From c6267296ec03db24ff40959ef58eedcec904c39b Mon Sep 17 00:00:00 2001 From: luixal Date: Tue, 23 Feb 2021 20:50:32 +0100 Subject: Changes relative paths to hash. Avoids problems with #8 --- docs/configuration.md | 2 +- public/assets/page2.yml | 7 +------ src/App.vue | 7 ++++--- src/components/ConnectivityChecker.vue | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 81de590..3c16b25 100644 --- 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 e10d706..00001e9 100644 --- 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 03970ed..cd1d9ba 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,7 +13,7 @@
@@ -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 e0e88bb..d41c443 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.origin + "?alive", { + return fetch(window.location.href + "?alive", { method: "HEAD", cache: "no-store", }) -- cgit v1.2.3