Merge pull request #133 from Mogazoa-team20/feat/myPage

프로필수정시 기본 값 제공 (이미지제외)
Mogazoa-team20 · Jun 24, 2024 · 1bf469f · 1bf469f
2 parents 21d023f + 57cad80
commit 1bf469f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/app/(userpage)/user/[userId]/components/MyProfileButton/MyProfileButton.tsx b/src/app/(userpage)/user/[userId]/components/MyProfileButton/MyProfileButton.tsx
@@ -15,14 +15,20 @@ import cn from "@/utils/classNames";
 import { CLOSE_ICON } from "@/utils/constant";
 import styles from "./MyProfileButton.module.scss";
 
+type MyProfileButtonProps = {
+  Iimage: string;
+  Inickname: string;
+  Idescription: string;
+};
+
 type UserFormValue = {
   description: string;
   nickname: string;
   image: File;
   croppedImage: Blob;
 };
 
-export default function MyProfileButton() {
+export default function MyProfileButton({ Iimage, Inickname, Idescription }: MyProfileButtonProps) {
   const queryClient = useQueryClient();
   const { data: session } = useSession();
   const accessToken = session?.accessToken ?? "";
@@ -95,7 +101,6 @@ export default function MyProfileButton() {
     }
     return "저장하기";
   };
-  console.log("입력상태", isValid);
 
   return (
     <div className={cn(styles.container)}>
@@ -109,6 +114,7 @@ export default function MyProfileButton() {
             >
               <ImageUpload
                 name='image'
+                defaultImage={Iimage}
                 cropFiledName='croppedImage'
                 setValue={setValue}
                 register={register}
@@ -123,14 +129,15 @@ export default function MyProfileButton() {
                 }}
                 errors={errors}
                 type='text'
-                placeholder='닉네임을 입력해주세요.'
+                defaultValue={Inickname}
                 maxLength={10}
                 className={cn(styles.profileInput)}
               />
               <TextArea
                 name='description'
                 rows={5}
                 control={control}
+                defaultValue={Idescription}
                 rules={{
                   required: "자기 소개글은 필수 입력입니다.",
                   minLength: { value: 1, message: "최소 1자 이상 적어주세요." },

diff --git a/src/app/(userpage)/user/[userId]/components/UserInfo/UserInfo.module.scss b/src/app/(userpage)/user/[userId]/components/UserInfo/UserInfo.module.scss
@@ -53,6 +53,10 @@
   justify-content: space-between;
   width: 184px;
 
+  :hover {
+    cursor: pointer;
+  }
+
   div {
     display: flex;
     flex-direction: column;
@@ -93,7 +97,7 @@
   }
 }
 
-.followButton{
+.followButton {
   display: flex;
   align-items: center;
   justify-content: center;

diff --git a/src/app/(userpage)/user/[userId]/components/UserInfo/UserInfo.tsx b/src/app/(userpage)/user/[userId]/components/UserInfo/UserInfo.tsx
@@ -105,7 +105,11 @@ export default function UserInfo({
           </div>
         </div>
         {Number(userId) === loginUser ? (
-          <MyProfileButton />
+          <MyProfileButton
+            Iimage={image}
+            Inickname={nickname}
+            Idescription={description}
+          />
         ) : (
           <div className={styles.followButton}>
             {isfollow ? (