Merge branch 'main' into refactor/login-form

BesLogic · Dec 19, 2024 · 2adc824 · 2adc824
2 parents 3b33c06 + 81f6382
commit 2adc824
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 46 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -112,7 +112,7 @@
     }
   ],
   "eslint.codeActionsOnSave.rules": [
-    // Clearing imports and unused vars because of commented code while testing is annoying
+    // Clearing imports, unused vars and comments because of commented code while testing is annoying
     "!unused-imports/no-unused-imports",
     "!autofix/no-debugger",
     "!autofix/no-unused-vars",
@@ -135,6 +135,9 @@
     "editor.defaultFormatter": "vscode.html-language-features"
   },
   "html.format.wrapAttributes": "force-expand-multiline",
+  // To match markup_fmt with dprint
+  "html.format.indentInnerHtml": true,
+  "html.format.extraLiners": "",
 
   /*
   * CSS

diff --git a/canopeum_frontend/index.html b/canopeum_frontend/index.html
@@ -1,47 +1,45 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link
+      rel="icon"
+      type="image/svg+xml"
+      href="/favicon.ico"
+    />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0"
+    />
+    <title>Releaf</title>
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200"
+    />
+    <link
+      href="https://unpkg.com/[email protected]/dist/maplibre-gl.css"
+      rel="stylesheet"
+    />
+    <link
+      rel="preconnect"
+      href="https://fonts.googleapis.com"
+    />
+    <link
+      rel="preconnect"
+      href="https://fonts.gstatic.com"
+      crossorigin
+    />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap"
+      rel="stylesheet"
+    />
+  </head>
 
-<head>
-  <meta charset="UTF-8" />
-  <link
-    rel="icon"
-    type="image/svg+xml"
-    href="/favicon.ico"
-  />
-  <meta
-    name="viewport"
-    content="width=device-width, initial-scale=1.0"
-  />
-  <title>Releaf</title>
-  <link
-    rel="stylesheet"
-    href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200"
-  />
-  <link
-    href='https://unpkg.com/[email protected]/dist/maplibre-gl.css'
-    rel='stylesheet'
-  />
-  <link
-    rel="preconnect"
-    href="https://fonts.googleapis.com"
-  >
-  <link
-    rel="preconnect"
-    href="https://fonts.gstatic.com"
-    crossorigin
-  >
-  <link
-    href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap"
-    rel="stylesheet"
-  >
-</head>
-
-<body>
-  <div id="root"></div>
-  <script
-    type="module"
-    src="/src/main.tsx"
-  ></script>
-</body>
-
+  <body>
+    <div id="root"></div>
+    <script
+      type="module"
+      src="/src/main.tsx"
+    ></script>
+  </body>
 </html>
diff --git a/dprint.json b/dprint.json
@@ -13,6 +13,8 @@
     "**/obj",
     // capacitor folders
     "**/*/android/app",
-    "**/*/ios/App"
+    "**/*/ios/App",
+    // TODO: Test and update configs for scss (Malva)
+    "**/*.scss"
   ]
 }