fixed login

bcgov · Nov 1, 2024 · 0c49308 · 0c49308
1 parent 7c0c986
commit 0c49308
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/frontend/src/App.vue b/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,8 @@ export default {
     },
     login() {
       // Use Vue Router to navigate to the login route
-      this.$router.push(this.loginUrl);
+      console.log(this.authRoutes.LOGIN);
+      this.$router.push(this.authRoutes.LOGIN);
     },
   },
 };

diff --git a/frontend/src/components/DisplayTable.vue b/frontend/src/components/DisplayTable.vue
@@ -175,11 +175,7 @@ export default {
     editableFields() {
       return this.fields.filter((field) => field.editable);
     },
-    // totalRows: function () {
-    //   if (this.items?.length) {
-    //     return this.items.length;
-    //   } else return this.totalRows;
-    // },
+
     sortOptions() {
       return this.fields
         .filter((f) => f.sortable)

diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
@@ -12,7 +12,7 @@
             valid IDIR.
           </v-card-text>
           <v-card-actions>
-            <v-btn color="primary" variant="text" href="authRoutes.LOGIN">
+            <v-btn color="primary" variant="text">
               <a :href="authRoutes.LOGIN">Login</a>
             </v-btn>
           </v-card-actions>