Skip to content
Closed
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
8 changes: 4 additions & 4 deletions src/APIFunctions/Advertisement.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { BASE_API_URL } from '../Enums';

export async function getAd() {
let status = new ApiResponse();
await axios.get(BASE_API_URL + '/api/Advertisement/')
await axios.get(BASE_API_URL + 'api/Advertisement/')
.then(res => {
status.responseData = res.data;
}).catch(err => {
Expand All @@ -17,7 +17,7 @@ export async function getAd() {

export async function getAds(token) {
let status = new ApiResponse();
await axios.get(BASE_API_URL + '/api/Advertisement/getAllAdvertisements',
await axios.get(BASE_API_URL + 'api/Advertisement/getAllAdvertisements',
{
headers: {
Authorization: `Bearer ${token}`
Expand All @@ -35,7 +35,7 @@ export async function getAds(token) {

export async function createAd(newAd, token) {
let status = new ApiResponse();
await axios.post(BASE_API_URL + '/api/Advertisement/createAdvertisement',
await axios.post(BASE_API_URL + 'api/Advertisement/createAdvertisement',
newAd,
{
headers: {
Expand All @@ -53,7 +53,7 @@ export async function createAd(newAd, token) {

export async function deleteAd(newAd, token) {
let status = new ApiResponse();
await axios.post(BASE_API_URL + '/api/Advertisement/deleteAdvertisement',
await axios.post(BASE_API_URL + 'api/Advertisement/deleteAdvertisement',
newAd,
{
headers: {
Expand Down
66 changes: 29 additions & 37 deletions src/Pages/Advertisement/AdvertisementAdmin.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@ export default function AdvertisementAdmin(props) {

const [ads, setAds] = useState([]);
const [message, setMessage] = useState('');
const [year, setYear] = useState();
const [month, setMonth] = useState();
const [day, setDay] = useState();
// const [year, setYear] = useState();
// const [month, setMonth] = useState();
// const [day, setDay] = useState();
const [expireDate, setExpireDate] = useState();
// const [expDate, setExpDate] = useState({
// year: '',
// month: '',
// day: ''
// });

async function getAdsFromDB() {
const adsFromDB = await getAds(props.user.token);
Expand All @@ -19,19 +25,22 @@ export default function AdvertisementAdmin(props) {

async function createAdHandler() {
// make sure empty inputs are properly set as undefined if empty
if (year === '') {
setYear(undefined);
}
if (month === '') {
setMonth(undefined);
}
if (day === '') {
setDay(undefined);
}
// if (year === '') {
// setYear(undefined);
// }
// if (month === '') {
// setMonth(undefined);
// }
// if (day === '') {
// setDay(undefined);
// }

let expireDate = new Date(year, month - 1, day);
if (isNaN(expireDate.getTime())) {
expireDate = undefined;
// let expireDate = new Date(year, month - 1, day);
// if (isNaN(expireDate.getTime())) {
// expireDate = undefined;
// }
if(expireDate === null){
setExpireDate(undefined);
}

await createAd({
Expand Down Expand Up @@ -100,27 +109,10 @@ export default function AdvertisementAdmin(props) {
</div>
<div className="flex items-center space-x-4 mb-6">
<input
className="flex-1 text-sm input input-bordered sm:text-base"
type="text"
placeholder="Year"
onChange={event => {
setYear(event.target.value);
}}
/>
<input
className="flex-1 text-sm input input-bordered sm:text-base"
type="text"
placeholder="Month"
onChange={event => {
setMonth(event.target.value);
}}
/>
<input
className="flex-1 text-sm input input-bordered sm:text-base"
type="text"
placeholder="Day"
onChange={event => {
setDay(event.target.value);
className='flex-1 text-sm input input-bordered sm:text-base'
type='date'
onChange={ event => {
setExpireDate(event.target.value);
}}
/>
<button
Expand Down Expand Up @@ -175,4 +167,4 @@ export default function AdvertisementAdmin(props) {
</div>
</div>
);
}
}