fix

package.json

@@ -7,7 +7,7 @@
     "@material-ui/lab": "^4.0.0-alpha.56",
     "axios": "^0.19.2",
     "notistack": "^1.0.1",
-    "react": "^16.13.1",
+    "react": "^17.0.1",
     "react-click-away-listener": "^1.4.3",
     "react-dom": "^16.13.1",
     "react-scripts": "3.4.1",

src/components/Admin.tsx

@@ -17,16 +17,15 @@ const LeftSide = styled.div`
 const Wrap = styled.div`
   display: flex;
   height: calc(100vh - 120px);
-  background-color: #ECEEF4;
+  background-color: #eceef4;
   width: 100%;
 `;
 
-
 const Wrapper = styled.div`
   flex: 12;
   display: flex;
   height: calc(100vh - 120px);
-  background-color: #ECEEF4;
+  background-color: #eceef4;
 `;
 
 interface LeftPanelElement {
@@ -42,9 +41,8 @@ const LeftPanelElement = styled.div<LeftPanelElement>`
   //box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.75);
   padding: 20px;
   cursor: pointer;
-  box-shadow: ${({isCurrentTab})=>(isCurrentTab === true ? `inset 0px 0px 26px 0px rgba(0,0,0,0.55)` : "")};
+  box-shadow: ${({ isCurrentTab }) => (isCurrentTab === true ? `inset 0px 0px 26px 0px rgba(0,0,0,0.55)` : '')};
   border-bottom: 1px solid #979797;
-  
 `;
 const Icon = styled.img`
   width: 40px;
@@ -52,25 +50,24 @@ const Icon = styled.img`
 `;
 
 export const Admin = () => {
-
   const [currentTab, setCurrentTab] = useState<null | number>(null);
 
   const handleClick = (e: MouseEvent<HTMLDivElement>) => {
     setCurrentTab(Number(e.currentTarget.id));
-    }
+  };
 
   return (
     <Wrap>
       <LeftSide>
-      <LeftPanelElement id={"1"} isCurrentTab={currentTab===1} onClick={handleClick}>
+        <LeftPanelElement id={'1'} isCurrentTab={currentTab === 1} onClick={handleClick}>
           <Icon alt="profile" src={Plan} />
           Pokaż plan
         </LeftPanelElement>
-      <LeftPanelElement id={"2"} isCurrentTab={currentTab===2} onClick={handleClick}>
+        <LeftPanelElement id={'2'} isCurrentTab={currentTab === 2} onClick={handleClick}>
           <Icon alt="history" src={History} />
           Historia Zmian
         </LeftPanelElement>
-      <LeftPanelElement id={"3"} isCurrentTab={currentTab===3} onClick={handleClick}>
+        <LeftPanelElement id={'3'} isCurrentTab={currentTab === 3} onClick={handleClick}>
           <Icon alt="statistics" src={Statistics} />
           Statystyki
         </LeftPanelElement>

src/components/App.tsx

@@ -8,16 +8,10 @@ import styled from 'styled-components';
 const Wrapper = styled.div`
   display: flex;
   height: calc(100vh - 80px);
-<<<<<<< HEAD
   background-color: #eceef4;
   padding-top: 20px;
   padding-bottom: 20px;
-=======
-  background-color: #ECEEF4;
-  padding-top:20px;
-  padding-bottom:20px;
   padding-right: 20px;
->>>>>>> b687b3c014cabbedb9233d5f33e42d461a04a047
 `;
 
 export const App = () => {

src/components/SchedulerRow.tsx

@@ -45,6 +45,7 @@ interface SchedulerEventProps {
 
 const StyledSchedulerEvent = styled.div<SchedulerEventProps>`
   display: flex;
+  flex-direction: column;
   justify-content: center;
   align-items: center;
   z-index: 2;
@@ -54,7 +55,7 @@ const StyledSchedulerEvent = styled.div<SchedulerEventProps>`
   height: ${({ cellHeight }) => cellHeight * 3}px;
   width: ${({ cellWidth }) => (cellWidth * 3) / 4}px;
   margin-right: 5px;
-  padding: 5px 5px 5px 5px;
+  padding: 5px 5px 0 5px;
   text-align: center;
   background-color: ${({ groupType }) => (groupType === 'CLASS' ? '#FFDC61' : '#9ed3ff')};
   box-shadow: 3px 3px 3px 0px rgba(0, 0, 0, 0.75);
@@ -64,6 +65,18 @@ const StyledTypography = styled(Typography)`
   background-color: white;
 `;
 
+const BoldParagraph = styled.p`
+  font-weight: 700;
+`;
+
+const TextWrapper = styled.div`
+  width: inherit;
+  margin-top: 30px;
+  padding: 0 10px 0 10px;
+  display: flex;
+  justify-content: space-between;
+`;
+
 interface SchedulerRowProps {
   groups: Array<SchedulerEvent>;
   indexRow: number;
@@ -116,12 +129,13 @@ export const SchedulerRow = ({ groups, indexRow, rowTop, cellWidth, cellHeight }
                     onMouseEnter={(e) => handlePopoverOpen(e)}
                     onMouseLeave={handlePopoverClose}
                   >
+                    <BoldParagraph>{groups[index].name}</BoldParagraph>
+                    <TextWrapper>
                       <div>
-                      <p style={{ fontWeight: 700 }}>{groups[index].name}</p>
-                      <p>
                         {groups[index].time[0]} - {groups[index].time[1]}
-                      </p>
                       </div>
+                      <div>3/30</div>
+                    </TextWrapper>
                   </StyledSchedulerEvent>
                   <Popover
                     id={`mouse-over-popover`}

src/contexts/CoursesProvider.tsx

@@ -127,6 +127,7 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
 
   const fetchCourses = async () => {
     try {
+      console.log('env is: ', process.env.REACT_APP_API_URL);
       const { data: courses } = await axiosInstance.get<Array<Course>>(
         `${process.env.REACT_APP_API_URL}/api/v1/courses/getCoursesWithGroups`,
       );