admin panel changes

src/components/Admin.tsx

@@ -90,7 +90,7 @@ const Icon = styled.img`
 `;
 
 export const Admin = () => {
-  const [currentTab, setCurrentTab] = useState<null | number>(null);
+  const [currentTab, setCurrentTab] = useState<null | number>(1);
 
   const handleClick = (e: MouseEvent<HTMLDivElement>) => {
     setCurrentTab(Number(e.currentTarget.id));

src/components/Dropdown.tsx

@@ -50,7 +50,9 @@ interface DropdownProps {
 }
 
 export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: DropdownProps) => {
-  const { courses, selectBasketNames, addCourseToBasket, getUserID } = useContext(coursesContext)!;
+  const { courses, selectBasketNames, addCourseToBasket, changeStudent } = useContext(
+    coursesContext,
+  )!;
   const { students } = useContext(studentsContext)!;
   const basketNames = useMemo(() => selectBasketNames(), [selectBasketNames]);
   const [filteredCourses, setFilteredCourses] = useState<Array<Course>>([]);
@@ -67,7 +69,7 @@ export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: D
 
   const onUserClick = (event: MouseEvent) => {
     const target = event.currentTarget;
-    getUserID(target.id);
+    changeStudent(target.id);
     handleCloseDropdown();
   };
 
@@ -119,7 +121,7 @@ export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: D
               {filteredStudents.map(({ name, surname, id }, index) => (
                 <CourseContainer key={index} id={id.toString()} onClick={onUserClick}>
                   <p>
-                    {name} {surname}{' '}
+                    {name} {surname}
                   </p>
                 </CourseContainer>
               ))}

src/components/Scheduler.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useLayoutEffect, useRef } from 'react';
 import { useState } from 'react';
 import { SchedulerEvents } from './SchedulerEvents';
 import { days, hours } from '../constants/index';
@@ -66,7 +66,7 @@ export const Scheduler = () => {
   const [cellWidth, setCellWidth] = useState(0);
   const [cellHeight, setCellHeight] = useState(0);
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     const handleResize = () => {
       if (cellRef.current) {
         setCellWidth(cellRef.current.getBoundingClientRect().width);

src/components/SchedulerRow.tsx

@@ -140,7 +140,6 @@ export const SchedulerRow = ({ groups, indexRow, rowTop, cellWidth, cellHeight }
   const [popoverId, setPopoverId] = useState<string | null>(null);
   //looks weird
   const handlePopoverOpen = (event: MouseEvent<HTMLDivElement, globalThis.MouseEvent>) => {
-    console.log('I was clicked!!!!');
     setAnchorEl(event.currentTarget);
     setPopoverId(event.currentTarget.id);
   };

src/contexts/CoursesProvider.tsx

@@ -26,12 +26,13 @@ interface CourseContext {
   restoreGroupInBasket: (restoreGroup: Group, courseId: number) => void;
   deleteFromBasket: (id: number) => void;
   saveBasket: (userID: string) => Promise<void>;
-  getUserID: (userID: string) => Promise<void>;
+  changeStudent: (studentId: string) => void;
   selectSchedulerEvents: () => Array<SchedulerEvent>;
   selectBasketNames: () => Array<string>;
   selectBasketCourses: () => Array<Course>;
   selectBasketCourseGroups: (courseId: number) => { lecture: Group | undefined; classes: Group | undefined };
-  getUserTimetable: (userID: string) => Promise<void>;
+  getNewestStudentTimetable: (studentId: string) => void;
+  changeDataLoading: (isLoading: boolean) => void;
 }
 export const coursesContext = createContext<CourseContext | undefined>(undefined);
 
@@ -92,6 +93,8 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
 
   const changeHoveredGroup = (group: Group | null) => setHoveredGroup(group);
 
+  const changeDataLoading = (isLoading: boolean) => setIsDataLoading(isLoading);
+
   const addCourseToBasket = (course: Course) => {
     const courseToBasket: Basket = {
       name: course.name,
@@ -104,8 +107,11 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
 
   const deleteFromBasket = (id: number) => setBasket(basket.filter((course) => course.id !== id));
 
-  const getUserID = async (userID: string) => {
-    setUserID(userID);
+  const changeStudent = async (studentId: string) => {
+    setUserID(studentId);
+    setTimeout(() => {
+      getNewestStudentTimetable(studentId);
+    }, 100);
   };
 
   const saveBasket = async (userID: string) => {
@@ -177,10 +183,13 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
     }
   };
 
-  const getUserTimetable = async (userID: string) => {
+  const getNewestStudentTimetable = async (studentId: string) => {
     try {
-      const { data } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${userID}`);
-      console.log(data);
+      const { data } = await axiosInstance.get(
+        `${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${studentId}/schedule`,
+      );
+      const basket = data === '' ? [] : data;
+      setBasket(basket);
     } catch (e) {
       console.log(e);
     }
@@ -225,8 +234,9 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
         selectBasketNames,
         selectBasketCourses,
         selectBasketCourseGroups,
-        getUserTimetable,
-        getUserID,
+        getNewestStudentTimetable,
+        changeStudent,
+        changeDataLoading,
       }}
     >
       {children}

src/contexts/StudentsProvider.tsx

@@ -1,6 +1,7 @@
-import React, { useState, createContext, useEffect, ReactNode, useRef } from 'react';
+import React, { useState, createContext, useEffect, ReactNode, useRef, useContext } from 'react';
 import { Student } from '../types';
 import { axiosInstance } from '../utils/axiosInstance';
+import { CASContext } from './CASProvider';
 
 interface StudentContext {
   students: Array<Student>;
@@ -15,7 +16,9 @@ interface StudentsProviderProps {
 export const StudentsProvider = ({ children }: StudentsProviderProps) => {
   const [students, setStudents] = useState<Array<Student>>([]);
 
+  //not working currently
   const userPrivilige = localStorage.getItem('userPrivilige');
+  const { user } = useContext(CASContext)!;
 
   const getStudents = async () => {
     try {
@@ -31,7 +34,8 @@ export const StudentsProvider = ({ children }: StudentsProviderProps) => {
 
   useEffect(() => {
     setTimeout(() => {
-      userPrivilige === 'DEANERY' && getStudents();
+      // user?.authorityRole === 'DEANERY' &&
+      getStudents();
     }, 500);
   }, []);