X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FApp.vue;h=b13b98ff7e8a2029405e148861a423a9d95fe0a4;hb=1f92e1746d0922574962113f41ba0804ddc3bdee;hp=8185da212c260f672ec5defd9957349a918c6d63;hpb=2301d8919c28eb888ea1eb968d03376b2219a27d;p=github%2Fbastienwirtz%2Fhomer.git

diff --git a/src/App.vue b/src/App.vue
index 8185da2..b13b98f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,7 +14,7 @@
         <div v-cloak class="container">
           <div class="logo">
             <img v-if="config.logo" :src="config.logo" alt="dashboard logo" />
-            <i v-if="config.icon" :class="config.icon"></i>
+            <i v-if="config.icon" :class="['fa-fw', config.icon]"></i>
           </div>
           <div class="dashboard-title">
             <span class="headline">{{ config.subtitle }}</span>
@@ -49,7 +49,10 @@
 
     <section id="main-section" class="section">
       <div v-cloak class="container">
-        <ConnectivityChecker @network:status-update="offline = $event" />
+        <ConnectivityChecker
+          v-if="config.connectivityCheck"
+          @network:status-update="offline = $event"
+        />
         <div v-if="!offline">
           <!-- Optional messages -->
           <Message :item="config.message" />
@@ -58,14 +61,14 @@
           <div v-if="!vlayout || filter" class="columns is-multiline">
             <template v-for="group in services">
               <h2 v-if="group.name" class="column is-full group-title">
-                <i v-if="group.icon" :class="group.icon"></i>
+                <i v-if="group.icon" :class="['fa-fw', group.icon]"></i>
                 {{ group.name }}
               </h2>
               <Service
                 v-for="item in group.items"
-                :key="item.url"
+                :key="item.name"
                 v-bind:item="item"
-                class="column is-one-third-widescreen"
+                :class="['column', `is-${12 / config.columns}`]"
               />
             </template>
           </div>
@@ -76,12 +79,12 @@
             class="columns is-multiline layout-vertical"
           >
             <div
-              class="column is-one-third-widescreen"
+              :class="['column', `is-${12 / config.columns}`]"
               v-for="group in services"
               :key="group.name"
             >
               <h2 v-if="group.name" class="group-title">
-                <i v-if="group.icon" :class="group.icon"></i>
+                <i v-if="group.icon" :class="['fa-fw', group.icon]"></i>
                 {{ group.name }}
               </h2>
               <Service
@@ -146,26 +149,34 @@ export default {
     };
   },
   created: async function () {
-    try {
-      const defaults = jsyaml.load(defaultConfig);
-      let config = await this.getConfig();
-
-      this.config = merge(defaults, config);
-      this.services = this.config.services;
-      document.title = `${this.config.title} | ${this.config.subtitle}`;
-    } catch (error) {
-      this.offline = true;
-    }
+    const defaults = jsyaml.load(defaultConfig);
+    let config = await this.getConfig();
+    this.config = merge(defaults, config);
+    this.services = this.config.services;
+    document.title = `${this.config.title} | ${this.config.subtitle}`;
   },
   methods: {
-    getConfig: function () {
-      return fetch("config.yml").then(function (response) {
-        if (response.status != 200) {
-          return;
+    getConfig: function (path = "assets/config.yml") {
+      return fetch(path).then((response) => {
+        if (!response.ok) {
+          throw Error(response.statusText);
         }
-        return response.text().then(function (body) {
-          return jsyaml.load(body);
-        });
+
+        const that = this;
+        return response
+          .text()
+          .then((body) => {
+            return jsyaml.load(body);
+          })
+          .then(function (config) {
+            if (config.externalConfig) {
+              return that.getConfig(config.externalConfig);
+            }
+            return config;
+          })
+          .catch((error) => {
+            return this.handleErrors("⚠️ Error loading configuration", error);
+          });
       });
     },
     matchesFilter: function (item) {
@@ -207,6 +218,15 @@ export default {
         },
       ];
     },
+    handleErrors: function (title, content) {
+      return {
+        message: {
+          title: title,
+          style: "is-danger",
+          content: content,
+        },
+      };
+    },
   },
 };
 </script>