-
-
+
Index: ReserveNGo-frontend/src/components/Project/Restaurant/Locale_.vue
===================================================================
--- ReserveNGo-frontend/src/components/Project/Restaurant/Locale_.vue (revision a23d112105072dfce8b11d0992c822930ec3a3b9)
+++ ReserveNGo-frontend/src/components/Project/Restaurant/Locale_.vue (revision 70fb1e8bebf3c196b424653984d95c518560ff12)
@@ -12,5 +12,5 @@
import ManagerFileInput from '@/components/Project/Utility/ManagerFileInput.vue'
import AddEventModal from '@/components/Project/Event/EditEventModal.vue'
-import {useToasts} from '@/composables/useToast.js'
+import { useToasts } from '@/composables/useToast.js'
import LoadingIcon from '@/components/Project/Utility/LoadingIcon.vue'
import { useLocales } from '@/repository/Locale'
@@ -76,5 +76,5 @@
isLogoUploading: false,
isPhotoUploading: false,
- //END UPLOADINg files state
+ //END UPLOADING files state
//loading details
@@ -83,5 +83,4 @@
isAddEventModalVisible: false,
-
//Edit Event
@@ -95,13 +94,5 @@
// Working hours edit helpers
- daysOfWeek: [
- 'MONDAY',
- 'TUESDAY',
- 'WEDNESDAY',
- 'THURSDAY',
- 'FRIDAY',
- 'SATURDAY',
- 'SUNDAY'
- ],
+ daysOfWeek: ['MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY'],
// Holds text inputs per day during edit mode, e.g. "09:00:00-17:00:00" or "Closed"
workingHoursInputs: {},
@@ -109,5 +100,4 @@
modalOpen: false,
}
-
},
computed: {
@@ -131,5 +121,5 @@
return this.locale.localPhotos.map((path) => `${config.API_BASE_URL}${path}`)
},
- logoPicture(){
+ logoPicture() {
if (!this.locale.logo) {
return 'https://cdn.vuetifyjs.com/images/profiles/default-avatar.png'
@@ -141,5 +131,5 @@
return config.API_BASE_URL + this.locale.logo
}
- }
+ },
},
@@ -151,10 +141,10 @@
this.locale.localPhotos.splice(index, 1)
let url = new URL(image)
- console.log('PHTORURL', url.pathname)
+ console.log('PHOTO-URL', url.pathname)
const localPhotosUrls = [url.pathname]
useLocalManager
.deletePhoto({ localPhotosUrls })
.then(() => {
- this.showToast("Successfully deleted a locale image")
+ this.showToast('Successfully deleted a local image')
})
.catch((error) => {
@@ -180,5 +170,5 @@
.then((data) => {
this.locale = data
- console.log("LOCALE::: WORKING HOURS DATA", this.locale.workingHours)
+ console.log('LOCAL::: WORKING HOURS DATA', this.locale.workingHours)
if (!this.locale.contact) {
this.locale.contact = { phone: '', email: '' }
@@ -189,10 +179,8 @@
this.eventsForCarousel = transformArray(this.locale.events, 2)
})
- .catch((err) => console.log('Error fetching locale data:', err))
+ .catch((err) => console.log('Error fetching local data:', err))
},
addToFavourites() {
- useCustomer
- .addFavourite(this.locale.id)
- .catch((error) => console.log(error))
+ useCustomer.addFavourite(this.locale.id).catch((error) => console.log(error))
},
uploadLogo(fileInput) {
@@ -209,12 +197,11 @@
.then(() => {
this.$refs.uploadLogoInputRef.reset()
- this.showToast("Successfully uploaded the logo")
+ this.showToast('Successfully uploaded the logo')
})
.catch((error) => {
if (error.status === 409) {
this.showToast(error.response, 'error')
- }
- else {
- this.showToast("You do not have permission to make this request", 'error')
+ } else {
+ this.showToast('You do not have permission to make this request', 'error')
}
})
@@ -237,12 +224,11 @@
this.fetchLocaleData()
this.$refs.uploadPhotoInputRef.reset()
- this.showToast("Successfully uploaded the photo")
+ this.showToast('Successfully uploaded the photo')
})
.catch((error) => {
if (error.status === 409) {
this.showToast(error.response, 'error')
- }
- else {
- this.showToast("You do not have permission to make this request", 'error')
+ } else {
+ this.showToast('You do not have permission to make this request', 'error')
}
})
@@ -265,5 +251,5 @@
},
saveLocalChanges() {
- this.isSaveChangesLoading = true;
+ this.isSaveChangesLoading = true
const payload = { ...this.locale }
if (this.isEditing) {
@@ -278,8 +264,9 @@
delete payload.eventsForCarousel
- useLocalManager.saveDetailChanges(payload)
+ useLocalManager
+ .saveDetailChanges(payload)
.then(() => {
this.cachedLocale = null
- this.showToast("Successfully updated")
+ this.showToast('Successfully updated')
this.fetchLocaleData()
})
@@ -297,5 +284,5 @@
const source = Array.isArray(this.locale.workingHours) ? this.locale.workingHours : []
const map = {}
- source.forEach(wh => {
+ source.forEach((wh) => {
if (wh && wh.dayOfWeek) {
const day = String(wh.dayOfWeek).toUpperCase()
@@ -303,5 +290,5 @@
}
})
- this.daysOfWeek.forEach(day => {
+ this.daysOfWeek.forEach((day) => {
const wh = map[day]
if (wh && wh.openTime && wh.closeTime) {
@@ -319,5 +306,6 @@
if (/^closed$/i.test(trimmed)) return { type: 'closed' }
const parts = trimmed.split('-')
- if (parts.length !== 2) return { type: 'invalid', reason: 'Expected format HH:MM:SS-HH:MM:SS' }
+ if (parts.length !== 2)
+ return { type: 'invalid', reason: 'Expected format HH:MM:SS-HH:MM:SS' }
const [from, to] = parts
const timeRegex = /^(\d{2}):(\d{2}):(\d{2})$/
@@ -325,10 +313,15 @@
const mTo = to.match(timeRegex)
if (!mFrom || !mTo) return { type: 'invalid', reason: 'Time must be HH:MM:SS' }
- const h1 = parseInt(mFrom[1], 10), m1 = parseInt(mFrom[2], 10), s1 = parseInt(mFrom[3], 10)
- const h2 = parseInt(mTo[1], 10), m2 = parseInt(mTo[2], 10), s2 = parseInt(mTo[3], 10)
- const inRange = (h, m, s) => h>=0 && h<=23 && m>=0 && m<=59 && s>=0 && s<=59
- if (!inRange(h1,m1,s1) || !inRange(h2,m2,s2)) return { type: 'invalid', reason: 'Time values out of range' }
- const sec1 = h1*3600 + m1*60 + s1
- const sec2 = h2*3600 + m2*60 + s2
+ const h1 = parseInt(mFrom[1], 10),
+ m1 = parseInt(mFrom[2], 10),
+ s1 = parseInt(mFrom[3], 10)
+ const h2 = parseInt(mTo[1], 10),
+ m2 = parseInt(mTo[2], 10),
+ s2 = parseInt(mTo[3], 10)
+ const inRange = (h, m, s) => h >= 0 && h <= 23 && m >= 0 && m <= 59 && s >= 0 && s <= 59
+ if (!inRange(h1, m1, s1) || !inRange(h2, m2, s2))
+ return { type: 'invalid', reason: 'Time values out of range' }
+ const sec1 = h1 * 3600 + m1 * 60 + s1
+ const sec2 = h2 * 3600 + m2 * 60 + s2
if (sec1 >= sec2) return { type: 'invalid', reason: 'Open time must be before close time' }
return { type: 'range', openTime: `${from}`, closeTime: `${to}` }
@@ -346,5 +339,5 @@
dayOfWeek: day,
openTime: res.openTime,
- closeTime: res.closeTime
+ closeTime: res.closeTime,
})
}
@@ -360,5 +353,5 @@
},
deleteEvent(eventId) {
- this.locale.events = this.locale.events.filter(event=>event.id !== eventId);
+ this.locale.events = this.locale.events.filter((event) => event.id !== eventId)
this.fetchLocaleData()
},
@@ -367,10 +360,9 @@
this.isModalVisible = false
},
- startEditingEvent(eventId){
- this.targetEditEvent = this.locale.events.find(event=>event.id === eventId);
- console.log("TARGET EDIT EVENT", this.targetEditEvent)
- this.isEventModalVisible = true;
- },
-
+ startEditingEvent(eventId) {
+ this.targetEditEvent = this.locale.events.find((event) => event.id === eventId)
+ console.log('TARGET EDIT EVENT', this.targetEditEvent)
+ this.isEventModalVisible = true
+ },
},
}
@@ -449,5 +441,10 @@
-
+
@@ -501,9 +498,12 @@
- Enter time as HH:MM:SS-HH:MM:SS (e.g., 09:00:00-17:30:00). Type "Closed" or leave blank for closed days.
+ Enter time as HH:MM:SS-HH:MM:SS (e.g., 09:00:00-17:30:00). Type "Closed" or
+ leave blank for closed days.
-
+
Menu
-
+
View Menu
@@ -583,9 +588,7 @@
- {{ service }}
+ {{
+ service
+ }}
No services listed
@@ -639,11 +642,14 @@
-
@@ -58,5 +67,5 @@
grid-template-columns: 1fr 1fr;
gap: 0.5rem; /* This handles the space between the images perfectly */
- /* grid-auto-rows: 50px;*/
+ /* grid-auto-rows: 50px;*/
}
@@ -67,5 +76,4 @@
gap: 0.5rem; /* This handles the space between the images perfectly */
}
-
/* --- SHARED STYLES FOR IMAGES & RESPONSIVENESS --- */
@@ -90,3 +98,4 @@
display: none;
}
-}
+}
+
Index: ReserveNGo-frontend/src/components/Project/Utility/PlusAddImage.vue
===================================================================
--- ReserveNGo-frontend/src/components/Project/Utility/PlusAddImage.vue (revision a23d112105072dfce8b11d0992c822930ec3a3b9)
+++ ReserveNGo-frontend/src/components/Project/Utility/PlusAddImage.vue (revision 70fb1e8bebf3c196b424653984d95c518560ff12)
@@ -1,45 +1,33 @@
-
+
@@ -21,8 +18,8 @@
mounted() {
setTimeout(() => {
- this.$emit('dismiss', this.id);
- }, this.duration);
+ this.$emit('dismiss', this.id)
+ }, this.duration)
},
-};
+}
Index: ReserveNGo-frontend/src/components/Project/Worker/WorkerReservationsDashboard.vue
===================================================================
--- ReserveNGo-frontend/src/components/Project/Worker/WorkerReservationsDashboard.vue (revision a23d112105072dfce8b11d0992c822930ec3a3b9)
+++ ReserveNGo-frontend/src/components/Project/Worker/WorkerReservationsDashboard.vue (revision 70fb1e8bebf3c196b424653984d95c518560ff12)
@@ -95,5 +95,5 @@
await useLocalWorker.deleteReservations({ reservationIds: this.selectedIds })
const set = new Set(this.selectedIds)
- this.reservations = this.reservations.filter(r => !set.has(r.reservationId))
+ this.reservations = this.reservations.filter((r) => !set.has(r.reservationId))
this.showToast('Selected reservations deleted successfully.', 'success')
this.cancelSelection()
@@ -206,5 +206,9 @@
-