Index: ReserveNGo-frontend/index.html =================================================================== --- ReserveNGo-frontend/index.html (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/index.html (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -1,16 +1,24 @@ - - - - - RnG - - - - - -
- - + + + + + RnG + + + + + + + + + + + + + +
+ + Index: ReserveNGo-frontend/src/App.vue =================================================================== --- ReserveNGo-frontend/src/App.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/App.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -44,5 +44,5 @@ overflow: hidden; margin-top: 80px; - background: #fbfff1; + background: #f3f5f8; padding-bottom: 80px; } Index: ReserveNGo-frontend/src/PiniaStores/UserStore.js =================================================================== --- ReserveNGo-frontend/src/PiniaStores/UserStore.js (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/PiniaStores/UserStore.js (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -1,6 +1,3 @@ - import { defineStore } from 'pinia' - - export const userStore = defineStore('userStore', { @@ -8,5 +5,4 @@ state() { return { - data: { id: 0, @@ -24,9 +20,6 @@ setLocalStorage(jsonObject) { - //console.log("Local Storage object", jsonObject) this.data = jsonObject - - console.log("Local Storage data", this.data.firstName, this.data.lastName) localStorage.setItem('userData', JSON.stringify(jsonObject)); @@ -68,7 +61,4 @@ } - - - }, getters: { @@ -77,9 +67,3 @@ } } - - - - - - }) Index: serveNGo-frontend/src/components/Project/Admin/AddRestaurant.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Admin/AddRestaurant.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ (revision ) @@ -1,54 +1,0 @@ - - - - - Index: ReserveNGo-frontend/src/components/Project/Admin/AdminDashboard.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Admin/AdminDashboard.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) +++ ReserveNGo-frontend/src/components/Project/Admin/AdminDashboard.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -0,0 +1,348 @@ + + + + + Index: ReserveNGo-frontend/src/components/Project/Auth/login_.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Auth/login_.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/components/Project/Auth/login_.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -1,72 +1,97 @@ Index: ReserveNGo-frontend/src/components/Project/Auth/register_.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Auth/register_.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/components/Project/Auth/register_.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -1,8 +1,6 @@ Index: ReserveNGo-frontend/src/components/Project/Customer/Profile_Page.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Customer/Profile_Page.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/components/Project/Customer/Profile_Page.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -1,8 +1,6 @@ Index: ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -10,6 +10,26 @@ return { user: userStore(), + managerLocalId:"", } }, + methods: { + fetchLocalForManager(){ + fetch("http://localhost:8080/api/local-manager/my-local",{ + method: 'GET', + headers: { + 'Content-Type': 'application/json', + Authorization: this.user.getToken + }, + }).then((res) => res.json()) + .then((data) => (this.managerLocalId = data.id)) + .catch((err) => console.log(err)); + + } + }, + mounted() { + if(this.user && this.user.data.role==="ROLE_LOCAL_MANAGER"){ + this.fetchLocalForManager(); + } + } } @@ -35,4 +55,11 @@ +
  • + Dashboard +
    • +
  • + My Restaurant +
    • +
  • @@ -49,8 +76,4 @@
  • Register -
    • - -
  • - Add Restaurant
    • @@ -71,5 +94,5 @@ .custom-background-nav{ - background-color: #8377D1; + background-color: #5EA5BC; } Index: ReserveNGo-frontend/src/components/Project/Restaurant/Locale_.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Restaurant/Locale_.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/components/Project/Restaurant/Locale_.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -47,13 +47,4 @@ }, }).catch((error) => console.log(error)) - }, - removeRestaurant() { - fetch(`http://localhost:8080/api/admin/delete/${this.locale.id}`, { - method: 'DELETE', - headers: { - Authorization: this.userStore.getToken, - }, - }).catch((error) => console.log(error)) - .then(() => this.router.push('/')) }, } @@ -144,9 +135,9 @@
    - - @@ -156,13 +147,4 @@
    - - - @@ -176,5 +158,5 @@ height: calc(100vh - 80px); overflow-y: auto; - background-color: #fbfff1; + background-color: #f3f5f8; } Index: ReserveNGo-frontend/src/components/Project/Restaurant/Locale_details.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Restaurant/Locale_details.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/components/Project/Restaurant/Locale_details.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -63,5 +63,5 @@ margin: 30px auto; border-left: 3px solid #8377D1; - background-color: #FBFFF1; + background-color: #fff; height: 100%; } Index: ReserveNGo-frontend/src/components/Project/Restaurant/Locale_listing_container.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Restaurant/Locale_listing_container.vue (revision 94ab9038341b2e160af240badc7cf95ede39c3da) +++ ReserveNGo-frontend/src/components/Project/Restaurant/Locale_listing_container.vue (revision 17c7d5e2ac72f6a02575ab961c72fc9978f0796e) @@ -1,9 +1,9 @@