@wishbone-media/spark 0.10.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wishbone-media/spark",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/src/components/SparkAppSelector.vue

@@ -12,12 +12,14 @@
             />
           </div>
         </div>
-        <div
+        <a
           v-for="app in appsWithCurrent"
           :key="app.name"
+          :href="app.href"
+          target="_blank"
           :class="app.current ? 'bg-gray-50' : 'hover:bg-gray-50'"
           class="flex px-[22px] py-[15px] cursor-pointer"
-          @click="openNewTab(app)"
+          @click="app.current ? $event.preventDefault() : handleAppClick(app, $event)"
         >
           <div class="gap-y-1">
             <div class="text-base text-gray-800 flex items-center">
@@ -38,12 +40,21 @@
               class="h-5 w-5 shrink-0"
             />
           </div>
-        </div>
+        </a>
         <div></div>
       </div>
       <div class="mt-auto">
-        <div class="p-6">Learn More</div>
-        <div class="bg-gray-50 p-6">Footer</div>
+        <div v-if="$slots.bottom || bottomSlot" class="p-6">
+          <slot name="bottom">
+            <component v-if="bottomSlot" :is="bottomSlot" />
+          </slot>
+        </div>
+
+        <div v-if="$slots.footer || footerSlot" class="bg-gray-50 p-6">
+          <slot name="footer">
+            <component v-if="footerSlot" :is="footerSlot" />
+          </slot>
+        </div>
       </div>
     </div>
   </div>
@@ -52,69 +63,34 @@
 <script setup>
 import { computed } from 'vue'
 import { Icons } from '@/plugins/fontawesome'
