Skip to content

Commit

Permalink
[Merge] epic/FE-26브랜치 최신화 (#8)
Browse files Browse the repository at this point in the history
* .nvmrc 버전 수정

* 폰트 및 공용컬러 추가 (#6)

* font-family 추가

* tailwind common color 추가

* color 명 변경

* lang 수정

---------

Co-authored-by: 전유민 <[email protected]>

* 💄 공용 컴포넌트 shadcn ui 추가 (#7)

* 💄 Feat: shadcn-ui init

* 💄 Feat: add toast ui

* Feat: add textarea ui

* Feat: add switch ui

* Feat: add radio-group ui

* Feat: add label ui

* Feat: add input ui

* Feat: add form ui

* Feat: add button ui

* Feat: add dropdown-menu ui

* Feat: add card ui

* Feat: add badge ui

* Feat: add avatar ui

* Feat: add alert dialog ui

* Chore: add eslint rules

* Chore: add shadcn ui

---------

Co-authored-by: 전유민 <[email protected]>
Co-authored-by: JeonYumin94 <[email protected]>
Co-authored-by: MOON <[email protected]>
  • Loading branch information
4 people authored Jul 10, 2024
1 parent 37538f7 commit 42cc95e
Show file tree
Hide file tree
Showing 28 changed files with 2,191 additions and 536 deletions.
19 changes: 6 additions & 13 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
Expand All @@ -12,7 +10,7 @@ module.exports = {
},
extends: [
'eslint:recommended',
"plugin:@tanstack/eslint-plugin-query/recommended",
'plugin:@tanstack/eslint-plugin-query/recommended',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:@typescript-eslint/recommended',
Expand All @@ -23,20 +21,15 @@ module.exports = {
'next/core-web-vitals',
'prettier',
],
plugins: [
'react',
'react-hooks',
'@typescript-eslint',
'jsx-a11y',
'import',
'prettier',
],
plugins: ['react', 'react-hooks', '@typescript-eslint', 'jsx-a11y', 'import', 'prettier'],
rules: {
'prettier/prettier': 'error',
'react/react-in-jsx-scope': 'off', // Next.js doesn't require React to be in scope
'react/prop-types': 'off',
'no-console':'error',
"react/jsx-props-no-spreading":'off'
'no-console': 'error',
'react/jsx-props-no-spreading': 'off',
'no-use-before-define': 'off',
'@typescript-eslint/no-use-before-define': ['off'],
},
settings: {
react: {
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.14.0
v20.15.0
17 changes: 17 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": false,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "src/styles/globals.css",
"baseColor": "slate",
"cssVariables": true,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
Loading

0 comments on commit 42cc95e

Please sign in to comment.