Skip to content

마이-메인페이지 UI 수정, 마이페이지 사이드바 수정 #238

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
kjhyun0830 merged 2 commits into from
Aug 4, 2025
Merged

마이-메인페이지 UI 수정, 마이페이지 사이드바 수정 #238

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
d410e57
💄 [#235] Style: 마이-메인페이지 구조 수정, 모바일 반응형 구현
Aug 4, 2025
b311640
💄 [#235] Style: 마이페이지 사이드바 높이, 토글 영역 수정
Aug 4, 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
97 changes: 0 additions & 97 deletions apps/what-today/src/components/MypageMainSideBar.tsx
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion apps/what-today/src/components/MypageSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ export default function MypageSidebar({ onLogoutClick, onClick, isOpen }: Mypage
// 공통 스타일
'fixed z-50 max-w-200 min-w-200 rounded-2xl border border-gray-50 bg-white transition duration-300 md:static md:h-fit xl:w-280',
// 모바일에서 Drawer 위치
isOpen ? 'translate-x-0' : 'h-50 -translate-x-full bg-gray-200',
isOpen ? 'translate-x-0' : 'h-100 -translate-x-full bg-gray-200',
'md:translate-x-0',
'md:bg-white',
)}
onClick={onClick}
>
{/* 콘텐츠: PC는 항상, 모바일은 isOpen일 때만 */}
<div
Expand Down
2 changes: 1 addition & 1 deletion apps/what-today/src/layouts/Mypage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function MyPageLayout() {
onLogoutClick={handleLogout}
/>
<Button
className={twMerge('fixed top-68 left-4 z-55 w-fit p-0 md:hidden', isSidebarOpen && 'hidden')}
className={twMerge('fixed top-92 left-4 z-55 w-fit p-0 md:hidden', isSidebarOpen && 'hidden')}
size='xs'
variant='none'
onClick={() => setSidebarOpen(true)}
Expand Down
26 changes: 14 additions & 12 deletions apps/what-today/src/pages/mypage/main/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { useWhatTodayStore } from '@/stores';

export default function MyPage() {
const navigate = useNavigate();

const { logoutUser } = useAuth();
const { user } = useWhatTodayStore();
const { toast } = useToast();
Expand Down Expand Up @@ -112,11 +113,12 @@ export default function MyPage() {
{/* <MypageMainSidebar /> */}
<div className='flex w-full flex-col gap-24'>
<MypageProfileHeader
email={user?.email}
name={user?.nickname}
profileImageUrl={user?.profileImageUrl ?? undefined}
onLogoutClick={handleLogout}
/>
<div className='flex gap-24'>
<div className='flex flex-col gap-24 md:flex-row'>
<MypageSummaryCard.Root>
<MypageSummaryCard.Item count={totalActivity || 0} label='등록한 체험' />
<MypageSummaryCard.Item count={totalPending} label={`${dayjs().format('M')}월 승인 대기`} />
Expand All @@ -136,23 +138,23 @@ export default function MyPage() {
/>
</MypageSummaryCard.Root>
</div>
<div className='flex max-h-540 min-h-300 flex-col gap-16 rounded-3xl border border-gray-50 px-32 pt-24'>
<p className='body-text font-bold'>다가오는 일정</p>
<UpcomingSchedule
className='w-full overflow-y-scroll'
reservation={confirmedData?.reservations || []}
onClick={() => navigate('/')}
onClickReservation={(id) => navigate(`/activities/${id}`)}
/>
</div>
<div className='flex h-300 w-full flex-col gap-16 overflow-hidden rounded-3xl border border-gray-50 px-40 py-24'>
<p className='body-text font-bold'>{`${dayjs().format('M')}월 모집 중인 체험`}</p>
<div className='flex h-248 w-full flex-col gap-8 rounded-3xl border-gray-50 md:h-300 md:gap-16 md:border md:px-40 md:py-24'>
<p className='text-lg font-bold'>{`${dayjs().format('M')}월 모집 중인 체험`}</p>
<OngoingExperienceCard
activities={availableActivities}
onClick={() => navigate('/experiences/create')}
onClickActivity={(id) => navigate(`/activities/${id}`)}
/>
</div>
<div className='flex min-h-300 flex-col gap-8 rounded-3xl border-gray-50 md:max-h-540 md:gap-16 md:border md:px-32 md:pt-24'>
<p className='text-lg font-bold'>다가오는 일정</p>
<UpcomingSchedule
className='w-full md:overflow-y-auto'
reservation={confirmedData?.reservations || []}
onClick={() => navigate('/')}
onClickReservation={(id) => navigate(`/activities/${id}`)}
/>
</div>
</div>
</div>
);
Expand Down
10 changes: 7 additions & 3 deletions packages/design-system/src/components/MypageProfileHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { ProfileLogo } from './logos';

interface MypageProfileHeaderProps {
name?: string;
email?: string;
profileImageUrl?: string;
onLogoutClick: () => void;
}

export default function MypageProfileHeader({ name, profileImageUrl, onLogoutClick }: MypageProfileHeaderProps) {
export default function MypageProfileHeader({ name, email, profileImageUrl, onLogoutClick }: MypageProfileHeaderProps) {
return (
<div className='flex items-center gap-24 rounded-3xl border border-gray-50 bg-white px-36 py-24'>
<div className='flex size-100 items-center justify-center rounded-full border border-gray-50 bg-white'>
Expand All @@ -23,8 +24,11 @@ export default function MypageProfileHeader({ name, profileImageUrl, onLogoutCli
)}
</div>

<div className='flex h-80 flex-col justify-between text-gray-950'>
<p className='text-2xl font-bold'>{name}</p>
<div className='flex h-80 flex-col justify-center gap-8 text-gray-950'>
<div className='flex flex-col'>
<p className='text-2xl font-bold'>{name}</p>
<p className='text-lg text-gray-400'>{email}</p>
</div>
<Button
className='h-auto w-auto justify-start p-0 text-gray-400'
size='lg'
Expand Down