Changes relative paths to hash. Avoids problems with #8

pull/177/head
luixal 2021-02-23 20:50:32 +01:00
parent e3bd2ecc2c
commit c6267296ec
4 changed files with 7 additions and 11 deletions

View File

@ -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.

View File

@ -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: "#"

View File

@ -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);

View File

@ -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",
})