Skip to content

Commit

Permalink
Merge branch 'main' into feature/admin
Browse files Browse the repository at this point in the history
  • Loading branch information
sunglitter committed Dec 6, 2024
2 parents 9ab655c + dd6799e commit 6f19ff6
Show file tree
Hide file tree
Showing 34 changed files with 1,275 additions and 1,082 deletions.
40 changes: 28 additions & 12 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,31 @@
{
"extends": [
"react-app",
"react-app/jest",
"plugin:react/recommended",
"plugin:prettier/recommended"
],
"plugins": ["prettier"],
"rules": {
"prettier/prettier": "error",
"react/react-in-jsx-scope": "off",
"react/prop-types": "off"
"env": {
"browser": true,
"es2021": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react-hooks/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint", "react-hooks"],
"rules": {
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"@typescript-eslint/explicit-module-boundary-types": "off"
},
"settings": {
"react": {
"version": "detect"
}
}
}
23 changes: 14 additions & 9 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.formatDocument": "explicit",
"source.fixAll.eslint": "explicit"
},
"files.eol": "\n"
}

"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.formatDocument": "explicit",
"source.fixAll.eslint": "explicit"
},
"files.eol": "\n",
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
]
}
Loading

0 comments on commit 6f19ff6

Please sign in to comment.