Skip to content

Commit

Permalink
Merge pull request #173 from Gosrock/dev
Browse files Browse the repository at this point in the history
예매 마감 처리
  • Loading branch information
ImNM authored Feb 27, 2022
2 parents 6276f62 + d75e63a commit 098d035
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/components/LandingPage/HomePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ function HomePage({ ticketing, list }) {
티켓 예매과정에 고스락 선배들과의 밥약(소모임)을 신청 할 수
있습니다.
</li>
<li> 소모임 신청은 공연 3일전 마감됩니다. </li>
<li> 소모임 신청은 3월 3일 자정에 마감됩니다. </li>
<li>
티켓을 발급한 이후 마이페이지에서 소모임 신청에 대해 취소,
신청을 다시 할 수 있습니다.
Expand Down
7 changes: 5 additions & 2 deletions src/components/LandingPage/LandingPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ function LandingPage() {
const { ticketingAvailable } = useSelector(state => state.ticketingAvail);

const ticketingButtonHandler = () => {
if (authenticated) {
/* if (authenticated) {
return history.push('/ticketing/amount');
}
history.push('/ticketing/landing');
history.push('/ticketing/landing'); */
alert(
'저희가 준비한 티켓이 모두 매진되었습니다. \n기타 문의사항은 카카오톡 채널로 주시길 바랍니다. 감사합니다'
);
};
const listButtonHandler = () => {
if (authenticated) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ function SendValidationNumberPage({ ...props }) {
bottomLabel="휴대폰 인증이 필요해요."
/>
<ProcessDescription
topLabel="하이픈( - ) 없이"
bottomLabel="숫자로만 입력해주세요."
topLabel="문자로 발송된 인증번호"
bottomLabel="여섯자리를 입력해주세요."
/>
</TicketBodyHeader>
<TicketBody>
Expand Down
6 changes: 4 additions & 2 deletions src/components/TicketingProcess/TicketingProcess.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ function TicketingProcess({ location }) {
);
return (
<Routes location={location}>
<Route
{/* 티켓 매진 -> 예매 프로세스 마감 */}
{/* <Route
exact
path="landing"
//애니메이션을 위해 absolute로 설정해야함!
Expand All @@ -41,7 +42,8 @@ function TicketingProcess({ location }) {
path="deposit"
//애니메이션을 위해 absolute로 설정해야함!
element={<RATicketingDepositPage style={{ position: 'absolute' }} />}
/>
/> */}

{/* <Route
exact
path="validation"
Expand Down

0 comments on commit 098d035

Please sign in to comment.