Updates: removed errors from console, added dynamic env params, added…

… static config file
bcgov · Sep 25, 2023 · ca70ba8 · ca70ba8
1 parent dd130e7
commit ca70ba8
Show file tree

Hide file tree

Showing 14 changed files with 608 additions and 150 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "msedge",
+            "request": "launch",
+            "name": "Launch Edge against localhost",
+            "url": "http://localhost:8082",
+            "webRoot": "${workspaceFolder}/frontend/src/*"
+        }
+    ]
+}
diff --git a/frontend/.env b/frontend/.env
@@ -1,4 +1,3 @@
 # base-level env settings
-VITE_APP_API_ROOT=http://localhost:8080
 VITE_APP_TITLE=Operating Funding Model
 
diff --git a/frontend/index.html b/frontend/index.html
@@ -8,6 +8,7 @@
   </head>
   <body>
     <div id="app"></div>
+    <script src="/js/config/config.js"></script>
     <script type="module" src="/src/main.js"></script>
   </body>
 </html>
diff --git a/frontend/public/js/config/config.js b/frontend/public/js/config/config.js
@@ -0,0 +1,5 @@
+// eslint-disable-next-line no-unused-vars
+var config = {
+    BANNER_ENVIRONMENT: 'DEV',
+    BANNER_COLOR: '#8d28d7'
+}
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -76,6 +76,7 @@ export default {
   },
   methods: {
     ...mapActions(useAppStore, ['getConfig']),
+    ...mapActions(useAuthStore, ['getJwtToken']),    
     handleWebSocket() {
       if (this.isAuthenticated && this.isAuthorizedWebsocketUser) {
         this.$webSocketsConnect()

diff --git a/frontend/src/common/staticConfig.js b/frontend/src/common/staticConfig.js
@@ -0,0 +1,3 @@
+// eslint-disable-next-line
+const StaticConfig = config
+export default StaticConfig
diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
@@ -44,9 +44,9 @@ export default {
     }
   },
   created() {
-    useAuthStore().getUserInfo().then(() => {
-      this.user = this.userInfo;
-    });
+      useAuthStore().getUserInfo().then(() => {
+        this.user = this.userInfo
+      })
   },
   computed: {
     ...mapState(useAuthStore, ['userInfo', 'isAuthenticated'])

diff --git a/frontend/src/components/util/NavBar.vue b/frontend/src/components/util/NavBar.vue
@@ -110,6 +110,7 @@ import { mapState } from 'pinia'
 import SetNavigation from './SetNavigation.vue'
 import { useAuthStore } from '@/stores/auth'
 import { useAppStore } from '@/stores/app'
+import StaticConfig from '@/common/staticConfig.js'
 
 export default {
   name: 'NavBar',
@@ -125,8 +126,8 @@ export default {
   data() {
     return {
       drawer: null,
-      bannerEnvironment: 'DEV', //TODO: replace value with null when we've sorted out loading it from configuration
-      bannerColor: '#8D28D7' //TODO: replace value with null when we've sorted out loading it from configuration
+      bannerEnvironment: StaticConfig.BANNER_ENVIRONMENT,
+      bannerColor: StaticConfig.BANNER_COLOR
     }
   },
   async created() {

diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
@@ -170,7 +170,7 @@ const router = createRouter({
 router.beforeEach((to, _from, next) => {
   // this section is to set page title in vue store
   const appStore = useAppStore()
-  if (to && to.meta) {
+  if (to && to.meta.pageTitle) {
     appStore.setPageTitle(to.meta.pageTitle)
   } else {
     appStore.setPageTitle('')

diff --git a/frontend/src/stores/app.js b/frontend/src/stores/app.js
@@ -64,7 +64,6 @@ export const useAppStore = defineStore('app', {
       }
     },
     async getConfig() {
-      /* TODO: uncomment during integration with backend... */
       const response = await ApiService.getConfig();
       await this.setConfig(response.data);
     },

diff --git a/frontend/src/stores/auth.js b/frontend/src/stores/auth.js
@@ -1,7 +1,7 @@
-import { defineStore } from 'pinia'
 import ApiService from '@/common/apiService'
-import { Routes } from '@/utils/constants'
 import AuthService from '@/common/authService';
+import { Routes } from '@/utils/constants'
+import { defineStore } from 'pinia'
 
 export const useAuthStore = defineStore('auth', {
   namespaced: true,

diff --git a/frontend/vite.config.js b/frontend/vite.config.js
@@ -19,5 +19,16 @@ export default defineConfig({
         changeOrigin: true
       }
     }
-  }
-})
+  },
+
+}
+
+
+
+
+
+
+
+
+)
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,5 +19,16 @@ export default defineConfig({ @@
             changeOrigin: true
           }
         }
-      }
-    })
+      },
+    }
+    )