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.

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

[Feat/#102] 공연 정보 입력 뷰 구현 #109

Merged
merged 21 commits into from
Jul 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
35f8f86
feat: 공연 정보 입력 기본 틀 작성
imddoy Jul 11, 2024
c3bec36
feat: Register 페이지 구현(기간, 티켓 수, 회차 번호 제외)
imddoy Jul 11, 2024
8b443d0
chore: 파일 분리
imddoy Jul 11, 2024
7f24387
chore: 타입 wargning 해결
imddoy Jul 11, 2024
466abdc
feat: 모든 회차에 동일한 티켓 수 적용
imddoy Jul 11, 2024
91b407f
design: 장르 선택시 아이콘색 변경
imddoy Jul 11, 2024
f96d7a7
feat: 다음 버튼 구현
imddoy Jul 11, 2024
6dff330
feat: 공연 기간 및 회차 번호 생성
imddoy Jul 11, 2024
ba5ab18
chore: 안쓰는 값들 삭제
imddoy Jul 11, 2024
1ed3c07
Merge branch 'develop' into feat/#102/GigRegister
imddoy Jul 12, 2024
0e44b3c
feat: 무료 공연 및 약관 동의 구현
imddoy Jul 12, 2024
1439593
design: textarea padding값 수정
imddoy Jul 12, 2024
e1ca9e3
feat: 무료 공연 계좌 입력 비활성화
imddoy Jul 14, 2024
e3096a6
design: 회차 수 설명 추가
imddoy Jul 14, 2024
b4e5732
Merge branch 'develop' into feat/#102/GigRegister
imddoy Jul 14, 2024
3a2582f
fix: 포스터 사진 삭제되면 버튼 비활성화
imddoy Jul 14, 2024
d02f25d
Merge branch 'feat/#102/GigRegister' of https://github.com/TEAM-BEAT/…
imddoy Jul 14, 2024
0f7c1b4
fix: Register styled 중복 선언 해결
imddoy Jul 14, 2024
9aa4e76
Merge branch 'develop' into feat/#102/GigRegister
imddoy Jul 14, 2024
49bb097
fix: const 불변성 유지
imddoy Jul 14, 2024
69175a8
design: 타임피커 focus 배경색 변경
imddoy Jul 14, 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
Prev Previous commit
Next Next commit
Merge branch 'develop' into feat/#102/GigRegister
imddoy authored Jul 14, 2024
commit b4e57324c0bcad08c71359c577622baf13bbb5ca
3 changes: 3 additions & 0 deletions src/assets/svgs/index.tsx
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ export { default as IconCalendar } from "./IconCalendar";
export { default as IconCamera } from "./IconCamera";
export { default as IconCheck } from "./IconCheck";
export { default as IconChecked } from "./IconChecked";
export { default as IconCheckboxSelectedOn } from "./IconCheckboxSelectedOn";
export { default as IconCheckboxUnselectedOn } from "./IconCheckboxUnselectedOn";
export { default as IconChevronBack } from "./IconChevronBack";
export { default as IconEyeOff } from "./IconEyeOff";
export { default as IconEyeOn } from "./IconEyeOn";
export { default as IconHanna } from "./IconHanna";
34 changes: 34 additions & 0 deletions src/pages/register/Register.styled.ts
Original file line number Diff line number Diff line change
@@ -185,3 +185,37 @@ export const TimePickerWrapper = styled.section`
${Generators.flexGenerator("column", "center", "center")}
gap: 1.6rem;
`;

// 완료 페이지
export const RegisterCompleteLayout = styled.section`
width: 37.4rem;
padding: 2.4rem;
`;

export const RegisterCompleteWrapper = styled.article`
display: flex;
flex-direction: column;
align-items: center;
margin: 12rem 2.4rem 22rem;
`;

export const RegisterCompleteTitle = styled.h1`
color: ${({ theme }) => theme.colors.white};
${({ theme }) => theme.fonts.heading3}
text-align: center;
`;

export const ReigsterCompleteSubTitle = styled.p`
color: ${({ theme }) => theme.colors.gray_300};
${({ theme }) => theme.fonts["body2-normal-medi"]}
text-align: center;
`;

export const FooterContainer = styled.div`
position: sticky;
bottom: 0;
padding: 2.4rem;

background-color: ${({ theme }) => theme.colors.gray_900};
`;

1 change: 1 addition & 0 deletions src/routes/Router.tsx
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ const router = createBrowserRouter([
{ path: "lookup", element: <Lookup /> },
{ path: "testpage", element: <TestPage /> },
{ path: "gig-register", element: <Register /> },
{ path: "register-complete", element: <RegisterComplete /> },
{ path: "gig/:performanceId", element: <Gig /> },
{ path: "manage", element: <Manage /> },
{ path: "ticketholderlist", element: <TicketHolderList /> },
You are viewing a condensed version of this merge commit. You can view the full changes here.