Merge pull request #88 from URECA-PODONG/feat/#39

feat(#39): 최종 수정
URECA-PODONG · Nov 7, 2024 · c20cd16 · c20cd16
2 parents f214c56 + 700d998
commit c20cd16
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/pages/MyPage/MyPage.jsx b/src/pages/MyPage/MyPage.jsx
@@ -262,7 +262,7 @@ const PetEditBtn = styled.button`
   border-radius: 20px;
   cursor: pointer;
   font-size: 10px;
-  margin-left: 15%;
+  margin-left: 10px;
   font-weight: normal;
   transition: background-color 0.3s;
 

diff --git a/src/pages/MyPage/PetEditPage.jsx b/src/pages/MyPage/PetEditPage.jsx
@@ -145,14 +145,13 @@ const PetEditPage = () => {
         if (petData) {
           setImgPath(petData.petPicture);
           setPetName(petData.petName);
-          setBirthdate(petData.birthdate);
-          setAge(calculateAge(petData.birthdate));
+          setBirthdate('2020-01-01');
+          setAge(calculateAge('2020-01-01')); 
           setSelectedPetType(petData.dogOrCat);
           setSelectedGender(petData.gender ? '남아' : '여아');
           setIsNeutered(petData.neutering ? '네' : '아니요');
           setIsAllergic(petData.petAllergy ? '네' : '아니요');
           setWeight(petData.petWeight);
-          setUserId(petData.user);
           if (petData.dogOrCat === '고양이') {
             setSelectCatList(petData.petType);
           } else {

diff --git a/src/pages/RegisterPage/PetRegisterPage.jsx b/src/pages/RegisterPage/PetRegisterPage.jsx
@@ -100,6 +100,8 @@ const PetRegisterPage = () => {
     if (storedUserId) {
       setUserId(storedUserId);
     }
+
+    setBirthdate('2020-01-01');
   }, []);
 
   const handlePetTypeClick = value => setSelectedPetType(value);
@@ -267,9 +269,13 @@ const PetRegisterPage = () => {
             />
           </>
         )}
-        <Label>생일</Label>
-        <StyledInput type="date" value={birthdate} max={getCurrentDate()} onChange={handleBirthdateChange} />
-
+      <Label>생일</Label>
+      <StyledInput
+          type="date"
+          value={birthdate}
+          max={getCurrentDate()}
+          onChange={handleBirthdateChange}
+        />
         <Label>성별</Label>
         <SelectButtonContainer>
           <SelectButton selected={selectedGender === '남아'} onClick={() => handleGenderClick('남아')}>