diff --git a/src/entities/room/model/rooms.ts b/src/entities/room/model/rooms.ts index c754b95..3d1c8ba 100644 --- a/src/entities/room/model/rooms.ts +++ b/src/entities/room/model/rooms.ts @@ -233,9 +233,10 @@ export const getRoomCardBackgroundStyle = (room: RoomTheme): CSSProperties => { export const getRoomBackgroundStyle = (room: RoomTheme): CSSProperties => { return { - backgroundImage: `${room.previewGradient}, url('${room.previewImage}')`, + backgroundImage: `url('${getRoomCardPhotoUrl(room)}'), linear-gradient(160deg, #1e293b 0%, #0f172a 100%)`, backgroundSize: 'cover, cover', backgroundPosition: 'center, center', + backgroundRepeat: 'no-repeat, no-repeat', }; }; diff --git a/src/widgets/space-setup-drawer/ui/SpaceSetupDrawerWidget.tsx b/src/widgets/space-setup-drawer/ui/SpaceSetupDrawerWidget.tsx index eeb0d67..c7f15fd 100644 --- a/src/widgets/space-setup-drawer/ui/SpaceSetupDrawerWidget.tsx +++ b/src/widgets/space-setup-drawer/ui/SpaceSetupDrawerWidget.tsx @@ -8,6 +8,7 @@ import { SpaceSideSheet } from '@/widgets/space-sheet-shell'; interface SpaceSetupDrawerWidgetProps { open: boolean; + dismissible?: boolean; rooms: RoomTheme[]; selectedRoomId: string; goalInput: string; @@ -26,6 +27,7 @@ interface SpaceSetupDrawerWidgetProps { export const SpaceSetupDrawerWidget = ({ open, + dismissible = true, rooms, selectedRoomId, goalInput, @@ -45,8 +47,9 @@ export const SpaceSetupDrawerWidget = ({
-
+
-

Space

-

오늘 머물 공간을 하나 고르세요.

+

1) Space

-
+
-

Goal

-

스킵 없이 한 줄 목표를 남겨주세요.

+

2) Goal

-
+
-

Sound

-

선택 항목이에요. 필요 없으면 그대로 시작해도 됩니다.

+

3) Sound

diff --git a/src/widgets/space-sheet-shell/ui/SpaceSideSheet.tsx b/src/widgets/space-sheet-shell/ui/SpaceSideSheet.tsx index c690e30..70226d9 100644 --- a/src/widgets/space-sheet-shell/ui/SpaceSideSheet.tsx +++ b/src/widgets/space-sheet-shell/ui/SpaceSideSheet.tsx @@ -11,6 +11,7 @@ interface SpaceSideSheetProps { children: ReactNode; footer?: ReactNode; widthClassName?: string; + dismissible?: boolean; } export const SpaceSideSheet = ({ @@ -21,6 +22,7 @@ export const SpaceSideSheet = ({ children, footer, widthClassName, + dismissible = true, }: SpaceSideSheetProps) => { useEffect(() => { if (!open) { @@ -46,12 +48,16 @@ export const SpaceSideSheet = ({ return ( <> - + {dismissible ? ( + + ) : null}
{children}
diff --git a/src/widgets/space-tools-dock/ui/SpaceToolsDockWidget.tsx b/src/widgets/space-tools-dock/ui/SpaceToolsDockWidget.tsx index 16d8ffd..3d59336 100644 --- a/src/widgets/space-tools-dock/ui/SpaceToolsDockWidget.tsx +++ b/src/widgets/space-tools-dock/ui/SpaceToolsDockWidget.tsx @@ -75,13 +75,13 @@ export const SpaceToolsDockWidget = ({ return ( <> -
+
{TOOL_ITEMS.map((item) => { @@ -95,15 +95,15 @@ export const SpaceToolsDockWidget = ({ aria-label={item.label} onClick={() => setActivePanel(item.id)} className={cn( - 'relative inline-flex h-9 w-9 items-center justify-center rounded-xl border text-base transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-sky-300/75', + 'relative inline-flex h-8 w-8 items-center justify-center rounded-[10px] border text-[15px] transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-sky-300/75', selected - ? 'border-sky-200/64 bg-sky-200/22' - : 'border-white/18 bg-white/8 hover:bg-white/14', + ? 'border-sky-200/58 bg-sky-200/18 shadow-[0_0_0_1px_rgba(186,230,253,0.28)]' + : 'border-white/14 bg-white/7 hover:bg-white/13', )} > {item.icon} {item.id === 'inbox' && thoughtCount > 0 ? ( - + {thoughtCount > 99 ? '99+' : `${thoughtCount}`} ) : null} diff --git a/src/widgets/space-workspace/ui/SpaceWorkspaceWidget.tsx b/src/widgets/space-workspace/ui/SpaceWorkspaceWidget.tsx index 9437c0c..5030c40 100644 --- a/src/widgets/space-workspace/ui/SpaceWorkspaceWidget.tsx +++ b/src/widgets/space-workspace/ui/SpaceWorkspaceWidget.tsx @@ -14,7 +14,6 @@ import { type GoalChip, } from '@/entities/session'; import { useSoundPresetSelection } from '@/features/sound-preset'; -import { cn } from '@/shared/lib/cn'; import { useToast } from '@/shared/ui'; import { SpaceFocusHudWidget } from '@/widgets/space-focus-hud'; import { SpaceSetupDrawerWidget } from '@/widgets/space-setup-drawer'; @@ -102,7 +101,6 @@ export const SpaceWorkspaceWidget = () => { }; const handleOpenSetup = () => { - setWorkspaceMode('setup'); setSetupDrawerOpen(true); }; @@ -111,70 +109,48 @@ export const SpaceWorkspaceWidget = () => {
-
-
-
-

VibeRoom

-

- {selectedRoom.name} · {selectedRoom.vibeLabel} -

-
+
+ {!isFocusMode ? ( +
+

VibeRoom

+
+ ) : ( +
+ )} - {!isSetupDrawerOpen ? ( + {isFocusMode && !isSetupDrawerOpen ? ( ) : null}
-
- {isFocusMode ? null : ( -
-
-

Workspace

-

- 공간을 고르고 시작하세요 -

-

- 오른쪽 Setup에서 목표를 입력하면 바로 몰입 화면으로 전환됩니다. -

-
-
- )} -
+
{ goalChips={GOAL_CHIPS} soundPresets={SOUND_PRESETS} canStart={canStart} - onClose={() => setSetupDrawerOpen(false)} + onClose={() => { + if (isFocusMode) { + setSetupDrawerOpen(false); + } + }} onRoomSelect={setSelectedRoomId} onGoalChange={handleGoalChange} onGoalChipSelect={handleGoalChipSelect}