Merge pull request #194 from sugarforever/dev

Dev
sugarforever · Apr 3, 2024 · 795ff4e · 795ff4e
2 parents 649809a + 08c50fb
commit 795ff4e
Show file tree

Hide file tree

Showing 23 changed files with 957 additions and 368 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -2,10 +2,10 @@ root = true
 
 [*]
 charset = utf-8
+indent_style = space
+indent_size = 2
 end_of_line = lf
 insert_final_newline = true
-indent_style = space
-indent_size = 4
 trim_trailing_whitespace = true
 
 [*.md]

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+  "editor.formatOnSave": true,
+  "javascript.format.semicolons": "remove",
+  "javascript.preferences.quoteStyle": "single",
+  "typescript.format.semicolons": "remove",
+  "typescript.preferences.quoteStyle": "single",
+  "html.format.wrapAttributes": "preserve-aligned",
+  "cSpell.words": [
+    "nuxt"
+  ],
+}
diff --git a/app.vue b/app.vue
@@ -3,5 +3,6 @@
     <NuxtLayout>
       <NuxtPage />
     </NuxtLayout>
+    <UModals />
   </div>
 </template>