Index: ReserveNGo-frontend/src/PiniaStores/UserStore.js =================================================================== --- ReserveNGo-frontend/src/PiniaStores/UserStore.js (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ ReserveNGo-frontend/src/PiniaStores/UserStore.js (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) @@ -3,99 +3,91 @@ export const userStore = defineStore('userStore', { - state() { return { data: { id: 0, - firstName: "", - lastName: "", - email: "", - phoneNumber: "", - role: "UN_AUTHENTICATED", + firstName: '', + lastName: '', + email: '', + phoneNumber: '', + role: 'UN_AUTHENTICATED', token: null, logoUrl: null, - profilePictureBase64Encoded: null - } - + profilePictureBase64Encoded: null, + }, } }, actions: { - setLocalStorage(jsonObject) { - this.data = jsonObject //this.data.profilePictureBase64Encoded = if (this.data.logoUrl != null) { - this.setProfilePicturePathToLocalStorage(this.data.logoUrl); + this.setProfilePicturePathToLocalStorage(this.data.logoUrl) } - - localStorage.setItem('userData', JSON.stringify(jsonObject)); - + localStorage.setItem('userData', JSON.stringify(jsonObject)) }, removeProfilePictureFromLocaleStorage() { - this.data.logoUrl = null; - localStorage.setItem('userData', JSON.stringify(this.data)); + this.data.logoUrl = null + localStorage.setItem('userData', JSON.stringify(this.data)) }, setNewEditedDataToLocalStorage(jsonObject) { - const {firstName, lastName, phoneNumber} = jsonObject; - this.data.firstName = firstName; - this.data.lastName = lastName; - this.data.phoneNumber = phoneNumber; + const { firstName, lastName, phoneNumber } = jsonObject + this.data.firstName = firstName + this.data.lastName = lastName + this.data.phoneNumber = phoneNumber - localStorage.setItem('userData', JSON.stringify(this.data)); + localStorage.setItem('userData', JSON.stringify(this.data)) }, setNewEmailToLocalStorage(jsonObject) { - const {email, jwt} = jsonObject; - this.data.email = email; - this.data.token = jwt; + const { email, jwt } = jsonObject + this.data.email = email + this.data.token = jwt - localStorage.setItem('userData', JSON.stringify(this.data)); + localStorage.setItem('userData', JSON.stringify(this.data)) }, setProfilePicturePathToLocalStorage(profilePicturePath) { - this.data.logoUrl = profilePicturePath; - localStorage.setItem('userData', JSON.stringify(this.data)); + this.data.logoUrl = profilePicturePath + localStorage.setItem('userData', JSON.stringify(this.data)) }, getLocalStorage() { - let nonparsed = localStorage.getItem('userData'); + let nonparsed = localStorage.getItem('userData') if (nonparsed !== null) { - this.data = JSON.parse(nonparsed); + this.data = JSON.parse(nonparsed) } }, clearLocalStorage() { - - this.data = { + this.data = { id: 0, - firstName: "", - lastName: "", - email: "", - phoneNumber: "", - role: "UN_AUTHENTICATED", + firstName: '', + lastName: '', + email: '', + phoneNumber: '', + role: 'UN_AUTHENTICATED', token: null, logoUrl: null, - profilePictureBase64Encoded: null + profilePictureBase64Encoded: null, } - localStorage.setItem('userData', JSON.stringify(this.data)); - - } + localStorage.setItem('userData', JSON.stringify(this.data)) + }, }, getters: { - getToken(){ - return 'Bearer ' + this.data.token; + getToken() { + return 'Bearer ' + this.data.token }, - isLocaleManager(){ - return this.data.role === "ROLE_LOCAL_MANAGER"; + isLocaleManager() { + return this.data.role === 'ROLE_LOCAL_MANAGER' }, - isLocaleWorker(){ - return this.data.role === "ROLE_LOCAL_WORKER"; + isLocaleWorker() { + return this.data.role === 'ROLE_LOCAL_WORKER' }, - isCustomer(){ - return this.data.role === "ROLE_CUSTOMER"; + isCustomer() { + return this.data.role === 'ROLE_CUSTOMER' }, - isAdmin(){ - return this.data.role === "ROLE_ADMIN"; - } - } + isAdmin() { + return this.data.role === 'ROLE_ADMIN' + }, + }, }) Index: ReserveNGo-frontend/src/PiniaStores/restaurantStore.js =================================================================== --- ReserveNGo-frontend/src/PiniaStores/restaurantStore.js (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ ReserveNGo-frontend/src/PiniaStores/restaurantStore.js (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) @@ -1,10 +1,6 @@ - - -import {defineStore} from 'pinia' - +import { defineStore } from 'pinia' export const restaurantStore = defineStore('restaurantStore', { - - state(){ + state() { return { id: '', @@ -24,5 +20,5 @@ }, actions: { - setRestaurant (id, name, description, address, workingHours, logo, averageRating) { + setRestaurant(id, name, description, address, workingHours, logo, averageRating) { this.id = id this.name = name @@ -33,7 +29,21 @@ this.ratingAvg = averageRating }, - setRestaurantDetails (id, name, description, address, workingHours, availableServices, averageRating, events, restaurantPhotos, menuPhoto, menuLink, contact, logo) { - this.id=id; - this.name = name; + setRestaurantDetails( + id, + name, + description, + address, + workingHours, + availableServices, + averageRating, + events, + restaurantPhotos, + menuPhoto, + menuLink, + contact, + logo, + ) { + this.id = id + this.name = name this.description = description this.address = address @@ -48,16 +58,11 @@ this.logo = logo }, - newRestaurant (id) { + newRestaurant(id) { this.id = id }, - clearRestaurant () { + clearRestaurant() { this.setRestaurant(null) - } + }, }, - getters: { - - } - - - + getters: {}, }) Index: serveNGo-frontend/src/assets/logo.svg =================================================================== --- ReserveNGo-frontend/src/assets/logo.svg (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ (revision ) @@ -1,1 +1,0 @@ - Index: ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ ReserveNGo-frontend/src/components/Project/Nav_bar_new.vue (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) @@ -38,6 +38,8 @@ class="navbar-brand d-flex align-items-center" > - Logo - Reserve And Go + Logo + + ReserveNGo + @@ -46,6 +48,8 @@ class="navbar-brand d-flex align-items-center" > - Logo - Reserve And Go + Logo + + ReserveNGo + @@ -80,5 +84,7 @@
  • - Dashboard + Dashboard
    • @@ -122,3 +128,13 @@ color: rgba(255, 255, 255, 0.6) !important; } + +.brand-accent { + letter-spacing: 1px; + padding-left: 5px; + color: #fff; +} + +.brand-n { + color: #f55845; +} Index: ReserveNGo-frontend/src/components/Project/Testing.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Testing.vue (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ ReserveNGo-frontend/src/components/Project/Testing.vue (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) @@ -1,40 +1,30 @@ - + Index: ReserveNGo-frontend/src/components/interface/Interfaces.js =================================================================== --- ReserveNGo-frontend/src/components/interface/Interfaces.js (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) +++ ReserveNGo-frontend/src/components/interface/Interfaces.js (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) @@ -0,0 +1,14 @@ +/* + +class CustomError extends Error { + + + + constructor(message) { + super(message) + } + + + +} +a*/ Index: serveNGo-frontend/src/components/interface/interfejsi.js =================================================================== --- ReserveNGo-frontend/src/components/interface/interfejsi.js (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ (revision ) @@ -1,14 +1,0 @@ -/* - -class CustomError extends Error { - - - - constructor(message) { - super(message) - } - - - -} -a*/ Index: ReserveNGo-frontend/src/constants/Api_config.js =================================================================== --- ReserveNGo-frontend/src/constants/Api_config.js (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ ReserveNGo-frontend/src/constants/Api_config.js (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) @@ -8,5 +8,5 @@ // If hostLike already includes protocol, host, and maybe port/path const u = new URL(hostLike) - // If port is not specified in hostLike, apply provided port + // If the port is not specified in hostLike, apply the provided port if (!u.port && portLike) { u.port = String(portLike) Index: ReserveNGo-frontend/src/mixins/utilFunctions.js =================================================================== --- ReserveNGo-frontend/src/mixins/utilFunctions.js (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ ReserveNGo-frontend/src/mixins/utilFunctions.js (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) @@ -2,32 +2,29 @@ let [date, time] = dateTime.split('T') let timeSplit = time.split(':') - time = timeSplit[0] + ":" + timeSplit[1] - return {date: date, time: time} + time = timeSplit[0] + ':' + timeSplit[1] + return { date: date, time: time } } - export function transformArray(arr, howMany, doDateEdit = true) { - - const copiedArray = JSON.parse(JSON.stringify(arr)); + const copiedArray = JSON.parse(JSON.stringify(arr)) if (doDateEdit) { - copiedArray.forEach(item => { - item.eventEnd = transformDate(item.eventEnd) - item.eventStart = transformDate(item.eventStart) - }) + copiedArray.forEach((item) => { + item.eventEnd = transformDate(item.eventEnd) + item.eventStart = transformDate(item.eventStart) + }) } let newArray = [] - for (let i = 0; i()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ - ); - return emailRegex.test(email); + /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/, + ) + return emailRegex.test(email) } Index: ReserveNGo-frontend/src/router/index.js =================================================================== --- ReserveNGo-frontend/src/router/index.js (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ ReserveNGo-frontend/src/router/index.js (revision 2be93d21c7af6b3d88433242e73e6c8075d49c83) @@ -1,4 +1,3 @@ import { createRouter, createWebHistory } from 'vue-router' - import home_ from '@/components/Project/Restaurant/home_.vue' Index: serveNGo-frontend/src/stores/counter.js =================================================================== --- ReserveNGo-frontend/src/stores/counter.js (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ (revision ) @@ -1,12 +1,0 @@ -import { ref, computed } from 'vue' -import { defineStore } from 'pinia' - -export const useCounterStore = defineStore('counter', () => { - const count = ref(0) - const doubleCount = computed(() => count.value * 2) - function increment() { - count.value++ - } - - return { count, doubleCount, increment } -}) Index: serveNGo-frontend/src/views/AboutView.vue =================================================================== --- ReserveNGo-frontend/src/views/AboutView.vue (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ (revision ) @@ -1,15 +1,0 @@ - - - Index: serveNGo-frontend/src/views/HomeView.vue =================================================================== --- ReserveNGo-frontend/src/views/HomeView.vue (revision 10c66f20ff8b31e41036536605e760856650ed34) +++ (revision ) @@ -1,9 +1,0 @@ - - -