[#47] Feat CheckSignUpPage

- List & Detail API 생성 및 연동
potato-club · Jun 29, 2023 · aa71e3f · aa71e3f
1 parent e33fb22
commit aa71e3f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/src/components/adminPage/AdminDetailPage.tsx b/src/components/adminPage/AdminDetailPage.tsx
@@ -20,11 +20,13 @@ export const AdminDetailPage = () => {
           email={data?.email}
           hotLine={data?.hotLine}
           subLine={data?.subLine}
+          isLoading={isLoading}
         />
         <SignUpSiteInfo
           siteName={data?.siteName}
           purpose={data?.purpose}
           owner={data?.owner}
+          isLoading={isLoading}
         />
         <SignUpAddInfo
           mainColor={data?.mainColor}
@@ -34,6 +36,7 @@ export const AdminDetailPage = () => {
           database={data?.database}
           etc={data?.etc}
           meeting={data?.meeting}
+          isLoading={isLoading}
         />
       </WrapperInner>
     </Wrapper>

diff --git a/src/components/adminPage/SignUpAddInfo.tsx b/src/components/adminPage/SignUpAddInfo.tsx
@@ -13,6 +13,7 @@ interface Props {
   database: boolean | undefined;
   etc: string | undefined;
   meeting: string | undefined;
+  isLoading: boolean;
 }
 
 export const SignUpAddInfo = (props: Props) => {
@@ -29,13 +30,13 @@ export const SignUpAddInfo = (props: Props) => {
         <BoxItem>
           <BoxItemLabel>브랜드 컬러1</BoxItemLabel>
           <BoxItemContent>
-            <ColorPalette data={props.mainColor!} />
+            <ColorPalette data={props.isLoading ? [] : props.mainColor!} />
           </BoxItemContent>
         </BoxItem>
         <BoxItem>
           <BoxItemLabel>브랜드 컬러2</BoxItemLabel>
           <BoxItemContent>
-            <ColorPalette data={props.subColor!} />
+            <ColorPalette data={props.isLoading ? [] : props.subColor!} />
           </BoxItemContent>
         </BoxItem>
         <BoxItem>
@@ -60,12 +61,13 @@ export const SignUpAddInfo = (props: Props) => {
         </BoxItem>
         <BoxItem>
           <BoxItemLabel>기타사항</BoxItemLabel>
-          <BoxItemContent>{props.etc}</BoxItemContent>
+          <BoxItemContent>{props.isLoading && props.etc}</BoxItemContent>
         </BoxItem>
         <BoxItem>
           <BoxItemLabel>*첫 미팅 희망날짜</BoxItemLabel>
           <BoxItemContent>
-            {date![0]}({daysOfWeek[time.getDay()]}) / {date![1].slice(0, 5)}
+            {date !== undefined && date?.[0]}({daysOfWeek[time.getDay()]}) /{" "}
+            {date?.[1].slice(0, 5)}
           </BoxItemContent>
         </BoxItem>
       </Box>

diff --git a/src/components/adminPage/SignUpSiteInfo.tsx b/src/components/adminPage/SignUpSiteInfo.tsx
@@ -7,6 +7,7 @@ interface Props {
   siteName: string | undefined;
   purpose: string | undefined;
   owner: "COMPANY" | "PERSONAL" | "PUBLIC" | undefined;
+  isLoading: boolean;
 }
 
 export const SignUpSiteInfo = (props: Props) => {
@@ -28,7 +29,7 @@ export const SignUpSiteInfo = (props: Props) => {
         <BoxItem>
           <BoxItemLabel>*사이트 운영자</BoxItemLabel>
           <BoxItemContent>
-            <OrdererRadioBoxs data={props.owner!} />
+            <OrdererRadioBoxs data={props.isLoading ? null : props.owner!} />
           </BoxItemContent>
         </BoxItem>
       </Box>

diff --git a/src/components/adminPage/SignUpUserInfo.tsx b/src/components/adminPage/SignUpUserInfo.tsx
@@ -7,6 +7,7 @@ interface Props {
   email: string | undefined;
   hotLine: string | undefined;
   subLine: string | undefined;
+  isLoading: boolean;
 }
 
 export const SignUpUserInfo = (props: Props) => {

diff --git a/src/components/adminPage/components/OrdererRadioBoxs.tsx b/src/components/adminPage/components/OrdererRadioBoxs.tsx
@@ -2,7 +2,7 @@ import styled from "styled-components";
 import { customColor } from "../../customColor";
 
 interface Props {
-  data: "COMPANY" | "PUBLIC" | "PERSONAL";
+  data: "COMPANY" | "PUBLIC" | "PERSONAL" | null;
 }
 
 export const OrdererRadioBoxs = ({ data }: Props) => {