Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"env": {
"browser": true,
"es2021": true,
"node": true
},
"settings": {
"import/resolver": {
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
},
"extends": [
"next",
"next/core-web-vitals",
"prettier",
"airbnb",
"eslint:recommended",
"plugin:react/recommended",
"plugin:prettier/recommended",
"plugin:@typescript-eslint/recommended",
"airbnb-typescript"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module",
"project": "./tsconfig.json"
},
"plugins": ["@typescript-eslint", "react", "prettier"],
"rules": {
"prettier/prettier": "error",
"react/react-in-jsx-scope": "off"
}
}
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,22 @@
},
"dependencies": {
"eslint-plugin-prettier": "^5.2.3",
"next": "15.0.3",
"next": "^15.1.7",
"prettier": "^3.5.0",
"react": "19.0.0-rc-66855b96-20241106",
"react-dom": "19.0.0-rc-66855b96-20241106"
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/node": "^20.0.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.4.0",
"autoprefixer": "^10.4.20",
"eslint": "^8.0.1",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-next": "^15.1.7",
"eslint-config-next": "^13.0.0",
"eslint-config-prettier": "^10.0.1",
"eslint-config-standard-with-typescript": "^43.0.1",
"eslint-plugin-import": "^2.25.2",
Expand All @@ -33,9 +35,9 @@
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^5.1.0",
"postcss": "^8",
"postcss": "^8.4.5",
"prettier-plugin-tailwindcss": "^0.6.11",
"tailwindcss": "^3.4.1",
"typescript": "*"
"typescript": "^5.0.0"
}
}
6 changes: 6 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
8 changes: 0 additions & 8 deletions postcss.config.mjs

This file was deleted.

File renamed without changes.
20 changes: 10 additions & 10 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
:root {
--background: #ffffff;
--foreground: #171717;
}

@media (prefers-color-scheme: dark) {
:root {
--background: #0a0a0a;
--foreground: #ededed;
@media (prefers-color-scheme: dark) {
:root {
--background: #0a0a0a;
--foreground: #ededed;
}
}
}

body {
color: var(--foreground);
background: var(--background);
font-family: Arial, Helvetica, sans-serif;
body {
color: var(--foreground);
background: var(--background);
font-family: Pretendard, serif;
}
}
2 changes: 1 addition & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const geistMono = localFont({
});

export const metadata: Metadata = {
title: 'Create Next App',
title: '빌릴게',
description: 'Generated by create next app',
};

Expand Down
44 changes: 21 additions & 23 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,27 @@ export default {
pretendard: ['Pretendard', 'sans-serif'],
},
colors: {
background: 'var(--background)',
foreground: 'var(--foreground)',
background: 'var(--background)',

// 기본 색상 정의
warning: '#CC2E2E',
'black-primary': '#202125',
'white-primary': '#FAFAFA',
// background: '#F3F4F8',

'return-red': '#CC2E2E',
'return-blue': '#5294FF',

'main-primary': '#2E5ACC',
'main-secondary': '#899FD8',
'main-tertiary': '#C0C9E0',

'gray-primary': '#37393C',
'gray-secondary': '#898C8E',
'gray-tertiary': '#F2F1F1',
'gray-border': '#DCDDDE',
},
fontSize: {
'heading-1_M': ['24px', { lineHeight: '32px' }],
'heading-2_M': ['22px', { lineHeight: '30px' }],
Expand All @@ -33,28 +52,7 @@ export default {
'heading-2_D': ['32px', { lineHeight: '40px' }],
'heading-3_D': ['24px', { lineHeight: '32px' }],
'heading-4_D': ['20px', { lineHeight: '28px' }],
'text': ['18px', { lineHeight: '20px' }],
},

colors: {
foreground: "var(--foreground)",

'warning': "#CC2E2E",
'black-primary': "#202125",
'white-primary':'#FAFAFA',
'background': "#F3F4F8",

'return-red': '#CC2E2E',
'return-blue:': '#5294FF',

'main-primary':'#2E5ACC',
'main-secondary':'#899FD8',
'main-tertiary':'#C0C9E0',

'gray-primary':'#37393C',
'gray-secondary':'#898C8E',
'gray-tertiary':'#F2F1F1',
'gray-border':'#DCDDDE',
text: ['18px', { lineHeight: '20px' }],
},
},
},
Expand Down
Loading