Skip to content

Commit

Permalink
feat(ui): warningAlertModal 컴포넌트, warningAelrtModal 스토리북 추가 (#6)
Browse files Browse the repository at this point in the history
* 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 코드 수정
  • Loading branch information
lsj0202 authored Aug 19, 2024
1 parent cd03e72 commit 7788f4a
Show file tree
Hide file tree
Showing 50 changed files with 1,007 additions and 930 deletions.
26 changes: 21 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
29 changes: 0 additions & 29 deletions apps/admin/app/layout.tsx

This file was deleted.

10 changes: 5 additions & 5 deletions apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
File renamed without changes.
File renamed without changes.
19 changes: 19 additions & 0 deletions apps/admin/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<html lang="en">
<body>{children}</body>
</html>
);
}
File renamed without changes.
4 changes: 0 additions & 4 deletions apps/admin/app/page.tsx → apps/admin/src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down Expand Up @@ -46,9 +45,6 @@ export default function Home() {
Read our docs
</a>
</div>
<Button appName="web" className={styles.secondary}>
Open alert
</Button>
</main>
<footer className={styles.footer}>
<a
Expand Down
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion apps/admin/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
{
"name": "next"
}
]
],
"types": ["react", "react-dom"]
},
"include": [
"next-env.d.ts",
Expand Down
1 change: 1 addition & 0 deletions apps/client/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
parserOptions: {
project: true,
},
ignorePatterns: ['postcss.config.js', 'tailwind.config.js'],
};
Binary file removed apps/client/app/favicon.ico
Binary file not shown.
Binary file removed apps/client/app/fonts/GeistMonoVF.woff
Binary file not shown.
Binary file removed apps/client/app/fonts/GeistVF.woff
Binary file not shown.
39 changes: 0 additions & 39 deletions apps/client/app/globals.css

This file was deleted.

29 changes: 0 additions & 29 deletions apps/client/app/layout.tsx

This file was deleted.

188 changes: 0 additions & 188 deletions apps/client/app/page.module.css

This file was deleted.

Loading

0 comments on commit 7788f4a

Please sign in to comment.