update plugin/vuetify and app.vue

bcgov · Jan 5, 2024 · 13ff092 · 13ff092
1 parent 3898ee5
commit 13ff092
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 57 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -8,16 +8,15 @@
       <sbc-loader :show="showLoading" />
       <!-- common header -->
         <sbc-header
-        class="flex-column"
-        :key="$store.state.refreshKey"
-        :inAuth="false"
-        :show-product-selector="false"
-        :redirectUrlLoginFail="logoutUrl"
-        :redirect-on-logout="logoutUrl"
-        :showActions="true"
-      >
-      </sbc-header>
-      <bread-crumb />
+          class="flex-column"
+          :inAuth="false"
+          :show-product-selector="false"
+          :redirectUrlLoginFail="logoutUrl"
+          :redirect-on-logout="logoutUrl"
+          :showActions="true"
+        >
+        </sbc-header>
+      <!-- <bread-crumb /> -->
       <!-- error alert -->
       <error-alert-component
       :message="$t('errorAlertMessage')"

diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts
@@ -2,58 +2,50 @@ import 'vuetify/dist/vuetify.min.css'
 import '$assets/scss/base.scss'
 import '$assets/scss/layout.scss'
 import '$assets/scss/overrides.scss'
-
+import 'vuetify/styles'
 import { createVuetify } from 'vuetify'
 
 export default createVuetify({
   theme: {
-    options: {
-      customProperties: true
-    },
+    defaultTheme: 'light',
     themes: {
       light: {
-        primary: '#1669BB',
-        error: '#D3272C',
-        success: '#2E8540',
-        anchor: '#1669BB',
-        grey: {
-          base: '#adb5bd',
-          lighten5: '#f8f9fa',
-          lighten4: '#f1f3f5',
-          lighten3: '#e9ecef',
-          lighten2: '#dee2e6',
-          lighten1: '#ced4da',
-          darken1: '#868e96',
-          darken2: '#495057',
-          darken3: '#343a40',
-          darken4: '#212529'
-        },
-        bcgovblue: {
-          base: '#003366',
-          lighten5: '#e0e7ed',
-          lighten4: '#b3c2d1',
-          lighten3: '#8099b3',
-          lighten2: '#4d7094',
-          lighten1: '#26527d',
-          darken1: '#1e1e1f',
-          darken2: '#002753',
-          darken3: '#002049',
-          darken4: '#001438'
-        },
-        bcgovblue2: {
-          base: '#38598A'
-        },
-        bcgovblueLink: {
-          base: '#1A5A96'
-        },
-        bcgovgold: {
-          base: '#fcba19'
-        },
-        navBg: {
-          base: '#001438'
-        },
-        navMenuBg: {
-          base: '#26527d'
+        colors: {
+          primary: '#1669BB',
+          error: '#D3272C',
+          success: '#2E8540',
+          anchor: '#1669BB',
+
+          // Grey colors
+          greyBase: '#adb5bd',
+          greyLighten5: '#f8f9fa',
+          greyLighten4: '#f1f3f5',
+          greyLighten3: '#e9ecef',
+          greyLighten2: '#dee2e6',
+          greyLighten1: '#ced4da',
+          greyDarken1: '#868e96',
+          greyDarken2: '#495057',
+          greyDarken3: '#343a40',
+          greyDarken4: '#212529',
+
+          // Bcgovblue colors
+          bcgovblueBase: '#003366',
+          bcgovblueLighten5: '#e0e7ed',
+          bcgovblueLighten4: '#b3c2d1',
+          bcgovblueLighten3: '#8099b3',
+          bcgovblueLighten2: '#4d7094',
+          bcgovblueLighten1: '#26527d',
+          bcgovblueDarken1: '#1e1e1f',
+          bcgovblueDarken2: '#002753',
+          bcgovblueDarken3: '#002049',
+          bcgovblueDarken4: '#001438',
+
+          // Other colors
+          bcgovblue2Base: '#38598A',
+          bcgovblueLinkBase: '#1A5A96',
+          bcgovgoldBase: '#fcba19',
+          navBgBase: '#001438',
+          navMenuBgBase: '#26527d'
         }
       }
     }

diff --git a/src/router/routes.ts b/src/router/routes.ts
@@ -66,7 +66,7 @@ const routes: Array<RouteRecordRaw> = [
       requiresAuth: false
     }
   },
-  { path: '*', name: 'notfound', component: PageNotFound },
+  { path: '/:catchAll(.*)*', name: 'notfound', component: PageNotFound },
   {
     path: '/unauthorized',
     name: 'unauthorized',