fix: 닉네임 중복 로직 추가 및 약관 동의 여부 추가

delicious-algorithme · Dec 7, 2024 · 8b174a8 · 8b174a8
1 parent b403de8
commit 8b174a8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/src/components/login/Consent.jsx b/src/components/login/Consent.jsx
@@ -3,7 +3,7 @@ import { Grey, DarkGreen, DarkGrey, Orange } from '../../color';
 import { Button } from '../common';
 import { useState } from 'react';
 
-const Consent = ({ setIsConsent }) => {
+const Consent = ({ setIsAllConsent }) => {
     const [checkedItems, setCheckedItems] = useState({
         terms: false,
         privacyConsent: false,
@@ -19,7 +19,7 @@ const Consent = ({ setIsConsent }) => {
 
     const handleClickNextStep = (e) => {
         if (isAllChecked) {
-            setIsConsent(true);
+            setIsAllConsent(true);
         }
     };
 

diff --git a/src/components/login/SignUp.jsx b/src/components/login/SignUp.jsx
@@ -8,12 +8,15 @@ import { signUp } from '../../apis/api/postSignupForm';
 import { Button } from '../common';
 import Swal from 'sweetalert2';
 
-const Signup = () => {
+const Signup = ({ isAllConsent }) => {
     const navigate = useNavigate();
     const [signupForms, setSignupForms] = useState({
         email: '',
         password: '',
         nickname: '',
+        serviceAgreement: isAllConsent,
+        privacyAgreement: isAllConsent,
+        ageConfirmation: isAllConsent,
     });
 
     const [errors, setErrors] = useState({
@@ -53,12 +56,22 @@ const Signup = () => {
 
         if (response.status !== 201) {
             const errorMessage = response.error.message;
-            Swal.fire({
-                icon: 'warning',
-                title: '회원 가입 실패',
-                text: errorMessage,
-            });
+            if (response.status === 409) {
+                setErrors((prev) => ({
+                    ...prev,
+                    nickname: '중복된 닉네임 입니다.',
+                }));
+            } else {
+                Swal.fire({
+                    icon: 'warning',
+                    title: '회원가입 실패',
+                    text: errorMessage,
+                });
+            }
+
+            console.log(errorMessage);
         }
+
         if (response.status === 201) {
             Swal.fire({
                 icon: 'success',

diff --git a/src/pages/SignUpPage.jsx b/src/pages/SignUpPage.jsx
@@ -3,12 +3,12 @@ import { Signup } from '../components/login';
 import { Consent } from '../components/login';
 
 const SignUpPage = () => {
-    const [isConsent, setIsConsent] = useState(false);
+    const [isAllConsent, setIsAllConsent] = useState(false);
 
-    if (isConsent) {
-        return <Signup />;
+    if (isAllConsent) {
+        return <Signup isAllConsent={isAllConsent} />;
     } else {
-        return <Consent setIsConsent={setIsConsent} />;
+        return <Consent setIsAllConsent={setIsAllConsent} />;
     }
 };