feat: resolve conflict

IT-Cotato · Oct 31, 2024 · 482e229 · 482e229
1 parent 6ade9d5
commit 482e229
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/components/CotatoDropBox.tsx b/src/components/CotatoDropBox.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { styled, useTheme } from 'styled-components';
-import { ReactComponent as CheckIcon } from '@assets/check_icon_dotted.svg';
 import { CotatoGenerationInfoResponse, CotatoSessionListResponse } from 'cotato-openapi-clients';
 import drop_box_background_blue from '@assets/drop_box_background_blue.svg';
 import drop_box_background_yellow from '@assets/drop_box_background_yellow.svg';
@@ -175,7 +174,9 @@ const CotatoDropBox = <T extends CotatoDropBoxType>({
               className={item === selectedItem ? 'selected' : ''}
               onClick={() => handleItemClick(item)}
             >
-              {item === selectedItem && <StyledCheckIcon />}
+              {item === selectedItem && (
+                <StyledCheckIcon icon="check" color={theme.colors.sub3[40]} />
+              )}
               {StringFormatter(item)}
             </li>
           ))}

diff --git a/src/pages/Attendance/Report/AttendanceReportTable.tsx b/src/pages/Attendance/Report/AttendanceReportTable.tsx
@@ -1,9 +1,9 @@
-import { useGeneration } from '@/hooks/useGeneration';
+// import { useGeneration } from '@/hooks/useGeneration';
 import useGetAttendances from '@/hooks/useGetAttendances';
 import { Table, TableBody, TableCell, TableRow } from '@mui/material';
 import React, { useEffect } from 'react';
 import { useAttendancesAttendanceIdRecordsGet } from '../hooks/useAttendancesAttendanceIdRecordsGet';
-import { useSession } from '@/hooks/useSession';
+// import { useSession } from '@/hooks/useSession';
 import { useBreakpoints } from '@/hooks/useBreakpoints';
 import AttedanceTableLayout from './components/AttedanceTableLayout';
 import { getCurrentStatistic } from '../utils/util';
@@ -28,13 +28,13 @@ const AttendanceReportTable = () => {
   const search = searchParams.get('search') || '';
 
   //
-  const { currentGeneration } = useGeneration();
+  // const { currentGeneration } = useGeneration();
 
   const { generationId } = useParams();
   const { sessionId } = useParams();
 
   // TODO: need to get the latest session by params
-  const { sessions } = useSession({ generationId: currentGeneration?.generationId });
+  // const { sessions } = useSession({ generationId: currentGeneration?.generationId });
 
   //
   // const { currentAttendance } = useGetAttendances({

diff --git a/src/pages/CS/CSHome.tsx b/src/pages/CS/CSHome.tsx
@@ -1,8 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { styled } from 'styled-components';
 import CSContent from '@pages/CS/CSContent';
-import { ReactComponent as SettingIcon } from '@assets/setting_icon.svg';
-import { ReactComponent as AddIcon } from '@assets/add_icon.svg';
 import CotatoDropBox from '@components/CotatoDropBox';
 import CSModal from '@pages/CS/CSModal';
 import { IEducation } from '@/typing/db';
@@ -11,7 +9,6 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { CotatoGenerationInfoResponse } from 'cotato-openapi-clients';
 import { useGeneration } from '@/hooks/useGeneration';
 import useUser from '@/hooks/useUser';
-import GenerationDropBox from '@components/GenerationDropBox';
 import CotatoIcon from '@components/CotatoIcon';
 import { IconButton } from '@mui/material';