Skip to content

Commit

Permalink
Merge pull request #7 from JECT-Study/feature/design-system
Browse files Browse the repository at this point in the history
[TASK-39] style: 전역적으로 사용될 폰트, 색상 토큰 적용 / Navbar, Footer 생성 및 반응형 적용
  • Loading branch information
dahyeo-n authored Dec 18, 2024
2 parents 5d424d2 + 8448053 commit a239525
Show file tree
Hide file tree
Showing 64 changed files with 10,895 additions and 2,792 deletions.
8 changes: 7 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"airbnb",
"airbnb/hooks",
"plugin:@typescript-eslint/recommended",
"plugin:storybook/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
Expand All @@ -13,7 +14,12 @@
"prettier/prettier": "error",
"react/react-in-jsx-scope": "off",
"react/jsx-props-no-spreading": "off",
"react/jsx-filename-extension": ["warn", { "extensions": [".tsx"] }],
"react/jsx-filename-extension": [
"warn",
{
"extensions": [".tsx"]
}
],
"simple-import-sort/imports": "error",
"simple-import-sort/exports": "error",
"import/first": "error",
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
.next

.env
.env
*storybook.log
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public-hoist-pattern[]=*@nextui-org/*
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"semi": true,
"singleQuote": true,
"jsxSingleQuote": true,
"trailingComma": "all",
"tabWidth": 2,
"printWidth": 80
Expand Down
18 changes: 18 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { StorybookConfig } from '@storybook/nextjs';

const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-onboarding',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/nextjs',
options: {},
},
staticDirs: ['../public'],
};

export default config;
16 changes: 16 additions & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import '../src/styles/globals.css';

import type { Preview } from '@storybook/react';

const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
};

export default preview;
18 changes: 17 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,30 @@
"dev": "next dev --turbopack",
"build": "next build",
"start": "next start",
"lint": "next lint . --ext .js,.jsx,.ts,.tsx"
"lint": "next lint . --ext .js,.jsx,.ts,.tsx",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build",
"prettier": "prettier --write \"**/*.{js,jsx,ts,tsx}\""
},
"dependencies": {
"@nextui-org/react": "^2.6.8",
"@tanstack/react-query": "^5.62.3",
"framer-motion": "^11.14.4",
"next": "15.0.4",
"next-themes": "^0.4.4",
"react": "19.0.0",
"react-dom": "19.0.0",
"zustand": "^5.0.2"
},
"devDependencies": {
"@chromatic-com/storybook": "^3.2.2",
"@storybook/addon-essentials": "^8.4.7",
"@storybook/addon-interactions": "^8.4.7",
"@storybook/addon-onboarding": "^8.4.7",
"@storybook/blocks": "^8.4.7",
"@storybook/nextjs": "^8.4.7",
"@storybook/react": "^8.4.7",
"@storybook/test": "^8.4.7",
"@types/node": "^22.10.1",
"@types/react": "^19.0.1",
"@types/react-dom": "^19.0.1",
Expand All @@ -32,9 +46,11 @@
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-storybook": "^0.11.1",
"msw": "^2.7.0",
"postcss": "^8.4.49",
"prettier": "^3.4.2",
"storybook": "^8.4.7",
"tailwindcss": "^3.4.16",
"typescript": "^5.7.2"
},
Expand Down
Loading

0 comments on commit a239525

Please sign in to comment.