diff --git a/frontend/.editorconfig b/.editorconfig
similarity index 94%
rename from frontend/.editorconfig
rename to .editorconfig
index fbace8d..0880aa5 100644
--- a/frontend/.editorconfig
+++ b/.editorconfig
@@ -5,6 +5,7 @@ root = true
charset = utf-8
indent_style = space
indent_size = 2
+tab_width = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
@@ -12,4 +13,3 @@ trim_trailing_whitespace = true
[*.md]
insert_final_newline = false
trim_trailing_whitespace = false
-
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..e70e633
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,12 @@
+{
+ "recommendations": [
+ "EditorConfig.EditorConfig",
+ "esbenp.prettier-vscode",
+ "dbaeumer.vscode-eslint",
+ "stylelint.vscode-stylelint",
+ "Vue.volar",
+ "bradlc.vscode-tailwindcss",
+ "mikestead.dotenv",
+ "antfu.iconify"
+ ]
+}
diff --git a/frontend/web/.vscode/settings.json b/.vscode/settings.json
similarity index 53%
rename from frontend/web/.vscode/settings.json
rename to .vscode/settings.json
index 9b434de..2e05277 100644
--- a/frontend/web/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,32 +1,43 @@
{
- "editor.formatOnType": true,
- "editor.formatOnSave": true,
- "[vue]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode"
- },
+ "editor.detectIndentation": false,
"editor.tabSize": 2,
+ "editor.defaultFormatter": "esbenp.prettier-vscode",
+ "editor.formatOnSave": true,
"editor.formatOnPaste": true,
+ "editor.formatOnType": true,
"editor.guides.bracketPairs": "active",
- "files.autoSave": "afterDelay",
- "git.confirmSync": false,
- "workbench.startupEditor": "newUntitledFile",
+ "editor.snippetSuggestions": "top",
"editor.suggestSelection": "first",
"editor.acceptSuggestionOnCommitCharacter": false,
- "css.lint.propertyIgnoredDueToDisplay": "ignore",
"editor.quickSuggestions": {
"other": true,
"comments": true,
"strings": true
},
- "files.associations": {
- "editor.snippetSuggestions": "top"
+ "editor.codeActionsOnSave": {
+ "source.fixAll.eslint": "explicit",
+ "source.fixAll.stylelint": "explicit"
+ },
+ "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "vue"],
+ "stylelint.validate": ["css", "scss", "vue"],
+ "[vue]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
- "editor.codeActionsOnSave": {
- "source.fixAll.eslint": true
+ "[scss]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
},
- "iconify.excludes": ["el"],
- "cSpell.words": ["iconify", "Qrcode"]
+ "[typescript]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[javascript]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "css.lint.propertyIgnoredDueToDisplay": "ignore",
+ "files.autoSave": "afterDelay",
+ "git.confirmSync": false,
+ "workbench.startupEditor": "newUntitledFile",
+ "iconify.excludes": ["el"]
}
diff --git a/backend/GoogleStyle.xml b/backend/GoogleStyle.xml
index c2e1d68..1214d64 100644
--- a/backend/GoogleStyle.xml
+++ b/backend/GoogleStyle.xml
@@ -148,7 +148,9 @@
+
+
@@ -564,4 +566,4 @@
-
\ No newline at end of file
+
diff --git a/frontend/.prettierrc.cjs b/frontend/.prettierrc.cjs
index 87775f0..1fa2330 100644
--- a/frontend/.prettierrc.cjs
+++ b/frontend/.prettierrc.cjs
@@ -1,7 +1,7 @@
module.exports = {
+ tabWidth: 2,
bracketSpacing: true,
singleQuote: false,
arrowParens: "avoid",
trailingComma: "none"
};
-
diff --git a/frontend/web/.vscode/extensions.json b/frontend/web/.vscode/extensions.json
deleted file mode 100644
index 069796d..0000000
--- a/frontend/web/.vscode/extensions.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "recommendations": [
- "akamud.vscode-theme-onedark",
- "antfu.iconify",
- "bradlc.vscode-tailwindcss",
- "christian-kohler.npm-intellisense",
- "christian-kohler.path-intellisense",
- "Codeium.codeium",
- "csstools.postcss",
- "DavidAnson.vscode-markdownlint",
- "dbaeumer.vscode-eslint",
- "donjayamanne.githistory",
- "dsznajder.es7-react-js-snippets",
- "eamodio.gitlens",
- "ecmel.vscode-html-css",
- "esbenp.prettier-vscode",
- "genieai.chatgpt-vscode",
- "hollowtree.vue-snippets",
- "lokalise.i18n-ally",
- "mhutchie.git-graph",
- "mikestead.dotenv",
- "pmneo.tsimporter",
- "streetsidesoftware.code-spell-checker",
- "stylelint.vscode-stylelint",
- "syler.sass-indented",
- "sysoev.language-stylus",
- "vscode-icons-team.vscode-icons",
- "Vue.volar",
- "xabikos.JavaScriptSnippets"
- ]
-}
diff --git a/frontend/web/.vscode/vue3.0.code-snippets b/frontend/web/.vscode/vue3.0.code-snippets
deleted file mode 100644
index bb43589..0000000
--- a/frontend/web/.vscode/vue3.0.code-snippets
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "Vue3.0快速生成模板": {
- "scope": "vue",
- "prefix": "Vue3.0",
- "body": [
- "",
- "\ttest
",
- "\n",
- "\n",
- "",
- "$2"
- ],
- "description": "Vue3.0"
- }
-}
diff --git a/frontend/web/.vscode/vue3.2.code-snippets b/frontend/web/.vscode/vue3.2.code-snippets
deleted file mode 100644
index 2cebb46..0000000
--- a/frontend/web/.vscode/vue3.2.code-snippets
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "Vue3.2+快速生成模板": {
- "scope": "vue",
- "prefix": "Vue3.2+",
- "body": [
- "\n",
- "",
- "\ttest
",
- "\n",
- "",
- "$2"
- ],
- "description": "Vue3.2+"
- }
-}
diff --git a/frontend/web/.vscode/vue3.3.code-snippets b/frontend/web/.vscode/vue3.3.code-snippets
deleted file mode 100644
index dc7a106..0000000
--- a/frontend/web/.vscode/vue3.3.code-snippets
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "Vue3.3+defineOptions快速生成模板": {
- "scope": "vue",
- "prefix": "Vue3.3+",
- "body": [
- "\n",
- "",
- "\ttest
",
- "\n",
- "",
- "$2"
- ],
- "description": "Vue3.3+defineOptions快速生成模板"
- }
-}