Merge pull request #105 from IT-Cotato/fix/calendar_component

[Refactor] NoLesson 컴포넌트 하나의 컴포넌트로 병합
IT-Cotato · Mar 6, 2025 · 9ae4cbd · 9ae4cbd
2 parents 22d8bf8 + 8fc8d06
commit 9ae4cbd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 27 deletions.
diff --git a/src/components/Calendar/CalendarInfo.tsx b/src/components/Calendar/CalendarInfo.tsx
@@ -2,7 +2,6 @@ import { Clicked } from '../../models/calendar.model';
 import CalendarLesson from './CalendarLesson';
 import CalendarDeposit from './CalendarDeposit';
 import CalendarNolesson from './CalendarNolesson';
-import CalendarNolessonStudent from './CalendarNolessonStudent';
 
 type CalendarProps = { clickDate: Clicked; roleInfo: string };
 
@@ -15,10 +14,7 @@ const CalendarInfo = ({ clickDate, roleInfo }: CalendarProps) => {
       <div className="flex flex-col gap-2">
         {clickDate.roomname && <CalendarDeposit roomname={clickDate.roomname} type={'calendar'} />}
         {clickDate.subjectAndRooms && <CalendarLesson subjectAndRooms={clickDate.subjectAndRooms} />}
-        {!clickDate.roomname && !clickDate.subjectAndRooms && roleInfo === 'TEACHER' && <CalendarNolesson />}
-        {!clickDate.roomname && !clickDate.subjectAndRooms && (roleInfo === 'PARENT' || roleInfo === 'STUDENT') && (
-          <CalendarNolessonStudent />
-        )}
+        {!clickDate.roomname && !clickDate.subjectAndRooms && <CalendarNolesson roleInfo={roleInfo} />}
       </div>
     </div>
   );

diff --git a/src/components/Calendar/CalendarNolesson.tsx b/src/components/Calendar/CalendarNolesson.tsx
@@ -9,9 +9,10 @@ import { getShareCode } from '../../api/roomList.api';
 
 type Props = {
   isShareLink?: boolean;
+  roleInfo: string;
 };
 
-const CalendarNolesson = ({ isShareLink }: Props) => {
+const CalendarNolesson = ({ isShareLink, roleInfo }: Props) => {
   const navigation = useNavigate();
   const { roomId } = useParams();
   const [toast, setToast] = useState(false);
@@ -28,7 +29,7 @@ const CalendarNolesson = ({ isShareLink }: Props) => {
       } catch (e) {
         alert('초대 코드 복사에 실패했습니다.');
       }
-    } else {
+    } else if (roleInfo === 'TEACHER') {
       navigation('/user/roomlist');
     }
   };
@@ -52,12 +53,14 @@ const CalendarNolesson = ({ isShareLink }: Props) => {
           ) : (
             <>
               <div className="text-gray-900 text-base font-semibold leading-7">오늘은 일정이 없어요!</div>
-              <div className="text-sm leading-6 tracking-[-0.042px]">과외방에서 일정을 추가할 수 있어요</div>
+              {roleInfo === 'TEACHER' && (
+                <div className="text-sm leading-6 tracking-[-0.042px]">과외방에서 일정을 추가할 수 있어요</div>
+              )}
             </>
           )}
         </div>
       </div>
-      <MdKeyboardArrowRight size={24} />
+      {roleInfo === 'TEACHER' && <MdKeyboardArrowRight size={24} />}
     </div>
   );
 };

diff --git a/src/components/Calendar/CalendarNolessonStudent.tsx b/src/components/Calendar/CalendarNolessonStudent.tsx