From 7788f4a0bbea30f5a0ffcc5b1fd7738b38fa24db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=83=81=EC=A7=84?= <102288397+lsj0202@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:33:01 +0900 Subject: [PATCH] =?UTF-8?q?feat(ui):=20warningAlertModal=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8,=20warningAelrtModal=20=EC=8A=A4?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=EB=B6=81=20=EC=B6=94=EA=B0=80=20(#6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(ui): warningAlertModal 컴포넌트, warningAelrtModal 스토리북 추가 * fix(ui): dist/styles.css를 직접 임포트 하지 않아도 tailwindCss 적용되도록 수정 * feat(ui): storybook 에서 임포트한 컴포넌트가 바로 tailwindCss 적용되도록 함 * fix: storybook tsconfig.json 수정 * fix: next 15 버전에서 14 버전으로 다운그레이드 * fix(ui): warningAlertModal 코드 수정 --- .vscode/settings.json | 26 +- apps/admin/app/layout.tsx | 29 - apps/admin/package.json | 10 +- apps/admin/{ => src}/app/favicon.ico | Bin apps/admin/{ => src}/app/globals.css | 0 apps/admin/src/app/layout.tsx | 19 + apps/admin/{ => src}/app/page.module.css | 0 apps/admin/{ => src}/app/page.tsx | 4 - .../admin/{app => src}/fonts/GeistMonoVF.woff | Bin apps/admin/{app => src}/fonts/GeistVF.woff | Bin apps/admin/tsconfig.json | 3 +- apps/client/.eslintrc.js | 1 + apps/client/app/favicon.ico | Bin 25931 -> 0 bytes apps/client/app/fonts/GeistMonoVF.woff | Bin 67864 -> 0 bytes apps/client/app/fonts/GeistVF.woff | Bin 66268 -> 0 bytes apps/client/app/globals.css | 39 - apps/client/app/layout.tsx | 29 - apps/client/app/page.module.css | 188 --- apps/client/app/page.tsx | 87 -- apps/client/package.json | 17 +- apps/client/postcss.config.js | 6 + apps/client/public/file-text.svg | 3 - apps/client/public/globe.svg | 10 - apps/client/public/next.svg | 1 - apps/client/public/vercel.svg | 10 - apps/client/public/window.svg | 3 - apps/client/src/app/favicon.ico | Bin 0 -> 668 bytes apps/client/src/app/layout.tsx | 12 + apps/client/src/app/page.tsx | 3 + apps/client/src/styles/globals.css | 46 + apps/client/tailwind.config.js | 11 + apps/client/tsconfig.json | 7 +- package.json | 5 +- packages/ui/.eslintrc.js | 1 + packages/ui/package.json | 15 +- packages/ui/postcss.config.js | 6 + packages/ui/src/WarningAlertModal/index.tsx | 46 + packages/ui/src/button.tsx | 20 - packages/ui/src/card.tsx | 25 - packages/ui/src/code.tsx | 9 - packages/ui/src/index.ts | 1 + packages/ui/tailwind.config.js | 8 + pnpm-lock.yaml | 1188 +++++++++++------ storybook/.storybook/preview.ts | 1 + storybook/.storybook/styles.css | 3 + storybook/package.json | 4 + storybook/postcss.config.cjs | 6 + storybook/src/WarningAlertModal.stories.ts | 24 + storybook/tailwind.config.cjs | 8 + storybook/tsconfig.json | 3 +- 50 files changed, 1007 insertions(+), 930 deletions(-) delete mode 100644 apps/admin/app/layout.tsx rename apps/admin/{ => src}/app/favicon.ico (100%) rename apps/admin/{ => src}/app/globals.css (100%) create mode 100644 apps/admin/src/app/layout.tsx rename apps/admin/{ => src}/app/page.module.css (100%) rename apps/admin/{ => src}/app/page.tsx (94%) rename apps/admin/{app => src}/fonts/GeistMonoVF.woff (100%) rename apps/admin/{app => src}/fonts/GeistVF.woff (100%) delete mode 100644 apps/client/app/favicon.ico delete mode 100644 apps/client/app/fonts/GeistMonoVF.woff delete mode 100644 apps/client/app/fonts/GeistVF.woff delete mode 100644 apps/client/app/globals.css delete mode 100644 apps/client/app/layout.tsx delete mode 100644 apps/client/app/page.module.css delete mode 100644 apps/client/app/page.tsx create mode 100644 apps/client/postcss.config.js delete mode 100644 apps/client/public/file-text.svg delete mode 100644 apps/client/public/globe.svg delete mode 100644 apps/client/public/next.svg delete mode 100644 apps/client/public/vercel.svg delete mode 100644 apps/client/public/window.svg create mode 100644 apps/client/src/app/favicon.ico create mode 100644 apps/client/src/app/layout.tsx create mode 100644 apps/client/src/app/page.tsx create mode 100644 apps/client/src/styles/globals.css create mode 100644 apps/client/tailwind.config.js create mode 100644 packages/ui/postcss.config.js create mode 100644 packages/ui/src/WarningAlertModal/index.tsx delete mode 100644 packages/ui/src/button.tsx delete mode 100644 packages/ui/src/card.tsx delete mode 100644 packages/ui/src/code.tsx create mode 100644 packages/ui/src/index.ts create mode 100644 packages/ui/tailwind.config.js create mode 100644 storybook/.storybook/styles.css create mode 100644 storybook/postcss.config.cjs create mode 100644 storybook/src/WarningAlertModal.stories.ts create mode 100644 storybook/tailwind.config.cjs diff --git a/.vscode/settings.json b/.vscode/settings.json index 44a73ec..d9d77e5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,23 @@ { - "eslint.workingDirectories": [ - { - "mode": "auto" - } - ] + "tailwindCSS.experimental.classRegex": [ + ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"], + ["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"] + ], + "editor.codeActionsOnSave": { + "source.fixAll.eslint": "explicit", + "source.organizeImports": "explicit" + }, + "editor.formatOnSave": true, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } } diff --git a/apps/admin/app/layout.tsx b/apps/admin/app/layout.tsx deleted file mode 100644 index b43cacd..0000000 --- a/apps/admin/app/layout.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import type { Metadata } from 'next'; -import localFont from 'next/font/local'; -import './globals.css'; - -const geistSans = localFont({ - src: './fonts/GeistVF.woff', - variable: '--font-geist-sans', -}); -const geistMono = localFont({ - src: './fonts/GeistMonoVF.woff', - variable: '--font-geist-mono', -}); - -export const metadata: Metadata = { - title: 'Create Next App', - description: 'Generated by create next app', -}; - -export default function RootLayout({ - children, -}: Readonly<{ - children: React.ReactNode; -}>) { - return ( - - {children} - - ); -} diff --git a/apps/admin/package.json b/apps/admin/package.json index 637ffbc..cc99e2a 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -10,18 +10,18 @@ }, "dependencies": { "@jjoing/ui": "workspace:*", + "next": "^14.0.0", "react": "19.0.0-rc-f994737d14-20240522", - "react-dom": "19.0.0-rc-f994737d14-20240522", - "next": "15.0.0-rc.0" + "react-dom": "19.0.0-rc-f994737d14-20240522" }, "devDependencies": { "@jjoing/eslint-config": "workspace:*", "@jjoing/typescript-config": "workspace:*", - "typescript": "^5", "@types/node": "^20", - "@types/react": "^18", + "@types/react": "^18.3.3", "@types/react-dom": "^18", "eslint": "^8", - "eslint-config-next": "15.0.0-rc.0" + "eslint-config-next": "15.0.0-rc.0", + "typescript": "^5.5.4" } } diff --git a/apps/admin/app/favicon.ico b/apps/admin/src/app/favicon.ico similarity index 100% rename from apps/admin/app/favicon.ico rename to apps/admin/src/app/favicon.ico diff --git a/apps/admin/app/globals.css b/apps/admin/src/app/globals.css similarity index 100% rename from apps/admin/app/globals.css rename to apps/admin/src/app/globals.css diff --git a/apps/admin/src/app/layout.tsx b/apps/admin/src/app/layout.tsx new file mode 100644 index 0000000..f3d4978 --- /dev/null +++ b/apps/admin/src/app/layout.tsx @@ -0,0 +1,19 @@ +import type { Metadata } from 'next'; +import './globals.css'; + +export const metadata: Metadata = { + title: 'Create Next App', + description: 'Generated by create next app', +}; + +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + return ( + + {children} + + ); +} diff --git a/apps/admin/app/page.module.css b/apps/admin/src/app/page.module.css similarity index 100% rename from apps/admin/app/page.module.css rename to apps/admin/src/app/page.module.css diff --git a/apps/admin/app/page.tsx b/apps/admin/src/app/page.tsx similarity index 94% rename from apps/admin/app/page.tsx rename to apps/admin/src/app/page.tsx index 6d991c6..091b5eb 100644 --- a/apps/admin/app/page.tsx +++ b/apps/admin/src/app/page.tsx @@ -1,6 +1,5 @@ import Image from 'next/image'; import styles from './page.module.css'; -import { Button } from '@jjoing/ui/button'; export default function Home() { return ( @@ -46,9 +45,6 @@ export default function Home() { Read our docs -