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

Jump to bottom

Hotfix/mobile join #253

Merged
merged 2 commits into from
Mar 31, 2023
Merged

Hotfix/mobile join #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2646c2a
[ feat ] scroll 상단으로 올리기
NYeonK Mar 31, 2023
fb9a7f5
[ fix ] 회원가입 이슈 해결 (임시)
NYeonK Mar 31, 2023
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
12 changes: 7 additions & 5 deletions src/@components/JoinPage/AgreePage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,23 @@ import { agreeListsContents } from "../../../util/join/agreeListsContents";
import { subHeaderInfo } from "../../../util/join/subHeaderInfo";
import Footer from "../../@common/Footer";
import useGTMPage from "../../@common/hooks/useGTMPage";
import useOutClickCloser from "../../@common/hooks/useOutClickCloser";
//import useOutClickCloser from "../../@common/hooks/useOutClickCloser";
import useScroll from "../../@common/hooks/useScroll";
import SubHeader from "../../@common/SubHeader";
import { UserInfoFormDataContext } from "..";
import { ModalContainerWithAnimation, St } from "./style";

export default function AgreePage() {
useGTMPage();
useScroll();

const { userInfoFormDataForPost } = useOutletContext<UserInfoFormDataContext>();

const navigate = useNavigate();

const outClickCloserRef = useOutClickCloser(() => {
setIsOpenAlert(false);
});
// const outClickCloserRef = useOutClickCloser(() => {
// setIsOpenAlert(false);
// });

const [isPickedItems, setIsPickedItems] = useState<boolean[]>([false, true, true, true, false]);
const [isOpenAlert, setIsOpenAlert] = useState(false);
Expand Down Expand Up @@ -120,7 +122,7 @@ export default function AgreePage() {
<St.JoinAgree>
<St.AgreeTitle>약관을 동의해주세요</St.AgreeTitle>
<St.AgreeContent>{agreeLists}</St.AgreeContent>
<ModalContainerWithAnimation isopen={isOpenAlert} ref={outClickCloserRef}>
<ModalContainerWithAnimation isopen={isOpenAlert} /*ref={outClickCloserRef}*/>
필수 항목에 동의해주세요
</ModalContainerWithAnimation>
<St.JoinButton className={GTM_CLASS_NAME.joinAgreeComplete} onClick={completeJoinBtn}>
Expand Down
2 changes: 2 additions & 0 deletions src/@components/JoinPage/UserProfilePage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { JOIN_FORM_DATA_KEY } from "../../../util/join/formData";
import { subHeaderInfo } from "../../../util/join/subHeaderInfo";
import { JOIN_PROFILE_ALERT_KEY, JOIN_PROFILE_ALERT_MESSAGE } from "../../../util/join/userProfileErrorMessage";
import Footer from "../../@common/Footer";
import useScroll from "../../@common/hooks/useScroll";
import SubHeader from "../../@common/SubHeader";
import { UserInfoFormDataContext } from "..";
import ProfileBirth from "./ProfileBirth";
Expand All @@ -16,6 +17,7 @@ import ProfileNickname from "./ProfileNickname";
import { St } from "./style";

export default function UserProfilePage() {
useScroll();
const navigate = useNavigate();

const { formDataNicknameValue, formDataBirthdayValue, formDataGenderValue, setUserInfoFormData } =
Expand Down