Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui): warningAlertModal 컴포넌트 개발 및 스토리북 작성 #6

Merged
merged 6 commits into from
Aug 19, 2024
Merged

feat(ui): warningAlertModal 컴포넌트 개발 및 스토리북 작성 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81c23f8
feat(ui): warningAlertModal 컴포넌트, warningAelrtModal 스토리북 추가
lsj0202 Aug 9, 2024
ab17811
fix(ui): dist/styles.css를 직접 임포트 하지 않아도 tailwindCss 적용되도록 수정
lsj0202 Aug 10, 2024
e29bae1
feat(ui): storybook 에서 임포트한 컴포넌트가 바로 tailwindCss 적용되도록 함
lsj0202 Aug 10, 2024
7f51cef
fix: storybook tsconfig.json 수정
lsj0202 Aug 10, 2024
996f1c9
fix: next 15 버전에서 14 버전으로 다운그레이드
lsj0202 Aug 11, 2024
79e3349
fix(ui): warningAlertModal 코드 수정
lsj0202 Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions .vscode/settings.json
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions apps/admin/package.json
View file
Open in desktop
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"
}
}
0 apps/admin/app/favicon.ico → apps/admin/src/app/favicon.ico
View file
Open in desktop
File renamed without changes.
0 apps/admin/app/globals.css → apps/admin/src/app/globals.css
View file
Open in desktop
File renamed without changes.
19 changes: 19 additions & 0 deletions apps/admin/src/app/layout.tsx
View file
Open in desktop
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>
);
}
0 apps/admin/app/page.module.css → apps/admin/src/app/page.module.css
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions apps/admin/app/page.tsx → apps/admin/src/app/page.tsx
View file
Open in desktop
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
0 apps/admin/app/fonts/GeistMonoVF.woff → apps/admin/src/fonts/GeistMonoVF.woff
View file
Open in desktop
File renamed without changes.
0 apps/admin/app/fonts/GeistVF.woff → apps/admin/src/fonts/GeistVF.woff
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion apps/admin/tsconfig.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
Binary file removed apps/client/app/fonts/GeistMonoVF.woff
View file
Open in desktop
Binary file not shown.
Binary file removed apps/client/app/fonts/GeistVF.woff
View file
Open in desktop
Binary file not shown.
39 changes: 0 additions & 39 deletions apps/client/app/globals.css
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions apps/client/app/layout.tsx
View file
Open in desktop

This file was deleted.

188 changes: 0 additions & 188 deletions apps/client/app/page.module.css
View file
Open in desktop

This file was deleted.

Loading
Loading