Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 5c8b7da

Browse files
authored
fix: 스프린트 1 QA 이슈 중 일부 수정 (#63) #patch
* 폰트관련 오타 수정 * 기본 창 높이 720으로 축소 * 툴팁 메시지 텍스트 드래그 방지 * 툴팁 위치 20px 더 아래로 이동 * 나머지 고양이 툴팁 위치도 변경 * 서비스 가이드에 대한 디자인 맞추기
1 parent d9adaef commit 5c8b7da

File tree

9 files changed

+89
-80
lines changed

9 files changed

+89
-80
lines changed

src/main/main.ts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,22 @@ if (require('electron-squirrel-startup')) {
1717
app.quit();
1818
}
1919

20+
const WindowSizeMap = {
21+
minimized: { width: 400, height: 220 },
22+
normal: { width: 400, height: 720 },
23+
};
24+
2025
const createWindow = () => {
2126
// Create the browser window.
2227
const mainWindow = new BrowserWindow({
2328
webPreferences: {
2429
preload: path.join(__dirname, 'preload.js'),
2530
webSecurity: false,
2631
},
27-
width: 400,
28-
minWidth: 400,
29-
height: 800,
30-
minHeight: 800,
32+
width: WindowSizeMap.normal.width,
33+
minWidth: WindowSizeMap.normal.width,
34+
height: WindowSizeMap.normal.height,
35+
minHeight: WindowSizeMap.normal.height,
3136
title: '',
3237
titleBarStyle: 'hidden',
3338
});
@@ -153,11 +158,11 @@ app.whenReady().then(() => {
153158
});
154159
ipcMain.handle('set-minimized', (event, isMinimized: boolean) => {
155160
if (isMinimized) {
156-
mainWindow?.setMinimumSize(400, 220);
157-
mainWindow?.setSize(400, 220);
161+
mainWindow?.setMinimumSize(WindowSizeMap.minimized.width, WindowSizeMap.minimized.height);
162+
mainWindow?.setSize(WindowSizeMap.minimized.width, WindowSizeMap.minimized.height);
158163
} else {
159-
mainWindow?.setMinimumSize(400, 800);
160-
mainWindow?.setSize(400, 800);
164+
mainWindow?.setMinimumSize(WindowSizeMap.normal.width, WindowSizeMap.normal.height);
165+
mainWindow?.setSize(WindowSizeMap.normal.width, WindowSizeMap.normal.height);
161166
}
162167
});
163168
});

