Merge pull request #70 from Kusitms-29th-ASAP/fix/#69

[Fix] 회원가입 로직 수정
Kusitms-29th-ASAP · May 21, 2024 · b833d79 · b833d79
2 parents 3ec96fc + f9b6069
commit b833d79
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/app/signin/process3-1/page.tsx b/src/app/signin/process3-1/page.tsx
@@ -25,7 +25,7 @@ const Process3_1 = () => {
   const [openclassNumPopup, setOpenclassNumPopup] = useState(false);
 
   const [grade, setGrade] = useState<null | number>(null);
-  const [classNum, setClassNum] = useState<null | number>(null);
+  const [classNum, setClassNum] = useState<string>("");
 
   const name = studentName.substr(1, 3);
   const router = useRouter();
@@ -36,7 +36,7 @@ const Process3_1 = () => {
     const updateChildren = user.children.map((child) => ({
       ...child,
       elementSchoolGrade: GRADE[grade!! - 1],
-      elementSchoolClass: classNum,
+      elementSchoolClassNumber: "1", // 임시
     }));
 
     dispatch(
@@ -66,7 +66,7 @@ const Process3_1 = () => {
     setOpenGradePopup(false);
   };
 
-  const handleSelectclassNum = (selectedclassNum: number) => {
+  const handleSelectclassNum = (selectedclassNum: string) => {
     setClassNum(selectedclassNum);
     setOpenclassNumPopup(false);
   };

diff --git a/src/app/signin/process3/page.tsx b/src/app/signin/process3/page.tsx
@@ -36,7 +36,7 @@ const SigninProcess3 = () => {
   const handleNextButtonClick = () => {
     const updateChildren = user.children.map((child) => ({
       ...child,
-      elementSchoolId: 1,
+      elementSchoolId: 566, // 임시
       elementSchoolGrade: grade,
     }));
 

diff --git a/src/app/signin/process4/page.tsx b/src/app/signin/process4/page.tsx
@@ -48,7 +48,7 @@ const SigninProcess4 = () => {
     );
 
     const User: PostUserRequest = {
-      registrationToken: auth.registerToken,
+      registrationToken: `Bearer ${auth.registerToken}`,
       agreement: user.agreement,
       phoneNumber: user.phoneNumber,
       children: updateChildren,

diff --git a/src/components/signin/SelectionPopup.tsx b/src/components/signin/SelectionPopup.tsx
@@ -5,7 +5,7 @@ import { GradeData } from "@/data/studentData";
 
 interface SelectionPopupProps {
   onClose: () => void;
-  onSelect: (value: number) => void;
+  onSelect: (value: any) => void;
   selectionList: number[];
 }
 

diff --git a/src/redux/slices/userSlice.ts b/src/redux/slices/userSlice.ts
@@ -17,7 +17,7 @@ export const userSlice = createSlice({
         name: "",
         gender: "",
         birth: "",
-        elementSchoolId: 0,
+        elementSchoolId: 566, // 임시
         elementSchoolGrade: "",
         elementSchoolClassNumber: "",
         elementSchoolClassCode: "",