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

공연 생성 페이지 QA 반영 #261

Merged
merged 5 commits into from
Jan 12, 2025
Merged

공연 생성 페이지 QA 반영 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59d6588
fix: 공연 생성 페이지에서 팀 정보 추가 후, 다른 페이지로부터 돌아오면 입력된 팀 정보가 보이지 않는 문제 수정
Puterism Jan 11, 2025
b15ca5d
fix: 공연 등록 후, 바로 공연 상세 페이지로 이동하도록 수정 및 공연 등록 완료 페이지 삭제
Puterism Jan 11, 2025
ba16318
fix: 공연 상세 페이지에서 저장 후 페이지 이탈 팝업이 노출되지 않는 문제 수정
Puterism Jan 11, 2025
09e81a9
feat: 공연 상세 페이지에서 수정사항 존재 시 페이지 이동 팝업 내용 및 동작 수정
Puterism Jan 12, 2025
b2f6986
fix: 공연 생성 페이지 디자인 QA 반영
Puterism Jan 12, 2025
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
5 changes: 0 additions & 5 deletions apps/admin/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
QRPage,
OAuthKakaoPage,
HomePage,
ShowAddCompletePage,
SignUpCompletePage,
SitePolicyPage,
GiftRegisterPage,
Expand Down Expand Up @@ -131,10 +130,6 @@ const privateRoutes = [
{ path: PATH.SHOW_ADD, element: <ShowAddPage step="basic" /> },
{ path: PATH.SHOW_ADD_DETAIL, element: <ShowAddPage step="detail" /> },
{ path: PATH.SHOW_ADD_SALES, element: <ShowAddPage step="sales" /> },
{
path: PATH.SHOW_ADD_COMPLETE,
element: <ShowAddCompletePage />,
},
{
path: '/',
element: (
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/src/components/ShowDetailLayout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ const TabItem = ({ type }: TabItemProps) => {
<Styled.TabItem
active={match !== null}
id={type === 'SETTLEMENT' ? 'settlement-page-tooltip' : undefined}
onClick={() => {
onClick={async () => {
if (!params.showId) return;

if (middleware && !middleware()) {
if (middleware && !(await middleware())) {
return;
}

Expand Down
1 change: 0 additions & 1 deletion apps/admin/src/constants/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export const PATH = {
SHOW_ADD: '/show/add',
SHOW_ADD_DETAIL: '/show/add/detail',
SHOW_ADD_SALES: '/show/add/sales',
SHOW_ADD_COMPLETE: '/show/add/complete',

SHOW_INFO: '/show/:showId/info',
SHOW_TICKET: '/show/:showId/ticket',
Expand Down
201 changes: 0 additions & 201 deletions apps/admin/src/pages/ShowAddCompletePage/ShowAddCompletePage.styles.ts
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions apps/admin/src/pages/ShowAddCompletePage/index.tsx
View file
Open in desktop

This file was deleted.

12 changes: 10 additions & 2 deletions apps/admin/src/pages/ShowAddPage/ShowAddPage.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,22 @@ const ProcessIndicator = styled.div`
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 40px;
margin-bottom: 16px;

${mq_lg} {
margin-bottom: 28px;
}
`;

const CardDescription = styled.p`
${({ theme }) => theme.typo.b1};
color: ${({ theme }) => theme.palette.grey.g60};
text-align: center;
margin-bottom: 40px;
margin-bottom: 32px;

${mq_lg} {
margin-bottom: 40px;
}
`;

const ShowAddForm = styled.form`
Expand Down
6 changes: 4 additions & 2 deletions apps/admin/src/pages/ShowAddPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
ShowDetailInfoFormInputs,
ShowSalesInfoFormInputs,
} from '~/components/ShowInfoFormContent/types';
import { PATH } from '~/constants/routes';
import { HREF, PATH } from '~/constants/routes';

import Styled from './ShowAddPage.styles';
import ShowCastInfoFormContent from '~/components/ShowInfoFormContent/ShowCastInfoFormContent';
Expand Down Expand Up @@ -127,7 +127,8 @@ const ShowAddPage = ({ step }: ShowAddPageProps) => {
return;
}

navigate(PATH.SHOW_ADD_COMPLETE);
toast.success('공연 등록을 완료했습니다.')
navigate(HREF.SHOW_INFO(showId));
};

const basicStepContent = (
Expand Down Expand Up @@ -190,6 +191,7 @@ const ShowAddPage = ({ step }: ShowAddPageProps) => {
</Styled.ShowInfoFormContent>
<Styled.ShowInfoFormContent style={{ marginBottom: '32px' }}>
<ShowCastInfoFormContent
initialCastTeamList={castTeamList}
onChange={(data) => {
setCastTeamList(data);
}}
Expand Down
Loading
Loading