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

fix: 자잘한 오류 수정 #36

Merged
merged 9 commits into from
Jul 1, 2024
Merged

fix: 자잘한 오류 수정 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
782c08f
fix: 마이페이지 뒤로 가기 버튼 삭제
iOdiO89 Jul 1, 2024
b7b8fea
fix: 일반 설정 라우팅 주석처리
iOdiO89 Jul 1, 2024
3aaeab2
chore: 홈 화면 로그 삭제
iOdiO89 Jul 1, 2024
b55578b
fix: HeadFunction 뒤로가기 버튼 오류 수정
iOdiO89 Jul 1, 2024
e6d1216
fix: 비밀번호 변경 페이지 console.log 삭제
iOdiO89 Jul 1, 2024
5cdc973
fix: 마이페이지 버튼 문구 수정
iOdiO89 Jul 1, 2024
7ad79be
fix: 프로필 페이지 뒤로가기 버튼 보이게 수정
iOdiO89 Jul 1, 2024
77f815c
fix: tailwind css disabled prefix 사용
iOdiO89 Jul 1, 2024
b87d07e
Merge pull request #35 from team-Ollie/16-fix-final-home,mypage,admin
iOdiO89 Jul 1, 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
4 changes: 2 additions & 2 deletions components/HeadFunction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ export default function HeadFunction({
<FlexBox className="w-full h-[60px] px-4">
<div
className="w-5 h-5 shrink-0 items-center align-center"
onClick={router.back}
onClick={leftIcon ? () => router.back() : null}
>
<LeftArrowIcon width={20} height={20} />
{leftIcon && <LeftArrowIcon width={20} height={20} />}
</div>
<FlexBox className="w-full h-full justify-center">
<div className="h2">{title}</div>
Expand Down
4 changes: 0 additions & 4 deletions pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ const Home: NextPage = () => {
});
};

//isAdmin
const isAdmin = useAtomValue(isAdminAtom);
console.log("atom: ", isAdmin);

return (
<FlexBox direction="col" className="w-full h-full justify-between">
<HomeChallenge onNotify={notify} />
Expand Down
2 changes: 1 addition & 1 deletion pages/mypage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const MyPage: NextPage = () => {
<FlexBox direction="col" className="w-full gap-2">
<div
className="w-full py-4 px-6"
onClick={() => router.push("/mypage/setting")}
// onClick={() => router.push("/mypage/setting")}
>
일반 설정
</div>
Expand Down
6 changes: 2 additions & 4 deletions pages/mypage/password/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ const Password: NextPage = () => {
};
const checkNewPwError = () => {
if (newPw.length === 0) {
console.log(1);
setNewPwError({ status: false, text: "" });
return;
}
if (newPw === password) {
console.log(2);
setNewPwError({ status: true, text: "기존 비밀번호와 동일합니다" });
return;
}
Expand Down Expand Up @@ -98,7 +96,7 @@ const Password: NextPage = () => {

return (
<div>
<HeadFunction title="비밀번호 수정" />
<HeadFunction title="비밀번호 변경" />
<FlexBox direction="col" className="gap-8 px-4 w-full pt-4">
<TextInput
value={password}
Expand Down Expand Up @@ -129,7 +127,7 @@ const Password: NextPage = () => {
: "bg-main-color text-white"
}`}
onClick={changePassword}
text="새 비밀번호 저장"
text="변경하기"
/>
</FlexBox>
</div>
Expand Down
8 changes: 2 additions & 6 deletions pages/mypage/quit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,9 @@ const QuitAccount: NextPage = () => {
errorText={pwError.text}
/>
<Button
text="회원 탈퇴하기"
text="탈퇴하기"
onClick={onClickQuitBtn}
style={`${
password.length === 0
? "bg-grey-300 text-grey-500"
: "bg-main-color text-white"
}`}
style="disabled:bg-grey-300 disabled:text-grey-500 bg-main-color text-white"
disabled={password.length === 0}
/>
</FlexBox>
Expand Down