src/renderer/pages/mycat.tsx

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,25 @@ const MyCat = () => {
4343
<Frame>
4444
<Frame.NavBar title="나의 고양이" onBack={() => navigate(PATH.MY_PAGE)} />
4545

46-
<div className="flex h-full items-center justify-center">
47-
<div className="flex w-full flex-col">
48-
<Tooltip
49-
content="사냥놀이를 하고싶다냥"
50-
color="white"
51-
sideOffset={-20}
52-
rootProps={{ open: true }}
53-
arrowProps={{ width: 14, height: 9 }}
54-
/>
46+
<div className="flex h-full flex-col items-center justify-center">
47+
<Tooltip
48+
content="사냥놀이를 하고싶다냥"
49+
color="white"
50+
sideOffset={-40}
51+
rootProps={{ open: true }}
52+
arrowProps={{ width: 14, height: 9 }}
53+
>
54+
<RiveComponent className="h-[240px] w-[240px] select-none" />
55+
</Tooltip>
5556

56-
<RiveComponent className="h-[240px] w-full select-none" />
57-
58-
<div className="flex w-full items-center justify-center">
59-
<button
60-
className="flex items-center justify-center gap-1 p-3"
61-
onClick={handleClickEditNameButton}
62-
>
63-
<span className="header-4 text-text-secondary">{user?.cat?.name}</span>
64-
<Icon name="pen" size="md" />
65-
</button>
66-
</div>
57+
<div className="flex w-full items-center justify-center">
58+
<button
59+
className="flex items-center justify-center gap-1 p-3"
60+
onClick={handleClickEditNameButton}
61+
>
62+
<span className="header-4 text-text-secondary">{user?.cat?.name}</span>
63+
<Icon name="pen" size="md" />
64+
</button>
6765
</div>
6866
</div>
6967

src/renderer/pages/naming.tsx

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,39 +44,40 @@ const Naming = () => {
4444
<SimpleLayout>
4545
<Frame>
4646
<Frame.NavBar onBack={handleClickBackButton} />
47-
<div className="flex h-full items-center justify-center">
48-
<div className="flex w-full flex-col gap-10">
49-
<Tooltip
50-
content="반갑다냥! 내 이름을 지어줄래냥?"
51-
color="white"
52-
sideOffset={-20}
53-
rootProps={{ open: true }}
54-
arrowProps={{ width: 14, height: 9 }}
55-
/>
47+
<div className="flex h-full w-full flex-col items-center justify-center gap-10">
48+
<Tooltip
49+
content="반갑다냥! 내 이름을 지어줄래냥?"
50+
color="white"
51+
sideOffset={-40}
52+
rootProps={{ open: true }}
53+
arrowProps={{ width: 14, height: 9 }}
54+
>
5655
<RiveComponent
57-
className="h-[240px] w-full cursor-pointer select-none"
56+
className="h-[240px] w-[240px] cursor-pointer select-none"
5857
onClick={() => {
5958
clickCatInput?.fire();
6059
}}
6160
/>
62-
<div className="relative flex flex-col gap-2">
63-
<label className="subBody-4 text-text-secondary">내 고양이의 이름</label>
64-
<input
65-
value={typedCatName}
66-
placeholder={selectedCatName}
67-
className="body-sb rounded-sm p-lg text-text-primary caret-text-accent-1 placeholder:text-text-disabled"
68-
onChange={(e) => setTypedCatName(e.target.value)}
69-
/>
70-
{errorMessage && (
71-
<div className="absolute bottom-[-8px] left-0 w-full">
72-
<div className="caption-r absolute left-0 top-0 text-accent-red">
73-
{errorMessage}
74-
</div>
61+
</Tooltip>
62+
63+
<div className="relative flex w-full flex-col gap-2">
64+
<label className="subBody-r text-text-secondary">내 고양이의 이름</label>
65+
<input
66+
value={typedCatName}
67+
placeholder={selectedCatName}
68+
className="body-sb rounded-sm p-lg text-text-primary caret-text-accent-1 placeholder:text-text-disabled"
69+
onChange={(e) => setTypedCatName(e.target.value)}
70+
/>
71+
{errorMessage && (
72+
<div className="absolute bottom-[-8px] left-0 w-full">
73+
<div className="caption-r absolute left-0 top-0 text-accent-red">
74+
{errorMessage}
7575
</div>
76-
)}
77-
</div>
76+
</div>
77+
)}
7878
</div>
7979
</div>
80+
8081
<Frame.BottomBar>
8182
<Button className="w-full" disabled={!!errorMessage} onClick={handleClickCompleteButton}>
8283
확인

src/renderer/pages/selection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ const Selection = () => {
139139
value={cat.id}
140140
className="flex h-[80px] flex-1 flex-col gap-1"
141141
>
142-
<span className="subBody-4 flex gap-1 text-text-tertiary">
142+
<span className="subBody-r flex gap-1 text-text-tertiary">
143143
{cat.adjective} <Icon size="xs" name={cat.iconName} />
144144
</span>
145145
<span

src/renderer/shared/ui/guide.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export const Guide = ({ steps, handler }: TGuideProps) => {
8181
{/* 3. 툴팁 메세지 */}
8282
<div
8383
className={cn(
84-
'transition-position rounded-xs bg-white p-md text-text-secondary duration-300',
84+
'transition-position body-sb w-max rounded-xs bg-white px-4 py-3 text-text-secondary duration-300',
8585
isAnimating ? 'translate-y-4 opacity-0' : 'translate-y-0 opacity-100',
8686
)}
8787
style={{

src/renderer/shared/ui/tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const Tooltip = ({
3333
className={cn(
3434
color === 'black' && 'bg-gray-900 text-white',
3535
color === 'white' && 'bg-white text-gray-600',
36-
'shadow-xs body-sb z-50 rounded-xs px-lg py-md',
36+
'shadow-xs body-sb z-50 select-none rounded-xs px-lg py-md',
3737
'animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
3838
className,
3939
)}

src/renderer/widgets/pomodoro/ui/focus-screen.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,16 +122,18 @@ export const FocusScreen = ({
122122
<Tooltip
123123
content={isExceed ? toolTipContentMap.exceed : toolTipContentMap.default}
124124
color="white"
125-
sideOffset={-20}
125+
sideOffset={-40}
126126
rootProps={{ open: true }}
127127
arrowProps={{ width: 14, height: 9 }}
128-
/>
129-
<RiveComponent
130-
className="h-[240px] w-full cursor-pointer select-none"
131-
onClick={() => {
132-
clickCatInput?.fire();
133-
}}
134-
/>
128+
>
129+
<RiveComponent
130+
className="h-[240px] w-[240px] cursor-pointer select-none"
131+
onClick={() => {
132+
clickCatInput?.fire();
133+
}}
134+
/>
135+
</Tooltip>
136+
135137
<div className="mt-xl flex flex-col items-center">
136138
<div className="flex gap-xs">
137139
<Icon name="focusTime" width={20} height={20} />

src/renderer/widgets/pomodoro/ui/home-screen.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,15 @@ export const HomeScreen = ({
8181
sideOffset={-40}
8282
rootProps={{ open: !showGuide }}
8383
arrowProps={{ width: 14, height: 9 }}
84-
/>
85-
<RiveComponent
86-
className="h-[240px] w-full cursor-pointer select-none"
87-
onClick={() => {
88-
showRandomMessage();
89-
clickCatInput?.fire();
90-
}}
91-
/>
84+
>
85+
<RiveComponent
86+
className="h-[240px] w-[240px] cursor-pointer select-none"
87+
onClick={() => {
88+
showRandomMessage();
89+
clickCatInput?.fire();
90+
}}
91+
/>
92+
</Tooltip>
9293

9394
<div className="header-4 text-text-tertiary">{user?.cat?.name}</div>
9495
<div className="flex flex-col gap-md p-lg">

src/renderer/widgets/pomodoro/ui/rest-screen.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,18 @@ export const RestScreen = ({
126126
<Tooltip
127127
content={!isExceed ? '쉬는게 제일 좋다냥' : '이제 다시 사냥놀이 하자냥!'}
128128
color="white"
129-
sideOffset={-20}
129+
sideOffset={-40}
130130
rootProps={{ open: true }}
131131
arrowProps={{ width: 14, height: 9 }}
132-
/>
133-
<RiveComponent
134-
className="h-[240px] w-full cursor-pointer select-none"
135-
onClick={() => {
136-
clickCatInput?.fire();
137-
}}
138-
/>
132+
>
133+
<RiveComponent
134+
className="h-[240px] w-[240px] cursor-pointer select-none"
135+
onClick={() => {
136+
clickCatInput?.fire();
137+
}}
138+
/>
139+
</Tooltip>
140+
139141
<div className="flex flex-col items-center py-3">
140142
<div className="flex gap-xs">
141143
<Icon name="restTime" width={20} height={20} />

0 commit comments

Comments
 (0)