Changeset 7d8eeab for ReserveNGo-frontend/src

Timestamp:

04/29/25 15:00:55 (3 weeks ago)

Author:

Nikola Jordanoski <nikolaj_koko@…>

Branches:

master

Children:

349551d

Parents:

bf78464 (diff), dad25fc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/nikolakoko/ReserveNGo

Location:

ReserveNGo-frontend/src

Files:

• PiniaStores/restaurantStore.js (modified) (1 diff)
• components/Project/AddRestaurant.vue (added)
• components/Project/Nav_bar_new.vue (modified) (1 diff)
• components/Project/login_.vue (modified) (1 diff)
• components/Project/register_.vue (modified) (1 diff)
• router/index.js (modified) (2 diffs)

ReserveNGo-frontend/src/PiniaStores/restaurantStore.js

@@ -24 +24 @@
       this.workingHours = workingHours
       this.availableServices = availableServices
+    },
+    newRestaurant (id) {
+      this.id = id
     }
   },

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

@@ -89 +89 @@
             <a v-if="userStore_.data.role==='UN_AUTHENTICATED'" class="btn btn-dark ms-2">Register</a>
             </router-link>
+            <router-link to="/addRestaurant">
+              <a v-if="userStore_.data.role==='ROLE_LOCAL_MANAGER' || userStore_.data.role==='ROLE_ADMIN'" class="btn btn-dark me-2">Add Restaurant</a>
+            </router-link>
             <logout_></logout_>
           </li>

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

@@ -28 +28 @@
       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
+        headers: { 'Content-Type': 'application/json'},
+        body: JSON.stringify({
+          email: this.form_info.email,
+          password: this.form_info.password,
         })
       }).then((response) => response.json())

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

@@ -36 +36 @@
 
   methods: {
-   async register() {
-     await fetch(this.wholeUrl, {
+    async register() {
+      await fetch(this.wholeUrl, {
         method: 'POST',
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        body: new URLSearchParams({
+        headers: { 'Content-Type': 'application/json' },
+        body: 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})
-      }).then((response) => response.json())
-        .then((json) => {this.userStore_.setLocalStorage(json);
-                        router.push('/')})
-          //console.log("Data received:", this.data);
+          phoneNumber: this.form_info.phoneNumber
+        })
+      })
+        .then((response) => response.json())
+        .then((json) => {
+          this.userStore_.setLocalStorage(json);
+          router.push('/');
+        });
+    //console.log("Data received:", this.data);
           //this.userStore_.setLocalStorage(json)
         //console.log(json)

ReserveNGo-frontend/src/router/index.js

@@ -8 +8 @@
 import my_reservations from '@/components/Project/My_reservations.vue'
 import Locale_ from '@/components/Project/Locale_.vue'
+import AddRestaurant from "@/components/Project/AddRestaurant.vue";
 
 const router = createRouter({
@@ -45 +46 @@
       name: 'more_details',
       component: Locale_,
+    },
+    {
+      path: '/addRestaurant',
+      name: 'addRestaurant',
+      component: AddRestaurant,
     }
   ],