-
Notifications
You must be signed in to change notification settings - Fork 2
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
새터반 택시대제전 이벤트 참여 모달 제작 #738
Merged
The head ref may contain hidden characters: "#737-\uC0C8\uD130\uBC18-\uD0DD\uC2DC\uB300\uC81C\uC804-\uC774\uBCA4\uD2B8-\uCC38\uC5EC-\uBAA8\uB2EC-\uC81C\uC791"
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
0877b40
Add: 새터반 택시 대제전 이벤트 참여 모달 만들기
pbc1017 3d11758
Merge branch 'dev' into #737-새터반-택시대제전-이벤트-참여-모달-제작
pbc1017 0406974
Refactor: accept feedback
pbc1017 68710e1
Refactor: accept feedback
pbc1017 49d9f31
Refactor: 추천인 링크 접속시 모달 표시, 모달에 추천인 표시
pbc1017 27c16fd
Fix: 빌드 오류 해결
pbc1017 fd5f242
Add: min, max properties to freshman group input element
kmc7468 215fc9b
Remove: unused fields in LoginInfoType
kmc7468 2b66c44
Remove: randomToken in SuggestJoinEventContainer
kmc7468 713aa8e
Refactor: minor changes in terms of event
kmc7468 3d540d5
Merge branch 'dev' into #737-새터반-택시대제전-이벤트-참여-모달-제작
kmc7468 1311c29
Fix: build error
kmc7468 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
267 changes: 267 additions & 0 deletions
267
packages/web/src/components/ModalPopup/ModalEvent2024SpringJoin.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,267 @@ | ||
| import { useCallback, useMemo, useState } from "react"; | ||
| import { useLocation } from "react-router-dom"; | ||
|
|
||
| import { useEvent2024SpringQuestComplete } from "@/hooks/event/useEvent2024SpringQuestComplete"; | ||
| import { | ||
| useFetchRecoilState, | ||
| useIsLogin, | ||
| useValueRecoilState, | ||
| } from "@/hooks/useFetchRecoilState"; | ||
| import { useAxios } from "@/hooks/useTaxiAPI"; | ||
|
|
||
| import Button from "@/components/Button"; | ||
| import DottedLine from "@/components/DottedLine"; | ||
| import Input from "@/components/Input"; | ||
| import Modal from "@/components/Modal"; | ||
|
|
||
| import alertAtom from "@/atoms/alert"; | ||
| import { useSetRecoilState } from "recoil"; | ||
|
|
||
| import regExpTest from "@/tools/regExpTest"; | ||
| import theme from "@/tools/theme"; | ||
|
|
||
| import FestivalRoundedIcon from "@mui/icons-material/FestivalRounded"; | ||
|
|
||
| type ModalEvent2024SpringJoinProps = Parameters<typeof Modal>[0]; | ||
|
|
||
| const ModalEvent2024SpringJoin = ( | ||
| modalProps: ModalEvent2024SpringJoinProps | ||
| ) => { | ||
| const axios = useAxios(); | ||
| const setAlert = useSetRecoilState(alertAtom); | ||
| const isLogin = useIsLogin(); | ||
| const { phoneNumber: phoneNumberFromLoginInfo } = | ||
| useValueRecoilState("loginInfo") || {}; | ||
| const { isAgreeOnTermsOfEvent } = | ||
| useValueRecoilState("event2024SpringInfo") || {}; | ||
| const { group: groupFromLoginInfo } = | ||
| useValueRecoilState("event2024SpringInfo") || {}; | ||
| const fetchLoginInfo = useFetchRecoilState("loginInfo"); | ||
| //#region event2024Spring | ||
| const event2024SpringQuestComplete = useEvent2024SpringQuestComplete(); | ||
| //#endregion | ||
|
|
||
| const [phoneNumber, setPhoneNumber] = useState<string>(""); | ||
| const [group, setGroup] = useState<number>(0); | ||
| // 추천인 구현 방식에 따라 삭제가 필요할 수도 있습니다. | ||
| const [inviter] = useState<string>(""); | ||
|
|
||
| const isValidPhoneNumber = useMemo( | ||
| () => regExpTest.phoneNumber(phoneNumber), | ||
| [phoneNumber] | ||
| ); | ||
| const isValidGroup = useMemo(() => group > 0 && group < 27, [group]); | ||
|
|
||
| const location = useLocation(); | ||
| const path = location.pathname; | ||
| const isInvited = path.startsWith("/home/startEvent/"); | ||
|
|
||
| const onClickJoin = useCallback( | ||
| () => | ||
| axios({ | ||
| url: "/events/2024spring/globalState/create", | ||
| method: "post", | ||
| data: { phoneNumber, group, inviter }, | ||
| onSuccess: () => { | ||
| fetchLoginInfo(); | ||
| //#region event2024Spring | ||
| event2024SpringQuestComplete("firstLogin"); | ||
| //#endregion | ||
| modalProps.onChangeIsOpen?.(false); | ||
| }, | ||
| onError: () => setAlert("이벤트 참여에 실패하였습니다."), | ||
| }), | ||
| [phoneNumber, setPhoneNumber, event2024SpringQuestComplete] | ||
| ); | ||
|
|
||
| const styleTitle = { | ||
| ...theme.font18, | ||
| display: "flex", | ||
| alignItems: "center", | ||
| margin: "0 8px 12px", | ||
| }; | ||
| const styleIcon = { | ||
| fontSize: "21px", | ||
| margin: "0 4px 0 0", | ||
| }; | ||
| const styleText = { | ||
| ...theme.font12, | ||
| color: theme.gray_text, | ||
| margin: "0 8px", | ||
| }; | ||
| const styleInputWrap = { | ||
| margin: "12px 8px", | ||
| display: "flex", | ||
| alignItems: "center", | ||
| color: theme.gray_text, | ||
| whiteSpace: "nowrap", | ||
| ...theme.font14, | ||
| } as const; | ||
|
|
||
| return ( | ||
| <Modal padding="16px 12px 12px" {...modalProps}> | ||
| <div css={styleTitle}> | ||
| <FestivalRoundedIcon style={styleIcon} /> | ||
| 새터반 택시대제전 이벤트 | ||
| </div> | ||
| <div css={styleText}> | ||
| • 택시 동승을 하지 않는 사용자는{" "} | ||
| <b css={{ color: theme.black }}> | ||
| 택시 출발 시각이 지나기 전에 탑승 취소 | ||
| </b> | ||
| 를 하여 방에서 나가야 합니다. | ||
| </div> | ||
| <div css={{ height: "12px" }} /> | ||
| <div css={styleText}> | ||
| • 실제 Taxi 동승을 하지 않고{" "} | ||
| <b css={{ color: theme.black }}>허위로 방을 개설하거나 참여</b>하여 | ||
| 이벤트 퀘스트를 달성하는 것은{" "} | ||
| <b css={{ color: theme.black }}>부정 이용</b>에 해당됩니다. Taxi 서비스 | ||
| 이용 중 서비스를 부정 이용하였다고 판단되거나, 신고를 받은 사용자에게는 | ||
| 사안에 따라{" "} | ||
| <b css={{ color: theme.black }}> | ||
| 이벤트 상품이 지급되지 않을 수 있습니다. | ||
| </b>{" "} | ||
| 위 경우, SPARCS Taxi팀 서비스 관리자는 서비스 부정 이용을 방지하기 위해 | ||
| 택시 탑승을 인증할 수 있는{" "} | ||
| <b css={{ color: theme.black }}>영수증 또는 카카오T 이용기록</b>을 | ||
| 요청할 수 있습니다. 또한, 본 서비스를 부정 이용하는 사용자에게는 택시 | ||
| 서비스 이용 제한 및 법적 조치를 취할 수 있습니다. | ||
| </div> | ||
| <div css={{ height: "12px" }} /> | ||
| <div css={styleText}> | ||
| •{" "} | ||
| <b css={{ color: theme.red_text }}> | ||
| 입력해주신 새터반으로 점수가 합산됩니다. | ||
| </b>{" "} | ||
| 또한, 입력해주신 연락처는 서비스 신고 대응 및 본인 확인을 위해 사용될 수 | ||
| 있습니다. | ||
| </div> | ||
| <div css={{ height: "12px" }} /> | ||
| <div css={styleText}> | ||
| •{" "} | ||
| <b css={{ color: theme.red_text }}> | ||
| 입력해주신 연락처와 새터반은 이후 수정이 불가능합니다. | ||
| </b>{" "} | ||
| </div> | ||
| <div css={{ height: "12px" }} /> | ||
| <div css={styleText}> | ||
| •{" "} | ||
| <b css={{ color: theme.red_text }}> | ||
| 추천인 이벤트 참여를 위해서는 추천인이 발송한 링크로 이벤트에 참여해야 | ||
| 합니다. | ||
| </b>{" "} | ||
| 추천인을 통해 이벤트에 참여할 시, 참가자와 추천인 모두에게 50 넙죽코인이 | ||
| 지급됩니다. | ||
| </div> | ||
| <div css={{ height: "12px" }} /> | ||
| <div css={styleText}> | ||
| • 본 약관은 동의 이후에도 {'"'}마이페이지{">"}새터반 택시대제전 이벤트 | ||
| 참여 약관{'"'}에서 다시 확인하실 수 있습니다.{" "} | ||
| </div> | ||
| {isLogin && | ||
| (isAgreeOnTermsOfEvent ? ( | ||
| <> | ||
| <div css={{ height: "12px" }} /> | ||
| <DottedLine /> | ||
| <div css={styleInputWrap}> | ||
| 전화번호 | ||
| <Input | ||
| value={phoneNumberFromLoginInfo || ""} | ||
| css={{ width: "100%", marginLeft: "10px" }} | ||
| /> | ||
| </div> | ||
| <div css={styleInputWrap}> | ||
| 새터반 | ||
| <Input | ||
| value={groupFromLoginInfo?.toString() || ""} | ||
| css={{ width: "100%", marginLeft: "10px" }} | ||
| /> | ||
| </div> | ||
| {/* 추천인이 있을 경우에만 표시하도록 변경 필요 */} | ||
| {/* <div css={styleInputWrap}> | ||
| 추천인 | ||
| <img | ||
| src="" | ||
| alt="추천인" | ||
| css={{ width: "24px", height: "24px", marginLeft: "10px" }} | ||
| /> | ||
| <span css={{ marginLeft: "5px" }}>추천인닉네임</span> | ||
| </div> */} | ||
| <Button | ||
| type="purple_inset" | ||
| css={{ | ||
| width: "100%", | ||
| padding: "10px 0 9px", | ||
| borderRadius: "8px", | ||
| ...theme.font14_bold, | ||
| }} | ||
| disabled | ||
| > | ||
| 이미 동의하셨습니다 | ||
| </Button> | ||
| </> | ||
| ) : ( | ||
| <> | ||
| <div css={{ height: "12px" }} /> | ||
| <DottedLine /> | ||
| <div css={styleInputWrap}> | ||
| 전화번호 | ||
| <Input | ||
| value={phoneNumber} | ||
| onChangeValue={setPhoneNumber} | ||
| placeholder="010-0000-0000 형식으로 입력하세요" | ||
| css={{ width: "100%", marginLeft: "10px" }} | ||
| /> | ||
| </div> | ||
| <div css={styleInputWrap}> | ||
| 새터반 | ||
| <Input | ||
| type="number" | ||
| value={group.toString()} | ||
| min={1} | ||
| max={26} | ||
| onChangeValue={(value) => { | ||
| const number = parseInt(value, 10); | ||
| setGroup(number); | ||
| }} | ||
| placeholder="숫자만 입력하세요" | ||
| css={{ width: "100%", marginLeft: "10px" }} | ||
| /> | ||
| </div> | ||
| {isInvited && ( | ||
| <div css={styleInputWrap}> | ||
| 추천인 | ||
| <img | ||
| src="" | ||
| alt="추천인" | ||
| css={{ width: "24px", height: "24px", marginLeft: "10px" }} | ||
| /> | ||
| <span css={{ marginLeft: "5px" }}>추천인닉네임</span> | ||
| </div> | ||
| )} | ||
|
|
||
| <Button | ||
| type="purple_inset" | ||
| css={{ | ||
| width: "100%", | ||
| padding: "10px 0 9px", | ||
| borderRadius: "8px", | ||
| ...theme.font14_bold, | ||
| }} | ||
| onClick={onClickJoin} | ||
| disabled={!isValidPhoneNumber || !isValidGroup} | ||
| > | ||
| {!isValidPhoneNumber | ||
| ? "올바른 전화번호를 입력하세요" | ||
| : !isValidGroup | ||
| ? "올바른 새터반을 입력하세요" | ||
| : "동의 후 이벤트 참여하기"} | ||
| </Button> | ||
| </> | ||
| ))} | ||
| </Modal> | ||
| ); | ||
| }; | ||
|
|
||
| export default ModalEvent2024SpringJoin; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
지난 가을학기 때 쓰였던 WhiteContainerSuggestJoinEvent 코드와 비교하며 읽어보니, randomToken은 띄워야 할 컨테이너 종류가 여러 개였어서 그 중 하나를 랜덤으로 띄우기 위해 쓰였던 값 같습니다. 이번 봄학기 때에는 그럴 필요가 없어서, 관련 코드를 모두 삭제했습니다.