lots of changes

src/components/Admin.tsx

@@ -12,6 +12,7 @@ const LeftSide = styled.div`
   flex: 1;
   flex-direction: column;
   background-color: white;
+  text-align:center;
 `;
 
 const Wrap = styled.div`

src/components/App.tsx

@@ -27,9 +27,9 @@ export const App = () => {
       <Topbar handleTransfer={handleTransfer} />
       <Transfer isOpen={isOpenTransfer} handleClose={handleTransfer} />
       <Wrapper>
-        {/* <Admin/> */}
-        <Scheduler />
-        <Rightbar />
+        
+        {sessionStorage.getItem('userPrivilage')=== "STUDENT" ? <><Scheduler />
+        <Rightbar /></>: <Admin/>}
       </Wrapper>
     </>
   );

src/components/CourseCard.tsx

@@ -7,6 +7,7 @@ import styled, { css } from 'styled-components';
 import { makeStyles } from '@material-ui/core/styles';
 import DeleteIcon from '@material-ui/icons/Delete';
 import { useMemo } from 'react';
+import { createClassTime } from '../utils';
 
 const CourseCardWrapper = styled.div`
   position: relative;
@@ -20,7 +21,7 @@ const CourseCardWrapper = styled.div`
   border-radius: 10px;
   cursor: pointer;
   align-items: stretch;
-  box-shadow: 9px 9px 8px -2px rgba(0, 0, 0, 0.59);
+  box-shadow: 3px 3px 3px 0px rgba(0, 0, 0, 0.75);
 `;
 
 const TitleWrapper = styled.div`
@@ -52,6 +53,7 @@ const ClassGroupStyled = styled.div`
   position: relative;
   padding-top: 1px;
   padding-bottom: 5px;
+  transition: background-color 0.4s ease;
   :hover {
     cursor: pointer;
     background-color: #9ed3ff;
@@ -102,7 +104,7 @@ type FlexItemProps = {
 const FlexItem = styled.div<FlexItemProps>`
   display: flex;
   font-size: 14px;
-  font-weight: 600;
+  font-weight: 500;
   ${({ justifyContent }) =>
     justifyContent &&
     css`
@@ -141,7 +143,7 @@ export const CourseCard = ({ course }: CourseCardProps) => {
     selectBasketCourseGroups,
     changeHoveredGroup,
   } = useContext(coursesContext)!;
-  const [isSelected, setSelected] = useState(false);
+  const [isSelected, setSelected] = useState(true);
   const groups = [...course.lectures!, ...course.classes!];
   const basketCourseGroups = useMemo(() => selectBasketCourseGroups(course.id), []);
   const [previous, setPrevious] = useState(basketCourseGroups);
@@ -203,8 +205,9 @@ export const CourseCard = ({ course }: CourseCardProps) => {
                   {group.lecturer.replace('UAM', '')}
                 </FlexItem>
               )}
+              {console.log("abisfdibuafsbuiafsbuifasbuibuiafsbuifasbuifsabuiasf",group)}
               <FlexItem style={{ justifyContent: 'center', margin: '0 50px' }}>
-                <span>{/*group.time*/}</span> <span> Sala: {group.room}</span>
+                <span> {createClassTime(group.time)[0] + " - " + createClassTime(group.time)[1]} {/* Sala: {group.room} */}</span>
               </FlexItem>
             </FlexboxWrapper>
           </ClassGroupStyled>

src/components/Dropdown.tsx

@@ -50,12 +50,13 @@ interface DropdownProps {
 }
 
 export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: DropdownProps) => {
-  const { courses, selectBasketNames, addCourseToBasket,getUserTimetable } = useContext(coursesContext)!;
+  const { courses, selectBasketNames, addCourseToBasket, getUserID } = useContext(coursesContext)!;
   const { users } = useContext(usersContext)!;
   const basketNames = useMemo(() => selectBasketNames(), [selectBasketNames]);
   const [filteredCourses, setFilteredCourses] = useState<Array<Course>>([]);
   const [filteredUsers, setFilteredUsers] = useState<Array<User>>([]);
 
+
   const onCourseClick = (event: MouseEvent) => {
     const target = event.currentTarget;
     if (target.id && target.textContent) {
@@ -67,11 +68,8 @@ export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: D
 
   const onUserClick = (event: MouseEvent) => {
     const target = event.currentTarget;
-    if (target.id && target.textContent) {
-      console.log(target.id,target.textContent);
-      getUserTimetable(target.id);
-      handleCloseDropdown();
-    }
+    getUserID(target.id);
+    handleCloseDropdown();
   };
 
   useEffect(() => {

src/components/Rightbar.tsx

@@ -44,14 +44,14 @@ const SaveButton = styled.div`
     background-color: #54c457;
   }
 
-  box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.24);
+  box-shadow: 3px 3px 3px 0px rgba(0, 0, 0, 0.75);
 `;
 
 export const Rightbar = () => {
-  const { selectBasketCourses, saveBasket } = useContext(coursesContext)!;
+  const { selectBasketCourses, saveBasket, userekID } = useContext(coursesContext)!;
 
   const basketCourses = selectBasketCourses();
-  const handleSave = debounce(() => saveBasket(), 500);
+  const handleSave = debounce(() => saveBasket(userekID), 500);
   return (
     <RightbarWrapper>
       <SaveButton onClick={handleSave}>ZAPISZ</SaveButton>

src/components/Topbar.tsx

@@ -162,7 +162,7 @@ export default function ({ handleTransfer }: TopbarProps) {
       <FlexboxColumn>
         <ClickAwayListener onClickAway={handleCloseDropdown}>
           <Flexbox>
-          {/* <SelectMenu changeSelectedOption={changeSelectedOption} selectedOption={selectedOption} changeDropdownOpen={setOpen}/> */}
+            {sessionStorage.getItem('userPrivilage')=== "STUDENT" ? (<div></div>): <SelectMenu changeSelectedOption={changeSelectedOption} selectedOption={selectedOption} changeDropdownOpen={setOpen}/>}
             <InputWrapper>
               <Input
                 placeholder={`Wyszukaj ${selectedOption === "studenci" ? "studentów..." : "przedmioty..."}`}