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
4 changes: 3 additions & 1 deletion front-end/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ dist-ssr

.env*

*.pem
*.pem

vercel*
2 changes: 1 addition & 1 deletion front-end/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "vite",
"prebuild": "node copyCmaps.js && node vercelRewrite.js",
"prebuild": "node copyCmaps.js",
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview"
Expand Down
51 changes: 35 additions & 16 deletions front-end/src/pages/professor/home/modal/CourseModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,40 @@ const makeFullUniversity = (university: string) => {
return university;
};

const checkScheduleError = (schedules: CourseForm['schedule']): boolean => {
let isScheduleError = false;

schedules.forEach((schedule, index) => {
if (isScheduleError) return;

if (schedule.day === '') {
isScheduleError = true;
}
if (!timeRegex.test(schedule.start) || !timeRegex.test(schedule.end)) {
isScheduleError = true;
}
if (schedule.start >= schedule.end) {
isScheduleError = true;
}

schedules.forEach((otherSchedule, otherIndex) => {
if (isScheduleError) return;

if (index >= otherIndex) return;

if (
schedule.day === otherSchedule.day &&
schedule.start < otherSchedule.end &&
schedule.end > otherSchedule.start
) {
isScheduleError = true;
}
});
});

return isScheduleError;
};

const checkFormError = (
courseError: CourseError,
courseForm: CourseForm
Expand All @@ -77,22 +111,7 @@ const checkFormError = (
return true;
}

let isScheduleError = false;
courseForm.schedule.forEach((schedule) => {
if (isScheduleError) return;

if (schedule.day === '') {
isScheduleError = true;
}
if (!timeRegex.test(schedule.start) || !timeRegex.test(schedule.end)) {
isScheduleError = true;
}
if (schedule.start >= schedule.end) {
isScheduleError = true;
}
});

return isScheduleError;
return checkScheduleError(courseForm.schedule);
};

const CourseModal = ({ course, onSubmit, onClose }: CourseModalProps) => {
Expand Down
16 changes: 10 additions & 6 deletions front-end/src/pages/professor/home/modal/components/TimeInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ const TimeInput = ({ time, setTime }: TimeInputProps) => {
setLocalHour('00');
setTime(`00:${localMinute}`);
} else if (parseInt(inputHour) > 23) {
setLocalHour('23');
setTime(`23:${localMinute}`);
} else {
setTime(
`${parseInt(inputHour).toString().padStart(2, '0')}:${localMinute}`
);
const parsedHour = parseInt(inputHour).toString().padStart(2, '0');
setLocalHour(parsedHour);
setTime(`${parsedHour}:${localMinute}`);
}
}}
/>
Expand All @@ -64,11 +65,14 @@ const TimeInput = ({ time, setTime }: TimeInputProps) => {
setLocalMinute('00');
setTime(`${localHour}:00`);
} else if (parseInt(inputMinute) > 59) {
setLocalMinute('59');
setTime(`${localHour}:59`);
} else {
setTime(
`${localHour}:${parseInt(inputMinute).toString().padStart(2, '0')}`
);
const parsedMinute = parseInt(inputMinute)
.toString()
.padStart(2, '0');
setLocalMinute(parsedMinute);
setTime(`${localHour}:${parsedMinute}`);
}
}}
/>
Expand Down
12 changes: 0 additions & 12 deletions front-end/vercel.json

This file was deleted.

29 changes: 0 additions & 29 deletions front-end/vercelRewrite.js

This file was deleted.