Merge pull request #468 from Gwasuwon-shot/hotfix#-errorFix

Hotfix# error fix

Author: eunbeann

src/components/lessonShare/ShareMain.tsx

@@ -1,18 +1,10 @@
 import { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { useRecoilState, useRecoilValue } from "recoil";
+import { useRecoilValue } from "recoil";
 import styled from "styled-components";
 import { CopyLessonShareIc, ShareViaEtc, ShareViaMessage } from "../../assets";
-import { studentNameState, subjectNameState } from "../../atom/common/datePicker";
-import { cycleNumberState, dateState, dayState, firstLessonDay, focusDayState } from "../../atom/timePicker/timePicker";
-import {
-  accountNumber,
-  bankName,
-  lessonCodeAndPaymentId,
-  moneyAmount,
-  payingPersonName,
-  paymentOrder,
-} from "../../atom/tuitionPayment/tuitionPayment";
+import { studentNameState } from "../../atom/common/datePicker";
+import { lessonCodeAndPaymentId } from "../../atom/tuitionPayment/tuitionPayment";
 import useGetLessonByUser from "../../hooks/useGetLessonByUser";
 import { handleMoveToPageProps } from "../../pages/LessonShare";
 import { BottomButton, ProgressBar } from "../common";
@@ -32,39 +24,19 @@ interface Day {
 
 export default function ShareMain({ handleMoveToPage }: handleMoveToPageProps) {
   const { userName } = useGetLessonByUser();
-
-  const [cycleNumber, setCycleNumberState] = useRecoilState(cycleNumberState);
-  const [date, setdateState] = useRecoilState(dateState);
-  const [day, setDayState] = useRecoilState(dayState);
-  const [firstLesson, setFirstLessonDay] = useRecoilState(firstLessonDay);
-  const [focusDay, setFocusDayState] = useRecoilState(focusDayState);
-  const [studentName, setStudentName] = useRecoilState<string>(studentNameState);
-  const [subjectName, setSubjectNameState] = useRecoilState(subjectNameState);
-  const [accountNum, setAccountNumber] = useRecoilState(accountNumber);
-  const [bank, setBankName] = useRecoilState(bankName);
-  const [money, setMoneyAmount] = useRecoilState(moneyAmount);
-  const [payingPerson, setPayingPersonName] = useRecoilState(payingPersonName);
-  const [payment, setPaymentOrder] = useRecoilState(paymentOrder);
-
-  function setAllSet() {
-    setCycleNumberState(-1);
-    setdateState({ year: new Date().getFullYear(), month: new Date().getMonth() + 1, date: new Date().getDate() });
-    setDayState([]);
-    setFirstLessonDay({ 1: "월", 2: "화", 3: "수", 4: "목", 5: "금", 6: "토", 0: "일" }[new Date().getDay()]);
-    setStudentName("");
-    setSubjectNameState("");
-    setAccountNumber("");
-    setBankName("");
-    setMoneyAmount(0);
-    setPayingPersonName("");
-  }
-
+  const studentName = useRecoilValue<string>(studentNameState);
   const navigate = useNavigate();
   const codeAndId = useRecoilValue(lessonCodeAndPaymentId);
   const [URL, setURL] = useState(`https://tutice.com/${codeAndId?.lessonCode}`);
 
   const SHARE_ICON = [
-    { icon: ShareViaMessage, text: "메시지", onClick: () => {} },
+    {
+      icon: ShareViaMessage,
+      text: "메시지",
+      onClick: () => {
+        alert("준비 중인 기능입니다.");
+      },
+    },
     {
       icon: ShareViaEtc,
       text: "기타",
@@ -76,7 +48,6 @@ export default function ShareMain({ handleMoveToPage }: handleMoveToPageProps) {
 
   useEffect(() => {
     setURL(`https://tutice.com/${codeAndId?.lessonCode}`);
-    setAllSet();
   }, [codeAndId]);
 
   function handleMoveToHome() {

src/components/parentsHome/NoClassParentsHome.tsx

@@ -7,7 +7,7 @@ export default function NoClassParentsHome() {
   const navigate = useNavigate();
 
   function handleMoveToOnboarding() {
-    navigate("/on-boarding");
+    navigate("/on-boarding", { state: { isFromParentsHome: true } });
   }
 
   return (

src/components/parentsHome/TodayClassSwiper.tsx

@@ -1,10 +1,10 @@
-import "slick-carousel/slick/slick.css";
-import "slick-carousel/slick/slick-theme.css";
 import Slider from "react-slick";
-import { TODAY_CLASS_SLIDER_SETTINGS } from "../../core/parentsHome/parentsHome";
-import TodayClassScedule from "./TodayClassScedule";
+import "slick-carousel/slick/slick-theme.css";
+import "slick-carousel/slick/slick.css";
 import { styled } from "styled-components";
+import { TODAY_CLASS_SLIDER_SETTINGS } from "../../core/parentsHome/parentsHome";
 import useGetTodayScheduleByParents from "../../hooks/useGetTodayScheduleByParents";
+import TodayClassScedule from "./TodayClassScedule";
 
 interface calssInfoType {
   idx: number;
@@ -16,14 +16,14 @@ interface calssInfoType {
 }
 
 export default function TodayClassSwiper() {
-  const dateOfWeek = "월";
-  const dateStr = "2023-07-12";
-
-  const date = new Date(dateStr);
+  const date = new Date();
 
-  const year = date.getFullYear(); // 년 추출
-  const month = date.getMonth() + 1; // 월 추출 (0부터 시작하므로 +1)
-  const day = date.getDate(); // 일 추출
+  const year = date.getFullYear();
+  const month = date.getMonth() + 1;
+  const day = date.getDate();
+  const dayOfWeek = date.getDay();
+  const dayOfWeekStr = ["일", "월", "화", "수", "목", "금", "토"];
+  const dayOfWeekKor = dayOfWeekStr[dayOfWeek];
 
   const { scheduleList } = useGetTodayScheduleByParents();
 
@@ -32,7 +32,7 @@ export default function TodayClassSwiper() {
       {scheduleList?.length > 0 && (
         <div>
           <SwiperTitleDate>
-            {year}년 {month}월 {day}일 ({dateOfWeek}) 수업
+            {year}년 {month}월 {day}일 ({dayOfWeekKor}) 수업
           </SwiperTitleDate>
           <Slider {...TODAY_CLASS_SLIDER_SETTINGS}>
             {scheduleList.map((classInfo: calssInfoType) => {

src/hooks/manageLessons/useResetLessonInfo.ts

@@ -0,0 +1,44 @@
+import { useResetRecoilState } from "recoil";
+import { studentNameState, subjectNameState } from "../../atom/common/datePicker";
+import { cycleNumberState, dateState, firstLessonDay, focusDayState } from "../../atom/timePicker/timePicker";
+import {
+  accountNumber,
+  bankName,
+  moneyAmount,
+  payingPersonName,
+  paymentOrder,
+} from "../../atom/tuitionPayment/tuitionPayment";
+
+const useResetAllRecoilStates = () => {
+  const resetCycleNumber = useResetRecoilState(cycleNumberState);
+  const resetDate = useResetRecoilState(dateState);
+  const resetDay = useResetRecoilState(dateState);
+  const resetFirstLessonDay = useResetRecoilState(firstLessonDay);
+  const resetFocusDay = useResetRecoilState(focusDayState);
+  const resetStudentName = useResetRecoilState(studentNameState);
+  const resetSubjectName = useResetRecoilState(subjectNameState);
+  const resetAccountNumber = useResetRecoilState(accountNumber);
+  const resetBankName = useResetRecoilState(bankName);
+  const resetMoneyAmount = useResetRecoilState(moneyAmount);
+  const resetPayingPersonName = useResetRecoilState(payingPersonName);
+  const resetPaymentOrder = useResetRecoilState(paymentOrder);
+
+  const resetAllStates = () => {
+    resetCycleNumber();
+    resetDate();
+    resetDay();
+    resetFirstLessonDay();
+    resetFocusDay();
+    resetStudentName();
+    resetSubjectName();
+    resetAccountNumber();
+    resetBankName();
+    resetMoneyAmount();
+    resetPayingPersonName();
+    resetPaymentOrder();
+  };
+
+  return resetAllStates;
+};
+
+export default useResetAllRecoilStates;

src/pages/ManageLessonMain.tsx

@@ -6,14 +6,13 @@ import { AddTreeCodeButtonManageIc } from "../assets";
 import { attendanceStatus } from "../atom/attendanceCheck/attendanceStatus";
 import { isModalOpen } from "../atom/common/isModalOpen";
 import { isSnackBarOpen } from "../atom/common/isSnackBarOpen";
-import CancelLessonMaintenanceSnackBar from "../components/common/CancelLessonMaintenanceSnackBar";
 import TeacherFooter from "../components/common/TeacherFooter";
 import DeleteLessonModal from "../components/manageLesson/DeleteLessonModal";
 import ExtensionLessonModal from "../components/manageLesson/ExtensionLessonModal";
 import FinishedLessons from "../components/manageLesson/FinishedLessons";
 import MainLessons from "../components/manageLesson/MainLessons";
 import MissingMainteanceLessons from "../components/manageLesson/MissingMainteanceLessons";
-import SuccessLessonMaintenanceSnackBar from "../components/modal/SuccessLessonMaintenanceSanckBar";
+import useResetAllRecoilStates from "../hooks/manageLessons/useResetLessonInfo";
 import useGetAllLessons from "../hooks/useGetAllLessons";
 import useGetMissingMaintenanceLesson from "../hooks/useGetMissingMaintenanceLesson";
 import { lessonListType } from "../type/manageLesson/lessonListType";
@@ -22,7 +21,10 @@ export default function ManageLessonMain() {
   const [snackBarOpen, setSanckBarOpen] = useRecoilState(isSnackBarOpen);
   const [isSuccess, setIsSuccess] = useState(true);
   const navigate = useNavigate();
+
   const [attendanceData, setAttendanceData] = useRecoilState(attendanceStatus);
+  const resetAll = useResetAllRecoilStates();
+
   const [isClickedEdit, setIsClickedEdit] = useState(false);
   const [isClickedDeleteButton, setIsClickedDeleteButton] = useState(false);
   const [openModal, setOpenModal] = useRecoilState<boolean>(isModalOpen);
@@ -44,6 +46,7 @@ export default function ManageLessonMain() {
   }
 
   function handleMakeTreeCode() {
+    resetAll();
     navigate("/register-lesson");
   }
 

src/pages/OnBoarding.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 import Slider from "react-slick";
 import "slick-carousel/slick/slick-theme.css";
 import "slick-carousel/slick/slick.css";
@@ -12,12 +12,15 @@ import { SLIDER_SETTING } from "../core/OnBoarding";
 
 export default function OnBoarding() {
   const sliderRef = useRef<Slider>(null);
+  const location = useLocation();
+  const { isFromParentsHome } = location.state || {};
+
   const [step, setStep] = useState(0);
   const navigate = useNavigate();
   const isLastSwiper = step === 3;
 
   useEffect(() => {
-    if (getCookie("lastLogin")) {
+    if (getCookie("lastLogin") && !isFromParentsHome) {
       navigate("/landing");
     }
   }, []);