From 1792f4028a347a557ad14289c76d5fa0a0e6b3f9 Mon Sep 17 00:00:00 2001
From: CRBroughton <crbroughton@posteo.uk>
Date: Fri, 24 Nov 2023 22:20:04 +0000
Subject: [PATCH] feat: :sparkles: Users can now create custom colours for
 foragables

---
 .changeset/strong-bugs-double.md     |  5 ++++
 src/components/ColourSelector.vue    | 42 +++-------------------------
 src/mapbox/layers.ts                 | 15 ++--------
 src/stores/mapbox.ts                 | 10 +++----
 src/stores/pocketbase.ts             |  2 +-
 src/types.ts                         |  1 +
 src/utils/pocketbase.ts              | 16 ++++++++++-
 src/views/settings/ImageSettings.vue |  5 ++--
 8 files changed, 36 insertions(+), 60 deletions(-)
 create mode 100644 .changeset/strong-bugs-double.md

diff --git a/.changeset/strong-bugs-double.md b/.changeset/strong-bugs-double.md
new file mode 100644
index 0000000..73629c5
--- /dev/null
+++ b/.changeset/strong-bugs-double.md
@@ -0,0 +1,5 @@
+---
+"forager": minor
+---
+
+Users can now create custom colours for foragables
diff --git a/src/components/ColourSelector.vue b/src/components/ColourSelector.vue
index dfd63f1..4782532 100644
--- a/src/components/ColourSelector.vue
+++ b/src/components/ColourSelector.vue
@@ -1,53 +1,19 @@
 <script setup lang="ts">
-interface Props {
-  selectedColour: string
-}
-
-const props = defineProps<Props>()
-
 const emit = defineEmits<Emits>()
 interface Emits {
   (e: 'change', value: string): void
 }
-
-const colours = ['red', 'blue', 'purple', 'deeppink', 'cadetblue']
+const selectedColour = ref('#ffffff')
 </script>
 
 <template>
-  <div
-    class="my-2
-      "
-  >
-    Selected Colour: {{
-      props.selectedColour.length > 0 ? props.selectedColour : 'None selected'
-    }}
-  </div>
-
-  <div class="colour-selector">
-    <div
-      v-for="colour in colours"
-      :key="colour"
-      class="colour-choice"
-      :class="{ highlighted: colour === props.selectedColour }"
-      @click="emit('change', colour)"
-    >
-      <div
-        class="colour-dot"
-        :style="{ background: colour }"
-      />
-    </div>
+  <div class="flex flex-col gap-2">
+    <p>Colour</p>
+    <input v-model="selectedColour" class="w-full" type="color" @change="emit('change', selectedColour)">
   </div>
 </template>
 
 <style scoped>
