Skip to content

refactor: 레이아웃 리팩토링 #88

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
mgYang53 merged 2 commits into from
Feb 19, 2026
Merged

refactor: 레이아웃 리팩토링 #88

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
a0ead0b
refactor: 레이아웃 리팩토링 및 CSS 핵 제거 (#83)
mgYang53 Feb 19, 2026
5389ed6
fix: pr 리뷰 반영 - 하드코딩 제거 및 안전성 개선 (#83)
mgYang53 Feb 19, 2026
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
8 changes: 4 additions & 4 deletions src/features/book/components/BookLogList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const BookLogList = ({ bookId, isRecording }: BookLogListProps) => {
return (
<section>
{/* 감상 기록 헤더 - sticky */}
<div className="sticky top-[108px] z-30 bg-white [box-shadow:0_6px_6px_-4px_rgba(17,17,17,0.08)] w-screen ml-[calc(-50vw+50%)]">
<div className="sticky top-[calc(var(--spacing-gnb-height)+44px)] z-30 bg-white shadow-drop-bottom">
<div className="mx-auto max-w-layout-max px-layout-padding py-base">
<div className="flex justify-between mb-base">
<h2 className="typo-heading2 text-grey-800">감상 기록</h2>
Expand Down Expand Up @@ -174,8 +174,8 @@ const BookLogList = ({ bookId, isRecording }: BookLogListProps) => {
</div>

{/* 기록 목록 - full-bleed 배경 */}
<div className="w-screen relative left-1/2 -translate-x-1/2 bg-grey-100">
<section className="max-w-[1200px] mx-auto py-xlarge">
<div className="bg-grey-100">
<div className="mx-auto max-w-layout-max px-layout-padding py-xlarge">
{allRecords.length === 0 ? (
<div className="flex flex-col items-center justify-center py-base text-center">
<p className="typo-subtitle2 text-grey-600">
Expand Down Expand Up @@ -236,7 +236,7 @@ const BookLogList = ({ bookId, isRecording }: BookLogListProps) => {
})}
</div>
)}
</section>
</div>
</div>
<BookLogModal
open={isModalOpen}
Expand Down
12 changes: 7 additions & 5 deletions src/pages/Books/BookDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ export default function BookDetailPage() {
return (
<>
<SubPageHeader label="내 책장" to="/books" />
<BookInfo
bookId={bookId}
isRecording={isRecording}
onToggleRecording={() => toggleReadingStatus()}
/>
<div className="mx-auto max-w-layout-max px-layout-padding">
<BookInfo
bookId={bookId}
isRecording={isRecording}
onToggleRecording={() => toggleReadingStatus()}
/>
</div>
<BookLogList bookId={bookId} isRecording={isRecording} />
</>
)
Expand Down
36 changes: 19 additions & 17 deletions src/pages/Books/BookReviewHistoryPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,25 @@ export default function BookReviewHistoryPage() {
return (
<>
<SubPageHeader label={bookDetail?.title ?? '뒤로가기'} to={ROUTES.BOOK_DETAIL(bookId)} />
<section className="py-base">
<h2 className="typo-heading2 text-grey-800 mb-large">지난 평가</h2>
{isLoading && <div className="mt-medium">로딩중...</div>}
{historyData?.items.map((item, idx) => (
<Fragment key={item.bookReviewHistoryId}>
<ReviewHistoryCard item={item} />
{historyData?.items.length !== idx + 1 && <Division />}
</Fragment>
))}
{!isLoading && historyData?.items.length === 0 && (
<div className="mt-medium py-base flex justify-center">
<p className="typo-subtitle2 text-grey-600 text-center">
아직 이 책을 평가하지 않았어요. <br />다 읽고 나서 이 책이 어땠는지 알려주세요!
</p>
</div>
)}
</section>
<div className="mx-auto max-w-layout-max px-layout-padding">
<section className="py-base">
<h2 className="typo-heading2 text-grey-800 mb-large">지난 평가</h2>
{isLoading && <div className="mt-medium">로딩중...</div>}
{historyData?.items.map((item, idx) => (
<Fragment key={item.bookReviewHistoryId}>
<ReviewHistoryCard item={item} />
{historyData?.items.length !== idx + 1 && <Division />}
</Fragment>
))}
{!isLoading && historyData?.items.length === 0 && (
<div className="mt-medium py-base flex justify-center">
<p className="typo-subtitle2 text-grey-600 text-center">
아직 이 책을 평가하지 않았어요. <br />다 읽고 나서 이 책이 어땠는지 알려주세요!
</p>
</div>
)}
</section>
</div>
</>
)
}
270 changes: 136 additions & 134 deletions src/pages/Gatherings/GatheringSettingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
useRemoveMember,
useUpdateGathering,
} from '@/features/gatherings'
import SubPageHeader from '@/shared/components/SubPageHeader'
import FormPageHeader from '@/shared/components/FormPageHeader'
import { ROUTES } from '@/shared/constants'
import { showErrorToast, showToast } from '@/shared/lib/toast'
import {
Expand Down Expand Up @@ -187,140 +187,142 @@ export default function GatheringSettingPage() {
if (!gathering || gathering.currentUserRole !== 'LEADER') return null

return (
<div className="flex flex-col gap-xlarge pb-medium">
<SubPageHeader to={ROUTES.GATHERING_DETAIL(gatheringId)} />

<h2 className="typo-heading3 text-black">독서모임 설정</h2>
{/* 독서모임 정보 섹션 */}
<Container>
<div className="flex items-center justify-between">
<Container.Title>독서모임 정보</Container.Title>
<div className="flex items-center gap-xsmall">
<Button
variant="danger"
outline
size="small"
onClick={handleDeleteGathering}
disabled={deleteMutation.isPending}
>
모임 삭제하기
</Button>
<Button
variant="primary"
size="small"
onClick={handleSave}
disabled={!isValid || updateMutation.isPending}
>
저장하기
</Button>
<>
<FormPageHeader
title="독서모임 설정"
actionLabel={updateMutation.isPending ? '...' : '저장하기'}
onAction={handleSave}
isActionDisabled={!isValid || updateMutation.isPending}
to={ROUTES.GATHERING_DETAIL(gatheringId)}
/>
<div className="bg-grey-100">
<div className="mx-auto max-w-layout-max px-layout-padding">
<div className="flex flex-col gap-xlarge py-xlarge">
{/* 독서모임 정보 섹션 */}
<Container>
<div className="flex items-center justify-between">
<Container.Title>독서모임 정보</Container.Title>
<Button
variant="danger"
outline
size="small"
onClick={handleDeleteGathering}
disabled={deleteMutation.isPending}
>
모임 삭제하기
</Button>
</div>
<Container.Content className="flex flex-col gap-medium">
<Input
label="독서모임 이름"
placeholder="독서모임 이름을 입력해주세요."
value={name}
onChange={(e) => setName(e.target.value)}
maxLength={MAX_NAME_LENGTH}
/>
<div className="flex flex-col gap-xsmall">
<p className="text-left text-black typo-subtitle3">독서모임 설명</p>
<Textarea
placeholder="모임에 대한 설명을 적어주세요"
value={description}
onChange={(e) => setDescription(e.target.value)}
maxLength={MAX_DESCRIPTION_LENGTH}
height={80}
/>
</div>
</Container.Content>
</Container>
{/* 멤버 관리 섹션 */}
<Container>
<Container.Title>멤버 관리</Container.Title>
<Container.Content>
<Tabs
value={activeTab}
onValueChange={(value) => setActiveTab(value as MemberTab)}
className="gap-0"
>
<TabsList className="border-b border-grey-300" size="medium">
<TabsTrigger value="PENDING" badge={pendingTotalCount} size="medium">
승인 대기
</TabsTrigger>
<TabsTrigger value="ACTIVE" badge={activeTotalCount} size="medium">
승인 완료
</TabsTrigger>
</TabsList>
<TabsContent value="PENDING" className="pt-medium">
{pendingMembers.length === 0 ? (
<div className="flex h-35 items-center justify-center rounded-base border border-grey-300">
<p className="text-center text-grey-600 typo-subtitle2">
승인 대기 중인 멤버가 없어요.
</p>
</div>
) : (
<div className="flex flex-col gap-medium">
<div className="grid grid-cols-1 gap-medium md:grid-cols-2 lg:grid-cols-3">
{pendingMembers.map((member) => (
<MemberCard
key={member.gatheringMemberId}
member={member}
actions={['reject', 'approve']}
onAction={handleMemberAction}
disabled={joinRequestMutation.isPending}
/>
))}
</div>
{hasNextPending && (
<Button
variant="secondary"
outline
size="medium"
onClick={() => fetchNextPending()}
disabled={isFetchingNextPending}
>
{isFetchingNextPending ? '불러오는 중...' : '더보기'}
</Button>
)}
</div>
)}
</TabsContent>
<TabsContent value="ACTIVE" className="pt-medium">
{activeMembers.length === 0 ? (
<div className="flex h-35 items-center justify-center rounded-base border border-grey-300">
<p className="text-center text-grey-600 typo-subtitle2">
승인된 멤버가 없어요.
</p>
</div>
) : (
<div className="flex flex-col gap-medium">
<div className="grid grid-cols-1 gap-medium md:grid-cols-2 lg:grid-cols-3">
{activeMembers.map((member) => (
<MemberCard
key={member.gatheringMemberId}
member={member}
actions={['remove']}
onAction={handleMemberAction}
disabled={removeMemberMutation.isPending}
/>
))}
</div>
{hasNextActive && (
<Button
variant="secondary"
outline
size="medium"
onClick={() => fetchNextActive()}
disabled={isFetchingNextActive}
>
{isFetchingNextActive ? '불러오는 중...' : '더보기'}
</Button>
)}
</div>
)}
</TabsContent>
</Tabs>
</Container.Content>
</Container>
</div>
</div>
<Container.Content className="flex flex-col gap-medium">
<Input
label="독서모임 이름"
placeholder="독서모임 이름을 입력해주세요."
value={name}
onChange={(e) => setName(e.target.value)}
maxLength={MAX_NAME_LENGTH}
/>
<div className="flex flex-col gap-xsmall">
<p className="text-left text-black typo-subtitle3">독서모임 설명</p>
<Textarea
placeholder="모임에 대한 설명을 적어주세요"
value={description}
onChange={(e) => setDescription(e.target.value)}
maxLength={MAX_DESCRIPTION_LENGTH}
height={80}
/>
</div>
</Container.Content>
</Container>
{/* 멤버 관리 섹션 */}
<Container>
<Container.Title>멤버 관리</Container.Title>
<Container.Content>
<Tabs
value={activeTab}
onValueChange={(value) => setActiveTab(value as MemberTab)}
className="gap-0"
>
<TabsList className="border-b border-grey-300" size="medium">
<TabsTrigger value="PENDING" badge={pendingTotalCount} size="medium">
승인 대기
</TabsTrigger>
<TabsTrigger value="ACTIVE" badge={activeTotalCount} size="medium">
승인 완료
</TabsTrigger>
</TabsList>
<TabsContent value="PENDING" className="pt-medium">
{pendingMembers.length === 0 ? (
<div className="flex h-35 items-center justify-center rounded-base border border-grey-300">
<p className="text-center text-grey-600 typo-subtitle2">
승인 대기 중인 멤버가 없어요.
</p>
</div>
) : (
<div className="flex flex-col gap-medium">
<div className="grid grid-cols-1 gap-medium md:grid-cols-2 lg:grid-cols-3">
{pendingMembers.map((member) => (
<MemberCard
key={member.gatheringMemberId}
member={member}
actions={['reject', 'approve']}
onAction={handleMemberAction}
disabled={joinRequestMutation.isPending}
/>
))}
</div>
{hasNextPending && (
<Button
variant="secondary"
outline
size="medium"
onClick={() => fetchNextPending()}
disabled={isFetchingNextPending}
>
{isFetchingNextPending ? '불러오는 중...' : '더보기'}
</Button>
)}
</div>
)}
</TabsContent>
<TabsContent value="ACTIVE" className="pt-medium">
{activeMembers.length === 0 ? (
<div className="flex h-35 items-center justify-center rounded-base border border-grey-300">
<p className="text-center text-grey-600 typo-subtitle2">승인된 멤버가 없어요.</p>
</div>
) : (
<div className="flex flex-col gap-medium">
<div className="grid grid-cols-1 gap-medium md:grid-cols-2 lg:grid-cols-3">
{activeMembers.map((member) => (
<MemberCard
key={member.gatheringMemberId}
member={member}
actions={['remove']}
onAction={handleMemberAction}
disabled={removeMemberMutation.isPending}
/>
))}
</div>
{hasNextActive && (
<Button
variant="secondary"
outline
size="medium"
onClick={() => fetchNextActive()}
disabled={isFetchingNextActive}
>
{isFetchingNextActive ? '불러오는 중...' : '더보기'}
</Button>
)}
</div>
)}
</TabsContent>
</Tabs>
</Container.Content>
</Container>
</div>
</div>
</>
)
}
Loading
Loading