y0rune/frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added splitting groups into lectures and classes

Browse Source
This commit is contained in:
Maciek Głowacki
2020-10-01 19:51:06 +02:00
parent 8b812dcbed
commit d6aa58fd34
5 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/contexts/CoursesProvider.tsx
View File

@ -5,7 +5,7 @@ import axios from 'axios';
interface CourseContext {
courses: Array<Course>;
basket: Array<Basket>;
addToBasket: (courses: Basket) => void;
addToBasket: (courses: Course) => void;
addGroup: (group: Group, id: number) => void;
deleteFromBasket: (id: number) => void;
}
@ -20,10 +20,17 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
const [courses, setCourses] = useState<Array<Course>>([]);
const [basket, setBasket] = useState<Array<Basket>>([]);
const addToBasket = (course: Basket) => setBasket([...basket, course]);
const deleteFromBasket = (id: number) => setBasket(basket.filter(course => course.id !== id));
const addToBasket = (course: Course) => {
const courseToBasket = {
name: course.name,
id: course.id,
classes: course.classes[0],
lecture: course.lectures !== undefined ? course.lectures[0] : undefined,
} as Basket;
setBasket([...basket, courseToBasket]);
};
const deleteFromBasket = (id: number) => setBasket(basket.filter((course) => course.id !== id));
useEffect(() => {
console.log('BASKET');
@ -48,14 +55,27 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
useEffect(() => {
const fetchData = async () => {
const { data: courses } = await axios.get(`${process.env.REACT_APP_API_URL}/getCoursesWithGroups`);
const { data } = await axios.get<Array<{ id: string; name: string; groups: Array<Group> }>>(
`${process.env.REACT_APP_API_URL}/api/v1/courses/getCoursesWithGroups`,
);
const courses = data.map(({ id, name, groups }) => ({
id: parseInt(id),
name,
lectures: groups.filter(({ type }) => type === GroupType.LECTURE),
classes: groups.filter(({ type }) => type === GroupType.CLASS),
})) as Array<Course>;
console.log('courses mapped');
console.log(courses);
courses.sort((a: Course, b: Course) => (a.name > b.name ? 1 : -1));
setCourses(courses);
};
fetchData();
}, []);
return (
<coursesContext.Provider value={{ courses, basket, addToBasket, addGroup, deleteFromBasket }}>{children}</coursesContext.Provider>
<coursesContext.Provider value={{ courses, basket, addToBasket, addGroup, deleteFromBasket }}>
{children}
</coursesContext.Provider>
);
};