Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[운영배포] 공연상세 개선 및 선물 페이지 이미지 변경 #221

Merged
merged 10 commits into from
Oct 18, 2024
Merged

[운영배포] 공연상세 개선 및 선물 페이지 이미지 변경 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
38ffa63
refac: 공연 상세는 레이지 로딩 하지 않으며 레이웃은 라우터에서 주입
alstn2468 Oct 11, 2024
6930f63
chore: 린트 경고 수정
alstn2468 Oct 11, 2024
0bfea07
feat: 선물 수령 화면 > 선물 배경 이미지 변경
hexdrinker Oct 14, 2024
7247b2f
feat: 칩 컬러코드 변경
hexdrinker Oct 15, 2024
1b03a1f
Merge pull request #220 from Nexters/fix/gift-chip-color
hexdrinker Oct 15, 2024
faa09a9
Merge pull request #219 from Nexters/refac/show-detail-layout
alstn2468 Oct 15, 2024
600dd6d
fix: 출연징 팀원 없을 때 하단 radius 적용
alstn2468 Oct 15, 2024
230d846
Merge pull request #222 from Nexters/fix/empty-cast-info
alstn2468 Oct 15, 2024
545d723
fix: 포스터 이미지 높이 설정 및 공연 초대 메시지 줄바꿈 처리
hexdrinker Oct 18, 2024
a3dea0c
Merge pull request #223 from Nexters/fix/gift-info-poster-image
hexdrinker Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions apps/admin/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ import {
OAuthKakaoPage,
HomePage,
ShowAddCompletePage,
ShowEnterancePage,
ShowInfoPage,
ShowReservationPage,
ShowSettlementPage,
ShowTicketPage,
SignUpCompletePage,
SitePolicyPage,
GiftRegisterPage,
Expand All @@ -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 });

Expand Down Expand Up @@ -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 /> },
],
},
],
},
];
Expand Down
4 changes: 4 additions & 0 deletions apps/admin/src/components/ShowCastInfo/ShowCastInfo.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)`
Expand Down
52 changes: 27 additions & 25 deletions apps/admin/src/components/ShowCastInfo/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand Down
1 change: 0 additions & 1 deletion apps/admin/src/components/ShowCastInfoFormDialogContent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading
Loading