diff --git a/.eslintrc b/.eslintrc index 27794d6..ddecee3 100644 --- a/.eslintrc +++ b/.eslintrc @@ -31,7 +31,7 @@ }, "settings": { "react": { - "version": "16.8" + "version": "18" } } } diff --git a/.huskyrc b/.huskyrc deleted file mode 100644 index 5a1b2a8..0000000 --- a/.huskyrc +++ /dev/null @@ -1,6 +0,0 @@ -{ - "hooks": { - "commit-msg": "commitlint -E HUSKY_GIT_PARAMS", - "pre-commit": "lint-staged" - } -} diff --git a/.lintstagedrc b/.lintstagedrc deleted file mode 100644 index f960371..0000000 --- a/.lintstagedrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "src/**/*.{js,jsx}": ["eslint --fix"] -} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d1a8d25 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,51 @@ +{ + "editor.codeActionsOnSave": { + "source.fixAll": false, + "source.fixAll.eslint": true + }, + "todohighlight.isCaseSensitive": false, + "css.validate": false, + "editor.quickSuggestions": { + "other": true, + "comments": false, + "strings": true + }, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "prettier.prettierPath": "./node_modules/prettier", + "editor.formatOnSave": true, + "eslint.validate": ["javascript"], + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true + }, + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "emmet.triggerExpansionOnTab": true, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "cSpell.words": ["Privoce"], + "reactSnippets.settings.prettierEnabled": true, + "reactSnippets.settings.importReactOnTop": false, + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "typescript.tsdk": "node_modules/typescript/lib", + "typescript.tsc.autoDetect": "off", + "json.schemas": [ + { + "fileMatch": ["/*electron-builder.json5", "/*electron-builder.json"], + "url": "https://json.schemastore.org/electron-builder" + } + ] +} diff --git a/README.md b/README.md index 0e0030e..5822377 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,6 @@ - [react.js](https://reactjs.org) - [styled-components](https://styled-components.com): CSS-IN-JS Best Practice - eslint + prettier: for better code -- husky + commitlint: for better git commit format - [html2canvas](http://html2canvas.hertzen.com/) - [pinyin](https://github.com/hotoo/pinyin): convert Han to pinyin - [react-copy-to-clipboard](https://github.com/nkbt/react-copy-to-clipboard): enable copy diff --git a/README.zh.md b/README.zh.md index a8f3b07..0626176 100644 --- a/README.zh.md +++ b/README.zh.md @@ -33,7 +33,6 @@ - [react](https://reactjs.org): 最流行的前端 UI 构建语言 - [styled-components](https://styled-components.com): react 中 css 解决方案,CSS-IN-JS 最佳实践 - eslint + prettier: 为了更好地编码 -- husky + commitlint: 为了更好地 GIT 提交 - [html2canvas](http://html2canvas.hertzen.com/) - [pinyin](https://github.com/hotoo/pinyin): 汉字转拼音 - [react-copy-to-clipboard](https://github.com/nkbt/react-copy-to-clipboard): 开启复制功能 diff --git a/index.html b/index.html index d4a57e5..74ddfbc 100644 --- a/index.html +++ b/index.html @@ -1,59 +1,80 @@ - + +
+ + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - -