Changeset 17bf12d

Timestamp:

01/25/25 00:58:19 (3 months ago)

Author:

Ljubomir Ilievski <ilievski.ljubomir@…>

Branches:

master

Children:

4894099

Parents:

a520992

Message:

Zavrsen pogolem del Login/Register Logika

Location:

ReserveNGo-frontend/src

Files:

• App.vue (modified) (1 diff)
• PiniaStores/UserStore.js (added)
• components/Project/Nav_bar_new.vue (modified) (2 diffs)
• components/Project/login_.vue (modified) (2 diffs)
• components/Project/register_.vue (modified) (5 diffs)

ReserveNGo-frontend/src/App.vue

@@ -3 +3 @@
 import NavBar from './components/Project/Nav_bar_new.vue'
 import Footer_ from '@/components/Project/Footer_.vue'
+
+
+
+
+
 
 </script>

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

@@ -2 +2 @@
 
 
+import { userStore } from '@/PiniaStores/UserStore.js'
+
+export default {
+  data() {
+    return {
+      userStore_: userStore()
+    }
+  }
+}
 
 
@@ -57 +66 @@
       <!-- navbar links -->
       <div class="collapse navbar-collapse justify-content-end align-center" id="main-nav">
+
         <ul class="navbar-nav">
+
           <li class="nav-item">
-            <router-link to="/favourite_locals" class="nav-link">Favourite locals </router-link>
+            <router-link v-if="this.userStore_.data.role==='ROLE_CUSTOMER'" to="/favourite_locals" class="nav-link">Favourite locals </router-link>
           </li>
           <li class="nav-item">
-            <router-link to="/my_reservations" class="nav-link">My reservations </router-link>
+            <router-link v-if="this.userStore_.data.role==='ROLE_CUSTOMER'" to="/my_reservations" class="nav-link">My reservations </router-link>
           </li>
+
           <li class="nav-item ms-2 d-none d-md-inline">
             <router-link to="/login" >

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

@@ -1 @@
-<script setup>
+<script>
+
+
+import { userStore } from '@/PiniaStores/UserStore.js'
+
+export default {
+  data() {
+    return {
+      form_info:{
+        email: '',
+        password: ''
+      },
+
+      url: 'http://localhost:8080/api/auth/login',
+
+      userStore_: userStore(),
+
+    }
+  },
+  methods: {
+   /*async makeLogin() {
+
+      await fetch(this.url, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded'},
+        body: new URLSearchParams({
+            email: this.form_info.email,
+            password: this.form_info.password
+        })
+      }).then((response) => response.json())
+        .then(json => )
+
+    }*/
+  }
+}
 
 </script>
@@ -10 +44 @@
     <div class="row justify-content-center  ">
 
+<!--      <form action="http://localhost:8080/api/auth/login" method="POST">-->
       <div class="col-3">
-        <form action="http://localhost:8080/api/auth/login" method="POST">
+        <form  v-on:submit.prevent="makeLogin">
 
-      <label for="email" class="form-label">Email</label>
-      <input name="email" id="email" class="form-control" type="email">
+      <label  for="email" class="form-label">Email</label>
+      <input v-model="this.form_info.email" name="email" id="email" class="form-control" type="email">
 
       <label for="password" class="form-label">Password</label>
-      <input name="password" id="password" type="password" class="form-control">
+      <input v-model="this.form_info.password" name="password" id="password" type="password" class="form-control">
 
         <button type="submit" class="btn btn-dark mt-2">Login</button>

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

@@ -1 +1 @@
 <script>
 
+
+import { userStore } from '@/PiniaStores/UserStore.js'
 
 export default {
@@ -7 +9 @@
       path: '',
       url: 'http://localhost:8080/api/auth/register/',
+
       form_info:{
         firstName: '',
@@ -15 +18 @@
 
       },
-      data: {}
+     /* data: {
+        id: 0,
+        firstName: "",
+        lastName: "",
+        email: "",
+        phoneNumber: "",
+        role: "",
+        token: ""
+      },*/
+      userStore_: userStore(),
+
+      //NE ZABORAVAJ TREBA DA SREDIS VCITUVANJE NA data od userStore na pocetok na stranicata
 
     }
@@ -21 +35 @@
 
   methods: {
-    register() {
-      fetch(this.url+this.path, {
+   async register() {
+     await fetch(this.wholeUrl, {
         method: 'POST',
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({firstName: this.firstName, lastName: this.lastName, email: this.email, password: this.password})
-      }).then((response) => {response.json()})
-        .then((json) => this.data = json)
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        body: new URLSearchParams({
+          firstName: this.form_info.firstName,
+          lastName: this.form_info.lastName,
+          email: this.form_info.email,
+          password: this.form_info.password,
+          phoneNumber: this.form_info.phoneNumber})
+      }).then((response) => response.json())
+        .then((json) => {this.userStore_.setLocalStorage(json)})
+          //console.log("Data received:", this.data);
+          //this.userStore_.setLocalStorage(json)
+        //console.log(json)
 
+     //console.log(this.userStore_.data)
     }
 
   },
-  /*computed: {
-    somevariabletest(){
+  computed: {
+    wholeUrl(){
       return this.url+this.path;
+    },
+    testJson(){
+      return JSON.stringify({
+        firstName: this.form_info.firstName,
+        lastName: this.form_info.lastName,
+        email: this.form_info.email,
+        password: this.form_info.password,
+        phoneNumber: this.form_info.phoneNumber})
     }
-  }*/
+  }
 
 
@@ -49 +80 @@
     <div class="row justify-content-center">
 
+<!--      <form @submit.prevent="register" method="POST">-->
+<!--      <form v-bind:action="wholeUrl" method="POST">-->
 
   <div class="col-3">
-    <form @submit.prevent="register()" method="POST">
+    <form @submit.prevent="register" method="POST">
       <label for="name" class="form-label" >Name</label>
-      <input v-model="form_info.firstName" type="text" id="name" name="firstName" class="form-control" placeholder="Name" required>
+      <input v-model="this.form_info.firstName" type="text" id="name" name="firstName" class="form-control" placeholder="Name" required>
 
       <label for="surname" class="form-label">Surname</label>