Display parsing error

pull/80/head
Bastien Wirtz 2020-06-06 16:57:36 -07:00
parent 10ea23a01d
commit bd9109425a
1 changed files with 25 additions and 17 deletions

View File

@ -146,27 +146,26 @@ export default {
}; };
}, },
created: async function () { created: async function () {
try { const defaults = jsyaml.load(defaultConfig);
const defaults = jsyaml.load(defaultConfig); let config = await this.getConfig();
let config = await this.getConfig(); this.config = merge(defaults, config);
this.services = this.config.services;
this.config = merge(defaults, config); document.title = `${this.config.title} | ${this.config.subtitle}`;
this.services = this.config.services;
document.title = `${this.config.title} | ${this.config.subtitle}`;
} catch (error) {
this.offline = true;
}
}, },
methods: { methods: {
getConfig: function () { getConfig: function () {
return fetch("config.yml").then(function (response) { return fetch("config.yml")
if (response.status != 200) { .then((response) => {
return; if (!response.ok) {
} throw Error(response.statusText);
return response.text().then(function (body) { }
return jsyaml.load(body); return response.text().then((body) => {
return jsyaml.load(body);
});
})
.catch((error) => {
return this.handleErrors("⚠️ Error loading configuration", error);
}); });
});
}, },
matchesFilter: function (item) { matchesFilter: function (item) {
return ( return (
@ -207,6 +206,15 @@ export default {
}, },
]; ];
}, },
handleErrors: function (title, content) {
return {
message: {
title: title,
style: "is-danger",
content: content,
},
};
},
}, },
}; };
</script> </script>