Merge pull request #197 from Igloo-Club/fes/register

Fes/register
Igloo-Club · May 14, 2024 · f970c60 · f970c60
2 parents a070026 + 7013d6a
commit f970c60
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/src/register/RegisterPage.tsx b/src/register/RegisterPage.tsx
@@ -83,7 +83,6 @@ const Register = () => {
     faceDepictionList: [],
     personalityDepictionList: [],
     description: '',
-    markerList: [],
     hobbyList: [],
     disableCompany: false,
   });
@@ -193,7 +192,9 @@ const Register = () => {
             values={registerValues.hobbyList}
             handleValues={handleValues}
             onPrev={() => setStep('PersonalityDepiction')}
-            onNext={() => setStep('시간선택')}
+            onNext={() => {
+              setStep('시간선택');
+            }}
             handleRegisterValue={handleRegisterValue}
             registerValues={registerValues}
             percent={90}

diff --git a/src/register/components/HobbyList.tsx b/src/register/components/HobbyList.tsx
@@ -6,6 +6,8 @@ import { HOBBY } from '../constants/profileConstants';
 import { useState } from 'react';
 import CheckBoxItem from './CheckBoxItem';
 import { ExtendedNavTypesProps } from '../types/navTypes';
+import { Registertypes } from '../types/registerTypes';
+import instance from '../../common/apis/axiosInstanse';
 
 interface HobbyListProps extends ExtendedNavTypesProps {
   values: string[];
@@ -14,17 +16,35 @@ interface HobbyListProps extends ExtendedNavTypesProps {
 
 const HobbyList = ({
   values,
-  handleValues,
   onNext,
   onPrev,
+  registerValues,
 }: HobbyListProps) => {
   const [thisValues, setThisValues] = useState<string[]>(values);
+  const [thisRegisterValues] = useState<Registertypes>(registerValues);
 
   const handleSubmit = () => {
-    handleValues(thisValues, 'hobbyList');
+    const updatedRegisterValues = {
+      ...thisRegisterValues,
+      hobbyList: thisValues,
+    };
+    // 상태를 업데이트합니다.
+    console.log(updatedRegisterValues);
+    postSubmit(updatedRegisterValues);
+
     onNext();
   };
 
+  //데이터 보내기
+  const postSubmit = async (value: Registertypes) => {
+    console.log(value);
+    try {
+      await instance.patch('/api/member', value);
+    } catch (err) {
+      console.log(err);
+    }
+  };
+
   return (
     <StBackgroud>
       <ArrowLeft onClick={() => onPrev()} />

diff --git a/src/register/funnelPages/RegisterSelectMarker.tsx b/src/register/funnelPages/RegisterSelectMarker.tsx
@@ -53,6 +53,7 @@ const 장소선택 = ({
         ...registerScheduleValues,
         markerList: thisValues,
       });
+      await instance.post('/api/nungil/addRecommendNungil', {});
       onNext();
     } catch (err) {
       console.log(err);

diff --git a/src/register/types/registerTypes.ts b/src/register/types/registerTypes.ts
@@ -6,17 +6,16 @@ export interface Registertypes {
   contactInstagram?: string | null;
   animalFace: string;
   job: string;
-  height: number | string;
+  height?: number | string;
   mbti: string;
-  marriageState: string;
-  religion: string;
-  alcohol: string;
-  smoke: string;
+  marriageState?: string;
+  religion?: string;
+  alcohol?: string;
+  smoke?: string;
   faceDepictionList: string[];
   personalityDepictionList: string[];
   description: string;
-  disableCompany: boolean;
+  disableCompany?: boolean;
   // 선택 사항
-  markerList?: string[];
   hobbyList: string[];
 }