From a489a0a3018499282824ae3124484dd6ab40710e Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Thu, 19 Dec 2019 15:35:11 +0100 Subject: [PATCH 1/2] Allow running Homer in a subdirectory When running homer in a subpath the worker cannot be loaded (404) the same accounts for the images in the default configuration. Signed-off-by: Felix Bartels --- app.js | 12 ++++++------ config.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app.js b/app.js index def0be7..40830da 100644 --- a/app.js +++ b/app.js @@ -9,14 +9,14 @@ const app = new Vue({ }, created: function () { let that = this; - - this.isDark = 'overrideDark' in localStorage ? + + this.isDark = 'overrideDark' in localStorage ? JSON.parse(localStorage.overrideDark) : matchMedia("(prefers-color-scheme: dark)").matches; if ('vlayout' in localStorage) { this.vlayout = JSON.parse(localStorage.vlayout) } - + this.checkOffline(); that.getConfig().then(function (config) { that.config = config; @@ -58,8 +58,8 @@ const app = new Vue({ }, toggleLayout: function() { this.vlayout = !this.vlayout; - localStorage.vlayout = this.vlayout; - }, + localStorage.vlayout = this.vlayout; + }, } }); @@ -95,6 +95,6 @@ Vue.component('service', { if ('serviceWorker' in navigator) { window.addEventListener('load', function () { - navigator.serviceWorker.register('/worker.js'); + navigator.serviceWorker.register('worker.js'); }); } diff --git a/config.yml b/config.yml index 8060119..2adddb1 100644 --- a/config.yml +++ b/config.yml @@ -31,12 +31,12 @@ services: icon: "fas fa-code-branch" items: - name: "Jenkins" - logo: "/assets/tools/jenkins.png" + logo: "assets/tools/jenkins.png" subtitle: "Continuous integration server" tag: "CI" url: "#" - name: "RabbitMQ Management" - logo: "/assets/tools/rabbitmq.png" + logo: "assets/tools/rabbitmq.png" subtitle: "Manage & monitor RabbitMQ server" tag: "haproxy" # Optional tagstyle @@ -47,21 +47,21 @@ services: icon: "fas fa-heartbeat" items: - name: "M/Monit" - logo: "/assets/tools/monit.png" + logo: "assets/tools/monit.png" subtitle: "Monitor & manage all monit enabled hosts" tag: "monit" url: "#" - name: "Grafana" - logo: "/assets/tools/grafana.png" + logo: "assets/tools/grafana.png" subtitle: "Metric analytics & dashboards" url: "#" - name: "Kibana" - logo: "/assets/tools/elastic.png" + logo: "assets/tools/elastic.png" subtitle: "Explore & visualize logs" tag: "elk" url: "#" - name: "Website monitoring" - logo: "/assets/tools/pingdom.png" + logo: "assets/tools/pingdom.png" subtitle: "Pingdom public reports overview" tag: "CI" url: "#" From d819cf5c15c26ae0e7128b8a1230c65201fa4d0e Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Thu, 19 Dec 2019 15:45:51 +0100 Subject: [PATCH 2/2] also fix paths in worker.js Signed-off-by: Felix Bartels --- worker.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/worker.js b/worker.js index 32aca25..a887a0a 100644 --- a/worker.js +++ b/worker.js @@ -4,13 +4,13 @@ self.addEventListener('install', event => { .open('homer') .then(cache => cache.addAll([ - '/', - '/index.html', - '/config.yml', - '/app.css', - '/app.js', - '/vendors/js-yaml.min.js', - '/assets/logo.png', + '.', + 'index.html', + 'config.yml', + 'app.css', + 'app.js', + 'vendors/js-yaml.min.js', + 'assets/logo.png', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css', 'https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.5/css/bulma.min.css', 'https://fonts.googleapis.com/css?family=Lato|Raleway&display=swap',