Merge pull request #36 from team-Ollie/main

fix: 자잘한 오류 수정
team-Ollie · Jul 1, 2024 · 7ed0f11 · 7ed0f11
2 parents c88fe58 + b87d07e
commit 7ed0f11
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/components/HeadFunction.tsx b/components/HeadFunction.tsx
@@ -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>

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -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} />

diff --git a/pages/mypage/index.tsx b/pages/mypage/index.tsx
@@ -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>

diff --git a/pages/mypage/password/index.tsx b/pages/mypage/password/index.tsx
@@ -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;
     }
@@ -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}
@@ -129,7 +127,7 @@ const Password: NextPage = () => {
               : "bg-main-color text-white"
           }`}
           onClick={changePassword}
-          text="새 비밀번호 저장"
+          text="변경하기"
         />
       </FlexBox>
     </div>

diff --git a/pages/mypage/quit.tsx b/pages/mypage/quit.tsx
@@ -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>