From e3bd2ecc2ca874270282c3c42813b8053d67dcbd Mon Sep 17 00:00:00 2001
From: luixal <luixal@gmail.com>
Date: Thu, 7 Jan 2021 09:39:58 +0100
Subject: Adds multiple pages based on different config files

---
 src/App.vue                            | 9 ++++++++-
 src/components/ConnectivityChecker.vue | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src')

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 @@
       <section v-if="config.header" class="first-line">
         <div v-cloak class="container">
           <div class="logo">
-            <img v-if="config.logo" :src="config.logo" alt="dashboard logo" />
+            <a href="/"><img v-if="config.logo" :src="config.logo" alt="dashboard logo" /></a>
             <i v-if="config.icon" :class="config.icon"></i>
           </div>
           <div class="dashboard-title">
@@ -153,6 +153,13 @@ export default {
     let config;
     try {
       config = await this.getConfig();
+      const path = (window.location.pathname != '/') ? window.location.pathname : null;
+      if (path) {
+        let pathConfig = await this.getConfig(`assets${path}.yml`); // the slash (/) is included in the pathname
+        for (const prop in pathConfig) config[prop] = pathConfig[prop];
+      }
+      // config = await this.getConfig(path ? `assets/${path}.yml` : null);
+      //config = await (path ? this.getConfig(`assets/${path}.yml`) : this.getConfig())
     } catch (error) {
       console.log(error);
       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 {
   methods: {
     checkOffline: function () {
       let that = this;
-      return fetch(window.location.href + "?alive", {
+      return fetch(window.location.origin + "?alive", {
         method: "HEAD",
         cache: "no-store",
       })
-- 
cgit v1.2.3