+import { useSparkAppSelectorStore } from '@/stores/app-selector'
+import { useSparkAppStore } from '@/stores/app'
 
 const props = defineProps({
-  appItems: {
-    type: Array,
-    default() {
-      return [
-        {
-          name: '3CX',
-          description: 'VOIP Phone',
-          href: 'https://3cx.letsbolt.com.au',
-          icon: 'farLaptopMobile',
-        },
-        {
-          name: 'Buzz',
-          description: 'Communication on the go',
-          href: 'https://buzz.letsbolt.com.au',
-          icon: 'farSatelliteDish',
-        },
-        {
-          name: 'Dash',
-          description: 'Financial powerhouse',
-          href: 'https://dash.letsbolt.com.au',
-          icon: 'farScaleBalanced',
-        },
-        {
-          name: 'MAPit',
-          description: 'Geolocation everything',
-          href: 'https://mapit.letsbolt.com.au',
-          icon: 'farStreetView',
-        },
-        {
-          name: 'ProspectR',
-          description: 'Leads management',
-          href: 'https://prospectr.letsbolt.com.au',
-          icon: 'farFaceSmileRelaxed',
-        },
-        {
-          name: 'ReVuze',
-          description: 'Get Customer feedback',
-          href: 'https://revuze.letsbolt.com.au',
-          icon: 'farComments',
-        },
-      ]
-    },
+  bottomSlot: {
+    type: [Object, Function],
+    default: null,
   },
-  currentApp: {
-    type: String,
-    default: 'Buzz',
+  footerSlot: {
+    type: [Object, Function],
+    default: null,
   },
 })
 
 const emit = defineEmits(['close', 'select'])
 
+const appSelectorStore = useSparkAppSelectorStore()
+const appStore = useSparkAppStore()
+
 const appsWithCurrent = computed(() => {
-  return props.appItems.map(app => ({
+  const currentAppName = appStore.state.app
+  return appSelectorStore.state.apps.map(app => ({
     ...app,
-    current: app.name === props.currentApp
+    current: currentAppName && app.name.toLowerCase() === currentAppName.toLowerCase()
   }))
 })
 
-const openNewTab = (app) => {
-  window.open(app.href, '_blank')
-
+const handleAppClick = (app, event) => {
   emit('select', app)
 }
 </script>

package/src/containers/SparkDefaultContainer.vue

@@ -10,7 +10,7 @@
                   class="grid w-[40px] h-[40px] place-items-center rounded-md bg-primary-600 text-white text-[13px] cursor-pointer"
                   @click.prevent="mainNavStore.goto(appStore.state.homeRoute)"
                 >
-                  <font-awesome-icon :icon="Icons[appStore.state.icon]" class="size-5" />
+                  <font-awesome-icon :icon="Icons[appIcon]" class="size-5" />
                 </a>
                 <a
                   @click.prevent="mainNavStore.goto(appStore.state.homeRoute)"
@@ -165,11 +165,12 @@
 </template>
 
 <script setup>
-import { computed } from 'vue'
+import { computed, h, useSlots } from 'vue'
 import {
   SparkOverlay,
   SparkBrandSelector,
   useSparkBrandFilterStore,
+  useSparkAppSelectorStore,
   SparkAppSelector,
   sparkOverlayService,
   SparkModalContainer,
@@ -185,14 +186,38 @@ const props = defineProps({
     type: Object,
     required: true,
   },
+  appSelectorSlots: {
+    type: Object,
+    default: () => ({}),
+  },
 })
 
+const slots = useSlots()
+
 const sparkBrandFilterStore = useSparkBrandFilterStore()
+const sparkAppSelectorStore = useSparkAppSelectorStore()
+
+const appIcon = computed(() => {
+  return sparkAppSelectorStore.getAppIcon(props.appStore.state.app)
+})
 
 const toggleAppSelector = () => {
-  sparkOverlayService.showRight(SparkAppSelector, {
-    currentApp: props.appStore.state.app,
-  })
+  // Create component wrappers for slots if they exist
+  const slotProps = {}
+
+  if (slots['app-selector-bottom']) {
+    slotProps.bottomSlot = () => h('div', {}, slots['app-selector-bottom']())
+  } else if (props.appSelectorSlots.bottomSlot) {
+    slotProps.bottomSlot = props.appSelectorSlots.bottomSlot
+  }
+
+  if (slots['app-selector-footer']) {
+    slotProps.footerSlot = () => h('div', {}, slots['app-selector-footer']())
+  } else if (props.appSelectorSlots.footerSlot) {
+    slotProps.footerSlot = props.appSelectorSlots.footerSlot
+  }
+
+  sparkOverlayService.showRight(SparkAppSelector, slotProps)
 }
 
 const toggleBrandSelector = () => {

package/src/plugins/axios.js

@@ -42,7 +42,7 @@ export function createAxiosInstance(config = {}) {
     },
   )
 
-  // Response interceptor - handle 401 errors (unauthorized)
+  // Response interceptor - handle 401 and 403 errors
   instance.interceptors.response.use(
     (response) => response,
     async (error) => {
@@ -60,6 +60,20 @@ export function createAxiosInstance(config = {}) {
           window.location.href = '/login'
         }
       }
+
+      // Redirect on 403 Forbidden responses
+      if (error.response?.status === 403) {
+        try {
+          const authStore = useSparkAuthStore()
+          // Redirect to forbidden page
+          window.location.href = authStore.state.routes.forbidden
+        } catch (redirectError) {
+          // If redirect fails, fallback to default forbidden route
+          console.error('Error during 403 redirect:', redirectError)
+          window.location.href = '/error/403'
+        }
+      }
+
       return Promise.reject(error)
     },
   )

package/src/plugins/index.js

@@ -1,3 +1,3 @@
 export { Icons, addIcons, setupFontAwesome } from './fontawesome.js'
-export { createAuthRoutes, setupAuthGuards } from './router.js'
+export { createAuthRoutes, setupAuthGuards, create403Route, create404Route } from './router.js'
 export { createAxiosInstance, setupAxios } from './axios.js'

package/src/plugins/router.js

@@ -4,6 +4,9 @@ import {
   SparkLogoutView,
   SparkForgotPasswordView,
   SparkResetPasswordView,
+  SparkError403View,
+  SparkError404View,
+  SparkErrorGeneralView,
 } from '../views/index.js'
 
 export function createAuthRoutes(options = {}) {
@@ -11,7 +14,7 @@ export function createAuthRoutes(options = {}) {
     loginPath = '/login',
     logoutPath = '/logout',
     forgotPasswordPath = '/forgot-password',
-    resetPasswordPath = '/reset-password',
+    resetPasswordPath = '/password/reset',
     logo = '',
     defaultRedirect = '/dashboard',
   } = options
@@ -40,7 +43,7 @@ export function createAuthRoutes(options = {}) {
     },
     {
       path: resetPasswordPath,
-      name: 'reset-password',
+      name: 'password-reset',
       component: SparkResetPasswordView,
       props: { logo, loginRoute: loginPath },
       meta: { auth: false },
@@ -126,3 +129,52 @@ function processNavigation(to, next, authStore, defaultAuthenticatedRoute) {
     next()
   }
 }
+
+/**
+ * Creates error page route for 403 Forbidden
+ * NOTE: 404 catch-all route is separate - use create404Route() and add it LAST
+ * NOTE: General error page is available as SparkErrorGeneralView component for manual use
+ * @param {Object} options - Configuration options
+ * @param {string} options.forbiddenPath - Path for 403 forbidden page (default: '/error/403')
+ * @param {string} options.logo - Logo URL to display on error page
+ * @param {string} options.homeRoute - Default route for "Go Home" button (default: '/dashboard')
+ * @returns {Object} Route configuration for 403 error page
+ */
+export function create403Route(options = {}) {
+  const {
+    forbiddenPath = '/error/403',
+    logo = '',
+    homeRoute = '/dashboard',
+  } = options
+
+  return {
+    path: forbiddenPath,
+    name: 'error-403',
+    component: SparkError403View,
+    props: { logo, homeRoute },
+    meta: { auth: false },
+  }
+}
+
+/**
+ * Creates 404 catch-all route
+ * IMPORTANT: This MUST be added as the last route in your router configuration
+ * @param {Object} options - Configuration options
+ * @param {string} options.logo - Logo URL to display on error page
+ * @param {string} options.homeRoute - Default route for "Go Home" button (default: '/dashboard')
+ * @returns {Object} Route configuration for 404 catch-all
+ */
+export function create404Route(options = {}) {
+  const {
+    logo = '',
+    homeRoute = '/dashboard',
+  } = options
+
+  return {
+    path: '/:pathMatch(.*)*',
+    name: 'error-404',
+    component: SparkError404View,
+    props: { logo, homeRoute },
+    meta: { auth: false },
+  }
+}

package/src/stores/app-selector.js

@@ -0,0 +1,140 @@
+import { defineStore } from 'pinia'
+import { computed, reactive } from 'vue'
+
+const DEFAULT_APPS = [
+  {
+    name: '3CX',
+    description: 'VOIP Phone',
+    href: 'https://tmrg.3cx.com.au:5001/webclient',
+    icon: 'farLaptopMobile',
+  },
+  {
+    name: 'Buzz',
+    description: 'Communication on the go',
+    href: 'https://buzz-next.letsbolt.io',
+    icon: 'farSatelliteDish',
+  },
+  {
+    name: 'Dash',
+    description: 'Financial powerhouse',
+    href: 'https://dash-next.letsbolt.io',
+    icon: 'farScaleBalanced',
+  },
+  {
+    name: 'MAPit',
+    description: 'Geolocation everything',
+    href: 'https://mapit-next.letsbolt.io',
+    icon: 'farStreetView',
+  },
+  {
+    name: 'ProspectR',
+    description: 'Leads management',
+    href: 'https://prospectr-next.letsbolt.io',
+    icon: 'farFaceSmileRelaxed',
+  },
+  {
+    name: 'ReVuze',
+    description: 'Get Customer feedback',
+    href: 'https://revuze-next.letsbolt.io',
+    icon: 'farComments',
+  },
+  {
+    name: 'Tabula',
+    description: 'Admin interface',
+    href: 'https://tabula.letsbolt.io',
+    icon: 'farCompass',
+  },
+]
+
+export const useSparkAppSelectorStore = defineStore('sparkAppSelector', () => {
+  const state = reactive({
+    apps: [...DEFAULT_APPS],
+  })
+
+  /**
+   * Initialize app selector store with either partial href config or full app override
+   * @param {Object} config - Configuration object
+   * @param {Object} config.appHrefs - Object mapping app names to hrefs (case-insensitive)
+   *                                    Example: { 'Buzz': 'https://buzz.staging.example.com' }
+   * @param {Array} config.apps - Complete array of app objects to override defaults
+   *                               Example: [{ name: 'Buzz', description: '...', icon: '...', href: '...' }]
+   */
+  const initialize = (config = {}) => {
+    // Full override: if apps array is provided, use it entirely
+    if (config.apps && Array.isArray(config.apps)) {
+      const validApps = config.apps.filter((app) => {
+        const isValid = app.name && app.description && app.icon && app.href
+        if (!isValid) {
+          console.warn('useSparkAppSelectorStore: Invalid app object', app)
+        }
+        return isValid
+      })
+
+      state.apps = validApps.map((app) => ({
+        name: app.name,
+        description: app.description,
+        icon: app.icon,
+        href: app.href,
+      }))
+
+      return
+    }
+
+    // Partial config: merge appHrefs into defaults
+    if (config.appHrefs && typeof config.appHrefs === 'object') {
+      // Create a case-insensitive lookup map
+      const hrefMap = new Map()
+      Object.keys(config.appHrefs).forEach((appName) => {
+        hrefMap.set(appName.toLowerCase(), config.appHrefs[appName])
+      })
+
+      // Update default apps with provided hrefs
+      state.apps = DEFAULT_APPS.map((app) => {
+        const customHref = hrefMap.get(app.name.toLowerCase())
+        return {
+          ...app,
+          href: customHref || app.href,
+        }
+      })
+
+      return
+    }
+
+    // No config provided: use defaults
+    state.apps = [...DEFAULT_APPS]
+  }
+
+  /**
+   * Get all available apps
+   */
+  const allApps = computed(() => state.apps)
+
+  /**
+   * Get app by name (case-insensitive)
+   * @param {string} appName - Name of the app to find
+   * @returns {Object|null} App object or null if not found
+   */
+  const getAppByName = (appName) => {
+    if (!appName) return null
+    const normalizedName = appName.toLowerCase()
+    return state.apps.find((app) => app.name.toLowerCase() === normalizedName) || null
+  }
+
+  /**
+   * Get icon for a specific app (case-insensitive)
+   * @param {string} appName - Name of the app
+   * @returns {string} Icon name or empty string if not found
+   */
+  const getAppIcon = (appName) => {
+    const app = getAppByName(appName)
+    return app ? app.icon : ''
+  }
+
+  return {
+    state,
+    initialize,
+    allApps,
+    getAppByName,
+    getAppIcon,
+  }
+})

package/src/stores/app.js

@@ -4,7 +4,6 @@ import { reactive } from 'vue'
 export const useSparkAppStore = defineStore('sparkApp', () => {
   const state = reactive({
     app: '',
-    icon: '',
     homeRoute: 'dashboard',
     showBrandSelector: true,
     showAppSelector: true,
@@ -12,7 +11,6 @@ export const useSparkAppStore = defineStore('sparkApp', () => {
 
   const initialize = (config = {}) => {
     state.app = config.app || ''
-    state.icon = config.icon || ''
     state.homeRoute = config.homeRoute ?? 'dashboard'
     state.showBrandSelector = config.showBrandSelector ?? true
     state.showAppSelector = config.showAppSelector ?? true

package/src/stores/index.js

@@ -1,4 +1,5 @@
 export * from './app.js'
+export * from './app-selector.js'
 export * from './auth.js'
 export * from './brand-filter.js'
 export * from './navigation.js'

package/src/views/SparkError403View.vue

@@ -0,0 +1,70 @@
+<template>
+  <div class="h-full grid place-content-center relative">
+    <div class="absolute top-8 left-8">
+      <img v-if="props.logo" :src="props.logo" alt="Logo" class="h-[23px] w-auto" />
+      <svg
+        v-else
+        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-lg grid gap-y-6 text-center -mt-8">
+      <div>
+        <div class="text-primary-600 text-7xl font-bold mb-4">403</div>
+        <h1 class="text-3xl text-gray-900 font-semibold tracking-tight mb-3">
+          Access Forbidden
+        </h1>
+        <p class="text-gray-600">
+          You don't have permission to access this resource.<br>
+          If you believe this is an error, please contact your administrator.
+        </p>
+      </div>
+
+      <div class="flex gap-4 justify-center">
+        <spark-button @click="goHome" size="lg">
+          Go to Home
+        </spark-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { useRouter } from 'vue-router'
+import { SparkButton } from '@/index.js'
+
+const router = useRouter()
+
+const props = defineProps({
+  logo: {
+    type: String,
+    default: '',
+  },
+  homeRoute: {
+    type: String,
+    default: '/dashboard',
+  },
+})
+
+const goHome = () => {
+  router.push(props.homeRoute)
+}
+</script>

package/src/views/SparkError404View.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="h-full grid place-content-center relative">
+    <div class="absolute top-8 left-8">
+      <img v-if="props.logo" :src="props.logo" alt="Logo" class="h-[23px] w-auto" />
+      <svg
+        v-else
+        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-lg grid gap-y-6 text-center -mt-8">
+      <div>
+        <div class="text-primary-600 text-7xl font-bold mb-4">404</div>
+        <h1 class="text-3xl text-gray-900 font-semibold tracking-tight mb-3">
+          Page Not Found
+        </h1>
+        <p class="text-gray-600">
+          The page you're looking for doesn't exist or has been moved.
+        </p>
+      </div>
+
+      <div class="flex gap-4 justify-center">
+        <spark-button @click="goHome" size="lg">
+          Go to Home
+        </spark-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { useRouter } from 'vue-router'
+import { SparkButton } from '@/index.js'
+
+const router = useRouter()
+
+const props = defineProps({
+  logo: {
+    type: String,
+    default: '',
+  },
+  homeRoute: {
+    type: String,
+    default: '/dashboard',
+  },
+})
+
+const goHome = () => {
+  router.push(props.homeRoute)
+}
+</script>