Changes relative paths to hash. Avoids problems with #8

diff --git a/docs/configuration.md b/docs/configuration.md
index 81de5904db94c7264b4b6140b43e08366e7aac41..3c16b254fd0bd4bf8e96895f53a8b7f507c9a709 100644 (file)
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -85,7 +85,7 @@ links:
   # see url field and assets/page.yml used in this example:
   - name: "Second Page"
     icon: "fas fa-file-alt"
-    url: "/page2"
+    url: "#page2"
 
 # Services
 # First level array represents a group.

diff --git a/public/assets/page2.yml b/public/assets/page2.yml
index e10d706f079cfbbdba39939a8cfa3211c171a466..00001e992acabe8779a288474d5f82d41f479858 100644 (file)
--- a/public/assets/page2.yml
+++ b/public/assets/page2.yml
@@ -26,14 +26,9 @@ services:
   - name: "NEW"
     icon: "fas fa-cloud"
     items:
-      - name: "Awesome app"
+      - name: "Awesome app on a second page!"
         logo: "assets/tools/sample.png"
         subtitle: "Bookmark example"
         tag: "app"
         url: "https://www.reddit.com/r/selfhosted/"
         target: "_blank"
-      - name: "Another one"
-        logo: "assets/tools/sample2.png"
-        subtitle: "Another application"
-        tag: "app"
-        url: "#"

diff --git a/src/App.vue b/src/App.vue
index 03970edce642874a28dd8c70d59f2ec6cccd8361..cd1d9ba2755d104d83c4a122d934f19846f65497 100644 (file)
--- 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">
-            <a href="/"><img v-if="config.logo" :src="config.logo" alt="dashboard logo" /></a>
+            <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">
@@ -151,11 +151,12 @@ export default {
   created: async function () {
     const defaults = jsyaml.load(defaultConfig);
     let config;
+    window.onhashchange = function() { location.reload(); };
     try {
       config = await this.getConfig();
-      const path = (window.location.pathname != '/') ? window.location.pathname : null;
+      const path = (window.location.hash.substring(1) != '') ? window.location.hash.substring(1) : null;
       if (path) {
-        let pathConfig = await this.getConfig(`assets${path}.yml`); // the slash (/) is included in the pathname
+        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);

diff --git a/src/components/ConnectivityChecker.vue b/src/components/ConnectivityChecker.vue
index e0e88bb9f7cab8ab89eb24bc7f57a2e3b31e47e3..d41c4437442e46256749f2230d1fa3755892ab5f 100644 (file)
--- 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.origin + "?alive", {
+      return fetch(window.location.href + "?alive", {
         method: "HEAD",
         cache: "no-store",
       })