Release 2.1.4

Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001103 to 1.0.30001104.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases)
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001103...v1.0.30001104)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: amir20
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS, Windows or Mac Os]
+ - Docker version [e.g. `docker version`'s output]
+ - Browser & version [e.g. chrome, safari]
+ - Version [e.g. 1.26.1. Can be found at `<Dozzle-host>/version`]
+
+**If applicable include logs with `--level debug` and browser logs**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: amir20
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 20
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 3
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.reflex

@@ -1 +1 @@
--r '\.go$' -R '^node_modules/' -R '^static/' -R '^.cache/' -G '*_test.go' -s -- go run main.go routes.go --level debug
+-r '\.go$' -R 'node_modules' -R '^static/' -R '^.cache/' -G '*_test.go' -s -- go run main.go routes.go --level debug

Dockerfile

@@ -1,5 +1,5 @@
 # Build assets
-FROM node:13-alpine as node
+FROM node:current-alpine as node
 
 RUN apk add --no-cache git openssh python make g++ util-linux
 
@@ -54,4 +54,6 @@ ENV PATH=/bin
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /dozzle/dozzle /dozzle
 
+EXPOSE 8080
+
 ENTRYPOINT ["/dozzle"]

Makefile

@@ -1,5 +1,5 @@
 TAG := $(shell git describe --tags)
-PLATFROMS := linux/amd64,linux/arm64,linux/arm/v7
+PLATFROMS := linux/amd64,linux/arm/v7,linux/arm64/v8
 
 .PHONY: publish
 publish:

README.md

@@ -138,6 +138,6 @@ To Build and test locally:
 2. Install Go.
 3. Globally install [packr utility](https://github.com/gobuffalo/packr) with `go get -u github.com/gobuffalo/packr/packr` outside of dozzle directory.
 4. Install [reflex](https://github.com/cespare/reflex) with `get -u github.com/cespare/reflex` outside of dozzle.
-5. Install node modules with `npm install`.
-6. Do `npm start`
+5. Install node modules with `yarn`.
+6. Do `yarn dev`
 

__snapshots__/dozzle.snapshot

@@ -91,6 +91,9 @@ X-Accel-Buffering: no
 
 data: INFO Testing logs...
 
+event: container-stopped
+data: end of stream
+
 /* snapshot: Test_handler_streamLogs_happy_container_stopped */
 HTTP/1.1 200 OK
 Connection: close
@@ -102,6 +105,9 @@ X-Accel-Buffering: no
 event: container-stopped
 data: end of stream
 
+event: container-stopped
+data: end of stream
+
 /* snapshot: Test_handler_streamLogs_happy_with_id */
 HTTP/1.1 200 OK
 Connection: close
@@ -111,4 +117,7 @@ Content-Type: text/event-stream
 X-Accel-Buffering: no
 
 data: 2020-05-13T18:55:37.772853839Z INFO Testing logs...
-id: 2020-05-13T18:55:37.772853839Z
+id: 2020-05-13T18:55:37.772853839Z
+
+event: container-stopped
+data: end of stream

assets/App.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <main>
     <mobile-menu v-if="isMobile"></mobile-menu>
 
@@ -8,7 +8,7 @@
       </pane>
       <pane min-size="10">
         <splitpanes>
-          <pane class="has-min-height">
+          <pane class="has-min-height router-view">
             <search></search>
             <router-view></router-view>
           </pane>
@@ -82,6 +82,9 @@ export default {
     if (this.hasSmallerScrollbars) {
       document.documentElement.classList.add("has-custom-scrollbars");
     }
+    if (this.hasLightTheme) {
+      document.documentElement.setAttribute("data-theme", "light");
+    }
     this.menuWidth = this.settings.menuWidth;
   },
   watch: {
@@ -92,6 +95,13 @@ export default {
         document.documentElement.classList.remove("has-custom-scrollbars");
       }
     },
+    hasLightTheme(newValue, oldValue) {
+      if (newValue) {
+        document.documentElement.setAttribute("data-theme", "light");
+      } else {
+        document.documentElement.removeAttribute("data-theme");
+      }
+    },
   },
   computed: {
     ...mapState(["activeContainers", "isMobile", "settings"]),
@@ -99,6 +109,9 @@ export default {
     hasSmallerScrollbars() {
       return this.settings.smallerScrollbars;
     },
+    hasLightTheme() {
+      return this.settings.lightTheme;
+    },
   },
   methods: {
     ...mapActions({
@@ -119,9 +132,15 @@ export default {
 <style scoped lang="scss">
 ::v-deep .splitpanes--vertical > .splitpanes__splitter {
   min-width: 3px;
-  background: #666;
+  background: var(--border-color);
   &:hover {
-    background: rgb(255, 221, 87);
+    background: var(--border-hover-color);
+  }
+}
+
+@media screen and (max-width: 768px) {
+  .router-view {
+    padding-top: 75px;
   }
 }
 

assets/__snapshots__/App.spec.js.snap

@@ -25,7 +25,7 @@ exports[`<App /> renders correctly 1`] = `
         pushotherpanes="true"
       >
         <pane-stub
-          class="has-min-height"
+          class="has-min-height router-view"
           maxsize="100"
           minsize="0"
         >

assets/components/ContainerTitle.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div class="name columns is-marginless">
     <span class="column">{{ value }}</span>
     <span class="column is-narrow" v-if="closable">
@@ -26,5 +26,18 @@ export default {
   background: rgba(0, 0, 0, 0.1);
   font-weight: bold;
   font-family: monospace;
+
+  button.delete {
+    background-color: var(--scheme-main-ter);
+    opacity: 0.6;
+    &:after,
+    &:before {
+      background-color: var(--text-color);
+    }
+
+    &:hover {
+      opacity: 1;
+    }
+  }
 }
 </style>

assets/components/InfiniteLoader.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div ref="observer" class="control" :class="{ 'is-loading': isLoading }"></div>
 </template>
 
@@ -31,6 +31,8 @@ export default {
     );
 
     intersectionObserver.observe(this.$refs.observer);
+
+    this.$once("hook:beforeDestroy", () => intersectionObserver.disconnect());
   },
 };
 </script>

assets/components/LogEventSource.spec.js

@@ -19,10 +19,10 @@ describe("<LogEventSource />", () => {
     global.EventSource = EventSource;
     window.scrollTo = jest.fn();
     const observe = jest.fn();
-    const unobserve = jest.fn();
+    const disconnect = jest.fn();
     global.IntersectionObserver = jest.fn(() => ({
       observe,
-      unobserve,
+      disconnect,
     }));
     debounce.mockClear();
   });
@@ -144,7 +144,7 @@ describe("<LogEventSource />", () => {
       await wrapper.vm.$nextTick();
       expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
         <ul class="events medium">
-          <li class=""><span class="date">today at 10:55 AM</span> <span class="text">"This is a message."</span></li>
+          <li class=""><span class="date"><time datetime="2019-06-12T10:55:42.459Z">today at 10:55 AM</time></span> <span class="text">"This is a message."</span></li>
         </ul>
       `);
     });
@@ -159,7 +159,7 @@ describe("<LogEventSource />", () => {
       await wrapper.vm.$nextTick();
       expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
         <ul class="events medium">
-          <li class=""><span class="date">today at 10:55 AM</span> <span class="text"><span style="color:#000">black<span style="color:#AAA">white</span></span></span></li>
+          <li class=""><span class="date"><time datetime="2019-06-12T10:55:42.459Z">today at 10:55 AM</time></span> <span class="text"><span style="color:#000">black<span style="color:#AAA">white</span></span></span></li>
         </ul>
       `);
     });
@@ -174,7 +174,7 @@ describe("<LogEventSource />", () => {
       await wrapper.vm.$nextTick();
       expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
         <ul class="events medium">
-          <li class=""><span class="date">today at 10:55 AM</span> <span class="text">&lt;test&gt;foo bar&lt;/test&gt;</span></li>
+          <li class=""><span class="date"><time datetime="2019-06-12T10:55:42.459Z">today at 10:55 AM</time></span> <span class="text">&lt;test&gt;foo bar&lt;/test&gt;</span></li>
         </ul>
       `);
     });
@@ -192,7 +192,7 @@ describe("<LogEventSource />", () => {
       await wrapper.vm.$nextTick();
       expect(wrapper.find("ul.events")).toMatchInlineSnapshot(`
         <ul class="events medium">
-          <li class=""><span class="date">today at 10:55 AM</span> <span class="text">This is a <mark>test</mark> &lt;hi&gt;&lt;/hi&gt;</span></li>
+          <li class=""><span class="date"><time datetime="2019-06-12T10:55:42.459Z">today at 10:55 AM</time></span> <span class="text">This is a <mark>test</mark> &lt;hi&gt;&lt;/hi&gt;</span></li>
         </ul>
       `);
     });

assets/components/LogEventSource.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div>
     <infinite-loader :onLoadMore="loadOlderLogs" :enabled="messages.length > 100"></infinite-loader>
     <slot :messages="messages"></slot>
@@ -25,35 +25,38 @@ export default {
   created() {
     this.es = null;
     this.loadLogs(this.id);
+    this.flushBuffer = debounce(this.flushNow, 250, { maxWait: 1000 });
   },
   methods: {
     loadLogs(id) {
-      if (this.es) {
-        this.es.close();
-        this.messages = [];
-        this.buffer = [];
-        this.es = null;
-      }
+      this.reset();
       this.es = new EventSource(`${config.base}/api/logs/stream?id=${this.id}`);
-
       this.es.addEventListener("container-stopped", (e) => {
         this.es.close();
         this.buffer.push({ event: "container-stopped", message: "Container stopped", date: new Date() });
-        flushNow();
+        this.flushBuffer();
+        this.flushBuffer.flush();
       });
-      this.es.addEventListener("error", (e) => console.log("EventSource failed: " + JSON.stringify(e)));
-
-      const flushBuffer = debounce(() => flushNow(), 250, { maxWait: 1000 });
-      const flushNow = () => {
-        this.messages.push(...this.buffer);
-        this.buffer = [];
-      };
+      this.es.addEventListener("error", (e) => console.error("EventSource failed: " + JSON.stringify(e)));
       this.es.onmessage = (e) => {
         this.buffer.push(this.parseMessage(e.data));
-        flushBuffer();
+        this.flushBuffer();
       };
       this.$once("hook:beforeDestroy", () => this.es.close());
     },
+    flushNow() {
+      this.messages.push(...this.buffer);
+      this.buffer = [];
+    },
+    reset() {
+      if (this.es) {
+        this.es.close();
+        this.es = null;
+        this.flushBuffer.cancel();
+      }
+      this.messages = [];
+      this.buffer = [];
+    },
     async loadOlderLogs() {
       if (this.messages.length < 300) return;
 
@@ -62,7 +65,7 @@ export default {
       const delta = to - last;
       const from = new Date(to.getTime() + delta);
       const logs = await (
-        await fetch(`/api/logs?id=${this.id}&from=${from.toISOString()}&to=${to.toISOString()}`)
+        await fetch(`${config.base}/api/logs?id=${this.id}&from=${from.toISOString()}&to=${to.toISOString()}`)
       ).text();
       if (logs) {
         const newMessages = logs

assets/components/LogViewer.vue

@@ -1,17 +1,16 @@
-<template lang="html">
+<template>
   <ul class="events" :class="settings.size">
     <li v-for="item in filtered" :key="item.key" :class="{ event: !!item.event }">
-      <span class="date" v-if="settings.showTimestamp">{{ item.date | relativeTime }}</span>
+      <span class="date" v-if="settings.showTimestamp"><relative-time :date="item.date"></relative-time></span>
       <span class="text" v-html="colorize(item.message)"></span>
     </li>
   </ul>
 </template>
-
 <script>
 import { mapActions, mapGetters, mapState } from "vuex";
-import { formatRelative } from "date-fns";
 import AnsiConvertor from "ansi-to-html";
 import DOMPurify from "dompurify";
+import RelativeTime from "./RelativeTime";
 
 const ansiConvertor = new AnsiConvertor({ escapeXML: true });
 
@@ -24,7 +23,7 @@ if (window.trustedTypes && trustedTypes.createPolicy) {
 export default {
   props: ["messages"],
   name: "LogViewer",
-  components: {},
+  components: { RelativeTime },
   data() {
     return {
       showSearch: false,
@@ -60,11 +59,6 @@ export default {
       return messages;
     },
   },
-  filters: {
-    relativeTime(date) {
-      return formatRelative(date, new Date());
-    },
-  },
 };
 </script>
 <style scoped lang="scss">
@@ -97,6 +91,13 @@ export default {
 .date {
   background-color: #262626;
   color: #258ccd;
+
+  [data-theme="light"] & {
+    background-color: #f0f0f0;
+    color: #009900;
+    padding-left: 5px;
+    padding-right: 5px;
+  }
 }
 
 .text {
@@ -109,8 +110,8 @@ li.event {
 
 ::v-deep mark {
   border-radius: 2px;
-  background-color: #ffdd57;
-  animation: pops 0.2s ease-out;
+  background-color: var(--secondary-color);
+  animation: pops 200ms ease-out;
   display: inline-block;
 }
 

assets/components/LogViewerWithSource.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <log-event-source :id="id" v-slot="eventSource">
     <log-viewer :messages="eventSource.messages"></log-viewer>
   </log-event-source>

assets/components/MobileMenu.vue

@@ -1,17 +1,19 @@
-<template lang="html">
+<template>
   <aside>
     <a
       role="button"
-      class="navbar-burger burger is-white is-hidden-tablet is-pulled-right"
+      class="navbar-burger burger is-hidden-tablet is-pulled-right"
       @click="showNav = !showNav"
       :class="{ 'is-active': showNav }"
     >
       <span></span> <span></span> <span></span>
     </a>
-    <h1 class="title has-text-warning is-marginless">Dozzle</h1>
+    <svg class="logo">
+      <use href="#logo"></use>
+    </svg>
     <p class="menu-label is-hidden-mobile" :class="{ 'is-active': showNav }">Containers</p>
     <ul class="menu-list is-hidden-mobile" :class="{ 'is-active': showNav }">
-      <li v-for="item in visibleContainers">
+      <li v-for="item in visibleContainers" :key="item.id">
         <router-link
           :to="{ name: 'container', params: { id: item.id, name: item.name } }"
           active-class="is-active"
@@ -54,7 +56,7 @@ aside {
   top: 0;
   left: 0;
   right: 0;
-  background: #222;
+  background: var(--scheme-main-ter);
   z-index: 2;
   max-height: 100vh;
   overflow: auto;
@@ -68,8 +70,12 @@ aside {
     overflow: hidden;
   }
 
-  .burger.is-white {
-    color: #fff;
+  .title {
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
+  }
+
+  .burger {
+    color: var(--body-color);
   }
 
   .is-hidden-mobile.is-active {
@@ -79,5 +85,11 @@ aside {
   .navbar-burger {
     height: 2.35rem;
   }
+
+  .logo {
+    width: 82px;
+    height: 36px;
+    fill: var(--logo-color);
+  }
 }
 </style>

assets/components/PastTime.vue

@@ -0,0 +1,39 @@
+<template>
+  <time :datetime="date.toISOString()">{{ text }}</time>
+</template>
+
+<script>
+import formatDistance from "date-fns/formatDistance";
+
+export default {
+  props: {
+    date: {
+      required: true,
+      type: Date,
+    },
+  },
+  data() {
+    return {
+      text: "",
+      interval: null,
+    };
+  },
+  name: "PastTime",
+  mounted() {
+    this.updateFromNow();
+    this.interval = setInterval(() => this.updateFromNow(), 30000);
+  },
+  destroyed() {
+    clearInterval(this.interval);
+  },
+  methods: {
+    updateFromNow() {
+      this.text = formatDistance(this.date, new Date(), {
+        addSuffix: true,
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss"></style>

assets/components/RelativeTime.vue

@@ -0,0 +1,34 @@
+<template>
+  <time :datetime="date.toISOString()">{{ date | relativeTime }}</time>
+</template>
+
+<script>
+import { formatRelative } from "date-fns";
+import { enGB, enUS } from "date-fns/locale";
+
+const use24Hr =
+  new Intl.DateTimeFormat(undefined, {
+    hour: "numeric",
+  })
+    .formatToParts(new Date(2020, 0, 1, 13))
+    .find((part) => part.type === "hour").value.length === 2;
+
+const locale = use24Hr ? enGB : enUS;
+
+export default {
+  props: {
+    date: {
+      required: true,
+      type: Date,
+    },
+  },
+  name: "RelativeTime",
+  components: {},
+
+  filters: {
+    relativeTime(date) {
+      return formatRelative(date, new Date(), { locale });
+    },
+  },
+};
+</script>

assets/components/ScrollProgress.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="scroll-progress">
+    <svg width="100" height="100" viewBox="0 0 100 100">
+      <circle r="44" cx="50" cy="50" :style="{ '--progress': scrollProgress }" />
+    </svg>
+    <div class="is-overlay columns is-vcentered is-centered has-text-weight-light">
+      <span class="column is-narrow is-paddingless is-size-2">
+        {{ Math.ceil(scrollProgress * 100) }}
+      </span>
+      <span class="column is-narrow is-paddingless">
+        %
+      </span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+import throttle from "lodash.throttle";
+
+export default {
+  name: "ScrollProgress",
+  data() {
+    return {
+      scrollProgress: 0,
+      animation: { cancel: () => {} },
+      parentElement: document,
+    };
+  },
+  created() {
+    this.onScrollThrottled = throttle(this.onScroll, 150);
+  },
+  mounted() {
+    this.attachEvents();
+    this.$once("hook:beforeDestroy", this.detachEvents);
+  },
+  watch: {
+    activeContainers() {
+      this.detachEvents();
+      this.attachEvents();
+    },
+  },
+  computed: {
+    ...mapState(["activeContainers"]),
+  },
+  methods: {
+    attachEvents() {
+      this.parentElement = this.$el.closest("[data-scrolling]") || document;
+      this.parentElement.addEventListener("scroll", this.onScrollThrottled);
+    },
+    detachEvents() {
+      this.parentElement.removeEventListener("scroll", this.onScrollThrottled);
+    },
+    onScroll() {
+      const p = this.parentElement == document ? document.documentElement : this.parentElement;
+      this.scrollProgress = p.scrollTop / (p.scrollHeight - p.clientHeight);
+      this.animation.cancel();
+      this.animation = this.$el.animate(
+        { opacity: [1, 0] },
+        {
+          duration: 500,
+          delay: 2000,
+          fill: "both",
+          easing: "ease-out",
+        }
+      );
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.scroll-progress {
+  display: inline-block;
+  position: relative;
+  circle {
+    fill: var(--scheme-main-ter);
+    fill-opacity: 0.8;
+    transition: stroke-dashoffset 250ms ease-out;
+    transform: rotate(-90deg);
+    transform-origin: 50% 50%;
+    stroke: var(--primary-color);
+    stroke-dashoffset: calc(276.32px - var(--progress) * 276.32px);
+    stroke-dasharray: 276.32px 276.32px;
+    stroke-width: 3;
+    will-change: stroke-dashoffset;
+  }
+}
+</style>

assets/components/ScrollableView.vue

@@ -1,20 +1,19 @@
-<template lang="html">
+<template>
   <section :class="{ 'is-full-height-scrollable': scrollable }">
     <header v-if="$slots.header">
       <slot name="header"></slot>
     </header>
     <main ref="content" :data-scrolling="scrollable">
+      <div class="is-scrollbar-progress is-hidden-mobile">
+        <scroll-progress v-show="paused"></scroll-progress>
+      </div>
       <slot></slot>
-      <div ref="scrollObserver"></div>
+      <div ref="scrollObserver" class="is-scroll-observer"></div>
     </main>
-    <div class="scroll-bar-notification">
+
+    <div class="is-scrollbar-notification">
       <transition name="fade">
-        <button
-          class="button"
-          :class="hasMore ? 'is-warning' : 'is-primary'"
-          @click="scrollToBottom('instant')"
-          v-show="paused"
-        >
+        <button class="button" :class="hasMore ? 'has-more' : ''" @click="scrollToBottom('instant')" v-show="paused">
           <icon name="download"></icon>
         </button>
       </transition>
@@ -24,6 +23,7 @@
 
 <script>
 import Icon from "./Icon";
+import ScrollProgress from "./ScrollProgress";
 
 export default {
   props: {
@@ -34,6 +34,7 @@ export default {
   },
   components: {
     Icon,
+    ScrollProgress,
   },
   name: "ScrollableView",
   data() {
@@ -44,20 +45,22 @@ export default {
   },
   mounted() {
     const { content } = this.$refs;
-    new MutationObserver((e) => {
+    const mutationObserver = new MutationObserver((e) => {
       if (!this.paused) {
         this.scrollToBottom("instant");
       } else {
         this.hasMore = true;
       }
-    }).observe(content, { childList: true, subtree: true });
+    });
+    mutationObserver.observe(content, { childList: true, subtree: true });
+    this.$once("hook:beforeDestroy", () => mutationObserver.disconnect());
 
     const intersectionObserver = new IntersectionObserver(
       (entries) => (this.paused = entries[0].intersectionRatio == 0),
       { threshholds: [0, 1], rootMargin: "80px 0px" }
     );
-
     intersectionObserver.observe(this.$refs.scrollObserver);
+    this.$once("hook:beforeDestroy", () => intersectionObserver.disconnect());
   },
 
   methods: {
@@ -75,6 +78,7 @@ section {
 
   &.is-full-height-scrollable {
     height: 100vh;
+    min-height: 0;
   }
 
   main {
@@ -83,12 +87,54 @@ section {
     scroll-snap-type: y proximity;
   }
 
-  .scroll-bar-notification {
+  .is-scrollbar-progress {
+    text-align: right;
+    margin-right: 110px;
+    .scroll-progress {
+      position: fixed;
+      top: 60px;
+      z-index: 2;
+    }
+  }
+
+  .is-scroll-observer {
+    height: 1px;
+  }
+
+  .is-scrollbar-notification {
     text-align: right;
     margin-right: 65px;
     button {
       position: fixed;
       bottom: 30px;
+      background-color: var(--secondary-color);
+      transition: background-color 1s ease-out;
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+      border: none !important;
+
+      &.has-more {
+        background-color: var(--primary-color);
+        animation-name: bounce;
+        animation-duration: 1000ms;
+        animation-fill-mode: both;
+        color: #fff;
+      }
+    }
+  }
+
+  @keyframes bounce {
+    0%,
+    20%,
+    50%,
+    80%,
+    100% {
+      transform: translateY(0);
+    }
+    40% {
+      transform: translateY(-30px);
+    }
+    60% {
+      transform: translateY(-15px);
     }
   }
 

assets/components/Search.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div class="search columns is-gapless is-vcentered" v-show="showSearch" v-if="settings.search">
     <div class="column">
       <p class="control has-icons-left">
@@ -75,17 +75,36 @@ export default {
   width: 350px;
   position: fixed;
   padding: 10px;
-  background: rgba(50, 50, 50, 0.9);
+  background: var(--scheme-main-ter);
   top: 0;
   right: 0;
   border-radius: 0 0 0 5px;
   z-index: 10;
-}
-.delete {
-  margin-left: 1em;
-}
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
 
-.icon {
-  padding: 10px 3px;
+  button.delete {
+    margin-left: 1em;
+    background-color: var(--scheme-main-ter);
+    opacity: 0.6;
+    &:after,
+    &:before {
+      background-color: var(--text-color);
+    }
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  .icon {
+    padding: 10px 3px;
+  }
+
+  .input {
+    color: var(--body-color);
+    &::placeholder {
+      color: var(--border-color);
+    }
+  }
 }
 </style>

assets/components/SideMenu.vue

@@ -1,10 +1,14 @@
-<template lang="html">
+<template>
   <aside>
     <div class="columns is-marginless">
-      <div class="column">
-        <h1 class="title has-text-warning is-marginless">Dozzle</h1>
+      <div class="column is-paddingless">
+        <router-link :to="{ name: 'default' }">
+          <svg class="logo">
+            <use href="#logo"></use>
+          </svg>
+        </router-link>
       </div>
-      <div class="column is-narrow has-text-right is-hidden-mobile">
+      <div class="column is-narrow has-text-right x">
         <router-link
           :to="{ name: 'settings' }"
           active-class="is-active"
@@ -79,10 +83,6 @@ aside {
     overflow: hidden;
   }
 
-  .burger.is-white {
-    color: #fff;
-  }
-
   .is-hidden-mobile.is-active {
     display: block !important;
   }
@@ -92,11 +92,17 @@ li.exited a {
   color: #777;
 }
 
+.logo {
+  width: 122px;
+  height: 54px;
+  fill: var(--logo-color);
+}
+
 .will-append-container.icon {
   transition: transform 0.2s ease-out;
   &.is-active {
     pointer-events: none;
-    color: #00d1b2;
+    color: var(--primary-color);
   }
   .router-link-exact-active & {
     visibility: hidden;

assets/main.js

@@ -6,10 +6,7 @@ import Switch from "buefy/dist/esm/switch";
 import store from "./store";
 import config from "./store/config";
 import App from "./App.vue";
-import Container from "./pages/Container.vue";
-import Settings from "./pages/Settings.vue";
-import Index from "./pages/Index.vue";
-import Show from "./pages/Show.vue";
+import { Container, Settings, Index, Show, ContainerNotFound, PageNotFound } from "./pages";
 
 Vue.use(VueRouter);
 Vue.use(Meta);
@@ -28,6 +25,11 @@ const routes = [
     name: "container",
     props: true,
   },
+  {
+    path: "/container/*",
+    component: ContainerNotFound,
+    name: "container-not-found",
+  },
   {
     path: "/settings",
     component: Settings,
@@ -38,6 +40,11 @@ const routes = [
     component: Show,
     name: "show",
   },
+  {
+    path: "/*",
+    component: PageNotFound,
+    name: "page-not-found",
+  },
 ];
 
 const router = new VueRouter({

assets/pages/Container.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <scrollable-view :scrollable="activeContainers.length > 0">
     <template v-slot:header v-if="activeContainers.length > 0">
       <container-title :value="allContainersById[id].name"></container-title>
@@ -13,6 +13,7 @@ import { mapActions, mapGetters, mapState } from "vuex";
 import LogViewerWithSource from "../components/LogViewerWithSource";
 import ScrollableView from "../components/ScrollableView";
 import ContainerTitle from "../components/ContainerTitle";
+import store from "../store";
 
 export default {
   props: ["id", "name"],

assets/pages/ContainerNotFound.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="hero is-halfheight">
+    <div class="hero-body">
+      <div class="container has-text-centered">
+        <h1 class="title">
+          Container not found.
+          <small class="subtitle">It may have been removed.</small>
+        </h1>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ContainerNotFound",
+};
+</script>

assets/pages/Index.spec.js

@@ -1,9 +0,0 @@
-import { shallowMount } from "@vue/test-utils";
-import Index from "./Index";
-
-describe("<Index />", () => {
-  test("renders correctly", () => {
-    const wrapper = shallowMount(Index);
-    expect(wrapper.element).toMatchSnapshot();
-  });
-});

assets/pages/Index.vue

@@ -1,22 +1,153 @@
-<template lang="html">
-  <div class="hero is-fullheight is-dark">
-    <div class="hero-body">
-      <div class="container has-text-centered">
-        <h1 class="title">Please choose a container from the list to view the logs</h1>
+<template>
+  <div>
+    <section class="hero is-small mt-4">
+      <div class="hero-body">
+        <div class="container">
+          <h1 class="title">
+            Hello, there!
+          </h1>
+        </div>
       </div>
-    </div>
+    </section>
+    <section class="level section">
+      <div class="level-item has-text-centered">
+        <div>
+          <p class="title">{{ containers.length }}</p>
+          <p class="heading">Total Containers</p>
+        </div>
+      </div>
+      <div class="level-item has-text-centered">
+        <div>
+          <p class="title">{{ runningContainers.length }}</p>
+          <p class="heading">Running</p>
+        </div>
+      </div>
+      <div class="level-item has-text-centered">
+        <div>
+          <p class="title">{{ version }}</p>
+          <p class="heading">Dozzle Version</p>
+        </div>
+      </div>
+    </section>
+
+    <section class="columns is-centered">
+      <div class="column is-4">
+        <div class="panel">
+          <p class="panel-heading">
+            Containers
+          </p>
+          <div class="panel-block">
+            <p class="control has-icons-left">
+              <input
+                class="input"
+                type="text"
+                placeholder="Search Containers"
+                v-model="search"
+                @keyup.esc="search = null"
+                @keyup.enter="onEnter()"
+              />
+              <span class="icon is-left">
+                <icon name="search"></icon>
+              </span>
+            </p>
+          </div>
+          <p class="panel-tabs">
+            <a :class="{ 'is-active': sort === 'running' }" @click="sort = 'running'">Running</a>
+            <a :class="{ 'is-active': sort === 'all' }" @click="sort = 'all'">All</a>
+          </p>
+          <router-link
+            :to="{ name: 'container', params: { id: item.id, name: item.name } }"
+            v-for="item in results.slice(0, 10)"
+            :key="item.id"
+            class="panel-block"
+          >
+            <span class="name">{{ item.name }}</span>
+
+            <div class="subtitle is-7 status">
+              <past-time :date="new Date(item.created * 1000)"></past-time>
+            </div>
+          </router-link>
+        </div>
+      </div>
+    </section>
   </div>
 </template>
 
 <script>
+import { mapActions, mapGetters, mapState } from "vuex";
+import Icon from "../components/Icon";
+import PastTime from "../components/PastTime";
+import config from "../store/config";
+
 export default {
-  props: [],
-  name: "Default",
+  name: "Index",
+  components: { Icon, PastTime },
+  data() {
+    return {
+      version: config.version,
+      search: null,
+      sort: "running",
+    };
+  },
+  methods: {
+    onEnter() {
+      if (this.results.length == 1) {
+        const [item] = this.results;
+        this.$router.push({ name: "container", params: { id: item.id, name: item.name } });
+      }
+    },
+  },
+  computed: {
+    ...mapState(["containers"]),
+    mostRecentContainers() {
+      return [...this.containers].sort((a, b) => b.created - a.created);
+    },
+    runningContainers() {
+      return this.mostRecentContainers.filter((c) => c.state === "running");
+    },
+    allContainers() {
+      return this.containers;
+    },
+    results() {
+      if (this.search) {
+        const term = this.search.toLowerCase();
+        return this.allContainers.filter((c) => c.name.toLowerCase().includes(term));
+      }
+      switch (this.sort) {
+        case "all":
+          return this.mostRecentContainers;
+        case "running":
+          return this.runningContainers;
+
+        default:
+          throw `Invalid sort order: ${this.sort}`;
+      }
+    },
+  },
 };
 </script>
-<style scoped>
-.hero.is-dark {
-  color: #ddd;
-  background-color: #111;
+<style lang="scss" scoped>
+.panel {
+  border: 1px solid var(--border-color);
+  .panel-block,
+  .panel-tabs {
+    border-color: var(--border-color);
+    .is-active {
+      border-color: var(--border-hover-color);
+    }
+    .name {
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+    }
+    .status {
+      margin-left: auto;
+      white-space: nowrap;
+    }
+  }
+}
+
+.icon {
+  padding: 10px 3px;
 }
 </style>

assets/pages/PageNotFound.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="hero is-halfheight">
+    <div class="hero-body">
+      <div class="container has-text-centered">
+        <h1 class="title">
+          Oops,
+          <small class="subtitle">this page doesn't exist</small>
+        </h1>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "PageNotFound",
+};
+</script>

assets/pages/Settings.vue

@@ -1,4 +1,4 @@
-<template lang="html">
+<template>
   <div>
     <section class="section">
       <div class="has-underline">
@@ -46,30 +46,40 @@
       </div>
 
       <div class="item">
-        <h2 class="title is-6 is-marginless">Font size</h2>
-        Modify the font size when viewing logs.
+        <b-switch v-model="lightTheme">
+          Use light theme
+        </b-switch>
+      </div>
 
-        <b-dropdown v-model="size" aria-role="list" style="margin: -8px 10px 0;">
-          <button class="button is-primary" type="button" slot="trigger">
-            <span class="is-capitalized">{{ size }}</span>
-            <span class="icon"><icon name="chevron-down"></icon></span>
-          </button>
-          <b-dropdown-item
-            :value="value"
-            aria-role="listitem"
-            v-for="value in ['small', 'medium', 'large']"
-            :key="value"
-          >
-            <div class="media">
-              <span class="icon keep-size">
-                <icon name="check" v-if="value == size"></icon>
-              </span>
-              <div class="media-content">
-                <h3 class="is-capitalized">{{ value }}</h3>
-              </div>
-            </div>
-          </b-dropdown-item>
-        </b-dropdown>
+      <div class="item">
+        <div class="columns is-vcentered is-mobile is-variable is-2">
+          <div class="column is-narrow">
+            <b-dropdown v-model="size" aria-role="list">
+              <button class="button is-primary" type="button" slot="trigger">
+                <span class="is-capitalized">{{ size }}</span>
+                <span class="icon"><icon name="chevron-down"></icon></span>
+              </button>
+              <b-dropdown-item
+                :value="value"
+                aria-role="listitem"
+                v-for="value in ['small', 'medium', 'large']"
+                :key="value"
+              >
+                <div class="media">
+                  <span class="icon keep-size">
+                    <icon name="check" v-if="value == size"></icon>
+                  </span>
+                  <div class="media-content">
+                    <h3 class="is-capitalized">{{ value }}</h3>
+                  </div>
+                </div>
+              </b-dropdown-item>
+            </b-dropdown>
+          </div>
+          <div class="column">
+            Font size to use for logs
+          </div>
+        </div>
       </div>
     </section>
   </div>
@@ -112,29 +122,30 @@ export default {
   },
   computed: {
     ...mapState(["settings"]),
-    ...["search", "size", "smallerScrollbars", "showTimestamp", "showAllContainers"].reduce((map, name) => {
-      map[name] = {
-        get() {
-          return this.settings[name];
-        },
-        set(value) {
-          this.updateSetting({ [name]: value });
-        },
-      };
-      return map;
-    }, {}),
+    ...["search", "size", "smallerScrollbars", "showTimestamp", "showAllContainers", "lightTheme"].reduce(
+      (map, name) => {
+        map[name] = {
+          get() {
+            return this.settings[name];
+          },
+          set(value) {
+            this.updateSetting({ [name]: value });
+          },
+        };
+        return map;
+      },
+      {}
+    ),
   },
 };
 </script>
 <style lang="scss" scoped>
 .title {
-  color: #eee;
+  color: var(--title-color);
 }
 
 a.next-release {
   text-decoration: underline;
-  color: #00d1b2;
-
   &:hover {
     text-decoration: none;
   }
@@ -145,7 +156,7 @@ a.next-release {
 }
 
 .has-underline {
-  border-bottom: 1px solid #fff;
+  border-bottom: 1px solid var(--border-color);
   padding: 1em 0px;
   margin-bottom: 1em;
 }

assets/pages/Show.vue

@@ -1,4 +1,4 @@
-<template lang="html"> </template>
+<template> </template>
 
 <script>
 import { mapActions, mapGetters, mapState } from "vuex";

assets/pages/__snapshots__/Index.spec.js.snap

@@ -1,21 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Index /> renders correctly 1`] = `
-<div
-  class="hero is-fullheight is-dark"
->
-  <div
-    class="hero-body"
-  >
-    <div
-      class="container has-text-centered"
-    >
-      <h1
-        class="title"
-      >
-        Please choose a container from the list to view the logs
-      </h1>
-    </div>
-  </div>
-</div>
-`;

assets/pages/index.js

@@ -0,0 +1,6 @@
+export { default as Index } from "./Index.vue";
+export { default as ContainerNotFound } from "./ContainerNotFound.vue";
+export { default as Show } from "./Show.vue";
+export { default as Container } from "./Container.vue";
+export { default as Settings } from "./Settings.vue";
+export { default as PageNotFound } from "./PageNotFound.vue";

assets/store/config.js

@@ -1,2 +1,6 @@
 const config = JSON.parse(document.querySelector("script#config__json").textContent);
+if (config.version == "{{ .Version }}") {
+  config.version = "dev";
+  config.base = "";
+}
 export default config;

assets/store/settings.js

@@ -6,4 +6,5 @@ export const DEFAULT_SETTINGS = {
   smallerScrollbars: false,
   showTimestamp: true,
   showAllContainers: false,
+  lightTheme: false
 };

assets/styles.scss

@@ -1,7 +1,29 @@
 @charset "utf-8";
+@import "~bulma/sass/utilities/initial-variables.sass";
 
-$menu-item-active-background-color: hsl(171, 100%, 41%);
-$menu-item-color: hsl(0, 6%, 87%);
+$body-family: "Roboto", sans-serif;
+$body-background-color: var(--body-background-color);
+
+$scheme-main: var(--scheme-main);
+$scheme-main-bis: var(--scheme-main-bis);
+$scheme-main-ter: var(--scheme-main-ter);
+
+$border: var(--border-color);
+$border-hover: var(--border-hover-color);
+
+$menu-item-active-background-color: var(--menu-item-active-background-color);
+$menu-item-color: var(--menu-item-color);
+$menu-item-hover-background-color: var(--menu-item-hover-background-color);
+$menu-item-hover-color: var(--menu-item-hover-color);
+
+$text-strong: var(--text-strong-color);
+$text: var(--text-color);
+
+$panel-heading-background-color: var(--panel-heading-background-color);
+$panel-heading-color: var(--panel-heading-color);
+
+$link: $turquoise;
+$link-active: $grey-dark;
 
 @import "~bulma";
 @import "../node_modules/splitpanes/dist/splitpanes.css";
@@ -9,14 +31,56 @@ $menu-item-color: hsl(0, 6%, 87%);
 @import "~buefy/src/scss/components/_dropdown";
 @import "~buefy/src/scss/components/_switch";
 
-body {
-  font-family: "Roboto", sans-serif;
-  color: #ddd;
-  background-color: #111;
+html {
+  --scheme-main: #{$black};
+  --scheme-main-bis: #{$black-bis};
+  --scheme-main-ter: #{$black-ter};
+
+  --border-color: #{$grey-darker};
+  --border-hover-color: var(--secondary-color);
+  --logo-color: var(--secondary-color);
+
+  --primary-color: #{$turquoise};
+  --secondary-color: #{$yellow};
+
+  --body-background-color: #{$black-bis};
+
+  --menu-item-active-background-color: var(--primary-color);
+  --menu-item-color: hsl(0, 6%, 87%);
+  --menu-item-hover-background-color: #{$white-ter};
+  --menu-item-hover-color: #{$black-ter};
+
+  --panel-heading-background-color: var(--secondary-color);
+  --panel-heading-color: var(--scheme-main-bis);
+
+  --text-strong-color: #{$grey-lightest};
+  --text-color: #{$grey-lighter};
 }
 
-h1.title {
-  font-family: "Gafata", sans-serif;
+[data-theme="light"] {
+  --scheme-main: #{$white};
+  --scheme-main-bis: #{$white-bis};
+  --scheme-main-ter: #{$white-ter};
+
+  --border-color: #{$grey-lighter};
+  --border-hover-color: var(--secondary-color);
+  --logo-color: #{$grey-darker};
+
+  --primary-color: #{$turquoise};
+  --secondary-color: #d8f0ca;
+
+  --body-background-color: #{$white-bis};
+  --body-color: #{$grey-darker};
+
+  --menu-item-color: #{$grey-dark};
+  --menu-item-hover-background-color: #eee8e7;
+  --menu-item-hover-color: #{black-ter};
+
+  --panel-heading-background-color: var(--secondary-color);
+  --panel-heading-color: var(--text-strong-color);
+
+  --text-strong-color: #{$grey-dark};
+  --text-color: #{$grey-darker};
 }
 
 html {
@@ -60,7 +124,7 @@ html.has-custom-scrollbars {
   color: #fff;
   border-color: transparent;
   &:hover {
-    border-color: rgb(255, 221, 87) !important;
+    border-color: var(--border-hover-color) !important;
     background: rgba(0, 0, 0, 0.8) !important;
     color: #fff !important;
   }

docker/client.go

@@ -95,9 +95,8 @@ func (d *dockerClient) ListContainers() ([]Container, error) {
 		return nil, err
 	}
 
-	var containers []Container
+	var containers = make([]Container, 0, len(list))
 	for _, c := range list {
-
 		container := Container{
 			ID:      c.ID[:12],
 			Names:   c.Names,
@@ -116,10 +115,6 @@ func (d *dockerClient) ListContainers() ([]Container, error) {
 		return strings.ToLower(containers[i].Name) < strings.ToLower(containers[j].Name)
 	})
 
-	if containers == nil {
-		containers = []Container{}
-	}
-
 	return containers, nil
 }
 

go.mod

@@ -41,10 +41,9 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.0
 	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.6.1
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
 	golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect
-	golang.org/x/text v0.3.2 // indirect
 	google.golang.org/genproto v0.0.0-20200226201735-46b91f19d98c // indirect
 	google.golang.org/grpc v1.27.1 // indirect
 	gopkg.in/ini.v1 v1.52.0 // indirect

go.sum

@@ -316,6 +316,10 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho=
+github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
@@ -486,6 +490,8 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

integration/.dockerignore

@@ -0,0 +1 @@
+node_modules

integration/Dockerfile

@@ -1,8 +1,8 @@
-FROM amir20/docker-alpine-puppeteer:edge
+FROM amir20/docker-alpine-puppeteer:v1
 
-COPY --chown=pptruser:pptruser package*.json yarn.lock /app/
-RUN yarn 
+COPY package*.json yarn.lock /app/
+RUN yarn
 
-COPY --chown=pptruser:pptruser . /app/
+COPY . /app/
 
-CMD [ "yarn", "test"]
+CMD ["yarn", "test"]

integration/__tests__/custom_base.js

@@ -0,0 +1,22 @@
+const { removeTimes } = require("../utils");
+const { CUSTOM_URL: URL } = process.env;
+
+describe("Dozzle with custom base", () => {
+  beforeEach(async () => {
+    await page.goto(URL, { waitUntil: "networkidle2" });
+  });
+
+  it("renders full page on desktop", async () => {
+    await removeTimes(page);
+    const image = await page.screenshot({ fullPage: true });
+
+    expect(image).toMatchImageSnapshot();
+  });
+
+  it("and shows one container with correct title", async () => {
+    await removeTimes(page);
+    const menuTitle = await page.$eval("aside ul.menu-list li a", (e) => e.title);
+
+    expect(menuTitle).toEqual("custom_base");
+  });
+});

integration/__tests__/default.js

@@ -1,15 +1,17 @@
 const puppeteer = require("puppeteer");
+const { removeTimes } = require("../utils");
 const iPhoneX = puppeteer.devices["iPhone X"];
 const iPadLandscape = puppeteer.devices["iPad landscape"];
 
-const { BASE } = process.env;
+const { DEFAULT_URL: URL } = process.env;
 
 describe("home page", () => {
   beforeEach(async () => {
-    await page.goto(BASE, { waitUntil: "networkidle2" });
+    await page.goto(URL, { waitUntil: "networkidle2" });
   });
 
   it("renders full page on desktop", async () => {
+    await removeTimes(page);
     const image = await page.screenshot({ fullPage: true });
 
     expect(image).toMatchImageSnapshot();
@@ -17,6 +19,7 @@ describe("home page", () => {
 
   it("renders ipad viewport", async () => {
     await page.emulate(iPadLandscape);
+    await removeTimes(page);
     const image = await page.screenshot();
 
     expect(image).toMatchImageSnapshot();
@@ -24,6 +27,7 @@ describe("home page", () => {
 
   it("renders iphone viewport", async () => {
     await page.emulate(iPhoneX);
+    await removeTimes(page);
     const image = await page.screenshot();
 
     expect(image).toMatchImageSnapshot();
@@ -43,7 +47,7 @@ describe("home page", () => {
     });
 
     beforeEach(async () => {
-      await page.goto(BASE, { waitUntil: "networkidle2" });
+      await page.goto(URL, { waitUntil: "networkidle2" });
     });
 
     it("and shows one container with correct title", async () => {

integration/__tests__/light_mode.js

@@ -0,0 +1,41 @@
+const puppeteer = require("puppeteer");
+const { removeTimes } = require("../utils");
+const iPhoneX = puppeteer.devices["iPhone X"];
+const iPadLandscape = puppeteer.devices["iPad landscape"];
+
+const { DEFAULT_URL: URL } = process.env;
+
+describe("Dozzle with light mode", () => {
+  beforeAll(async () => {
+    await page.goto(URL + "/settings", { waitUntil: "networkidle2" });
+    await page.$$eval("label.switch", (elements) => {
+      elements.filter((e) => e.textContent.trim() === "Use light theme")[0].click();
+    });
+  });
+  beforeEach(async () => {
+    await page.goto(URL, { waitUntil: "networkidle2" });
+  });
+
+  it("renders full page on desktop", async () => {
+    await removeTimes(page);
+    const image = await page.screenshot({ fullPage: true });
+
+    expect(image).toMatchImageSnapshot();
+  });
+
+  it("renders ipad viewport", async () => {
+    await page.emulate(iPadLandscape);
+    await removeTimes(page);
+    const image = await page.screenshot();
+
+    expect(image).toMatchImageSnapshot();
+  });
+
+  it("renders iphone viewport", async () => {
+    await page.emulate(iPhoneX);
+    await removeTimes(page);
+    const image = await page.screenshot();
+
+    expect(image).toMatchImageSnapshot();
+  });
+});

integration/docker-compose.test.yml

@@ -1,5 +1,14 @@
 version: "3.4"
 services:
+  custom_base:
+    container_name: custom_base
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - DOZZLE_FILTER=name=custom_base
+      - DOZZLE_BASE=/foobarbase
+    build:
+      context: ..
   dozzle:
     container_name: dozzle
     volumes:
@@ -12,7 +21,11 @@ services:
     build:
       context: .
     command: yarn test
+    volumes:
+      - ./__tests__:/app/__tests__
     environment:
-      - BASE=http://dozzle:8080/
+      - DEFAULT_URL=http://dozzle:8080/
+      - CUSTOM_URL=http://custom_base:8080/foobarbase
     depends_on:
       - dozzle
+      - custom_base

integration/package.json

@@ -10,7 +10,7 @@
  "dependencies": {
   "jest": "^26.0.1",
   "jest-image-snapshot": "^4.0.0",
-  "puppeteer": "^3.0.4"
+  "puppeteer": "^5.0.0"
  },
  "jest": {
   "preset": "jest-puppeteer",

integration/utils.js

@@ -0,0 +1,8 @@
+async function removeTimes(page) {
+  await page.waitForSelector("time");
+  await page.evaluate(() => {
+    (document.querySelectorAll("time") || []).forEach((el) => el.remove());
+  });
+}
+
+module.exports = { removeTimes };

package.json

@@ -1,18 +1,20 @@
 {
  "name": "dozzle",
- "version": "1.26.0",
+ "version": "2.1.4",
  "description": "Realtime log viewer for docker containers. ",
  "scripts": {
   "prestart": "yarn clean",
-  "start": "concurrently 'yarn watch-server' 'yarn watch-assets'",
-  "watch-assets": "webpack --mode=development --watch",
-  "watch-server": "reflex -c .reflex",
+  "watch": "npm-run-all -p watch:*",
+  "watch:assets": "webpack --mode=development --watch",
+  "watch:server": "reflex -c .reflex",
+  "dev": "npm-run-all -p dev-server watch:server",
+  "dev-server": "webpack-dev-server --open",
   "prebuild": "yarn clean",
   "build": "yarn webpack --mode=production",
   "clean": "rm -rf static/ a_main-packr.go",
   "release": "release-it",
   "test": "TZ=UTC jest",
-  "integration": "docker-compose -f integration/docker-compose.test.yml up --build --force-recreate integration"
+  "integration": "docker-compose -f integration/docker-compose.test.yml up --build --force-recreate --exit-code-from integration"
  },
  "repository": {
   "type": "git",
@@ -26,55 +28,54 @@
  "homepage": "https://github.com/amir20/dozzle#readme",
  "dependencies": {
   "ansi-to-html": "^0.6.14",
-  "buefy": "^0.8.19",
-  "bulma": "^0.8.2",
-  "date-fns": "^2.14.0",
-  "dompurify": "^2.0.11",
+  "buefy": "^0.8.20",
+  "bulma": "^0.9.0",
+  "date-fns": "^2.15.0",
+  "dompurify": "^2.0.12",
   "hotkeys-js": "^3.8.1",
   "lodash.debounce": "^4.0.8",
+  "lodash.throttle": "^4.1.1",
   "semver": "^7.3.2",
   "splitpanes": "^2.2.1",
   "store": "^2.0.12",
   "vue": "^2.6.11",
-  "vue-meta": "^2.3.3",
-  "vue-router": "^3.2.0",
-  "vuex": "^3.4.0"
+  "vue-meta": "^2.4.0",
+  "vue-router": "^3.3.4",
+  "vuex": "^3.5.1"
  },
  "devDependencies": {
-  "@babel/core": "^7.9.6",
-  "@babel/plugin-transform-runtime": "^7.9.6",
+  "@babel/core": "^7.10.5",
+  "@babel/plugin-transform-runtime": "^7.10.5",
   "@vue/component-compiler-utils": "^3.1.2",
   "@vue/test-utils": "^1.0.3",
   "babel-core": "^7.0.0-bridge.0",
-  "babel-jest": "^26.0.1",
-  "babel-loader": "^8.1.0",
+  "babel-jest": "^26.1.0",
   "babel-preset-env": "^1.7.0",
-  "caniuse-lite": "^1.0.30001064",
-  "concurrently": "^5.2.0",
-  "css-loader": "^3.5.3",
+  "caniuse-lite": "^1.0.30001104",
+  "css-loader": "^3.6.0",
   "eventsourcemock": "^2.0.0",
   "html-webpack-plugin": "^4.3.0",
   "husky": "^4.2.5",
-  "jest": "^26.0.1",
+  "jest": "^26.1.0",
   "jest-serializer-vue": "^2.0.2",
-  "lint-staged": "^10.2.6",
+  "lint-staged": "^10.2.11",
   "mini-css-extract-plugin": "^0.9.0",
-  "node-fetch": "^2.6.0",
+  "npm-run-all": "^4.1.5",
   "postcss-cssnext": "^3.1.0",
   "postcss-import": "^12.0.1",
   "postcss-loader": "^3.0.0",
   "prettier": "^2.0.5",
-  "release-it": "^13.6.1",
-  "sass": "^1.26.5",
-  "sass-loader": "^8.0.2",
+  "release-it": "^13.6.5",
+  "sass": "^1.26.10",
+  "sass-loader": "^9.0.2",
   "vue-hot-reload-api": "^2.3.4",
-  "vue-jest": "^3.0.5",
-  "vue-loader": "^15.9.2",
+  "vue-jest": "^3.0.6",
+  "vue-loader": "^15.9.3",
   "vue-style-loader": "^4.1.2",
   "vue-template-compiler": "^2.6.11",
   "webpack": "^4.43.0",
-  "webpack-cli": "^3.3.11",
-  "webpack-manifest-plugin": "^2.2.0",
+  "webpack-cli": "^3.3.12",
+  "webpack-dev-server": "^3.11.0",
   "webpack-pwa-manifest": "^4.2.0"
  },
  "husky": {

routes.go

@@ -126,6 +126,7 @@ Loop:
 		select {
 		case message, ok := <-messages:
 			if !ok {
+				fmt.Fprintf(w, "event: container-stopped\ndata: end of stream\n\n")
 				break Loop
 			}
 			fmt.Fprintf(w, "data: %s\n", message)

webpack.config.js

@@ -10,12 +10,12 @@ module.exports = (env, argv) => ({
     maxAssetSize: 350000,
     maxEntrypointSize: 600000,
   },
-  devtool: argv.mode === "development" ? "inline-cheap-source-map" : false,
+  devtool: argv.mode !== "production" ? "inline-cheap-source-map" : false,
   entry: ["./assets/main.js", "./assets/styles.scss"],
   output: {
     path: path.resolve(__dirname, "./static"),
     filename: "[name].js",
-    publicPath: "{{ .Base }}",
+    publicPath: process.env.WEBPACK_DEV_SERVER ? "/" : "{{ .Base }}",
   },
   module: {
     rules: [
@@ -26,19 +26,18 @@ module.exports = (env, argv) => ({
       {
         test: /\.(sass|scss|css)$/,
         use: [
-          MiniCssExtractPlugin.loader,
           {
-            loader: "css-loader",
-            query: {
-              importLoaders: 1,
+            loader: MiniCssExtractPlugin.loader,
+            options: {
+              hmr: argv.mode !== "production",
             },
           },
+          "css-loader",
           {
             loader: "postcss-loader",
             options: {
               ident: "postcss",
               plugins: (loader) => [
-                require("postcss-import")(),
                 require("postcss-cssnext")({
                   features: {
                     customProperties: { warnings: false },
@@ -75,4 +74,15 @@ module.exports = (env, argv) => ({
     },
     extensions: ["*", ".js", ".vue", ".json"],
   },
+  devServer: {
+    port: 8081,
+    inline: true,
+    hot: true,
+    historyApiFallback: true,
+    proxy: {
+      "/api": {
+        target: "http://localhost:8080",
+      },
+    },
+  },
 });