From e3bd2ecc2ca874270282c3c42813b8053d67dcbd Mon Sep 17 00:00:00 2001 From: luixal Date: Thu, 7 Jan 2021 09:39:58 +0100 Subject: Adds multiple pages based on different config files --- src/App.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/App.vue') 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 @@
@@ -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); -- cgit v1.2.3 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 --- src/App.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/App.vue') 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); -- cgit v1.2.3