Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/main_endpoints/routes/Advertisement.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
143 changes: 0 additions & 143 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

106 changes: 66 additions & 40 deletions src/APIFunctions/Advertisement.js
Original file line number Diff line number Diff line change
@@ -1,70 +1,96 @@
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) {
const result = await res.json();
status.responseData = result;
} 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) {
const result = await res.json();
status.responseData = result;
} 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) {
const result = await res.json();
status.responseData = res;
} else {
status.error = true;
});
}
} catch (err) {
status.responseData = err;
status.error = true;
}
return status;
}