Merge pull request #106 from Kusitms-29th-ASAP/fix/#103

[Fix] 급식표 날짜 오류 및 서명 localStorage 오류 수정

src/app/mypage/profile/page.tsx

@@ -71,7 +71,7 @@ const Profile = () => {
 
   useEffect(() => {
     if (typeof window !== "undefined") {
-      const storedSignImage = localStorage.getItem("signImage");
+      const storedSignImage = localStorage?.getItem("signImage");
       setSignImage(storedSignImage);
     }
   }, []);

src/app/mypage/profile/signature/page.tsx

@@ -24,13 +24,6 @@ const Signature = () => {
     setIsSignatureEmpty(false);
   };
 
-  useEffect(() => {
-    const dataURL = sigPad.current?.toDataURL("image/png");
-    if (dataURL) {
-      localStorage.setItem("signImage", dataURL);
-    }
-  }, []);
-
   /* dataURL을 File로 반환하는 함수 */
   const convertDataUrlToFile = () => {
     const dataURL = sigPad.current?.toDataURL("image/png");
@@ -53,19 +46,25 @@ const Signature = () => {
       return;
     }
 
+    /* 서명 localStorage 저장 */
+    const dataURL = sigPad.current?.toDataURL("image/png");
+    if (dataURL) {
+      localStorage.setItem("signImage", dataURL);
+    }
+
     /* signature 파일 */
     const signImage = convertDataUrlToFile();
 
     router.push("/mypage/profile");
 
     /* signature 파일 post */
-    Axios.post(`엔드포인트`, signImage)
-      .then((response) => {
-        router.push("/mypage/profile");
-      })
-      .catch(() => {
-        console.error("Signature Post Error");
-      });
+    // Axios.post(`엔드포인트`, signImage)
+    //   .then((response) => {
+    //     router.push("/mypage/profile");
+    //   })
+    //   .catch(() => {
+    //     console.error("Signature Post Error");
+    //   });
   };
 
   return (

src/app/news/eduOffice/page.tsx

@@ -84,7 +84,6 @@ export default EduOffice;
 
 const Layout = styled.div`
   width: 100%;
-  height: 100%;
   overflow-x: hidden;
   overflow-y: scroll;
   display: flex;

src/app/news/school/page.tsx

@@ -84,7 +84,6 @@ export default School;
 
 const Layout = styled.div`
   width: 100%;
-  height: 100%;
   overflow-x: hidden;
   overflow-y: scroll;
   display: flex;

src/app/school/notification/page.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import Tabbar from "@/components/common/Tabbar";
 import Topbar from "@/components/common/Topbar";
 import LastNotification from "@/components/school/notification/LastNotifications";
 import TodayNotification from "@/components/school/notification/TodayNotification";
@@ -10,7 +9,7 @@ const Notification = () => {
   return (
     <>
       <Container>
-        <Topbar text="학급알림장" icon={true} link="/school" />
+        <Topbar text="학급알림장" icon={true} />
       </Container>
       <TodayNotification />
       <LastNotification />

src/components/common/ListBox.tsx

@@ -149,6 +149,9 @@ const StyledListBox = styled.div<ListBoxProps>`
   align-items: center;
   padding: 12px 0px 12px 12px;
 
+  &.none {
+    background: ${theme.colors.white};
+  }
   &.mint {
     border: 1px solid ${theme.colors.b300};
   }

src/components/common/ListNumber.tsx

@@ -32,11 +32,12 @@ const StyledListNumber = styled.div`
 const Number = styled.div`
   display: inline-flex;
   width: 24px;
+  height: 25px;
   padding: 4px 8px;
   justify-content: center;
   align-items: center;
   border-radius: 8px;
-  background: rgba(255, 135, 0, 0.15);
+  background: #ffedd9;
   color: ${theme.colors.primary700};
   ${(props) => props.theme.fonts.caption1_b}
 `;

src/components/home/MealTablePopup.tsx

@@ -40,42 +40,46 @@ const MealTablePopup = ({ onClose }: { onClose: () => void }) => {
   const [mealTable, setMealTable] = useState<MealTable[]>([]);
   /* 주간별 급식 데이터 */
   const [weeklyMealTable, setWeeklyMealTable] = useState<MealTable[][]>([]);
-  /* 매달 시작 요일 */
-  const [dayOfWeek, setDayOfWeek] = useState<string>("");
-
-  let remainingDays = 0;
 
   useEffect(() => {
     Axios.get(`/api/v1/menus/month`)
       .then((response) => {
         const mealTableData: MealTable[] = response.data.menus;
         setMealTable(mealTableData);
 
-        const dayNames = ["월", "화", "수", "목", "금", "토", "일"];
-        const date = new Date(mealTableData[0].date);
-        const dayOfWeek = dayNames[date.getDay()];
-        setDayOfWeek(dayOfWeek);
-
-        // 첫 번째 주차의 데이터 개수 결정
-        if (dayOfWeek === "월") {
-          remainingDays = 5;
-        } else if (dayOfWeek === "화") {
-          remainingDays = 4;
-        } else if (dayOfWeek === "수") {
-          remainingDays = 3;
-        } else if (dayOfWeek === "목") {
-          remainingDays = 2;
-        } else if (dayOfWeek === "금") {
-          remainingDays = 1;
-        }
-
         const weeklyMealTable: MealTable[][] = [];
-        if (remainingDays > 0) {
-          weeklyMealTable.push(mealTableData.slice(0, remainingDays));
-        }
-
-        for (let i = remainingDays; i < mealTableData.length; i += 5) {
-          weeklyMealTable.push(mealTableData.slice(i, i + 5));
+        let currentWeek: MealTable[] = [];
+        /* 주차별 시작일 */
+        let currentWeekStartDay: number | null = null;
+
+        mealTableData.forEach((meal) => {
+          const mealDate = new Date(meal.date);
+          const mealDay = mealDate.getDate();
+          const mealDayOfWeek = mealDate.getDay();
+
+          /* 이번 주차 시작일 */
+          if (currentWeekStartDay === null) {
+            currentWeekStartDay = mealDay;
+          }
+
+          /* 이번 주차에 있는 날짜인지 확인 */
+          if (
+            (currentWeekStartDay !== null &&
+              mealDay >= currentWeekStartDay &&
+              mealDay < currentWeekStartDay + 5 &&
+              mealDayOfWeek !== 0) || // 일요일 제외
+            currentWeek.length === 0
+          ) {
+            currentWeek.push(meal);
+          } else {
+            weeklyMealTable.push(currentWeek);
+            currentWeek = [meal];
+            currentWeekStartDay = mealDay;
+          }
+        });
+
+        if (currentWeek.length > 0) {
+          weeklyMealTable.push(currentWeek);
         }
 
         setWeeklyMealTable(weeklyMealTable);

src/components/news/SummaryCard.tsx

@@ -103,7 +103,9 @@ const SummaryCard = (props: AnnouncementsProps) => {
 
         {summaryType === "detail" &&
           highlight?.summaries.map((data, index) => (
-            <StyledListNumber key={index} index={index + 1} text={data} />
+            <Background key={index}>
+              <StyledListNumber key={index} index={index + 1} text={data} />
+            </Background>
           ))}
       </Sentence>
     </StyledCard>
@@ -216,7 +218,7 @@ const StyledKeyword = styled.div`
   align-items: center;
   gap: 10px;
   border-radius: 6px;
-  background: rgba(255, 135, 0, 0.15);
+  background: #ffedd9;
   color: ${theme.colors.primary500};
   text-align: center;
   ${(props) => props.theme.fonts.caption1_b};
@@ -240,3 +242,9 @@ const StyledListNumber = styled(ListNumber)`
     background: ${theme.colors.b100};
   }
 `;
+
+const Background = styled.div`
+  padding: 8px 12px;
+  border-radius: 10px;
+  background: ${theme.colors.b100};
+`;