Changeset 2a2614e for ReserveNGo-frontend/src/components

Timestamp:

01/26/25 00:32:02 (4 months ago)

Author:

Ljubomir Ilievski <ilievski.ljubomir@…>

Branches:

master

Children:

231918f

Parents:

9bcad23

Message:

Celosno funkcionalna logika na login/register/logout

Location:

ReserveNGo-frontend/src/components/Project

Files:

• Nav_bar_new.vue (modified) (3 diffs)
• login_.vue (modified) (4 diffs)
• logout_.vue (added)
• register_.vue (modified) (3 diffs)

ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue

@@ -3 +3 @@
 
 import { userStore } from '@/PiniaStores/UserStore.js'
+import logout_ from '@/components/Project/logout_.vue'
+
 
 export default {
@@ -9 +11 @@
       userStore_: userStore()
     }
+  },
+  components: {
+    logout_
   }
+
 }
 
@@ -78 +84 @@
           <li class="nav-item ms-2 d-none d-md-inline">
             <router-link to="/login" >
-            <a class="btn btn-dark">Login</a>
+            <a v-if="userStore_.data.role==='UN_AUTHENTICATED'" class="btn btn-dark">Login</a>
             </router-link>
             <router-link to="/register">
-            <a class="btn btn-dark ms-2">Register</a>
+            <a v-if="userStore_.data.role==='UN_AUTHENTICATED'" class="btn btn-dark ms-2">Register</a>
             </router-link>
+            <logout_></logout_>
           </li>
 

ReserveNGo-frontend/src/components/Project/login_.vue

@@ -3 +3 @@
 
 import { userStore } from '@/PiniaStores/UserStore.js'
+
+import {useRouter} from 'vue-router'
+import router from '@/router/index.js'
 
 export default {
@@ -16 +19 @@
       userStore_: userStore(),
 
+      router: useRouter()
+
     }
   },
   methods: {
-   /*async makeLogin() {
+   async makeLogin() {
 
       await fetch(this.url, {
@@ -29 +34 @@
         })
       }).then((response) => response.json())
-        .then(json => )
+        .then(json => {this.userStore_.setLocalStorage(json);
+                        router.push('/')})
 
-    }*/
+    }
   }
 }
@@ -43 +49 @@
 
     <div class="row justify-content-center  ">
-
+<!--      <form  v-on:submit.prevent="makeLogin">-->
 <!--      <form action="http://localhost:8080/api/auth/login" method="POST">-->
       <div class="col-3">

ReserveNGo-frontend/src/components/Project/register_.vue

@@ -3 +3 @@
 
 import { userStore } from '@/PiniaStores/UserStore.js'
+import {useRouter} from 'vue-router'
+import router from '@/router/index.js'
 
 export default {
@@ -28 +30 @@
       },*/
       userStore_: userStore(),
-
-      //NE ZABORAVAJ TREBA DA SREDIS VCITUVANJE NA data od userStore na pocetok na stranicata
+      router: useRouter()
 
     }
@@ -46 +47 @@
           phoneNumber: this.form_info.phoneNumber})
       }).then((response) => response.json())
-        .then((json) => {this.userStore_.setLocalStorage(json)})
+        .then((json) => {this.userStore_.setLocalStorage(json);
+                        router.push('/')})
           //console.log("Data received:", this.data);
           //this.userStore_.setLocalStorage(json)