@wishbone-media/spark 0.5.2 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wishbone-media/spark",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -42,7 +42,8 @@
     "./formkit.config.js": "./formkit.config.js",
     "./formkit.theme.mjs": "./formkit.theme.mjs",
     "./assets/css/*": "./src/assets/css/*",
-    "./assets/fonts/*": "./src/assets/fonts/*"
+    "./assets/fonts/*": "./src/assets/fonts/*",
+    "./assets/images/brands/*": "./src/assets/images/brands/*"
   },
   "publishConfig": {
     "access": "public"

package/src/components/SparkBrandSelector.vue

@@ -12,9 +12,15 @@
             />
           </div>
         </div>
+        <div
+          v-if="sparkBrandFilterStore.allBrands.length === 0"
+          class="flex px-[22px] py-[15px] text-gray-500 text-sm"
+        >
+          No brands configured
+        </div>
         <div
           v-for="brand in sparkBrandFilterStore.allBrands"
-          :key="brand.name"
+          :key="brand.id"
           :class="brand.current ? 'bg-gray-50' : 'hover:bg-gray-50'"
           class="flex px-[22px] py-[15px] cursor-pointer"
           @click="selectBrand(brand)"

package/src/stores/brand-filter.js

@@ -1,31 +1,55 @@
 import { defineStore } from 'pinia'
 import { computed, reactive } from 'vue'
 
-import mrPestControllerLogo from '@/assets/images/mr-pest-controller.png'
-import mrGutterCleaningLogo from '@/assets/images/mr-gutter-cleaning.png'
-import mrAntennaLogo from '@/assets/images/mr-antenna.png'
-
 export const useSparkBrandFilterStore = defineStore('brandFilter', () => {
   const state = reactive({
-    brands: [
-      {
-        name: 'Mr Pest Controller',
-        logo: mrPestControllerLogo,
-        current: false,
-      },
-      {
-        name: 'Mr Gutter Cleaning',
-        logo: mrGutterCleaningLogo,
-        current: false,
-      },
-      { name: 'Mr Antenna', logo: mrAntennaLogo, current: true },
-    ],
+    brands: [],
   })
 
-  const currentBrand = computed(() => state.brands.find((item) => item.current))
+  const initialize = (config = {}) => {
+    if (!config.brands || !Array.isArray(config.brands)) {
+      console.warn('useSparkBrandFilterStore: No brands provided to initialize()')
+      state.brands = []
+      return
+    }
+
+    // Validate brand structure
+    const validBrands = config.brands.filter((brand) => {
+      const isValid = brand.id && brand.name && brand.logo
+      if (!isValid) {
+        console.warn('useSparkBrandFilterStore: Invalid brand object', brand)
+      }
+      return isValid
+    })
+
+    // Ensure exactly one brand is marked as current
+    const currentBrands = validBrands.filter((b) => b.current)
+    if (currentBrands.length === 0 && validBrands.length > 0) {
+      validBrands[0].current = true
+    } else if (currentBrands.length > 1) {
+      // Only the first current brand stays current
+      validBrands.forEach((brand) => {
+        brand.current = brand === currentBrands[0]
+      })
+    }
+
+    state.brands = validBrands.map((brand) => ({
+      id: brand.id,
+      name: brand.name,
+      logo: brand.logo,
+      current: brand.current || false,
+    }))
+  }
+
+  const currentBrand = computed(() => state.brands.find((item) => item.current) || null)
   const allBrands = computed(() => state.brands)
 
   const toggleBrand = (brand) => {
+    if (!brand || !state.brands.includes(brand)) {
+      console.warn('useSparkBrandFilterStore: Invalid brand provided to toggleBrand()')
+      return
+    }
+
     state.brands.forEach((item) => {
       item.current = item === brand
     })
@@ -33,6 +57,7 @@ export const useSparkBrandFilterStore = defineStore('brandFilter', () => {
 
   return {
     state,
+    initialize,
     currentBrand,
     allBrands,
     toggleBrand,

package/src/views/SparkForgotPasswordView.vue

@@ -0,0 +1,75 @@
+<template>
+  <div class="h-full grid place-content-center relative">
+    <div class="absolute top-8 left-8">
+      <svg
+          width="59"
+          height="23"
+          viewBox="0 0 59 23"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+            d="M49.2029 17.1264V8.03835H44.0829V5.22235H58.0989V8.03835H52.9629V17.1264H49.2029Z"
+            fill="#1C64F2"
+        />
+        <path d="M34.5 5.22235H38.228V14.1664H46.5V17.1264H34.5V5.22235Z" fill="#1C64F2" />
+        <path
+            d="M28.3161 0C29.1499 0 29.7522 0.798785 29.5209 1.59757L27.1856 9.77748H30.9046C31.747 9.77748 32.4279 10.4584 32.4279 11.3008C32.4279 11.7504 32.2315 12.1738 31.891 12.4619L20.5989 22.0517C20.3719 22.2438 20.0839 22.3485 19.787 22.3485C18.9533 22.3485 18.351 21.5497 18.5823 20.751L20.9176 12.571H17.1463C16.33 12.571 15.6709 11.9119 15.6709 11.1001C15.6709 10.6679 15.8586 10.262 16.186 9.98263L27.5043 0.301181C27.7312 0.104759 28.0193 0 28.3161 0ZM26.7404 3.71021L18.8311 10.4759H22.3056C22.633 10.4759 22.9429 10.6286 23.1437 10.8905C23.3445 11.1524 23.4056 11.4929 23.3139 11.8072L21.3584 18.6601L29.355 11.8727H25.7976C25.4702 11.8727 25.1603 11.7199 24.9595 11.458C24.7587 11.1961 24.6976 10.8556 24.7893 10.5413L26.7404 3.71021Z"
+            fill="#1C64F2"
+        />
+        <path
+            d="M0 17.1264V5.22235H10.192C13.6 5.22235 14.544 6.53435 14.544 7.94235V8.16635C14.544 9.70235 13.232 10.3264 12.656 10.4864C13.472 10.6944 15.216 11.3984 15.216 13.4784V13.7024C15.216 15.5904 14.144 17.1264 10.288 17.1264H0ZM9.552 7.73435H3.728V9.67035H9.552C10.592 9.67035 10.848 9.19035 10.848 8.71035V8.67835C10.848 8.18235 10.592 7.73435 9.552 7.73435ZM9.872 12.1984H3.728V14.5344H9.872C11.12 14.5344 11.344 13.8464 11.344 13.3664V13.3024C11.344 12.7904 11.104 12.1984 9.872 12.1984Z"
+            fill="#1C64F2"
+        />
+      </svg>
+    </div>
+
+    <div class="max-w-sm grid gap-y-1 -mt-8">
+      <div class="mb-7">
+        <h1 class="text-4xl text-gray-900 semibold tracking-tight mb-3">Log in</h1>
+
+        <p class="text-gray-600">
+          Welcome back{{ appStore.state.app ? ` to ${appStore.state.app}` : '' }}! Please enter
+          your details.
+        </p>
+      </div>
+
+      <FormKit type="form" @submit="handleLogin" :actions="false">
+        <FormKit
+            label="Email"
+            name="email"
+            placeholder="Enter your email"
+            type="email"
+            validation="required|email"
+            outer-class="max-w-full"
+        />
+
+        <FormKit
+            label="Password"
+            name="password"
+            placeholder="••••••••"
+            type="password"
+            validation="required"
+            outer-class="max-w-full"
+        />
+
+        <div class="grid grid-flow-col justify-between my-1">
+          <FormKit label="Remember me" name="remember" type="checkbox" />
+        </div>
+
+        <div v-if="errorMessage" class="text-red-600 text-sm mb-2">
+          {{ errorMessage }}
+        </div>
+
+        <spark-button type="submit" size="xl" :disabled="isLoading" button-class="w-full mb-2">
+          <span v-if="!isLoading">Sign in</span>
+          <span v-else>Signing in...</span>
+        </spark-button>
+      </FormKit>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { SparkButton } from '@/index.js'
+</script>

package/src/views/SparkLoginView.vue

@@ -31,8 +31,8 @@
         <h1 class="text-4xl text-gray-900 semibold tracking-tight mb-3">Log in</h1>
 
         <p class="text-gray-600">
-          Welcome back{{ props.appName ? ` to ${props.appName}` : '' }}! Please enter your
-          details.
+          Welcome back{{ appStore.state.app ? ` to ${appStore.state.app}` : '' }}! Please enter
+          your details.
         </p>
       </div>
 
@@ -70,35 +70,26 @@
           {{ errorMessage }}
         </div>
 
-        <spark-button type="submit" size="xl" :disabled="isLoading" button-class="w-full">
+        <spark-button type="submit" size="xl" :disabled="isLoading" button-class="w-full mb-2">
           <span v-if="!isLoading">Sign in</span>
           <span v-else>Signing in...</span>
         </spark-button>
       </FormKit>
-
-      <div v-if="props.signupRoute" class="mt-4 text-center text-sm text-gray-600">
-        Don't have an account?
-        <router-link :to="props.signupRoute" class="text-primary-600 font-semibold">
-          Sign up
-        </router-link>
-      </div>
     </div>
   </div>
 </template>
 
 <script setup>
 import { ref } from 'vue'
-import { SparkButton } from '@/index.js'
+import { SparkButton, useSparkAppStore } from '@/index.js'
+
+const appStore = useSparkAppStore()
 
 const props = defineProps({
   logo: {
     type: String,
     default: '',
   },
-  appName: {
-    type: String,
-    default: '',
-  },
   onLogin: {
     type: Function,
     required: true,
@@ -107,10 +98,6 @@ const props = defineProps({
     type: String,
     default: '/forgot-password',
   },
-  signupRoute: {
-    type: String,
-    default: '',
-  },
 })
 
 const emit = defineEmits(['login-success', 'login-error'])

package/src/views/SparkLogoutView.vue

@@ -0,0 +1,15 @@
+<template></template>
+
+<script setup>
+import { onMounted } from 'vue'
+
+const props = defineProps({
+  onLogout: {
+    type: Function,
+  },
+})
+
+onMounted(async () => {
+  await props.onLogout()
+});
+</script>