Index: ReserveNGo-frontend/src/App.vue
===================================================================
--- ReserveNGo-frontend/src/App.vue	(revision 9bcad23014032900a30a400c42d32d68381175be)
+++ ReserveNGo-frontend/src/App.vue	(revision 2a2614eb03e0c0b29f8d2d20eab0605a765eee82)
@@ -1,16 +1,21 @@
-<script setup>
+<script>
 //import { RouterLink, RouterView } from 'vue-router'
 import NavBar from './components/Project/Nav_bar_new.vue'
 import Footer_ from '@/components/Project/Footer_.vue'
+import { userStore } from '@/PiniaStores/UserStore.js'
 
-
-
-
-
-
+export default {
+  components: {
+    NavBar,
+    Footer_,
+  },
+  beforeMount() {
+    userStore().getLocalStorage()
+  },
+}
 </script>
 
 <template>
-<!--  <header>
+  <!--  <header>
     <img alt="Vue logo" class="logo" src="@/assets/logo.svg" width="125" height="125" />
 
@@ -30,5 +35,5 @@
     <NavBar></NavBar>
     <main>
-      <router-view/>
+      <router-view />
     </main>
     <footer>
@@ -41,18 +46,10 @@
   </div>
 
-
-
-
-
-
-<!--  <Locale_listing_container></Locale_listing_container>
+  <!--  <Locale_listing_container></Locale_listing_container>
   <Locale_listing_container></Locale_listing_container>
   <Locale_listing_container></Locale_listing_container>-->
-
-
 </template>
 
 <style scoped>
-
 .wrapper {
   display: flex;
@@ -64,9 +61,11 @@
   flex: 1; /*istrazi*/
 }
-footer{
-  background: #8377D1;
+footer {
+  background: #8377d1;
 }
 
-template{ background: #FBFFF1;}
+template {
+  background: #fbfff1;
+}
 /*header {
   line-height: 1.5;
Index: ReserveNGo-frontend/src/PiniaStores/UserStore.js
===================================================================
--- ReserveNGo-frontend/src/PiniaStores/UserStore.js	(revision 9bcad23014032900a30a400c42d32d68381175be)
+++ ReserveNGo-frontend/src/PiniaStores/UserStore.js	(revision 2a2614eb03e0c0b29f8d2d20eab0605a765eee82)
@@ -38,4 +38,18 @@
         this.data = JSON.parse(nonparsed);
       }
+    },
+    clearLocalStorage() {
+
+      this.data =  {
+        id: 0,
+        firstName: "",
+        lastName: "",
+        email: "",
+        phoneNumber: "",
+        role: "UN_AUTHENTICATED",
+        token: ""
+      }
+      localStorage.setItem('userData', JSON.stringify(this.data));
+
     }
 
Index: ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue
===================================================================
--- ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue	(revision 9bcad23014032900a30a400c42d32d68381175be)
+++ ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue	(revision 2a2614eb03e0c0b29f8d2d20eab0605a765eee82)
@@ -3,4 +3,6 @@
 
 import { userStore } from '@/PiniaStores/UserStore.js'
+import logout_ from '@/components/Project/logout_.vue'
+
 
 export default {
@@ -9,5 +11,9 @@
       userStore_: userStore()
     }
+  },
+  components: {
+    logout_
   }
+
 }
 
@@ -78,9 +84,10 @@
           <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>
 
Index: ReserveNGo-frontend/src/components/Project/login_.vue
===================================================================
--- ReserveNGo-frontend/src/components/Project/login_.vue	(revision 9bcad23014032900a30a400c42d32d68381175be)
+++ ReserveNGo-frontend/src/components/Project/login_.vue	(revision 2a2614eb03e0c0b29f8d2d20eab0605a765eee82)
@@ -3,4 +3,7 @@
 
 import { userStore } from '@/PiniaStores/UserStore.js'
+
+import {useRouter} from 'vue-router'
+import router from '@/router/index.js'
 
 export default {
@@ -16,8 +19,10 @@
       userStore_: userStore(),
 
+      router: useRouter()
+
     }
   },
   methods: {
-   /*async makeLogin() {
+   async makeLogin() {
 
       await fetch(this.url, {
@@ -29,7 +34,8 @@
         })
       }).then((response) => response.json())
-        .then(json => )
+        .then(json => {this.userStore_.setLocalStorage(json);
+                        router.push('/')})
 
-    }*/
+    }
   }
 }
@@ -43,5 +49,5 @@
 
     <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">
Index: ReserveNGo-frontend/src/components/Project/logout_.vue
===================================================================
--- ReserveNGo-frontend/src/components/Project/logout_.vue	(revision 2a2614eb03e0c0b29f8d2d20eab0605a765eee82)
+++ ReserveNGo-frontend/src/components/Project/logout_.vue	(revision 2a2614eb03e0c0b29f8d2d20eab0605a765eee82)
@@ -0,0 +1,25 @@
+<script>
+
+import { userStore } from '@/PiniaStores/UserStore.js'
+import {useRouter} from 'vue-router'
+
+export default {
+  data(){
+    return {
+      userStore_: userStore(),
+      router: useRouter()
+    }
+  },
+}
+
+</script>
+
+<template>
+
+  <a v-on:click="userStore_.clearLocalStorage()" @click="router.push('/login')" v-if="userStore_.data.role!=='UN_AUTHENTICATED'" class="btn btn-dark">Logout</a>
+
+</template>
+
+<style scoped>
+
+</style>
Index: ReserveNGo-frontend/src/components/Project/register_.vue
===================================================================
--- ReserveNGo-frontend/src/components/Project/register_.vue	(revision 9bcad23014032900a30a400c42d32d68381175be)
+++ ReserveNGo-frontend/src/components/Project/register_.vue	(revision 2a2614eb03e0c0b29f8d2d20eab0605a765eee82)
@@ -3,4 +3,6 @@
 
 import { userStore } from '@/PiniaStores/UserStore.js'
+import {useRouter} from 'vue-router'
+import router from '@/router/index.js'
 
 export default {
@@ -28,6 +30,5 @@
       },*/
       userStore_: userStore(),
-
-      //NE ZABORAVAJ TREBA DA SREDIS VCITUVANJE NA data od userStore na pocetok na stranicata
+      router: useRouter()
 
     }
@@ -46,5 +47,6 @@
           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)