wegue-oss#98 app-specific config file location under app/

justb4 · May 24, 2020 · f8e8e02 · f8e8e02
1 parent bfc36d9
commit f8e8e02
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/src/main.js b/src/main.js
@@ -33,17 +33,27 @@ if (appCtx) {
   appCtxFile = '-' + appCtx.replace(/(\.\.[/])+/g, '');
 }
 
-fetch('static/app-conf' + appCtxFile + '.json')
+const createApp = function (appConfig) {
+  // make app config accessible for all components
+  Vue.prototype.$appConfig = appConfig;
+  /* eslint-disable no-new */
+  new Vue({
+    el: '#app',
+    template: '<wgu-app/>',
+    components: { WguApp }
+  });
+};
+
+// First look in the app dir for an app-specific config file.
+fetch('app/static/app-conf' + appCtxFile + '.json')
   .then(function (response) {
-    return response.json();
-  })
-  .then(function (appConfig) {
-    // make app config accessible for all components
-    Vue.prototype.$appConfig = appConfig;
-    /* eslint-disable no-new */
-    new Vue({
-      el: '#app',
-      template: '<wgu-app/>',
-      components: { WguApp }
-    });
+    return response.json().then(function (appConfig) {
+      createApp(appConfig);
+    })
+  }).catch(function () {
+    fetch('static/app-conf' + appCtxFile + '.json').then(function (response) {
+      return response.json().then(function (appConfig) {
+        createApp(appConfig);
+      })
+    })
   });