diff --git a/.prettierrc b/.prettierrc index 2fec1f2..a64b191 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,6 @@ { "singleQuote": true, "trailingComma": "all", - "printWidth": 100 + "printWidth": 100, + "plugins": ["prettier-plugin-tailwindcss"] } diff --git a/package.json b/package.json index 94f91ef..d5d537d 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "eslint-plugin-prettier": "^5.1.3", "postcss": "^8.4.39", "prettier": "^3.3.2", + "prettier-plugin-tailwindcss": "^0.6.6", "tailwindcss": "^3.4.4", "ts-node": "^10.0.0", "typescript": "~4.5.4", diff --git a/src/renderer/app/layout.tsx b/src/renderer/app/layout.tsx index c63719a..b3d8bf4 100644 --- a/src/renderer/app/layout.tsx +++ b/src/renderer/app/layout.tsx @@ -2,7 +2,7 @@ import { Outlet } from 'react-router-dom'; const RootLayout = () => { return ( -
+
); diff --git a/src/renderer/features/category/ui/category-chip.tsx b/src/renderer/features/category/ui/category-chip.tsx index 86a626c..9d9402c 100644 --- a/src/renderer/features/category/ui/category-chip.tsx +++ b/src/renderer/features/category/ui/category-chip.tsx @@ -7,7 +7,7 @@ type CategoryChipProps = { export const CategoryChip = ({ category }: CategoryChipProps) => { return ( -
+
{category}
diff --git a/src/renderer/features/category/ui/change-category-drawer.tsx b/src/renderer/features/category/ui/change-category-drawer.tsx index fd5fb06..cfde31a 100644 --- a/src/renderer/features/category/ui/change-category-drawer.tsx +++ b/src/renderer/features/category/ui/change-category-drawer.tsx @@ -43,8 +43,8 @@ export const ChangeCategoryDrawer = ({ }} > -
- 카테고리 변경 +
+ 카테고리 변경 @@ -54,7 +54,7 @@ export const ChangeCategoryDrawer = ({ onValueChange={(value) => { setSelectedCategory(value); }} - className="flex flex-col gap-4 mt-lg px-lg" + className="mt-lg flex flex-col gap-4 px-lg" > {categories?.map((category) => { const focusTime = @@ -67,13 +67,13 @@ export const ChangeCategoryDrawer = ({
{category.title}
-
+
집중 {focusTime}분 | 휴식 {restTime}분 diff --git a/src/renderer/features/pomodoro/ui/timeout-dialog.tsx b/src/renderer/features/pomodoro/ui/timeout-dialog.tsx index f74f7a1..b651de8 100644 --- a/src/renderer/features/pomodoro/ui/timeout-dialog.tsx +++ b/src/renderer/features/pomodoro/ui/timeout-dialog.tsx @@ -10,7 +10,7 @@ export const TimeoutDialog = ({ open, onOpenChange, title, description }: Timeou
-
{title}
+
{title}
{description}
-
+
-
+
{padNumber(minutes)} {/* @note: 콜론 가운데 정렬이 되지 않아 이렇게 표시함 */} : @@ -112,7 +112,7 @@ export const ChangeTimeDialog = ({
-
+
{errorMessage}
@@ -128,7 +128,7 @@ export const ChangeTimeDialog = ({
-
diff --git a/src/renderer/pages/home.tsx b/src/renderer/pages/home.tsx index f144998..abf8550 100644 --- a/src/renderer/pages/home.tsx +++ b/src/renderer/pages/home.tsx @@ -27,7 +27,7 @@ const Home = () => { return (
diff --git a/src/renderer/pages/mycat.tsx b/src/renderer/pages/mycat.tsx index 1a73bcb..904dd08 100644 --- a/src/renderer/pages/mycat.tsx +++ b/src/renderer/pages/mycat.tsx @@ -42,8 +42,8 @@ const MyCat = () => { navigate(PATH.MY_PAGE)} /> -
-
+
+
{ arrowProps={{ width: 14, height: 9 }} /> - + -
+
); const ReadyForStat = () => ( -
+

통계 기능을 준비하고 있어요

diff --git a/src/renderer/pages/naming.tsx b/src/renderer/pages/naming.tsx index 9d9a5e3..468d6b4 100644 --- a/src/renderer/pages/naming.tsx +++ b/src/renderer/pages/naming.tsx @@ -43,8 +43,8 @@ const Naming = () => { return ( -
-
+
+
{ arrowProps={{ width: 14, height: 9 }} /> { clickCatInput?.fire(); }} @@ -63,12 +63,12 @@ const Naming = () => { setTypedCatName(e.target.value)} /> {errorMessage && (
-
+
{errorMessage}
diff --git a/src/renderer/pages/onboarding.tsx b/src/renderer/pages/onboarding.tsx index d76992e..f308754 100644 --- a/src/renderer/pages/onboarding.tsx +++ b/src/renderer/pages/onboarding.tsx @@ -12,7 +12,7 @@ import { cn } from '@/shared/utils'; const Onboarding = () => { return ( - + {/* @note: useCarousel를 사용하기 위해 별도 컴포넌트로 분리 */} @@ -45,10 +45,10 @@ const OnboardingContent = () => { const [, setIsCompleted] = useLocalStorage(LOCAL_STORAGE_KEY.ONBOARDING_COMPLETED, false); return ( -
+
{ {contents.map(({ title, description, imageSrc }, index) => ( -
+

{title}

-

{description}

+

{description}

@@ -73,7 +73,7 @@ const OnboardingContent = () => {
  • diff --git a/src/renderer/pages/selection.tsx b/src/renderer/pages/selection.tsx index a51f6da..702b6df 100644 --- a/src/renderer/pages/selection.tsx +++ b/src/renderer/pages/selection.tsx @@ -86,7 +86,7 @@ const Selection = () => { -
    +

    어떤 고양이와 함께할까요?

    언제든지 다른 고양이와 함께할 수 있어요

    @@ -101,7 +101,7 @@ const Selection = () => { ))} {/* TODO: 아래를 선택한 고양이 이미지 에셋으로 변경 */} - +
    { - + {cat.adjective} { const AlarmEmpty = () => { return ( -
    +
    {'고양이를 선택하면\n딴 짓 방해알림 예시를 보여드려요'}
    ); @@ -172,17 +172,17 @@ const AlarmSample = ({ appName = '모하냥', time = '지금', message }: AlarmS return (
    -
    +

    {appName}

    -

    {time}

    +

    {time}

    {message}

    diff --git a/src/renderer/shared/ui/carousel.tsx b/src/renderer/shared/ui/carousel.tsx index d21547c..d141e80 100644 --- a/src/renderer/shared/ui/carousel.tsx +++ b/src/renderer/shared/ui/carousel.tsx @@ -209,7 +209,7 @@ const CarouselPrevious = React.forwardRef @@ -62,10 +62,10 @@ export const Dialog = ({ {title} diff --git a/src/renderer/shared/ui/frame.tsx b/src/renderer/shared/ui/frame.tsx index c3b6959..aa09f78 100644 --- a/src/renderer/shared/ui/frame.tsx +++ b/src/renderer/shared/ui/frame.tsx @@ -7,8 +7,8 @@ type FrameProps = { }; export const Frame = ({ children }: FrameProps) => { return ( -
    -
    {children}
    +
    +
    {children}
    ); }; @@ -19,10 +19,10 @@ type NavBarProps = { }; const NavBar = ({ title, onBack }: NavBarProps) => { return ( -
    +
    {onBack && ( -
    +
    { clickCatInput?.fire(); }} />
    {user?.cat?.name}
    -
    +
    -
    +
    -
    +
    diff --git a/src/renderer/widgets/pomodoro/ui/rest-screen.tsx b/src/renderer/widgets/pomodoro/ui/rest-screen.tsx index 9b59e61..6c35f83 100644 --- a/src/renderer/widgets/pomodoro/ui/rest-screen.tsx +++ b/src/renderer/widgets/pomodoro/ui/rest-screen.tsx @@ -38,15 +38,15 @@ export const RestScreen = ({ }); return ( -
    +
    -
    +
    {currentCategory}
    -
    +
    { clickCatInput?.fire(); }} @@ -65,14 +65,14 @@ export const RestScreen = ({ 휴식시간
    -
    @@ -103,7 +103,7 @@ export const RestScreen = ({
    -
    +
    diff --git a/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx b/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx index 22d8f45..7437dba 100644 --- a/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx +++ b/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx @@ -36,24 +36,24 @@ export const RestWaitScreen = ({ ); return ( -
    +
    -
    +
    -
    -
    +
    -
    -