Skip to content

Feat/refactor/mypage/DEVING-71 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lee-Dong-Seok merged 2 commits into from
Mar 18, 2025
Merged

Feat/refactor/mypage/DEVING-71 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc8956a
refactor(DEVING-71): ํ”ผ๋“œ๋ฐฑ ์ˆ˜์ •
Lee-Dong-Seok Mar 16, 2025
918e003
refactor(DEVING-71): ๋งˆ์ดํŽ˜์ด์ง€ UI ์ˆ˜์ •
Lee-Dong-Seok Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/app/(user-page)/mypage/MyPageClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
import { useQueryClient } from '@tanstack/react-query';
import { useRouter, useSearchParams } from 'next/navigation';
import { useCallback, useEffect, useRef, useState } from 'react';
import { getProfile } from 'service/api/mypageProfile';

import { TAB_TYPES } from '../../../constants/mypage/mypageConstant';
// ์ปดํฌ๋„ŒํŠธ ์ž„ํฌํŠธ
Expand Down
22 changes: 14 additions & 8 deletions src/app/(user-page)/mypage/_features/BasicEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,10 @@ const BasicEdit = ({ onEditComplete }: BasicEditProps) => {
<div className="flex flex-col gap-[16px] md:gap-[32px]">
{/* ์ด๋ฆ„ ์ž…๋ ฅ ํ•„๋“œ */}
<div className="flex flex-col gap-[8px]">
<label htmlFor="name-input" className="typo-head3 text-main">
<label
htmlFor="name-input"
className="typo-head3 text-[20px] text-main"
>
์‚ฌ์šฉ์ž ์ด๋ฆ„
</label>
<input
Expand Down Expand Up @@ -203,7 +206,10 @@ const BasicEdit = ({ onEditComplete }: BasicEditProps) => {
{/* ์ž๊ธฐ์†Œ๊ฐœ ํ…์ŠคํŠธ ์˜์—ญ */}
<div className="flex flex-col gap-2">
<div className="flex items-center justify-between">
<label htmlFor="intro-input" className="typo-head3 text-main">
<label
htmlFor="intro-input"
className="typo-head3 text-[20px] text-main"
>
์ž๊ธฐ์†Œ๊ฐœ
</label>
</div>
Expand All @@ -230,7 +236,7 @@ const BasicEdit = ({ onEditComplete }: BasicEditProps) => {

{/* ํฌ์ง€์…˜ ๋ฒ„ํŠผ */}
<div className="flex flex-col gap-[16px] border-b border-Cgray300 pb-[16px] md:pb-[32px]">
<div className="typo-head3 text-main">ํฌ์ง€์…˜</div>
<div className="typo-head3 text-[20px] text-main">ํฌ์ง€์…˜</div>
<div className="flex w-full flex-wrap gap-2">
<div className="rounded-4 typo-head3 flex w-full gap-[12px]">
{POSITION_OPTIONS.map((option) => (
Expand Down Expand Up @@ -262,7 +268,7 @@ const BasicEdit = ({ onEditComplete }: BasicEditProps) => {

{/* ์„ฑ๋ณ„ ํ† ๊ธ€ ๋ฒ„ํŠผ */}
<div className="flex flex-col gap-[16px] border-b border-Cgray300 pb-[16px] md:pb-[32px]">
<div className="typo-head3 text-main">์„ฑ๋ณ„</div>
<div className="typo-head3 text-[20px] text-main">์„ฑ๋ณ„</div>
<div className="typo-head3 flex w-full gap-[16px] rounded-md">
{GENDER_OPTIONS.map((option) => (
<button
Expand Down Expand Up @@ -292,7 +298,7 @@ const BasicEdit = ({ onEditComplete }: BasicEditProps) => {

{/* ์—ฐ๋ น๋Œ€ ๋“œ๋กญ๋‹ค์šด */}
<div className="flex flex-col gap-[16px] border-b border-Cgray300 pb-[16px] md:pb-[32px]">
<div className="typo-head3 text-main">์—ฐ๋ น๋Œ€</div>
<div className="typo-head3 text-[20px] text-main">์—ฐ๋ น๋Œ€</div>
<Controller
name="age"
control={control}
Expand All @@ -312,7 +318,7 @@ const BasicEdit = ({ onEditComplete }: BasicEditProps) => {

{/* ์ง€์—ญ ๋“œ๋กญ๋‹ค์šด */}
<div className="flex flex-col gap-[16px] border-b border-Cgray300 pb-[16px] md:pb-[32px]">
<div className="typo-head3 text-main">์ง€์—ญ</div>
<div className="typo-head3 text-[20px] text-main">์ง€์—ญ</div>
<Controller
name="location"
control={control}
Expand All @@ -335,14 +341,14 @@ const BasicEdit = ({ onEditComplete }: BasicEditProps) => {
<Button
type="button"
variant="outline"
className="h-[40px] w-[140px] md:h-[46px]"
className="h-[40px] w-[80px] md:h-[46px] md:w-[180px]"
onClick={handleCancel}
>
์ทจ์†Œ
</Button>
<Button
type="submit"
className="h-[40px] w-[140px] select-none md:h-[46px]"
className="h-[40px] w-[130px] select-none md:h-[46px] md:w-[200px]"
disabled={
isSubmitting || isUpdating || introLength > MAX_INTRO_LENGTH
}
Expand Down
46 changes: 32 additions & 14 deletions src/app/(user-page)/mypage/_features/BasicInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,78 +36,96 @@ const BasicInfo = ({ onEnableEdit }: BasicInfoProps) => {
}

return (
<div className="w-full rounded-[16px] border border-Cgray300 p-[16px] md:p-[32px]">
<div className="flex flex-col gap-[32px]">
<div className="w-full rounded-[16px] border border-Cgray300 p-[24px] md:p-[32px]">
<div className="flex flex-col gap-[24px] md:gap-[32px]">
<div className="flex flex-col gap-[8px]">
<label htmlFor="name-input" className="typo-head3 text-Cgray700">
<label
htmlFor="name-input"
className="typo-head3 text-[20px] text-white"
>
์ด๋ฆ„
</label>
<input
id="name-input"
type="text"
value={userData.name}
readOnly
className="typo-button1 h-[50px] rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
className="typo-button1 h-[50px] cursor-default rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
/>
</div>
<div className="flex flex-col gap-[8px]">
<label htmlFor="intro-input" className="typo-head3 text-Cgray700">
<label
htmlFor="intro-input"
className="typo-head3 text-[20px] text-white"
>
์†Œ๊ฐœ๊ธ€
</label>
<textarea
id="intro-input"
rows={3}
value={userData.intro}
readOnly
className="h-[140px] resize-none rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
className="h-[140px] cursor-default resize-none rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
/>
</div>
<div className="flex flex-col gap-[8px]">
<label htmlFor="position-input" className="typo-head3 text-Cgray700">
<label
htmlFor="position-input"
className="typo-head3 text-[20px] text-white"
>
ํฌ์ง€์…˜
</label>
<input
id="position-input"
type="text"
value={userData.position}
readOnly
className="typo-button1 h-[50px] rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
className="typo-button1 h-[50px] cursor-default rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
/>
</div>
<div className="flex flex-col gap-[8px]">
<label htmlFor="gender-input" className="typo-head3 text-Cgray700">
<label
htmlFor="gender-input"
className="typo-head3 text-[20px] text-white"
>
์„ฑ๋ณ„
</label>
<input
id="gender-input"
type="text"
value={userData.gender}
readOnly
className="typo-button1 h-[50px] rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
className="typo-button1 h-[50px] cursor-default rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
/>
</div>
<div className="flex flex-col gap-[8px]">
<label htmlFor="age-input" className="typo-head3 text-Cgray700">
<label
htmlFor="age-input"
className="typo-head3 text-[20px] text-white"
>
์—ฐ๋ น๋Œ€
</label>
<input
id="age-input"
type="text"
value={userData.age}
readOnly
className="typo-button1 h-[50px] rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
className="typo-button1 h-[50px] cursor-default rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
/>
</div>
<div className="flex flex-col gap-[8px]">
<label htmlFor="area-input" className="typo-head3 text-Cgray700">
<label
htmlFor="area-input"
className="typo-head3 text-[20px] text-white"
>
์ง€์—ญ
</label>
<input
id="area-input"
type="text"
value={userData.location}
readOnly
className="typo-button1 h-[50px] rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
className="typo-button1 h-[50px] cursor-default rounded-[8px] border-b border-Cgray300 bg-transparent py-2 pl-[16px] text-Cgray700 focus:outline-none"
/>
</div>
<div className="flex justify-center md:justify-start">
Expand Down
12 changes: 6 additions & 6 deletions src/app/(user-page)/mypage/_features/ContactEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const ContactEdit = ({ onEditComplete }: ContactEditProps) => {
>
<div className="flex flex-col gap-[32px]">
<div className="flex flex-col gap-[8px]">
<label htmlFor="phone" className="typo-head3 text-main">
<label htmlFor="phone" className="typo-head3 text-[20px] text-main">
์ „ํ™”๋ฒˆํ˜ธ
</label>
<Input
Expand All @@ -99,7 +99,7 @@ const ContactEdit = ({ onEditComplete }: ContactEditProps) => {
</div>

<div className="flex flex-col gap-[8px]">
<label htmlFor="kakao" className="typo-head3 text-main">
<label htmlFor="kakao" className="typo-head3 text-[20px] text-main">
์นด์นด์˜คํ†ก ID
</label>
<Input
Expand All @@ -117,7 +117,7 @@ const ContactEdit = ({ onEditComplete }: ContactEditProps) => {
</div>

<div className="flex flex-col gap-[8px]">
<label htmlFor="github" className="typo-head3 text-main">
<label htmlFor="github" className="typo-head3 text-[20px] text-main">
๊นƒํ—ˆ๋ธŒ
</label>
<Input
Expand Down Expand Up @@ -151,7 +151,7 @@ const ContactEdit = ({ onEditComplete }: ContactEditProps) => {
</div>

<div className="flex flex-col gap-[8px]">
<label htmlFor="blog" className="typo-head3 text-main">
<label htmlFor="blog" className="typo-head3 text-[20px] text-main">
๋ธ”๋กœ๊ทธ
</label>
<Input
Expand Down Expand Up @@ -205,14 +205,14 @@ const ContactEdit = ({ onEditComplete }: ContactEditProps) => {
<Button
type="button"
variant="outline"
className="h-[40px] w-[140px] md:h-[46px]"
className="h-[40px] w-[80px] md:h-[46px] md:w-[180px]"
onClick={handleCancel}
>
์ทจ์†Œ
</Button>
<Button
type="submit"
className="h-[40px] w-[140px] select-none md:h-[46px]"
className="h-[40px] w-[130px] select-none md:h-[46px] md:w-[200px]"
disabled={isSubmitting || isUpdating}
>
{isUpdating ? '์ €์žฅ ์ค‘...' : '๋ณ€๊ฒฝ์‚ฌํ•ญ ์ €์žฅ'}
Expand Down
24 changes: 18 additions & 6 deletions src/app/(user-page)/mypage/_features/ContactInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,13 @@ const ContactInfo = ({ onEnableEdit }: ContactInfoProps) => {
};

return (
<div className="w-full rounded-[16px] border border-Cgray300 p-[32px]">
<div className="flex flex-col gap-[32px]">
<div className="w-full rounded-[16px] border border-Cgray300 p-[24px] md:p-[32px]">
<div className="flex flex-col gap-[24px] md:gap-[32px]">
<div className="flex flex-col gap-[8px]">
<label htmlFor="phone-input" className="typo-head3 text-Cgray700">
<label
htmlFor="phone-input"
className="typo-head3 text-[20px] text-white"
>
์ „ํ™”๋ฒˆํ˜ธ
</label>
<input
Expand All @@ -60,7 +63,10 @@ const ContactInfo = ({ onEnableEdit }: ContactInfoProps) => {
/>
</div>
<div className="flex flex-col gap-[8px]">
<label htmlFor="kakao-input" className="typo-head3 text-Cgray700">
<label
htmlFor="kakao-input"
className="typo-head3 text-[20px] text-white"
>
์นด์นด์˜คํ†ก ID
</label>
<input
Expand All @@ -72,7 +78,10 @@ const ContactInfo = ({ onEnableEdit }: ContactInfoProps) => {
/>
</div>
<div className="flex flex-col gap-[8px]">
<label htmlFor="github-input" className="typo-head3 text-Cgray700">
<label
htmlFor="github-input"
className="typo-head3 text-[20px] text-white"
>
๊นƒํ—ˆ๋ธŒ
</label>
<input
Expand All @@ -84,7 +93,10 @@ const ContactInfo = ({ onEnableEdit }: ContactInfoProps) => {
/>
</div>
<div className="flex flex-col gap-[8px]">
<label htmlFor="blog-input" className="typo-head3 text-Cgray700">
<label
htmlFor="blog-input"
className="typo-head3 text-[20px] text-white"
>
๋ธ”๋กœ๊ทธ
</label>
<input
Expand Down
Loading
Loading