Merge pull request #49 from Real-Dev-Squad/develop

dev -> main
Real-Dev-Squad · Mar 13, 2024 · 597cb82 · 597cb82
2 parents 363824b + 290533d
commit 597cb82
Show file tree

Hide file tree

Showing 33 changed files with 22,075 additions and 34,504 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,50 +1,64 @@
 {
-  /**
+    /**
     Editor rules
     ------------
   */
-  "editor.formatOnSave": true,
-  "editor.tabSize": 4,
-  "prettier.tabWidth": 4,
-  "prettier.printWidth": 120,
-  "editor.rulers": [
-    {
-      "column": 120
-    }
-  ],
-  /**
+    "editor.formatOnSave": true,
+    "editor.tabSize": 4,
+    "editor.insertSpaces": false,
+    "prettier.tabWidth": 4,
+    "prettier.printWidth": 120,
+    "editor.rulers": [
+        {
+            "column": 120
+        }
+    ],
+    /**
     Formatters
     ------------
   */
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  /**
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "[javascript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[javascriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "prettier.requireConfig": true,
+    /**
     New Lines
     ------------
   */
-  "files.eol": "\n",
-  "files.insertFinalNewline": true,
-  /**
+    "files.eol": "\n",
+    "files.insertFinalNewline": true,
+    /**
     Linting
     ------------
   */
-  "eslint.run": "onSave",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "always"
-  },
-  /**
+    "eslint.run": "onSave",
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": "always"
+    },
+    /**
     Miscelaneous
     ------------
   */
-  "typescript.tsdk": "node_modules/typescript/lib",
-  /**
+    "typescript.tsdk": "node_modules/typescript/lib",
+    /**
     TailwindCSS
     ------------
   */
-  "tailwindCSS.experimental.classRegex": [
-    ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
-    ["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]
-  ],
-  "[jsonc]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
+    "tailwindCSS.experimental.classRegex": [
+        ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
+        ["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]
+    ],
+    "[jsonc]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    }
 }