Merge pull request #221 from Nexters/develop

[운영배포] 공연상세 개선 및 선물 페이지 이미지 변경
Nexters · Oct 18, 2024 · 4f13b64 · 4f13b64
2 parents 8702b9d + a3dea0c
commit 4f13b64
Show file tree

Hide file tree

Showing 17 changed files with 283 additions and 236 deletions.
diff --git a/apps/admin/src/App.tsx b/apps/admin/src/App.tsx
@@ -25,11 +25,6 @@ import {
   OAuthKakaoPage,
   HomePage,
   ShowAddCompletePage,
-  ShowEnterancePage,
-  ShowInfoPage,
-  ShowReservationPage,
-  ShowSettlementPage,
-  ShowTicketPage,
   SignUpCompletePage,
   SitePolicyPage,
   GiftRegisterPage,
@@ -39,6 +34,12 @@ import {
 import ShowAddPage from './pages/ShowAddPage';
 import { Suspense } from 'react';
 import { domAnimation, LazyMotion } from 'framer-motion';
+import ShowDetailLayout from './components/ShowDetailLayout';
+import ShowInfoPage from './pages/ShowInfoPage';
+import ShowTicketPage from './pages/ShowTicketPage';
+import ShowReservationPage from './pages/ShowReservationPage';
+import ShowSettlementPage from './pages/ShowSettlementPage';
+import ShowEnterancePage from './pages/ShowEnterancePage';
 
 setDefaultOptions({ locale: ko });
 
@@ -125,15 +126,25 @@ const privateRoutes = [
       { path: PATH.HOME, element: <HomePage /> },
       { path: PATH.SHOW_ADD, element: <ShowAddPage step="info" /> },
       { path: PATH.SHOW_ADD_TICKET, element: <ShowAddPage step="ticket" /> },
-      { path: PATH.SHOW_INFO, element: <ShowInfoPage /> },
-      { path: PATH.SHOW_TICKET, element: <ShowTicketPage /> },
-      { path: PATH.SHOW_RESERVATION, element: <ShowReservationPage /> },
-      { path: PATH.SHOW_ENTRANCE, element: <ShowEnterancePage /> },
-      { path: PATH.SHOW_SETTLEMENT, element: <ShowSettlementPage /> },
       {
         path: PATH.SHOW_ADD_COMPLETE,
         element: <ShowAddCompletePage />,
       },
+      {
+        path: '/',
+        element: (
+          <ShowDetailLayout>
+            <Outlet />
+          </ShowDetailLayout>
+        ),
+        children: [
+          { path: PATH.SHOW_INFO, element: <ShowInfoPage /> },
+          { path: PATH.SHOW_TICKET, element: <ShowTicketPage /> },
+          { path: PATH.SHOW_RESERVATION, element: <ShowReservationPage /> },
+          { path: PATH.SHOW_ENTRANCE, element: <ShowEnterancePage /> },
+          { path: PATH.SHOW_SETTLEMENT, element: <ShowSettlementPage /> },
+        ],
+      },
     ],
   },
 ];

diff --git a/apps/admin/src/components/ShowCastInfo/ShowCastInfo.styles.ts b/apps/admin/src/components/ShowCastInfo/ShowCastInfo.styles.ts
@@ -21,6 +21,10 @@ const Header = styled.div`
   color: ${({ theme }) => theme.palette.grey.g90};
   ${({ theme }) => theme.typo.sh2};
   padding: 24px 28px;
+
+  &:last-child {
+    border-radius: 8px;
+  }
 `;
 
 const EditButton = styled(Button)`

diff --git a/apps/admin/src/components/ShowCastInfo/index.tsx b/apps/admin/src/components/ShowCastInfo/index.tsx
@@ -61,32 +61,34 @@ const ShowCastInfo = ({ showCastInfo, onSave, onDelete }: Props) => {
           편집하기
         </Styled.EditButton>
       </Styled.Header>
-      <Styled.Cast
-        animate={{ transition: { type: 'tween' }, height: isOpen ? 'auto' : 0 }}
-        transition={{ duration: 0.4 }}
-        initial={{ height: 0, opacity: 1 }}
-        exit={{ height: 0, opacity: 1 }}
-      >
-        {members.map((member) => (
-          <Styled.CastItem key={member.id}>
-            <Styled.UserImage
-              style={{ '--imgPath': `url(${member.userImgPath})` } as React.CSSProperties}
-            />
-            <Styled.Username>{member.userNickname}</Styled.Username>
-            <Styled.Rolename>({member.roleName})</Styled.Rolename>
-          </Styled.CastItem>
-        ))}
-      </Styled.Cast>
       {memberLength > 0 && (
-        <Styled.CollapseButton
-          onClick={(e) => {
-            e.preventDefault();
-            toggle();
-          }}
-        >
-          {isOpen ? '팀원 리스트 접기' : '팀원 리스트 펼쳐보기'}
-          {isOpen ? <ChevronUpIcon /> : <ChevronDownIcon />}
-        </Styled.CollapseButton>
+        <>
+          <Styled.Cast
+            animate={{ transition: { type: 'tween' }, height: isOpen ? 'auto' : 0 }}
+            transition={{ duration: 0.4 }}
+            initial={{ height: 0, opacity: 1 }}
+            exit={{ height: 0, opacity: 1 }}
+          >
+            {members.map((member) => (
+              <Styled.CastItem key={member.id}>
+                <Styled.UserImage
+                  style={{ '--imgPath': `url(${member.userImgPath})` } as React.CSSProperties}
+                />
+                <Styled.Username>{member.userNickname}</Styled.Username>
+                <Styled.Rolename>({member.roleName})</Styled.Rolename>
+              </Styled.CastItem>
+            ))}
+          </Styled.Cast>
+          <Styled.CollapseButton
+            onClick={(e) => {
+              e.preventDefault();
+              toggle();
+            }}
+          >
+            {isOpen ? '팀원 리스트 접기' : '팀원 리스트 펼쳐보기'}
+            {isOpen ? <ChevronUpIcon /> : <ChevronDownIcon />}
+          </Styled.CollapseButton>
+        </>
       )}
     </Styled.Container>
   );

diff --git a/apps/admin/src/components/ShowCastInfoFormDialogContent/index.tsx b/apps/admin/src/components/ShowCastInfoFormDialogContent/index.tsx
@@ -99,7 +99,6 @@ const ShowCastInfoFormDialogContent = ({ onDelete, prevShowCastInfo, onSave }: P
           <Styled.Row key={field._id}>
             <Controller
               control={control}
-              defaultValue={field.userCode}
               render={({ field: { onChange, onBlur } }) => {
                 const value = field.userCode;
                 const isError = Boolean(