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
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@ node_modules
!.pnp.loader.mjs

# 생성되더라도 굳이 커밋할 필요 없는 PnP 바이너리 데이터
.pnp.data.mdb
.pnp.data.mdb


#노드 버전 관리
.nvmrc
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn lint-staged
11 changes: 11 additions & 0 deletions .lintstagedrc.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export default {
"apps/nowait-admin/src/**/*.{ts,tsx,js,jsx}": (files) => [
`yarn workspace nowait-admin run eslint --fix ${files.join(" ")}`,
`prettier --write ${files.join(" ")}`,
],
"apps/nowait-user/src/**/*.{ts,tsx,js,jsx}": (files) => [
`yarn workspace nowait-user run eslint --fix ${files.join(" ")}`,
`prettier --write ${files.join(" ")}`,
],
"**/*.{css,json,md,yaml,yml,html}": "prettier --write",
};
604 changes: 600 additions & 4 deletions .pnp.cjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dist
.yarn
.pnp.*
*.tsbuildinfo
node_modules
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "es5",
"printWidth": 100,
"endOfLine": "lf"
}
10 changes: 9 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,13 @@
"**/.pnp.*": true
},
"typescript.tsdk": ".yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
"typescript.enablePromptUseWorkspaceTsdk": true,
"typescript.useWorkspaceTsdk": true,
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.useFlatConfig": true,
"prettier.requireConfig": true
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .yarn/cache/fsevents-patch-6b67494872-10c0.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions apps/nowait-admin/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'
import tseslint from 'typescript-eslint'
import eslintConfigPrettier from 'eslint-config-prettier'

export default tseslint.config(
{ ignores: ['dist'] },
Expand All @@ -12,6 +13,9 @@ export default tseslint.config(
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
parserOptions: {
tsconfigRootDir: import.meta.dirname,
},
},
plugins: {
'react-hooks': reactHooks,
Expand All @@ -25,4 +29,5 @@ export default tseslint.config(
],
},
},
eslintConfigPrettier,
)
2 changes: 2 additions & 0 deletions apps/nowait-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"preview": "vite preview"
},
"dependencies": {
"@hello-pangea/dnd": "^18.0.1",
"@repo/ui": "workspace:*",
"@tanstack/react-query": "^5.81.2",
"@tiptap/core": "^3.0.7",
Expand Down Expand Up @@ -55,6 +56,7 @@
"@vitejs/plugin-react": "^4.4.1",
"autoprefixer": "^10.4.20",
"eslint": "^9.25.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.19",
"globals": "^16.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ const AccountPage = () => {
(opt) => (inputs[opt.id] ?? "").trim().length > 0
);

const serverKakao = storePayment?.response.kakaoPayUrl;
const serverToss = storePayment?.response.tossUrl;
const serverNaver = storePayment?.response.naverPayUrl;
const serverAccount = storePayment?.response.accountNumber;
const serverKakao = storePayment?.response?.kakaoPayUrl;
const serverToss = storePayment?.response?.tossUrl;
const serverNaver = storePayment?.response?.naverPayUrl;
const serverAccount = storePayment?.response?.accountNumber;

const curKakao = inputs.kakao;
const curToss = inputs.toss;
Expand Down
Loading
Loading