-.colour-selector {
-  display: flex;
-  gap: .5em;
-  margin-bottom: 20px;
-  cursor: pointer;
-  margin-left: 5px;
-}
-
 .colour-choice {
   width: 50px;
   background: rgb(255, 255, 255);
diff --git a/src/mapbox/layers.ts b/src/mapbox/layers.ts
index 6825230..86d90fd 100644
--- a/src/mapbox/layers.ts
+++ b/src/mapbox/layers.ts
@@ -1,6 +1,6 @@
 import type mapboxgl from 'mapbox-gl'
 
-export function createLayers(map: mapboxgl.Map) {
+export function createLayers(map: mapboxgl.Map, usersSavedColours: string[]) {
   map.addLayer({
     id: 'unclustered-point',
     type: 'circle',
@@ -11,18 +11,7 @@ export function createLayers(map: mapboxgl.Map) {
       'circle-color': [
         'match',
         ['get', 'colour'],
-        'blue',
-        'blue',
-        'red',
-        'red',
-        'purple',
-        'purple',
-        'orange',
-        'orange',
-        'deeppink',
-        'deeppink',
-        'cadetblue',
-        'cadetblue',
+        ...usersSavedColours,
         /* other */ '#ccc',
       ],
       'circle-radius': 8,
diff --git a/src/stores/mapbox.ts b/src/stores/mapbox.ts
index 9b44c1e..0136337 100644
--- a/src/stores/mapbox.ts
+++ b/src/stores/mapbox.ts
@@ -6,11 +6,11 @@ import { createLandmarks, createLayers } from '../mapbox/layers'
 import { createGeolocator } from '../mapbox/geoLocator'
 import type { LandmarksRecord } from '../pocketbase-types'
 import { usePocketBase } from '@/stores'
-import { user } from '@/utils/pocketbase'
+import { user, usersSavedColours } from '@/utils/pocketbase'
 
 export const useMapbox = defineStore('mapbox-store', () => {
   const userStore = usePocketBase()
-  mapboxgl.accessToken = userStore.user?.mapboxAPIKey
+  mapboxgl.accessToken = userStore.user.mapboxAPIKey!
   let map: mapboxgl.Map | undefined
   const lng = ref(0)
   const lat = ref(0)
@@ -95,7 +95,7 @@ export const useMapbox = defineStore('mapbox-store', () => {
     map = new mapboxgl.Map({
       container: 'map',
       style: 'mapbox://styles/mapbox/outdoors-v12',
-      center: [user?.value?.lng, user?.value?.lat] ?? [0, 0],
+      center: [user.value.lng!, user.value.lat!] ?? [0, 0],
       zoom: user?.value?.lat === 0 && user?.value?.lng === 0 ? 2 : 14,
     })
 
@@ -155,7 +155,7 @@ export const useMapbox = defineStore('mapbox-store', () => {
       // })
 
       if (map) {
-        createLayers(map)
+        createLayers(map, usersSavedColours.value)
         createGeolocator(map)
       }
     })
@@ -349,7 +349,7 @@ export const useMapbox = defineStore('mapbox-store', () => {
 
   const returnHome = () => {
     const settingsStore = usePocketBase()
-    map?.flyTo({ center: [settingsStore.user?.lng, settingsStore.user?.lat], zoom: 14 })
+    map?.flyTo({ center: [settingsStore.user.lng!, settingsStore.user.lat!], zoom: 14 })
   }
 
   return {
diff --git a/src/stores/pocketbase.ts b/src/stores/pocketbase.ts
index 60ffaf1..0e67ed3 100644
--- a/src/stores/pocketbase.ts
+++ b/src/stores/pocketbase.ts
@@ -33,7 +33,7 @@ export const usePocketBase = defineStore('pocketbase-store', () => {
   const health = ref<healthCheckResponse>()
   const selectedItemPocketbase = ref<ItemsRecordWithID>()
 
-  pb.authStore.onChange(() => user.value = pb.authStore.model)
+  pb.authStore.onChange(() => user.value = pb.authStore.model as UserRecordWithID)
 
   const getHealth = async () => {
     try {
diff --git a/src/types.ts b/src/types.ts
index 19b82d8..2354e43 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -12,6 +12,7 @@ export interface LandmarksRecordWithID extends LandmarksRecord {
 export interface UserRecordWithID extends UsersRecord {
   email: string
   id: string
+  images: UserImage[]
 }
 
 export interface UserImage {
diff --git a/src/utils/pocketbase.ts b/src/utils/pocketbase.ts
index 38885ca..514051b 100644
--- a/src/utils/pocketbase.ts
+++ b/src/utils/pocketbase.ts
@@ -1,11 +1,25 @@
 import PocketBase from 'pocketbase'
+import type { UserRecordWithID } from '@/types'
 
 const state = useStorage('forager-store', {
   server: import.meta.env.VITE_POCKETBASE_URL,
 })
 
 export const pb = new PocketBase(state.value.server)
-export const user = ref(pb.authStore.model)
+export const user = ref(pb.authStore.model) as Ref<UserRecordWithID>
+
+export const usersSavedColours = computed(() => {
+  const colours: string[] = []
+
+  user.value.images.forEach((image) => {
+    if (colours.includes(image.colour))
+      return
+    if (image.colour === '')
+      return
+    colours.push(image.colour, image.colour)
+  })
+  return colours
+})
 
 export const errorMessage = ref<Error | undefined>(undefined)
 export function setErrorMessage(message: Error) {
diff --git a/src/views/settings/ImageSettings.vue b/src/views/settings/ImageSettings.vue
index 14fa5ae..5855a25 100644
--- a/src/views/settings/ImageSettings.vue
+++ b/src/views/settings/ImageSettings.vue
@@ -9,7 +9,7 @@ const { user } = storeToRefs(pocketbaseStore)
 
 const imageURL = ref('')
 const imageName = ref('')
-const selectedColour = ref('red')
+const selectedColour = ref('')
 
 const submitButtonDisabled = computed(() => {
   return imageURL.value.length === 0
@@ -42,7 +42,7 @@ const selectedEndMonth = ref('December')
       Saved Images
     </h2>
     <div class="grid grid-cols-3 gap-4 justify-center">
-      <div v-for="image in user?.images" :key="image" class="flex flex-col items-center justify-center gap-2">
+      <div v-for="(image, index) in user?.images" :key="index" class="flex flex-col items-center justify-center gap-2">
         <ReferenceImage :image="image" can-delete @delete="pocketbaseStore.deleteReferenceImage(image)" />
       </div>
     </div>
@@ -50,6 +50,7 @@ const selectedEndMonth = ref('December')
     <h2 class="text-md font-medium">
       Create New Image
     </h2>
+    {{ selectedColour }}
     <ColourSelector :selected-colour="selectedColour" @change="selectedColour = $event" />
     <div class="flex flex-col gap-4">
       <input v-model="imageURL" class="login-input" placeholder="Enter Image URL">