fix : aside

Team-INSERT · Nov 2, 2023 · f51665e · f51665e
1 parent e5f41ac
commit f51665e
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 39 deletions.
diff --git a/src/components/common/Aside/InfomationBox.tsx b/src/components/common/Aside/InfomationBox.tsx
@@ -39,20 +39,24 @@ const InfomationBox = ({ user, isLogined }: IInfomationBoxProps) => {
           rounded
         />
       )}
-      <Column>
-        <UserInfoBox>
-          <UserGrade>{user.grade}</UserGrade>
-          <UserClass>{user.classNum}</UserClass>
-          <UserStudentNumber>{user.studentNumber}</UserStudentNumber>
-        </UserInfoBox>
-        <Row gap="4px">
-          <UserName>{user.name}</UserName>
-          <UserType>{getUserRole(user.role)}</UserType>
-        </Row>
-      </Column>
-      <InfomationButton onClick={handleLoginButtonClick}>
-        내 정보
-      </InfomationButton>
+      {isLogined && (
+        <>
+          <Column>
+            <UserInfoBox>
+              <UserGrade>{user.grade}</UserGrade>
+              <UserClass>{user.classNum}</UserClass>
+              <UserStudentNumber>{user.studentNumber}</UserStudentNumber>
+            </UserInfoBox>
+            <Row gap="4px">
+              <UserName>{user.name}</UserName>
+              <UserType>{getUserRole(user.role)}</UserType>
+            </Row>
+          </Column>
+          <InfomationButton onClick={handleLoginButtonClick}>
+            내 정보
+          </InfomationButton>
+        </>
+      )}
       {!isLogined && (
         <>
           <LoginText>로그인이 필요해요</LoginText>
@@ -71,7 +75,7 @@ const Container = styled.main`
   height: 100%;
   background-color: ${color.white};
   gap: 8px;
-  padding: 14px 22px;
+  padding: 4px 22px;
   border-radius: 5px;
 
   @media screen and (max-width: 1074px) {

diff --git a/src/components/common/Aside/JoinCheckBox.tsx b/src/components/common/Aside/JoinCheckBox.tsx
@@ -8,7 +8,7 @@ const JoinCheckBox = () => {
         <Date>7월 1주차</Date>
         <RoomNumber>334</RoomNumber>
       </HGroup>
-      <CheckButton disabled />
+      <CheckButton />
     </Container>
   );
 };

diff --git a/src/components/common/Header/SubNavigation.tsx b/src/components/common/Header/SubNavigation.tsx
@@ -17,7 +17,7 @@ const navigations = [
   {
     key: "기숙사 생활",
     items: [
-      { name: "🚪 (미완)", href: "/" },
+      { name: "🚪 입사 체크", href: "/" },
       { name: "☕️ 베르실 예약", href: "/reserve" },
     ],
     isDisplayNoneAtResponsive: false,

diff --git a/src/provider/provider.helper.tsx b/src/provider/provider.helper.tsx
@@ -9,15 +9,15 @@ import StyledComponentsProvider from "./styledComponentsProvider.helper";
 
 const Provider = ({ children }: React.PropsWithChildren) => {
   return (
-    <ReactQueryProvider>
-      <ApolloClientProvider>
-        <RecoilRoot>
-          <LayoutProvider>
-            <StyledComponentsProvider>{children}</StyledComponentsProvider>
-          </LayoutProvider>
-        </RecoilRoot>
-      </ApolloClientProvider>
-    </ReactQueryProvider>
+    <StyledComponentsProvider>
+      <ReactQueryProvider>
+        <ApolloClientProvider>
+          <RecoilRoot>
+            <LayoutProvider>{children}</LayoutProvider>
+          </RecoilRoot>
+        </ApolloClientProvider>
+      </ReactQueryProvider>
+    </StyledComponentsProvider>
   );
 };
 

diff --git a/src/provider/styledComponentsProvider.helper.tsx b/src/provider/styledComponentsProvider.helper.tsx
@@ -1,14 +1,15 @@
 "use client";
 
-import React, { useState } from "react";
 import { useServerInsertedHTML } from "next/navigation";
+import type { ReactNode } from "react";
+import { useState } from "react";
 import { ServerStyleSheet, StyleSheetManager } from "styled-components";
 
-export default function StyledComponentsProvider({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+interface Props {
+  children: ReactNode;
+}
+
+const StyledComponentsRegistry = ({ children }: Props) => {
   const [styledComponentsStyleSheet] = useState(() => new ServerStyleSheet());
 
   useServerInsertedHTML(() => {
@@ -26,4 +27,6 @@ export default function StyledComponentsProvider({
       {children}
     </StyleSheetManager>
   );
-}
+};
+
+export default StyledComponentsRegistry;
diff --git a/src/templates/home/index.tsx b/src/templates/home/index.tsx
@@ -11,7 +11,6 @@ import HomeReserve from "./layouts/HomeReserve";
 import HomeMainBanner from "./layouts/HomeMainBanner";
 import HomeCalender from "./layouts/HomeCalender";
 import HomePost from "./layouts/HomePost";
-import HomeRadarChart from "./layouts/HomeRadarChart";
 import HomeMiniBanner from "./layouts/HomeMiniBanner";
 import HomeBamboo from "./layouts/HomeBamboo";
 

diff --git a/src/templates/home/layouts/HomeBamboo.tsx b/src/templates/home/layouts/HomeBamboo.tsx
@@ -18,7 +18,7 @@ const HomeBamboo = ({ allowedId, content }: IHomeBambooProps) => {
         href="/bamboo"
       />
       <StyledContent>
-        {content.length > 30 ? `${content}...` : content}
+        {content?.length > 30 ? `${content}...` : content}
       </StyledContent>
     </Container>
   );

diff --git a/src/templates/home/layouts/HomeCalender.tsx b/src/templates/home/layouts/HomeCalender.tsx
@@ -16,9 +16,9 @@ interface IHomeCalenderProps {
 const HomeCalender = ({ calenders }: IHomeCalenderProps) => {
   return (
     <Container>
-      <HomeHead icon={<CalenderIcon />} title="오늘의 일정" href="/Calender" />
+      <HomeHead icon={<CalenderIcon />} title="오늘의 일정" href="/calender" />
       <CalenderBody>
-        {calenders.map((calender) => (
+        {calenders?.map((calender) => (
           <CalenderContent>
             - {calender.title} <span>{getPlanType(calender.type)}</span>
           </CalenderContent>

diff --git a/src/templates/home/layouts/HomePostList.tsx b/src/templates/home/layouts/HomePostList.tsx
@@ -17,7 +17,7 @@ const HomePostList = ({ posts }: IHomePostListProps) => {
   const { formatDate } = useDate();
   return (
     <Container>
-      {posts.map((post) => (
+      {posts?.map((post) => (
         <PostListItem href={`${ROUTER.POST.LIST}/${post.id}`} key={post.id}>
           <StyledTitle>{post.title}</StyledTitle>
           <StyledDate>

diff --git a/src/templates/meister/index.tsx b/src/templates/meister/index.tsx
@@ -154,7 +154,7 @@ const MeisterPage = () => {
                   </StatusCardBox>
                   <Row width="100%" justifyContent="space-between">
                     {meisterData.isSuccess && (
-                      <YearlyMeisterScore meisterData={meister} />
+                      <YearlyMeisterScore meisterData={meisterData.data} />
                     )}
                     <Distribution meisterData={meister} />
                   </Row>