aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/App.vue9
-rw-r--r--src/components/ConnectivityChecker.vue2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/App.vue b/src/App.vue
index dc473ca..03970ed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,7 +13,7 @@
13 <section v-if="config.header" class="first-line"> 13 <section v-if="config.header" class="first-line">
14 <div v-cloak class="container"> 14 <div v-cloak class="container">
15 <div class="logo"> 15 <div class="logo">
16 <img v-if="config.logo" :src="config.logo" alt="dashboard logo" /> 16 <a href="/"><img v-if="config.logo" :src="config.logo" alt="dashboard logo" /></a>
17 <i v-if="config.icon" :class="config.icon"></i> 17 <i v-if="config.icon" :class="config.icon"></i>
18 </div> 18 </div>
19 <div class="dashboard-title"> 19 <div class="dashboard-title">
@@ -153,6 +153,13 @@ export default {
153 let config; 153 let config;
154 try { 154 try {
155 config = await this.getConfig(); 155 config = await this.getConfig();
156 const path = (window.location.pathname != '/') ? window.location.pathname : null;
157 if (path) {
158 let pathConfig = await this.getConfig(`assets${path}.yml`); // the slash (/) is included in the pathname
159 for (const prop in pathConfig) config[prop] = pathConfig[prop];
160 }
161 // config = await this.getConfig(path ? `assets/${path}.yml` : null);
162 //config = await (path ? this.getConfig(`assets/${path}.yml`) : this.getConfig())
156 } catch (error) { 163 } catch (error) {
157 console.log(error); 164 console.log(error);
158 config = this.handleErrors("⚠️ Error loading configuration", error); 165 config = this.handleErrors("⚠️ Error loading configuration", error);
diff --git a/src/components/ConnectivityChecker.vue b/src/components/ConnectivityChecker.vue
index d41c443..e0e88bb 100644
--- a/src/components/ConnectivityChecker.vue
+++ b/src/components/ConnectivityChecker.vue
@@ -33,7 +33,7 @@ export default {
33 methods: { 33 methods: {
34 checkOffline: function () { 34 checkOffline: function () {
35 let that = this; 35 let that = this;
36 return fetch(window.location.href + "?alive", { 36 return fetch(window.location.origin + "?alive", {
37 method: "HEAD", 37 method: "HEAD",
38 cache: "no-store", 38 cache: "no-store",
39 }) 39 })