From 2892b33de6bac5da27e090dab21f0b69dc44b19e Mon Sep 17 00:00:00 2001 From: DanielTQuach Date: Mon, 9 Jun 2025 00:57:20 -0700 Subject: [PATCH 1/5] Advertisements remove axios --- src/APIFunctions/Advertisement.js | 104 ++++++++++++++++++------------ 1 file changed, 64 insertions(+), 40 deletions(-) diff --git a/src/APIFunctions/Advertisement.js b/src/APIFunctions/Advertisement.js index 871accdd4..80d919032 100644 --- a/src/APIFunctions/Advertisement.js +++ b/src/APIFunctions/Advertisement.js @@ -1,70 +1,94 @@ -import axios from 'axios'; import { ApiResponse } from './ApiResponses'; import { BASE_API_URL } from '../Enums'; export async function getAd() { let status = new ApiResponse(); - await axios.get(BASE_API_URL + '/api/Advertisement/') - .then(res => { - status.responseData = res.data; - }).catch(err => { - status.responseData = err; + try { + const res = await fetch (BASE_API_URL + '/api/Advertisement/') + if (res.ok) { + status.responseData = await res.json(); + } else { status.error = true; - }); + } + + } catch (err) { + status.responseData = err; + status.error = true; + } return status; } export async function getAds(token) { let status = new ApiResponse(); - await axios.get(BASE_API_URL + '/api/Advertisement/getAllAdvertisements', - { - headers: { - Authorization: `Bearer ${token}` + try { + const res = await fetch(BASE_API_URL + '/api/Advertisement/getAllAdvertisements', + { + method: 'GET', + headers: { + Authorization: `Bearer ${token}` + } } - } - ) - .then(res => { - status.responseData = res.data; - }).catch(err => { - status.responseData = err; + ); + if (res.ok) { + status.responseData = await res.json(); + } else { status.error = true; - }); + } + } catch (err) { + status.responseData = err; + status.error = true; + } return status; } export async function createAd(newAd, token) { let status = new ApiResponse(); - await axios.post(BASE_API_URL + '/api/Advertisement/createAdvertisement', - newAd, - { - headers: { - Authorization: `Bearer ${token}` + try { + const res = await fetch(BASE_API_URL + '/api/Advertisement/createAdvertisement', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${token}` + }, + body: JSON.stringify(newAd) } - }) - .then(res => { - status.responseData = res.data; - }).catch(err => { - status.responseData = err; + ); + if (res.ok) { + status.responseData = await res.json(); + } else { status.error = true; - }); + } + + } catch (err) { + status.responseData = err; + status.error = true; + } return status; } export async function deleteAd(newAd, token) { let status = new ApiResponse(); - await axios.post(BASE_API_URL + '/api/Advertisement/deleteAdvertisement', - newAd, - { - headers: { - Authorization: `Bearer ${token}` + try { + const res = await fetch(BASE_API_URL + '/api/Advertisement/deleteAdvertisement', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${token}` + }, + body: JSON.stringify(newAd) } - }) - .then(res => { - status.responseData = res.data; - }).catch(err => { - status.responseData = err; + ); + if (res.ok) { + status.responseData = await res.json(); + } else { status.error = true; - }); + } + } catch (err) { + status.responseData = err; + status.error = true; + } return status; } From fa2926f4b3d799f1971d871d7f2c66a6add245af Mon Sep 17 00:00:00 2001 From: DanielTQuach Date: Mon, 9 Jun 2025 01:13:06 -0700 Subject: [PATCH 2/5] advertisement consistency fix --- src/APIFunctions/Advertisement.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/APIFunctions/Advertisement.js b/src/APIFunctions/Advertisement.js index 80d919032..55448d66f 100644 --- a/src/APIFunctions/Advertisement.js +++ b/src/APIFunctions/Advertisement.js @@ -7,11 +7,11 @@ export async function getAd() { try { const res = await fetch (BASE_API_URL + '/api/Advertisement/') if (res.ok) { - status.responseData = await res.json(); + const result = await res.json(); + status.responseData = result; } else { status.error = true; } - } catch (err) { status.responseData = err; status.error = true; @@ -56,7 +56,8 @@ export async function createAd(newAd, token) { } ); if (res.ok) { - status.responseData = await res.json(); + const result = await res.json(); + status.responseData = result; } else { status.error = true; } @@ -82,7 +83,8 @@ export async function deleteAd(newAd, token) { } ); if (res.ok) { - status.responseData = await res.json(); + const result = await res.json(); + status.responseData = res; } else { status.error = true; } From 48425a04bce2e409e308e994a082fca2dc2c5260 Mon Sep 17 00:00:00 2001 From: DanielTQuach Date: Thu, 12 Jun 2025 00:38:42 -0700 Subject: [PATCH 3/5] add semicolon --- package-lock.json | 143 ------------------------------ src/APIFunctions/Advertisement.js | 2 +- 2 files changed, 1 insertion(+), 144 deletions(-) diff --git a/package-lock.json b/package-lock.json index 138a35e04..9caefcba1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5517,17 +5517,6 @@ "node": ">=0.6.19" } }, - "node_modules/btoa": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", - "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==", - "bin": { - "btoa": "bin/btoa.js" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", @@ -18568,114 +18557,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map-explorer": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.5.3.tgz", - "integrity": "sha512-qfUGs7UHsOBE5p/lGfQdaAj/5U/GWYBw2imEpD6UQNkqElYonkow8t+HBL1qqIl3CuGZx7n8/CQo4x1HwSHhsg==", - "dependencies": { - "btoa": "^1.2.1", - "chalk": "^4.1.0", - "convert-source-map": "^1.7.0", - "ejs": "^3.1.5", - "escape-html": "^1.0.3", - "glob": "^7.1.6", - "gzip-size": "^6.0.0", - "lodash": "^4.17.20", - "open": "^7.3.1", - "source-map": "^0.7.4", - "temp": "^0.9.4", - "yargs": "^16.2.0" - }, - "bin": { - "sme": "bin/cli.js", - "source-map-explorer": "bin/cli.js" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/source-map-explorer/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/source-map-explorer/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/source-map-explorer/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/source-map-explorer/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/source-map-explorer/node_modules/open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", - "dependencies": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/source-map-explorer/node_modules/source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/source-map-explorer/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", @@ -19587,18 +19468,6 @@ "bintrees": "1.0.2" } }, - "node_modules/temp": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz", - "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", - "dependencies": { - "mkdirp": "^0.5.1", - "rimraf": "~2.6.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/temp-dir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", @@ -19607,18 +19476,6 @@ "node": ">=8" } }, - "node_modules/temp/node_modules/rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/tempy": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz", diff --git a/src/APIFunctions/Advertisement.js b/src/APIFunctions/Advertisement.js index 55448d66f..e539be9e5 100644 --- a/src/APIFunctions/Advertisement.js +++ b/src/APIFunctions/Advertisement.js @@ -5,7 +5,7 @@ import { BASE_API_URL } from '../Enums'; export async function getAd() { let status = new ApiResponse(); try { - const res = await fetch (BASE_API_URL + '/api/Advertisement/') + const res = await fetch (BASE_API_URL + '/api/Advertisement/'); if (res.ok) { const result = await res.json(); status.responseData = result; From 628811df83ba49d04caa3f283c983bb3220356d9 Mon Sep 17 00:00:00 2001 From: DanielTQuach Date: Sat, 21 Jun 2025 17:33:37 -0700 Subject: [PATCH 4/5] Merge branch 'dev' of https://github.com/SCE-Development/Clark into advert-rem-axios From eb628f5b58e875e264e07a03330ba097efc47259 Mon Sep 17 00:00:00 2001 From: DanielTQuach Date: Sat, 21 Jun 2025 17:40:05 -0700 Subject: [PATCH 5/5] empty ad fix --- api/main_endpoints/routes/Advertisement.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/main_endpoints/routes/Advertisement.js b/api/main_endpoints/routes/Advertisement.js index f56114e23..93a199e4a 100644 --- a/api/main_endpoints/routes/Advertisement.js +++ b/api/main_endpoints/routes/Advertisement.js @@ -13,7 +13,7 @@ router.get('/', async (req, res) => { Advertisement.findOne().skip(random) .then(items => { - res.status(OK).send(items); + res.status(OK).send(items || {}); }) .catch(error => { res.sendStatus(BAD_REQUEST);