Index: ReserveNGo-frontend/src/Api_Classes/HttpClient.js =================================================================== --- ReserveNGo-frontend/src/Api_Classes/HttpClient.js (revision 873cdd028d645074a037f50fdff0319236ef3769) +++ ReserveNGo-frontend/src/Api_Classes/HttpClient.js (revision 2a3dc2a5a6f89e87eb25b82003b95412e3446b1e) @@ -1,73 +1,63 @@ - - - - export class HttpClient { - constructor(baseURL) { - this.baseURL = baseURL; + this.baseURL = baseURL } - async baseFetch(endpoint, { method = 'GET', headers = {}, body, queryParams } = {}) { - const url = new URL(endpoint, this.baseURL); - - + const url = new URL(endpoint, this.baseURL) if (queryParams) { - Object.entries(queryParams).forEach(([k, v]) => url.searchParams.append(k, v)); + Object.entries(queryParams).forEach(([k, v]) => url.searchParams.append(k, v)) } - const finalHeaders = { ...headers }; + const finalHeaders = { ...headers } //Crutial code, adds the jwt, maybe to be changed later. - const nonParsed = localStorage.getItem('userData'); + const nonParsed = localStorage.getItem('userData') if (nonParsed) { - const token = JSON.parse(nonParsed).token; + const token = JSON.parse(nonParsed).token if (token) { - finalHeaders['Authorization'] = `Bearer ${token}`; + finalHeaders['Authorization'] = `Bearer ${token}` } } - const config = { method, headers: finalHeaders, body }; + const config = { method, headers: finalHeaders, body } - /* console.warn(config);*/ + /* console.warn(config);*/ - /* console.warn(url.toString());*/ + /* console.warn(url.toString());*/ - const res = await fetch(url.toString(), config); - const clonedRes = res.clone(); + const res = await fetch(url.toString(), config) + const clonedRes = res.clone() - const contentType = res.headers.get('Content-Type') || ''; + const contentType = res.headers.get('Content-Type') || '' - let parsed; + let parsed try { if (contentType.includes('application/json')) { - parsed = await res.json(); + parsed = await res.json() } else if (contentType.startsWith('text/')) { - parsed = await res.text(); + parsed = await res.text() } else { - parsed = await res.blob(); + parsed = await res.blob() } } catch (err) { - console.warn('Error parsing response body:', err); - parsed = null; + console.warn('Error parsing response body:', err) + parsed = null } if (!res.ok) { - const error = new Error(`Request failed with status ${res.status}`); - error.status = res.status; - error.statusText = res.statusText; - error.url = url.toString(); - error.response = parsed; // <--- THIS LINE - error.rawResponse = clonedRes; - throw error; + const error = new Error(`Request failed with status ${res.status}`) + error.status = res.status + error.statusText = res.statusText + error.url = url.toString() + error.response = parsed // <--- THIS LINE + error.rawResponse = clonedRes + throw error } - return parsed; + return parsed } - - json(endpoint, method, data = null, options = {}) { @@ -80,5 +70,5 @@ }, body: data ? JSON.stringify(data) : undefined, - }); + }) } @@ -91,5 +81,5 @@ ...(options.headers || {}), }, - }); + }) } @@ -99,55 +89,55 @@ method: 'GET', body: undefined, - }; - return this.baseFetch(endpoint, config); + } + return this.baseFetch(endpoint, config) } post(endpoint, data, options = {}) { - return this.json(endpoint, 'POST', data, options); + return this.json(endpoint, 'POST', data, options) } put(endpoint, data, options = {}) { - return this.json(endpoint, 'PUT', data, options); + return this.json(endpoint, 'PUT', data, options) } delete(endpoint, options = {}) { - return this.json(endpoint, 'DELETE', null, options); + return this.json(endpoint, 'DELETE', null, options) } upload(endpoint, formData, options = {}) { - return this.form(endpoint, 'POST', formData, options); + return this.form(endpoint, 'POST', formData, options) } async fetchImageAsBase64(imagePath) { try { - console.warn(`Fetching image as Base64 using baseFetch from: ${imagePath}`); - const blob = await this.baseFetch(imagePath, { method: 'GET' }); + console.warn(`Fetching image as Base64 using baseFetch from: ${imagePath}`) + const blob = await this.baseFetch(imagePath, { method: 'GET' }) // Ensure that the response is indeed a Blob if (!(blob instanceof Blob)) { - throw new Error("Expected a Blob response, but received a different type. Check Content-Type header."); + throw new Error( + 'Expected a Blob response, but received a different type. Check Content-Type header.', + ) } return new Promise((resolve, reject) => { - const reader = new FileReader(); + const reader = new FileReader() reader.onloadend = () => { if (typeof reader.result === 'string') { - resolve(reader.result); // This is the base64 string + resolve(reader.result) // This is the base64 string } else { - reject(new Error("FileReader did not return a string result for Base64 conversion.")); + reject(new Error('FileReader did not return a string result for Base64 conversion.')) } - }; + } reader.onerror = (error) => { - console.error("FileReader error:", error); - reject(new Error("Failed to read image as Base64.")); - }; - reader.readAsDataURL(blob); // Convert blob to base64 data URL - }); - + console.error('FileReader error:', error) + reject(new Error('Failed to read image as Base64.')) + } + reader.readAsDataURL(blob) // Convert blob to base64 data URL + }) } catch (err) { - console.error("Error fetching or converting image to Base64:", err); - throw err; // Re-throw the error for the caller to handle + console.error('Error fetching or converting image to Base64:', err) + throw err // Re-throw the error for the caller to handle } } - } Index: ReserveNGo-frontend/src/components/Project/Restaurant/events_carousel.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Restaurant/events_carousel.vue (revision 873cdd028d645074a037f50fdff0319236ef3769) +++ ReserveNGo-frontend/src/components/Project/Restaurant/events_carousel.vue (revision 2a3dc2a5a6f89e87eb25b82003b95412e3446b1e) @@ -1,81 +1,20 @@ Index: ReserveNGo-frontend/src/components/Project/Restaurant/local_in_local_listing.vue =================================================================== --- ReserveNGo-frontend/src/components/Project/Restaurant/local_in_local_listing.vue (revision 873cdd028d645074a037f50fdff0319236ef3769) +++ ReserveNGo-frontend/src/components/Project/Restaurant/local_in_local_listing.vue (revision 2a3dc2a5a6f89e87eb25b82003b95412e3446b1e) @@ -3,4 +3,5 @@ import { restaurantStore } from '@/PiniaStores/restaurantStore.js' import { useUtility } from '@/repository/utility.ts' +import {config} from '@/constants/Api_config.js' export default { @@ -49,4 +50,10 @@ }, }, + computed: { + locale_logo() { + const url = new URL(this.local.logo, config.API_BASE_URL) + return url.toString(); + } + } } @@ -64,5 +71,5 @@
Logo { - return this.httpClient.upload(this.endpoint + '/upload-logo', formData) + uploadLogo(formData: FormData): Promise { + return this.httpClient.upload('upload-logo', formData) } - - } - -export const useLocalManager = new LocalManager(BASE_API_URL, "/api/local-manager") +export const useLocalManager = new LocalManager(BASE_API_URL + '/api/local-manager/', ) Index: ReserveNGo-frontend/src/repository/utility.ts =================================================================== --- ReserveNGo-frontend/src/repository/utility.ts (revision 873cdd028d645074a037f50fdff0319236ef3769) +++ ReserveNGo-frontend/src/repository/utility.ts (revision 2a3dc2a5a6f89e87eb25b82003b95412e3446b1e) @@ -18,4 +18,5 @@ + }