develop -> main

DSM-PICK · Nov 12, 2024 · 8b60dea · 8b60dea
2 parents 19af3e9 + a2966cf
commit 8b60dea
Show file tree

Hide file tree

Showing 20 changed files with 108 additions and 61 deletions.
diff --git a/src/apis/admin/index.ts b/src/apis/admin/index.ts
@@ -5,6 +5,7 @@ import { cookie } from '@/utils/auth';
 import { Login } from './request';
 import { instance } from '@/apis';
 import { MynameType } from '@/apis/type';
+import useTeacherListInformation from '@/stores/teacherlist';
 
 const router = 'admin';
 
@@ -57,16 +58,16 @@ export const MyName = () => {
   });
 };
 
-export const GetAllTeacher = () => {
-  return useQuery<string[]>({
+export const useGetAllTeacher = () => {
+  const { teacher, setTeacher } = useTeacherListInformation();
+
+  return useQuery({
     queryKey: ['GetAllTeacher'],
     queryFn: async () => {
-      try {
-        const { data } = await instance.get(`${router}/all`);
-        return data;
-      } catch (error) {
-        console.log('');
-      }
+      const { data } = await instance.get(`${router}/all`);
+      setTeacher(data);
+      return data;
     },
+    enabled: teacher.length === 0,
   });
 };
diff --git a/src/apis/story/index.ts b/src/apis/story/index.ts
@@ -16,9 +16,11 @@ export const AllList = () => {
 
 export const DetailList = (student_id: string) => {
   return useQuery({
-    queryKey: ["DetailList", student_id],
+    queryKey: ['DetailList', student_id],
     queryFn: async () => {
-      const { data } = await instance.get<DetailApplication>(`${router}/query/${student_id}`);
+      const { data } = await instance.get<DetailApplication>(
+        `${router}/query/${student_id}`,
+      );
       return data;
     },
   });

diff --git a/src/components/StudentsState/index.tsx b/src/components/StudentsState/index.tsx
@@ -13,7 +13,7 @@ const StudentsState = ({ type, person }: StudentsStateType) => {
   const buttonText =
     type === 'outing' ? '외출자 목록 보기' : '교실 이동 학생 보기';
   const img = type === 'outing' ? outingImg : classroomMovementImg;
-  const rout = type === 'outing' ? 'outList' : 'classMove';
+  const rout = type === 'outing' ? 'outList' : '/classMoveList';
   return (
     <S.StudentsStateContainer>
       <S.StudentsStateFlexbox>

diff --git a/src/components/calendar/index.tsx b/src/components/calendar/index.tsx
@@ -199,7 +199,7 @@ const Calendar = ({ type }: CalendarProp) => {
       </Width>
       {modal && selectedDate && (
         <Modal
-          refetchStatus={ReSelfStudyData}
+          refetchStatus={type === 'schedule' ? ReScheduleData : ReSelfStudyData}
           type={type}
           title={`${selectedMonth}월 ${selectedDay}일 ${selectedWeekday}`}
           subTitle="오늘의 자습감독 선생님"

diff --git a/src/components/calendar/style.ts b/src/components/calendar/style.ts
@@ -3,7 +3,7 @@ import '@/styles/theme';
 import { theme } from '@/styles/theme';
 
 export const Container = styled.section`
-  width: 100%;
+  min-width: 1000px;
   display: flex;
   flex-direction: column;
   align-items: center;

diff --git a/src/components/input/search.tsx b/src/components/input/search.tsx
@@ -1,7 +1,7 @@
 import * as S from './style';
 import React, { useEffect, useRef, useState } from 'react';
 import search from '@/assets/svg/search.svg';
-import { GetAllTeacher } from '@/apis/admin';
+import useTeacherListInformation from '@/stores/teacherlist';
 
 interface ChangeProps {
   text: string;
@@ -26,8 +26,8 @@ const SearchInput = ({
   value,
   type,
 }: InputProp) => {
-  const { data: teacherData } = GetAllTeacher();
-  const [filteredTeachers, setFilteredTeachers] = useState<string[]>([]);
+  const { teacher } = useTeacherListInformation();
+  const [filteredTeachers, setFilteredTeachers] = useState<string[]>(teacher);
   const [list, setList] = useState<boolean>(false);
   const dropdownRef = useRef<HTMLDivElement>(null);
 
@@ -37,10 +37,14 @@ const SearchInput = ({
 
     if (type === 'self') {
       setList(true);
-      const filteredList = teacherData?.filter((teacher: string) =>
-        teacher.toLowerCase().includes(inputValue.toLowerCase()),
-      );
-      setFilteredTeachers(filteredList || ['']);
+
+      const filteredList = inputValue
+        ? teacher?.filter((teacher: string) =>
+            teacher.toLowerCase().includes(inputValue.toLowerCase()),
+          )
+        : teacher;
+
+      setFilteredTeachers(filteredList || []);
     }
   };
 

diff --git a/src/components/input/style.ts b/src/components/input/style.ts
@@ -98,9 +98,9 @@ export const TeacherList = styled.div`
   background-color: ${theme.color.normal.white};
   width: 100%;
   top: 110%;
+  height: 200px;
+  overflow: auto;
   z-index: 1;
-  max-height: 256px;
-  min-height: fit-content;
   overflow-y: scroll;
   border: 1px solid ${theme.color.gray[100]};
   border-radius: 12px;

diff --git a/src/components/list/index.tsx b/src/components/list/index.tsx
@@ -6,17 +6,29 @@ interface OutAcceptProp {
   date: string;
   content: string;
   onClick: () => void;
+  type: 'application' | 'early-return';
 }
 
-const OutAcceptList = ({ name, date, content, onClick }: OutAcceptProp) => {
+const OutAcceptList = ({
+  name,
+  date,
+  content,
+  onClick,
+  type,
+}: OutAcceptProp) => {
   const [isActive, setIsActive] = useState<boolean>(false);
 
   const handleClick = () => {
     setIsActive(!isActive);
     onClick();
   };
   return (
-    <S.OutAcceptWrap draggable isActive={isActive} onClick={handleClick}>
+    <S.OutAcceptWrap
+      type={type}
+      draggable
+      isActive={isActive}
+      onClick={handleClick}
+    >
       <S.OutAcceptTitle>{name}</S.OutAcceptTitle>
       <div>외출</div>
       <S.OutAcceptDate>{date}</S.OutAcceptDate>

diff --git a/src/components/list/style.ts b/src/components/list/style.ts
@@ -3,6 +3,7 @@ import { theme } from '@/styles/theme';
 
 interface AcceptListProp {
   isActive: boolean;
+  type: 'application' | 'early-return';
 }
 export const OutAcceptWrap = styled.div<AcceptListProp>`
   display: flex;
@@ -13,10 +14,14 @@ export const OutAcceptWrap = styled.div<AcceptListProp>`
   min-width: min-content;
   background-color: ${theme.color.main[50]};
   border: 2px solid
-    ${({ isActive }) =>
-      isActive ? theme.color.main[500] : theme.color.main[50]};
+    ${({ isActive, type }) =>
+      isActive && type === 'application'
+        ? theme.color.main[500]
+        : theme.color.main[50]};
   &:hover {
-    border: 2px solid ${theme.color.main[500]};
+    border: 2px solid
+      ${({ type }) =>
+        type === 'application' ? theme.color.main[500] : 'transparent'};
   }
 `;
 export const OutAcceptTitle = styled.p`

diff --git a/src/components/mainRouterButton/index.tsx b/src/components/mainRouterButton/index.tsx
@@ -57,7 +57,7 @@ const MainRouterButton = () => {
     },
     {
       img: clubManagement,
-      text: '전공동아리 관리',
+      text: '전공동아리 출결',
       router: '/club',
     },
     {

diff --git a/src/components/modal/index.tsx b/src/components/modal/index.tsx
@@ -58,7 +58,7 @@ export const Modal = ({
   const { mutate: postTeacherMutate } = PostTeacher();
   const { mutate: addScheduleMutate } = AddSchedule();
   const { mutate: Delete } = DeleteSchedule();
-  const { data: Schedule } = DaySchedule(date);
+  const { data: Schedule, refetch: reSchedule } = DaySchedule(date);
 
   useEffect(() => {
     if (!SelectSelfList?.length) return;
@@ -86,6 +86,7 @@ export const Modal = ({
             type: 'success',
             message: '삭제되었습니다',
           });
+          reSchedule();
           refetchStatus();
         },
       },
@@ -128,6 +129,7 @@ export const Modal = ({
           type: 'success',
           message: '학사일정이 추가되었습니다',
         });
+        setState(false);
         refetchStatus();
       },
       onError: (error) => {

diff --git a/src/pages/Main/index.tsx b/src/pages/Main/index.tsx
@@ -2,10 +2,10 @@ import Header from '@/components/header';
 import * as S from './style';
 import mainLogo from '@/assets/svg/mainLogo.svg';
 import MainRouterButton from '@/components/mainRouterButton';
-import { showToast } from '@/components/toast';
-import { useEffect } from 'react';
+import { useGetAllTeacher } from '@/apis/admin';
 
 const Main = () => {
+  useGetAllTeacher();
   return (
     <>
       <Header />

diff --git a/src/pages/RequestClass.tsx b/src/pages/RequestClass.tsx
@@ -69,7 +69,7 @@ const RequestClass = () => {
           <>
             <Button
               onClick={() => {
-                nav('accpet');
+                nav('/classMoveList');
               }}
               size="small"
               type="main"
@@ -123,6 +123,7 @@ const RequestClass = () => {
       />
       {modal && (
         <Modal
+          refetchStatus={() => {}}
           type="check"
           onCancel={() => {
             setModal(false);

diff --git a/src/pages/club/index.tsx b/src/pages/club/index.tsx
@@ -48,8 +48,8 @@ const ClubPage = () => {
 
   return (
     <Layout
-      now="전공동아리 관리"
-      title="전공동아리 관리"
+      now="전공동아리 출결"
+      title="전공동아리 출결"
       right={
         <>
           <Dropdown

diff --git a/src/pages/notice/index.tsx b/src/pages/notice/index.tsx
@@ -19,9 +19,8 @@ const NoticePage = () => {
 
   const notices: SimpleNoticeType[] = Array.isArray(data) ? data : [];
 
-  const filteredNotices = notices.filter(
-    (notice: SimpleNoticeType) =>
-      notice.title.includes(searchTerm) || notice.id.includes(searchTerm),
+  const filteredNotices = notices.filter((notice: SimpleNoticeType) =>
+    notice.title.includes(searchTerm),
   );
 
   return (
@@ -43,7 +42,7 @@ const NoticePage = () => {
             <SearchInput
               type="Search"
               value={searchTerm}
-              placeholder="입력하세요"
+              placeholder="검색할 공지의 제목을 입력해주세요"
               onChange={handleSearchChange}
             />
           </>

diff --git a/src/pages/outAccept/index.tsx b/src/pages/outAccept/index.tsx
@@ -11,6 +11,7 @@ import { showToast } from '@/components/toast';
 import { Toggle } from '@/components/toggle';
 import Modal from '@/components/modal';
 import { useAcceptModal } from '@/hook/useModal';
+import { getStudentString } from '@/utils/utils';
 
 const OutAccept = () => {
   const [selectedGrade, setSelectedGrade] = useState<number>(5);
@@ -102,10 +103,15 @@ const OutAccept = () => {
           {GetOutRequest?.length ? (
             GetOutRequest.map((item, index) => (
               <OutAcceptList
+                type={currentMenu}
                 key={index}
-                name={item.user_name}
+                name={getStudentString(item)}
                 content={item.reason}
-                date={item.end ? `${item.start}~${item.end}` : `${item.start}`}
+                date={
+                  item.end
+                    ? `${item.start.slice(0, 5)} ~ ${item.end.slice(0, 5)}`
+                    : `${item.start.slice(0, 5)}`
+                }
                 onClick={() => handleAcceptListClick(item.id, item.user_name)}
               />
             ))
@@ -137,6 +143,7 @@ const OutAccept = () => {
       />
       {modal && (
         <Modal
+          refetchStatus={() => {}}
           type="check"
           title={useAcceptModal({
             students: selectedStudentName,

diff --git a/src/pages/outList/index.tsx b/src/pages/outList/index.tsx
@@ -7,11 +7,11 @@ import { useState, useEffect } from 'react';
 import Modal from '@/components/modal';
 import Dropdown from '@/components/dropdown';
 import { FloorOption } from '@/utils/dropdown';
-import { toast } from 'react-toastify';
 import useSelectionStore from '@/stores/useSelect';
 import { showToast } from '@/components/toast';
 import { Toggle } from '@/components/toggle';
 import { useGetEarlyReturnList } from '@/apis/early-return';
+import { getStudentString } from '@/utils/utils';
 
 const OutList = () => {
   const {
@@ -69,11 +69,13 @@ const OutList = () => {
         right={
           <>
             <Toggle onChange={setCurrentMenu} />
-            <Dropdown
-              options={FloorOption}
-              value={selectedFloor}
-              changeHandler={handleFloorChange}
-            />
+            {currentMenu === 'application' && (
+              <Dropdown
+                options={FloorOption}
+                value={selectedFloor}
+                changeHandler={handleFloorChange}
+              />
+            )}
           </>
         }
       >
@@ -85,10 +87,11 @@ const OutList = () => {
             OutListFloorData?.length ? (
               OutListFloorData?.map((item, index) => (
                 <OutAcceptList
+                  type={currentMenu}
                   key={index}
-                  name={item.user_name}
+                  name={getStudentString(item)}
                   content={item.reason}
-                  date={`${item.start} ~ ${item.end}`}
+                  date={`${item.start.slice(0, 5)} ~ ${item.end.slice(0, 5)}`}
                   onClick={() => handleAcceptListClick(item.id, item.user_name)}
                 />
               ))
@@ -98,10 +101,11 @@ const OutList = () => {
           ) : earlyreturnListData?.length ? (
             earlyreturnListData?.map((item) => (
               <OutAcceptList
+                type={currentMenu}
                 key={item.class_num}
-                name={item.user_name}
+                name={getStudentString(item)}
                 content={item.reason}
-                date={item.start}
+                date={item.start.slice(0, 5)}
                 onClick={() => {}}
               />
             ))
@@ -121,6 +125,7 @@ const OutList = () => {
       )}
       {modal && (
         <Modal
+          refetchStatus={() => {}}
           type="red"
           title={`${
             selectedStudentName.length > 1

diff --git a/src/pages/previousList/index.tsx b/src/pages/previousList/index.tsx
@@ -43,7 +43,7 @@ const PreviousList = () => {
       }
     >
       <ContentWrap>
-        {Loading && <p>로딩중~</p>}
+        {Loading && <p>로딩중...</p>}
         {filteredStudents?.map((item) => (
           <StoryList
             id={item.id}