Merge remote-tracking branch 'origin/develop'

.vscode/settings.json

@@ -8,10 +8,10 @@
         "vue"
   ],
   "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true,
-      "eslint.format.enable": true,
-      "editor.formatOnSave": true,
-    },
+    "source.fixAll.eslint": "explicit",
+    "eslint.format.enable": "explicit",
+    "editor.formatOnSave": "explicit"
+  },
     "editor.bracketPairColorization.enabled": true,
     "editor.guides.bracketPairs": "active",
     "editor.wordWrap": "on",

components.d.ts

@@ -10,12 +10,15 @@ declare module 'vue' {
     AccountSettings: typeof import('./src/views/settings/account/AccountSettings.vue')['default']
     AddMarker: typeof import('./src/components/AddMarker.vue')['default']
     BaseButton: typeof import('./src/components/BaseButton.vue')['default']
+    Button: typeof import('./src/components/ui/button/Button.vue')['default']
     ColourSelector: typeof import('./src/components/ColourSelector.vue')['default']
     Disclaimer: typeof import('./src/components/Disclaimer.vue')['default']
     ErrorMessage: typeof import('./src/components/ErrorMessage.vue')['default']
     ImageSettings: typeof import('./src/views/settings/ImageSettings.vue')['default']
     InformationMark: typeof import('./src/components/InformationMark.vue')['default']
+    Input: typeof import('./src/components/ui/input/Input.vue')['default']
     ItemDetails: typeof import('./src/components/ItemDetails.vue')['default']
+    Label: typeof import('./src/components/ui/label/Label.vue')['default']
     LoadingScreen: typeof import('./src/components/LoadingScreen.vue')['default']
     LoginForm: typeof import('./src/components/LoginForm.vue')['default']
     MonthSelector: typeof import('./src/components/MonthSelector.vue')['default']

components.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://shadcn-vue.com/schema.json",
+  "style": "default",
+  "typescript": true,
+  "tsConfigPath": "./tsconfig.json",
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "src/index.css",
+    "baseColor": "slate",
+    "cssVariables": true
+  },
+  "framework": "vite",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils"
+  }
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "forager",
-  "version": "2.1.1",
   "type": "module",
+  "version": "2.1.1",
   "scripts": {
     "dev": "vite --host",
     "build": "vue-tsc --noEmit && vite build",
@@ -23,9 +23,15 @@
   },
   "dependencies": {
     "@vueuse/core": "10.6.1",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.1",
+    "lucide-vue-next": "^0.395.0",
     "mapbox-gl": "^2.15.0",
     "pinia": "^2.1.7",
     "pocketbase": "^0.18.0",
+    "radix-vue": "^1.8.3",
+    "tailwind-merge": "^2.3.0",
+    "tailwindcss-animate": "^1.0.7",
     "tippy.js": "^6.3.7",
     "vue": "3.3.8"
   },
@@ -49,4 +55,4 @@
     "vite-plugin-pwa": "^0.17.0",
     "vue-tsc": "1.8.22"
   }
-}
+}