Skip to content

Commit

Permalink
Merge pull request #112 from YukiOnishi1129/feature/top-design
Browse files Browse the repository at this point in the history
Feature/top design
  • Loading branch information
YukiOnishi1129 authored Jul 9, 2024
2 parents 7848e44 + c6ef8ec commit fc647d9
Show file tree
Hide file tree
Showing 58 changed files with 3,320 additions and 518 deletions.
11 changes: 3 additions & 8 deletions web/admin/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"semi": true,
"trailingComma": "es5",
"singleQuote": false,
"jsxSingleQuote": false,
"tabWidth": 2,
"useTabs": false
}

"singleQuote": true,
"trailingComma": "all"
}
6 changes: 3 additions & 3 deletions web/client/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"plugin:import/warnings",
"plugin:tailwindcss/recommended"
],
"plugins": ["import", "unused-imports", "tailwindcss", "@typescript-eslint"],
"plugins": ["import", "unused-imports", "tailwindcss"],
"rules": {
"import/order": [
"error",
Expand Down Expand Up @@ -56,10 +56,10 @@
],
"import/first": "error",
"import/newline-after-import": "error",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-imports": "warn",
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off",
"@typescript-eslint/no-unused-vars": "error"
"@typescript-eslint/no-unused-vars": "off"
},
"settings": {
"import/parsers": {
Expand Down
5 changes: 4 additions & 1 deletion web/client/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"typescript.enablePromptUseWorkspaceTsdk": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": ["source.addMissingImports", "source.fixAll"]
"editor.codeActionsOnSave": [
"source.addMissingImports",
"source.fixAll.eslint"
]
}
Loading

0 comments on commit fc647d9

Please sign in to comment.