Merge pull request #670 from bcgov/shaun-dev

fixed login

frontend/src/App.vue

@@ -1,6 +1,7 @@
 <template>
   <v-app>
     <Snackbar></Snackbar>
+
     <Bcheader class="bcheader">
       <div v-if="isAuthenticatedGet && dataReady">
         <v-btn @click="dialog = true">{{ userInfoGet.userName }}</v-btn>
@@ -57,13 +58,13 @@
             <v-card-text>
               <p v-if="tokenExpired">Your session has expired. Please Login.</p>
               <p v-else>
-                Your session is about to expire in {{ timerValue }} seconds. Are
-                you still there?
+                Your session is about to expire in {{ timerValue }} seconds. Do
+                you want to extend your session?
               </p>
             </v-card-text>
 
             <v-card-actions>
-              <v-btn @click="login" v-if="tokenExpired">Login</v-btn>
+              <v-btn :href="authRoutes.LOGIN" v-if="tokenExpired">Login</v-btn>
               <v-btn @click="resumeSession" v-else>Yes</v-btn>
               <v-btn @click="logout">Logout</v-btn>
             </v-card-actions>
@@ -133,8 +134,8 @@ export default {
     dataReady: function () {
       return this.userInfoGet;
     },
-    loginUrl: function () {
-      return this.authRoutes.LOGIN;
+    timeRemaining: function () {
+      return Math.floor(this.timerValue);
     },
   },
   methods: {
@@ -177,7 +178,7 @@ export default {
     },
     login() {
       // Use Vue Router to navigate to the login route
-      this.$router.push(this.loginUrl);
+      this.$router.push(this.authRoutes.LOGIN);
     },
   },
 };