From 0708337fc7f673a1efb437a1a8331dad7435df4b Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 15 Jan 2025 16:34:02 +0100
Subject: [PATCH 001/244] WIP - Instantsearch migration

---
 composer.json                                 |  10 +-
 lang/nl.json                                  |   4 +-
 package.json                                  |   4 +-
 resources/css/app.css                         |   1 -
 resources/css/components/pagination.css       |  37 --
 resources/js/components/Listing/Listing.vue   |  54 +-
 resources/views/components/listing.blade.php  |  25 +-
 resources/views/listing/filters.blade.php     |   9 +-
 .../listing/partials/filter/boolean.blade.php |  66 +-
 .../listing/partials/filter/select.blade.php  |  74 +--
 .../views/listing/partials/item.blade.php     |   4 +-
 .../listing/partials/pagination.blade.php     |  47 ++
 .../views/listing/partials/stats.blade.php    |  30 +-
 resources/views/listing/products.blade.php    |  28 +-
 src/Models/Product.php                        |  58 ++
 .../Product/CastMultiselectAttributes.php     |  13 +
 yarn.lock                                     | 621 ++++--------------
 17 files changed, 411 insertions(+), 674 deletions(-)
 delete mode 100644 resources/css/components/pagination.css
 create mode 100644 resources/views/listing/partials/pagination.blade.php

diff --git a/composer.json b/composer.json
index ad465e611..a403fea58 100644
--- a/composer.json
+++ b/composer.json
@@ -17,18 +17,21 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.1|^8.2|^8.3",
-        "rapidez/laravel-multi-cache": "^1.0",
         "blade-ui-kit/blade-heroicons": "^2.4",
+        "http-interop/http-factory-guzzle": "^1.2",
         "illuminate/database": "^11.0",
         "illuminate/events": "^11.0",
         "illuminate/queue": "^11.0",
         "illuminate/support": "^11.0",
         "justbetter/laravel-http3earlyhints": "*",
+        "laravel/scout": "^10.11",
         "lcobucci/clock": "^2.0|^3.2",
         "lcobucci/jwt": "^4.0|^5.3",
         "mailerlite/laravel-elasticsearch": "^11.1",
+        "meilisearch/meilisearch-php": "^1.12",
         "rapidez/blade-components": "^1.0",
         "rapidez/blade-directives": "^1.0",
+        "rapidez/laravel-multi-cache": "^1.0",
         "tormjens/eventy": "^0.8"
     },
     "require-dev": {
@@ -53,7 +56,10 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "extra": {
         "laravel": {
diff --git a/lang/nl.json b/lang/nl.json
index 400b346c2..922e5b792 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -111,5 +111,7 @@
     "Yes": "Ja",
     "You don't have anything in your cart.": "Je hebt geen producten in je winkelwagen.",
     "You have filtered for:": "Je hebt gefilterd op:",
-    "Your order is currently:": "Je bestelling is op dit moment:"
+    "Your order is currently:": "Je bestelling is op dit moment:",
+    "First": "Eerste",
+    "Last": "Laatste"
 }
diff --git a/package.json b/package.json
index cc2656c64..0b83d84b9 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
         "prod": "vite build"
     },
     "devDependencies": {
-        "@appbaseio/reactivesearch-vue": "https://gitpkg.vercel.app/api/pkg?url=rapidez/reactivesearch/packages/vue&commit=fixes&scripts.postinstall=yarn%20install%20--ignore-scripts%20%26%26%20yarn%20run%20build-es&scripts.build-es=nps%20build.es",
         "@babel/core": "^7.23.9",
         "@hotwired/turbo": "^8.0.2",
+        "@meilisearch/instant-meilisearch": "^0.23.0",
         "@tailwindcss/forms": "^0.5.3",
         "@tailwindcss/typography": "^0.5.9",
         "@vitejs/plugin-vue2": "^2.2.0",
@@ -20,6 +20,7 @@
         "graphql": "^16.8.1",
         "graphql-combine-query": "indykoning/graphql-combine-query#feature/add-allowed-duplicates",
         "graphql-tag": "^2.12.6",
+        "instantsearch.js": "^4.75.7",
         "laravel-vite-plugin": "^1.0.5",
         "postcss": "^8.4.29",
         "postcss-import": "^16.1.0",
@@ -33,6 +34,7 @@
         "vue": "^2.7",
         "vue-clickaway": "^2.2.2",
         "vue-cookies": "^1.8.2",
+        "vue-instantsearch": "^4.19.13",
         "vue-template-compiler": "^2.7.14",
         "vue-turbolinks": "^2.2.2"
     },
diff --git a/resources/css/app.css b/resources/css/app.css
index 0c0cd17d2..e35303a07 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -1,6 +1,5 @@
 @import 'components/vue-slider';
 @import 'components/price-slider';
-@import 'components/pagination';
 @import 'components/autocomplete';
 
 @tailwind base;
diff --git a/resources/css/components/pagination.css b/resources/css/components/pagination.css
deleted file mode 100644
index 1027377b5..000000000
--- a/resources/css/components/pagination.css
+++ /dev/null
@@ -1,37 +0,0 @@
-.pagination .pagination-button:first-child:nth-last-child(3),
-.pagination .pagination-button:first-child:nth-last-child(3) ~ .pagination-button {
-    @apply hidden;
-}
-
-.pagination {
-    @apply flex flex-wrap justify-center gap-x-2 !m-0 !my-6 max-md:gap-y-4;
-}
-
-.pagination-button {
-    @apply !font-semibold !font-sans !border !border-border !rounded !bg-white !text !shadow;
-}
-
-.pagination-button.active {
-    @apply !border !border-none !bg-primary !text-white !shadow-none;
-}
-
-.pagination-button:first-child {
-    @apply !mr-auto max-md:w-full max-md:order-last;
-}
-
-.pagination-button:last-child {
-    @apply !ml-auto max-md:w-full max-md:-order-1;
-}
-
-.pagination-button:not(:first-child):not(:last-child) {
-    @apply !m-0 !size-14 max-md:flex-1 max-md:w-auto;
-}
-
-.pagination-button:first-child,
-.pagination-button:last-child {
-    @apply h-14 px-6 max-md:!m-0;
-}
-
-.pagination-button[disabled] {
-    @apply opacity-60;
-}
diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 0c0d69c0a..9b5588d59 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,25 +1,16 @@
 <script>
-import {
-    ReactiveBase,
-    ReactiveList,
-    ReactiveComponent,
-    SelectedFilters,
-    MultiList,
-    DynamicRangeSlider,
-} from '@appbaseio/reactivesearch-vue'
-import VueSlider from 'vue-slider-component'
+import InstantSearch from 'vue-instantsearch'
+// TODO: Maybe make this swappable, so users can switch?
+import { instantMeiliSearch } from '@meilisearch/instant-meilisearch'
+import { history as historyRouter } from 'instantsearch.js/es/lib/routers';
+import { singleIndex as singleIndexMapping } from 'instantsearch.js/es/lib/stateMappings'
+// We should only import the components used!
+// https://www.algolia.com/doc/guides/building-search-ui/installation/vue/?client=Vue+2#optimize-your-build-with-tree-shaking
+Vue.use(InstantSearch)
+
 import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
 
-Vue.use(ReactiveBase)
-Vue.use(ReactiveList)
-Vue.use(ReactiveComponent)
-Vue.use(SelectedFilters)
-Vue.use(MultiList)
-Vue.component('vue-slider-component', VueSlider)
-Vue.use(DynamicRangeSlider)
-Vue.component('category-filter', categoryFilter)
-
 export default {
     props: {
         additionalFilters: {
@@ -38,6 +29,24 @@ export default {
         pageSize:
             (Turbo?.navigator?.location?.searchParams || new URLSearchParams(window.location.search)).get('pageSize') ||
             config.grid_per_page,
+
+        // TODO: Not sure if this is the right place,
+        // the autocomplete also needs this but
+        // we don't want to load everything
+        // directly due the JS size
+        searchClient: instantMeiliSearch(
+            // TODO: This should be configurable
+            'http://localhost:7700',
+            '',
+        ).searchClient,
+
+        // TODO: We need some finetuning here; the url isn't very clean.
+        // Also after a refresh the filters aren't selected.
+        // Maybe it conflicts with ReactiveSearch?
+        routing: {
+            router: historyRouter(),
+            stateMapping: singleIndexMapping('products_1'),
+        }
     }),
 
     render() {
@@ -60,6 +69,15 @@ export default {
         reactiveFilters: function () {
             return this.filters.map((filter) => filter.code).concat(this.additionalFilters)
         },
+        hitsPerPage: function () {
+            return this.$root.config.grid_per_page_values.map(function (pages, index) {
+                return {
+                    label: pages,
+                    value: pages,
+                    default: index === 0
+                }
+            }).concat({ label: this.$root.config.translations.all, value: 10000 })
+        },
         sortOptions: function () {
             return [
                 {
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 2feb78f35..1ff5027cf 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -19,20 +19,15 @@
         v-cloak
     >
         <div slot-scope="{ loaded, filters, sortOptions, reactiveFilters, getQuery, _renderProxy: listingSlotProps }">
-            <x-rapidez::reactive-base v-if="loaded">
-                @isset($query)
-                    <reactive-component
-                        component-id="query-filter"
-                        :custom-query="function () {return {query: {{ $query }} } }"
-                        :show-filter="false"
-                    ></reactive-component>
-                @endisset
-                <reactive-component
-                    component-id="score-position"
-                    :custom-query="getQuery"
-                    :show-filter="false"
-                ></reactive-component>
-
+            {{-- TODO: Implement $query and make sure the default product in category position is applied --}}
+            <ais-instant-search
+                v-if="loaded"
+                :search-client="listingSlotProps.searchClient"
+                index-name="products_1"
+                :routing="listingSlotProps.routing"
+            >
+                {{-- TODO: This isn't working?  --}}
+                <ais-configure :hitsPerPage="9" />
                 {{ $before ?? '' }}
                 @if ($slot->isEmpty())
                     <div class="flex flex-col lg:flex-row gap-x-4">
@@ -47,7 +42,7 @@
                     {{ $slot }}
                 @endif
                 {{ $after ?? '' }}
-            </x-rapidez::reactive-base>
+            </ais-instant-search>
         </div>
     </listing>
 </div>
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index 94fba194b..dc804735e 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -3,11 +3,12 @@
     <div class="w-full p-2 max-lg:bg-white max-lg:p-5">
         {{-- On mobile the filters aren't immedately visible so we should defer loading --}}
         <lazy>
-            @include('rapidez::listing.partials.filter.selected')
-            @include('rapidez::listing.partials.filter.category')
+            <ais-clear-refinements />
+            {{-- @include('rapidez::listing.partials.filter.selected') --}}
+            {{-- @include('rapidez::listing.partials.filter.category') --}}
             <template v-for="filter in filters">
-                @include('rapidez::listing.partials.filter.price')
-                @include('rapidez::listing.partials.filter.swatch')
+                {{-- @include('rapidez::listing.partials.filter.price') --}}
+                {{-- @include('rapidez::listing.partials.filter.swatch') --}}
                 @include('rapidez::listing.partials.filter.boolean')
                 @include('rapidez::listing.partials.filter.select')
             </template>
diff --git a/resources/views/listing/partials/filter/boolean.blade.php b/resources/views/listing/partials/filter/boolean.blade.php
index 234563eeb..258d1cb18 100644
--- a/resources/views/listing/partials/filter/boolean.blade.php
+++ b/resources/views/listing/partials/filter/boolean.blade.php
@@ -1,35 +1,37 @@
-<multi-list
-    v-else-if="filter.input == 'boolean'"
-    :component-id="filter.code"
-    :data-field="filter.code+(filter.type != 'int' ? '.keyword' : '')"
-    :react="{and: reactiveFilters}"
-    :show-search="false"
-    u-r-l-params
+<ais-refinement-list
+    v-if="filter.input == 'boolean'"
+    :attribute="filter.code"
 >
-    <div
-        slot="render"
-        class="relative pb-4"
-        slot-scope="{ data, handleChange, value }"
-        v-if="data.length > 0"
-    >
-        <x-rapidez::filter.heading>
-            <ul class="flex flex-col gap-1">
-                <li class="flex" v-for="item in data">
-                    <x-rapidez::input.checkbox
-                        v-bind:checked="value[item.key]"
-                        v-on:change="handleChange(item.key)"
+    <template v-slot="{ items, refine }">
+        <div v-if="items.length" class="relative pb-4">
+            <x-rapidez::filter.heading>
+                {{-- @{{items}} --}}
+                <ul class="flex flex-col gap-1">
+                    <li
+                        v-for="item in items"
+                        class="flex justify-between text-base text-muted"
                     >
-                        <div
-                            class="font-sans font-medium text-sm items-center flex"
-                            :class="value[item.key] ? 'text' : 'text-muted'"
-                        >
-                            <template v-if="item.key">@lang('Yes')</template>
-                            <template v-if="!item.key">@lang('No')</template>
-                            <span class="block ml-0.5 text-xs">(@{{ item.doc_count }})</span>
+                        <div class="flex">
+                            {{-- TODO: checked state is acting weird --}}
+                            {{-- @{{ item.isRefined }} --}}
+                            <x-rapidez::input.checkbox
+                                v-bind:checked="item.isRefined"
+                                v-on:change="refine(item.value)"
+                            >
+                                <span
+                                    class="font-sans font-medium items-center text-sm flex"
+                                    :class="item.isRefined ? 'text' : 'text-muted'"
+                                >
+                                    <template v-if="item.value == 'true'">@lang('Yes')</template>
+                                    <template v-if="item.value == 'false'">@lang('No')</template>
+                                    <span class="block ml-0.5 text-xs">(@{{ item.count }})</span>
+                                </span>
+                            </x-rapidez::input.checkbox>
                         </div>
-                    </x-rapidez::input.checkbox>
-                </li>
-            </ul>
-        </x-rapidez::filter.heading>
-    </div>
-</multi-list>
+                    </li>
+                </ul>
+            </x-rapidez::filter.heading>
+        </div>
+    </template>
+</ais-refinement-list>
+
diff --git a/resources/views/listing/partials/filter/select.blade.php b/resources/views/listing/partials/filter/select.blade.php
index 05b107b69..9de23a54d 100644
--- a/resources/views/listing/partials/filter/select.blade.php
+++ b/resources/views/listing/partials/filter/select.blade.php
@@ -1,54 +1,50 @@
-<multi-list
-    v-else
-    :component-id="filter.code"
-    :data-field="filter.code+'.keyword'"
-    :inner-class="{
-        count: 'text-muted',
-        list: '!max-h-full [&>li]:!h-auto',
-        label: 'text-muted before:shrink-0'
-    }"
-    :react="{and: filter.input == 'multiselect' ? reactiveFilters : reactiveFilters.filter(item => item != filter.code) }"
-    :query-format="filter.input == 'multiselect' ? 'and' : 'or'"
-    :show-search="false"
-    u-r-l-params
+<ais-refinement-list
+    v-if="['select', 'multiselect'].includes(filter.input)"
+    :operator="filter.input == 'multiselect' ? 'and' : 'or'"
+    :attribute="filter.code"
+    show-more
 >
-    <div slot="render" class="relative pb-4" slot-scope="{ data, handleChange, value }" v-if="data.length > 1">
-        <x-rapidez::filter.heading>
-            <toggler>
-                <ul class="flex flex-col gap-1" slot-scope="{ toggle, isOpen }">
+    <template v-slot="{ items, refine, isShowingMore, toggleShowMore, canToggleShowMore }">
+        <div v-if="items.length" class="relative pb-4">
+            <x-rapidez::filter.heading>
+                <ul class="flex flex-col gap-1">
                     <li
-                        v-for="item, index in data"
-                        v-if="index < 6 || isOpen"
-                        :key="item._id"
+                        v-for="item in items"
                         class="flex justify-between text-base text-muted"
                     >
                         <div class="flex">
                             <x-rapidez::input.checkbox
-                                v-bind:checked="value[item.key]"
-                                v-on:change="handleChange(item.key)"
+                                v-bind:checked="item.isRefined"
+                                v-on:change="refine(item.value)"
                             >
                                 <span
                                     class="font-sans font-medium items-center text-sm flex"
-                                    :class="value[item.key] ? 'text' : 'text-muted'"
+                                    :class="item.isRefined ? 'text' : 'text-muted'"
                                 >
-                                    @{{ item.key }}
-                                    <span class="block ml-0.5 text-xs">(@{{ item.doc_count }})</span>
+                                    @{{ item.label }}
+                                    <span class="block ml-0.5 text-xs">(@{{ item.count }})</span>
                                 </span>
                             </x-rapidez::input.checkbox>
                         </div>
                     </li>
-                    <li v-if="data.length > 6">
-                        <button class="text-sm text-primary" @click="toggle">
-                            <span v-if="isOpen" class="flex gap-x-4">
-                                @lang('Less options')
-                            </span>
-                            <span v-else class="flex gap-x-4">
-                                @lang('More options')
-                            </span>
-                        </button>
-                    </li>
                 </ul>
-            </toggler>
-        </x-rapidez::filter.heading>
-    </div>
-</multi-list>
+
+                <button
+                    v-if="canToggleShowMore"
+                    v-on:click="toggleShowMore"
+                    class="text-sm text-primary"
+                >
+                    <span v-if="isShowingMore" class="flex gap-x-4">
+                        @lang('Less options')
+                    </span>
+                    <span v-else class="flex gap-x-4">
+                        @lang('More options')
+                    </span>
+                </button>
+            </x-rapidez::filter.heading>
+        </div>
+
+        {{-- TODO: Without this "Show more" appears as the default slot renders --}}
+        <div v-else></div>
+    </template>
+</ais-refinement-list>
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index 57ac0fa23..3ca026f71 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -1,4 +1,4 @@
-<template {!! isset($slider) ? '' : 'slot="renderItem" slot-scope="{ item, count }"' !!}>
+{{-- <template {!! isset($slider) ? '' : 'slot="renderItem" slot-scope="{ item, count }"' !!}> --}}
     <div class="my-0.5 w-full h-full shrink-0 snap-start px-0.5 sm:my-2 sm:px-2 sm:w-1/2 lg:w-1/3">
         <div class="group relative flex flex-1 flex-col rounded border bg-white p-5" :key="item.entity_id">
             @if (App::providerIsLoaded('Rapidez\Wishlist\WishlistServiceProvider'))
@@ -28,4 +28,4 @@ class="mb-3 h-48 w-full rounded-t object-contain" :alt="item.name" :loading="con
             @includeWhen(Rapidez::config('catalog/frontend/show_swatches_in_product_list', 1), 'rapidez::listing.partials.item.addtocart')
         </div>
     </div>
-</template>
+{{-- </template> --}}
diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
new file mode 100644
index 000000000..6644c0284
--- /dev/null
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -0,0 +1,47 @@
+<ais-pagination class="flex">
+    <template v-slot="{ currentRefinement, nbPages, pages, isFirstPage, isLastPage, refine, createURL }">
+        <ul class="flex gap-2 mx-auto">
+            <li v-if="!isFirstPage">
+                <x-rapidez::button
+                    ::href="createURL(0)"
+                    v-on:click.prevent="refine(0)"
+                >
+                    @lang('First')
+                </x-rapidez::button>
+            </li>
+            <li v-if="!isFirstPage">
+                <x-rapidez::button
+                    ::href="createURL(currentRefinement - 1)"
+                    v-on:click.prevent="refine(currentRefinement - 1)"
+                >
+                    @lang('Prev')
+                </x-rapidez::button>
+            </li>
+            <li v-for="page in pages" :key="page">
+                <x-rapidez::button
+                    ::href="createURL(page)"
+                    ::class="{ '!font-bold': page === currentRefinement }"
+                    v-on:click.prevent="refine(page)"
+                >
+                    @{{ page + 1 }}
+                </x-rapidez::button>
+            </li>
+            <li v-if="!isLastPage">
+                <x-rapidez::button
+                    ::href="createURL(currentRefinement + 1)"
+                    v-on:click.prevent="refine(currentRefinement + 1)"
+                >
+                    @lang('Next')
+                </x-rapidez::button>
+            </li>
+            <li v-if="!isLastPage">
+                <x-rapidez::button
+                    ::href="createURL(nbPages)"
+                    v-on:click.prevent="refine(nbPages)"
+                >
+                    @lang('Last')
+                </x-rapidez::button>
+            </li>
+        </ul>
+    </template>
+</ais-pagination>
diff --git a/resources/views/listing/partials/stats.blade.php b/resources/views/listing/partials/stats.blade.php
index c1414e87c..104b6f635 100644
--- a/resources/views/listing/partials/stats.blade.php
+++ b/resources/views/listing/partials/stats.blade.php
@@ -1,4 +1,4 @@
-<div class="flex-wrap flex-1 gap-1 text-sm flex justify-between sm:text-base" slot="renderResultStats" slot-scope="{ numberOfResults, numberOfPages, currentPage, time }">
+<div class="flex-wrap flex-1 gap-1 text-sm flex justify-between sm:text-base">
     @{{ numberOfResults }} @lang('products')
     <template v-if="numberOfPages > 1">
         (@lang('page'): @{{ currentPage + 1 }}/@{{ numberOfPages }})
@@ -7,15 +7,25 @@
     <div class="justify-self-end mr-5">
         <div class="flex items-center gap-1 flex-wrap">
             <label class="flex items-center gap-x-1.5">
-                <x-rapidez::label class="text-sm text-muted whitespace-nowrap mb-0">@lang('Items per page'):</x-rapidez::label>
-                <x-rapidez::input.select v-model="listingSlotProps.pageSize" class="w-20">
-                    <option
-                        v-for="size in $root.config.grid_per_page_values.concat($root.config.translations.all)"
-                        v-bind:value="size"
-                    >
-                        @{{ size }}
-                    </option>
-                </x-rapidez::input.select>
+                <x-rapidez::label class="text-sm text-muted whitespace-nowrap mb-0">
+                    @lang('Items per page'):
+                </x-rapidez::label>
+
+                <ais-hits-per-page :items="listingSlotProps.hitsPerPage">
+                    <template v-slot="{ items, refine }">
+                        <x-rapidez::input.select class="w-20">
+                            <option
+                                v-for="item in items"
+                                v-bind:key="item.value"
+                                v-bind:value="item.value"
+                                v-bind:selected="item.isRefined"
+                                v-on:change="refine(item.value)"
+                            >
+                                @{{ item.label }}
+                            </option>
+                        </x-rapidez::input.select>
+                    </template>
+                </ais-hits-per-page>
             </label>
         </div>
     </div>
diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index bbbeed204..a396941ba 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -1,26 +1,34 @@
+@include('rapidez::listing.partials.stats')
+
+<ais-hits>
+    <template v-slot="{ items }">
+        <div class="flex flex-wrap mt-5 -mx-4 sm:-mx-1 overflow-hidden">
+            <template v-for="(item, count) in items">
+                @include('rapidez::listing.partials.item')
+            </template>
+        </div>
+    </template>
+</ais-hits>
+
+@include('rapidez::listing.partials.pagination')
+
+
+
+{{--
 @php $dropdownClasses = '!h-auto !py-3 !px-5 !border-solid !border !border-default !rounded-md !py-2 !ring-0 focus:!border-muted !text-sm !text !outline-none max-md:w-full' @endphp
 <reactive-list
     id="products"
     class="*:flex-wrap *:max-sm:gap-y-3 *:max-md:justify-end"
-    component-id="products"
-    data-field="name.keyword"
     list-class="flex flex-wrap mt-5 -mx-4 sm:-mx-1 overflow-hidden"
-    :pagination="true"
     v-on:page-click="scrollToElement('#products')"
     :size="isNaN(parseInt(listingSlotProps.pageSize)) ? 10000 : parseInt(listingSlotProps.pageSize)"
-    :react="{and: reactiveFilters}"
     :sort-options="sortOptions"
     :inner-class="{
-        button: 'pagination-button',
-        current: 'current-button',
         sortOptions: '{{ $dropdownClasses }}',
-        pagination: 'pagination'
     }"
-    prev-label="@lang('Prev')"
-    next-label="@lang('Next')"
-    u-r-l-params
 >
     @include('rapidez::listing.partials.stats', compact('dropdownClasses'))
     @include('rapidez::listing.partials.item')
     @include('rapidez::listing.partials.no-results')
 </reactive-list>
+ --}}
diff --git a/src/Models/Product.php b/src/Models/Product.php
index e65c11aa7..6381289bd 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -4,14 +4,18 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
+use Illuminate\Support\Arr;
+use Laravel\Scout\Searchable;
 use Rapidez\Core\Casts\Children;
 use Rapidez\Core\Casts\CommaSeparatedToArray;
 use Rapidez\Core\Casts\CommaSeparatedToIntegerArray;
 use Rapidez\Core\Casts\DecodeHtmlEntities;
+use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Scopes\Product\WithProductAttributesScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductCategoryInfoScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductChildrenScope;
@@ -31,6 +35,7 @@ class Product extends Model
     use CastSuperAttributes;
     use HasAlternatesThroughRewrites;
     use SelectAttributeScopes;
+    use Searchable;
 
     public array $attributesToSelect = [];
 
@@ -85,6 +90,59 @@ public function getCasts(): array
         return $this->casts;
     }
 
+    // TODO: Maybe move all these search related
+    // methods to a separated trait?
+    public function toSearchableArray(): array
+    {
+        $product = $this->toArray();
+
+        // dd($product);
+
+        // TODO: Maybe double check / handle what attributes are
+        // getting indexed here. From makeAllSearchableUsing
+        // we're getting the correct data, but when you
+        // index just one; I don't think that query
+        // will be used resulting in all attrs.
+
+        // Customize the data array...
+        // cast to the correct types! (int), etc
+
+        return $product;
+    }
+
+    public function shouldBeSearchable(): bool
+    {
+        if (! in_array($this->visibility, config('rapidez.indexer.visibility'))) {
+            return false;
+        }
+
+        $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
+        if (! $showOutOfStock && ! $this->in_stock) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function searchableAs(): string
+    {
+        return 'products_'.config('rapidez.store');
+    }
+
+    protected function makeAllSearchableUsing(Builder $query): Builder
+    {
+        return $query
+            ->selectOnlyIndexable()
+            ->with(['categoryProducts', 'reviewSummary'])
+            ->withEventyGlobalScopes('index.product.scopes')
+            ->withExists('options AS has_options');
+    }
+
+    public function makeSearchableUsing(Collection $models): Collection
+    {
+        return $models;
+    }
+
     public function gallery(): BelongsToMany
     {
         return $this->belongsToMany(
diff --git a/src/Models/Traits/Product/CastMultiselectAttributes.php b/src/Models/Traits/Product/CastMultiselectAttributes.php
index cee2604d1..3f7aed633 100644
--- a/src/Models/Traits/Product/CastMultiselectAttributes.php
+++ b/src/Models/Traits/Product/CastMultiselectAttributes.php
@@ -18,6 +18,19 @@ protected function getMultiselectAttributeCasts(): array
             $casts[$multiselectAttribute] = Multiselect::class;
         }
 
+        // TODO: If this needs to stay we've to rename the trait and method.
+        // Double check if this doesn't effect anything on the frontend!
+        // But see the TODO in the boolean.blade.php about the state
+        // which is acting weird. When that's working we maybe
+        // don't even need this, just check for 1 and 0.
+        $booleanAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
+            return $attribute['input'] == 'boolean';
+        }), 'code');
+
+        foreach ($booleanAttributes as $booleanAttribute) {
+            $casts[$booleanAttribute] = 'boolean';
+        }
+
         return $casts ?? [];
     }
 }
diff --git a/yarn.lock b/yarn.lock
index 809c76eef..b1efb1698 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@algolia/events@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950"
+  integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ==
+
 "@alloc/quick-lru@^5.2.0":
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
@@ -15,54 +20,6 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@appbaseio/reactivecore@9.14.25":
-  version "9.14.25"
-  resolved "https://registry.yarnpkg.com/@appbaseio/reactivecore/-/reactivecore-9.14.25.tgz#90f081f8b873011481e576dda79e3956a83ef262"
-  integrity sha512-eQlrdcXE9Y8r7emCIGPR7BhPy430VxelyrNKE0WkOM1paq1HuSCH+mw9IyZAqY3vk1+oV2ftXQQyz5YZRY7xYw==
-  dependencies:
-    cross-fetch "^3.0.4"
-    prop-types "^15.6.0"
-    redux "^4.0.0"
-    redux-thunk "^2.3.0"
-    xdate "^0.8.2"
-
-"@appbaseio/reactivesearch-vue@https://gitpkg.vercel.app/api/pkg?url=rapidez/reactivesearch/packages/vue&commit=fixes&scripts.postinstall=yarn%20install%20--ignore-scripts%20%26%26%20yarn%20run%20build-es&scripts.build-es=nps%20build.es":
-  version "2.0.0-alpha.4"
-  resolved "https://gitpkg.vercel.app/api/pkg?url=rapidez/reactivesearch/packages/vue&commit=fixes&scripts.postinstall=yarn%20install%20--ignore-scripts%20%26%26%20yarn%20run%20build-es&scripts.build-es=nps%20build.es#1ac0368c6aa09acacc48f18809498bad42b7607f"
-  dependencies:
-    "@appbaseio/reactivecore" "9.14.25"
-    "@appbaseio/vue-emotion" "0.4.4"
-    "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
-    appbase-js "^5.1.0"
-    compute-scroll-into-view "^1.0.11"
-    emotion "9.2.12"
-    gmap-vue "^3.5.4"
-    hotkeys-js "^3.8.7"
-    ngeohash "^0.6.3"
-    polished "^2.2.0"
-    redux "^4.0.0"
-    url-search-params-polyfill "^7.0.0"
-    vue-highlight-words "^1.2.0"
-    vue-no-ssr "^1.1.0"
-    vue-slider-component "^3.2.15"
-    vue-types "^1.7.0"
-
-"@appbaseio/vue-emotion@0.4.4":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@appbaseio/vue-emotion/-/vue-emotion-0.4.4.tgz#a2187691a5dce090a8571250c1a7911d2ceee58a"
-  integrity sha512-ljbCeLozV+5O9lOaJc67gvhdz3RTLYwZj6aRpYRvXgcIIAtSOTT1TBdvCoORoCEYCfOseicv+TxKbOSGiopjBw==
-  dependencies:
-    emotion-utils "^9.1.0"
-    nano-assign "^1.0.0"
-
-"@babel/code-frame@^7.0.0":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
-  dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
-
 "@babel/code-frame@^7.24.7":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
@@ -118,13 +75,6 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-module-imports@^7.0.0":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
 "@babel/helper-module-imports@^7.24.7":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
@@ -174,7 +124,7 @@
     "@babel/template" "^7.25.0"
     "@babel/types" "^7.25.6"
 
-"@babel/highlight@^7.23.4", "@babel/highlight@^7.24.7":
+"@babel/highlight@^7.24.7":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
   integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
@@ -196,10 +146,10 @@
   dependencies:
     "@babel/types" "^7.25.6"
 
-"@babel/runtime@^7.2.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.9.2":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
-  integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
+"@babel/runtime@^7.1.2":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -225,7 +175,7 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.22.15", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6":
+"@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6":
   version "7.25.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6"
   integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==
@@ -234,53 +184,6 @@
     "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
-"@emotion/babel-utils@^0.6.4":
-  version "0.6.10"
-  resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz#83dbf3dfa933fae9fc566e54fbb45f14674c6ccc"
-  integrity sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow==
-  dependencies:
-    "@emotion/hash" "^0.6.6"
-    "@emotion/memoize" "^0.6.6"
-    "@emotion/serialize" "^0.9.1"
-    convert-source-map "^1.5.1"
-    find-root "^1.1.0"
-    source-map "^0.7.2"
-
-"@emotion/hash@^0.6.2", "@emotion/hash@^0.6.6":
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44"
-  integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ==
-
-"@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.6":
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"
-  integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==
-
-"@emotion/serialize@^0.9.1":
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145"
-  integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==
-  dependencies:
-    "@emotion/hash" "^0.6.6"
-    "@emotion/memoize" "^0.6.6"
-    "@emotion/unitless" "^0.6.7"
-    "@emotion/utils" "^0.8.2"
-
-"@emotion/stylis@^0.7.0":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5"
-  integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ==
-
-"@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.7":
-  version "0.6.7"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397"
-  integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg==
-
-"@emotion/utils@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc"
-  integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw==
-
 "@esbuild/aix-ppc64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
@@ -396,14 +299,6 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
   integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
 
-"@googlemaps/markerclusterer@^2.0.4":
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/@googlemaps/markerclusterer/-/markerclusterer-2.5.3.tgz#9f891ce7e8e161775f3a3e2c9f66956810284591"
-  integrity sha512-x7lX0R5yYOoiNectr10wLgCBasNcXFHiADIBdmn7jQllF2B5ENQw5XtZK+hIw4xnV0Df0xhN4LN98XqA5jaiOw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-    supercluster "^8.0.1"
-
 "@hotwired/turbo@^8.0.2":
   version "8.0.10"
   resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.10.tgz#d95569d259f0daad6e824ee1ada877ff94beb72b"
@@ -453,6 +348,13 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@meilisearch/instant-meilisearch@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@meilisearch/instant-meilisearch/-/instant-meilisearch-0.23.0.tgz#111562206d29b3f2f0f461f30470e35dab6e7ba0"
+  integrity sha512-KXyTZ7HEj4EQzROSno0k7BeijHS0YQu5AIH76OWcuGxFwUIajlk9k6CsH1DsW9+W8SPpmoJY0BglaW0lK6YH1w==
+  dependencies:
+    meilisearch "^0.47.0"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -581,15 +483,30 @@
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.6.0.tgz#eac397f28bf1d6ae0ae081363eca2f425bedf0d5"
   integrity sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==
 
+"@types/dom-speech-recognition@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@types/dom-speech-recognition/-/dom-speech-recognition-0.0.1.tgz#e326761a04b4a49c0eec2ac7948afc1c6aa12baa"
+  integrity sha512-udCxb8DvjcDKfk1WTBzDsxFbLgYxmQGKrE/ricoMqHRNjSlSUCcamVTA5lIQqzY10mY5qCY0QDwBfFEwhfoDPw==
+
 "@types/estree@1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
-"@types/parse-json@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
-  integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
+"@types/google.maps@^3.55.12":
+  version "3.58.1"
+  resolved "https://registry.yarnpkg.com/@types/google.maps/-/google.maps-3.58.1.tgz#71ce3dec44de1452f56641d2c87c7dd8ea964b4d"
+  integrity sha512-X9QTSvGJ0nCfMzYOnaVs/k6/4L+7F5uCS+4iUmkLEls6J9S/Phv+m/i3mDeyc49ZBgwab3EFO1HEoBY7k98EGQ==
+
+"@types/hogan.js@^3.0.0":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/hogan.js/-/hogan.js-3.0.5.tgz#09f5b916ad88e1975b093ab7a25a37ffc0418be5"
+  integrity sha512-/uRaY3HGPWyLqOyhgvW9Aa43BNnLZrNeQxl2p8wqId4UHMfPKolSB+U7BlZyO1ng7MkLnyEAItsBzCG0SDhqrA==
+
+"@types/qs@^6.5.3":
+  version "6.9.17"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.17.tgz#fc560f60946d0aeff2f914eb41679659d3310e1a"
+  integrity sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==
 
 "@types/web-bluetooth@^0.0.20":
   version "0.0.20"
@@ -601,11 +518,6 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-2.3.1.tgz#53078d3d9d50d9863f1fbb1c1ef7791a5fcd4948"
   integrity sha512-/ksaaz2SRLN11JQhLdEUhDzOn909WEk99q9t9w+N12GjQCljzv7GyvAbD/p20aBUjHkvpGOoQ+FCOkG+mjDF4A==
 
-"@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz#8d53a1e21347db8edbe54d339902583176de09f2"
-  integrity sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==
-
 "@vue/compiler-sfc@2.7.16":
   version "2.7.16"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83"
@@ -675,6 +587,13 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+algoliasearch-helper@3.22.6:
+  version "3.22.6"
+  resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.22.6.tgz#6a31c67d277a32f3f7ae1b8a6e57ca73f1e1a0b0"
+  integrity sha512-F2gSb43QHyvZmvH/2hxIjbk/uFdO2MguQYTFP7J+RowMW1csjIODMobEnpLI8nbLQuzZnGZdIxl5Bpy1k9+CFQ==
+  dependencies:
+    "@algolia/events" "^4.0.1"
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -717,15 +636,6 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-appbase-js@^5.1.0:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/appbase-js/-/appbase-js-5.3.4.tgz#c30add29133fcfd7cc938a710a347cb89377670e"
-  integrity sha512-rbjCC7jmcPh1cjnW3W7TjTugQpLOB8SrPIdnkKwrNDdsl8d0nzPTJH4/082UTnkvlMkjm4WYY2HYCRl2vpDlpw==
-  dependencies:
-    cross-fetch "^3.1.5"
-    querystring "^0.2.0"
-    url-parser-lite "^0.1.0"
-
 arg@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
@@ -743,38 +653,6 @@ autoprefixer@^10.4.15:
     picocolors "^1.0.1"
     postcss-value-parser "^4.2.0"
 
-babel-plugin-emotion@^9.2.11:
-  version "9.2.11"
-  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz#319c005a9ee1d15bb447f59fe504c35fd5807728"
-  integrity sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@emotion/babel-utils" "^0.6.4"
-    "@emotion/hash" "^0.6.2"
-    "@emotion/memoize" "^0.6.1"
-    "@emotion/stylis" "^0.7.0"
-    babel-plugin-macros "^2.0.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    convert-source-map "^1.5.0"
-    find-root "^1.1.0"
-    mkdirp "^0.5.1"
-    source-map "^0.5.7"
-    touch "^2.0.1"
-
-babel-plugin-macros@^2.0.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
-  integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
-  dependencies:
-    "@babel/runtime" "^7.7.2"
-    cosmiconfig "^6.0.0"
-    resolve "^1.12.0"
-
-babel-plugin-syntax-jsx@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-  integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -809,11 +687,6 @@ browserslist@^4.23.1, browserslist@^4.23.3:
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.0"
 
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
 camelcase-css@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
@@ -886,16 +759,6 @@ commander@^4.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-compute-scroll-into-view@^1.0.11:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz#1768b5522d1172754f5d0c9b02de3af6be506a43"
-  integrity sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==
-
-convert-source-map@^1.5.0, convert-source-map@^1.5.1:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
-
 convert-source-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
@@ -906,35 +769,6 @@ cookie@^0.7.2:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
   integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
 
-core-js@^3.6.5:
-  version "3.36.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.0.tgz#e752fa0b0b462a0787d56e9d73f80b0f7c0dde68"
-  integrity sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==
-
-cosmiconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
-  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.1.0"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.7.2"
-
-create-emotion@^9.2.12:
-  version "9.2.12"
-  resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz#0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f"
-  integrity sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA==
-  dependencies:
-    "@emotion/hash" "^0.6.2"
-    "@emotion/memoize" "^0.6.1"
-    "@emotion/stylis" "^0.7.0"
-    "@emotion/unitless" "^0.6.2"
-    csstype "^2.5.2"
-    stylis "^3.5.0"
-    stylis-rule-sheet "^0.0.10"
-
 cross-env@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
@@ -942,13 +776,6 @@ cross-env@^7.0.3:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-fetch@^3.0.4, cross-fetch@^3.1.5:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
-  integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
-  dependencies:
-    node-fetch "^2.6.12"
-
 cross-spawn@^7.0.0, cross-spawn@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -963,11 +790,6 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-csstype@^2.5.2:
-  version "2.6.21"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"
-  integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
-
 csstype@^3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
@@ -1020,26 +842,6 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-emotion-utils@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/emotion-utils/-/emotion-utils-9.1.0.tgz#7484dbf18f3b1dc1de68559d1ff35a74caa998dc"
-  integrity sha512-Zdy9TiZzMDRsCufivL/ZhQ0JdfGGSOc20opRjaBOemF5h2kYI/MD/bLcXfAZgzYVL12WNQegZIme6l+N/JFE4Q==
-
-emotion@9.2.12:
-  version "9.2.12"
-  resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9"
-  integrity sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ==
-  dependencies:
-    babel-plugin-emotion "^9.2.11"
-    create-emotion "^9.2.12"
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
 esbuild@^0.21.3:
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
@@ -1079,11 +881,6 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
 fast-glob@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
@@ -1109,11 +906,6 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-root@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
-
 foreground-child@^3.1.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
@@ -1178,13 +970,6 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-gmap-vue@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/gmap-vue/-/gmap-vue-3.5.4.tgz#53da5f3eb3f0e48aec49f463976ff1808593bc8b"
-  integrity sha512-NGqZbwUtCDWDGtbDF+bFs5slaGABbw6TEB+pdOYyWxN+81c5iRBuOV6iaQ61ilzk4ttUFLE7q6w9nDsNUpG7ig==
-  dependencies:
-    "@googlemaps/markerclusterer" "^2.0.4"
-
 graphql-combine-query@indykoning/graphql-combine-query#feature/add-allowed-duplicates:
   version "1.2.4"
   resolved "https://codeload.github.com/indykoning/graphql-combine-query/tar.gz/12c517bbe231077f8e1a677df8786a506ef902be"
@@ -1218,28 +1003,43 @@ he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-highlight-words-core@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/highlight-words-core/-/highlight-words-core-1.2.2.tgz#1eff6d7d9f0a22f155042a00791237791b1eeaaa"
-  integrity sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg==
-
-hotkeys-js@^3.8.7:
-  version "3.13.7"
-  resolved "https://registry.yarnpkg.com/hotkeys-js/-/hotkeys-js-3.13.7.tgz#0188d8e2fca16a3f1d66541b48de0bb9df613726"
-  integrity sha512-ygFIdTqqwG4fFP7kkiYlvayZppeIQX2aPpirsngkv1xM1lP0piDY5QEh68nQnIKvz64hfocxhBaD/uK3sSK1yQ==
-
-import-fresh@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+hogan.js@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/hogan.js/-/hogan.js-3.0.2.tgz#4cd9e1abd4294146e7679e41d7898732b02c7bfd"
+  integrity sha512-RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg==
   dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
+    mkdirp "0.3.0"
+    nopt "1.0.10"
 
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+htm@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/htm/-/htm-3.1.1.tgz#49266582be0dc66ed2235d5ea892307cc0c24b78"
+  integrity sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ==
+
+instantsearch-ui-components@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/instantsearch-ui-components/-/instantsearch-ui-components-0.9.0.tgz#f7ae71fe623d18eff32b73071749f31826cb7b89"
+  integrity sha512-ugQ+XdPx3i3Sxu+woRo6tPE0Fz/kWd4KblTUfZD1TZZBsm/8qFvcbg5dVBDvXX9v7ntoyugXCzC/XCZMzrSkig==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+
+instantsearch.js@4.75.7, instantsearch.js@^4.75.7:
+  version "4.75.7"
+  resolved "https://registry.yarnpkg.com/instantsearch.js/-/instantsearch.js-4.75.7.tgz#581185f335990d45dbd011deaa275e7c004e8d35"
+  integrity sha512-xniCraV4SM017LA5iaw8ntvWurq7WC09Kpn/hfsIhoP52woqdiXTaKvo/8Z6oOb2BGSLBkcOU/RY1ntASsrUxA==
+  dependencies:
+    "@algolia/events" "^4.0.1"
+    "@types/dom-speech-recognition" "^0.0.1"
+    "@types/google.maps" "^3.55.12"
+    "@types/hogan.js" "^3.0.0"
+    "@types/qs" "^6.5.3"
+    algoliasearch-helper "3.22.6"
+    hogan.js "^3.0.2"
+    htm "^3.0.0"
+    instantsearch-ui-components "0.9.0"
+    preact "^10.10.0"
+    qs "^6.5.1 < 6.10"
+    search-insights "^2.17.2"
 
 is-binary-path@~2.1.0:
   version "2.1.0"
@@ -1282,13 +1082,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-plain-object@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
-  integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==
-  dependencies:
-    isobject "^4.0.0"
-
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -1301,11 +1094,6 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isobject@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
-  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
-
 jackspeak@^3.1.2:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
@@ -1330,21 +1118,11 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
 json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-kdbush@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-4.0.2.tgz#2f7b7246328b4657dd122b6c7f025fbc2c868e39"
-  integrity sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==
-
 laravel-vite-plugin@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/laravel-vite-plugin/-/laravel-vite-plugin-1.0.5.tgz#0d1881bf69d9d420a01f33db183adb82d9143362"
@@ -1383,7 +1161,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-loose-envify@^1.2.0, loose-envify@^1.4.0:
+loose-envify@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -1402,6 +1180,11 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+meilisearch@^0.47.0:
+  version "0.47.0"
+  resolved "https://registry.yarnpkg.com/meilisearch/-/meilisearch-0.47.0.tgz#376bda5d65f7dd7b80e1ad317912664c4a02b05f"
+  integrity sha512-Qq+hatuDJ0z5c+szVb0O/uI7Z2jfMUjj8eNB6xPyKp9Og7GVnrOZJRVoDPqGoVY484Iwh+F61y2UreIetda00w==
+
 merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
@@ -1427,22 +1210,20 @@ minimatch@^9.0.4:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.6:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-mkdirp@^0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
+mitt@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-2.1.0.tgz#f740577c23176c6205b121b2973514eade1b2230"
+  integrity sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==
+
+mkdirp@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
+  integrity sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==
 
 ms@^2.1.3:
   version "2.1.3"
@@ -1458,34 +1239,17 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nano-assign@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nano-assign/-/nano-assign-1.0.1.tgz#abb1c50d0416b865fb37bbd155c5368bb54378e5"
-  integrity sha512-1K8ncUoAYFPYcCZqrB+K2XQaFCmA35rryJCtPkGrG3zYkwm+iIUZRIHyaAfuy6zxaK9siPdjeJq7+Inijm6xhw==
-
 nanoid@^3.3.7:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
-ngeohash@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/ngeohash/-/ngeohash-0.6.3.tgz#10b1e80be5488262ec95c56cf2dbb6c45fbdf245"
-  integrity sha512-kltF0cOxgx1AbmVzKxYZaoB0aj7mOxZeHaerEtQV0YaqnkXNq26WWqMmJ6lTqShYxVRWZ/mwvvTrNeOwdslWiw==
-
-node-fetch@^2.6.12:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-releases@^2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
-nopt@~1.0.10:
+nopt@1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
   integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==
@@ -1502,7 +1266,7 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
-object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -1526,23 +1290,6 @@ package-json-from-dist@^1.0.0:
   resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
   integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
 
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-json@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
 path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -1561,11 +1308,6 @@ path-scurry@^1.11.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
 picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
@@ -1586,13 +1328,6 @@ pirates@^4.0.1:
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
   integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
-polished@^2.2.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/polished/-/polished-2.3.3.tgz#bdbaba962ba8271b0e11aa287f2befd4c87be99a"
-  integrity sha512-59V4fDbdxtH4I1m9TWxFsoGJbC8nnOpUYo5uFmvMfKp9Qh+6suo4VMUle1TGIIUZIGxfkW+Rs485zPk0wcwR2Q==
-  dependencies:
-    "@babel/runtime" "^7.2.0"
-
 postcss-import@^15.1.0:
   version "15.1.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70"
@@ -1672,35 +1407,26 @@ postcss@^8.4.23, postcss@^8.4.29, postcss@^8.4.43:
     picocolors "^1.1.0"
     source-map-js "^1.2.1"
 
+preact@^10.10.0:
+  version "10.25.4"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.25.4.tgz#c1d00bee9d7b9dcd06a2311d9951973b506ae8ac"
+  integrity sha512-jLdZDb+Q+odkHJ+MpW/9U5cODzqnB+fy2EiHSZES7ldV5LK7yjlVzTp7R8Xy6W6y75kfK8iWYtFVH7lvjwrCMA==
+
 "prettier@^1.18.2 || ^2.0.0":
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
-prop-types@^15.6.0:
-  version "15.8.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
-querystring@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
-  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
+"qs@^6.5.1 < 6.10":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
+  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-react-is@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -1715,18 +1441,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-redux-thunk@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
-  integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
-
-redux@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
-  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
@@ -1737,12 +1451,7 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve@^1.1.7, resolve@^1.12.0, resolve@^1.22.2:
+resolve@^1.1.7, resolve@^1.22.2:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -1798,6 +1507,11 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+search-insights@^2.17.2:
+  version "2.17.3"
+  resolved "https://registry.yarnpkg.com/search-insights/-/search-insights-2.17.3.tgz#8faea5d20507bf348caba0724e5386862847b661"
+  integrity sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==
+
 semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
@@ -1825,17 +1539,12 @@ source-map-js@^1.0.2, source-map-js@^1.2.1:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
   integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
-source-map@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
 source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.2, source-map@^0.7.4:
+source-map@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
@@ -1873,16 +1582,6 @@ strip-ansi@^7.0.1:
   dependencies:
     ansi-regex "^6.0.1"
 
-stylis-rule-sheet@^0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
-  integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==
-
-stylis@^3.5.0:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
-  integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
-
 sucrase@^3.32.0:
   version "3.35.0"
   resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
@@ -1896,13 +1595,6 @@ sucrase@^3.32.0:
     pirates "^4.0.1"
     ts-interface-checker "^0.1.9"
 
-supercluster@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-8.0.1.tgz#9946ba123538e9e9ab15de472531f604e7372df5"
-  integrity sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==
-  dependencies:
-    kdbush "^4.0.2"
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -1974,18 +1666,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-touch@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz#ca0b2a3ae3211246a61b16ba9e6cbf1596287164"
-  integrity sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A==
-  dependencies:
-    nopt "~1.0.10"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
 ts-interface-checker@^0.1.9:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
@@ -2012,16 +1692,6 @@ update-browserslist-db@^1.1.0:
     escalade "^3.2.0"
     picocolors "^1.1.0"
 
-url-parser-lite@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/url-parser-lite/-/url-parser-lite-0.1.0.tgz#4679720fd7448d42357d1c8c0a6ece95174e864e"
-  integrity sha512-k8eUA7I5qfH6c1ZI9CvdHEk+YH1KroX2ry+FF9k6yJBl7AmDWen2WI+xNzbCBAek6JEvgPBoHub4v8aZIM7Jqw==
-
-url-search-params-polyfill@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-7.0.1.tgz#b900cd9a0d9d2ff757d500135256f2344879cbff"
-  integrity sha512-bAw7L2E+jn9XHG5P9zrPnHdO0yJub4U+yXJOdpcpkr7OBd9T8oll4lUos0iSGRcDvfZoLUKfx9a6aNmIhJ4+mQ==
-
 util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -2046,11 +1716,6 @@ vite@^5.0:
   optionalDependencies:
     fsevents "~2.3.3"
 
-vue-class-component@^7.1.0:
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-7.2.6.tgz#8471e037b8e4762f5a464686e19e5afc708502e4"
-  integrity sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==
-
 vue-clickaway@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/vue-clickaway/-/vue-clickaway-2.2.2.tgz#cecf6839575e8b2afc5d3edb3efb616d293dbb44"
@@ -2068,32 +1733,14 @@ vue-demi@>=0.14.10, vue-demi@>=0.14.8:
   resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04"
   integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==
 
-vue-highlight-words@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vue-highlight-words/-/vue-highlight-words-1.2.0.tgz#73c2d49a46ecdb0638358b7ad749013c190ece5c"
-  integrity sha512-TkROGAnjxi/Xm4hBd1budn/kQmg8sfTF2TKwkj2O3PuLOgf6D1QOLpnnaTUEV/wP6Z3kVb3IcIHDZDAWvXQmMQ==
-  dependencies:
-    highlight-words-core "^1.2.2"
-
-vue-no-ssr@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz#875f3be6fb0ae41568a837f3ac1a80eaa137b998"
-  integrity sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g==
-
-vue-property-decorator@^8.0.0:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/vue-property-decorator/-/vue-property-decorator-8.5.1.tgz#571a91cf8d2b507f537d79bf8275af3184572fff"
-  integrity sha512-O6OUN2OMsYTGPvgFtXeBU3jPnX5ffQ9V4I1WfxFQ6dqz6cOUbR3Usou7kgFpfiXDvV7dJQSFcJ5yUPgOtPPm1Q==
-  dependencies:
-    vue-class-component "^7.1.0"
-
-vue-slider-component@^3.2.15:
-  version "3.2.24"
-  resolved "https://registry.yarnpkg.com/vue-slider-component/-/vue-slider-component-3.2.24.tgz#9c931da3d10d0efde361138626a76d21c4359fd5"
-  integrity sha512-28hfotAL/CPXPwqHgVFyUwUEV0zweoc2wW0bgraGkoIcRZGlFjk8caYJLE8+Luug5t3b9tJm/NyDXpyIdmcYZg==
+vue-instantsearch@^4.19.13:
+  version "4.19.13"
+  resolved "https://registry.yarnpkg.com/vue-instantsearch/-/vue-instantsearch-4.19.13.tgz#b8e33187438e3bf716ebdd84e0b9816984affc16"
+  integrity sha512-sXAkTwvykT70w5PcuGBJU0ClthZlUekuDL1qi1taRyCx158z1s4WCZizhVfBfHufwtPpNiJZYnST8JQ/xqpPNw==
   dependencies:
-    core-js "^3.6.5"
-    vue-property-decorator "^8.0.0"
+    instantsearch-ui-components "0.9.0"
+    instantsearch.js "4.75.7"
+    mitt "^2.1.0"
 
 vue-template-compiler@^2.7.14:
   version "2.7.16"
@@ -2108,13 +1755,6 @@ vue-turbolinks@^2.2.2:
   resolved "https://registry.yarnpkg.com/vue-turbolinks/-/vue-turbolinks-2.2.2.tgz#6b7b5c4120f5586907ef977be4b63a734bf8cd36"
   integrity sha512-pPO2Fr+1UgdhUK9dc5OhjLSeYi5LZAm/VZBXOVQgLHCO31bRjAof/+W/e/6SHCbnb1xdZb1gW5T9MX0k9ejSAQ==
 
-vue-types@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/vue-types/-/vue-types-1.7.0.tgz#07b273342aba7cc43d9460d9c4f4a4cf5eeb00b1"
-  integrity sha512-MbhuWukmcBJHdfXAdLerbP29i3j2HAJoKwEv7No2Jh/YNl9dOKsNBfvMOkf0SS8VCuWd1/JBX4NnGaGUojbkUA==
-  dependencies:
-    is-plain-object "3.0.0"
-
 vue@^2.7:
   version "2.7.16"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9"
@@ -2123,19 +1763,6 @@ vue@^2.7:
     "@vue/compiler-sfc" "2.7.16"
     csstype "^3.1.0"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -2162,11 +1789,6 @@ wrap-ansi@^8.1.0:
     string-width "^5.0.1"
     strip-ansi "^7.0.1"
 
-xdate@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/xdate/-/xdate-0.8.2.tgz#d7b033c00485d02695baf0044f4eacda3fc961a3"
-  integrity sha512-sNBlLfOC8S3V0vLDEUianQOXcTsc9j4lfeKU/klHe0RjHAYn0CXsSttumTot8dzalboV8gZbH38B+WcCIBjhFQ==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -2177,11 +1799,6 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^1.7.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
 yaml@^2.3.4:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.1.tgz#c9772aacf62cb7494a95b0c4f1fb065b563db130"

From b65b344e58398da91f3229b9422ff196f7ccc1df Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Wed, 15 Jan 2025 15:34:27 +0000
Subject: [PATCH 002/244] Apply fixes from Duster

---
 src/Models/Product.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Models/Product.php b/src/Models/Product.php
index 6381289bd..16ed29607 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -9,7 +9,6 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
-use Illuminate\Support\Arr;
 use Laravel\Scout\Searchable;
 use Rapidez\Core\Casts\Children;
 use Rapidez\Core\Casts\CommaSeparatedToArray;
@@ -34,8 +33,8 @@ class Product extends Model
     use CastMultiselectAttributes;
     use CastSuperAttributes;
     use HasAlternatesThroughRewrites;
-    use SelectAttributeScopes;
     use Searchable;
+    use SelectAttributeScopes;
 
     public array $attributesToSelect = [];
 
@@ -126,7 +125,7 @@ public function shouldBeSearchable(): bool
 
     public function searchableAs(): string
     {
-        return 'products_'.config('rapidez.store');
+        return 'products_' . config('rapidez.store');
     }
 
     protected function makeAllSearchableUsing(Builder $query): Builder

From 34a9f5cab4a5c219feb5bfc2d6ffbd070c5e22f0 Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Wed, 15 Jan 2025 15:34:59 +0000
Subject: [PATCH 003/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 9b5588d59..69dba32de 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -2,7 +2,7 @@
 import InstantSearch from 'vue-instantsearch'
 // TODO: Maybe make this swappable, so users can switch?
 import { instantMeiliSearch } from '@meilisearch/instant-meilisearch'
-import { history as historyRouter } from 'instantsearch.js/es/lib/routers';
+import { history as historyRouter } from 'instantsearch.js/es/lib/routers'
 import { singleIndex as singleIndexMapping } from 'instantsearch.js/es/lib/stateMappings'
 // We should only import the components used!
 // https://www.algolia.com/doc/guides/building-search-ui/installation/vue/?client=Vue+2#optimize-your-build-with-tree-shaking
@@ -46,7 +46,7 @@ export default {
         routing: {
             router: historyRouter(),
             stateMapping: singleIndexMapping('products_1'),
-        }
+        },
     }),
 
     render() {
@@ -70,13 +70,15 @@ export default {
             return this.filters.map((filter) => filter.code).concat(this.additionalFilters)
         },
         hitsPerPage: function () {
-            return this.$root.config.grid_per_page_values.map(function (pages, index) {
-                return {
-                    label: pages,
-                    value: pages,
-                    default: index === 0
-                }
-            }).concat({ label: this.$root.config.translations.all, value: 10000 })
+            return this.$root.config.grid_per_page_values
+                .map(function (pages, index) {
+                    return {
+                        label: pages,
+                        value: pages,
+                        default: index === 0,
+                    }
+                })
+                .concat({ label: this.$root.config.translations.all, value: 10000 })
         },
         sortOptions: function () {
             return [

From 5a99dd46ffdc37975d80c6f5fb4bf2cc720de7a9 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Thu, 16 Jan 2025 14:05:44 +0100
Subject: [PATCH 004/244] Dev

---
 .../js/components/Search/Autocomplete.vue     |  8 +--
 resources/views/components/listing.blade.php  |  1 +
 .../views/listing/partials/item.blade.php     | 64 +++++++++----------
 .../listing/partials/pagination.blade.php     | 17 +++--
 .../views/listing/partials/stats.blade.php    | 32 ----------
 .../views/listing/partials/toolbar.blade.php  | 13 ++++
 .../listing/partials/toolbar/pages.blade.php  | 15 +++++
 .../partials/toolbar/sorting.blade.php        | 23 +++++++
 .../listing/partials/toolbar/stats.blade.php  | 11 ++++
 resources/views/listing/products.blade.php    | 49 ++++++--------
 10 files changed, 127 insertions(+), 106 deletions(-)
 delete mode 100644 resources/views/listing/partials/stats.blade.php
 create mode 100644 resources/views/listing/partials/toolbar.blade.php
 create mode 100644 resources/views/listing/partials/toolbar/pages.blade.php
 create mode 100644 resources/views/listing/partials/toolbar/sorting.blade.php
 create mode 100644 resources/views/listing/partials/toolbar/stats.blade.php

diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 6ba2ff805..5a8474d23 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,9 +1,9 @@
 <script>
-import { ReactiveBase, DataSearch } from '@appbaseio/reactivesearch-vue'
-import { useDebounceFn } from '@vueuse/core'
+// import { ReactiveBase, DataSearch } from '@appbaseio/reactivesearch-vue'
+// import { useDebounceFn } from '@vueuse/core'
 
-Vue.use(ReactiveBase)
-Vue.use(DataSearch)
+// Vue.use(ReactiveBase)
+// Vue.use(DataSearch)
 
 export default {
     props: {
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index a8f8cf46c..fd86c4f0e 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -27,6 +27,7 @@
                 :routing="listingSlotProps.routing"
             >
                 {{-- TODO: This isn't working?  --}}
+                {{-- :size="isNaN(parseInt(listingSlotProps.pageSize)) ? 10000 : parseInt(listingSlotProps.pageSize)" --}}
                 <ais-configure :hitsPerPage="9" />
                 {{ $before ?? '' }}
                 @if ($slot->isEmpty())
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index 578033326..af5bfb5ba 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -1,33 +1,31 @@
-{{-- <template {!! isset($slider) ? '' : 'slot="renderItem" slot-scope="{ item, count }"' !!}> --}}
-    <div class="size-full">
-        <add-to-cart v-bind:product="item" v-slot="addToCart" v-cloak>
-            <div class="group relative flex flex-1 flex-col rounded border bg-white p-5" :key="item.entity_id">
-                @if (App::providerIsLoaded('Rapidez\Wishlist\WishlistServiceProvider'))
-                    <div class="group absolute right-0 top-0 z-10 p-2">
-                        @include('rapidez::wishlist.button')
-                    </div>
-                @endif
-                <a :href="item.url | url" class="block">
-                    <img
-                        v-if="addToCart.currentThumbnail"
-                        :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + addToCart.currentThumbnail + '.webp'"
-                        class="mb-3 h-48 w-full rounded-t object-contain" :alt="item.name" :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
-                        width="200"
-                        height="200"
-                    />
-                    <x-rapidez::no-image v-else class="mb-3 h-48 rounded-t" />
-                    <div class="px-2">
-                        <div class="text-base font-medium">@{{ item.name }}</div>
-                        @if (!Rapidez::config('catalog/frontend/show_swatches_in_product_list', 1))
-                            <div class="flex items-center space-x-2">
-                                <div class="font-semibold">@{{ (item.special_price || item.price) | price }}</div>
-                                <div class="text-sm line-through" v-if="item.special_price">@{{ item.price | price }}</div>
-                            </div>
-                        @endif
-                    </div>
-                </a>
-                @include('rapidez::listing.partials.item.addtocart')
-            </div>
-        </add-to-cart>
-    </div>
-{{-- </template> --}}
+<div class="size-full">
+    <add-to-cart v-bind:product="item" v-slot="addToCart" v-cloak>
+        <div class="group relative flex flex-1 flex-col rounded border bg-white p-5" :key="item.entity_id">
+            @if (App::providerIsLoaded('Rapidez\Wishlist\WishlistServiceProvider'))
+                <div class="group absolute right-0 top-0 z-10 p-2">
+                    @include('rapidez::wishlist.button')
+                </div>
+            @endif
+            <a :href="item.url | url" class="block">
+                <img
+                    v-if="addToCart.currentThumbnail"
+                    :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + addToCart.currentThumbnail + '.webp'"
+                    class="mb-3 h-48 w-full rounded-t object-contain" :alt="item.name" :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
+                    width="200"
+                    height="200"
+                />
+                <x-rapidez::no-image v-else class="mb-3 h-48 rounded-t" />
+                <div class="px-2">
+                    <div class="text-base font-medium">@{{ item.name }}</div>
+                    @if (!Rapidez::config('catalog/frontend/show_swatches_in_product_list', 1))
+                        <div class="flex items-center space-x-2">
+                            <div class="font-semibold">@{{ (item.special_price || item.price) | price }}</div>
+                            <div class="text-sm line-through" v-if="item.special_price">@{{ item.price | price }}</div>
+                        </div>
+                    @endif
+                </div>
+            </a>
+            @include('rapidez::listing.partials.item.addtocart')
+        </div>
+    </add-to-cart>
+</div>
diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
index 6644c0284..67a7c02db 100644
--- a/resources/views/listing/partials/pagination.blade.php
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -1,10 +1,11 @@
-<ais-pagination class="flex">
+<ais-pagination class="flex" v-on:page-change="scrollToElement('#products')">
     <template v-slot="{ currentRefinement, nbPages, pages, isFirstPage, isLastPage, refine, createURL }">
         <ul class="flex gap-2 mx-auto">
             <li v-if="!isFirstPage">
                 <x-rapidez::button
                     ::href="createURL(0)"
-                    v-on:click.prevent="refine(0)"
+                    v-on:click.exact.left.prevent="refine(0)"
+                    :aria-label="__('First Page')"
                 >
                     @lang('First')
                 </x-rapidez::button>
@@ -12,7 +13,8 @@
             <li v-if="!isFirstPage">
                 <x-rapidez::button
                     ::href="createURL(currentRefinement - 1)"
-                    v-on:click.prevent="refine(currentRefinement - 1)"
+                    v-on:click.exact.left.prevent="refine(currentRefinement - 1)"
+                    :aria-label="__('Previous Page')"
                 >
                     @lang('Prev')
                 </x-rapidez::button>
@@ -21,7 +23,8 @@
                 <x-rapidez::button
                     ::href="createURL(page)"
                     ::class="{ '!font-bold': page === currentRefinement }"
-                    v-on:click.prevent="refine(page)"
+                    v-on:click.exact.left.prevent="refine(page)"
+                    ::aria-label="`{{ __('Page') }} ${page + 1}`"
                 >
                     @{{ page + 1 }}
                 </x-rapidez::button>
@@ -29,7 +32,8 @@
             <li v-if="!isLastPage">
                 <x-rapidez::button
                     ::href="createURL(currentRefinement + 1)"
-                    v-on:click.prevent="refine(currentRefinement + 1)"
+                    v-on:click.exact.left.prevent="refine(currentRefinement + 1)"
+                    :aria-label="__('Next Page')"
                 >
                     @lang('Next')
                 </x-rapidez::button>
@@ -37,7 +41,8 @@
             <li v-if="!isLastPage">
                 <x-rapidez::button
                     ::href="createURL(nbPages)"
-                    v-on:click.prevent="refine(nbPages)"
+                    v-on:click.exact.left.prevent="refine(nbPages)"
+                    :aria-label="__('Last Page')"
                 >
                     @lang('Last')
                 </x-rapidez::button>
diff --git a/resources/views/listing/partials/stats.blade.php b/resources/views/listing/partials/stats.blade.php
deleted file mode 100644
index 610507e0c..000000000
--- a/resources/views/listing/partials/stats.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="flex-wrap flex-1 gap-1 text-sm items-center flex justify-between sm:text-base">
-    @{{ numberOfResults }} @lang('products')
-    <template v-if="numberOfPages > 1">
-        (@lang('page'): @{{ currentPage + 1 }}/@{{ numberOfPages }})
-    </template>
-
-    <div class="justify-self-end">
-        <div class="flex items-center gap-1 flex-wrap">
-            <label class="flex items-center gap-x-1.5">
-                <x-rapidez::label class="text-sm text-muted whitespace-nowrap mb-0">
-                    @lang('Items per page'):
-                </x-rapidez::label>
-
-                <ais-hits-per-page :items="listingSlotProps.hitsPerPage">
-                    <template v-slot="{ items, refine }">
-                        <x-rapidez::input.select class="w-20">
-                            <option
-                                v-for="item in items"
-                                v-bind:key="item.value"
-                                v-bind:value="item.value"
-                                v-bind:selected="item.isRefined"
-                                v-on:change="refine(item.value)"
-                            >
-                                @{{ item.label }}
-                            </option>
-                        </x-rapidez::input.select>
-                    </template>
-                </ais-hits-per-page>
-            </label>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/listing/partials/toolbar.blade.php b/resources/views/listing/partials/toolbar.blade.php
new file mode 100644
index 000000000..b842aa1fc
--- /dev/null
+++ b/resources/views/listing/partials/toolbar.blade.php
@@ -0,0 +1,13 @@
+{{-- TODO: Double check the responsiveness --}}
+<div class="flex gap-1 items-center text-sm">
+    <div class="flex-1">
+        @include('rapidez::listing.partials.toolbar.stats')
+    </div>
+    <label class="flex items-center gap-x-1.5">
+        <x-rapidez::label class="whitespace-nowrap mb-0">
+            @lang('Items per page'):
+        </x-rapidez::label>
+        @include('rapidez::listing.partials.toolbar.pages')
+    </label>
+    @include('rapidez::listing.partials.toolbar.sorting')
+</div>
diff --git a/resources/views/listing/partials/toolbar/pages.blade.php b/resources/views/listing/partials/toolbar/pages.blade.php
new file mode 100644
index 000000000..488418ad8
--- /dev/null
+++ b/resources/views/listing/partials/toolbar/pages.blade.php
@@ -0,0 +1,15 @@
+<ais-hits-per-page :items="listingSlotProps.hitsPerPage">
+    <template v-slot="{ items, refine }">
+        <x-rapidez::input.select class="w-20">
+            <option
+                v-for="item in items"
+                v-bind:key="item.value"
+                v-bind:value="item.value"
+                v-bind:selected="item.isRefined"
+                v-on:change="refine(item.value)"
+            >
+                @{{ item.label }}
+            </option>
+        </x-rapidez::input.select>
+    </template>
+</ais-hits-per-page>
diff --git a/resources/views/listing/partials/toolbar/sorting.blade.php b/resources/views/listing/partials/toolbar/sorting.blade.php
new file mode 100644
index 000000000..ca2d55716
--- /dev/null
+++ b/resources/views/listing/partials/toolbar/sorting.blade.php
@@ -0,0 +1,23 @@
+{{--
+TODO: The "sortOptions" computed prop should be used,
+but the value is the index instead of an attribute.
+--}}
+<ais-sort-by :items="[
+    { value: 'instant_search', label: 'Featured' },
+    { value: 'instant_search_price_asc', label: 'Price asc' },
+    { value: 'instant_search_price_desc', label: 'Price desc' },
+]">
+    <template v-slot="{ items, currentRefinement, refine }">
+        <x-rapidez::input.select>
+            <option
+                v-for="item in items"
+                v-bind:key="item.value"
+                v-bind:value="item.value"
+                v-bind:selected="item.value === currentRefinement"
+                v-on:change="refine(item.value)"
+            >
+                @{{ item.label }}
+            </option>
+        </x-rapidez::input.select>
+    </template>
+</ais-sort-by>
diff --git a/resources/views/listing/partials/toolbar/stats.blade.php b/resources/views/listing/partials/toolbar/stats.blade.php
new file mode 100644
index 000000000..04f2c76cd
--- /dev/null
+++ b/resources/views/listing/partials/toolbar/stats.blade.php
@@ -0,0 +1,11 @@
+<ais-stats>
+    <template v-slot="{ nbPages, nbHits, page, processingTimeMS }">
+        @{{ nbHits }} @lang('products')
+        <template v-if="nbPages > 1">
+            (@lang('page'): @{{ page + 1 }} / @{{ nbPages }})
+        </template>
+        <template v-if="window.debug">
+            - @{{ processingTimeMS }}ms
+        </template>
+    </template>
+</ais-stats>
diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index 80e6b22ac..4acb90f15 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -1,34 +1,21 @@
-@include('rapidez::listing.partials.stats')
+{{-- TODO: Is this wrapper with these classes still the cleanest option? --}}
+<div id="products" class="flex flex-col gap-3 *:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end">
+    @include('rapidez::listing.partials.toolbar')
 
-<ais-hits>
-    <template v-slot="{ items }">
-        <div class="flex flex-wrap mt-5 -mx-4 sm:-mx-1 overflow-hidden">
-            <template v-for="(item, count) in items">
-                @include('rapidez::listing.partials.item')
-            </template>
-        </div>
-    </template>
-</ais-hits>
+    <ais-hits>
+        <template v-slot="{ items }">
+            <div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 overflow-hidden">
+                <template v-for="(item, count) in items">
+                    @include('rapidez::listing.partials.item')
+                </template>
+            </div>
+        </template>
+    </ais-hits>
 
-@include('rapidez::listing.partials.pagination')
-
-
-
-{{--
-@php $dropdownClasses = '!h-auto !py-3 !px-5 !border-solid !border !border-default !rounded-md !py-2 !ring-0 focus:!border-muted !text-sm !text !outline-none max-md:w-full' @endphp
-<reactive-list
-    id="products"
-    class="*:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end"
-    list-class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 mt-5 overflow-hidden"
-    v-on:page-click="scrollToElement('#products')"
-    :size="isNaN(parseInt(listingSlotProps.pageSize)) ? 10000 : parseInt(listingSlotProps.pageSize)"
-    :sort-options="sortOptions"
-    :inner-class="{
-        sortOptions: '{{ $dropdownClasses }}',
-    }"
->
-    @include('rapidez::listing.partials.stats', compact('dropdownClasses'))
-    @include('rapidez::listing.partials.item')
+    {{--
+    TODO: What do we get when there are no results?
     @include('rapidez::listing.partials.no-results')
-</reactive-list>
- --}}
+    --}}
+
+    @include('rapidez::listing.partials.pagination')
+</div>

From 42262ba5fdb125746efd2f65658008a7d088f8c3 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Thu, 16 Jan 2025 17:31:10 +0100
Subject: [PATCH 005/244] Switched to Searchkit / Elasticsearch

---
 package.json                                  |  2 +-
 resources/js/components/Listing/Listing.vue   | 72 ++++++++++++++++---
 resources/views/category/overview.blade.php   |  6 +-
 resources/views/components/listing.blade.php  | 16 ++++-
 .../views/components/reactive-base.blade.php  |  8 ---
 resources/views/search/overview.blade.php     |  4 ++
 yarn.lock                                     | 31 ++++----
 7 files changed, 103 insertions(+), 36 deletions(-)
 delete mode 100644 resources/views/components/reactive-base.blade.php

diff --git a/package.json b/package.json
index 0b83d84b9..292b6c0b9 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "devDependencies": {
         "@babel/core": "^7.23.9",
         "@hotwired/turbo": "^8.0.2",
-        "@meilisearch/instant-meilisearch": "^0.23.0",
+        "@searchkit/instantsearch-client": "^4.14.1",
         "@tailwindcss/forms": "^0.5.3",
         "@tailwindcss/typography": "^0.5.9",
         "@vitejs/plugin-vue2": "^2.2.0",
diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 69dba32de..a784330ba 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,7 +1,10 @@
 <script>
 import InstantSearch from 'vue-instantsearch'
+
 // TODO: Maybe make this swappable, so users can switch?
-import { instantMeiliSearch } from '@meilisearch/instant-meilisearch'
+import Client from '@searchkit/instantsearch-client'
+import Searchkit from "searchkit"
+
 import { history as historyRouter } from 'instantsearch.js/es/lib/routers'
 import { singleIndex as singleIndexMapping } from 'instantsearch.js/es/lib/stateMappings'
 // We should only import the components used!
@@ -30,16 +33,6 @@ export default {
             (Turbo?.navigator?.location?.searchParams || new URLSearchParams(window.location.search)).get('pageSize') ||
             config.grid_per_page,
 
-        // TODO: Not sure if this is the right place,
-        // the autocomplete also needs this but
-        // we don't want to load everything
-        // directly due the JS size
-        searchClient: instantMeiliSearch(
-            // TODO: This should be configurable
-            'http://localhost:7700',
-            '',
-        ).searchClient,
-
         // TODO: We need some finetuning here; the url isn't very clean.
         // Also after a refresh the filters aren't selected.
         // Maybe it conflicts with ReactiveSearch?
@@ -58,6 +51,63 @@ export default {
     },
 
     computed: {
+        // TODO: Not sure if this is the right place,
+        // the autocomplete also needs this but
+        // we don't want to load everything
+        // directly due the JS size
+        searchClient: function () {
+            let client = Client(this.searchkit)
+
+            // console.log(client)
+
+            return client
+        },
+
+        searchkit: function () {
+            let searchkit = new Searchkit({
+                connection: {
+                    host: config.es_url,
+                },
+                search_settings: {
+                    // Are we using this? In the autocomplete maybe?
+                    // highlight_attributes: ['title'],
+
+                    // Should use: config.searchable
+                    // search_attributes: [{ field: 'title', weight: 3 }, 'actors', 'plot'],
+
+                    // We could make the response smaller with this
+                    // result_attributes: ['title', 'actors', 'poster', 'plot'],
+
+                    // TODO: Loop through all filters
+                    facet_attributes: [
+                        { attribute: 'activity', field: 'activity.keyword', type: 'string' },
+                        { attribute: 'material', field: 'material.keyword', type: 'string' },
+                        { attribute: 'style_bags', field: 'style_bags.keyword', type: 'string' },
+                        { attribute: 'gender', field: 'gender.keyword', type: 'string' },
+                    ],
+
+                    filter_attributes: [
+                        { attribute: 'category_ids', field: 'category_ids', type: 'numeric' },
+                        { attribute: 'visibility', field: 'visibility', type: 'numeric' },
+                    ],
+
+                    sorting: {
+                        default: {
+                            field: '_score',
+                            order: 'desc'
+                        },
+                        _rated_desc: {
+                            field: 'rated',
+                            order: 'desc'
+                        }
+                    },
+                }
+            })
+
+            // console.log(searchkit)
+
+            return searchkit
+        },
         filters: function () {
             return Object.values(this.attributes)
                 .filter((attribute) => attribute.filter)
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index 95e9985a1..84db698a3 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -11,7 +11,11 @@
         <h1 class="mb-5 text-3xl font-bold">{{ $category->name }}</h1>
 
         @if ($category->is_anchor)
-            <x-rapidez::listing query="{ bool: { must: [{ terms: { visibility: [2, 4] } }, { terms: { category_ids: [config.category.entity_id] } }] } }" />
+            {{--
+            The "query string query" is cleaner,
+            but will this work everywhere?
+            --}}
+            <x-rapidez::listing query="'visibility:(2 OR 4) AND category_ids:'+config.category.entity_id" />
         @else
             <div class="flex max-md:flex-col">
                 <div class="xl:w-1/5">
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index fd86c4f0e..368ab2565 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -23,12 +23,22 @@
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
-                index-name="products_1"
+                :index-name="config.es_prefix + '_products_' + config.store"
                 :routing="listingSlotProps.routing"
             >
-                {{-- TODO: This isn't working?  --}}
                 {{-- :size="isNaN(parseInt(listingSlotProps.pageSize)) ? 10000 : parseInt(listingSlotProps.pageSize)" --}}
-                <ais-configure :hitsPerPage="9" />
+                <ais-configure
+                    :filters="{{ $query }}"
+                    {{-- :query="getQuery" --}}
+                    {{-- :custom-query="function () {return {query: {{ $query }} } }" --}}
+                />
+
+                {{-- <reactive-component
+                    component-id="score-position"
+                    :custom-query="getQuery"
+                    :show-filter="false"
+                ></reactive-component> --}}
+
                 {{ $before ?? '' }}
                 @if ($slot->isEmpty())
                     <div class="flex flex-col lg:flex-row gap-x-6 gap-y-3">
diff --git a/resources/views/components/reactive-base.blade.php b/resources/views/components/reactive-base.blade.php
deleted file mode 100644
index 72e34fb58..000000000
--- a/resources/views/components/reactive-base.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<reactive-base {{ $attributes->merge([
-    ':app' => "config.es_prefix + '_products_' + config.store",
-    ':url' => "config.es_url",
-    ':set-search-params' => "setSearchParams",
-]) }} v-cloak>
-    {{ $slot }}
-</reactive-base>
-
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index a8979c391..4e4366955 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -7,6 +7,10 @@
 @section('content')
     <div class="container">
         <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
+        {{--
+        Is it possible to change this query to a "query string query"?
+        Or is there something else we can use better now?
+        --}}
         <x-rapidez::listing query="{
             bool: {
                 must: [
diff --git a/yarn.lock b/yarn.lock
index b1efb1698..76bf03607 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -348,13 +348,6 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@meilisearch/instant-meilisearch@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@meilisearch/instant-meilisearch/-/instant-meilisearch-0.23.0.tgz#111562206d29b3f2f0f461f30470e35dab6e7ba0"
-  integrity sha512-KXyTZ7HEj4EQzROSno0k7BeijHS0YQu5AIH76OWcuGxFwUIajlk9k6CsH1DsW9+W8SPpmoJY0BglaW0lK6YH1w==
-  dependencies:
-    meilisearch "^0.47.0"
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -461,6 +454,13 @@
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz#0574d7e87b44ee8511d08cc7f914bcb802b70818"
   integrity sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==
 
+"@searchkit/instantsearch-client@^4.14.1":
+  version "4.14.1"
+  resolved "https://registry.yarnpkg.com/@searchkit/instantsearch-client/-/instantsearch-client-4.14.1.tgz#85fed3f90ba88a1d73ec247264d7342aee4eddb6"
+  integrity sha512-AOkVPcnUVl+5bFTChFh60ca6GsbSU4I7TPB3ZfTGJygsfMx90/p+Ck9kGT+khhxiotDUctIa+nK3GKwNG5QcKA==
+  dependencies:
+    searchkit "^4.13.0"
+
 "@tailwindcss/forms@^0.5.3":
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.5.9.tgz#b495c12575d6eae5865b2cbd9876b26d89f16f61"
@@ -807,6 +807,11 @@ debug@^4.1.0, debug@^4.3.1:
   dependencies:
     ms "^2.1.3"
 
+deepmerge@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -1180,11 +1185,6 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-meilisearch@^0.47.0:
-  version "0.47.0"
-  resolved "https://registry.yarnpkg.com/meilisearch/-/meilisearch-0.47.0.tgz#376bda5d65f7dd7b80e1ad317912664c4a02b05f"
-  integrity sha512-Qq+hatuDJ0z5c+szVb0O/uI7Z2jfMUjj8eNB6xPyKp9Og7GVnrOZJRVoDPqGoVY484Iwh+F61y2UreIetda00w==
-
 merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
@@ -1512,6 +1512,13 @@ search-insights@^2.17.2:
   resolved "https://registry.yarnpkg.com/search-insights/-/search-insights-2.17.3.tgz#8faea5d20507bf348caba0724e5386862847b661"
   integrity sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==
 
+searchkit@^4.13.0:
+  version "4.13.2"
+  resolved "https://registry.yarnpkg.com/searchkit/-/searchkit-4.13.2.tgz#adb978363082781cfded2663ee05cb92c7511b74"
+  integrity sha512-d6OnHFG0lwl5QKcLUfqSsk9eD9Zvl6Us2z3Ib9U9H/9T7PsNlPk/gV4ToquaPG2uIN5hhHuUAEa9jx1Pzj/HyA==
+  dependencies:
+    deepmerge "^4.2.2"
+
 semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"

From 05ee2a74afc8c54c1872eaabf8f478dc474e01bf Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Thu, 16 Jan 2025 17:31:34 +0100
Subject: [PATCH 006/244] Toolbar select fix

---
 resources/views/listing/partials/toolbar/pages.blade.php  | 8 +++++---
 .../views/listing/partials/toolbar/sorting.blade.php      | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/views/listing/partials/toolbar/pages.blade.php b/resources/views/listing/partials/toolbar/pages.blade.php
index 488418ad8..a66963936 100644
--- a/resources/views/listing/partials/toolbar/pages.blade.php
+++ b/resources/views/listing/partials/toolbar/pages.blade.php
@@ -1,12 +1,14 @@
 <ais-hits-per-page :items="listingSlotProps.hitsPerPage">
     <template v-slot="{ items, refine }">
-        <x-rapidez::input.select class="w-20">
+        <x-rapidez::input.select
+            v-bind:value="items.find(item => item.isRefined)?.value"
+            v-on:change="event => refine(event.target.value)"
+            class="w-20"
+        >
             <option
                 v-for="item in items"
                 v-bind:key="item.value"
                 v-bind:value="item.value"
-                v-bind:selected="item.isRefined"
-                v-on:change="refine(item.value)"
             >
                 @{{ item.label }}
             </option>
diff --git a/resources/views/listing/partials/toolbar/sorting.blade.php b/resources/views/listing/partials/toolbar/sorting.blade.php
index ca2d55716..451085b11 100644
--- a/resources/views/listing/partials/toolbar/sorting.blade.php
+++ b/resources/views/listing/partials/toolbar/sorting.blade.php
@@ -8,13 +8,14 @@
     { value: 'instant_search_price_desc', label: 'Price desc' },
 ]">
     <template v-slot="{ items, currentRefinement, refine }">
-        <x-rapidez::input.select>
+        <x-rapidez::input.select
+            v-bind:value="items.find(item => item.value === currentRefinement)?.value"
+            v-on:change="event => refine(event.target.value)"
+        >
             <option
                 v-for="item in items"
                 v-bind:key="item.value"
                 v-bind:value="item.value"
-                v-bind:selected="item.value === currentRefinement"
-                v-on:change="refine(item.value)"
             >
                 @{{ item.label }}
             </option>

From 9c44d67b2227722918fca7b63b0ea81794f72541 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Thu, 16 Jan 2025 16:32:11 +0000
Subject: [PATCH 007/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index a784330ba..61388a4c0 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -3,7 +3,7 @@ import InstantSearch from 'vue-instantsearch'
 
 // TODO: Maybe make this swappable, so users can switch?
 import Client from '@searchkit/instantsearch-client'
-import Searchkit from "searchkit"
+import Searchkit from 'searchkit'
 
 import { history as historyRouter } from 'instantsearch.js/es/lib/routers'
 import { singleIndex as singleIndexMapping } from 'instantsearch.js/es/lib/stateMappings'
@@ -94,14 +94,14 @@ export default {
                     sorting: {
                         default: {
                             field: '_score',
-                            order: 'desc'
+                            order: 'desc',
                         },
                         _rated_desc: {
                             field: 'rated',
-                            order: 'desc'
-                        }
+                            order: 'desc',
+                        },
                     },
-                }
+                },
             })
 
             // console.log(searchkit)

From 6f0d8a66b2c5869d9b0d2cf48fa267f937097344 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 22 Jan 2025 11:37:03 +0100
Subject: [PATCH 008/244] Dynamic facets and category sorting query

---
 resources/js/components/Listing/Listing.vue | 72 +++++++++++++++------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index a784330ba..3c7b865c1 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,9 +1,8 @@
 <script>
 import InstantSearch from 'vue-instantsearch'
-
-// TODO: Maybe make this swappable, so users can switch?
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from "searchkit"
+import deepmerge from 'deepmerge'
 
 import { history as historyRouter } from 'instantsearch.js/es/lib/routers'
 import { singleIndex as singleIndexMapping } from 'instantsearch.js/es/lib/stateMappings'
@@ -56,7 +55,20 @@ export default {
         // we don't want to load everything
         // directly due the JS size
         searchClient: function () {
-            let client = Client(this.searchkit)
+            let client = Client(this.searchkit, {
+                hooks: {
+                    beforeSearch: async (searchRequests) => {
+                        return searchRequests.map((sr) => {
+                            // TODO: Maybe use deepmerge here so it doesn't
+                            // really matter what query is used? What
+                            // if we want to add something to the
+                            // "must" instead of "filter"?
+                            sr.body.query.bool.filter.push(this.getQuery())
+                            return sr
+                        })
+                    }
+                },
+            })
 
             // console.log(client)
 
@@ -72,19 +84,13 @@ export default {
                     // Are we using this? In the autocomplete maybe?
                     // highlight_attributes: ['title'],
 
-                    // Should use: config.searchable
-                    // search_attributes: [{ field: 'title', weight: 3 }, 'actors', 'plot'],
+                    search_attributes: Object.entries(config.searchable)
+                        .map(([field, weight]) => ({ field, weight })),
 
                     // We could make the response smaller with this
                     // result_attributes: ['title', 'actors', 'poster', 'plot'],
 
-                    // TODO: Loop through all filters
-                    facet_attributes: [
-                        { attribute: 'activity', field: 'activity.keyword', type: 'string' },
-                        { attribute: 'material', field: 'material.keyword', type: 'string' },
-                        { attribute: 'style_bags', field: 'style_bags.keyword', type: 'string' },
-                        { attribute: 'gender', field: 'gender.keyword', type: 'string' },
-                    ],
+                    facet_attributes: this.facets,
 
                     filter_attributes: [
                         { attribute: 'category_ids', field: 'category_ids', type: 'numeric' },
@@ -104,21 +110,49 @@ export default {
                 }
             })
 
-            // console.log(searchkit)
+            // console.log(this.facets)
 
             return searchkit
         },
+
         filters: function () {
             return Object.values(this.attributes)
                 .filter((attribute) => attribute.filter)
                 .sort((a, b) => a.position - b.position)
         },
+
+        facets: function () {
+            return [
+                ...this.filters.map((filter) => ({
+                    attribute: filter.code,
+                    field: filter.code + (['price', 'boolean'].includes(filter.input) ? '' : '.keyword'),
+                    type: ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string',
+                })),
+                { attribute: 'category_lvl0', field: 'category_lvl0.keyword', type: 'string' },
+                { attribute: 'category_lvl1', field: 'category_lvl1.keyword', type: 'string' },
+                { attribute: 'category_lvl2', field: 'category_lvl2.keyword', type: 'string' },
+                { attribute: 'category_lvl3', field: 'category_lvl3.keyword', type: 'string' },
+            ];
+
+
+            return this.filters.map((filter) => ({
+                attribute: filter.code,
+                field: filter.code + (['price', 'boolean'].includes(filter.input) ? '' : '.keyword'),
+                type: ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string',
+            })).push([
+                { attribute: 'category_lvl0', field: 'category_lvl0.keyword', type: 'string' },
+                { attribute: 'category_lvl1', field: 'category_lvl1.keyword', type: 'string' },
+                { attribute: 'category_lvl2', field: 'category_lvl2.keyword', type: 'string' },
+                { attribute: 'category_lvl3', field: 'category_lvl3.keyword', type: 'string' },
+            ])
+            // TODO: Double check this and how it's used.
+            // .concat(this.additionalFilters)
+        },
+
         sortings: function () {
             return Object.values(this.attributes).filter((attribute) => attribute.sorting)
         },
-        reactiveFilters: function () {
-            return this.filters.map((filter) => filter.code).concat(this.additionalFilters)
-        },
+
         hitsPerPage: function () {
             return this.$root.config.grid_per_page_values
                 .map(function (pages, index) {
@@ -130,6 +164,7 @@ export default {
                 })
                 .concat({ label: this.$root.config.translations.all, value: 10000 })
         },
+
         sortOptions: function () {
             return [
                 {
@@ -157,6 +192,7 @@ export default {
                 .concat(this.additionalSorting)
         },
     },
+
     watch: {
         attributes: function (value) {
             this.loaded = Object.keys(value).length > 0
@@ -176,7 +212,7 @@ export default {
             }
 
             return {
-                query: {
+                // query: {
                     function_score: {
                         script_score: {
                             script: {
@@ -184,7 +220,7 @@ export default {
                             },
                         },
                     },
-                },
+                // },
             }
         },
     },

From 6f3023d0ccfc8936bf32e2f000df1aadceedb7bf Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 22 Jan 2025 11:40:18 +0100
Subject: [PATCH 009/244] Filters

---
 resources/js/components/Recursion.vue         | 31 ++++++++++
 resources/js/vue-components.js                |  2 +
 resources/views/category/overview.blade.php   |  4 --
 .../views/components/filter/heading.blade.php | 13 +++--
 resources/views/components/listing.blade.php  |  2 +-
 resources/views/listing/filters.blade.php     |  8 +--
 .../listing/partials/filter/boolean.blade.php |  8 +--
 .../partials/filter/category.blade.php        | 40 ++++++++++++-
 .../listing/partials/filter/price.blade.php   | 53 +++++++++++++-----
 .../listing/partials/filter/search.blade.php  | 14 +++++
 .../listing/partials/filter/select.blade.php  | 10 ++++
 .../partials/filter/selected.blade.php        | 56 +++++++++++++++++++
 .../listing/partials/filter/swatch.blade.php  |  1 -
 src/Commands/IndexProductsCommand.php         | 28 ++++++++++
 14 files changed, 235 insertions(+), 35 deletions(-)
 create mode 100644 resources/js/components/Recursion.vue
 create mode 100644 resources/views/listing/partials/filter/search.blade.php

diff --git a/resources/js/components/Recursion.vue b/resources/js/components/Recursion.vue
new file mode 100644
index 000000000..3b849e5d3
--- /dev/null
+++ b/resources/js/components/Recursion.vue
@@ -0,0 +1,31 @@
+<template>
+    <div>
+        <slot
+            :data="data"
+            :component="childComponent"
+        />
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        data: {
+            type: Array,
+            required: true,
+        },
+    },
+    computed: {
+        childComponent() {
+            return {
+                render: (h) =>
+                    h('recursion', {
+                        props: {
+                            data: this.data,
+                        },
+                    }),
+            };
+        },
+    },
+};
+</script>
diff --git a/resources/js/vue-components.js b/resources/js/vue-components.js
index 9a400f4c7..fec46eb63 100644
--- a/resources/js/vue-components.js
+++ b/resources/js/vue-components.js
@@ -15,6 +15,8 @@ import graphql from './components/Graphql.vue'
 Vue.component('graphql', graphql)
 import graphqlMutation from './components/GraphqlMutation.vue'
 Vue.component('graphql-mutation', graphqlMutation)
+import recursion from './components/Recursion.vue'
+Vue.component('recursion', recursion)
 
 import notifications from './components/Notifications/Notifications.vue'
 Vue.component('notifications', notifications)
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index 84db698a3..d9230e3e5 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -11,10 +11,6 @@
         <h1 class="mb-5 text-3xl font-bold">{{ $category->name }}</h1>
 
         @if ($category->is_anchor)
-            {{--
-            The "query string query" is cleaner,
-            but will this work everywhere?
-            --}}
             <x-rapidez::listing query="'visibility:(2 OR 4) AND category_ids:'+config.category.entity_id" />
         @else
             <div class="flex max-md:flex-col">
diff --git a/resources/views/components/filter/heading.blade.php b/resources/views/components/filter/heading.blade.php
index 5da92c527..f7eaf45af 100644
--- a/resources/views/components/filter/heading.blade.php
+++ b/resources/views/components/filter/heading.blade.php
@@ -1,14 +1,19 @@
 @slots(['title'])
 
+{{-- TODO: Can't we use <details> with <summary> for this? --}}
 <input class="peer hidden" type="checkbox" checked :set="id = Math.random().toString(36).slice(2)" :id="id" />
 
+{{--
+TODO: Double check these paddings;
+why are they different? And why
+do we've pb-4 wrapped around
+it from the filters?
+--}}
 <label class="flex items-center justify-between gap-x-2 border-t pb-2.5 pt-4 text cursor-pointer peer-checked:[&>.chevron]:rotate-180" :for="id">
     <span class="block font-sans text-base font-semibold">
-        @if ($title->isNotEmpty())
-            {{ $title }}
-        @else
+        @slotdefault('title')
             @{{ filter?.name?.replace('_', ' ') }}
-        @endif
+        @endslotdefault
     </span>
 
     <x-heroicon-o-chevron-down class="size-4 chevron transition" />
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 368ab2565..8a514a715 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -18,7 +18,7 @@
         }]"
         v-cloak
     >
-        <div slot-scope="{ loaded, filters, sortOptions, reactiveFilters, getQuery, _renderProxy: listingSlotProps }">
+        <div slot-scope="{ loaded, filters, sortOptions, getQuery, _renderProxy: listingSlotProps }">
             {{-- TODO: Implement $query and make sure the default product in category position is applied --}}
             <ais-instant-search
                 v-if="loaded"
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index 748b51731..96a3ea64f 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -3,11 +3,11 @@
     <div class="w-full p-2 max-lg:bg-white max-lg:p-5">
         {{-- On mobile the filters aren't immedately visible so we should defer loading --}}
         <lazy>
-            <ais-clear-refinements />
-            {{-- @include('rapidez::listing.partials.filter.selected') --}}
-            {{-- @include('rapidez::listing.partials.filter.category') --}}
+            @include('rapidez::listing.partials.filter.selected')
+            @include('rapidez::listing.partials.filter.search')
+            @include('rapidez::listing.partials.filter.category')
             <template v-for="filter in filters">
-                {{-- @include('rapidez::listing.partials.filter.price') --}}
+                @include('rapidez::listing.partials.filter.price')
                 {{-- @include('rapidez::listing.partials.filter.swatch') --}}
                 @include('rapidez::listing.partials.filter.boolean')
                 @include('rapidez::listing.partials.filter.select')
diff --git a/resources/views/listing/partials/filter/boolean.blade.php b/resources/views/listing/partials/filter/boolean.blade.php
index 258d1cb18..9dbb6d343 100644
--- a/resources/views/listing/partials/filter/boolean.blade.php
+++ b/resources/views/listing/partials/filter/boolean.blade.php
@@ -1,19 +1,17 @@
 <ais-refinement-list
     v-if="filter.input == 'boolean'"
     :attribute="filter.code"
+    operator="and"
 >
     <template v-slot="{ items, refine }">
         <div v-if="items.length" class="relative pb-4">
             <x-rapidez::filter.heading>
-                {{-- @{{items}} --}}
                 <ul class="flex flex-col gap-1">
                     <li
                         v-for="item in items"
                         class="flex justify-between text-base text-muted"
                     >
                         <div class="flex">
-                            {{-- TODO: checked state is acting weird --}}
-                            {{-- @{{ item.isRefined }} --}}
                             <x-rapidez::input.checkbox
                                 v-bind:checked="item.isRefined"
                                 v-on:change="refine(item.value)"
@@ -22,8 +20,8 @@ class="flex justify-between text-base text-muted"
                                     class="font-sans font-medium items-center text-sm flex"
                                     :class="item.isRefined ? 'text' : 'text-muted'"
                                 >
-                                    <template v-if="item.value == 'true'">@lang('Yes')</template>
-                                    <template v-if="item.value == 'false'">@lang('No')</template>
+                                    <template v-if="item.value == '1'">@lang('Yes')</template>
+                                    <template v-if="item.value == '0'">@lang('No')</template>
                                     <span class="block ml-0.5 text-xs">(@{{ item.count }})</span>
                                 </span>
                             </x-rapidez::input.checkbox>
diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 25c5de3db..47413e333 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -1,10 +1,47 @@
+<ais-hierarchical-menu
+    :attributes="[
+        'category_lvl1',
+        'category_lvl2',
+        'category_lvl3',
+        {{-- TODO: This should be dynamic up to the max depth --}}
+    ]"
+    {{-- root-path="Men > Tops" --}}
+    show-more
+>
+    <template v-slot="{ items, refine, createURL }">
+        {{-- See the HierarchicalMenuList.vue --}}
+        <recursion :data="items" v-slot="{ data, component }">
+            <ul>
+                <li v-for="item in data" :key="item.value">
+                    <a
+                        :href="createURL(item.value)"
+                        :class="{ 'font-bold': item.isRefined }"
+                        v-on:click.exact.left.prevent="refine(item.value)"
+                    >
+                        @{{ item.label }}
+                        (@{{ item.count }})
+                    </a>
+                    {{--
+                    TODO: Double check this, the data updates,
+                    but the component doesn't. Tried to
+                    make everything working recursive
+                    plus keep it renderless.
+                    --}}
+                    {{-- @{{item.data}} --}}
+                    <component :data="item.data" :is="component" />
+                </li>
+            </ul>
+        </recursion>
+    </template>
+</ais-hierarchical-menu>
+
+{{--
 <reactive-component
     component-id="category"
     :default-query="() => ({ aggs: {
         categories: { terms: { field: 'categories.keyword' } },
         category_paths: { terms: { field: 'category_paths.keyword' } }
     }})"
-    :react="{and: reactiveFilters.filter(item => item != 'category') }"
     u-r-l-params
 >
     <div slot-scope="{ aggregations, setQuery, value }">
@@ -29,3 +66,4 @@
         </category-filter>
     </div>
 </reactive-component>
+ --}}
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 6b3196ba3..3a65d4ef1 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -1,15 +1,38 @@
-<div v-if="filter.input == 'price'" class="relative pb-4">
-    <x-rapidez::filter.heading>
-        <dynamic-range-slider
-            :component-id="filter.code"
-            :data-field="filter.code"
-            :react="{and: ['query-filter']}"
-            :slider-options="{ dragOnClick: true, useKeyboard: false }"
-            :inner-class="{
-                slider: '!pt-4 !mt-0 mx-2',
-            }"
-            u-r-l-params
-        >
-        </dynamic-range-slider>
-    </x-rapidez::filter.heading>
-</div>
+<ais-range-input
+    v-if="filter.input == 'price'"
+    :attribute="filter.code"
+>
+    <template v-slot="{ currentRefinement, range, canRefine, refine, sendEvent }">
+        <x-rapidez::filter.heading>
+            {{-- TODO: This should become a slider --}}
+            <div class="flex">
+                <input
+                    class="w-1/2"
+                    type="number"
+                    :min="range.min"
+                    :max="range.max"
+                    :placeholder="range.min"
+                    :disabled="!canRefine"
+                    :value="currentRefinement.min"
+                    v-on:input="refine({
+                      min: $event.currentTarget.value,
+                      max: currentRefinement.max,
+                    })"
+                />
+                <input
+                    class="w-1/2"
+                    type="number"
+                    :min="range.min"
+                    :max="range.max"
+                    :placeholder="range.max"
+                    :disabled="!canRefine"
+                    :value="currentRefinement.max"
+                    v-on:input="refine({
+                      min: currentRefinement.min,
+                      max: $event.currentTarget.value,
+                    })"
+                />
+            </div>
+        </x-rapidez::filter.heading>
+    </template>
+</ais-range-input>
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
new file mode 100644
index 000000000..6f44948ef
--- /dev/null
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -0,0 +1,14 @@
+<ais-search-box>
+    <template v-slot="{ currentRefinement, isSearchStalled, refine }">
+        <x-rapidez::input
+            type="search"
+            v-bind:value="currentRefinement"
+            v-on:input="refine($event.currentTarget.value)"
+            :placeholder="__('Search within the results')"
+        />
+        {{--
+        TODO: Maybe use this for a loading icon with the input?
+        <span :hidden="!isSearchStalled">Loading...</span>
+        --}}
+    </template>
+</ais-search-box>
diff --git a/resources/views/listing/partials/filter/select.blade.php b/resources/views/listing/partials/filter/select.blade.php
index 9de23a54d..9eef84ec8 100644
--- a/resources/views/listing/partials/filter/select.blade.php
+++ b/resources/views/listing/partials/filter/select.blade.php
@@ -5,6 +5,11 @@
     show-more
 >
     <template v-slot="{ items, refine, isShowingMore, toggleShowMore, canToggleShowMore }">
+        {{--
+        TODO: Why do we need this pb-4 in here?
+        We also have padding in the heading?
+        Maybe handle that in 1 place?
+        --}}
         <div v-if="items.length" class="relative pb-4">
             <x-rapidez::filter.heading>
                 <ul class="flex flex-col gap-1">
@@ -13,6 +18,11 @@
                         class="flex justify-between text-base text-muted"
                     >
                         <div class="flex">
+                            {{--
+                            TODO: Maybe we should change these checkboxes
+                            to anchors so we can use createURL(item)
+                            within a href. Maybe useful for SEO?
+                            --}}
                             <x-rapidez::input.checkbox
                                 v-bind:checked="item.isRefined"
                                 v-on:change="refine(item.value)"
diff --git a/resources/views/listing/partials/filter/selected.blade.php b/resources/views/listing/partials/filter/selected.blade.php
index e22895bcf..99f6e323f 100644
--- a/resources/views/listing/partials/filter/selected.blade.php
+++ b/resources/views/listing/partials/filter/selected.blade.php
@@ -1,3 +1,58 @@
+<ais-clear-refinements>
+    <template v-slot="{ canRefine, refine, createURL }">
+        <a
+            v-if="canRefine"
+            v-bind:href="createURL()"
+            v-on:click.prevent="refine"
+        >
+            @lang('Reset filters')
+        </a>
+
+        {{-- TODO: Without this the default renders... --}}
+        <div v-else></div>
+    </template>
+</ais-clear-refinements>
+
+<ais-current-refinements>
+    <template v-slot="{ items, createURL }">
+        <ul class="flex gap-2 flex-wrap">
+            <template v-for="item in items">
+                <li
+                    class="flex flex-wrap gap-2 relative"
+                    v-for="refinement in item.refinements"
+                    :key="[
+                      refinement.attribute,
+                      refinement.type,
+                      refinement.value,
+                      refinement.operator
+                    ].join(':')"
+                >
+                    <a
+                        :href="createURL(refinement)"
+                        v-on:click.prevent="item.refine(refinement)"
+                        class="flex justify-between items-center transition hover:opacity-80"
+                    >
+                        {{-- Why do we need an extra span here? --}}
+                        <span class="font-sans flex gap-1 p-1 items-center text-xs rounded-lg bg">
+                            {{--
+                            Having the label here is useful when filtering booleans,
+                            but the item label is currently the "code".
+                            --}}
+                            @{{ item.label }}:
+                            {{-- When the label is a boolean a yes/no would be nice --}}
+                            @{{ refinement.label }}
+                            <x-heroicon-o-x-mark class="size-3 shrink-0"/>
+                        </span>
+                    </a>
+                </li>
+            </template>
+        </ul>
+    </template>
+</ais-current-refinements>
+
+{{--
+TODO: Make sure all of this is implemented
+
 <selected-filters>
     <div
         slot-scope="{ clearValues, selectedValues, setValue, components }"
@@ -30,3 +85,4 @@
         </selected-filters-values>
     </div>
 </selected-filters>
+ --}}
diff --git a/resources/views/listing/partials/filter/swatch.blade.php b/resources/views/listing/partials/filter/swatch.blade.php
index 6d9ef8636..daaf57c2d 100644
--- a/resources/views/listing/partials/filter/swatch.blade.php
+++ b/resources/views/listing/partials/filter/swatch.blade.php
@@ -5,7 +5,6 @@
     :inner-class="{
         title: 'capitalize text-sm font-medium text',
     }"
-    :react="{and: filter.input == 'multiselect' ? reactiveFilters : reactiveFilters.filter(item => item != filter.code) }"
     :query-format="filter.input == 'multiselect' ? 'and' : 'or'"
     :show-search="false"
     :show-checkbox="false"
diff --git a/src/Commands/IndexProductsCommand.php b/src/Commands/IndexProductsCommand.php
index d33026426..b5cc122a0 100644
--- a/src/Commands/IndexProductsCommand.php
+++ b/src/Commands/IndexProductsCommand.php
@@ -128,6 +128,34 @@ public function withCategories(array $data, Collection $categories): array
             }
         }
 
+        // TODO: It would be nice to migrate to Scout,
+        // so we've to do this somewhere else.
+        // And maybe refactor it a bit.
+        foreach ($data['category_paths'] as $categoryPath) {
+            $paths = explode('/', $categoryPath);
+            $paths = array_slice($paths, array_search(config('rapidez.root_category_id'), $paths) + 1);
+
+            $categoryHierarchy = [];
+            $currentPath = '';
+
+            foreach ($paths as $categoryId) {
+                if (isset($categories[$categoryId])) {
+                    $currentPath .= ($currentPath ? ' > ' : '') . $categories[$categoryId];
+                    $categoryHierarchy[] = $currentPath;
+                }
+            }
+
+            foreach ($categoryHierarchy as $level => $category) {
+                $data['category_lvl' . ($level + 1)][] = $category;
+            }
+        }
+
+        foreach ($data as $key => &$value) {
+            if (str_starts_with($key, 'category_lvl')) {
+                $value = array_values(array_unique($value));
+            }
+        }
+
         return $data;
     }
 }

From d95aa5c4b5b33cd39fb921e2e54e4ed9cd787aba Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Wed, 22 Jan 2025 10:41:40 +0000
Subject: [PATCH 010/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 40 ++++++++++-----------
 resources/js/components/Recursion.vue       |  9 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 3d1e4f153..52b51852f 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -66,7 +66,7 @@ export default {
                             sr.body.query.bool.filter.push(this.getQuery())
                             return sr
                         })
-                    }
+                    },
                 },
             })
 
@@ -84,8 +84,7 @@ export default {
                     // Are we using this? In the autocomplete maybe?
                     // highlight_attributes: ['title'],
 
-                    search_attributes: Object.entries(config.searchable)
-                        .map(([field, weight]) => ({ field, weight })),
+                    search_attributes: Object.entries(config.searchable).map(([field, weight]) => ({ field, weight })),
 
                     // We could make the response smaller with this
                     // result_attributes: ['title', 'actors', 'poster', 'plot'],
@@ -132,19 +131,20 @@ export default {
                 { attribute: 'category_lvl1', field: 'category_lvl1.keyword', type: 'string' },
                 { attribute: 'category_lvl2', field: 'category_lvl2.keyword', type: 'string' },
                 { attribute: 'category_lvl3', field: 'category_lvl3.keyword', type: 'string' },
-            ];
-
+            ]
 
-            return this.filters.map((filter) => ({
-                attribute: filter.code,
-                field: filter.code + (['price', 'boolean'].includes(filter.input) ? '' : '.keyword'),
-                type: ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string',
-            })).push([
-                { attribute: 'category_lvl0', field: 'category_lvl0.keyword', type: 'string' },
-                { attribute: 'category_lvl1', field: 'category_lvl1.keyword', type: 'string' },
-                { attribute: 'category_lvl2', field: 'category_lvl2.keyword', type: 'string' },
-                { attribute: 'category_lvl3', field: 'category_lvl3.keyword', type: 'string' },
-            ])
+            return this.filters
+                .map((filter) => ({
+                    attribute: filter.code,
+                    field: filter.code + (['price', 'boolean'].includes(filter.input) ? '' : '.keyword'),
+                    type: ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string',
+                }))
+                .push([
+                    { attribute: 'category_lvl0', field: 'category_lvl0.keyword', type: 'string' },
+                    { attribute: 'category_lvl1', field: 'category_lvl1.keyword', type: 'string' },
+                    { attribute: 'category_lvl2', field: 'category_lvl2.keyword', type: 'string' },
+                    { attribute: 'category_lvl3', field: 'category_lvl3.keyword', type: 'string' },
+                ])
             // TODO: Double check this and how it's used.
             // .concat(this.additionalFilters)
         },
@@ -213,13 +213,13 @@ export default {
 
             return {
                 // query: {
-                    function_score: {
-                        script_score: {
-                            script: {
-                                source: `Integer.parseInt(doc['positions.${window.config.category.entity_id}'].empty ? '0' : doc['positions.${window.config.category.entity_id}'].value)`,
-                            },
+                function_score: {
+                    script_score: {
+                        script: {
+                            source: `Integer.parseInt(doc['positions.${window.config.category.entity_id}'].empty ? '0' : doc['positions.${window.config.category.entity_id}'].value)`,
                         },
                     },
+                },
                 // },
             }
         },
diff --git a/resources/js/components/Recursion.vue b/resources/js/components/Recursion.vue
index 3b849e5d3..0eb4498f4 100644
--- a/resources/js/components/Recursion.vue
+++ b/resources/js/components/Recursion.vue
@@ -1,9 +1,6 @@
 <template>
     <div>
-        <slot
-            :data="data"
-            :component="childComponent"
-        />
+        <slot :data="data" :component="childComponent" />
     </div>
 </template>
 
@@ -24,8 +21,8 @@ export default {
                             data: this.data,
                         },
                     }),
-            };
+            }
         },
     },
-};
+}
 </script>

From bce2dc8850d1dee9dcccee9812949f0abba7cfce Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 22 Jan 2025 14:37:14 +0100
Subject: [PATCH 011/244] Sorting options

---
 resources/js/components/Listing/Listing.vue   | 77 ++++++++-----------
 resources/views/components/listing.blade.php  | 23 ++----
 .../partials/toolbar/sorting.blade.php        | 10 +--
 src/Http/ViewComposers/ConfigComposer.php     |  2 +-
 src/Rapidez.php                               |  5 ++
 5 files changed, 45 insertions(+), 72 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 52b51852f..8c01204c0 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -15,6 +15,7 @@ import useAttributes from '../../stores/useAttributes.js'
 
 export default {
     props: {
+        // TODO: Do we still use/need this?
         additionalFilters: {
             type: Array,
             default: () => [],
@@ -28,9 +29,6 @@ export default {
     data: () => ({
         loaded: false,
         attributes: useAttributes(),
-        pageSize:
-            (Turbo?.navigator?.location?.searchParams || new URLSearchParams(window.location.search)).get('pageSize') ||
-            config.grid_per_page,
 
         // TODO: We need some finetuning here; the url isn't very clean.
         // Also after a refresh the filters aren't selected.
@@ -64,6 +62,8 @@ export default {
                             // if we want to add something to the
                             // "must" instead of "filter"?
                             sr.body.query.bool.filter.push(this.getQuery())
+                            // And, this is currently applied on all queries,
+                            // it's only relevant on the listing one.
                             return sr
                         })
                     },
@@ -96,20 +96,17 @@ export default {
                         { attribute: 'visibility', field: 'visibility', type: 'numeric' },
                     ],
 
-                    sorting: {
-                        default: {
-                            field: '_score',
-                            order: 'desc',
-                        },
-                        _rated_desc: {
-                            field: 'rated',
-                            order: 'desc',
-                        },
-                    },
+                    sorting: this.sortOptions.reduce((acc, item) => {
+                        acc[item.key] = {
+                            field: item.field,
+                            order: item.order
+                        };
+                        return acc;
+                    }),
                 },
             })
 
-            // console.log(this.facets)
+            // console.log(this.sortOptions)
 
             return searchkit
         },
@@ -159,37 +156,33 @@ export default {
                     return {
                         label: pages,
                         value: pages,
-                        default: index === 0,
+                        default: pages == config.grid_per_page,
                     }
                 })
                 .concat({ label: this.$root.config.translations.all, value: 10000 })
         },
 
         sortOptions: function () {
-            return [
-                {
-                    label: window.config.translations.relevance,
-                    dataField: '_score',
-                    sortBy: 'desc',
-                },
-            ]
-                .concat(
-                    this.sortings.flatMap(function (sorting) {
-                        return [
-                            ['asc', window.config.translations.asc],
-                            ['desc', window.config.translations.desc],
-                        ].map(function ([directionKey, directionLabel]) {
-                            return {
-                                label:
-                                    window.config.translations.sorting?.[sorting.code]?.[directionKey] ??
-                                    sorting.name + ' ' + directionLabel,
-                                dataField: sorting.code + (sorting.code != 'price' ? '.keyword' : ''),
-                                sortBy: directionKey,
-                            }
-                        })
-                    }),
-                )
-                .concat(this.additionalSorting)
+            return [{
+                label: window.config.translations.relevance,
+                field: '_score',
+                order: 'desc',
+                value: config.index,
+                key: 'default',
+            }].concat(this.sortings.flatMap(function (sorting) {
+                return [
+                    ['asc', window.config.translations.asc],
+                    ['desc', window.config.translations.desc],
+                ].map(function ([directionKey, directionLabel]) {
+                    return {
+                        label: window.config.translations.sorting?.[sorting.code]?.[directionKey] ?? sorting.name + ' ' + directionLabel,
+                        field: sorting.code + (sorting.code != 'price' ? '.keyword' : ''),
+                        order: directionKey,
+                        value: [config.index, sorting.code, directionKey].join('_'),
+                        key: '_'+[sorting.code, directionKey].join('_')
+                    }
+                })
+            })).concat(this.additionalSorting)
         },
     },
 
@@ -197,12 +190,6 @@ export default {
         attributes: function (value) {
             this.loaded = Object.keys(value).length > 0
         },
-
-        pageSize: function (pageSize) {
-            let url = new URL(window.location)
-            url.searchParams.set('pageSize', pageSize)
-            window.history.pushState(window.history.state, '', url)
-        },
     },
 
     methods: {
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 8a514a715..879585431 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -10,34 +10,23 @@
 
 <div class="min-h-screen">
     <listing
-        :additional-filters="{!! isset($query) ? "['query-filter', 'category', 'score-position']" : "['category', 'score-position']" !!}"
         :additional-sorting="[{
             label: window.config.translations.newest,
-            dataField: 'created_at',
-            sortBy: 'desc'
+            field: 'created_at',
+            order: 'desc',
+            value: config.index+'_created_at_desc',
+            key: '_created_at_desc'
         }]"
         v-cloak
     >
         <div slot-scope="{ loaded, filters, sortOptions, getQuery, _renderProxy: listingSlotProps }">
-            {{-- TODO: Implement $query and make sure the default product in category position is applied --}}
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
-                :index-name="config.es_prefix + '_products_' + config.store"
+                :index-name="config.index"
                 :routing="listingSlotProps.routing"
             >
-                {{-- :size="isNaN(parseInt(listingSlotProps.pageSize)) ? 10000 : parseInt(listingSlotProps.pageSize)" --}}
-                <ais-configure
-                    :filters="{{ $query }}"
-                    {{-- :query="getQuery" --}}
-                    {{-- :custom-query="function () {return {query: {{ $query }} } }" --}}
-                />
-
-                {{-- <reactive-component
-                    component-id="score-position"
-                    :custom-query="getQuery"
-                    :show-filter="false"
-                ></reactive-component> --}}
+                <ais-configure :filters="{{ $query }}"/>
 
                 {{ $before ?? '' }}
                 @if ($slot->isEmpty())
diff --git a/resources/views/listing/partials/toolbar/sorting.blade.php b/resources/views/listing/partials/toolbar/sorting.blade.php
index 451085b11..3707877f9 100644
--- a/resources/views/listing/partials/toolbar/sorting.blade.php
+++ b/resources/views/listing/partials/toolbar/sorting.blade.php
@@ -1,12 +1,4 @@
-{{--
-TODO: The "sortOptions" computed prop should be used,
-but the value is the index instead of an attribute.
---}}
-<ais-sort-by :items="[
-    { value: 'instant_search', label: 'Featured' },
-    { value: 'instant_search_price_asc', label: 'Price asc' },
-    { value: 'instant_search_price_desc', label: 'Price desc' },
-]">
+<ais-sort-by :items="sortOptions">
     <template v-slot="{ items, currentRefinement, refine }">
         <x-rapidez::input.select
             v-bind:value="items.find(item => item.value === currentRefinement)?.value"
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 65eb9df71..5abbb2086 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -16,7 +16,7 @@ public function compose(View $view)
     {
         $exposedFrontendConfigValues = Arr::only(
             array_merge_recursive(config('rapidez'), config('rapidez.frontend')),
-            array_merge(config('rapidez.frontend.exposed'), ['store_code'])
+            array_merge(config('rapidez.frontend.exposed'), ['store_code', 'index'])
         );
 
         Config::set('frontend', array_merge(
diff --git a/src/Rapidez.php b/src/Rapidez.php
index e2c17c2fd..9431dac46 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -129,6 +129,11 @@ public function setStore(Store|array|callable|int|string $store): void
         config()->set('rapidez.group', $store['group_id']);
         config()->set('rapidez.root_category_id', $store['root_category_id']);
         config()->set('frontend.base_url', url('/'));
+        config()->set('rapidez.index', implode('_', array_values([
+            config('rapidez.es_prefix'),
+            'products',
+            $store['store_id'],
+        ])));
 
         if (config()->get('rapidez.magento_url_from_db', false)) {
             $magentoUrl = trim(

From 9fdcf997f337205bd38d684594a68fb648231424 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:49:13 +0000
Subject: [PATCH 012/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 54 ++++++++++++---------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 8c01204c0..1b7d93a29 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -99,9 +99,9 @@ export default {
                     sorting: this.sortOptions.reduce((acc, item) => {
                         acc[item.key] = {
                             field: item.field,
-                            order: item.order
-                        };
-                        return acc;
+                            order: item.order,
+                        }
+                        return acc
                     }),
                 },
             })
@@ -163,26 +163,34 @@ export default {
         },
 
         sortOptions: function () {
-            return [{
-                label: window.config.translations.relevance,
-                field: '_score',
-                order: 'desc',
-                value: config.index,
-                key: 'default',
-            }].concat(this.sortings.flatMap(function (sorting) {
-                return [
-                    ['asc', window.config.translations.asc],
-                    ['desc', window.config.translations.desc],
-                ].map(function ([directionKey, directionLabel]) {
-                    return {
-                        label: window.config.translations.sorting?.[sorting.code]?.[directionKey] ?? sorting.name + ' ' + directionLabel,
-                        field: sorting.code + (sorting.code != 'price' ? '.keyword' : ''),
-                        order: directionKey,
-                        value: [config.index, sorting.code, directionKey].join('_'),
-                        key: '_'+[sorting.code, directionKey].join('_')
-                    }
-                })
-            })).concat(this.additionalSorting)
+            return [
+                {
+                    label: window.config.translations.relevance,
+                    field: '_score',
+                    order: 'desc',
+                    value: config.index,
+                    key: 'default',
+                },
+            ]
+                .concat(
+                    this.sortings.flatMap(function (sorting) {
+                        return [
+                            ['asc', window.config.translations.asc],
+                            ['desc', window.config.translations.desc],
+                        ].map(function ([directionKey, directionLabel]) {
+                            return {
+                                label:
+                                    window.config.translations.sorting?.[sorting.code]?.[directionKey] ??
+                                    sorting.name + ' ' + directionLabel,
+                                field: sorting.code + (sorting.code != 'price' ? '.keyword' : ''),
+                                order: directionKey,
+                                value: [config.index, sorting.code, directionKey].join('_'),
+                                key: '_' + [sorting.code, directionKey].join('_'),
+                            }
+                        })
+                    }),
+                )
+                .concat(this.additionalSorting)
         },
     },
 

From e5151dc51db0fa6e24f8a8fae822a45b3c129aa9 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 22 Jan 2025 15:57:32 +0100
Subject: [PATCH 013/244] Comments

---
 resources/css/components/autocomplete.css | 1 +
 resources/css/components/price-slider.css | 1 +
 resources/css/components/vue-slider.css   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/resources/css/components/autocomplete.css b/resources/css/components/autocomplete.css
index 1ce3ace8a..cabf520bf 100644
--- a/resources/css/components/autocomplete.css
+++ b/resources/css/components/autocomplete.css
@@ -1,3 +1,4 @@
+/*Can we remove this file?*/
 .search-input + div div[groupposition='right'] {
     @apply size-6 right-16 cursor-pointer z-50 !-translate-y-1/2 !top-1/2 !absolute;
 
diff --git a/resources/css/components/price-slider.css b/resources/css/components/price-slider.css
index 1452735bc..4c0c37d56 100644
--- a/resources/css/components/price-slider.css
+++ b/resources/css/components/price-slider.css
@@ -1,3 +1,4 @@
+/*Can we remove this file?*/
 div.vue-slider {
     @apply mt-5 mb-3.5 max-w-sm;
 }
diff --git a/resources/css/components/vue-slider.css b/resources/css/components/vue-slider.css
index 53a7b0acd..046893fd9 100644
--- a/resources/css/components/vue-slider.css
+++ b/resources/css/components/vue-slider.css
@@ -1,3 +1,4 @@
+/*Can we remove this file?*/
 .vue-slider {
     @apply mx-2;
 }

From 81a4d4bf56086b28e4a383ce86f4c8efb4ecbc00 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 22 Jan 2025 16:15:57 +0100
Subject: [PATCH 014/244] Cleanup

---
 resources/js/components/Listing/Listing.vue | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 1b7d93a29..61e3e1e9e 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -129,19 +129,6 @@ export default {
                 { attribute: 'category_lvl2', field: 'category_lvl2.keyword', type: 'string' },
                 { attribute: 'category_lvl3', field: 'category_lvl3.keyword', type: 'string' },
             ]
-
-            return this.filters
-                .map((filter) => ({
-                    attribute: filter.code,
-                    field: filter.code + (['price', 'boolean'].includes(filter.input) ? '' : '.keyword'),
-                    type: ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string',
-                }))
-                .push([
-                    { attribute: 'category_lvl0', field: 'category_lvl0.keyword', type: 'string' },
-                    { attribute: 'category_lvl1', field: 'category_lvl1.keyword', type: 'string' },
-                    { attribute: 'category_lvl2', field: 'category_lvl2.keyword', type: 'string' },
-                    { attribute: 'category_lvl3', field: 'category_lvl3.keyword', type: 'string' },
-                ])
             // TODO: Double check this and how it's used.
             // .concat(this.additionalFilters)
         },

From 977a9f0b5e49ca4cb33dbed759fc076bb655e5ef Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Thu, 23 Jan 2025 08:53:35 +0100
Subject: [PATCH 015/244] Autocomplete init

---
 package.json                                  |  1 +
 .../js/components/Search/Autocomplete.vue     |  7 +---
 .../partials/header/autocomplete.blade.php    | 11 ++++-
 yarn.lock                                     | 42 ++++++++++++++++++-
 4 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 292b6c0b9..bf947c279 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
         "prod": "vite build"
     },
     "devDependencies": {
+        "@algolia/autocomplete-js": "^1.17.9",
         "@babel/core": "^7.23.9",
         "@hotwired/turbo": "^8.0.2",
         "@searchkit/instantsearch-client": "^4.14.1",
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 5a8474d23..43f9b6c2d 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,9 +1,6 @@
 <script>
-// import { ReactiveBase, DataSearch } from '@appbaseio/reactivesearch-vue'
-// import { useDebounceFn } from '@vueuse/core'
-
-// Vue.use(ReactiveBase)
-// Vue.use(DataSearch)
+import client from '@searchkit/instantsearch-client'
+import { getAlgoliaResults } from '@algolia/autocomplete-js'
 
 export default {
     props: {
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 732973d2e..5a44171df 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,3 +1,10 @@
+<autocomplete>
+
+</autocomplete>
+
+
+@return
+
 @php $inputClasses = 'relative z-header-autocomplete border !font-sans !border-default !text-sm !min-h-0 outline-0 ring-0 !h-auto rounded-xl !pl-5 !pr-24 !py-3.5 !bg-white w-full focus:ring-transparent search-input' @endphp
 
 <div v-if="!$root.loadAutocomplete" class="relative w-full">
@@ -20,7 +27,7 @@ class="{{ $inputClasses }}"
     class="relative w-full"
     v-cloak
 >
-    <x-rapidez::reactive-base slot-scope="autocompleteScope">
+    {{-- <x-rapidez::reactive-base slot-scope="autocompleteScope"> --}}
         <div
             class="z-header-autocomplete-overlay pointer-events-none fixed inset-0 cursor-pointer bg-black/40 opacity-0 transition duration-500"
             :class="autocompleteScope.overlay ? 'pointer-events-auto opacity-100 prevent-scroll' : 'opacity-0 pointer-events-none '"
@@ -70,5 +77,5 @@ class="z-header-autocomplete absolute -inset-x-5 top-14 overflow-x-hidden overfl
                 </div>
             </div>
         </data-search>
-    </x-rapidez::reactive-base>
+    {{-- </x-rapidez::reactive-base> --}}
 </autocomplete>
diff --git a/yarn.lock b/yarn.lock
index 76bf03607..685408b77 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,44 @@
 # yarn lockfile v1
 
 
+"@algolia/autocomplete-core@1.17.9":
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.17.9.tgz#83374c47dc72482aa45d6b953e89377047f0dcdc"
+  integrity sha512-O7BxrpLDPJWWHv/DLA9DRFWs+iY1uOJZkqUwjS5HSZAGcl0hIVCQ97LTLewiZmZ402JYUrun+8NqFP+hCknlbQ==
+  dependencies:
+    "@algolia/autocomplete-plugin-algolia-insights" "1.17.9"
+    "@algolia/autocomplete-shared" "1.17.9"
+
+"@algolia/autocomplete-js@^1.17.9":
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-js/-/autocomplete-js-1.17.9.tgz#2f7e5599fdfe7d6c44b82ac5b64662b487615465"
+  integrity sha512-51xmsIfApj8LEceArnLe3UfS8HSgJJa70FUEYpnLryO6+KZL0pDPQHw1uVw6e5yJiKN0KelDmk2Sa2uJ+gVKJw==
+  dependencies:
+    "@algolia/autocomplete-core" "1.17.9"
+    "@algolia/autocomplete-preset-algolia" "1.17.9"
+    "@algolia/autocomplete-shared" "1.17.9"
+    htm "^3.1.1"
+    preact "^10.13.2"
+
+"@algolia/autocomplete-plugin-algolia-insights@1.17.9":
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.9.tgz#74c86024d09d09e8bfa3dd90b844b77d9f9947b6"
+  integrity sha512-u1fEHkCbWF92DBeB/KHeMacsjsoI0wFhjZtlCq2ddZbAehshbZST6Hs0Avkc0s+4UyBGbMDnSuXHLuvRWK5iDQ==
+  dependencies:
+    "@algolia/autocomplete-shared" "1.17.9"
+
+"@algolia/autocomplete-preset-algolia@1.17.9":
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.9.tgz#911f3250544eb8ea4096fcfb268f156b085321b5"
+  integrity sha512-Na1OuceSJeg8j7ZWn5ssMu/Ax3amtOwk76u4h5J4eK2Nx2KB5qt0Z4cOapCsxot9VcEN11ADV5aUSlQF4RhGjQ==
+  dependencies:
+    "@algolia/autocomplete-shared" "1.17.9"
+
+"@algolia/autocomplete-shared@1.17.9":
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.9.tgz#5f38868f7cb1d54b014b17a10fc4f7e79d427fa8"
+  integrity sha512-iDf05JDQ7I0b7JEA/9IektxN/80a2MZ1ToohfmNS3rfeuQnIKI3IJlIafD0xu4StbtQTghx9T3Maa97ytkXenQ==
+
 "@algolia/events@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950"
@@ -1016,7 +1054,7 @@ hogan.js@^3.0.2:
     mkdirp "0.3.0"
     nopt "1.0.10"
 
-htm@^3.0.0:
+htm@^3.0.0, htm@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/htm/-/htm-3.1.1.tgz#49266582be0dc66ed2235d5ea892307cc0c24b78"
   integrity sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ==
@@ -1407,7 +1445,7 @@ postcss@^8.4.23, postcss@^8.4.29, postcss@^8.4.43:
     picocolors "^1.1.0"
     source-map-js "^1.2.1"
 
-preact@^10.10.0:
+preact@^10.10.0, preact@^10.13.2:
   version "10.25.4"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.25.4.tgz#c1d00bee9d7b9dcd06a2311d9951973b506ae8ac"
   integrity sha512-jLdZDb+Q+odkHJ+MpW/9U5cODzqnB+fy2EiHSZES7ldV5LK7yjlVzTp7R8Xy6W6y75kfK8iWYtFVH7lvjwrCMA==

From c44d50b501cfbc1718c7e55b7c451ae2ab5bb7cf Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 24 Jan 2025 09:08:49 +0000
Subject: [PATCH 016/244] Use URL helper to remove auth from url (#712)

---
 resources/js/components/Listing/Listing.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 61e3e1e9e..55ceb1197 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -76,9 +76,15 @@ export default {
         },
 
         searchkit: function () {
+            let url = new URL(config.es_url)
+
             let searchkit = new Searchkit({
                 connection: {
-                    host: config.es_url,
+                    host: url.origin,
+                    auth: {
+                        username: url.username,
+                        password: url.password,
+                    },
                 },
                 search_settings: {
                     // Are we using this? In the autocomplete maybe?

From e97ff53c3cea43e6f80c56ad10a18944a520548f Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 28 Jan 2025 07:46:25 +0000
Subject: [PATCH 017/244] Update selected refinements (#716)

---
 resources/js/components/Listing/Listing.vue   |  7 ++
 resources/views/components/listing.blade.php  |  2 +-
 .../partials/filter/selected.blade.php        | 88 ++++++-------------
 .../filter/selected/boolean.blade.php         |  4 +
 .../partials/filter/selected/swatch.blade.php |  5 ++
 .../Product/CastMultiselectAttributes.php     | 13 ---
 6 files changed, 44 insertions(+), 75 deletions(-)
 create mode 100644 resources/views/listing/partials/filter/selected/boolean.blade.php
 create mode 100644 resources/views/listing/partials/filter/selected/swatch.blade.php

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 55ceb1197..71dbdd2c4 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -211,6 +211,13 @@ export default {
                 // },
             }
         },
+
+        withFilters(items) {
+            return items.map((item) => ({
+                filter: this.filters.find((filter) => filter.code === item.attribute),
+                ...item,
+            }))
+        },
     },
 }
 </script>
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 879585431..7a2a4c273 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -19,7 +19,7 @@
         }]"
         v-cloak
     >
-        <div slot-scope="{ loaded, filters, sortOptions, getQuery, _renderProxy: listingSlotProps }">
+        <div slot-scope="{ loaded, filters, sortOptions, getQuery, withFilters, _renderProxy: listingSlotProps }">
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
diff --git a/resources/views/listing/partials/filter/selected.blade.php b/resources/views/listing/partials/filter/selected.blade.php
index 99f6e323f..08ab909f4 100644
--- a/resources/views/listing/partials/filter/selected.blade.php
+++ b/resources/views/listing/partials/filter/selected.blade.php
@@ -1,22 +1,24 @@
 <ais-clear-refinements>
     <template v-slot="{ canRefine, refine, createURL }">
-        <a
-            v-if="canRefine"
-            v-bind:href="createURL()"
-            v-on:click.prevent="refine"
-        >
-            @lang('Reset filters')
-        </a>
-
-        {{-- TODO: Without this the default renders... --}}
-        <div v-else></div>
+        <div v-show="canRefine" class="flex flex-wrap items-baseline justify-between gap-2 w-full pb-2">
+            <div class="font-semibold text-base">
+                @lang('Selected filters'):
+            </div>
+            <a
+                v-bind:href="createURL()"
+                v-on:click.prevent="refine"
+                class="text-sm text-muted transition-all hover:underline"
+            >
+                @lang('Reset filters')
+            </a>
+        </div>
     </template>
 </ais-clear-refinements>
 
 <ais-current-refinements>
     <template v-slot="{ items, createURL }">
-        <ul class="flex gap-2 flex-wrap">
-            <template v-for="item in items">
+        <ul class="flex gap-2 flex-wrap pb-2">
+            <template v-for="item in withFilters(items)">
                 <li
                     class="flex flex-wrap gap-2 relative"
                     v-for="refinement in item.refinements"
@@ -28,61 +30,25 @@ class="flex flex-wrap gap-2 relative"
                     ].join(':')"
                 >
                     <a
-                        :href="createURL(refinement)"
+                        v-bind:href="createURL(refinement)"
                         v-on:click.prevent="item.refine(refinement)"
-                        class="flex justify-between items-center transition hover:opacity-80"
+                        class="flex items-center gap-1 p-1 text-xs rounded-lg bg transition hover:opacity-80"
                     >
-                        {{-- Why do we need an extra span here? --}}
-                        <span class="font-sans flex gap-1 p-1 items-center text-xs rounded-lg bg">
-                            {{--
-                            Having the label here is useful when filtering booleans,
-                            but the item label is currently the "code".
-                            --}}
-                            @{{ item.label }}:
-                            {{-- When the label is a boolean a yes/no would be nice --}}
+                        @{{ item.filter.name }}:
+                        <template v-if="false"></template>
+                        @include('rapidez::listing.partials.filter.selected.boolean')
+                        @include('rapidez::listing.partials.filter.selected.swatch')
+                        <template v-else>
                             @{{ refinement.label }}
-                            <x-heroicon-o-x-mark class="size-3 shrink-0"/>
-                        </span>
+                        </template>
+                        {{--
+                            TODO: Check how we will display swatches here.
+                            Just the label or show an actual swatch?
+                        --}}
+                        <x-heroicon-o-x-mark class="size-3 shrink-0"/>
                     </a>
                 </li>
             </template>
         </ul>
     </template>
 </ais-current-refinements>
-
-{{--
-TODO: Make sure all of this is implemented
-
-<selected-filters>
-    <div
-        slot-scope="{ clearValues, selectedValues, setValue, components }"
-        v-if="Object.keys(selectedValues).filter(function (id) {
-            let value = selectedValues[id].value
-            let isArray = Array.isArray(value)
-            return components.includes(id) && selectedValues[id].showFilter && ((isArray && value.length) || (!isArray && value))}).length"
-    >
-        <selected-filters-values :selected-values="selectedValues">
-            <div slot-scope="{ activeFilters }" class="flex flex-wrap items-center w-full md:w-auto relative mb-5">
-                <div class="flex flex-wrap items-baseline justify-between gap-2 w-full border-t py-4">
-                    <div class="font-semibold text-base font-sans">
-                        @lang('You have filtered for:')
-                    </div>
-                    <button v-on:click="clearValues" class="!font-sans text-sm text-muted transition-all hover:underline">
-                        @lang('Reset filters')
-                    </button>
-                </div>
-                <div class="flex gap-2 flex-wrap">
-                    <div class="flex flex-wrap gap-2 relative cursor-pointer" v-for="filter in activeFilters">
-                        <div v-on:click="setValue(filter.code, null)" class="flex justify-between items-center transition hover:opacity-80">
-                            <span class="font-sans flex gap-1 p-1 items-center text-xs rounded-lg bg">
-                                @{{ filter.value }}
-                                <x-heroicon-o-x-mark class="size-3 shrink-0"/>
-                            </span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </selected-filters-values>
-    </div>
-</selected-filters>
- --}}
diff --git a/resources/views/listing/partials/filter/selected/boolean.blade.php b/resources/views/listing/partials/filter/selected/boolean.blade.php
new file mode 100644
index 000000000..d82230e56
--- /dev/null
+++ b/resources/views/listing/partials/filter/selected/boolean.blade.php
@@ -0,0 +1,4 @@
+<template v-else-if="item.filter.input === 'boolean'">
+    <template v-if="refinement.label == '1'">@lang('Yes')</template>
+    <template v-if="refinement.label == '0'">@lang('No')</template>
+</template>
diff --git a/resources/views/listing/partials/filter/selected/swatch.blade.php b/resources/views/listing/partials/filter/selected/swatch.blade.php
new file mode 100644
index 000000000..d5d72bc0b
--- /dev/null
+++ b/resources/views/listing/partials/filter/selected/swatch.blade.php
@@ -0,0 +1,5 @@
+{{-- TODO: Display swatches correctly here --}}
+
+<template v-else-if="item.filter.input === 'swatch'">
+    @{{ refinement.label }}
+</template>
diff --git a/src/Models/Traits/Product/CastMultiselectAttributes.php b/src/Models/Traits/Product/CastMultiselectAttributes.php
index 3f7aed633..cee2604d1 100644
--- a/src/Models/Traits/Product/CastMultiselectAttributes.php
+++ b/src/Models/Traits/Product/CastMultiselectAttributes.php
@@ -18,19 +18,6 @@ protected function getMultiselectAttributeCasts(): array
             $casts[$multiselectAttribute] = Multiselect::class;
         }
 
-        // TODO: If this needs to stay we've to rename the trait and method.
-        // Double check if this doesn't effect anything on the frontend!
-        // But see the TODO in the boolean.blade.php about the state
-        // which is acting weird. When that's working we maybe
-        // don't even need this, just check for 1 and 0.
-        $booleanAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['input'] == 'boolean';
-        }), 'code');
-
-        foreach ($booleanAttributes as $booleanAttribute) {
-            $casts[$booleanAttribute] = 'boolean';
-        }
-
         return $casts ?? [];
     }
 }

From 68526a03b7b05da914100fad3487026d1b11e5cd Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 29 Jan 2025 14:43:02 +0000
Subject: [PATCH 018/244] Range slider (#713)

---
 .../js/components/Elements/RangeSlider.vue    | 85 +++++++++++++++++++
 resources/js/vue-components.js                |  1 +
 .../components/input/range-slider.blade.php   | 36 ++++++++
 .../listing/partials/filter/price.blade.php   | 58 +++++++------
 4 files changed, 152 insertions(+), 28 deletions(-)
 create mode 100644 resources/js/components/Elements/RangeSlider.vue
 create mode 100644 resources/views/components/input/range-slider.blade.php

diff --git a/resources/js/components/Elements/RangeSlider.vue b/resources/js/components/Elements/RangeSlider.vue
new file mode 100644
index 000000000..a2f3a8d7c
--- /dev/null
+++ b/resources/js/components/Elements/RangeSlider.vue
@@ -0,0 +1,85 @@
+<script>
+export default {
+    props: {
+        range: {
+            type: Object,
+            default: () => ({ min: 0, max: 100 }),
+        },
+        current: {
+            type: Object,
+            default: () => ({ min: undefined, max: undefined }),
+        },
+    },
+
+    render() {
+        return this.$scopedSlots.default(this)
+    },
+
+    data() {
+        return {
+            minValue: null,
+            maxValue: null,
+        }
+    },
+
+    watch: {
+        minValue() {
+            if (this.minValue >= this.maxValue) {
+                this.minValue = this.maxValue - 1
+            }
+        },
+
+        maxValue() {
+            if (this.maxValue <= this.minValue) {
+                this.maxValue = this.minValue + 1
+            }
+        },
+
+        range() {
+            if (this.range.min == this.range.max && this.range.min == 0) {
+                return
+            }
+
+            if (this.minValue === null && this.maxValue === null) {
+                this.updateFromProps()
+            }
+        },
+
+        current() {
+            this.updateFromProps()
+        },
+    },
+
+    mounted() {
+        this.updateFromProps()
+    },
+
+    methods: {
+        updateFromProps() {
+            this.minValue = this.current.min ?? this.range.min
+            this.maxValue = this.current.max ?? this.range.max
+        },
+
+        percentage(amount) {
+            return ((amount - this.range.min) / (this.range.max - this.range.min)) * 100
+        },
+
+        updateRefinement() {
+            this.$emit('change', {
+                min: this.minValue,
+                max: this.maxValue,
+            })
+        },
+    },
+
+    computed: {
+        minThumb() {
+            return Math.max(this.percentage(this.minValue), 0)
+        },
+
+        maxThumb() {
+            return Math.max(100 - this.percentage(this.maxValue), 0)
+        },
+    },
+}
+</script>
diff --git a/resources/js/vue-components.js b/resources/js/vue-components.js
index fec46eb63..e4000cd08 100644
--- a/resources/js/vue-components.js
+++ b/resources/js/vue-components.js
@@ -38,3 +38,4 @@ Vue.component('listing', () => import('./components/Listing/Listing.vue'))
 Vue.component('checkout-success', () => import('./components/Checkout/CheckoutSuccess.vue'))
 Vue.component('popup', () => import('./components/Popup.vue'))
 Vue.component('selected-filters-values', () => import('./components/Listing/Filters/SelectedFiltersValues.vue'))
+Vue.component('range-slider', () => import('./components/Elements/RangeSlider.vue'))
diff --git a/resources/views/components/input/range-slider.blade.php b/resources/views/components/input/range-slider.blade.php
new file mode 100644
index 000000000..636a1850f
--- /dev/null
+++ b/resources/views/components/input/range-slider.blade.php
@@ -0,0 +1,36 @@
+<range-slider v-slot="rangeInputScope" {{ $attributes }}>
+    <div class="flex flex-1 relative h-16 mx-5">
+        <input
+            type="range"
+            v-bind:disabled="!canRefine"
+            v-bind:min="rangeInputScope.range.min"
+            v-bind:max="rangeInputScope.range.max"
+            v-model="rangeInputScope.minValue"
+            v-on:change="rangeInputScope.updateRefinement"
+            class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cursor-pointer [&::-moz-range-thumb]:pointer-events-auto [&::-webkit-slider-thumb]:pointer-events-auto"
+        >
+
+        <input
+            type="range"
+            v-bind:disabled="!canRefine"
+            v-bind:min="rangeInputScope.range.min"
+            v-bind:max="rangeInputScope.range.max"
+            v-model="rangeInputScope.maxValue"
+            v-on:change="rangeInputScope.updateRefinement"
+            class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cursor-pointer [&::-moz-range-thumb]:pointer-events-auto [&::-webkit-slider-thumb]:pointer-events-auto"
+        >
+
+        <div class="relative z-10 h-1 w-full mt-2 mx-2">
+            <div class="absolute z-10 inset-0 rounded-md bg-border"></div>
+            <div class="absolute z-20 inset-y-0 rounded-md bg-primary" v-bind:style="'right:'+rangeInputScope.maxThumb+'%; left:'+rangeInputScope.minThumb+'%'"></div>
+            <div class="absolute z-30 size-5 top-0 left-0 bg-white border rounded-full -mt-2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
+            <div class="absolute z-30 size-5 top-0 right-0 bg-white border rounded-full -mt-2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
+            <div class="absolute z-30 top-4 left-0 bg-white border px-2 py-0.5 rounded-full -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
+                @{{ rangeInputScope.minValue }}
+            </div>
+            <div class="absolute z-30 top-4 right-0 bg-white border px-2 py-0.5 rounded-full translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'">
+                @{{ rangeInputScope.maxValue }}
+            </div>
+        </div>
+    </div>
+</range-input>
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 3a65d4ef1..bd859a55e 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -4,34 +4,36 @@
 >
     <template v-slot="{ currentRefinement, range, canRefine, refine, sendEvent }">
         <x-rapidez::filter.heading>
-            {{-- TODO: This should become a slider --}}
-            <div class="flex">
-                <input
-                    class="w-1/2"
-                    type="number"
-                    :min="range.min"
-                    :max="range.max"
-                    :placeholder="range.min"
-                    :disabled="!canRefine"
-                    :value="currentRefinement.min"
-                    v-on:input="refine({
-                      min: $event.currentTarget.value,
-                      max: currentRefinement.max,
-                    })"
-                />
-                <input
-                    class="w-1/2"
-                    type="number"
-                    :min="range.min"
-                    :max="range.max"
-                    :placeholder="range.max"
-                    :disabled="!canRefine"
-                    :value="currentRefinement.max"
-                    v-on:input="refine({
-                      min: currentRefinement.min,
-                      max: $event.currentTarget.value,
-                    })"
-                />
+            <div class="flex flex-col">
+                <div class="flex flex-1">
+                    <x-rapidez::input.range-slider
+                        v-bind:range="range"
+                        v-bind:current="currentRefinement"
+                        v-on:change="refine"
+                    />
+                </div>
+                <div class="flex">
+                    <input
+                        class="w-1/2"
+                        type="number"
+                        :min="range.min"
+                        :max="range.max"
+                        :placeholder="range.min"
+                        :disabled="!canRefine"
+                        :value="currentRefinement.min ?? range.min"
+                        v-on:input="refine({ min: $event.currentTarget.value, max: currentRefinement.max })"
+                    />
+                    <input
+                        class="w-1/2"
+                        type="number"
+                        :min="range.min"
+                        :max="range.max"
+                        :placeholder="range.max"
+                        :disabled="!canRefine"
+                        :value="currentRefinement.max ?? range.max"
+                        v-on:input="refine({ min: currentRefinement.min, max: $event.currentTarget.value })"
+                    />
+                </div>
             </div>
         </x-rapidez::filter.heading>
     </template>

From 7762fd4e7ec75ecb3725ffaf761010e5e5bcfcf1 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 29 Jan 2025 15:24:54 +0000
Subject: [PATCH 019/244] Moved the item key (#717)

---
 resources/views/listing/partials/item.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index af5bfb5ba..1e357464f 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -1,6 +1,6 @@
-<div class="size-full">
+<div class="size-full" v-bind:key="item.entity_id">
     <add-to-cart v-bind:product="item" v-slot="addToCart" v-cloak>
-        <div class="group relative flex flex-1 flex-col rounded border bg-white p-5" :key="item.entity_id">
+        <div class="group relative flex flex-1 flex-col rounded border bg-white p-5">
             @if (App::providerIsLoaded('Rapidez\Wishlist\WishlistServiceProvider'))
                 <div class="group absolute right-0 top-0 z-10 p-2">
                     @include('rapidez::wishlist.button')

From d9f2499558adf5e7115e6e3a7b26dcce3ccb9df1 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 31 Jan 2025 08:32:31 +0000
Subject: [PATCH 020/244] Swatch filter (#718)

---
 resources/js/components/Listing/Listing.vue   | 32 +++++++-
 resources/views/components/listing.blade.php  |  2 +-
 resources/views/listing/filters.blade.php     |  2 +-
 .../listing/partials/filter/select.blade.php  |  2 +-
 .../partials/filter/selected.blade.php        |  6 +-
 .../partials/filter/selected/swatch.blade.php |  4 +-
 .../listing/partials/filter/swatch.blade.php  | 78 ++++++++++---------
 7 files changed, 78 insertions(+), 48 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 71dbdd2c4..013ca233b 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -120,6 +120,7 @@ export default {
         filters: function () {
             return Object.values(this.attributes)
                 .filter((attribute) => attribute.filter)
+                .map((filter) => ({ ...filter, code: this.filterPrefix(filter) + filter.code, base_code: filter.code }))
                 .sort((a, b) => a.position - b.position)
         },
 
@@ -127,8 +128,8 @@ export default {
             return [
                 ...this.filters.map((filter) => ({
                     attribute: filter.code,
-                    field: filter.code + (['price', 'boolean'].includes(filter.input) ? '' : '.keyword'),
-                    type: ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string',
+                    field: filter.code + (this.filterType(filter) == 'string' ? '.keyword' : ''),
+                    type: this.filterType(filter),
                 })),
                 { attribute: 'category_lvl0', field: 'category_lvl0.keyword', type: 'string' },
                 { attribute: 'category_lvl1', field: 'category_lvl1.keyword', type: 'string' },
@@ -194,6 +195,26 @@ export default {
     },
 
     methods: {
+        filterType(filter) {
+            if (filter.super) {
+                return 'numeric'
+            }
+
+            return ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string'
+        },
+
+        filterPrefix(filter) {
+            if (filter.super) {
+                return 'super_'
+            }
+
+            if (filter.visual_swatch) {
+                return 'visual_'
+            }
+
+            return ''
+        },
+
         getQuery() {
             if (!window.config.category?.entity_id) {
                 return
@@ -218,6 +239,13 @@ export default {
                 ...item,
             }))
         },
+
+        withSwatches(items, filter) {
+            return items.map((item) => ({
+                swatch: this.$root.swatches[filter.base_code]?.options?.[item.value] ?? null,
+                ...item,
+            }))
+        },
     },
 }
 </script>
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 7a2a4c273..0392fd309 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -19,7 +19,7 @@
         }]"
         v-cloak
     >
-        <div slot-scope="{ loaded, filters, sortOptions, getQuery, withFilters, _renderProxy: listingSlotProps }">
+        <div slot-scope="{ loaded, filters, sortOptions, getQuery, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index 96a3ea64f..cdb41fc5f 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -8,7 +8,7 @@
             @include('rapidez::listing.partials.filter.category')
             <template v-for="filter in filters">
                 @include('rapidez::listing.partials.filter.price')
-                {{-- @include('rapidez::listing.partials.filter.swatch') --}}
+                @include('rapidez::listing.partials.filter.swatch')
                 @include('rapidez::listing.partials.filter.boolean')
                 @include('rapidez::listing.partials.filter.select')
             </template>
diff --git a/resources/views/listing/partials/filter/select.blade.php b/resources/views/listing/partials/filter/select.blade.php
index 9eef84ec8..7cb9db8f5 100644
--- a/resources/views/listing/partials/filter/select.blade.php
+++ b/resources/views/listing/partials/filter/select.blade.php
@@ -1,5 +1,5 @@
 <ais-refinement-list
-    v-if="['select', 'multiselect'].includes(filter.input)"
+    v-if="['select', 'multiselect'].includes(filter.input) && !(filter.text_swatch || filter.visual_swatch)"
     :operator="filter.input == 'multiselect' ? 'and' : 'or'"
     :attribute="filter.code"
     show-more
diff --git a/resources/views/listing/partials/filter/selected.blade.php b/resources/views/listing/partials/filter/selected.blade.php
index 08ab909f4..cc75b9a93 100644
--- a/resources/views/listing/partials/filter/selected.blade.php
+++ b/resources/views/listing/partials/filter/selected.blade.php
@@ -21,7 +21,7 @@ class="text-sm text-muted transition-all hover:underline"
             <template v-for="item in withFilters(items)">
                 <li
                     class="flex flex-wrap gap-2 relative"
-                    v-for="refinement in item.refinements"
+                    v-for="refinement in withSwatches(item.refinements, item.filter)"
                     :key="[
                       refinement.attribute,
                       refinement.type,
@@ -41,10 +41,6 @@ class="flex items-center gap-1 p-1 text-xs rounded-lg bg transition hover:opacit
                         <template v-else>
                             @{{ refinement.label }}
                         </template>
-                        {{--
-                            TODO: Check how we will display swatches here.
-                            Just the label or show an actual swatch?
-                        --}}
                         <x-heroicon-o-x-mark class="size-3 shrink-0"/>
                     </a>
                 </li>
diff --git a/resources/views/listing/partials/filter/selected/swatch.blade.php b/resources/views/listing/partials/filter/selected/swatch.blade.php
index d5d72bc0b..a7cbc96bc 100644
--- a/resources/views/listing/partials/filter/selected/swatch.blade.php
+++ b/resources/views/listing/partials/filter/selected/swatch.blade.php
@@ -1,5 +1,5 @@
 {{-- TODO: Display swatches correctly here --}}
 
-<template v-else-if="item.filter.input === 'swatch'">
-    @{{ refinement.label }}
+<template v-else-if="item.filter.super">
+    @{{ refinement.swatch?.label ?? refinement.label }}
 </template>
diff --git a/resources/views/listing/partials/filter/swatch.blade.php b/resources/views/listing/partials/filter/swatch.blade.php
index daaf57c2d..76e414eae 100644
--- a/resources/views/listing/partials/filter/swatch.blade.php
+++ b/resources/views/listing/partials/filter/swatch.blade.php
@@ -1,37 +1,43 @@
-<multi-list
-    v-else-if="filter.text_swatch || filter.visual_swatch"
-    :component-id="filter.code"
-    :data-field="filter.super ? 'super_' + filter.code : (filter.visual_swatch ? 'visual_' + filter.code : filter.code)"
-    :inner-class="{
-        title: 'capitalize text-sm font-medium text',
-    }"
-    :query-format="filter.input == 'multiselect' ? 'and' : 'or'"
-    :show-search="false"
-    :show-checkbox="false"
-    u-r-l-params
+<ais-refinement-list
+    v-if="filter.text_swatch || filter.visual_swatch"
+    :limit="64"
+    :operator="filter.input == 'multiselect' ? 'and' : 'or'"
+    :attribute="filter.code"
 >
-    <div slot="render" class="pb-4" slot-scope="{ data, value, handleChange }">
-        <x-rapidez::filter.heading>
-            <div class="flex flex-wrap gap-2 items-center my-1">
-                <template v-for="swatch in data">
-                    <label
-                        v-if="filter.visual_swatch"
-                        class="size-6 ring-1 ring-emphasis/10 ring-inset cursor-pointer flex items-center justify-center hover:opacity-75 rounded-full transition"
-                        v-bind:class="{'outline outline-2 outline-emphasis outline-offset-1' : value[swatch.key]}"
-                        v-bind:style="{ background: $root.swatches[filter.code]?.options[swatch.key].swatch }"
-                    >
-                        <input type="checkbox" v-on:change="handleChange(swatch.key)" class="hidden" v-bind:checked="value[swatch.key]"/>
-                    </label>
-                    <label
-                        v-else
-                        class="border px-3 transition-all rounded cursor-pointer text-sm text-muted font-medium"
-                        v-bind:class="{'border text' : value[swatch.key]}"
-                    >
-                        @{{ $root.swatches[filter.code]?.options[swatch.key].swatch }}
-                        <input type="checkbox" v-on:change="handleChange(swatch.key)" class="hidden" v-bind:checked="value[swatch.key]"/>
-                    </label>
-                </template>
-            </div>
-        </x-rapidez::filter.heading>
-    </div>
-</multi-list>
+    <template v-slot="{ items, refine }">
+        <div v-show="items.length" class="relative pb-4">
+            <x-rapidez::filter.heading>
+                <ul class="flex flex-wrap gap-2 items-center my-1">
+                    <li v-for="item in withSwatches(items, filter)">
+                        <label
+                            v-if="filter.visual_swatch"
+                            class="size-6 ring-1 ring-emphasis/10 ring-inset cursor-pointer flex items-center justify-center hover:opacity-75 rounded-full transition"
+                            v-bind:class="{ 'outline outline-2 outline-emphasis outline-offset-1': item.isRefined }"
+                            v-bind:style="{ background: item.swatch?.swatch ?? 'none' }"
+                        >
+                            <input
+                                type="checkbox"
+                                v-bind:checked="item.isRefined"
+                                v-on:change="refine(item.value)"
+                                class="hidden"
+                            >
+                        </label>
+                        <label
+                            v-else
+                            class="border px-3 transition-all rounded cursor-pointer text-sm text-muted font-medium"
+                            v-bind:class="{ 'outline outline-2 outline-emphasis outline-offset-1': item.isRefined }"
+                        >
+                            @{{ item.swatch?.swatch ?? item.value }}
+                            <input
+                                type="checkbox"
+                                v-bind:checked="item.isRefined"
+                                v-on:change="refine(item.value)"
+                                class="hidden"
+                            >
+                        </label>
+                    </li>
+                </ul>
+            </x-rapidez::filter.heading>
+        </div>
+    </template>
+</ais-refinement-list>

From 461dba34b42311b64cdcdf269c09cd0bd943f2fc Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 31 Jan 2025 11:37:20 +0100
Subject: [PATCH 021/244] Dev

---
 resources/js/components/Listing/Listing.vue   |  21 ++-
 .../views/components/productlist.blade.php    | 132 ++++++++++--------
 .../partials/header/autocomplete.blade.php    |   3 +-
 .../listing/partials/filter/search.blade.php  |   2 +-
 resources/views/product/overview.blade.php    |  16 ++-
 resources/views/search/overview.blade.php     |   9 +-
 6 files changed, 116 insertions(+), 67 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 71dbdd2c4..7aa15610e 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -4,8 +4,8 @@ import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
 import deepmerge from 'deepmerge'
 
-import { history as historyRouter } from 'instantsearch.js/es/lib/routers'
-import { singleIndex as singleIndexMapping } from 'instantsearch.js/es/lib/stateMappings'
+import { history } from 'instantsearch.js/es/lib/routers'
+import { singleIndex, simple } from 'instantsearch.js/es/lib/stateMappings'
 // We should only import the components used!
 // https://www.algolia.com/doc/guides/building-search-ui/installation/vue/?client=Vue+2#optimize-your-build-with-tree-shaking
 Vue.use(InstantSearch)
@@ -30,12 +30,18 @@ export default {
         loaded: false,
         attributes: useAttributes(),
 
+        // TODO: Not sure yet if this is the right option,
+        // when the routing works properly we maybe
+        // don't need this.
+        searchTerm: new URLSearchParams(window.location.search).get('q'),
+
         // TODO: We need some finetuning here; the url isn't very clean.
         // Also after a refresh the filters aren't selected.
         // Maybe it conflicts with ReactiveSearch?
         routing: {
-            router: historyRouter(),
-            stateMapping: singleIndexMapping('products_1'),
+            router: history(),
+            // stateMapping: singleIndex('rapidez_products_1'),
+            stateMapping: simple()
         },
     }),
 
@@ -61,7 +67,9 @@ export default {
                             // really matter what query is used? What
                             // if we want to add something to the
                             // "must" instead of "filter"?
-                            sr.body.query.bool.filter.push(this.getQuery())
+                            if (this.getQuery()) {
+                                sr.body.query.bool.filter.push(this.getQuery())
+                            }
                             // And, this is currently applied on all queries,
                             // it's only relevant on the listing one.
                             return sr
@@ -97,7 +105,10 @@ export default {
 
                     facet_attributes: this.facets,
 
+                    // TODO: Do we really need this? With ReactiveSearch
+                    // we didn't need to keep a list to filter.
                     filter_attributes: [
+                        { attribute: 'entity_id', field: 'entity_id', type: 'numeric' },
                         { attribute: 'category_ids', field: 'category_ids', type: 'numeric' },
                         { attribute: 'visibility', field: 'visibility', type: 'numeric' },
                     ],
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 635de509a..735138f87 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -1,68 +1,90 @@
 @props(['value', 'title' => false, 'field' => 'sku.keyword'])
 
+{{--
+TODO: We should NOT have this here! It should be loaded
+lazily when "intersected" by scrolling to down
+But it currently doesn't work without it.
+--}}
+@pushOnce('head')
+    @if ($file = vite_filename_path('Listing.vue'))
+        @vite([$file])
+    @endif
+@endPushOnce
+
 @if ($value)
     <lazy v-slot="{ intersected }">
-        <listing v-if="intersected">
-            <x-rapidez::reactive-base>
-                <reactive-list
-                    component-id="{{ md5(serialize($value)) }}"
-                    data-field="{{ $field }}"
-                    :size="999"
-                    :default-query="function () { return { query: { terms: { '{{ $field }}': {!!
-                        is_array($value)
-                            ? "['".implode("','", $value)."']"
-                            : $value
-                    !!} } } } }"
+        <listing v-if="intersected" v-cloak>
+            {{--
+            TODO: Maybe better to have a wrapper
+            component again like reactive-base?
+            --}}
+            <div slot-scope="{ loaded, searchClient }">
+                <ais-instant-search
+                    v-if="loaded"
+                    :search-client="searchClient"
+                    :index-name="config.index"
                 >
-                    @if ($title)
-                        <strong class="font-bold text-2xl mt-5" slot="renderResultStats">
-                            @lang($title)
-                        </strong>
-                    @else
-                        <div slot="renderResultStats"></div>
-                    @endif
+                    <ais-configure :filters="'{{ $field }}:({{ is_array($value)
+                        ? implode(' OR ', $value)
+                        : "'+".$value.".join(' OR ')+'"
+                    }})'"/>
 
-                    <div slot="renderNoResults"></div>
+                    <ais-hits v-slot="{ items }">
+                        <div v-if="items.length" class="flex flex-col gap-5">
+                            @if($title)
+                                <strong class="font-bold text-2xl">
+                                    @lang($title)
+                                </strong>
+                            @endif
 
-                    <div class="mt-5" slot="render" slot-scope="{ data, loading }" v-if="!loading && data?.length">
-                        <slider>
-                            <div slot-scope="{ navigate, showLeft, showRight, currentSlide, slidesTotal }">
-                                <div class="relative">
-                                    <div ref="slider" class="*:sm:w-1/2 *:md:w-1/3 *:xl:w-1/3 *:px-0.5 *:sm:px-2 *:shrink-0 *:snap-start -mx-2 -mx-4 flex snap-x snap-mandatory overflow-x-auto scroll-smooth scrollbar-hide sm:-mx-1">
-                                        <template v-for="item in data">
-                                            @include('rapidez::listing.partials.item', ['slider' => true])
-                                        </template>
+                            <slider>
+                                <div slot-scope="{ navigate, showLeft, showRight, currentSlide, slidesTotal }">
+                                    <div class="relative">
+                                        {{--
+                                        TODO: @frontend, the listing has been changed
+                                        to a grid, do we also need that here? As
+                                        the item partials is shared.
+                                        --}}
+                                        <div ref="slider" class="*:sm:w-1/2 *:md:w-1/3 *:xl:w-1/3 *:px-0.5 *:sm:px-2 *:shrink-0 *:snap-start -mx-2 -mx-4 flex snap-x snap-mandatory overflow-x-auto scroll-smooth scrollbar-hide sm:-mx-1">
+                                            <template v-for="(item, count) in items">
+                                                @include('rapidez::listing.partials.item', ['slider' => true])
+                                            </template>
+                                        </div>
+                                        <x-rapidez::button.slider
+                                            class="absolute left-0 top-1/2 sm:-translate-x-1/2 -translate-y-1/2"
+                                            v-if="showLeft"
+                                            v-on:click="navigate(currentSlide - 1)"
+                                            :aria-label="__('Prev')"
+                                        >
+                                            <x-heroicon-o-chevron-left class="size-6 shrink-0"/>
+                                        </x-rapidez::button.slider>
+                                        <x-rapidez::button.slider
+                                            class="absolute right-0 top-1/2 sm:translate-x-1/2 -translate-y-1/2"
+                                            v-if="showRight"
+                                            v-on:click="navigate(currentSlide + 1)"
+                                            :aria-label="__('Next')"
+                                        >
+                                            <x-heroicon-o-chevron-right class="size-6 shrink-0"/>
+                                        </x-rapidez::button.slider>
                                     </div>
-                                    <x-rapidez::button.slider
-                                        class="absolute left-0 top-1/2 sm:-translate-x-1/2 -translate-y-1/2"
-                                        v-if="showLeft"
-                                        v-on:click="navigate(currentSlide - 1)"
-                                        :aria-label="__('Prev')"
-                                    >
-                                        <x-heroicon-o-chevron-left class="size-6 shrink-0"/>
-                                    </x-rapidez::button.slider>
-                                    <x-rapidez::button.slider
-                                        class="absolute right-0 top-1/2 sm:translate-x-1/2 -translate-y-1/2"
-                                        v-if="showRight"
-                                        v-on:click="navigate(currentSlide + 1)"
-                                        :aria-label="__('Next')"
-                                    >
-                                        <x-heroicon-o-chevron-right class="size-6 shrink-0"/>
-                                    </x-rapidez::button.slider>
-                                </div>
-                                <div v-show="slidesTotal > 1" class="flex flex-row justify-center w-full mt-[35px]">
-                                    <div
-                                        v-for="slide, index in slidesTotal"
-                                        v-on:click="navigate(index)"
-                                        class="relative bg rounded-full border size-4 mx-1 cursor-pointer"
-                                        :class="{ 'bg-emphasis border-0': index === currentSlide }">
+                                    <div v-show="slidesTotal > 1" class="flex flex-row justify-center w-full mt-[35px]">
+                                        <div
+                                            v-for="slide, index in slidesTotal"
+                                            v-on:click="navigate(index)"
+                                            class="relative bg rounded-full border size-4 mx-1 cursor-pointer"
+                                            :class="{ 'bg-emphasis border-0': index === currentSlide }">
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </slider>
-                    </div>
-                </reactive-list>
-            </x-rapidez::reactive-base>
+                            </slider>
+                        </div>
+                    </ais-hits>
+                </ais-instant-search>
+            </div>
         </listing>
     </lazy>
+    {{--
+    TODO: Look up here, there is a lot of nesting,
+    could we extract some to clean this up?
+    --}}
 @endif
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 5a44171df..14c12eeff 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,7 +1,8 @@
+{{--
 <autocomplete>
 
 </autocomplete>
-
+ --}}
 
 @return
 
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index 6f44948ef..26464b872 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -1,4 +1,4 @@
-<ais-search-box>
+<ais-search-box :value="listingSlotProps.searchTerm">
     <template v-slot="{ currentRefinement, isSearchStalled, refine }">
         <x-rapidez::input
             type="search"
diff --git a/resources/views/product/overview.blade.php b/resources/views/product/overview.blade.php
index 9df85936f..5338f6803 100644
--- a/resources/views/product/overview.blade.php
+++ b/resources/views/product/overview.blade.php
@@ -51,6 +51,7 @@
             </div>
         </div>
     </div>
+
     @if (App::providerIsLoaded('Rapidez\Reviews\ReviewsServiceProvider'))
         <div class="my-5 py-8 bg min-h-[515px]">
             <div class="container grid w-full grid-cols-1 gap-5 p-5 md:grid-cols-3">
@@ -65,8 +66,17 @@
             </div>
         </div>
     @endif
-    <div class="container">
-        <x-rapidez::productlist title="Related products" field="id" :value="$product->relation_ids"/>
-        <x-rapidez::productlist title="We found other products you might like!" field="id" :value="$product->upsell_ids"/>
+
+    <div class="container flex flex-col gap-5">
+        <x-rapidez::productlist
+            title="Related products"
+            field="entity_id"
+            :value="$product->relation_ids"
+        />
+        <x-rapidez::productlist
+            title="We found other products you might like!"
+            field="entity_id"
+            :value="$product->upsell_ids"
+        />
     </div>
 @endsection
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 4e4366955..1dcf65a91 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -7,11 +7,16 @@
 @section('content')
     <div class="container">
         <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
+
+        <x-rapidez::listing query="'visibility:(3 OR 4)'"/>
+
+
         {{--
         Is it possible to change this query to a "query string query"?
         Or is there something else we can use better now?
         --}}
-        <x-rapidez::listing query="{
+
+        {{-- <x-rapidez::listing query="{
             bool: {
                 must: [
                     { terms: { visibility: [3, 4] } },
@@ -44,6 +49,6 @@
                     ] } }
                 ],
             }
-        }"/>
+        }"/> --}}
     </div>
 @endsection

From 3120724715a25377ded83210834a9ca966491f77 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Fri, 31 Jan 2025 10:37:51 +0000
Subject: [PATCH 022/244] Apply fixes from Duster

---
 resources/views/components/productlist.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 735138f87..ba30bde5c 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -31,7 +31,7 @@
 
                     <ais-hits v-slot="{ items }">
                         <div v-if="items.length" class="flex flex-col gap-5">
-                            @if($title)
+                            @if ($title)
                                 <strong class="font-bold text-2xl">
                                     @lang($title)
                                 </strong>

From fd4475eea2e176770cbe0ea57f75634088aefdc1 Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Fri, 31 Jan 2025 10:38:18 +0000
Subject: [PATCH 023/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 743290fba..2d376ae86 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -41,7 +41,7 @@ export default {
         routing: {
             router: history(),
             // stateMapping: singleIndex('rapidez_products_1'),
-            stateMapping: simple()
+            stateMapping: simple(),
         },
     }),
 

From 8b7a3781aa68e140bcf9a31ea064974bb0dd1a41 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 31 Jan 2025 15:48:07 +0100
Subject: [PATCH 024/244] Configs

---
 config/rapidez/indexer.php                  |  15 +--
 config/rapidez/searchkit.php                |  56 +++++++++++
 resources/js/components/Listing/Listing.vue |  34 ++++---
 src/Http/ViewComposers/ConfigComposer.php   | 100 ++++++++++++++------
 src/Models/Attribute.php                    |   1 +
 src/RapidezServiceProvider.php              |   1 +
 6 files changed, 152 insertions(+), 55 deletions(-)
 create mode 100644 config/rapidez/searchkit.php

diff --git a/config/rapidez/indexer.php b/config/rapidez/indexer.php
index 517991e66..e0d6efcab 100644
--- a/config/rapidez/indexer.php
+++ b/config/rapidez/indexer.php
@@ -1,22 +1,13 @@
 <?php
 
 return [
+    // TODO: This configuration is a bit lonely here,
+    // maybe we can move this to Scout later?
+
     // Which product visibilities should be indexed?
     // VISIBILITY_NOT_VISIBLE    = 1
     // VISIBILITY_IN_CATALOG     = 2
     // VISIBILITY_IN_SEARCH      = 3
     // VISIBILITY_BOTH           = 4
     'visibility' => [2, 3, 4],
-
-    // Additional searchable attributes with the search weight.
-    'searchable' => [
-        // 'attribute' => 4.0,
-    ],
-
-    // From Magento only "Yes/No, Dropdown, Multiple Select and Price" attribute types
-    // can be configured as filter. If you'd like to have a filter for an attribute
-    // with, for example, the type of "Text", you can specify the attribute_code here.
-    'additional_filters' => [
-        // eav_attribute attribute_code. e.g. brand
-    ],
 ];
diff --git a/config/rapidez/searchkit.php b/config/rapidez/searchkit.php
new file mode 100644
index 000000000..ffd36e1f2
--- /dev/null
+++ b/config/rapidez/searchkit.php
@@ -0,0 +1,56 @@
+<?php
+
+// See: https://www.searchkit.co/docs/api-documentation/searchkit#search_settings-configuration
+return [
+    // Attributes that are used to highlight the search results.
+    'highlight_attributes' => [
+        // 'name',
+    ],
+
+    // Attributes that are used to search the results.
+    // This will be merged with the searchable
+    // attributes configured in Magento.
+    'search_attributes' => [
+        // ['field' => 'attribute_code', 'weight' => 4.0],
+    ],
+
+    // Attributes that are returned in the search result response.
+    // Don't want to keep track of this? An empty array will
+    // return all attributes, but that's not recommended!
+    'result_attributes' => [
+        'entity_id',
+        'name',
+        'sku',
+        'price',
+        'special_price',
+        'image',
+        'images',
+        'url',
+        'thumbnail',
+        'in_stock',
+        'children',
+        'super_*',
+        'reviews_count',
+        'reviews_score',
+    ],
+
+    // Attributes that are used to create facets.
+    // From Magento only "Yes/No, Dropdown, Multiple Select and Price" attribute types
+    // can be configured as filter. If you'd like to have a filter for an attribute
+    // with, for example, the type of "Text", you can specify the attribute_code here.
+    'facet_attributes' => [
+        // ['attribute' => 'brand', 'field' => 'brand.keyword', 'type' => 'string'],
+    ],
+
+    // Attributes that are used to create filters.
+    // TODO: Do we really need this? With ReactiveSearch
+    // we didn't need to keep a list to filter.
+    'filter_attributes' => [
+        ['attribute' => 'entity_id', 'field' => 'entity_id', 'type' => 'numeric'],
+        ['attribute' => 'category_ids', 'field' => 'category_ids', 'type' => 'numeric'],
+        ['attribute' => 'visibility', 'field' => 'visibility', 'type' => 'numeric'],
+    ],
+
+    // TODO: Sorting...
+    // 'sorting' => []
+];
diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 2d376ae86..2251a4ec9 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -16,6 +16,8 @@ import useAttributes from '../../stores/useAttributes.js'
 export default {
     props: {
         // TODO: Do we still use/need this?
+        // Maybe transform it to a callback
+        // so the items can be manipulated?
         additionalFilters: {
             type: Array,
             default: () => [],
@@ -94,25 +96,26 @@ export default {
                         password: url.password,
                     },
                 },
-                search_settings: {
-                    // Are we using this? In the autocomplete maybe?
-                    // highlight_attributes: ['title'],
-
-                    search_attributes: Object.entries(config.searchable).map(([field, weight]) => ({ field, weight })),
 
-                    // We could make the response smaller with this
-                    // result_attributes: ['title', 'actors', 'poster', 'plot'],
+                // TODO: Maybe just do: search_settings: config.searchkit
+                // so it's possible to add anything to the PHP config
+                // and that will appear here?
+                search_settings: {
+                    highlight_attributes: config.searchkit.highlight_attributes,
+                    search_attributes: config.searchkit.search_attributes,
+                    result_attributes: config.searchkit.result_attributes,
 
+                    // TODO: For consistency maybe make it possible to do this:
+                    // facet_attributes: config.searchkit.facet_attributes,
                     facet_attributes: this.facets,
 
-                    // TODO: Do we really need this? With ReactiveSearch
-                    // we didn't need to keep a list to filter.
-                    filter_attributes: [
-                        { attribute: 'entity_id', field: 'entity_id', type: 'numeric' },
-                        { attribute: 'category_ids', field: 'category_ids', type: 'numeric' },
-                        { attribute: 'visibility', field: 'visibility', type: 'numeric' },
-                    ],
+                    filter_attributes: config.searchkit.filter_attributes,
 
+                    // TODO: Let's also change this to a PHP config.
+                    // So we start there and that will be merged
+                    // with the Magento configured attributes
+                    // and lastly from a prop it's possible
+                    // to manipulate it from a callback?
                     sorting: this.sortOptions.reduce((acc, item) => {
                         acc[item.key] = {
                             field: item.field,
@@ -128,6 +131,9 @@ export default {
             return searchkit
         },
 
+        // TODO: Maybe move this completely to PHP?
+        // Any drawbacks? A window.config that
+        // becomes to big? Is that an issue?
         filters: function () {
             return Object.values(this.attributes)
                 .filter((attribute) => attribute.filter)
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 5abbb2086..0f57a507c 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -10,13 +10,26 @@
 use Illuminate\View\View;
 use Rapidez\Core\Facades\Rapidez;
 
+// TODO: Can we improve anything in this file?
+// It doesn't feel very clean currently.
 class ConfigComposer
 {
     public function compose(View $view)
     {
+        $this
+            ->exposeGraphqlQueries()
+            ->configureSearchkit();
+
         $exposedFrontendConfigValues = Arr::only(
-            array_merge_recursive(config('rapidez'), config('rapidez.frontend')),
-            array_merge(config('rapidez.frontend.exposed'), ['store_code', 'index'])
+            array_merge_recursive(
+                config('rapidez'),
+                config('rapidez.frontend'),
+                config('rapidez.searchkit'),
+            ),
+            array_merge(
+                config('rapidez.frontend.exposed'),
+                ['store_code', 'index', 'searchkit'],
+            ),
         );
 
         Config::set('frontend', array_merge(
@@ -25,37 +38,11 @@ public function compose(View $view)
             $this->getConfig()
         ));
 
-        Config::set('frontend.queries', [
-            'customer'                           => view('rapidez::customer.queries.customer')->renderOneliner(),
-            'setGuestEmailOnCart'                => view('rapidez::checkout.queries.setGuestEmailOnCart')->renderOneliner(),
-            'setNewShippingAddressesOnCart'      => view('rapidez::checkout.queries.setNewShippingAddressesOnCart')->renderOneliner(),
-            'setExistingShippingAddressesOnCart' => view('rapidez::checkout.queries.setExistingShippingAddressesOnCart')->renderOneliner(),
-            'setNewBillingAddressOnCart'         => view('rapidez::checkout.queries.setNewBillingAddressOnCart')->renderOneliner(),
-            'setExistingBillingAddressOnCart'    => view('rapidez::checkout.queries.setExistingBillingAddressOnCart')->renderOneliner(),
-            'setShippingMethodsOnCart'           => view('rapidez::checkout.queries.setShippingMethodsOnCart')->renderOneliner(),
-            'setPaymentMethodOnCart'             => view('rapidez::checkout.queries.setPaymentMethodOnCart')->renderOneliner(),
-            'placeOrder'                         => view('rapidez::checkout.queries.placeOrder')->renderOneliner(),
-        ]);
-
-        Config::set('frontend.fragments', [
-            'cart'    => view('rapidez::cart.queries.fragments.cart')->renderOneliner(),
-            'order'   => view('rapidez::checkout.queries.fragments.order')->renderOneliner(),
-            'orderV2' => view('rapidez::checkout.queries.fragments.orderV2')->renderOneliner(),
-        ]);
-
         Event::dispatch('rapidez:frontend-config-composed');
     }
 
     public function getConfig(): array
     {
-        $attributeModel = config('rapidez.models.attribute');
-        $searchableAttributes = Arr::pluck(
-            $attributeModel::getCachedWhere(fn ($attribute) => $attribute['search'] && in_array($attribute['type'], ['text', 'varchar', 'static'])
-            ),
-            'search_weight',
-            'code'
-        );
-
         return [
             'locale'                       => Rapidez::config('general/locale/code', 'en_US'),
             'default_country'              => Rapidez::config('general/country/default', 'NL'),
@@ -65,7 +52,6 @@ public function getConfig(): array
             'show_swatches'                => (bool) Rapidez::config('catalog/frontend/show_swatches_in_product_list'),
             'translations'                 => __('rapidez::frontend'),
             'recaptcha'                    => Rapidez::config('recaptcha_frontend/type_recaptcha_v3/public_key', null, true),
-            'searchable'                   => array_merge($searchableAttributes, config('rapidez.indexer.searchable')),
             'show_customer_address_fields' => $this->getCustomerAddressFields(),
             'street_lines'                 => Rapidez::config('customer/address/street_lines', 2),
             'show_tax'                     => (bool) Rapidez::config('tax/display/type', 1),
@@ -94,4 +80,60 @@ public function getCustomerAddressFields(): array
             'fax'         => Rapidez::config('customer/address/fax_show', 'opt'),
         ];
     }
+
+    public function exposeGraphqlQueries(): self
+    {
+        $checkoutQueries = [
+            'setGuestEmailOnCart',
+            'setNewShippingAddressesOnCart',
+            'setExistingShippingAddressesOnCart',
+            'setNewBillingAddressOnCart',
+            'setExistingBillingAddressOnCart',
+            'setShippingMethodsOnCart',
+            'setPaymentMethodOnCart',
+            'placeOrder',
+        ];
+
+        // TODO: Maybe limit this to just the checkout pages?
+        foreach ($checkoutQueries as $checkoutQuery) {
+            Config::set(
+                'frontend.queries.'.$checkoutQuery,
+                view('rapidez::checkout.queries.'.$checkoutQuery)->renderOneliner()
+            );
+        }
+
+        Config::set(
+            'frontend.queries.customer',
+            view('rapidez::customer.queries.customer')->renderOneliner()
+        );
+
+        Config::set('frontend.fragments', [
+            'cart'    => view('rapidez::cart.queries.fragments.cart')->renderOneliner(),
+            'order'   => view('rapidez::checkout.queries.fragments.order')->renderOneliner(),
+            'orderV2' => view('rapidez::checkout.queries.fragments.orderV2')->renderOneliner(),
+        ]);
+
+        return $this;
+    }
+
+    public function configureSearchkit(): self
+    {
+        $attributeModel = config('rapidez.models.attribute');
+
+        // Get all searchable attributes from Magento.
+        $searchableAttributes = $attributeModel::getCachedWhere(function ($attribute) {
+            return $attribute['search']
+                && in_array($attribute['type'], ['text', 'varchar', 'static']);
+        });
+
+        // Map and merge them with the config.
+        $searchableAttributes = collect($searchableAttributes)->map(fn ($attribute) => [
+            'field' => $attribute['code'],
+            'weight' => $attribute['search_weight'],
+        ])->merge(config('rapidez.searchkit.search_attributes'))->values()->toArray();
+
+        Config::set('rapidez.searchkit.search_attributes', $searchableAttributes);
+
+        return $this;
+    }
 }
diff --git a/src/Models/Attribute.php b/src/Models/Attribute.php
index 532d04a8a..2d5b19733 100644
--- a/src/Models/Attribute.php
+++ b/src/Models/Attribute.php
@@ -20,6 +20,7 @@ protected static function booting()
 
     protected function filter(): CastsAttribute
     {
+        // TODO: Double check; this config has been (re)moved.
         return CastsAttribute::make(
             get: fn ($value) => $value || in_array($this->code, config('rapidez.indexer.additional_filters')),
         )->shouldCache();
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 428bb3e99..7241409b5 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -48,6 +48,7 @@ class RapidezServiceProvider extends ServiceProvider
         'jwt',
         'models',
         'routing',
+        'searchkit',
         'system',
     ];
 

From ace6b3f429c93bd173171b58063dea23439d4b9e Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Fri, 31 Jan 2025 14:48:36 +0000
Subject: [PATCH 025/244] Apply fixes from Duster

---
 src/Http/ViewComposers/ConfigComposer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 0f57a507c..e36e9a035 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -97,8 +97,8 @@ public function exposeGraphqlQueries(): self
         // TODO: Maybe limit this to just the checkout pages?
         foreach ($checkoutQueries as $checkoutQuery) {
             Config::set(
-                'frontend.queries.'.$checkoutQuery,
-                view('rapidez::checkout.queries.'.$checkoutQuery)->renderOneliner()
+                'frontend.queries.' . $checkoutQuery,
+                view('rapidez::checkout.queries.' . $checkoutQuery)->renderOneliner()
             );
         }
 
@@ -128,7 +128,7 @@ public function configureSearchkit(): self
 
         // Map and merge them with the config.
         $searchableAttributes = collect($searchableAttributes)->map(fn ($attribute) => [
-            'field' => $attribute['code'],
+            'field'  => $attribute['code'],
             'weight' => $attribute['search_weight'],
         ])->merge(config('rapidez.searchkit.search_attributes'))->values()->toArray();
 

From 00ce4353ebc593bc158c17e685bf9ae47909f072 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 5 Feb 2025 12:55:47 +0100
Subject: [PATCH 026/244] Index with Scout and fixes

---
 composer.json                                 |  3 +-
 config/rapidez/frontend.php                   |  1 -
 config/rapidez/searchkit.php                  |  6 +-
 config/rapidez/system.php                     |  3 -
 .../js/components/Search/Autocomplete.vue     |  1 +
 .../views/components/filter/heading.blade.php |  6 +-
 resources/views/components/listing.blade.php  |  2 +-
 .../listing/partials/filter/price.blade.php   | 67 +++++++++---------
 .../listing/partials/filter/search.blade.php  |  1 +
 .../listing/partials/filter/select.blade.php  |  5 +-
 .../listing/partials/no-results.blade.php     |  5 +-
 .../listing/partials/pagination.blade.php     |  2 +-
 resources/views/listing/products.blade.php    | 10 ++-
 src/Commands/ElasticsearchIndexCommand.php    |  2 +-
 src/Commands/ElasticsearchIndexer.php         | 12 ++--
 src/Commands/IndexCategoriesCommand.php       |  4 ++
 src/Commands/IndexProductsCommand.php         | 12 +++-
 src/Models/Attribute.php                      |  3 +-
 src/Models/Product.php                        | 55 +--------------
 src/Models/Traits/Product/Searchable.php      | 69 +++++++++++++++++++
 src/Rapidez.php                               |  2 +-
 21 files changed, 150 insertions(+), 121 deletions(-)
 create mode 100644 src/Models/Traits/Product/Searchable.php

diff --git a/composer.json b/composer.json
index f954b46e9..84777de0f 100644
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,7 @@
         "laravel/scout": "^10.11",
         "lcobucci/clock": "^2.0|^3.2",
         "lcobucci/jwt": "^4.0|^5.3",
-        "mailerlite/laravel-elasticsearch": "^11.1",
-        "meilisearch/meilisearch-php": "^1.12",
+        "matchish/laravel-scout-elasticsearch": "^7.10",
         "rapidez/blade-components": "^1.4",
         "rapidez/blade-directives": "^1.0",
         "rapidez/laravel-multi-cache": "^1.0",
diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index e37adb43f..c108189b1 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -5,7 +5,6 @@
     'exposed' => [
         'store',
         'es_url',
-        'es_prefix',
         'media_url',
         'magento_url',
         'notifications',
diff --git a/config/rapidez/searchkit.php b/config/rapidez/searchkit.php
index ffd36e1f2..86448434f 100644
--- a/config/rapidez/searchkit.php
+++ b/config/rapidez/searchkit.php
@@ -4,10 +4,10 @@
 return [
     // Attributes that are used to highlight the search results.
     'highlight_attributes' => [
-        // 'name',
+        'name',
     ],
 
-    // Attributes that are used to search the results.
+    // Additional attributes that are used to search the results.
     // This will be merged with the searchable
     // attributes configured in Magento.
     'search_attributes' => [
@@ -34,7 +34,7 @@
         'reviews_score',
     ],
 
-    // Attributes that are used to create facets.
+    // Additional attributes that are used to create facets.
     // From Magento only "Yes/No, Dropdown, Multiple Select and Price" attribute types
     // can be configured as filter. If you'd like to have a filter for an attribute
     // with, for example, the type of "Text", you can specify the attribute_code here.
diff --git a/config/rapidez/system.php b/config/rapidez/system.php
index eca144223..56d19c276 100644
--- a/config/rapidez/system.php
+++ b/config/rapidez/system.php
@@ -7,9 +7,6 @@
     // Elasticsearch url.
     'es_url' => env('ELASTICSEARCH_URL', 'http://localhost:9200'),
 
-    // Elasticsearch prefix.
-    'es_prefix' => env('ELASTICSEARCH_PREFIX', 'rapidez'),
-
     // Get Magento url from Database
     'magento_url_from_db' => env('GET_MAGENTO_URL_FROM_DATABASE', false),
 
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 43f9b6c2d..44aaa726c 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -87,6 +87,7 @@ export default {
                     },
                 }
 
+                // es_prefix has been removed, Scout is used
                 rapidezFetch(`${baseUrl}/${config.es_prefix}_${name}_${config.store}/_search`, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json', Authorization: auth },
diff --git a/resources/views/components/filter/heading.blade.php b/resources/views/components/filter/heading.blade.php
index f7eaf45af..beb8ea0bf 100644
--- a/resources/views/components/filter/heading.blade.php
+++ b/resources/views/components/filter/heading.blade.php
@@ -1,6 +1,9 @@
 @slots(['title'])
 
-{{-- TODO: Can't we use <details> with <summary> for this? --}}
+{{--
+TODO: Can't we use <details> with <summary> for this?
+Or maybe is JS easier so we don't need an input?
+--}}
 <input class="peer hidden" type="checkbox" checked :set="id = Math.random().toString(36).slice(2)" :id="id" />
 
 {{--
@@ -19,6 +22,7 @@
     <x-heroicon-o-chevron-down class="size-4 chevron transition" />
 </label>
 <div class="peer-checked:*:-my-1 peer-checked:*:py-1 grid grid-rows-[0fr] transition-all peer-checked:grid-rows-[1fr]">
+    {{-- TODO: Why do we need these classes? --}}
     <div class="-mx-1 overflow-hidden px-1">
         {{ $slot }}
     </div>
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 0392fd309..8f33f0144 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -26,7 +26,7 @@
                 :index-name="config.index"
                 :routing="listingSlotProps.routing"
             >
-                <ais-configure :filters="{{ $query }}"/>
+                <ais-configure :filters="{!! $query !!}"/>
 
                 {{ $before ?? '' }}
                 @if ($slot->isEmpty())
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index bd859a55e..52168b5d6 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -3,38 +3,41 @@
     :attribute="filter.code"
 >
     <template v-slot="{ currentRefinement, range, canRefine, refine, sendEvent }">
-        <x-rapidez::filter.heading>
-            <div class="flex flex-col">
-                <div class="flex flex-1">
-                    <x-rapidez::input.range-slider
-                        v-bind:range="range"
-                        v-bind:current="currentRefinement"
-                        v-on:change="refine"
-                    />
+        <div v-show="range.max">
+            <x-rapidez::filter.heading>
+                {{-- TODO: Handle the padding globally within the component? --}}
+                <div class="flex flex-col pb-4">
+                    <div class="flex flex-1">
+                        <x-rapidez::input.range-slider
+                            v-bind:range="range"
+                            v-bind:current="currentRefinement"
+                            v-on:change="refine"
+                        />
+                    </div>
+
+                    <div class="flex gap-10">
+                        <x-rapidez::input
+                            type="number"
+                            v-bind:min="range.min"
+                            v-bind:max="range.max"
+                            v-bind:placeholder="range.min"
+                            v-bind:disabled="!canRefine"
+                            v-bind:value="currentRefinement.min ?? range.min"
+                            v-on:input="refine({ min: $event.currentTarget.value, max: currentRefinement.max })"
+                        />
+                        <x-rapidez::input
+                            class="text-right"
+                            type="number"
+                            v-bind:min="range.min"
+                            v-bind:max="range.max"
+                            v-bind:placeholder="range.max"
+                            v-bind:disabled="!canRefine"
+                            v-bind:value="currentRefinement.max ?? range.max"
+                            v-on:input="refine({ min: currentRefinement.min, max: $event.currentTarget.value })"
+                        />
+                    </div>
                 </div>
-                <div class="flex">
-                    <input
-                        class="w-1/2"
-                        type="number"
-                        :min="range.min"
-                        :max="range.max"
-                        :placeholder="range.min"
-                        :disabled="!canRefine"
-                        :value="currentRefinement.min ?? range.min"
-                        v-on:input="refine({ min: $event.currentTarget.value, max: currentRefinement.max })"
-                    />
-                    <input
-                        class="w-1/2"
-                        type="number"
-                        :min="range.min"
-                        :max="range.max"
-                        :placeholder="range.max"
-                        :disabled="!canRefine"
-                        :value="currentRefinement.max ?? range.max"
-                        v-on:input="refine({ min: currentRefinement.min, max: $event.currentTarget.value })"
-                    />
-                </div>
-            </div>
-        </x-rapidez::filter.heading>
+            </x-rapidez::filter.heading>
+        </div>
     </template>
 </ais-range-input>
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index 26464b872..cdfc9ef18 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -1,3 +1,4 @@
+{{-- TODO: Can/should we hide this filter when there are no results? --}}
 <ais-search-box :value="listingSlotProps.searchTerm">
     <template v-slot="{ currentRefinement, isSearchStalled, refine }">
         <x-rapidez::input
diff --git a/resources/views/listing/partials/filter/select.blade.php b/resources/views/listing/partials/filter/select.blade.php
index 7cb9db8f5..9c307bb99 100644
--- a/resources/views/listing/partials/filter/select.blade.php
+++ b/resources/views/listing/partials/filter/select.blade.php
@@ -10,7 +10,7 @@
         We also have padding in the heading?
         Maybe handle that in 1 place?
         --}}
-        <div v-if="items.length" class="relative pb-4">
+        <div v-show="items.length" class="relative pb-4">
             <x-rapidez::filter.heading>
                 <ul class="flex flex-col gap-1">
                     <li
@@ -53,8 +53,5 @@ class="text-sm text-primary"
                 </button>
             </x-rapidez::filter.heading>
         </div>
-
-        {{-- TODO: Without this "Show more" appears as the default slot renders --}}
-        <div v-else></div>
     </template>
 </ais-refinement-list>
diff --git a/resources/views/listing/partials/no-results.blade.php b/resources/views/listing/partials/no-results.blade.php
index e93cd3507..f78a5b6a9 100644
--- a/resources/views/listing/partials/no-results.blade.php
+++ b/resources/views/listing/partials/no-results.blade.php
@@ -1,3 +1,2 @@
-<div slot="renderNoResults">
-    @lang('Sorry! We did not find any products.')
-</div>
+@lang('Sorry! We did not find any products.')
+{{-- TODO: Can we make this more useful? --}}
diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
index 67a7c02db..77fd16e06 100644
--- a/resources/views/listing/partials/pagination.blade.php
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -1,6 +1,6 @@
 <ais-pagination class="flex" v-on:page-change="scrollToElement('#products')">
     <template v-slot="{ currentRefinement, nbPages, pages, isFirstPage, isLastPage, refine, createURL }">
-        <ul class="flex gap-2 mx-auto">
+        <ul v-show="nbPages" class="flex gap-2 mx-auto">
             <li v-if="!isFirstPage">
                 <x-rapidez::button
                     ::href="createURL(0)"
diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index 4acb90f15..6587da694 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -4,18 +4,16 @@
 
     <ais-hits>
         <template v-slot="{ items }">
-            <div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 overflow-hidden">
+            <div v-if="items" class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 overflow-hidden">
                 <template v-for="(item, count) in items">
                     @include('rapidez::listing.partials.item')
                 </template>
             </div>
+            <div v-else>
+                @include('rapidez::listing.partials.no-results')
+            </div>
         </template>
     </ais-hits>
 
-    {{--
-    TODO: What do we get when there are no results?
-    @include('rapidez::listing.partials.no-results')
-    --}}
-
     @include('rapidez::listing.partials.pagination')
 </div>
diff --git a/src/Commands/ElasticsearchIndexCommand.php b/src/Commands/ElasticsearchIndexCommand.php
index ccae869d1..048dfe49c 100644
--- a/src/Commands/ElasticsearchIndexCommand.php
+++ b/src/Commands/ElasticsearchIndexCommand.php
@@ -52,7 +52,7 @@ public function indexStore(Store|array $store, string $indexName, callable|itera
     public function prepareIndexerWithStore(Store|array $store, string $indexName, array $mapping = [], array $settings = [], array $synonymsFor = []): void
     {
         Rapidez::setStore($store);
-        $this->indexer->prepare(config('rapidez.es_prefix') . '_' . $indexName . '_' . $store['store_id'], $mapping, $settings, $synonymsFor);
+        $this->indexer->prepare(config('scout.prefix') . '_' . $indexName . '_' . $store['store_id'], $mapping, $settings, $synonymsFor);
     }
 
     public function dataFrom(callable|iterable $items)
diff --git a/src/Commands/ElasticsearchIndexer.php b/src/Commands/ElasticsearchIndexer.php
index 7556110b3..107bf59b1 100644
--- a/src/Commands/ElasticsearchIndexer.php
+++ b/src/Commands/ElasticsearchIndexer.php
@@ -5,7 +5,7 @@
 use Carbon\Carbon;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
-use MailerLite\LaravelElasticsearch\Manager as Elasticsearch;
+// use MailerLite\LaravelElasticsearch\Manager as Elasticsearch;
 use Rapidez\Core\Jobs\IndexJob;
 
 class ElasticsearchIndexer
@@ -13,12 +13,12 @@ class ElasticsearchIndexer
     public string $alias;
     public string $index;
 
-    protected Elasticsearch $elasticsearch;
+    // protected Elasticsearch $elasticsearch;
 
-    public function __construct(Elasticsearch $elasticsearch)
-    {
-        $this->elasticsearch = $elasticsearch;
-    }
+    // public function __construct(Elasticsearch $elasticsearch)
+    // {
+    //     $this->elasticsearch = $elasticsearch;
+    // }
 
     public function deleteIndex(string $index): void
     {
diff --git a/src/Commands/IndexCategoriesCommand.php b/src/Commands/IndexCategoriesCommand.php
index 6bdaa4e51..8b1ca77cd 100644
--- a/src/Commands/IndexCategoriesCommand.php
+++ b/src/Commands/IndexCategoriesCommand.php
@@ -13,6 +13,10 @@ class IndexCategoriesCommand extends ElasticsearchIndexCommand
 
     public function handle(): int
     {
+        // TODO: (re)implement with Laravel Scout
+        // Move it to the caregory model?
+        return 0;
+
         $this->synonymsFor = ['name'];
 
         $this->indexStores(
diff --git a/src/Commands/IndexProductsCommand.php b/src/Commands/IndexProductsCommand.php
index b5cc122a0..6fc7c2b0a 100644
--- a/src/Commands/IndexProductsCommand.php
+++ b/src/Commands/IndexProductsCommand.php
@@ -26,10 +26,20 @@ public function handle()
 
         IndexBeforeEvent::dispatch($this);
 
-        $productModel = config('rapidez.models.product');
         $stores = Rapidez::getStores($this->argument('store'));
         foreach ($stores as $store) {
+            Rapidez::setStore($store);
+
             $this->line('Store: ' . $store['name']);
+
+            $this->call('scout:import', [
+                'searchable' => config('rapidez.models.product'),
+            ]);
+
+            // TODO: (re)implement everything below.
+            // Maybe move it to the product model?
+            continue;
+
             $this->prepareIndexerWithStore($store, 'products', Eventy::filter('index.product.mapping', [
                 'properties' => [
                     'price' => [
diff --git a/src/Models/Attribute.php b/src/Models/Attribute.php
index 2d5b19733..4f5f40bc3 100644
--- a/src/Models/Attribute.php
+++ b/src/Models/Attribute.php
@@ -22,7 +22,8 @@ protected function filter(): CastsAttribute
     {
         // TODO: Double check; this config has been (re)moved.
         return CastsAttribute::make(
-            get: fn ($value) => $value || in_array($this->code, config('rapidez.indexer.additional_filters')),
+            get: fn ($value) => $value || []
+            // in_array($this->code, config('rapidez.indexer.additional_filters')),
         )->shouldCache();
     }
 
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 16ed29607..394bc5401 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -9,7 +9,6 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
-use Laravel\Scout\Searchable;
 use Rapidez\Core\Casts\Children;
 use Rapidez\Core\Casts\CommaSeparatedToArray;
 use Rapidez\Core\Casts\CommaSeparatedToIntegerArray;
@@ -25,6 +24,7 @@
 use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
 use Rapidez\Core\Models\Traits\Product\CastMultiselectAttributes;
 use Rapidez\Core\Models\Traits\Product\CastSuperAttributes;
+use Rapidez\Core\Models\Traits\Product\Searchable;
 use Rapidez\Core\Models\Traits\Product\SelectAttributeScopes;
 use TorMorten\Eventy\Facades\Eventy;
 
@@ -89,59 +89,6 @@ public function getCasts(): array
         return $this->casts;
     }
 
-    // TODO: Maybe move all these search related
-    // methods to a separated trait?
-    public function toSearchableArray(): array
-    {
-        $product = $this->toArray();
-
-        // dd($product);
-
-        // TODO: Maybe double check / handle what attributes are
-        // getting indexed here. From makeAllSearchableUsing
-        // we're getting the correct data, but when you
-        // index just one; I don't think that query
-        // will be used resulting in all attrs.
-
-        // Customize the data array...
-        // cast to the correct types! (int), etc
-
-        return $product;
-    }
-
-    public function shouldBeSearchable(): bool
-    {
-        if (! in_array($this->visibility, config('rapidez.indexer.visibility'))) {
-            return false;
-        }
-
-        $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
-        if (! $showOutOfStock && ! $this->in_stock) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function searchableAs(): string
-    {
-        return 'products_' . config('rapidez.store');
-    }
-
-    protected function makeAllSearchableUsing(Builder $query): Builder
-    {
-        return $query
-            ->selectOnlyIndexable()
-            ->with(['categoryProducts', 'reviewSummary'])
-            ->withEventyGlobalScopes('index.product.scopes')
-            ->withExists('options AS has_options');
-    }
-
-    public function makeSearchableUsing(Collection $models): Collection
-    {
-        return $models;
-    }
-
     public function gallery(): BelongsToMany
     {
         return $this->belongsToMany(
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
new file mode 100644
index 000000000..4a2403635
--- /dev/null
+++ b/src/Models/Traits/Product/Searchable.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Rapidez\Core\Models\Traits\Product;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Arr;
+use Laravel\Scout\Searchable as ScoutSearchable;
+use Rapidez\Core\Facades\Rapidez;
+
+trait Searchable
+{
+    use ScoutSearchable;
+
+    public function toSearchableArray(): array
+    {
+        $product = $this->toArray();
+
+        // dd($product);
+
+        // TODO: Maybe double check / handle what attributes are
+        // getting indexed here. From makeAllSearchableUsing
+        // we're getting the correct data, but when you
+        // index just one; I don't think that query
+        // will be used resulting in all attrs.
+
+        // Customize the data array...
+        // cast to the correct types! (int), etc
+
+        return $product;
+    }
+
+    public function shouldBeSearchable(): bool
+    {
+        if (! in_array($this->visibility, config('rapidez.indexer.visibility'))) {
+            return false;
+        }
+
+        $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
+        if (! $showOutOfStock && ! $this->in_stock) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function searchableAs(): string
+    {
+        if (!config('rapidez.index')) {
+            throw new \Exception('Do not use Scout directly; please use `php artisan rapidez:index`');
+        }
+
+        return config('rapidez.index');
+    }
+
+    protected function makeAllSearchableUsing(Builder $query): Builder
+    {
+        return dd($query
+            ->selectOnlyIndexable()
+            ->with(['categoryProducts', 'reviewSummary'])
+            ->withEventyGlobalScopes('index.product.scopes')
+            ->withExists('options AS has_options'));
+    }
+
+    public function makeSearchableUsing(Collection $models): Collection
+    {
+        return $models;
+    }
+}
diff --git a/src/Rapidez.php b/src/Rapidez.php
index 9431dac46..dc7ee7c2d 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -130,7 +130,7 @@ public function setStore(Store|array|callable|int|string $store): void
         config()->set('rapidez.root_category_id', $store['root_category_id']);
         config()->set('frontend.base_url', url('/'));
         config()->set('rapidez.index', implode('_', array_values([
-            config('rapidez.es_prefix'),
+            config('scout.prefix'),
             'products',
             $store['store_id'],
         ])));

From 73487cbf0a09e3f9bce2202c29689b91a5b8ada7 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Wed, 5 Feb 2025 11:56:12 +0000
Subject: [PATCH 027/244] Apply fixes from Duster

---
 src/Models/Product.php                   | 2 --
 src/Models/Traits/Product/Searchable.php | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Models/Product.php b/src/Models/Product.php
index 394bc5401..2accb7840 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
@@ -13,7 +12,6 @@
 use Rapidez\Core\Casts\CommaSeparatedToArray;
 use Rapidez\Core\Casts\CommaSeparatedToIntegerArray;
 use Rapidez\Core\Casts\DecodeHtmlEntities;
-use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Scopes\Product\WithProductAttributesScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductCategoryInfoScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductChildrenScope;
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 4a2403635..28bf89bdc 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -2,9 +2,9 @@
 
 namespace Rapidez\Core\Models\Traits\Product;
 
+use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Arr;
 use Laravel\Scout\Searchable as ScoutSearchable;
 use Rapidez\Core\Facades\Rapidez;
 
@@ -46,8 +46,8 @@ public function shouldBeSearchable(): bool
 
     public function searchableAs(): string
     {
-        if (!config('rapidez.index')) {
-            throw new \Exception('Do not use Scout directly; please use `php artisan rapidez:index`');
+        if (! config('rapidez.index')) {
+            throw new Exception('Do not use Scout directly; please use `php artisan rapidez:index`');
         }
 
         return config('rapidez.index');

From 4e5cfa34743d1ffe8179c632e73a558a3fe7963d Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Thu, 13 Feb 2025 13:25:41 +0100
Subject: [PATCH 028/244] Remove dd

---
 src/Models/Traits/Product/Searchable.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 28bf89bdc..68f4866d6 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -55,11 +55,11 @@ public function searchableAs(): string
 
     protected function makeAllSearchableUsing(Builder $query): Builder
     {
-        return dd($query
+        return $query
             ->selectOnlyIndexable()
             ->with(['categoryProducts', 'reviewSummary'])
             ->withEventyGlobalScopes('index.product.scopes')
-            ->withExists('options AS has_options'));
+            ->withExists('options AS has_options');
     }
 
     public function makeSearchableUsing(Collection $models): Collection

From 2274966966428b00d9a2c2ad49125becc7c2c50e Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 14 Feb 2025 13:21:35 +0100
Subject: [PATCH 029/244] Index products with the same data filtering as before

---
 config/rapidez/indexer.php                    |   4 +
 src/Commands/ElasticsearchIndexCommand.php    |  62 -------
 src/Commands/ElasticsearchIndexer.php         | 151 ----------------
 src/Commands/IndexCategoriesCommand.php       |  39 ++--
 src/Commands/IndexCommand.php                 |  46 +++++
 src/Commands/IndexProductsCommand.php         | 171 ------------------
 src/Models/Product.php                        | 109 ++++++++++-
 .../Traits/{Product => }/Searchable.php       |  35 ++--
 src/Rapidez.php                               |   4 +-
 src/RapidezServiceProvider.php                |   4 +-
 10 files changed, 194 insertions(+), 431 deletions(-)
 delete mode 100644 src/Commands/ElasticsearchIndexCommand.php
 delete mode 100644 src/Commands/ElasticsearchIndexer.php
 create mode 100644 src/Commands/IndexCommand.php
 delete mode 100644 src/Commands/IndexProductsCommand.php
 rename src/Models/Traits/{Product => }/Searchable.php (53%)

diff --git a/config/rapidez/indexer.php b/config/rapidez/indexer.php
index e0d6efcab..6bc2f0767 100644
--- a/config/rapidez/indexer.php
+++ b/config/rapidez/indexer.php
@@ -10,4 +10,8 @@
     // VISIBILITY_IN_SEARCH      = 3
     // VISIBILITY_BOTH           = 4
     'visibility' => [2, 3, 4],
+
+    'models' => [
+        'product',
+    ],
 ];
diff --git a/src/Commands/ElasticsearchIndexCommand.php b/src/Commands/ElasticsearchIndexCommand.php
deleted file mode 100644
index 048dfe49c..000000000
--- a/src/Commands/ElasticsearchIndexCommand.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Commands;
-
-use Exception;
-use Illuminate\Console\Command;
-use Rapidez\Core\Facades\Rapidez;
-use Rapidez\Core\Models\Store;
-
-abstract class ElasticsearchIndexCommand extends Command
-{
-    public ElasticsearchIndexer $indexer;
-
-    public array $mapping = [];
-    public array $settings = [];
-    public array $synonymsFor = [];
-
-    public function __construct(ElasticsearchIndexer $indexer)
-    {
-        parent::__construct();
-        $this->indexer = $indexer;
-    }
-
-    public function indexAllStores(string $indexName, callable|iterable $items, callable|array|null $dataFilter = null, callable|string $id = 'entity_id'): void
-    {
-        $this->indexStores(Rapidez::getStores(), $indexName, $items, $dataFilter, $id);
-    }
-
-    public function indexStores(array $stores, string $indexName, callable|iterable $items, callable|array|null $dataFilter = null, callable|string $id = 'entity_id'): void
-    {
-        foreach ($stores as $store) {
-            $this->indexStore($store, $indexName, $items, $dataFilter, $id);
-        }
-    }
-
-    public function indexStore(Store|array $store, string $indexName, callable|iterable $items, callable|array|null $dataFilter = null, callable|string $id = 'entity_id'): void
-    {
-        $storeName = $store['name'] ?? $store['code'] ?? reset($store);
-        $this->line('Indexing `' . $indexName . '` for store ' . $storeName);
-
-        try {
-            $this->prepareIndexerWithStore($store, $indexName, $this->mapping, $this->settings, $this->synonymsFor);
-            $this->indexer->index($this->dataFrom($items), $dataFilter, $id);
-            $this->indexer->finish();
-        } catch (Exception $e) {
-            $this->indexer->abort();
-
-            throw $e;
-        }
-    }
-
-    public function prepareIndexerWithStore(Store|array $store, string $indexName, array $mapping = [], array $settings = [], array $synonymsFor = []): void
-    {
-        Rapidez::setStore($store);
-        $this->indexer->prepare(config('scout.prefix') . '_' . $indexName . '_' . $store['store_id'], $mapping, $settings, $synonymsFor);
-    }
-
-    public function dataFrom(callable|iterable $items)
-    {
-        return value($items, config()->get('rapidez.store_code'));
-    }
-}
diff --git a/src/Commands/ElasticsearchIndexer.php b/src/Commands/ElasticsearchIndexer.php
deleted file mode 100644
index 107bf59b1..000000000
--- a/src/Commands/ElasticsearchIndexer.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Commands;
-
-use Carbon\Carbon;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Arr;
-// use MailerLite\LaravelElasticsearch\Manager as Elasticsearch;
-use Rapidez\Core\Jobs\IndexJob;
-
-class ElasticsearchIndexer
-{
-    public string $alias;
-    public string $index;
-
-    // protected Elasticsearch $elasticsearch;
-
-    // public function __construct(Elasticsearch $elasticsearch)
-    // {
-    //     $this->elasticsearch = $elasticsearch;
-    // }
-
-    public function deleteIndex(string $index): void
-    {
-        $this->elasticsearch->indices()->delete(['index' => $index]);
-    }
-
-    public function index(iterable|object $data, callable|array|null $dataFilter, callable|string $id = 'entity_id'): void
-    {
-        if (is_iterable($data)) {
-            $this->indexItems($data, $dataFilter, $id);
-        } else {
-            $this->indexItem($data, $dataFilter, $id);
-        }
-    }
-
-    public function indexItems(iterable $items, callable|array|null $dataFilter, callable|string $id = 'entity_id'): void
-    {
-        foreach ($items as $item) {
-            $this->indexItem($item, $dataFilter, $id);
-        }
-    }
-
-    public function indexItem(object $item, callable|array|null $dataFilter, callable|string $id = 'entity_id'): void
-    {
-        if (is_null($item)) {
-            return;
-        }
-
-        $currentValues = match (true) {
-            is_callable($dataFilter) => $dataFilter($item),
-            is_null($dataFilter)     => $item,
-            default                  => Arr::only($item instanceof Arrayable ? $item->toArray() : (array) $item, $dataFilter),
-        };
-
-        if (is_null($currentValues)) {
-            return;
-        }
-
-        $currentId = is_callable($id)
-            ? $id($item)
-            : data_get($item, $id);
-
-        if (is_null($currentId)) {
-            return;
-        }
-
-        IndexJob::dispatch($this->index, $currentId, $currentValues);
-    }
-
-    public function prepare(string $indexName, array $mapping = [], array $settings = [], array $synonymsFor = []): void
-    {
-        data_set($settings, 'index.analysis.analyzer.default', [
-            'filter'    => ['lowercase', 'asciifolding'],
-            'tokenizer' => 'standard',
-        ]);
-
-        if (count($synonymsFor)) {
-            $synonyms = config('rapidez.models.search_synonym')::whereIn('store_id', [0, config('rapidez.store')])
-                ->get()
-                ->map(fn ($synonym) => $synonym->synonyms)
-                ->toArray();
-
-            data_set($settings, 'index.analysis.filter.synonym', ['type' => 'synonym_graph', 'synonyms' => $synonyms]);
-            data_set($settings, 'index.analysis.analyzer.synonym', [
-                'filter'    => ['lowercase', 'asciifolding', 'synonym'],
-                'tokenizer' => 'standard',
-            ]);
-
-            foreach ($synonymsFor as $property) {
-                data_set($mapping, 'properties.' . $property . '.type', 'text');
-                data_set($mapping, 'properties.' . $property . '.analyzer', 'synonym');
-                data_set($mapping, 'properties.' . $property . '.fields', [
-                    'keyword' => [
-                        'type'         => 'keyword',
-                        'ignore_above' => 256,
-                    ],
-                ]);
-            }
-        }
-
-        $this->createAlias($indexName);
-        $this->createIndex($this->index, $mapping, $settings);
-    }
-
-    public function finish(): void
-    {
-        $this->switchAlias($this->alias, $this->index);
-    }
-
-    public function abort(): void
-    {
-        $this->deleteIndex($this->index);
-    }
-
-    public function createAlias(string $indexName): void
-    {
-        $this->alias = $indexName;
-        $this->index = $this->alias . '_' . Carbon::now()->format('YmdHis');
-    }
-
-    public function createIndex(string $index, array $mapping = [], array $settings = []): void
-    {
-        $this->elasticsearch->indices()->create([
-            'index' => $index,
-            'body'  => array_filter([
-                'mappings' => $mapping,
-                'settings' => $settings,
-            ]),
-        ]);
-    }
-
-    public function switchAlias(string $alias, string $index): void
-    {
-        $this->elasticsearch->indices()->putAlias([
-            'index' => $index,
-            'name'  => $alias,
-        ]);
-
-        $aliases = $this->elasticsearch->indices()->getAlias(['name' => $alias]);
-        foreach ($aliases as $indexLinkedToAlias => $aliasData) {
-            if ($indexLinkedToAlias != $index) {
-                $this->elasticsearch->indices()->deleteAlias([
-                    'index' => $indexLinkedToAlias,
-                    'name'  => $alias,
-                ]);
-                $this->elasticsearch->indices()->delete(['index' => $indexLinkedToAlias]);
-            }
-        }
-    }
-}
diff --git a/src/Commands/IndexCategoriesCommand.php b/src/Commands/IndexCategoriesCommand.php
index 8b1ca77cd..4cb9d50e3 100644
--- a/src/Commands/IndexCategoriesCommand.php
+++ b/src/Commands/IndexCategoriesCommand.php
@@ -2,10 +2,9 @@
 
 namespace Rapidez\Core\Commands;
 
-use Rapidez\Core\Facades\Rapidez;
-use TorMorten\Eventy\Facades\Eventy;
+use Illuminate\Console\Command;
 
-class IndexCategoriesCommand extends ElasticsearchIndexCommand
+class IndexCategoriesCommand extends Command
 {
     protected $signature = 'rapidez:index:categories {store? : Store ID from Magento}';
 
@@ -17,25 +16,25 @@ public function handle(): int
         // Move it to the caregory model?
         return 0;
 
-        $this->synonymsFor = ['name'];
+        // $this->synonymsFor = ['name'];
 
-        $this->indexStores(
-            stores: Rapidez::getStores($this->argument('store')),
-            indexName: 'categories',
-            items: $this->getCategories(...),
-            dataFilter: fn ($data) => Eventy::filter('index.category.data', $data),
-        );
+        // $this->indexStores(
+        //     stores: Rapidez::getStores($this->argument('store')),
+        //     indexName: 'categories',
+        //     items: $this->getCategories(...),
+        //     dataFilter: fn ($data) => Eventy::filter('index.category.data', $data),
+        // );
 
-        return 0;
+        // return 0;
     }
 
-    public function getCategories()
-    {
-        return config('rapidez.models.category')::withEventyGlobalScopes('index.categories.scopes')
-            ->select((new (config('rapidez.models.category')))->qualifyColumns(['entity_id', 'name', 'url_path']))
-            ->whereNotNull('url_key')
-            ->whereNot('url_key', 'default-category')
-            ->has('products')
-            ->get() ?? [];
-    }
+    // public function getCategories()
+    // {
+    //     return config('rapidez.models.category')::withEventyGlobalScopes('index.categories.scopes')
+    //         ->select((new (config('rapidez.models.category')))->qualifyColumns(['entity_id', 'name', 'url_path']))
+    //         ->whereNotNull('url_key')
+    //         ->whereNot('url_key', 'default-category')
+    //         ->has('products')
+    //         ->get() ?? [];
+    // }
 }
diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
new file mode 100644
index 000000000..027ddd194
--- /dev/null
+++ b/src/Commands/IndexCommand.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Rapidez\Core\Commands;
+
+use Illuminate\Console\Command;
+use Rapidez\Core\Events\IndexAfterEvent;
+use Rapidez\Core\Events\IndexBeforeEvent;
+use Rapidez\Core\Facades\Rapidez;
+
+class IndexCommand extends Command
+{
+    protected $signature = 'rapidez:index {--t|types= : To specify types of models to index, separated by commas} {--s|store= : To specify store IDs from Magento, separated by commas}';
+
+    protected $description = 'Index all searchable models in Elasticsearch';
+
+    public function handle()
+    {
+        $types = $this->option('types')
+            ? explode(',', $this->option('types'))
+            : config('rapidez.indexer.models');
+        // TODO: Where do we put the above configuration?
+        // Can (and should?) we dynamically retrieve which models have the Searchable trait?
+
+        $stores = $this->option('store')
+            ? Rapidez::getStores(explode(',', $this->option('store')))
+            : Rapidez::getStores();
+
+        $this->call('cache:clear');
+
+        IndexBeforeEvent::dispatch($this);
+
+        foreach ($stores as $store) {
+            Rapidez::setStore($store);
+
+            $this->line('Store: ' . $store['name']);
+
+            foreach($types as $type) {
+                $this->call('scout:import', [
+                    'searchable' => config('rapidez.models.' . $type),
+                ]);
+            }
+        }
+
+        IndexAfterEvent::dispatch($this);
+    }
+}
diff --git a/src/Commands/IndexProductsCommand.php b/src/Commands/IndexProductsCommand.php
deleted file mode 100644
index 6fc7c2b0a..000000000
--- a/src/Commands/IndexProductsCommand.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Commands;
-
-use Exception;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-use Rapidez\Core\Events\IndexAfterEvent;
-use Rapidez\Core\Events\IndexBeforeEvent;
-use Rapidez\Core\Facades\Rapidez;
-use Rapidez\Core\Models\Category;
-use Rapidez\Core\Models\CategoryProduct;
-use TorMorten\Eventy\Facades\Eventy;
-
-class IndexProductsCommand extends ElasticsearchIndexCommand
-{
-    protected $signature = 'rapidez:index {store? : Store ID from Magento}';
-
-    protected $description = 'Index the products in Elasticsearch';
-
-    protected int $chunkSize = 500;
-
-    public function handle()
-    {
-        $this->call('cache:clear');
-
-        IndexBeforeEvent::dispatch($this);
-
-        $stores = Rapidez::getStores($this->argument('store'));
-        foreach ($stores as $store) {
-            Rapidez::setStore($store);
-
-            $this->line('Store: ' . $store['name']);
-
-            $this->call('scout:import', [
-                'searchable' => config('rapidez.models.product'),
-            ]);
-
-            // TODO: (re)implement everything below.
-            // Maybe move it to the product model?
-            continue;
-
-            $this->prepareIndexerWithStore($store, 'products', Eventy::filter('index.product.mapping', [
-                'properties' => [
-                    'price' => [
-                        'type' => 'double',
-                    ],
-                    'children' => [
-                        'type' => 'flattened',
-                    ],
-                    'grouped' => [
-                        'type' => 'flattened',
-                    ],
-                    'positions' => [
-                        'type' => 'flattened',
-                    ],
-                ],
-            ]), Eventy::filter('index.product.settings', []), ['name']);
-            try {
-                $maxPositions = CategoryProduct::query()
-                    ->selectRaw('GREATEST(MAX(position), 0) as position')
-                    ->addSelect('category_id')
-                    ->groupBy('category_id')
-                    ->pluck('position', 'category_id');
-
-                $productQuery = $productModel::selectOnlyIndexable()
-                    ->with(['categoryProducts', 'reviewSummary'])
-                    ->withEventyGlobalScopes('index.product.scopes')
-                    ->withExists('options AS has_options');
-
-                $bar = $this->output->createProgressBar($productQuery->getQuery()->getCountForPagination());
-                $bar->start();
-
-                $categories = Category::withEventyGlobalScopes('index.category.scopes')
-                    ->where('catalog_category_flat_store_' . config('rapidez.store') . '.entity_id', '<>', Rapidez::config('catalog/category/root_id', 2))
-                    ->pluck('name', 'entity_id');
-
-                $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
-                $indexVisibility = config('rapidez.indexer.visibility');
-
-                $productQuery->chunk($this->chunkSize, function ($products) use ($store, $bar, $categories, $showOutOfStock, $indexVisibility, $maxPositions) {
-                    $this->indexer->index($products, function ($product) use ($store, $categories, $showOutOfStock, $indexVisibility, $maxPositions) {
-                        if (! in_array($product->visibility, $indexVisibility)) {
-                            return;
-                        }
-
-                        if (! $showOutOfStock && ! $product->in_stock) {
-                            return;
-                        }
-
-                        $data = array_merge(['store' => $store['store_id']], $product->toArray());
-
-                        foreach ($product->super_attributes ?: [] as $superAttribute) {
-                            $data['super_' . $superAttribute->code] = $superAttribute->text_swatch || $superAttribute->visual_swatch
-                                ? array_keys((array) $product->{'super_' . $superAttribute->code})
-                                : Arr::pluck($product->{'super_' . $superAttribute->code} ?: [], 'label');
-                        }
-
-                        $data = $this->withCategories($data, $categories);
-
-                        $data['positions'] = $product->categoryProducts
-                            ->pluck('position', 'category_id')
-                            // Turn all positions positive
-                            ->mapWithKeys(fn ($position, $category_id) => [$category_id => $maxPositions[$category_id] - $position]);
-
-                        return Eventy::filter('index.product.data', $data, $product);
-                    });
-
-                    $bar->advance($products->count());
-                });
-
-                $this->indexer->finish();
-            } catch (Exception $e) {
-                $this->indexer->abort();
-
-                throw $e;
-            }
-
-            $bar->finish();
-            $this->line('');
-        }
-
-        IndexAfterEvent::dispatch($this);
-        $this->info('Done!');
-    }
-
-    public function withCategories(array $data, Collection $categories): array
-    {
-        foreach ($data['category_paths'] as $categoryPath) {
-            $category = [];
-            foreach (explode('/', $categoryPath) as $categoryId) {
-                if (isset($categories[$categoryId])) {
-                    $category[] = $categoryId . '::' . $categories[$categoryId];
-                }
-            }
-            if (! empty($category)) {
-                $data['categories'][] = implode(' /// ', $category);
-            }
-        }
-
-        // TODO: It would be nice to migrate to Scout,
-        // so we've to do this somewhere else.
-        // And maybe refactor it a bit.
-        foreach ($data['category_paths'] as $categoryPath) {
-            $paths = explode('/', $categoryPath);
-            $paths = array_slice($paths, array_search(config('rapidez.root_category_id'), $paths) + 1);
-
-            $categoryHierarchy = [];
-            $currentPath = '';
-
-            foreach ($paths as $categoryId) {
-                if (isset($categories[$categoryId])) {
-                    $currentPath .= ($currentPath ? ' > ' : '') . $categories[$categoryId];
-                    $categoryHierarchy[] = $currentPath;
-                }
-            }
-
-            foreach ($categoryHierarchy as $level => $category) {
-                $data['category_lvl' . ($level + 1)][] = $category;
-            }
-        }
-
-        foreach ($data as $key => &$value) {
-            if (str_starts_with($key, 'category_lvl')) {
-                $value = array_values(array_unique($value));
-            }
-        }
-
-        return $data;
-    }
-}
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 2accb7840..83f841b46 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -8,10 +8,15 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
 use Rapidez\Core\Casts\Children;
 use Rapidez\Core\Casts\CommaSeparatedToArray;
 use Rapidez\Core\Casts\CommaSeparatedToIntegerArray;
 use Rapidez\Core\Casts\DecodeHtmlEntities;
+use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
 use Rapidez\Core\Models\Scopes\Product\WithProductAttributesScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductCategoryInfoScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductChildrenScope;
@@ -19,11 +24,10 @@
 use Rapidez\Core\Models\Scopes\Product\WithProductRelationIdsScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductStockScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductSuperAttributesScope;
-use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
 use Rapidez\Core\Models\Traits\Product\CastMultiselectAttributes;
 use Rapidez\Core\Models\Traits\Product\CastSuperAttributes;
-use Rapidez\Core\Models\Traits\Product\Searchable;
 use Rapidez\Core\Models\Traits\Product\SelectAttributeScopes;
+use Rapidez\Core\Models\Traits\Searchable;
 use TorMorten\Eventy\Facades\Eventy;
 
 class Product extends Model
@@ -253,4 +257,105 @@ public static function exist($productId): bool
     {
         return self::withoutGlobalScopes()->where('entity_id', $productId)->exists();
     }
+
+    protected function makeAllSearchableUsing(Builder $query)
+    {
+        $query->selectOnlyIndexable()
+            ->with(['categoryProducts', 'reviewSummary'])
+            ->withEventyGlobalScopes('index.product.scopes');
+
+        return $query;
+    }
+
+    public function shouldBeSearchable(): bool
+    {
+        if (! in_array($this->visibility, config('rapidez.indexer.visibility'))) {
+            return false;
+        }
+
+        $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
+        if (! $showOutOfStock && ! $this->in_stock) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function searchableData($data, $product): array
+    {
+        $data['store'] = config('rapidez.store');
+
+        // TODO: Can we do this without having to cache this?
+        $maxPositions = Cache::driver('array')->rememberForever('max-positions-' . config('rapidez.store'), function() {
+            return CategoryProduct::query()
+                ->selectRaw('GREATEST(MAX(position), 0) as position')
+                ->addSelect('category_id')
+                ->groupBy('category_id')
+                ->pluck('position', 'category_id');
+        });
+
+        foreach ($product->super_attributes ?: [] as $superAttribute) {
+            $data['super_' . $superAttribute->code] = $superAttribute->text_swatch || $superAttribute->visual_swatch
+                ? array_keys((array) $product->{'super_' . $superAttribute->code})
+                : Arr::pluck($product->{'super_' . $superAttribute->code} ?: [], 'label');
+        }
+
+        $data = $this->withCategories($data);
+
+        $data['positions'] = $product->categoryProducts
+            ->pluck('position', 'category_id')
+            // Turn all positions positive
+            ->mapWithKeys(fn ($position, $category_id) => [$category_id => $maxPositions[$category_id] - $position]);
+
+        return $data;
+    }
+
+    public function withCategories(array $data): array
+    {
+        // TODO: Do we still need to do this in this way? Can we refactor this to be nicer now that we're using Scout?
+        $categories = Cache::driver('array')->rememberForever('categories-' . config('rapidez.store'), function() {
+            return Category::withEventyGlobalScopes('index.category.scopes')
+                ->where('catalog_category_flat_store_' . config('rapidez.store') . '.entity_id', '<>', Rapidez::config('catalog/category/root_id', 2))
+                ->pluck('name', 'entity_id');
+        });
+
+        foreach ($data['category_paths'] as $categoryPath) {
+            $category = [];
+            foreach (explode('/', $categoryPath) as $categoryId) {
+                if (isset($categories[$categoryId])) {
+                    $category[] = $categoryId . '::' . $categories[$categoryId];
+                }
+            }
+            if (! empty($category)) {
+                $data['categories'][] = implode(' /// ', $category);
+            }
+        }
+
+        foreach ($data['category_paths'] as $categoryPath) {
+            $paths = explode('/', $categoryPath);
+            $paths = array_slice($paths, array_search(config('rapidez.root_category_id'), $paths) + 1);
+
+            $categoryHierarchy = [];
+            $currentPath = '';
+
+            foreach ($paths as $categoryId) {
+                if (isset($categories[$categoryId])) {
+                    $currentPath .= ($currentPath ? ' > ' : '') . $categories[$categoryId];
+                    $categoryHierarchy[] = $currentPath;
+                }
+            }
+
+            foreach ($categoryHierarchy as $level => $category) {
+                $data['category_lvl' . ($level + 1)][] = $category;
+            }
+        }
+
+        foreach ($data as $key => &$value) {
+            if (str_starts_with($key, 'category_lvl')) {
+                $value = array_values(array_unique($value));
+            }
+        }
+
+        return $data;
+    }
 }
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Searchable.php
similarity index 53%
rename from src/Models/Traits/Product/Searchable.php
rename to src/Models/Traits/Searchable.php
index 68f4866d6..bc98e1aa3 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Rapidez\Core\Models\Traits\Product;
+namespace Rapidez\Core\Models\Traits;
 
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Laravel\Scout\Searchable as ScoutSearchable;
-use Rapidez\Core\Facades\Rapidez;
+use TorMorten\Eventy\Facades\Eventy;
 
 trait Searchable
 {
@@ -14,9 +14,10 @@ trait Searchable
 
     public function toSearchableArray(): array
     {
-        $product = $this->toArray();
+        $data = $this->searchableData($this->toArray(), $this);
 
-        // dd($product);
+        $modelType = str(static::class)->afterLast('\\')->lower();
+        Eventy::filter('index.' . $modelType . '.data', $data, $this);
 
         // TODO: Maybe double check / handle what attributes are
         // getting indexed here. From makeAllSearchableUsing
@@ -27,39 +28,31 @@ public function toSearchableArray(): array
         // Customize the data array...
         // cast to the correct types! (int), etc
 
-        return $product;
+        return $data;
     }
 
-    public function shouldBeSearchable(): bool
+    public function searchableData($data, $model): array
     {
-        if (! in_array($this->visibility, config('rapidez.indexer.visibility'))) {
-            return false;
-        }
-
-        $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
-        if (! $showOutOfStock && ! $this->in_stock) {
-            return false;
-        }
+        return $data;
+    }
 
+    public function shouldBeSearchable(): bool
+    {
         return true;
     }
 
     public function searchableAs(): string
     {
         if (! config('rapidez.index')) {
-            throw new Exception('Do not use Scout directly; please use `php artisan rapidez:index`');
+            throw new Exception('Do not use Scout directly. Please use `php artisan rapidez:index`.');
         }
 
         return config('rapidez.index');
     }
 
-    protected function makeAllSearchableUsing(Builder $query): Builder
+    protected function makeAllSearchableUsing(Builder $query)
     {
-        return $query
-            ->selectOnlyIndexable()
-            ->with(['categoryProducts', 'reviewSummary'])
-            ->withEventyGlobalScopes('index.product.scopes')
-            ->withExists('options AS has_options');
+        return $query;
     }
 
     public function makeSearchableUsing(Collection $models): Collection
diff --git a/src/Rapidez.php b/src/Rapidez.php
index dc7ee7c2d..996c2a1e9 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -86,7 +86,7 @@ public function fancyMagentoSyntaxDecoder(string $encodedString): object
         return json_decode(str_replace(array_values($mapping), array_keys($mapping), $encodedString));
     }
 
-    public function getStores(callable|int|string|null $store = null): array
+    public function getStores(callable|array|int|string|null $store = null): array
     {
         $storeModel = config('rapidez.models.store');
 
@@ -94,7 +94,7 @@ public function getStores(callable|int|string|null $store = null): array
             return Arr::where($storeModel::getCached(),
                 fn ($s) => is_callable($store)
                     ? $store($s)
-                    : $s['store_id'] == $store || $s['code'] == $store
+                    : in_array($s['store_id'], Arr::wrap($store)) || in_array($s['code'], Arr::wrap($store))
             );
         }
 
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 7241409b5..74dbac01b 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -18,7 +18,7 @@
 use Rapidez\Core\Auth\MagentoCartTokenGuard;
 use Rapidez\Core\Auth\MagentoCustomerTokenGuard;
 use Rapidez\Core\Commands\IndexCategoriesCommand;
-use Rapidez\Core\Commands\IndexProductsCommand;
+use Rapidez\Core\Commands\IndexCommand;
 use Rapidez\Core\Commands\InstallCommand;
 use Rapidez\Core\Commands\InstallTestsCommand;
 use Rapidez\Core\Commands\ValidateCommand;
@@ -89,7 +89,7 @@ protected function bootAuth(): self
     protected function bootCommands(): self
     {
         $this->commands([
-            IndexProductsCommand::class,
+            IndexCommand::class,
             IndexCategoriesCommand::class,
             ValidateCommand::class,
             InstallCommand::class,

From ecb176752d8eef396933bc4e2f20534c37147216 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 14 Feb 2025 14:32:43 +0100
Subject: [PATCH 030/244] Add categories + small refactor

---
 config/rapidez/indexer.php              |  6 ++--
 src/Commands/IndexCategoriesCommand.php | 40 -------------------------
 src/Commands/IndexCommand.php           | 17 +++++++----
 src/Models/Category.php                 | 18 +++++++----
 src/Models/Product.php                  |  6 ++--
 src/Models/Traits/Searchable.php        | 28 ++++++++---------
 src/Rapidez.php                         |  5 ----
 src/RapidezServiceProvider.php          |  7 -----
 8 files changed, 43 insertions(+), 84 deletions(-)
 delete mode 100644 src/Commands/IndexCategoriesCommand.php

diff --git a/config/rapidez/indexer.php b/config/rapidez/indexer.php
index 6bc2f0767..924298c11 100644
--- a/config/rapidez/indexer.php
+++ b/config/rapidez/indexer.php
@@ -11,7 +11,9 @@
     // VISIBILITY_BOTH           = 4
     'visibility' => [2, 3, 4],
 
-    'models' => [
-        'product',
+    // The Rapidez indexer will automatically start indexing any models with the Searchable trait that exist within `models.php`.
+    // If you want to add extra models you can add them here. Only Eloquent models are supported.
+    'extra_models' => [
+        // 'book' => \App\Models\Book::class,
     ],
 ];
diff --git a/src/Commands/IndexCategoriesCommand.php b/src/Commands/IndexCategoriesCommand.php
deleted file mode 100644
index 4cb9d50e3..000000000
--- a/src/Commands/IndexCategoriesCommand.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Commands;
-
-use Illuminate\Console\Command;
-
-class IndexCategoriesCommand extends Command
-{
-    protected $signature = 'rapidez:index:categories {store? : Store ID from Magento}';
-
-    protected $description = 'Index the Rapidez categories to Elasticsearch';
-
-    public function handle(): int
-    {
-        // TODO: (re)implement with Laravel Scout
-        // Move it to the caregory model?
-        return 0;
-
-        // $this->synonymsFor = ['name'];
-
-        // $this->indexStores(
-        //     stores: Rapidez::getStores($this->argument('store')),
-        //     indexName: 'categories',
-        //     items: $this->getCategories(...),
-        //     dataFilter: fn ($data) => Eventy::filter('index.category.data', $data),
-        // );
-
-        // return 0;
-    }
-
-    // public function getCategories()
-    // {
-    //     return config('rapidez.models.category')::withEventyGlobalScopes('index.categories.scopes')
-    //         ->select((new (config('rapidez.models.category')))->qualifyColumns(['entity_id', 'name', 'url_path']))
-    //         ->whereNotNull('url_key')
-    //         ->whereNot('url_key', 'default-category')
-    //         ->has('products')
-    //         ->get() ?? [];
-    // }
-}
diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 027ddd194..90bc8d33d 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -6,6 +6,7 @@
 use Rapidez\Core\Events\IndexAfterEvent;
 use Rapidez\Core\Events\IndexBeforeEvent;
 use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\Traits\Searchable;
 
 class IndexCommand extends Command
 {
@@ -15,11 +16,13 @@ class IndexCommand extends Command
 
     public function handle()
     {
+        $baseSearchableModels = collect(config('rapidez.models'))
+            ->filter(fn($class) => in_array(Searchable::class, class_uses_recursive($class)))
+            ->merge(config('rapidez.indexer.extra_models'));
+
         $types = $this->option('types')
-            ? explode(',', $this->option('types'))
-            : config('rapidez.indexer.models');
-        // TODO: Where do we put the above configuration?
-        // Can (and should?) we dynamically retrieve which models have the Searchable trait?
+            ? $baseSearchableModels->only(explode(',', $this->option('types')))
+            : $baseSearchableModels;
 
         $stores = $this->option('store')
             ? Rapidez::getStores(explode(',', $this->option('store')))
@@ -34,9 +37,11 @@ public function handle()
 
             $this->line('Store: ' . $store['name']);
 
-            foreach($types as $type) {
+            foreach($types as $type => $model) {
+                config()->set('rapidez.index', $type);
+
                 $this->call('scout:import', [
-                    'searchable' => config('rapidez.models.' . $type),
+                    'searchable' => $model,
                 ]);
             }
         }
diff --git a/src/Models/Category.php b/src/Models/Category.php
index 55a9dd9ce..376b1b530 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -7,10 +7,14 @@
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Rapidez\Core\Models\Scopes\IsActiveScope;
 use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
+use Rapidez\Core\Models\Traits\Searchable;
 
 class Category extends Model
 {
     use HasAlternatesThroughRewrites;
+    use Searchable;
+
+    protected $primaryKey = 'entity_id';
 
     protected $appends = ['url'];
 
@@ -46,11 +50,6 @@ protected static function booting()
         });
     }
 
-    public function getKeyName()
-    {
-        return $this->getTable() . '.entity_id';
-    }
-
     public function getTable()
     {
         return 'catalog_category_flat_store_' . config('rapidez.store');
@@ -98,4 +97,13 @@ public function getParentcategoriesAttribute()
             ->orderByRaw('FIELD(' . $this->getTable() . '.entity_id,' . implode(',', $categoryIds) . ')')
             ->get();
     }
+
+    protected function makeAllSearchableUsing(Builder $query)
+    {
+        return $query->withEventyGlobalScopes('index.categories.scopes')
+            ->select((new (config('rapidez.models.category')))->qualifyColumns(['entity_id', 'name']))
+            ->whereNotNull('url_key')
+            ->whereNot('url_key', 'default-category')
+            ->has('products');
+    }
 }
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 83f841b46..9dc67b0cd 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -260,11 +260,9 @@ public static function exist($productId): bool
 
     protected function makeAllSearchableUsing(Builder $query)
     {
-        $query->selectOnlyIndexable()
+        return $query->selectOnlyIndexable()
             ->with(['categoryProducts', 'reviewSummary'])
             ->withEventyGlobalScopes('index.product.scopes');
-
-        return $query;
     }
 
     public function shouldBeSearchable(): bool
@@ -281,7 +279,7 @@ public function shouldBeSearchable(): bool
         return true;
     }
 
-    public function searchableData($data, $product): array
+    public function searchableData(array $data, Product $product): array
     {
         $data['store'] = config('rapidez.store');
 
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index bc98e1aa3..0faf84f22 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Laravel\Scout\Searchable as ScoutSearchable;
 use TorMorten\Eventy\Facades\Eventy;
 
@@ -16,23 +17,16 @@ public function toSearchableArray(): array
     {
         $data = $this->searchableData($this->toArray(), $this);
 
-        $modelType = str(static::class)->afterLast('\\')->lower();
-        Eventy::filter('index.' . $modelType . '.data', $data, $this);
-
-        // TODO: Maybe double check / handle what attributes are
-        // getting indexed here. From makeAllSearchableUsing
-        // we're getting the correct data, but when you
-        // index just one; I don't think that query
-        // will be used resulting in all attrs.
-
-        // Customize the data array...
-        // cast to the correct types! (int), etc
-
-        return $data;
+        return Eventy::filter('index.' . config('rapidez.index') . '.data', $data, $this);
     }
 
-    public function searchableData($data, $model): array
+    public function searchableData(array $data, Model $model): array
     {
+        // Customize the data with this function.
+        // - $data is the actual array with data.
+        // - $model is useful for when you want to retrieve data from the actual model (e.g. relations).
+        // Return the array with data that you want to send to ES.
+
         return $data;
     }
 
@@ -47,7 +41,11 @@ public function searchableAs(): string
             throw new Exception('Do not use Scout directly. Please use `php artisan rapidez:index`.');
         }
 
-        return config('rapidez.index');
+        return implode('_', array_values([
+            config('scout.prefix'),
+            config('rapidez.index'),
+            config('rapidez.store'),
+        ]));
     }
 
     protected function makeAllSearchableUsing(Builder $query)
diff --git a/src/Rapidez.php b/src/Rapidez.php
index 996c2a1e9..264fef95e 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -129,11 +129,6 @@ public function setStore(Store|array|callable|int|string $store): void
         config()->set('rapidez.group', $store['group_id']);
         config()->set('rapidez.root_category_id', $store['root_category_id']);
         config()->set('frontend.base_url', url('/'));
-        config()->set('rapidez.index', implode('_', array_values([
-            config('scout.prefix'),
-            'products',
-            $store['store_id'],
-        ])));
 
         if (config()->get('rapidez.magento_url_from_db', false)) {
             $magentoUrl = trim(
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 74dbac01b..02148fd88 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -17,12 +17,10 @@
 use Lcobucci\JWT\Validation\RequiredConstraintsViolated;
 use Rapidez\Core\Auth\MagentoCartTokenGuard;
 use Rapidez\Core\Auth\MagentoCustomerTokenGuard;
-use Rapidez\Core\Commands\IndexCategoriesCommand;
 use Rapidez\Core\Commands\IndexCommand;
 use Rapidez\Core\Commands\InstallCommand;
 use Rapidez\Core\Commands\InstallTestsCommand;
 use Rapidez\Core\Commands\ValidateCommand;
-use Rapidez\Core\Events\IndexBeforeEvent;
 use Rapidez\Core\Events\ProductViewEvent;
 use Rapidez\Core\Facades\Rapidez as RapidezFacade;
 use Rapidez\Core\Http\Controllers\Fallback\CmsPageController;
@@ -90,16 +88,11 @@ protected function bootCommands(): self
     {
         $this->commands([
             IndexCommand::class,
-            IndexCategoriesCommand::class,
             ValidateCommand::class,
             InstallCommand::class,
             InstallTestsCommand::class,
         ]);
 
-        Event::listen(IndexBeforeEvent::class, function ($event) {
-            $event->context->call('rapidez:index:categories');
-        });
-
         return $this;
     }
 

From c223aa679980e83ae195683796eedb139425d000 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Fri, 14 Feb 2025 13:42:57 +0000
Subject: [PATCH 031/244] Apply fixes from Duster

---
 src/Commands/IndexCommand.php | 4 ++--
 src/Models/Product.php        | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 90bc8d33d..d12f464bb 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -17,7 +17,7 @@ class IndexCommand extends Command
     public function handle()
     {
         $baseSearchableModels = collect(config('rapidez.models'))
-            ->filter(fn($class) => in_array(Searchable::class, class_uses_recursive($class)))
+            ->filter(fn ($class) => in_array(Searchable::class, class_uses_recursive($class)))
             ->merge(config('rapidez.indexer.extra_models'));
 
         $types = $this->option('types')
@@ -37,7 +37,7 @@ public function handle()
 
             $this->line('Store: ' . $store['name']);
 
-            foreach($types as $type => $model) {
+            foreach ($types as $type => $model) {
                 config()->set('rapidez.index', $type);
 
                 $this->call('scout:import', [
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 9dc67b0cd..d2686179c 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -9,14 +9,12 @@
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Rapidez\Core\Casts\Children;
 use Rapidez\Core\Casts\CommaSeparatedToArray;
 use Rapidez\Core\Casts\CommaSeparatedToIntegerArray;
 use Rapidez\Core\Casts\DecodeHtmlEntities;
 use Rapidez\Core\Facades\Rapidez;
-use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
 use Rapidez\Core\Models\Scopes\Product\WithProductAttributesScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductCategoryInfoScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductChildrenScope;
@@ -24,6 +22,7 @@
 use Rapidez\Core\Models\Scopes\Product\WithProductRelationIdsScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductStockScope;
 use Rapidez\Core\Models\Scopes\Product\WithProductSuperAttributesScope;
+use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
 use Rapidez\Core\Models\Traits\Product\CastMultiselectAttributes;
 use Rapidez\Core\Models\Traits\Product\CastSuperAttributes;
 use Rapidez\Core\Models\Traits\Product\SelectAttributeScopes;
@@ -284,7 +283,7 @@ public function searchableData(array $data, Product $product): array
         $data['store'] = config('rapidez.store');
 
         // TODO: Can we do this without having to cache this?
-        $maxPositions = Cache::driver('array')->rememberForever('max-positions-' . config('rapidez.store'), function() {
+        $maxPositions = Cache::driver('array')->rememberForever('max-positions-' . config('rapidez.store'), function () {
             return CategoryProduct::query()
                 ->selectRaw('GREATEST(MAX(position), 0) as position')
                 ->addSelect('category_id')
@@ -311,7 +310,7 @@ public function searchableData(array $data, Product $product): array
     public function withCategories(array $data): array
     {
         // TODO: Do we still need to do this in this way? Can we refactor this to be nicer now that we're using Scout?
-        $categories = Cache::driver('array')->rememberForever('categories-' . config('rapidez.store'), function() {
+        $categories = Cache::driver('array')->rememberForever('categories-' . config('rapidez.store'), function () {
             return Category::withEventyGlobalScopes('index.category.scopes')
                 ->where('catalog_category_flat_store_' . config('rapidez.store') . '.entity_id', '<>', Rapidez::config('catalog/category/root_id', 2))
                 ->pluck('name', 'entity_id');

From 563109559a538e88b59d772c6792cdf2a585aa58 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 14 Feb 2025 14:52:56 +0100
Subject: [PATCH 032/244] Change command description

---
 src/Commands/IndexCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 90bc8d33d..4fb5b0456 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -12,7 +12,7 @@ class IndexCommand extends Command
 {
     protected $signature = 'rapidez:index {--t|types= : To specify types of models to index, separated by commas} {--s|store= : To specify store IDs from Magento, separated by commas}';
 
-    protected $description = 'Index all searchable models in Elasticsearch';
+    protected $description = 'Index all searchable models into ElasticSearch';
 
     public function handle()
     {

From 0c6fa5b667276d6dd1548b4844f75aade3d07876 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 14 Feb 2025 15:09:04 +0100
Subject: [PATCH 033/244] Fix index name in listing

---
 resources/views/components/listing.blade.php | 4 ++--
 src/Http/ViewComposers/ConfigComposer.php    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 8f33f0144..4f1302ee5 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -14,7 +14,7 @@
             label: window.config.translations.newest,
             field: 'created_at',
             order: 'desc',
-            value: config.index+'_created_at_desc',
+            value: config.index_prefix + '_products_' + config.store + '_created_at_desc',
             key: '_created_at_desc'
         }]"
         v-cloak
@@ -23,7 +23,7 @@
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
-                :index-name="config.index"
+                :index-name="config.index_prefix + '_products_' + config.store"
                 :routing="listingSlotProps.routing"
             >
                 <ais-configure :filters="{!! $query !!}"/>
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index e36e9a035..861b7109c 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -35,7 +35,7 @@ public function compose(View $view)
         Config::set('frontend', array_merge(
             config('frontend') ?: [],
             $exposedFrontendConfigValues,
-            $this->getConfig()
+            $this->getConfig(),
         ));
 
         Event::dispatch('rapidez:frontend-config-composed');
@@ -57,6 +57,7 @@ public function getConfig(): array
             'show_tax'                     => (bool) Rapidez::config('tax/display/type', 1),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
+            'index_prefix'                 => config('scout.prefix'),
         ];
     }
 

From 999524550a1994d0fa1e21b32bd74f891f4ba937 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 14 Feb 2025 15:13:33 +0100
Subject: [PATCH 034/244] Remove indexjob

---
 src/Jobs/IndexJob.php | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 src/Jobs/IndexJob.php

diff --git a/src/Jobs/IndexJob.php b/src/Jobs/IndexJob.php
deleted file mode 100644
index 4f3214ac9..000000000
--- a/src/Jobs/IndexJob.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Jobs;
-
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Foundation\Bus\Dispatchable;
-use MailerLite\LaravelElasticsearch\Manager as Elasticsearch;
-
-class IndexJob
-{
-    use Dispatchable;
-
-    protected string $index;
-    protected int|string $id;
-    protected array $values;
-
-    public function __construct(string $index, int|string $id, $values)
-    {
-        $this->index = $index;
-        $this->id = $id;
-        $this->values = ($values instanceof Arrayable ? $values->toArray() : (array) $values);
-    }
-
-    public function handle(Elasticsearch $elasticsearch)
-    {
-        $elasticsearch->index([
-            'index' => $this->index,
-            'id'    => $this->id,
-            'body'  => $this->values,
-        ]);
-    }
-}

From 80a3c47a648f28fd44d712c47756442d66e98eed Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 14 Feb 2025 15:49:57 +0100
Subject: [PATCH 035/244] Implement autocomplete using instantsearch-vue

---
 resources/js/components/Listing/Listing.vue   |  21 ++-
 .../js/components/Search/Autocomplete.vue     | 168 ++++++++----------
 resources/views/components/listing.blade.php  |   4 +-
 .../views/components/productlist.blade.php    |   2 +-
 resources/views/layouts/app.blade.php         |   8 +-
 .../partials/header/autocomplete.blade.php    | 117 +++++-------
 .../header/autocomplete/all-results.blade.php |  21 ++-
 .../header/autocomplete/categories.blade.php  |  30 ++--
 .../header/autocomplete/products.blade.php    |  58 +++---
 .../header/autocomplete/results.blade.php     |   3 +
 src/Http/ViewComposers/ConfigComposer.php     |   1 +
 11 files changed, 213 insertions(+), 220 deletions(-)
 create mode 100644 resources/views/layouts/partials/header/autocomplete/results.blade.php

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 2251a4ec9..ed8233110 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,14 +1,25 @@
 <script>
-import InstantSearch from 'vue-instantsearch'
+import { AisClearRefinements, AisConfigure, AisCurrentRefinements, AisHierarchicalMenu, AisHits, AisHitsPerPage, AisInstantSearch, AisPagination, AisRangeInput, AisRefinementList, AisSearchBox, AisSortBy, AisStats } from 'vue-instantsearch'
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
 import deepmerge from 'deepmerge'
 
 import { history } from 'instantsearch.js/es/lib/routers'
-import { singleIndex, simple } from 'instantsearch.js/es/lib/stateMappings'
-// We should only import the components used!
-// https://www.algolia.com/doc/guides/building-search-ui/installation/vue/?client=Vue+2#optimize-your-build-with-tree-shaking
-Vue.use(InstantSearch)
+import { simple } from 'instantsearch.js/es/lib/stateMappings'
+
+Vue.component('ais-instant-search', AisInstantSearch);
+Vue.component('ais-configure', AisConfigure);
+Vue.component('ais-refinement-list', AisRefinementList);
+Vue.component('ais-hierarchical-menu', AisHierarchicalMenu);
+Vue.component('ais-range-input', AisRangeInput);
+Vue.component('ais-search-box', AisSearchBox);
+Vue.component('ais-current-refinements', AisCurrentRefinements);
+Vue.component('ais-clear-refinements', AisClearRefinements);
+Vue.component('ais-hits', AisHits);
+Vue.component('ais-hits-per-page', AisHitsPerPage);
+Vue.component('ais-sort-by', AisSortBy);
+Vue.component('ais-pagination', AisPagination);
+Vue.component('ais-stats', AisStats);
 
 import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 44aaa726c..bfc1b2744 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,122 +1,94 @@
 <script>
-import client from '@searchkit/instantsearch-client'
-import { getAlgoliaResults } from '@algolia/autocomplete-js'
+import { AisConfigure, AisHighlight, AisHits, AisIndex, AisInstantSearch, AisSearchBox } from 'vue-instantsearch'
+import Client from '@searchkit/instantsearch-client'
+import Searchkit from 'searchkit'
+
+Vue.component('ais-instant-search', AisInstantSearch)
+Vue.component('ais-search-box', AisSearchBox)
+Vue.component('ais-hits', AisHits);
+Vue.component('ais-index', AisIndex);
+Vue.component('ais-configure', AisConfigure);
+Vue.component('ais-highlight', AisHighlight);
 
 export default {
-    props: {
-        additionals: Object,
-        debounce: {
-            type: Number,
-            default: 100,
-        },
-        size: {
-            type: Number,
-            default: 10,
-        },
-        multiMatchTypes: {
-            type: Array,
-            default: () => ['best_fields', 'phrase', 'phrase_prefix'],
-        },
-    },
+    data: () => ({
+        loaded: false,
+    }),
 
     render() {
         return this.$scopedSlots.default(this)
     },
 
-    data() {
-        return {
-            results: {},
-            resultsCount: 0,
-            searchAdditionals: () => null,
-            overlay: false,
-            searchLoading: false,
-        }
+    mounted() {
+        this.$nextTick(() => {this.$emit('mounted'); this.loaded = true})
     },
 
-    mounted() {
-        this.$nextTick(() => this.$emit('mounted'))
-        let self = this
+    computed: {
+        // TODO: Not sure if this is the right place,
+        // the autocomplete also needs this but
+        // we don't want to load everything
+        // directly due the JS size
+        searchClient: function () {
+            let client = Client(this.searchkit, {
+                hooks: {
+                    beforeSearch: async (searchRequests) => {
+                        return searchRequests;
+                    },
+                },
+            })
+
+            // Ensure no query is done if the search field is empty
+            const oldSearch = client.search;
+            client.search = async (requests) => {
+                if (requests.every(({ params }) => !params.query)) {
+                    return Promise.resolve({
+                        results: requests.map(() => ({
+                        hits: [],
+                        nbHits: 0,
+                        nbPages: 0,
+                        page: 0,
+                        processingTimeMS: 0,
+                        hitsPerPage: 0,
+                        exhaustiveNbHits: false,
+                        query: '',
+                        params: '',
+                        })),
+                    });
+                }
 
-        // Define function here to gain access to the debounce prop
-        this.searchAdditionals = useDebounceFn(function (query) {
-            if (!self.additionals) {
-                return
+                return oldSearch
+                    .bind(client)(requests)
             }
 
-            // Initialize with empty data to preserve additionals order
-            self.results = Object.fromEntries(Object.keys(self.additionals).map((indexName) => [indexName, []]))
-            self.resultsCount = 0
+            return client
+        },
 
+        searchkit: function () {
             let url = new URL(config.es_url)
-            let auth = `Basic ${btoa(`${url.username}:${url.password}`)}`
-            let baseUrl = url.origin
 
-            Object.entries(self.additionals).forEach(([name, data]) => {
-                let stores = data['stores'] ?? null
-                if (stores && !stores.includes(window.config.store_code)) {
-                    return
-                }
-
-                let fields = data['fields'] ?? data
-                let size = data['size'] ?? self.size ?? undefined
-                let sort = data['sort'] ?? undefined
-
-                let multimatch = self.multiMatchTypes.map((type) => ({
-                    multi_match: {
-                        query: query,
-                        type: type,
-                        fields: fields,
-                        fuzziness: type.includes('phrase') ? undefined : 'AUTO',
-                    },
-                }))
-
-                let esQuery = {
-                    size: size,
-                    sort: sort,
-                    query: {
-                        bool: {
-                            should: multimatch,
-                            minimum_should_match: 1,
-                        },
-                    },
-                    highlight: {
-                        pre_tags: ['<mark>'],
-                        post_tags: ['</mark>'],
-                        fields: Object.fromEntries(fields.map((field) => [field.split('^')[0], {}])),
-                        require_field_match: false,
+            let searchkit = new Searchkit({
+                connection: {
+                    host: url.origin,
+                    auth: {
+                        username: url.username,
+                        password: url.password,
                     },
-                }
+                },
 
-                // es_prefix has been removed, Scout is used
-                rapidezFetch(`${baseUrl}/${config.es_prefix}_${name}_${config.store}/_search`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json', Authorization: auth },
-                    body: JSON.stringify(esQuery),
-                }).then(async (response) => {
-                    const responseData = await response.json()
-
-                    self.results[name] = responseData?.hits ?? []
-                    self.results.count += self.results[name]?.hits?.length ?? 0
-                })
+                // TODO: Maybe just do: search_settings: config.searchkit
+                // so it's possible to add anything to the PHP config
+                // and that will appear here?
+                search_settings: {
+                    highlight_attributes: config.searchkit.highlight_attributes,
+                    search_attributes: config.searchkit.search_attributes,
+                    result_attributes: config.searchkit.result_attributes,
+                    filter_attributes: config.searchkit.filter_attributes,
+                },
             })
-        }, self.debounce)
-    },
 
-    methods: {
-        startLoading() {
-            this.searchLoading = true
-        },
-        stopLoading() {
-            this.searchLoading = false
-        },
-        highlight(hit, field) {
-            let source = hit._source ?? hit.source
-            let highlight = hit.highlight ?? source.highlight
-            return highlight?.[field]?.[0] ?? source?.[field] ?? ''
-        },
-        showOverlay(isOpen) {
-            this.overlay = isOpen
+            return searchkit
         },
     },
 }
 </script>
+
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 8f33f0144..330eb114b 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -14,7 +14,7 @@
             label: window.config.translations.newest,
             field: 'created_at',
             order: 'desc',
-            value: config.index+'_created_at_desc',
+            value: config.index.product+'_created_at_desc',
             key: '_created_at_desc'
         }]"
         v-cloak
@@ -23,7 +23,7 @@
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
-                :index-name="config.index"
+                :index-name="config.index.product"
                 :routing="listingSlotProps.routing"
             >
                 <ais-configure :filters="{!! $query !!}"/>
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index ba30bde5c..f92f09166 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -22,7 +22,7 @@
                 <ais-instant-search
                     v-if="loaded"
                     :search-client="searchClient"
-                    :index-name="config.index"
+                    :index-name="config.index.product"
                 >
                     <ais-configure :filters="'{{ $field }}:({{ is_array($value)
                         ? implode(' OR ', $value)
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 0f3308994..337255598 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -19,9 +19,15 @@
     <meta name="description" content="@yield('description', Rapidez::config('design/head/default_description', ''))"/>
     <meta name="robots" content="@yield('robots', Rapidez::config('design/search_engine_robots/default_robots', 'INDEX,FOLLOW'))"/>
     <link rel="canonical" href="@yield('canonical', url()->current())" />
-
+    <meta name="turbo-refresh-method" content="morph">
+    <meta name="turbo-refresh-scroll" content="preserve">
     @vite(['resources/css/app.css', 'resources/js/app.js'])
 
+    {{-- TODO fix nested lazy loading components --}}
+    @if ($file = vite_filename_path('Autocomplete.vue'))
+        @vite([$file])
+    @endif
+
     @stack('head')
     @config('design/head/includes')
 </head>
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 14c12eeff..082d0fb21 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,82 +1,49 @@
-{{--
-<autocomplete>
-
-</autocomplete>
- --}}
-
-@return
-
-@php $inputClasses = 'relative z-header-autocomplete border !font-sans !border-default !text-sm !min-h-0 outline-0 ring-0 !h-auto rounded-xl !pl-5 !pr-24 !py-3.5 !bg-white w-full focus:ring-transparent search-input' @endphp
-
 <div v-if="!$root.loadAutocomplete" class="relative w-full">
-    <label for="autocomplete-input" class="sr-only">@lang('Search')</label>
-    <input
-        id="autocomplete-input"
-        placeholder="@lang('What are you looking for?')"
-        class="{{ $inputClasses }}"
-        v-on:focus="$root.loadAutocomplete = true"
-    >
+    <form method="get" action="{{ route('search') }}">
+        <x-rapidez::input
+            type="search"
+            name="q"
+            :placeholder="__('What are you looking for?')"
+            v-on:focus="$root.loadAutocomplete = true"
+            v-on:mouseover="$root.loadAutocomplete = true"
+        />
+    </form>
     <x-rapidez::autocomplete.magnifying-glass />
 </div>
-
-<autocomplete
-    v-else
-    v-on:mounted="() => window.document.getElementById('autocomplete-input').focus()"
-    v-bind:additionals="{{ json_encode(config('rapidez.frontend.autocomplete.additionals')) }}"
-    v-bind:debounce="{{ config('rapidez.frontend.autocomplete.debounce') }}"
-    v-bind:size="{{ config('rapidez.frontend.autocomplete.size') }}"
-    class="relative w-full"
-    v-cloak
->
-    {{-- <x-rapidez::reactive-base slot-scope="autocompleteScope"> --}}
-        <div
-            class="z-header-autocomplete-overlay pointer-events-none fixed inset-0 cursor-pointer bg-black/40 opacity-0 transition duration-500"
-            :class="autocompleteScope.overlay ? 'pointer-events-auto opacity-100 prevent-scroll' : 'opacity-0 pointer-events-none '"
-        ></div>
-        <x-rapidez::autocomplete.magnifying-glass v-bind:class="{ 'bg-primary text-white': autocompleteScope.overlay }" />
-        <data-search
-            placeholder="@lang('What are you looking for?')"
-            v-on:value-selected="search"
-            component-id="autocomplete"
-            :inner-class="{ input: '{{ $inputClasses }}' }"
-            class="relative [&_*]:!m-0"
-            :data-field="Object.keys(config.searchable)"
-            :field-weights="Object.values(config.searchable)"
-            :show-icon="false"
-            fuzziness="AUTO"
-            v-bind:debounce="autocompleteScope.debounce"
-            v-on:blur="autocompleteScope.showOverlay(false)"
-            v-on:focus="autocompleteScope.showOverlay(true)"
-            v-bind:size="autocompleteScope.size"
-            :highlight="true"
-            v-on:value-change="autocompleteScope.searchAdditionals"
-            v-on:key-down="autocompleteScope.startLoading"
-            v-on:suggestions="autocompleteScope.stopLoading"
+<autocomplete v-else>
+    <div slot-scope="{ searchClient, loaded }" class="relative w-full"  v-if="loaded">
+        <ais-instant-search
+            class="contents"
+            :search-client="searchClient"
+            :index-name="config.index"
         >
-            <div slot="render" slot-scope="dataSearchScope">
-                <div
-                    v-if="dataSearchScope.downshiftProps.isOpen && !autocompleteScope.searchLoading && !dataSearchScope.loading && dataSearchScope.value"
-                    class="z-header-autocomplete absolute -inset-x-5 top-14 overflow-x-hidden overflow-y-auto scrollbar-hide pt-4 pb-7 bg-white max-md:h-[calc(100svh-150px)] max-md:max-h-[calc(100svh-150px)] md:top-14 md:max-h-[calc(100svh-150px)] md:rounded-xl md:border md:inset-x-0 md:w-full md:-translate-y-px"
-                >
-                    <div v-if="dataSearchScope.data.length || autocompleteScope.resultsCount">
-                        <div class="flex flex-col prose-li:px-5 hover:prose-li:bg-muted">
-                            {{-- The order can be changed with https://tailwindcss.com/docs/order --}}
-                            <template v-for="(resultsData, resultsType) in autocompleteScope.results ?? {}" v-if="resultsData?.hits?.length">
-                                @foreach (config('rapidez.frontend.autocomplete.additionals') as $key => $fields)
-                                    <template v-if="resultsType == '{{ $key }}'">
-                                        @includeIf('rapidez::layouts.partials.header.autocomplete.' . $key)
-                                    </template>
-                                @endforeach
-                            </template>
-                            @include('rapidez::layouts.partials.header.autocomplete.products')
-                        </div>
-                        @include('rapidez::layouts.partials.header.autocomplete.all-results')
-                    </div>
-                    <div v-else class="p-5">
-                        @include('rapidez::layouts.partials.header.autocomplete.no-results')
-                    </div>
+            <div class="contents">
+                <ais-configure :hits-per-page.camel="3"/>
+                <div class="searchbox">
+                    <ais-search-box>
+                        <template v-slot="{ currentRefinement, isSearchStalled, refine }">
+                            <form name="autocomplete-form" id="autocomplete-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
+                                <x-rapidez::input
+                                    type="search"
+                                    focus="true"
+                                    autocomplete="off"
+                                    autocorrect="off"
+                                    autocapitalize="none"
+                                    spellcheck="false"
+                                    name="q"
+                                    v-bind:value="currentRefinement"
+                                    v-on:input="refine($event.currentTarget.value)"
+                                    :placeholder="__('What are you looking for?')"
+                                />
+                                <x-rapidez::button class="absolute right-0 bg-none border-none" type="submit"><x-rapidez::autocomplete.magnifying-glass /></x-rapidez::button>
+                            </form>
+                        </template>
+                    </ais-search-box>
+                </div>
+                <div class="absolute inset-x-0 bg-white border">
+                    @include('rapidez::layouts.partials.header.autocomplete.results')
                 </div>
             </div>
-        </data-search>
-    {{-- </x-rapidez::reactive-base> --}}
+        </ais-instant-search>
+    </div>
 </autocomplete>
diff --git a/resources/views/layouts/partials/header/autocomplete/all-results.blade.php b/resources/views/layouts/partials/header/autocomplete/all-results.blade.php
index 8ec3aad5e..ce8f875b4 100644
--- a/resources/views/layouts/partials/header/autocomplete/all-results.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/all-results.blade.php
@@ -1,8 +1,13 @@
-<div class="font-sans px-5">
-    <x-rapidez::button.primary
-        v-bind:href="'/search?q=' + dataSearchScope.value"
-        class="relative group flex items-center gap-x-4 w-full text-sm"
-    >
-        <span>@lang('View all products')</span>
-    </x-rapidez::button.primary>
-</div>
+<ais-hits>
+    <template v-slot="{ items }">
+        <div v-if="items && items.length" class="font-sans px-5 py-2">
+            <x-rapidez::button.primary
+                type="submit"
+                form="autocomplete-form"
+                class="relative group flex items-center gap-x-4 w-full text-sm"
+            >
+                <span>@lang('View all products')</span>
+            </x-rapidez::button.primary>
+        </div>
+    </template>
+</ais-hits>
diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index 2d5aa1eb0..df09d890f 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -1,10 +1,20 @@
-<div class="border-b pb-2">
-    <x-rapidez::autocomplete.title>@lang('Categories')</x-rapidez::autocomplete.title>
-    <ul class="flex flex-col font-sans">
-        <li v-for="hit in resultsData.hits" :key="hit._source.id" class="flex flex-1 items-center w-full">
-            <a v-bind:href="hit._source.url" class="relative flex items-center group w-full py-2 text-sm gap-x-4">
-                <span class="ml-2 line-clamp-2" v-html="autocompleteScope.highlight(hit, 'name')"></span>
-            </a>
-        </li>
-    </ul>
-</div>
+<ais-index :index-name="config.index_prefix + '_categories_' + config.store">
+    <ais-hits v-slot="{ items }">
+        <div class="border-b p-2" v-if="items && items.length">
+            <x-rapidez::autocomplete.title>@lang('Categories')</x-rapidez::autocomplete.title>
+            <ul class="flex flex-col font-sans">
+                <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
+                    <a v-bind:href="item.url" class="relative flex items-center group w-full py-2 text-sm gap-x-4">
+                        <span class="ml-2 line-clamp-2">
+                            <ais-highlight
+                                attribute="name"
+                                :hit="item"
+                                highlightedTagName="mark"
+                            />
+                        </span>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </ais-hits>
+</ais-index>
diff --git a/resources/views/layouts/partials/header/autocomplete/products.blade.php b/resources/views/layouts/partials/header/autocomplete/products.blade.php
index b06166028..b539ce68e 100644
--- a/resources/views/layouts/partials/header/autocomplete/products.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/products.blade.php
@@ -1,21 +1,39 @@
-<div class="pt-4 pb-2">
-    <x-rapidez::autocomplete.title>@lang('Products')</x-rapidez::autocomplete.title>
-    <ul class="gap-2 flex flex-col">
-        <li v-for="suggestion in dataSearchScope.data" :key="suggestion.source._id">
-            <a v-bind:href="suggestion.source.url | url" class="group relative flex flex-wrap py-2">
-                <img :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + suggestion.source.thumbnail + '.webp'" class="shrink-0 self-center object-contain size-16 mix-blend-multiply" />
-                <div class="flex flex-1 justify-center flex-col px-2">
-                    <div class="text-sm font-medium font-sans hyphens-auto line-clamp-2 w-full" v-html="autocompleteScope.highlight(suggestion, 'name')"></div>
-                    <div class="flex items-center gap-x-0.5 mt-0.5">
-                        <div v-if="suggestion.source.special_price" class="text-muted font-sans line-through text-xs">
-                            @{{ suggestion.source.price | price }}
+<ais-hits>
+    <template v-slot="{ items }">
+        <div v-if="items && items.length" class="p-2">
+            <x-rapidez::autocomplete.title>@lang('Products')</x-rapidez::autocomplete.title>
+            <ul v-for="(item, count) in items" class="gap-2 flex flex-col">
+                <li>
+                    <a :href="item.url | url" class="group relative flex flex-wrap py-2">
+                        <img
+                            v-if="item.thumbnail"
+                            :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + item.thumbnail + '.webp'"
+                            class="shrink-0 self-center object-contain size-16 mix-blend-multiply" :alt="item.name" :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
+                            width="200"
+                            height="200"
+                        />
+                        <x-rapidez::no-image v-else class="mb-3 h-48 rounded-t" />
+                        <div class="flex flex-1 justify-center flex-col px-2">
+                            <span>
+                                <ais-highlight
+                                    attribute="name"
+                                    :hit="item"
+                                    highlightedTagName="mark"
+                                />
+                            </span>
+
+                            <div class="flex items-center gap-x-0.5 mt-0.5">
+                                <div v-if="item.special_price" class="text-muted font-sans line-through text-xs">
+                                    @{{ item.price | price }}
+                                </div>
+                                <div class="text-sm text font-sans font-bold">
+                                    @{{ (item.special_price || item.price) | price }}
+                                </div>
+                            </div>
                         </div>
-                        <div class="text-sm text font-sans font-bold">
-                            @{{ (suggestion.source.special_price || suggestion.source.price) | price }}
-                        </div>
-                    </div>
-                </div>
-            </a>
-        </li>
-    </ul>
-</div>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </template>
+</ais-hits>
diff --git a/resources/views/layouts/partials/header/autocomplete/results.blade.php b/resources/views/layouts/partials/header/autocomplete/results.blade.php
new file mode 100644
index 000000000..79b053ef6
--- /dev/null
+++ b/resources/views/layouts/partials/header/autocomplete/results.blade.php
@@ -0,0 +1,3 @@
+@include('rapidez::layouts.partials.header.autocomplete.categories')
+@include('rapidez::layouts.partials.header.autocomplete.products')
+@include('rapidez::layouts.partials.header.autocomplete.all-results')
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index e36e9a035..7e79d506f 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -57,6 +57,7 @@ public function getConfig(): array
             'show_tax'                     => (bool) Rapidez::config('tax/display/type', 1),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
+            'index_prefix'                 => config('scout.prefix'),
         ];
     }
 

From 1ee8a477de3035ef38604ab417e00bbe58cf6db3 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:50:39 +0000
Subject: [PATCH 036/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue   | 42 ++++++++++++-------
 .../js/components/Search/Autocomplete.vue     | 41 +++++++++---------
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index ed8233110..dc8f2fe5e 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,5 +1,19 @@
 <script>
-import { AisClearRefinements, AisConfigure, AisCurrentRefinements, AisHierarchicalMenu, AisHits, AisHitsPerPage, AisInstantSearch, AisPagination, AisRangeInput, AisRefinementList, AisSearchBox, AisSortBy, AisStats } from 'vue-instantsearch'
+import {
+    AisClearRefinements,
+    AisConfigure,
+    AisCurrentRefinements,
+    AisHierarchicalMenu,
+    AisHits,
+    AisHitsPerPage,
+    AisInstantSearch,
+    AisPagination,
+    AisRangeInput,
+    AisRefinementList,
+    AisSearchBox,
+    AisSortBy,
+    AisStats,
+} from 'vue-instantsearch'
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
 import deepmerge from 'deepmerge'
@@ -7,19 +21,19 @@ import deepmerge from 'deepmerge'
 import { history } from 'instantsearch.js/es/lib/routers'
 import { simple } from 'instantsearch.js/es/lib/stateMappings'
 
-Vue.component('ais-instant-search', AisInstantSearch);
-Vue.component('ais-configure', AisConfigure);
-Vue.component('ais-refinement-list', AisRefinementList);
-Vue.component('ais-hierarchical-menu', AisHierarchicalMenu);
-Vue.component('ais-range-input', AisRangeInput);
-Vue.component('ais-search-box', AisSearchBox);
-Vue.component('ais-current-refinements', AisCurrentRefinements);
-Vue.component('ais-clear-refinements', AisClearRefinements);
-Vue.component('ais-hits', AisHits);
-Vue.component('ais-hits-per-page', AisHitsPerPage);
-Vue.component('ais-sort-by', AisSortBy);
-Vue.component('ais-pagination', AisPagination);
-Vue.component('ais-stats', AisStats);
+Vue.component('ais-instant-search', AisInstantSearch)
+Vue.component('ais-configure', AisConfigure)
+Vue.component('ais-refinement-list', AisRefinementList)
+Vue.component('ais-hierarchical-menu', AisHierarchicalMenu)
+Vue.component('ais-range-input', AisRangeInput)
+Vue.component('ais-search-box', AisSearchBox)
+Vue.component('ais-current-refinements', AisCurrentRefinements)
+Vue.component('ais-clear-refinements', AisClearRefinements)
+Vue.component('ais-hits', AisHits)
+Vue.component('ais-hits-per-page', AisHitsPerPage)
+Vue.component('ais-sort-by', AisSortBy)
+Vue.component('ais-pagination', AisPagination)
+Vue.component('ais-stats', AisStats)
 
 import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index bfc1b2744..7d88fe949 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -5,10 +5,10 @@ import Searchkit from 'searchkit'
 
 Vue.component('ais-instant-search', AisInstantSearch)
 Vue.component('ais-search-box', AisSearchBox)
-Vue.component('ais-hits', AisHits);
-Vue.component('ais-index', AisIndex);
-Vue.component('ais-configure', AisConfigure);
-Vue.component('ais-highlight', AisHighlight);
+Vue.component('ais-hits', AisHits)
+Vue.component('ais-index', AisIndex)
+Vue.component('ais-configure', AisConfigure)
+Vue.component('ais-highlight', AisHighlight)
 
 export default {
     data: () => ({
@@ -20,7 +20,10 @@ export default {
     },
 
     mounted() {
-        this.$nextTick(() => {this.$emit('mounted'); this.loaded = true})
+        this.$nextTick(() => {
+            this.$emit('mounted')
+            this.loaded = true
+        })
     },
 
     computed: {
@@ -32,32 +35,31 @@ export default {
             let client = Client(this.searchkit, {
                 hooks: {
                     beforeSearch: async (searchRequests) => {
-                        return searchRequests;
+                        return searchRequests
                     },
                 },
             })
 
             // Ensure no query is done if the search field is empty
-            const oldSearch = client.search;
+            const oldSearch = client.search
             client.search = async (requests) => {
                 if (requests.every(({ params }) => !params.query)) {
                     return Promise.resolve({
                         results: requests.map(() => ({
-                        hits: [],
-                        nbHits: 0,
-                        nbPages: 0,
-                        page: 0,
-                        processingTimeMS: 0,
-                        hitsPerPage: 0,
-                        exhaustiveNbHits: false,
-                        query: '',
-                        params: '',
+                            hits: [],
+                            nbHits: 0,
+                            nbPages: 0,
+                            page: 0,
+                            processingTimeMS: 0,
+                            hitsPerPage: 0,
+                            exhaustiveNbHits: false,
+                            query: '',
+                            params: '',
                         })),
-                    });
+                    })
                 }
 
-                return oldSearch
-                    .bind(client)(requests)
+                return oldSearch.bind(client)(requests)
             }
 
             return client
@@ -91,4 +93,3 @@ export default {
     },
 }
 </script>
-

From 6a00a5cd266871bb5cceb946475ef1ff6193621e Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 14 Feb 2025 15:51:49 +0100
Subject: [PATCH 037/244] Implement autocomplete using instantsearch-vue

---
 resources/views/components/listing.blade.php     | 4 ++--
 resources/views/components/productlist.blade.php | 2 +-
 resources/views/layouts/app.blade.php            | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 330eb114b..8f33f0144 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -14,7 +14,7 @@
             label: window.config.translations.newest,
             field: 'created_at',
             order: 'desc',
-            value: config.index.product+'_created_at_desc',
+            value: config.index+'_created_at_desc',
             key: '_created_at_desc'
         }]"
         v-cloak
@@ -23,7 +23,7 @@
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
-                :index-name="config.index.product"
+                :index-name="config.index"
                 :routing="listingSlotProps.routing"
             >
                 <ais-configure :filters="{!! $query !!}"/>
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index f92f09166..ba30bde5c 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -22,7 +22,7 @@
                 <ais-instant-search
                     v-if="loaded"
                     :search-client="searchClient"
-                    :index-name="config.index.product"
+                    :index-name="config.index"
                 >
                     <ais-configure :filters="'{{ $field }}:({{ is_array($value)
                         ? implode(' OR ', $value)
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 337255598..4a66fe26e 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -19,8 +19,7 @@
     <meta name="description" content="@yield('description', Rapidez::config('design/head/default_description', ''))"/>
     <meta name="robots" content="@yield('robots', Rapidez::config('design/search_engine_robots/default_robots', 'INDEX,FOLLOW'))"/>
     <link rel="canonical" href="@yield('canonical', url()->current())" />
-    <meta name="turbo-refresh-method" content="morph">
-    <meta name="turbo-refresh-scroll" content="preserve">
+
     @vite(['resources/css/app.css', 'resources/js/app.js'])
 
     {{-- TODO fix nested lazy loading components --}}

From 71de0b1b1bb589a9e7994e44076fd6eda86319c7 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 14 Feb 2025 15:54:58 +0100
Subject: [PATCH 038/244] Add back dynamic autocomplete fields

---
 .../layouts/partials/header/autocomplete/results.blade.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/views/layouts/partials/header/autocomplete/results.blade.php b/resources/views/layouts/partials/header/autocomplete/results.blade.php
index 79b053ef6..ce2ed31b9 100644
--- a/resources/views/layouts/partials/header/autocomplete/results.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/results.blade.php
@@ -1,3 +1,5 @@
-@include('rapidez::layouts.partials.header.autocomplete.categories')
+@foreach (config('rapidez.frontend.autocomplete.additionals') as $key => $fields)
+    @includeIf('rapidez::layouts.partials.header.autocomplete.' . $key)
+@endforeach
 @include('rapidez::layouts.partials.header.autocomplete.products')
 @include('rapidez::layouts.partials.header.autocomplete.all-results')

From 128acde9baa4d1bf0703729e985f4ecf8761f566 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 14 Feb 2025 15:59:08 +0100
Subject: [PATCH 039/244] Fix warning logs

---
 .../layouts/partials/header/autocomplete/categories.blade.php   | 2 +-
 .../layouts/partials/header/autocomplete/products.blade.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index df09d890f..664e8b397 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -9,7 +9,7 @@
                             <ais-highlight
                                 attribute="name"
                                 :hit="item"
-                                highlightedTagName="mark"
+                                highlighted-tag-name="mark"
                             />
                         </span>
                     </a>
diff --git a/resources/views/layouts/partials/header/autocomplete/products.blade.php b/resources/views/layouts/partials/header/autocomplete/products.blade.php
index b539ce68e..bfadfebf9 100644
--- a/resources/views/layouts/partials/header/autocomplete/products.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/products.blade.php
@@ -18,7 +18,7 @@ class="shrink-0 self-center object-contain size-16 mix-blend-multiply" :alt="ite
                                 <ais-highlight
                                     attribute="name"
                                     :hit="item"
-                                    highlightedTagName="mark"
+                                    highlighted-tag-name="mark"
                                 />
                             </span>
 

From f4252e962f23e72864a3d4d0267b0fcc1fda6b71 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Tue, 18 Feb 2025 09:01:01 +0100
Subject: [PATCH 040/244] Todos

---
 resources/js/components/Listing/Listing.vue                | 2 ++
 resources/js/components/Search/Autocomplete.vue            | 6 +++---
 .../views/layouts/partials/header/autocomplete.blade.php   | 7 +++++--
 .../layouts/partials/header/autocomplete/results.blade.php | 1 +
 src/Http/ViewComposers/ConfigComposer.php                  | 4 ++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index dc8f2fe5e..47bc260e5 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,4 +1,6 @@
 <script>
+// TODO: How can we have this extendable in 
+// case we want to use another component?
 import {
     AisClearRefinements,
     AisConfigure,
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 7d88fe949..2edb64147 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -65,6 +65,7 @@ export default {
             return client
         },
 
+        // TODO: Maybe extract this so we have this once?
         searchkit: function () {
             let url = new URL(config.es_url)
 
@@ -77,9 +78,8 @@ export default {
                     },
                 },
 
-                // TODO: Maybe just do: search_settings: config.searchkit
-                // so it's possible to add anything to the PHP config
-                // and that will appear here?
+                // TODO: Should we split this as it could
+                // diff from the settings on listings.
                 search_settings: {
                     highlight_attributes: config.searchkit.highlight_attributes,
                     search_attributes: config.searchkit.search_attributes,
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 082d0fb21..14418432d 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -11,13 +11,14 @@
     <x-rapidez::autocomplete.magnifying-glass />
 </div>
 <autocomplete v-else>
-    <div slot-scope="{ searchClient, loaded }" class="relative w-full"  v-if="loaded">
+    <div slot-scope="{ searchClient, loaded }" class="relative w-full" v-if="loaded">
         <ais-instant-search
             class="contents"
             :search-client="searchClient"
             :index-name="config.index"
         >
             <div class="contents">
+                <!-- TODO: This is a Vue 3 thing -->
                 <ais-configure :hits-per-page.camel="3"/>
                 <div class="searchbox">
                     <ais-search-box>
@@ -35,7 +36,9 @@ class="contents"
                                     v-on:input="refine($event.currentTarget.value)"
                                     :placeholder="__('What are you looking for?')"
                                 />
-                                <x-rapidez::button class="absolute right-0 bg-none border-none" type="submit"><x-rapidez::autocomplete.magnifying-glass /></x-rapidez::button>
+                                <x-rapidez::button class="absolute right-0 bg-none border-none" type="submit">
+                                    <x-rapidez::autocomplete.magnifying-glass />
+                                </x-rapidez::button>
                             </form>
                         </template>
                     </ais-search-box>
diff --git a/resources/views/layouts/partials/header/autocomplete/results.blade.php b/resources/views/layouts/partials/header/autocomplete/results.blade.php
index ce2ed31b9..6c1880920 100644
--- a/resources/views/layouts/partials/header/autocomplete/results.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/results.blade.php
@@ -2,4 +2,5 @@
     @includeIf('rapidez::layouts.partials.header.autocomplete.' . $key)
 @endforeach
 @include('rapidez::layouts.partials.header.autocomplete.products')
+<!-- TODO: What about the no-results view? -->
 @include('rapidez::layouts.partials.header.autocomplete.all-results')
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 7e79d506f..810392938 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -57,6 +57,10 @@ public function getConfig(): array
             'show_tax'                     => (bool) Rapidez::config('tax/display/type', 1),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
+            // TODO: For the products we've the `rapidez.index` config
+            // set from the `src/Rapidez.php` which is accessible
+            // in the frontend with `config.index`, maybe we
+            // should change that to `config.index.TYPE`?
             'index_prefix'                 => config('scout.prefix'),
         ];
     }

From 648277d7fd853157d4255814a307946dcf0a184e Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Tue, 18 Feb 2025 08:01:21 +0000
Subject: [PATCH 041/244] Apply fixes from Duster

---
 src/Http/ViewComposers/ConfigComposer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 810392938..7c986f465 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -61,7 +61,7 @@ public function getConfig(): array
             // set from the `src/Rapidez.php` which is accessible
             // in the frontend with `config.index`, maybe we
             // should change that to `config.index.TYPE`?
-            'index_prefix'                 => config('scout.prefix'),
+            'index_prefix' => config('scout.prefix'),
         ];
     }
 

From 55678ce6e23307a5d0d0f82220c9c579604a037d Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Tue, 18 Feb 2025 08:01:51 +0000
Subject: [PATCH 042/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 47bc260e5..05ebf3cc1 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,5 +1,5 @@
 <script>
-// TODO: How can we have this extendable in 
+// TODO: How can we have this extendable in
 // case we want to use another component?
 import {
     AisClearRefinements,

From 1ed9fa7af16941c078b06fd0d23d16c9ca4d8ca4 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Tue, 18 Feb 2025 10:25:42 +0000
Subject: [PATCH 043/244] Apply fixes from Duster

---
 src/Http/ViewComposers/ConfigComposer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 93ccd5895..4bcfb1f55 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -62,7 +62,7 @@ public function getConfig(): array
             // set from the `src/Rapidez.php` which is accessible
             // in the frontend with `config.index`, maybe we
             // should change that to `config.index.TYPE`?
-            'index_prefix'                 => config('scout.prefix'),
+            'index_prefix' => config('scout.prefix'),
         ];
     }
 

From a76853e431ea82399173fb0024ad23daa342cac8 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Tue, 18 Feb 2025 12:47:45 +0100
Subject: [PATCH 044/244] Todos

---
 resources/views/components/listing.blade.php | 2 ++
 src/Models/Category.php                      | 2 ++
 src/Models/Product.php                       | 2 ++
 src/Models/Traits/Searchable.php             | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 4f1302ee5..12cd1b77d 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -14,6 +14,7 @@
             label: window.config.translations.newest,
             field: 'created_at',
             order: 'desc',
+            {{-- TODO: Extract this somewhere? --}}
             value: config.index_prefix + '_products_' + config.store + '_created_at_desc',
             key: '_created_at_desc'
         }]"
@@ -23,6 +24,7 @@
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
+                {{-- TODO: Extract this somewhere? --}}
                 :index-name="config.index_prefix + '_products_' + config.store"
                 :routing="listingSlotProps.routing"
             >
diff --git a/src/Models/Category.php b/src/Models/Category.php
index 376b1b530..baacb439e 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -100,6 +100,8 @@ public function getParentcategoriesAttribute()
 
     protected function makeAllSearchableUsing(Builder $query)
     {
+        // TODO: Is this filter still useful? You could override and
+        // extend the existing model which gives you full control
         return $query->withEventyGlobalScopes('index.categories.scopes')
             ->select((new (config('rapidez.models.category')))->qualifyColumns(['entity_id', 'name']))
             ->whereNotNull('url_key')
diff --git a/src/Models/Product.php b/src/Models/Product.php
index d2686179c..e63f95285 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -307,6 +307,8 @@ public function searchableData(array $data, Product $product): array
         return $data;
     }
 
+    // TODO: With this and all methods above this model
+    // is getting pretty big... can we move this?
     public function withCategories(array $data): array
     {
         // TODO: Do we still need to do this in this way? Can we refactor this to be nicer now that we're using Scout?
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 0faf84f22..92ccddab1 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -17,9 +17,12 @@ public function toSearchableArray(): array
     {
         $data = $this->searchableData($this->toArray(), $this);
 
+        // TODO: Is this filter still useful? Overriding the model gives you full control
         return Eventy::filter('index.' . config('rapidez.index') . '.data', $data, $this);
     }
 
+    // TODO: Not sure if this is the best idea, we already
+    // have the toSearchableArray for this.
     public function searchableData(array $data, Model $model): array
     {
         // Customize the data with this function.
@@ -43,6 +46,7 @@ public function searchableAs(): string
 
         return implode('_', array_values([
             config('scout.prefix'),
+            // TODO: Maybe use the model name here?
             config('rapidez.index'),
             config('rapidez.store'),
         ]));

From cd55d174249979cb562e023fcf74c5dbdc4acfc4 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Tue, 18 Feb 2025 11:57:10 +0000
Subject: [PATCH 045/244] Apply fixes from Prettier

---
 yarn.lock | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 56482595d..eb8b41c7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1815,13 +1815,6 @@ vue-turbolinks@^2.2.2:
   resolved "https://registry.yarnpkg.com/vue-turbolinks/-/vue-turbolinks-2.2.2.tgz#6b7b5c4120f5586907ef977be4b63a734bf8cd36"
   integrity sha512-pPO2Fr+1UgdhUK9dc5OhjLSeYi5LZAm/VZBXOVQgLHCO31bRjAof/+W/e/6SHCbnb1xdZb1gW5T9MX0k9ejSAQ==
 
-vue-types@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/vue-types/-/vue-types-1.7.0.tgz#07b273342aba7cc43d9460d9c4f4a4cf5eeb00b1"
-  integrity sha512-MbhuWukmcBJHdfXAdLerbP29i3j2HAJoKwEv7No2Jh/YNl9dOKsNBfvMOkf0SS8VCuWd1/JBX4NnGaGUojbkUA==
-  dependencies:
-    is-plain-object "3.0.0"
-
 vue2-teleport@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/vue2-teleport/-/vue2-teleport-1.1.4.tgz#30c84b1005bf9c208b1c05f4b6147300c54ee846"

From 7c7001cef62b55d15de65bfe62bd0844ba8e2957 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 21 Feb 2025 14:12:07 +0100
Subject: [PATCH 046/244] Make basic router

---
 resources/js/components/Listing/Listing.vue | 35 +++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 05ebf3cc1..84cbdce91 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -21,7 +21,6 @@ import Searchkit from 'searchkit'
 import deepmerge from 'deepmerge'
 
 import { history } from 'instantsearch.js/es/lib/routers'
-import { simple } from 'instantsearch.js/es/lib/stateMappings'
 
 Vue.component('ais-instant-search', AisInstantSearch)
 Vue.component('ais-configure', AisConfigure)
@@ -64,13 +63,37 @@ export default {
         // don't need this.
         searchTerm: new URLSearchParams(window.location.search).get('q'),
 
-        // TODO: We need some finetuning here; the url isn't very clean.
-        // Also after a refresh the filters aren't selected.
-        // Maybe it conflicts with ReactiveSearch?
         routing: {
-            router: history(),
+            router: history({
+                cleanUrlOnDispose: false,
+            }),
             // stateMapping: singleIndex('rapidez_products_1'),
-            stateMapping: simple(),
+            stateMapping: {
+                stateToRoute(uiState) {
+                    // TODO: Extract this somewhere?
+                    let index = config.index_prefix + '_products_' + config.store
+                    let data = uiState[index]
+
+                    let parameters = { ...(data.range || {}), ...(data.refinementList || {}) }
+
+                    return parameters
+                },
+
+                routeToState(routeState) {
+                    // TODO: Maybe allow other range-based attributes?
+                    let rangeAttributes = ['price']
+
+                    // TODO: Extract this somewhere?
+                    let index = config.index_prefix + '_products_' + config.store
+
+                    return {
+                        [index]: {
+                            refinementList: Object.fromEntries(Object.entries(routeState).filter(([key, _]) => !rangeAttributes.includes(key))),
+                            range: Object.fromEntries(Object.entries(routeState).filter(([key, _]) => rangeAttributes.includes(key))),
+                        }
+                    }
+                },
+            },
         },
     }),
 

From 8ea35b0f95bb80b8a5e810a4e2ec8f647f5443f6 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 21 Feb 2025 17:05:35 +0100
Subject: [PATCH 047/244] Fix the recursion of the recursion component

---
 resources/js/components/Recursion.vue         | 33 ++++++++++++-------
 .../partials/header/autocomplete.blade.php    |  2 +-
 .../partials/filter/category.blade.php        | 14 +++-----
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/resources/js/components/Recursion.vue b/resources/js/components/Recursion.vue
index 0eb4498f4..03eda759f 100644
--- a/resources/js/components/Recursion.vue
+++ b/resources/js/components/Recursion.vue
@@ -1,10 +1,11 @@
 <template>
-    <div>
-        <slot :data="data" :component="childComponent" />
+    <div v-if="data?.length">
+        <slot :data="data" :components="childComponents"></slot>
     </div>
 </template>
 
 <script>
+
 export default {
     props: {
         data: {
@@ -13,15 +14,25 @@ export default {
         },
     },
     computed: {
-        childComponent() {
-            return {
-                render: (h) =>
-                    h('recursion', {
-                        props: {
-                            data: this.data,
-                        },
-                    }),
-            }
+        childComponents() {
+            const self = this;
+
+            return this.data.map((item) => {
+                return {
+                    render: (h) => {
+                        if(!item.data?.length) {
+                            return h('span');
+                        }
+
+                        return h('recursion', {
+                            props: {
+                                data: item.data,
+                            },
+                            scopedSlots: self.$scopedSlots
+                        });
+                    }
+                }
+            })
         },
     },
 }
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index e38d86122..43593ede2 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -17,7 +17,7 @@
         <ais-instant-search
             class="contents"
             :search-client="searchClient"
-            :index-name="config.index"
+            :index-name="config.index_prefix + '_products_' + config.store"
         >
             <div class="contents">
                 <!-- TODO: This is a Vue 3 thing -->
diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 47413e333..05e69cab1 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -10,9 +10,9 @@
 >
     <template v-slot="{ items, refine, createURL }">
         {{-- See the HierarchicalMenuList.vue --}}
-        <recursion :data="items" v-slot="{ data, component }">
+        <recursion :data="items" v-slot="{ data, components }">
             <ul>
-                <li v-for="item in data" :key="item.value">
+                <li class="pl-3" v-for="(item, index) in data" :key="item.value">
                     <a
                         :href="createURL(item.value)"
                         :class="{ 'font-bold': item.isRefined }"
@@ -21,14 +21,8 @@
                         @{{ item.label }}
                         (@{{ item.count }})
                     </a>
-                    {{--
-                    TODO: Double check this, the data updates,
-                    but the component doesn't. Tried to
-                    make everything working recursive
-                    plus keep it renderless.
-                    --}}
-                    {{-- @{{item.data}} --}}
-                    <component :data="item.data" :is="component" />
+
+                    <component :is="components[index]" />
                 </li>
             </ul>
         </recursion>

From 65db6f193baa2e672af40f7792d53820919a2ea2 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:06:13 +0000
Subject: [PATCH 048/244] Apply fixes from Prettier

---
 resources/js/components/Recursion.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/Recursion.vue b/resources/js/components/Recursion.vue
index 03eda759f..2859d202b 100644
--- a/resources/js/components/Recursion.vue
+++ b/resources/js/components/Recursion.vue
@@ -5,7 +5,6 @@
 </template>
 
 <script>
-
 export default {
     props: {
         data: {
@@ -15,22 +14,22 @@ export default {
     },
     computed: {
         childComponents() {
-            const self = this;
+            const self = this
 
             return this.data.map((item) => {
                 return {
                     render: (h) => {
-                        if(!item.data?.length) {
-                            return h('span');
+                        if (!item.data?.length) {
+                            return h('span')
                         }
 
                         return h('recursion', {
                             props: {
                                 data: item.data,
                             },
-                            scopedSlots: self.$scopedSlots
-                        });
-                    }
+                            scopedSlots: self.$scopedSlots,
+                        })
+                    },
                 }
             })
         },

From e10ca7c7ab9e56fc3a6f8639b4a2f64622cd831b Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 24 Feb 2025 10:41:22 +0100
Subject: [PATCH 049/244] Refactor a bit, move config and remove lazy, fix
 routing

---
 resources/js/components/Listing/Listing.vue   | 239 ++++++++++--------
 resources/views/components/listing.blade.php  |   9 +-
 resources/views/listing/filters.blade.php     |  21 +-
 .../listing/partials/filter/price.blade.php   |   2 +-
 .../listing/partials/filter/search.blade.php  |   2 +-
 5 files changed, 143 insertions(+), 130 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 84cbdce91..50a33ba25 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -52,49 +52,17 @@ export default {
             type: Array,
             default: () => [],
         },
+        index: {
+            type: String,
+        }
     },
 
     data: () => ({
         loaded: false,
         attributes: useAttributes(),
 
-        // TODO: Not sure yet if this is the right option,
-        // when the routing works properly we maybe
-        // don't need this.
-        searchTerm: new URLSearchParams(window.location.search).get('q'),
-
-        routing: {
-            router: history({
-                cleanUrlOnDispose: false,
-            }),
-            // stateMapping: singleIndex('rapidez_products_1'),
-            stateMapping: {
-                stateToRoute(uiState) {
-                    // TODO: Extract this somewhere?
-                    let index = config.index_prefix + '_products_' + config.store
-                    let data = uiState[index]
-
-                    let parameters = { ...(data.range || {}), ...(data.refinementList || {}) }
-
-                    return parameters
-                },
-
-                routeToState(routeState) {
-                    // TODO: Maybe allow other range-based attributes?
-                    let rangeAttributes = ['price']
-
-                    // TODO: Extract this somewhere?
-                    let index = config.index_prefix + '_products_' + config.store
-
-                    return {
-                        [index]: {
-                            refinementList: Object.fromEntries(Object.entries(routeState).filter(([key, _]) => !rangeAttributes.includes(key))),
-                            range: Object.fromEntries(Object.entries(routeState).filter(([key, _]) => rangeAttributes.includes(key))),
-                        }
-                    }
-                },
-            },
-        },
+        searchkit: null,
+        searchClient: null,
     }),
 
     render() {
@@ -102,85 +70,13 @@ export default {
     },
 
     mounted() {
+        this.searchkit = this.initSearchkit()
+        this.searchClient = this.initSearchClient()
+
         this.loaded = Object.keys(this.attributes).length > 0
     },
 
     computed: {
-        // TODO: Not sure if this is the right place,
-        // the autocomplete also needs this but
-        // we don't want to load everything
-        // directly due the JS size
-        searchClient: function () {
-            let client = Client(this.searchkit, {
-                hooks: {
-                    beforeSearch: async (searchRequests) => {
-                        return searchRequests.map((sr) => {
-                            // TODO: Maybe use deepmerge here so it doesn't
-                            // really matter what query is used? What
-                            // if we want to add something to the
-                            // "must" instead of "filter"?
-                            if (this.getQuery()) {
-                                sr.body.query.bool.filter.push(this.getQuery())
-                            }
-                            // And, this is currently applied on all queries,
-                            // it's only relevant on the listing one.
-                            return sr
-                        })
-                    },
-                },
-            })
-
-            // console.log(client)
-
-            return client
-        },
-
-        searchkit: function () {
-            let url = new URL(config.es_url)
-
-            let searchkit = new Searchkit({
-                connection: {
-                    host: url.origin,
-                    auth: {
-                        username: url.username,
-                        password: url.password,
-                    },
-                },
-
-                // TODO: Maybe just do: search_settings: config.searchkit
-                // so it's possible to add anything to the PHP config
-                // and that will appear here?
-                search_settings: {
-                    highlight_attributes: config.searchkit.highlight_attributes,
-                    search_attributes: config.searchkit.search_attributes,
-                    result_attributes: config.searchkit.result_attributes,
-
-                    // TODO: For consistency maybe make it possible to do this:
-                    // facet_attributes: config.searchkit.facet_attributes,
-                    facet_attributes: this.facets,
-
-                    filter_attributes: config.searchkit.filter_attributes,
-
-                    // TODO: Let's also change this to a PHP config.
-                    // So we start there and that will be merged
-                    // with the Magento configured attributes
-                    // and lastly from a prop it's possible
-                    // to manipulate it from a callback?
-                    sorting: this.sortOptions.reduce((acc, item) => {
-                        acc[item.key] = {
-                            field: item.field,
-                            order: item.order,
-                        }
-                        return acc
-                    }),
-                },
-            })
-
-            // console.log(this.sortOptions)
-
-            return searchkit
-        },
-
         // TODO: Maybe move this completely to PHP?
         // Any drawbacks? A window.config that
         // becomes to big? Is that an issue?
@@ -253,6 +149,25 @@ export default {
                 )
                 .concat(this.additionalSorting)
         },
+
+        routing() {
+            return {
+                router: history({
+                    cleanUrlOnDispose: false,
+                }),
+                stateMapping: {
+                    routeToState: this.routeToState,
+                    stateToRoute: this.stateToRoute,
+                },
+            }
+        },
+
+        // TODO: Do we want to make this extendable?
+        rangeAttributes() {
+            return this.filters
+                .filter(filter => filter.input == 'price')
+                .map(filter => filter.code)
+        }
     },
 
     watch: {
@@ -262,6 +177,106 @@ export default {
     },
 
     methods: {
+        // TODO: Not sure if this is the right place,
+        // the autocomplete also needs this but
+        // we don't want to load everything
+        // directly due the JS size
+        initSearchClient() {
+            return Client(this.searchkit, {
+                hooks: {
+                    beforeSearch: async (searchRequests) => {
+                        return searchRequests.map((sr) => {
+                            // TODO: Maybe use deepmerge here so it doesn't
+                            // really matter what query is used? What
+                            // if we want to add something to the
+                            // "must" instead of "filter"?
+                            if (this.getQuery()) {
+                                sr.body.query.bool.filter.push(this.getQuery())
+                            }
+                            // And, this is currently applied on all queries,
+                            // it's only relevant on the listing one.
+                            return sr
+                        })
+                    },
+                },
+            })
+        },
+
+        initSearchkit() {
+            let url = new URL(config.es_url)
+
+            return new Searchkit({
+                connection: {
+                    host: url.origin,
+                    auth: {
+                        username: url.username,
+                        password: url.password,
+                    },
+                },
+
+                // TODO: Maybe just do: search_settings: config.searchkit
+                // so it's possible to add anything to the PHP config
+                // and that will appear here?
+                search_settings: {
+                    highlight_attributes: config.searchkit.highlight_attributes,
+                    search_attributes: config.searchkit.search_attributes,
+                    result_attributes: config.searchkit.result_attributes,
+
+                    // TODO: For consistency maybe make it possible to do this:
+                    // facet_attributes: config.searchkit.facet_attributes,
+                    facet_attributes: this.facets,
+
+                    filter_attributes: config.searchkit.filter_attributes,
+
+                    // TODO: Let's also change this to a PHP config.
+                    // So we start there and that will be merged
+                    // with the Magento configured attributes
+                    // and lastly from a prop it's possible
+                    // to manipulate it from a callback?
+                    sorting: this.sortOptions.reduce((acc, item) => {
+                        acc[item.key] = {
+                            field: item.field,
+                            order: item.order,
+                        }
+                        return acc
+                    }),
+                },
+            })
+        },
+
+        stateToRoute(uiState) {
+            let data = uiState[this.index]
+
+            let parameters = {
+                ...(data.range || {}),
+                ...(data.refinementList || {}),
+            }
+
+            if ('query' in data) {
+                parameters['query'] = data['query']
+            }
+
+            return parameters
+        },
+
+        routeToState(routeState) {
+            let ranges = Object.fromEntries(Object.entries(routeState).filter(([key, _]) =>
+                this.rangeAttributes.includes(key)
+            ))
+
+            let refinementList = Object.fromEntries(Object.entries(routeState).filter(([key, _]) =>
+                key != 'query' && !this.rangeAttributes.includes(key)
+            ))
+
+            return {
+                [this.index]: {
+                    refinementList: refinementList,
+                    range: ranges,
+                    query: routeState.query,
+                }
+            }
+        },
+
         filterType(filter) {
             if (filter.super) {
                 return 'numeric'
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 12cd1b77d..5756808c2 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -18,18 +18,16 @@
             value: config.index_prefix + '_products_' + config.store + '_created_at_desc',
             key: '_created_at_desc'
         }]"
+        :index="config.index_prefix + '_products_' + config.store"
         v-cloak
     >
         <div slot-scope="{ loaded, filters, sortOptions, getQuery, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
-                {{-- TODO: Extract this somewhere? --}}
-                :index-name="config.index_prefix + '_products_' + config.store"
+                :index-name="listingSlotProps.index"
                 :routing="listingSlotProps.routing"
             >
-                <ais-configure :filters="{!! $query !!}"/>
-
                 {{ $before ?? '' }}
                 @if ($slot->isEmpty())
                     <div class="flex flex-col lg:flex-row gap-x-6 gap-y-3">
@@ -44,6 +42,9 @@
                     {{ $slot }}
                 @endif
                 {{ $after ?? '' }}
+
+                {{-- NOTE: Do not put this component above the filters if you want routing to work. --}}
+                <ais-configure :filters="{!! $query !!}"/>
             </ais-instant-search>
         </div>
     </listing>
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index cdb41fc5f..41dd82660 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -1,18 +1,15 @@
 @php($id = uniqid('filters-'))
 <x-rapidez::slideover.mobile :$id :title="__('Filters')" position="right">
     <div class="w-full p-2 max-lg:bg-white max-lg:p-5">
-        {{-- On mobile the filters aren't immedately visible so we should defer loading --}}
-        <lazy>
-            @include('rapidez::listing.partials.filter.selected')
-            @include('rapidez::listing.partials.filter.search')
-            @include('rapidez::listing.partials.filter.category')
-            <template v-for="filter in filters">
-                @include('rapidez::listing.partials.filter.price')
-                @include('rapidez::listing.partials.filter.swatch')
-                @include('rapidez::listing.partials.filter.boolean')
-                @include('rapidez::listing.partials.filter.select')
-            </template>
-        </lazy>
+        @include('rapidez::listing.partials.filter.selected')
+        @include('rapidez::listing.partials.filter.search')
+        @include('rapidez::listing.partials.filter.category')
+        <template v-for="filter in filters">
+            @include('rapidez::listing.partials.filter.price')
+            @include('rapidez::listing.partials.filter.swatch')
+            @include('rapidez::listing.partials.filter.boolean')
+            @include('rapidez::listing.partials.filter.select')
+        </template>
         <x-rapidez::button.primary for="{{ $id }}" class="w-full text-sm lg:hidden">
             @lang('Show results')
         </x-rapidez::button.primary>
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 52168b5d6..63d6dba22 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -1,5 +1,5 @@
 <ais-range-input
-    v-if="filter.input == 'price'"
+    v-if="listingSlotProps.rangeAttributes.includes(filter.code)"
     :attribute="filter.code"
 >
     <template v-slot="{ currentRefinement, range, canRefine, refine, sendEvent }">
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index cdfc9ef18..cb8d8b7fb 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -1,5 +1,5 @@
 {{-- TODO: Can/should we hide this filter when there are no results? --}}
-<ais-search-box :value="listingSlotProps.searchTerm">
+<ais-search-box>
     <template v-slot="{ currentRefinement, isSearchStalled, refine }">
         <x-rapidez::input
             type="search"

From 701a73973928aad63669bb471765ab70a7ac092f Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Mon, 24 Feb 2025 09:41:55 +0000
Subject: [PATCH 050/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 50a33ba25..b1c69f82f 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -54,7 +54,7 @@ export default {
         },
         index: {
             type: String,
-        }
+        },
     },
 
     data: () => ({
@@ -164,10 +164,8 @@ export default {
 
         // TODO: Do we want to make this extendable?
         rangeAttributes() {
-            return this.filters
-                .filter(filter => filter.input == 'price')
-                .map(filter => filter.code)
-        }
+            return this.filters.filter((filter) => filter.input == 'price').map((filter) => filter.code)
+        },
     },
 
     watch: {
@@ -260,20 +258,18 @@ export default {
         },
 
         routeToState(routeState) {
-            let ranges = Object.fromEntries(Object.entries(routeState).filter(([key, _]) =>
-                this.rangeAttributes.includes(key)
-            ))
+            let ranges = Object.fromEntries(Object.entries(routeState).filter(([key, _]) => this.rangeAttributes.includes(key)))
 
-            let refinementList = Object.fromEntries(Object.entries(routeState).filter(([key, _]) =>
-                key != 'query' && !this.rangeAttributes.includes(key)
-            ))
+            let refinementList = Object.fromEntries(
+                Object.entries(routeState).filter(([key, _]) => key != 'query' && !this.rangeAttributes.includes(key)),
+            )
 
             return {
                 [this.index]: {
                     refinementList: refinementList,
                     range: ranges,
                     query: routeState.query,
-                }
+                },
             }
         },
 

From 3a28abacd999188191d5a49639c59f2694669dfd Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 24 Feb 2025 11:56:17 +0100
Subject: [PATCH 051/244] Change `query` to `q` for search page

---
 resources/js/components/Listing/Listing.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 50a33ba25..57926f2bc 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -253,7 +253,7 @@ export default {
             }
 
             if ('query' in data) {
-                parameters['query'] = data['query']
+                parameters['q'] = data['query']
             }
 
             return parameters
@@ -265,14 +265,14 @@ export default {
             ))
 
             let refinementList = Object.fromEntries(Object.entries(routeState).filter(([key, _]) =>
-                key != 'query' && !this.rangeAttributes.includes(key)
+                key != 'q' && !this.rangeAttributes.includes(key)
             ))
 
             return {
                 [this.index]: {
                     refinementList: refinementList,
                     range: ranges,
-                    query: routeState.query,
+                    query: routeState.q,
                 }
             }
         },

From 87d6c253f9e460a966d9522e7adf10ee55897b80 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 24 Feb 2025 12:08:44 +0100
Subject: [PATCH 052/244] Use getBaseFilters instead of a hook on beforeSearch

---
 resources/js/components/Listing/Listing.vue | 27 ++++-----------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 7dcfb6483..cd08b4ca9 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -181,22 +181,7 @@ export default {
         // directly due the JS size
         initSearchClient() {
             return Client(this.searchkit, {
-                hooks: {
-                    beforeSearch: async (searchRequests) => {
-                        return searchRequests.map((sr) => {
-                            // TODO: Maybe use deepmerge here so it doesn't
-                            // really matter what query is used? What
-                            // if we want to add something to the
-                            // "must" instead of "filter"?
-                            if (this.getQuery()) {
-                                sr.body.query.bool.filter.push(this.getQuery())
-                            }
-                            // And, this is currently applied on all queries,
-                            // it's only relevant on the listing one.
-                            return sr
-                        })
-                    },
-                },
+                getBaseFilters: this.getBaseFilters,
             })
         },
 
@@ -293,13 +278,12 @@ export default {
             return ''
         },
 
-        getQuery() {
+        getBaseFilters() {
             if (!window.config.category?.entity_id) {
-                return
+                return []
             }
 
-            return {
-                // query: {
+            return [{
                 function_score: {
                     script_score: {
                         script: {
@@ -307,8 +291,7 @@ export default {
                         },
                     },
                 },
-                // },
-            }
+            }]
         },
 
         withFilters(items) {

From 8b322acf40904abccdb304b78fd67dd087b7bbae Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Mon, 24 Feb 2025 11:09:19 +0000
Subject: [PATCH 053/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index cd08b4ca9..933b14dab 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -283,15 +283,17 @@ export default {
                 return []
             }
 
-            return [{
-                function_score: {
-                    script_score: {
-                        script: {
-                            source: `Integer.parseInt(doc['positions.${window.config.category.entity_id}'].empty ? '0' : doc['positions.${window.config.category.entity_id}'].value)`,
+            return [
+                {
+                    function_score: {
+                        script_score: {
+                            script: {
+                                source: `Integer.parseInt(doc['positions.${window.config.category.entity_id}'].empty ? '0' : doc['positions.${window.config.category.entity_id}'].value)`,
+                            },
                         },
                     },
                 },
-            }]
+            ]
         },
 
         withFilters(items) {

From 4550237f662b56a96eb570892ae354ca74d36a49 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 24 Feb 2025 12:55:45 +0100
Subject: [PATCH 054/244] Allow for custom search query

---
 resources/js/components/Listing/Listing.vue  | 14 +++++--
 resources/views/category/overview.blade.php  |  2 +-
 resources/views/components/listing.blade.php |  9 +++--
 resources/views/search/overview.blade.php    | 42 ++++++++------------
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 933b14dab..8c82d1324 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -55,6 +55,9 @@ export default {
         index: {
             type: String,
         },
+        query: {
+            type: Function,
+        }
     },
 
     data: () => ({
@@ -180,9 +183,14 @@ export default {
         // we don't want to load everything
         // directly due the JS size
         initSearchClient() {
-            return Client(this.searchkit, {
-                getBaseFilters: this.getBaseFilters,
-            })
+            let options = {}
+
+            options['getBaseFilters'] = this.getBaseFilters
+            if (this.query) {
+                options['getQuery'] = this.query
+            }
+
+            return Client(this.searchkit, options)
         },
 
         initSearchkit() {
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index d9230e3e5..33e7864b0 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -11,7 +11,7 @@
         <h1 class="mb-5 text-3xl font-bold">{{ $category->name }}</h1>
 
         @if ($category->is_anchor)
-            <x-rapidez::listing query="'visibility:(2 OR 4) AND category_ids:'+config.category.entity_id" />
+            <x-rapidez::listing filters="'visibility:(2 OR 4) AND category_ids:'+config.category.entity_id" />
         @else
             <div class="flex max-md:flex-col">
                 <div class="xl:w-1/5">
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 5756808c2..96a93b9a8 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -1,4 +1,4 @@
-@props(['query'])
+@props(['filters' => null])
 
 @pushOnce('head', 'es_url-preconnect')
     <link rel="preconnect" href="{{ config('rapidez.es_url') }}">
@@ -10,6 +10,7 @@
 
 <div class="min-h-screen">
     <listing
+        {{ $attributes }}
         :additional-sorting="[{
             label: window.config.translations.newest,
             field: 'created_at',
@@ -21,7 +22,7 @@
         :index="config.index_prefix + '_products_' + config.store"
         v-cloak
     >
-        <div slot-scope="{ loaded, filters, sortOptions, getQuery, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
+        <div slot-scope="{ loaded, filters, sortOptions, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
@@ -44,7 +45,9 @@
                 {{ $after ?? '' }}
 
                 {{-- NOTE: Do not put this component above the filters if you want routing to work. --}}
-                <ais-configure :filters="{!! $query !!}"/>
+                @if ($filters)
+                    <ais-configure :filters="{!! $filters !!}"/>
+                @endif
             </ais-instant-search>
         </div>
     </listing>
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 1dcf65a91..c327a4f46 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -8,23 +8,15 @@
     <div class="container">
         <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
 
-        <x-rapidez::listing query="'visibility:(3 OR 4)'"/>
-
-
-        {{--
-        Is it possible to change this query to a "query string query"?
-        Or is there something else we can use better now?
-        --}}
-
-        {{-- <x-rapidez::listing query="{
-            bool: {
-                must: [
-                    { terms: { visibility: [3, 4] } },
-                    { bool: { should: [
-                        {
+        <x-rapidez::listing
+            filters="'visibility:(3 OR 4)'"
+            v-bind:query="(query, searchAttributes, config) => {
+                return {
+                    bool: {
+                        should: [{
                             multi_match: {
-                                query: '{{ request()->q }}',
-                                fields: Object.entries(config.searchable).map((value) => value[0]+'^'+value[1]),
+                                query: query,
+                                fields: searchAttributes.map((value) => value.field+'^'+value.weight),
                                 type: 'best_fields',
                                 operator: 'or',
                                 fuzziness: 'AUTO',
@@ -32,23 +24,23 @@
                         },
                         {
                             multi_match: {
-                                query: '{{ request()->q }}',
-                                fields: Object.entries(config.searchable).map((value) => value[0]+'^'+value[1]),
+                                query: query,
+                                fields: searchAttributes.map((value) => value.field+'^'+value.weight),
                                 type: 'phrase',
                                 operator: 'or',
                             }
                         },
                         {
                             multi_match: {
-                                query: '{{ request()->q }}',
-                                fields: Object.entries(config.searchable).map((value) => value[0]+'^'+value[1]),
+                                query: query,
+                                fields: searchAttributes.map((value) => value.field+'^'+value.weight),
                                 type: 'phrase_prefix',
                                 operator: 'or',
                             }
-                        },
-                    ] } }
-                ],
-            }
-        }"/> --}}
+                        }]
+                    }
+                }
+            }"
+        />
     </div>
 @endsection

From c919f62800a1498ebde9fb885a76b1ff90897526 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Mon, 24 Feb 2025 11:56:17 +0000
Subject: [PATCH 055/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 8c82d1324..41c731f26 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -57,7 +57,7 @@ export default {
         },
         query: {
             type: Function,
-        }
+        },
     },
 
     data: () => ({

From 3682e1e137eedff973fed117a10779a239af57b9 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 24 Feb 2025 13:01:01 +0100
Subject: [PATCH 056/244] Simplify options

---
 resources/js/components/Listing/Listing.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 8c82d1324..eb8c17c3e 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -183,14 +183,10 @@ export default {
         // we don't want to load everything
         // directly due the JS size
         initSearchClient() {
-            let options = {}
-
-            options['getBaseFilters'] = this.getBaseFilters
-            if (this.query) {
-                options['getQuery'] = this.query
-            }
-
-            return Client(this.searchkit, options)
+            return Client(this.searchkit, {
+                getBaseFilters: this.getBaseFilters,
+                getQuery: this.query,
+            })
         },
 
         initSearchkit() {

From 9b8e7ec899e6f5c0fb72277987b49768cecec82f Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 24 Feb 2025 15:29:33 +0100
Subject: [PATCH 057/244] Add custom sorting

---
 config/rapidez/searchkit.php                 | 10 ++--
 lang/en/frontend.php                         | 21 ++++----
 lang/nl/frontend.php                         |  8 +--
 resources/js/components/Listing/Listing.vue  | 53 +++++++++-----------
 resources/views/components/listing.blade.php |  8 ---
 5 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/config/rapidez/searchkit.php b/config/rapidez/searchkit.php
index 86448434f..eb4c324b9 100644
--- a/config/rapidez/searchkit.php
+++ b/config/rapidez/searchkit.php
@@ -42,6 +42,13 @@
         // ['attribute' => 'brand', 'field' => 'brand.keyword', 'type' => 'string'],
     ],
 
+    // Additional sorting options to be added to the product listings
+    // Given directions can only be an array of 'asc' and/or 'desc'
+    // Order shown here will be the order shown in the dropdown (including the order of the given directions!)
+    'additional_sorting' => [
+        'created_at' => ['desc'],
+    ],
+
     // Attributes that are used to create filters.
     // TODO: Do we really need this? With ReactiveSearch
     // we didn't need to keep a list to filter.
@@ -50,7 +57,4 @@
         ['attribute' => 'category_ids', 'field' => 'category_ids', 'type' => 'numeric'],
         ['attribute' => 'visibility', 'field' => 'visibility', 'type' => 'numeric'],
     ],
-
-    // TODO: Sorting...
-    // 'sorting' => []
 ];
diff --git a/lang/en/frontend.php b/lang/en/frontend.php
index 9c57ff6fb..fbb918a9b 100644
--- a/lang/en/frontend.php
+++ b/lang/en/frontend.php
@@ -28,16 +28,19 @@
         'yes' => 'Yes',
     ],
 
-    'asc'       => 'asc',
-    'desc'      => 'desc',
+    'asc'       => 'ascending',
+    'desc'      => 'descending',
     'relevance' => 'Relevance',
-    'newest'    => 'Newest',
     'all'       => 'All',
 
-    // 'sorting' => [
-    //     'attribute' => [
-    //         'asc' => 'Attribute asc',
-    //         'desc' => 'Attrribute desc',
-    //     ],
-    // ],
+    'sorting' => [
+        'created_at' => [
+            'asc' => 'Oldest',
+            'desc' => 'Newest',
+        ],
+        'name' => [
+            'asc'  => 'Name A-Z',
+            'desc' => 'Name Z-A',
+        ],
+    ],
 ];
diff --git a/lang/nl/frontend.php b/lang/nl/frontend.php
index d87809a0f..5884ec720 100644
--- a/lang/nl/frontend.php
+++ b/lang/nl/frontend.php
@@ -26,13 +26,13 @@
     'asc'       => 'oplopend',
     'desc'      => 'aflopend',
     'relevance' => 'Relevantie',
-    'newest'    => 'Nieuwste',
     'all'       => 'Alles',
+    'price'     => 'Prijs',
 
     'sorting' => [
-        'price' => [
-            'asc'  => 'Prijs oplopend',
-            'desc' => 'Prijs aflopend',
+        'created_at' => [
+            'asc' => 'Oudste',
+            'desc' => 'Nieuwste',
         ],
         'name' => [
             'asc'  => 'Naam A-Z',
diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 7359f4238..ca1b7475e 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -41,17 +41,6 @@ import useAttributes from '../../stores/useAttributes.js'
 
 export default {
     props: {
-        // TODO: Do we still use/need this?
-        // Maybe transform it to a callback
-        // so the items can be manipulated?
-        additionalFilters: {
-            type: Array,
-            default: () => [],
-        },
-        additionalSorting: {
-            type: Array,
-            default: () => [],
-        },
         index: {
             type: String,
         },
@@ -107,7 +96,9 @@ export default {
         },
 
         sortings: function () {
-            return Object.values(this.attributes).filter((attribute) => attribute.sorting)
+            return Object.values(this.attributes)
+                .filter((attribute) => attribute.sorting)
+                .concat(Object.entries(config.searchkit.additional_sorting).map(([code, directions]) => ({ code: code, directions: directions })))
         },
 
         hitsPerPage: function () {
@@ -125,32 +116,38 @@ export default {
         sortOptions: function () {
             return [
                 {
-                    label: window.config.translations.relevance,
+                    label: config.translations.relevance,
                     field: '_score',
                     order: 'desc',
-                    value: config.index,
+                    value: this.index,
                     key: 'default',
                 },
             ]
                 .concat(
-                    this.sortings.flatMap(function (sorting) {
-                        return [
-                            ['asc', window.config.translations.asc],
-                            ['desc', window.config.translations.desc],
-                        ].map(function ([directionKey, directionLabel]) {
+                    this.sortings.flatMap((sorting) =>
+                        (sorting.directions ?? ['asc', 'desc']).map(direction => {
+                            let label = ''
+                            if(config.translations.sorting?.[sorting.code]?.[direction]) {
+                                label = config.translations.sorting?.[sorting.code]?.[direction]
+                            } else {
+                                label = config.translations[sorting.code] ?? sorting.name ?? sorting.code
+
+                                // Add asc/desc if relevant
+                                if (sorting.directions?.length != 1) {
+                                    label += ' ' + (config.translations[direction] ?? direction)
+                                }
+                            }
+
                             return {
-                                label:
-                                    window.config.translations.sorting?.[sorting.code]?.[directionKey] ??
-                                    sorting.name + ' ' + directionLabel,
-                                field: sorting.code + (sorting.code != 'price' ? '.keyword' : ''),
-                                order: directionKey,
-                                value: [config.index, sorting.code, directionKey].join('_'),
-                                key: '_' + [sorting.code, directionKey].join('_'),
+                                label: label,
+                                field: sorting.code + (sorting.input == 'text' ? '.keyword' : ''),
+                                order: direction,
+                                value: [this.index, sorting.code, direction].join('_'),
+                                key: '_' + [sorting.code, direction].join('_'),
                             }
                         })
-                    }),
+                    ),
                 )
-                .concat(this.additionalSorting)
         },
 
         routing() {
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 96a93b9a8..d87ecfaeb 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -11,14 +11,6 @@
 <div class="min-h-screen">
     <listing
         {{ $attributes }}
-        :additional-sorting="[{
-            label: window.config.translations.newest,
-            field: 'created_at',
-            order: 'desc',
-            {{-- TODO: Extract this somewhere? --}}
-            value: config.index_prefix + '_products_' + config.store + '_created_at_desc',
-            key: '_created_at_desc'
-        }]"
         :index="config.index_prefix + '_products_' + config.store"
         v-cloak
     >

From 167ce71504a324f6167dc897f07d56f08114b577 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Feb 2025 10:13:28 +0100
Subject: [PATCH 058/244] Update resources/views/components/listing.blade.php

Co-authored-by: Roy Duineveld <royduineveld@gmail.com>
---
 resources/views/components/listing.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 5756808c2..97ef7c4f0 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -18,6 +18,7 @@
             value: config.index_prefix + '_products_' + config.store + '_created_at_desc',
             key: '_created_at_desc'
         }]"
+        {{-- TODO: Extract this somewhere? --}}
         :index="config.index_prefix + '_products_' + config.store"
         v-cloak
     >

From 2a45c7ec02d6d96f4e4f79731879f553f3b4ccef Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Feb 2025 11:11:29 +0100
Subject: [PATCH 059/244] Update comment

---
 config/rapidez/searchkit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/rapidez/searchkit.php b/config/rapidez/searchkit.php
index eb4c324b9..4b880f5fe 100644
--- a/config/rapidez/searchkit.php
+++ b/config/rapidez/searchkit.php
@@ -50,8 +50,8 @@
     ],
 
     // Attributes that are used to create filters.
-    // TODO: Do we really need this? With ReactiveSearch
-    // we didn't need to keep a list to filter.
+    // Required so that SearchKit can keep track of the type and field of each attribute.
+    // TODO: Do the undocumented nestedPath and filterQuery parameters have any use case for us?
     'filter_attributes' => [
         ['attribute' => 'entity_id', 'field' => 'entity_id', 'type' => 'numeric'],
         ['attribute' => 'category_ids', 'field' => 'category_ids', 'type' => 'numeric'],

From 74b29c501fcc3d3ad8717c8ce7e242c40032ad9c Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Feb 2025 11:11:44 +0100
Subject: [PATCH 060/244] Use functions more liberally

---
 resources/js/components/Listing/Listing.vue  | 39 +++++++-------------
 resources/views/category/overview.blade.php  | 16 +++++++-
 resources/views/components/listing.blade.php |  7 ----
 resources/views/search/overview.blade.php    |  2 +-
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index ca1b7475e..fc7766062 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -41,12 +41,18 @@ import useAttributes from '../../stores/useAttributes.js'
 
 export default {
     props: {
+        sortOptionsCallback: {
+            type: Function,
+        },
         index: {
             type: String,
         },
         query: {
             type: Function,
         },
+        baseFilters: {
+            type: Function,
+        },
     },
 
     data: () => ({
@@ -114,7 +120,7 @@ export default {
         },
 
         sortOptions: function () {
-            return [
+            let sortOptions = [
                 {
                     label: config.translations.relevance,
                     field: '_score',
@@ -148,6 +154,12 @@ export default {
                         })
                     ),
                 )
+
+            if (this.sortOptionsCallback) {
+                sortOptions = this.sortOptionsCallback(sortOptions)
+            }
+
+            return sortOptions
         },
 
         routing() {
@@ -181,7 +193,7 @@ export default {
         // directly due the JS size
         initSearchClient() {
             return Client(this.searchkit, {
-                getBaseFilters: this.getBaseFilters,
+                getBaseFilters: this.baseFilters,
                 getQuery: this.query,
             })
         },
@@ -212,11 +224,6 @@ export default {
 
                     filter_attributes: config.searchkit.filter_attributes,
 
-                    // TODO: Let's also change this to a PHP config.
-                    // So we start there and that will be merged
-                    // with the Magento configured attributes
-                    // and lastly from a prop it's possible
-                    // to manipulate it from a callback?
                     sorting: this.sortOptions.reduce((acc, item) => {
                         acc[item.key] = {
                             field: item.field,
@@ -279,24 +286,6 @@ export default {
             return ''
         },
 
-        getBaseFilters() {
-            if (!window.config.category?.entity_id) {
-                return []
-            }
-
-            return [
-                {
-                    function_score: {
-                        script_score: {
-                            script: {
-                                source: `Integer.parseInt(doc['positions.${window.config.category.entity_id}'].empty ? '0' : doc['positions.${window.config.category.entity_id}'].value)`,
-                            },
-                        },
-                    },
-                },
-            ]
-        },
-
         withFilters(items) {
             return items.map((item) => ({
                 filter: this.filters.find((filter) => filter.code === item.attribute),
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index 33e7864b0..31a35ef36 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -11,7 +11,21 @@
         <h1 class="mb-5 text-3xl font-bold">{{ $category->name }}</h1>
 
         @if ($category->is_anchor)
-            <x-rapidez::listing filters="'visibility:(2 OR 4) AND category_ids:'+config.category.entity_id" />
+            <x-rapidez::listing
+                v-bind:base-filters="() => [{
+                    query_string: {
+                        query: 'visibility:(2 OR 4) AND category_ids:'+config.category.entity_id
+                    }
+                },{
+                    function_score: {
+                        script_score: {
+                            script: {
+                                source: `Integer.parseInt(doc['positions.{{ $category->entity_id }}'].empty ? '0' : doc['positions.{{ $category->entity_id }}'].value)`,
+                            },
+                        },
+                    },
+                }]"
+            />
         @else
             <div class="flex max-md:flex-col">
                 <div class="xl:w-1/5">
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index d87ecfaeb..321e439d8 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -1,5 +1,3 @@
-@props(['filters' => null])
-
 @pushOnce('head', 'es_url-preconnect')
     <link rel="preconnect" href="{{ config('rapidez.es_url') }}">
 
@@ -35,11 +33,6 @@
                     {{ $slot }}
                 @endif
                 {{ $after ?? '' }}
-
-                {{-- NOTE: Do not put this component above the filters if you want routing to work. --}}
-                @if ($filters)
-                    <ais-configure :filters="{!! $filters !!}"/>
-                @endif
             </ais-instant-search>
         </div>
     </listing>
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index c327a4f46..d14d27d61 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -9,7 +9,7 @@
         <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
 
         <x-rapidez::listing
-            filters="'visibility:(3 OR 4)'"
+            v-bind:base-filters="() => [{ query_string: { query: 'visibility:(3 OR 4)' }}]"
             v-bind:query="(query, searchAttributes, config) => {
                 return {
                     bool: {

From af0f1953c47c2075dea816789a8928d29f671202 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Feb 2025 11:17:44 +0100
Subject: [PATCH 061/244] Use baseFilters prop instead of ais-configure

---
 resources/js/components/Listing/Listing.vue  | 23 ++++----------------
 resources/views/category/overview.blade.php  | 16 +++++++++++++-
 resources/views/components/listing.blade.php |  5 -----
 resources/views/search/overview.blade.php    |  2 +-
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 933b14dab..31be3833d 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -55,6 +55,9 @@ export default {
         index: {
             type: String,
         },
+        baseFilters: {
+            type: Function,
+        },
     },
 
     data: () => ({
@@ -181,7 +184,7 @@ export default {
         // directly due the JS size
         initSearchClient() {
             return Client(this.searchkit, {
-                getBaseFilters: this.getBaseFilters,
+                getBaseFilters: this.baseFilters,
             })
         },
 
@@ -278,24 +281,6 @@ export default {
             return ''
         },
 
-        getBaseFilters() {
-            if (!window.config.category?.entity_id) {
-                return []
-            }
-
-            return [
-                {
-                    function_score: {
-                        script_score: {
-                            script: {
-                                source: `Integer.parseInt(doc['positions.${window.config.category.entity_id}'].empty ? '0' : doc['positions.${window.config.category.entity_id}'].value)`,
-                            },
-                        },
-                    },
-                },
-            ]
-        },
-
         withFilters(items) {
             return items.map((item) => ({
                 filter: this.filters.find((filter) => filter.code === item.attribute),
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index d9230e3e5..9883be70a 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -11,7 +11,21 @@
         <h1 class="mb-5 text-3xl font-bold">{{ $category->name }}</h1>
 
         @if ($category->is_anchor)
-            <x-rapidez::listing query="'visibility:(2 OR 4) AND category_ids:'+config.category.entity_id" />
+            <x-rapidez::listing
+                v-bind:base-filters="() => [{
+                    query_string: {
+                        query: 'visibility:(2 OR 4) AND category_ids:{{ $category->entity_id }}'
+                    }
+                }, {
+                    function_score: {
+                        script_score: {
+                            script: {
+                                source: `Integer.parseInt(doc['positions.{{ $category->entity_id }}'].empty ? '0' : doc['positions.{{ $category->entity_id }}'].value)`,
+                            },
+                        },
+                    },
+                }]"
+            />
         @else
             <div class="flex max-md:flex-col">
                 <div class="xl:w-1/5">
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 5756808c2..15540a74b 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -1,5 +1,3 @@
-@props(['query'])
-
 @pushOnce('head', 'es_url-preconnect')
     <link rel="preconnect" href="{{ config('rapidez.es_url') }}">
 
@@ -42,9 +40,6 @@
                     {{ $slot }}
                 @endif
                 {{ $after ?? '' }}
-
-                {{-- NOTE: Do not put this component above the filters if you want routing to work. --}}
-                <ais-configure :filters="{!! $query !!}"/>
             </ais-instant-search>
         </div>
     </listing>
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 1dcf65a91..e98c6bbbd 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -8,7 +8,7 @@
     <div class="container">
         <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
 
-        <x-rapidez::listing query="'visibility:(3 OR 4)'"/>
+        <x-rapidez::listing v-bind:base-filters="() => [{ query_string: { query: 'visibility:(3 OR 4)' }}]"/>
 
 
         {{--

From 3aff13250162a196e93eb249656ab59bcf3867c6 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Feb 2025 11:21:58 +0100
Subject: [PATCH 062/244] Remove query & add TODO

---
 resources/js/components/Listing/Listing.vue |  2 ++
 resources/views/search/overview.blade.php   | 35 +--------------------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index cd3a4e900..2b6d9e12d 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -55,6 +55,8 @@ export default {
         index: {
             type: String,
         },
+
+        // TODO: Document these two props in the Rapidez docs
         query: {
             type: Function,
         },
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 62ff4759c..3eb06b429 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -8,39 +8,6 @@
     <div class="container">
         <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
 
-        <x-rapidez::listing
-            v-bind:base-filters="() => [{ query_string: { filters: 'visibility:(3 OR 4)' }}]"
-            v-bind:query="(query, searchAttributes, config) => {
-                return {
-                    bool: {
-                        should: [{
-                            multi_match: {
-                                query: query,
-                                fields: searchAttributes.map((value) => value.field+'^'+value.weight),
-                                type: 'best_fields',
-                                operator: 'or',
-                                fuzziness: 'AUTO',
-                            },
-                        },
-                        {
-                            multi_match: {
-                                query: query,
-                                fields: searchAttributes.map((value) => value.field+'^'+value.weight),
-                                type: 'phrase',
-                                operator: 'or',
-                            }
-                        },
-                        {
-                            multi_match: {
-                                query: query,
-                                fields: searchAttributes.map((value) => value.field+'^'+value.weight),
-                                type: 'phrase_prefix',
-                                operator: 'or',
-                            }
-                        }]
-                    }
-                }
-            }"
-        />
+        <x-rapidez::listing v-bind:base-filters="() => [{ query_string: { filters: 'visibility:(3 OR 4)' }}]"/>
     </div>
 @endsection

From f602c074f2110663b1e662e6d2607ea17c576d59 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Feb 2025 11:27:13 +0100
Subject: [PATCH 063/244] Fix key name

---
 resources/views/search/overview.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 3eb06b429..1756aa787 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -8,6 +8,6 @@
     <div class="container">
         <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
 
-        <x-rapidez::listing v-bind:base-filters="() => [{ query_string: { filters: 'visibility:(3 OR 4)' }}]"/>
+        <x-rapidez::listing v-bind:base-filters="() => [{ query_string: { query: 'visibility:(3 OR 4)' }}]"/>
     </div>
 @endsection

From 8d742a50f7ac0fcb2ce92429365774c3da94de18 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:15:37 +0000
Subject: [PATCH 064/244] Apply fixes from Duster

---
 lang/en/frontend.php | 2 +-
 lang/nl/frontend.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/en/frontend.php b/lang/en/frontend.php
index fbb918a9b..fab5d6197 100644
--- a/lang/en/frontend.php
+++ b/lang/en/frontend.php
@@ -35,7 +35,7 @@
 
     'sorting' => [
         'created_at' => [
-            'asc' => 'Oldest',
+            'asc'  => 'Oldest',
             'desc' => 'Newest',
         ],
         'name' => [
diff --git a/lang/nl/frontend.php b/lang/nl/frontend.php
index 5884ec720..e543b0238 100644
--- a/lang/nl/frontend.php
+++ b/lang/nl/frontend.php
@@ -31,7 +31,7 @@
 
     'sorting' => [
         'created_at' => [
-            'asc' => 'Oudste',
+            'asc'  => 'Oudste',
             'desc' => 'Nieuwste',
         ],
         'name' => [

From f8dfd132c6831d252aa4d851ca770e13f0e7bce4 Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:16:08 +0000
Subject: [PATCH 065/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 54 +++++++++++----------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index cdbd2f7c4..994e41a49 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -106,7 +106,12 @@ export default {
         sortings: function () {
             return Object.values(this.attributes)
                 .filter((attribute) => attribute.sorting)
-                .concat(Object.entries(config.searchkit.additional_sorting).map(([code, directions]) => ({ code: code, directions: directions })))
+                .concat(
+                    Object.entries(config.searchkit.additional_sorting).map(([code, directions]) => ({
+                        code: code,
+                        directions: directions,
+                    })),
+                )
         },
 
         hitsPerPage: function () {
@@ -130,32 +135,31 @@ export default {
                     value: this.index,
                     key: 'default',
                 },
-            ]
-                .concat(
-                    this.sortings.flatMap((sorting) =>
-                        (sorting.directions ?? ['asc', 'desc']).map(direction => {
-                            let label = ''
-                            if(config.translations.sorting?.[sorting.code]?.[direction]) {
-                                label = config.translations.sorting?.[sorting.code]?.[direction]
-                            } else {
-                                label = config.translations[sorting.code] ?? sorting.name ?? sorting.code
-
-                                // Add asc/desc if relevant
-                                if (sorting.directions?.length != 1) {
-                                    label += ' ' + (config.translations[direction] ?? direction)
-                                }
+            ].concat(
+                this.sortings.flatMap((sorting) =>
+                    (sorting.directions ?? ['asc', 'desc']).map((direction) => {
+                        let label = ''
+                        if (config.translations.sorting?.[sorting.code]?.[direction]) {
+                            label = config.translations.sorting?.[sorting.code]?.[direction]
+                        } else {
+                            label = config.translations[sorting.code] ?? sorting.name ?? sorting.code
+
+                            // Add asc/desc if relevant
+                            if (sorting.directions?.length != 1) {
+                                label += ' ' + (config.translations[direction] ?? direction)
                             }
+                        }
 
-                            return {
-                                label: label,
-                                field: sorting.code + (sorting.input == 'text' ? '.keyword' : ''),
-                                order: direction,
-                                value: [this.index, sorting.code, direction].join('_'),
-                                key: '_' + [sorting.code, direction].join('_'),
-                            }
-                        })
-                    ),
-                )
+                        return {
+                            label: label,
+                            field: sorting.code + (sorting.input == 'text' ? '.keyword' : ''),
+                            order: direction,
+                            value: [this.index, sorting.code, direction].join('_'),
+                            key: '_' + [sorting.code, direction].join('_'),
+                        }
+                    }),
+                ),
+            )
 
             if (this.sortOptionsCallback) {
                 sortOptions = this.sortOptionsCallback(sortOptions)

From 46524a30aa6e3827df6061555882663be1c4d308 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 4 Mar 2025 12:58:10 +0100
Subject: [PATCH 066/244] Category filter max depth & root path

---
 resources/js/components/Listing/Listing.vue   | 13 +++-
 resources/views/category/overview.blade.php   |  1 +
 resources/views/components/listing.blade.php  |  2 +
 .../partials/filter/category.blade.php        | 78 ++++++-------------
 src/Http/ViewComposers/ConfigComposer.php     |  2 +
 src/Models/Category.php                       |  4 +-
 6 files changed, 38 insertions(+), 62 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 2b6d9e12d..36faa8149 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -102,15 +102,20 @@ export default {
                     field: filter.code + (this.filterType(filter) == 'string' ? '.keyword' : ''),
                     type: this.filterType(filter),
                 })),
-                { attribute: 'category_lvl0', field: 'category_lvl0.keyword', type: 'string' },
-                { attribute: 'category_lvl1', field: 'category_lvl1.keyword', type: 'string' },
-                { attribute: 'category_lvl2', field: 'category_lvl2.keyword', type: 'string' },
-                { attribute: 'category_lvl3', field: 'category_lvl3.keyword', type: 'string' },
+                ...this.categoryAttributes.map(attribute => ({
+                    attribute: attribute,
+                    field: attribute + '.keyword',
+                    type: 'string'
+                })),
             ]
             // TODO: Double check this and how it's used.
             // .concat(this.additionalFilters)
         },
 
+        categoryAttributes() {
+            return Array.from({length: config.max_category_level ?? 3}).map((_, index) => 'category_lvl' + (index + 1))
+        },
+
         sortings: function () {
             return Object.values(this.attributes).filter((attribute) => attribute.sorting)
         },
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index 9883be70a..40b6fc4c3 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -12,6 +12,7 @@
 
         @if ($category->is_anchor)
             <x-rapidez::listing
+                :root-path="$category->parentcategories->pluck('name')->join(' > ')"
                 v-bind:base-filters="() => [{
                     query_string: {
                         query: 'visibility:(2 OR 4) AND category_ids:{{ $category->entity_id }}'
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 3930e57d6..57964bf63 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -1,3 +1,5 @@
+@props(['rootPath' => null])
+
 @pushOnce('head', 'es_url-preconnect')
     <link rel="preconnect" href="{{ config('rapidez.es_url') }}">
 
diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 05e69cab1..2cce244e8 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -1,63 +1,29 @@
 <ais-hierarchical-menu
-    :attributes="[
-        'category_lvl1',
-        'category_lvl2',
-        'category_lvl3',
-        {{-- TODO: This should be dynamic up to the max depth --}}
-    ]"
-    {{-- root-path="Men > Tops" --}}
+    v-bind:attributes="listingSlotProps.categoryAttributes"
+    @attributes(['root-path' => $rootPath])
     show-more
 >
     <template v-slot="{ items, refine, createURL }">
-        {{-- See the HierarchicalMenuList.vue --}}
-        <recursion :data="items" v-slot="{ data, components }">
-            <ul>
-                <li class="pl-3" v-for="(item, index) in data" :key="item.value">
-                    <a
-                        :href="createURL(item.value)"
-                        :class="{ 'font-bold': item.isRefined }"
-                        v-on:click.exact.left.prevent="refine(item.value)"
-                    >
-                        @{{ item.label }}
-                        (@{{ item.count }})
-                    </a>
+        <x-rapidez::filter.heading>
+            <x-slot:title>
+                @lang('Category')
+            </x-slot:title>
+            <recursion :data="items" v-slot="{ data, components }">
+                <ul>
+                    <li class="pl-3" v-for="(item, index) in data" :key="item.value">
+                        <a
+                            :href="createURL(item.value)"
+                            :class="{ 'font-bold': item.isRefined }"
+                            v-on:click.exact.left.prevent="refine(item.value)"
+                        >
+                            @{{ item.label }}
+                            (@{{ item.count }})
+                        </a>
 
-                    <component :is="components[index]" />
-                </li>
-            </ul>
-        </recursion>
+                        <component :is="components[index]" />
+                    </li>
+                </ul>
+            </recursion>
+        </x-rapidez::filter.heading>
     </template>
 </ais-hierarchical-menu>
-
-{{--
-<reactive-component
-    component-id="category"
-    :default-query="() => ({ aggs: {
-        categories: { terms: { field: 'categories.keyword' } },
-        category_paths: { terms: { field: 'category_paths.keyword' } }
-    }})"
-    u-r-l-params
->
-    <div slot-scope="{ aggregations, setQuery, value }">
-        <category-filter :aggregations="aggregations" :value="value" :set-query="setQuery">
-            <div slot-scope="{ hasResults, results }" class="pb-4">
-                <x-rapidez::filter.heading>
-                    <x-slot:title>
-                        @lang('Category')
-                    </x-slot:title>
-                    <input class="hidden" type="radio" name="category" value="" :checked="!value" v-on:change="setQuery({})"/>
-                    <ul>
-                        <category-filter-category
-                            v-for="category in results"
-                            v-bind:key="category.key"
-                            :category="category"
-                            :value="(value || config.category?.entity_id) + ''"
-                            :set-query="setQuery"
-                        />
-                    </ul>
-                </x-rapidez::filter.heading>
-            </div>
-        </category-filter>
-    </div>
-</reactive-component>
- --}}
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 4bcfb1f55..382e6e507 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Str;
 use Illuminate\View\View;
 use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\Category;
 
 // TODO: Can we improve anything in this file?
 // It doesn't feel very clean currently.
@@ -57,6 +58,7 @@ public function getConfig(): array
             'show_tax'                     => (bool) Rapidez::config('tax/display/type', 1),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
+            'max_category_level'           => Category::withoutGlobalScopes()->selectRaw('MAX(level) as maxlevel')->first()->maxlevel,
 
             // TODO: For the products we've the `rapidez.index` config
             // set from the `src/Rapidez.php` which is accessible
diff --git a/src/Models/Category.php b/src/Models/Category.php
index 72a8bab63..890ad9d28 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -99,8 +99,8 @@ public function getParentcategoriesAttribute()
         $categoryIds = explode('/', $this->path);
         $categoryIds = array_slice($categoryIds, array_search(config('rapidez.root_category_id'), $categoryIds) + 1);
 
-        return ! $categoryIds ? [] : Category::whereIn($this->getTable() . '.entity_id', $categoryIds)
-            ->orderByRaw('FIELD(' . $this->getTable() . '.entity_id,' . implode(',', $categoryIds) . ')')
+        return ! $categoryIds ? [] : Category::whereIn($this->getQualifiedKeyName(), $categoryIds)
+            ->orderByRaw('FIELD(' . $this->getQualifiedKeyName() . ',' . implode(',', $categoryIds) . ')')
             ->get();
     }
 

From 82750ae12cb9a24040fa89ce71f434f038335ffd Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Tue, 4 Mar 2025 11:58:45 +0000
Subject: [PATCH 067/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 36faa8149..474650082 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -102,10 +102,10 @@ export default {
                     field: filter.code + (this.filterType(filter) == 'string' ? '.keyword' : ''),
                     type: this.filterType(filter),
                 })),
-                ...this.categoryAttributes.map(attribute => ({
+                ...this.categoryAttributes.map((attribute) => ({
                     attribute: attribute,
                     field: attribute + '.keyword',
-                    type: 'string'
+                    type: 'string',
                 })),
             ]
             // TODO: Double check this and how it's used.
@@ -113,7 +113,7 @@ export default {
         },
 
         categoryAttributes() {
-            return Array.from({length: config.max_category_level ?? 3}).map((_, index) => 'category_lvl' + (index + 1))
+            return Array.from({ length: config.max_category_level ?? 3 }).map((_, index) => 'category_lvl' + (index + 1))
         },
 
         sortings: function () {

From e8ac084e600d27ca3119e886083a67d34c8471a6 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 5 Mar 2025 09:47:22 +0100
Subject: [PATCH 068/244] Removed unused @algolia/autocomplete-js dependency

---
 package.json |  1 -
 yarn.lock    | 73 ++++------------------------------------------------
 2 files changed, 5 insertions(+), 69 deletions(-)

diff --git a/package.json b/package.json
index 0668d4de8..8d0835dbb 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
         "prod": "vite build"
     },
     "devDependencies": {
-        "@algolia/autocomplete-js": "^1.17.9",
         "@babel/core": "^7.23.9",
         "@hotwired/turbo": "^8.0.2",
         "@searchkit/instantsearch-client": "^4.14.1",
diff --git a/yarn.lock b/yarn.lock
index eb8b41c7f..dc1f1615a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,44 +2,6 @@
 # yarn lockfile v1
 
 
-"@algolia/autocomplete-core@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.17.9.tgz#83374c47dc72482aa45d6b953e89377047f0dcdc"
-  integrity sha512-O7BxrpLDPJWWHv/DLA9DRFWs+iY1uOJZkqUwjS5HSZAGcl0hIVCQ97LTLewiZmZ402JYUrun+8NqFP+hCknlbQ==
-  dependencies:
-    "@algolia/autocomplete-plugin-algolia-insights" "1.17.9"
-    "@algolia/autocomplete-shared" "1.17.9"
-
-"@algolia/autocomplete-js@^1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-js/-/autocomplete-js-1.17.9.tgz#2f7e5599fdfe7d6c44b82ac5b64662b487615465"
-  integrity sha512-51xmsIfApj8LEceArnLe3UfS8HSgJJa70FUEYpnLryO6+KZL0pDPQHw1uVw6e5yJiKN0KelDmk2Sa2uJ+gVKJw==
-  dependencies:
-    "@algolia/autocomplete-core" "1.17.9"
-    "@algolia/autocomplete-preset-algolia" "1.17.9"
-    "@algolia/autocomplete-shared" "1.17.9"
-    htm "^3.1.1"
-    preact "^10.13.2"
-
-"@algolia/autocomplete-plugin-algolia-insights@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.9.tgz#74c86024d09d09e8bfa3dd90b844b77d9f9947b6"
-  integrity sha512-u1fEHkCbWF92DBeB/KHeMacsjsoI0wFhjZtlCq2ddZbAehshbZST6Hs0Avkc0s+4UyBGbMDnSuXHLuvRWK5iDQ==
-  dependencies:
-    "@algolia/autocomplete-shared" "1.17.9"
-
-"@algolia/autocomplete-preset-algolia@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.9.tgz#911f3250544eb8ea4096fcfb268f156b085321b5"
-  integrity sha512-Na1OuceSJeg8j7ZWn5ssMu/Ax3amtOwk76u4h5J4eK2Nx2KB5qt0Z4cOapCsxot9VcEN11ADV5aUSlQF4RhGjQ==
-  dependencies:
-    "@algolia/autocomplete-shared" "1.17.9"
-
-"@algolia/autocomplete-shared@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.9.tgz#5f38868f7cb1d54b014b17a10fc4f7e79d427fa8"
-  integrity sha512-iDf05JDQ7I0b7JEA/9IektxN/80a2MZ1ToohfmNS3rfeuQnIKI3IJlIafD0xu4StbtQTghx9T3Maa97ytkXenQ==
-
 "@algolia/events@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950"
@@ -1054,7 +1016,7 @@ hogan.js@^3.0.2:
     mkdirp "0.3.0"
     nopt "1.0.10"
 
-htm@^3.0.0, htm@^3.1.1:
+htm@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/htm/-/htm-3.1.1.tgz#49266582be0dc66ed2235d5ea892307cc0c24b78"
   integrity sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ==
@@ -1445,7 +1407,7 @@ postcss@^8.4.23, postcss@^8.4.29, postcss@^8.4.43:
     picocolors "^1.1.0"
     source-map-js "^1.2.1"
 
-preact@^10.10.0, preact@^10.13.2:
+preact@^10.10.0:
   version "10.25.4"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.25.4.tgz#c1d00bee9d7b9dcd06a2311d9951973b506ae8ac"
   integrity sha512-jLdZDb+Q+odkHJ+MpW/9U5cODzqnB+fy2EiHSZES7ldV5LK7yjlVzTp7R8Xy6W6y75kfK8iWYtFVH7lvjwrCMA==
@@ -1594,16 +1556,7 @@ source-map@^0.7.4:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1621,14 +1574,7 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -1835,16 +1781,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

From 47a490f548328db05f05944c415e61bfe950f26d Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 5 Mar 2025 09:48:59 +0100
Subject: [PATCH 069/244] Removed all unused CSS files

---
 resources/css/app.css                     |  4 --
 resources/css/components/autocomplete.css | 18 ---------
 resources/css/components/price-slider.css | 45 -----------------------
 resources/css/components/vue-slider.css   | 12 ------
 4 files changed, 79 deletions(-)
 delete mode 100644 resources/css/components/autocomplete.css
 delete mode 100644 resources/css/components/price-slider.css
 delete mode 100644 resources/css/components/vue-slider.css

diff --git a/resources/css/app.css b/resources/css/app.css
index e35303a07..193081bec 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -1,7 +1,3 @@
-@import 'components/vue-slider';
-@import 'components/price-slider';
-@import 'components/autocomplete';
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
diff --git a/resources/css/components/autocomplete.css b/resources/css/components/autocomplete.css
deleted file mode 100644
index cabf520bf..000000000
--- a/resources/css/components/autocomplete.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*Can we remove this file?*/
-.search-input + div div[groupposition='right'] {
-    @apply size-6 right-16 cursor-pointer z-50 !-translate-y-1/2 !top-1/2 !absolute;
-
-    .cancel-icon {
-        @apply hidden;
-    }
-}
-
-.search-input + div div[groupposition='right'] div[isclearicon='true']::before {
-    @apply size-6;
-    content: '';
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none'%3E%3Cpath d='M4.20986 4.38708L4.29286 4.29308C4.46505 4.1209 4.69415 4.01747 4.93718 4.00219C5.18021 3.98691 5.42046 4.06083 5.61286 4.21008L5.70686 4.29308L11.9999 10.5851L18.2929 4.29308C18.3851 4.19757 18.4955 4.12139 18.6175 4.06898C18.7395 4.01657 18.8707 3.98898 19.0035 3.98783C19.1362 3.98668 19.2679 4.01198 19.3908 4.06226C19.5137 4.11254 19.6254 4.18679 19.7193 4.28069C19.8131 4.37458 19.8874 4.48623 19.9377 4.60913C19.988 4.73202 20.0133 4.8637 20.0121 4.99648C20.011 5.12926 19.9834 5.26048 19.931 5.38249C19.8786 5.50449 19.8024 5.61483 19.7069 5.70708L13.4149 12.0001L19.7069 18.2931C19.879 18.4653 19.9825 18.6944 19.9978 18.9374C20.013 19.1804 19.9391 19.4207 19.7899 19.6131L19.7069 19.7071C19.5347 19.8793 19.3056 19.9827 19.0625 19.998C18.8195 20.0133 18.5793 19.9393 18.3869 19.7901L18.2929 19.7071L11.9999 13.4151L5.70686 19.7071C5.51826 19.8892 5.26566 19.99 5.00346 19.9878C4.74126 19.9855 4.49045 19.8803 4.30504 19.6949C4.11963 19.5095 4.01447 19.2587 4.01219 18.9965C4.00991 18.7343 4.1107 18.4817 4.29286 18.2931L10.5849 12.0001L4.29286 5.70708C4.12068 5.53489 4.01725 5.30579 4.00197 5.06276C3.98669 4.81974 4.06061 4.57949 4.20986 4.38708Z' fill='%232E4A56'/%3E%3C/svg%3E");
-}
-
-mark {
-    @apply bg-transparent text-inherit font-bold;
-}
diff --git a/resources/css/components/price-slider.css b/resources/css/components/price-slider.css
deleted file mode 100644
index 4c0c37d56..000000000
--- a/resources/css/components/price-slider.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/*Can we remove this file?*/
-div.vue-slider {
-    @apply mt-5 mb-3.5 max-w-sm;
-}
-
-div.vue-slider-process,
-div.vue-slider-rail {
-    @apply h-2 bg-primary !important;
-}
-
-div.vue-slider-rail {
-    @apply bg-emphasis !important;
-}
-
-div.vue-slider .vue-slider-dot {
-    @apply size-6 !important;
-}
-
-div.vue-slider-dot-tooltip-inner {
-    @apply bg-white text border border-default px-1.5 !important;
-}
-
-span.vue-slider-dot-tooltip-text {
-    @apply font-medium font-sans text;
-}
-
-div.vue-slider-dot-tooltip::before {
-    @apply hidden;
-}
-
-div.vue-slider-dot .vue-slider-dot-handle {
-    @apply border border-border shadow;
-}
-
-div.vue-slider-tooltip-wrap.vue-slider-tooltip-top {
-    @apply font-sans;
-}
-
-.price-input {
-    @apply space-x-3;
-}
-
-.vue-slider-component.vue-slider-horizontal {
-    @apply mt-5;
-}
diff --git a/resources/css/components/vue-slider.css b/resources/css/components/vue-slider.css
deleted file mode 100644
index 046893fd9..000000000
--- a/resources/css/components/vue-slider.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/*Can we remove this file?*/
-.vue-slider {
-    @apply mx-2;
-}
-
-.vue-slider-dot-tooltip-inner {
-    @apply border-primary bg-primary !important;
-}
-
-.vue-slider-process {
-    @apply bg-primary !important;
-}

From cd5b7c1f067629badb3ea0fb9ced8012c548d763 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 5 Mar 2025 10:13:59 +0100
Subject: [PATCH 070/244] Cache config

---
 src/Http/ViewComposers/ConfigComposer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 382e6e507..3b4331056 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -58,7 +58,7 @@ public function getConfig(): array
             'show_tax'                     => (bool) Rapidez::config('tax/display/type', 1),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
-            'max_category_level'           => Category::withoutGlobalScopes()->selectRaw('MAX(level) as maxlevel')->first()->maxlevel,
+            'max_category_level'           => Cache::rememberForever('max_category_level', fn() => Category::withoutGlobalScopes()->selectRaw('MAX(level) as maxlevel')->first()->maxlevel),
 
             // TODO: For the products we've the `rapidez.index` config
             // set from the `src/Rapidez.php` which is accessible

From 9a45621b1ab31a99f7151bf91e1f072617a7d710 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Wed, 5 Mar 2025 09:14:28 +0000
Subject: [PATCH 071/244] Apply fixes from Duster

---
 src/Http/ViewComposers/ConfigComposer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 3b4331056..77736a71b 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -58,7 +58,7 @@ public function getConfig(): array
             'show_tax'                     => (bool) Rapidez::config('tax/display/type', 1),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
-            'max_category_level'           => Cache::rememberForever('max_category_level', fn() => Category::withoutGlobalScopes()->selectRaw('MAX(level) as maxlevel')->first()->maxlevel),
+            'max_category_level'           => Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->selectRaw('MAX(level) as maxlevel')->first()->maxlevel),
 
             // TODO: For the products we've the `rapidez.index` config
             // set from the `src/Rapidez.php` which is accessible

From 51e1c7a55f65814a14c7780e1d462cab9205e9bd Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 5 Mar 2025 10:45:52 +0100
Subject: [PATCH 072/244] Shorten all function definitions & fix filter error

---
 resources/js/components/Listing/Listing.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 474650082..d962a87ec 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -88,14 +88,14 @@ export default {
         // TODO: Maybe move this completely to PHP?
         // Any drawbacks? A window.config that
         // becomes to big? Is that an issue?
-        filters: function () {
+        filters() {
             return Object.values(this.attributes)
                 .filter((attribute) => attribute.filter)
                 .map((filter) => ({ ...filter, code: this.filterPrefix(filter) + filter.code, base_code: filter.code }))
                 .sort((a, b) => a.position - b.position)
         },
 
-        facets: function () {
+        facets() {
             return [
                 ...this.filters.map((filter) => ({
                     attribute: filter.code,
@@ -116,11 +116,11 @@ export default {
             return Array.from({ length: config.max_category_level ?? 3 }).map((_, index) => 'category_lvl' + (index + 1))
         },
 
-        sortings: function () {
+        sortings() {
             return Object.values(this.attributes).filter((attribute) => attribute.sorting)
         },
 
-        hitsPerPage: function () {
+        hitsPerPage() {
             return this.$root.config.grid_per_page_values
                 .map(function (pages, index) {
                     return {
@@ -132,7 +132,7 @@ export default {
                 .concat({ label: this.$root.config.translations.all, value: 10000 })
         },
 
-        sortOptions: function () {
+        sortOptions() {
             return [
                 {
                     label: window.config.translations.relevance,
@@ -182,7 +182,7 @@ export default {
     },
 
     watch: {
-        attributes: function (value) {
+        attributes(value) {
             this.loaded = Object.keys(value).length > 0
         },
     },
@@ -296,12 +296,12 @@ export default {
             return items.map((item) => ({
                 filter: this.filters.find((filter) => filter.code === item.attribute),
                 ...item,
-            }))
+            })).filter(item => item.filter)
         },
 
         withSwatches(items, filter) {
             return items.map((item) => ({
-                swatch: this.$root.swatches[filter.base_code]?.options?.[item.value] ?? null,
+                swatch: this.$root.swatches[filter?.base_code]?.options?.[item.value] ?? null,
                 ...item,
             }))
         },

From 7892e83839b7b23ede113528b46200fc4f9c92c7 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Wed, 5 Mar 2025 09:46:35 +0000
Subject: [PATCH 073/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index d962a87ec..53bc4840d 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -293,10 +293,12 @@ export default {
         },
 
         withFilters(items) {
-            return items.map((item) => ({
-                filter: this.filters.find((filter) => filter.code === item.attribute),
-                ...item,
-            })).filter(item => item.filter)
+            return items
+                .map((item) => ({
+                    filter: this.filters.find((filter) => filter.code === item.attribute),
+                    ...item,
+                }))
+                .filter((item) => item.filter)
         },
 
         withSwatches(items, filter) {

From 887e1ba252ef6275cba50b51da558ad48cd77c64 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 5 Mar 2025 11:02:14 +0100
Subject: [PATCH 074/244] Changed some todos

---
 resources/js/components/Listing/Listing.vue              | 2 --
 resources/js/components/Search/Autocomplete.vue          | 9 ++++++++-
 resources/views/listing/partials/filter/select.blade.php | 5 -----
 src/Models/Category.php                                  | 8 +++++++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 2b6d9e12d..adc89f061 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,6 +1,4 @@
 <script>
-// TODO: How can we have this extendable in
-// case we want to use another component?
 import {
     AisClearRefinements,
     AisConfigure,
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 2edb64147..fbe5c0bda 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,5 +1,12 @@
 <script>
-import { AisConfigure, AisHighlight, AisHits, AisIndex, AisInstantSearch, AisSearchBox } from 'vue-instantsearch'
+import {
+    AisConfigure,
+    AisHighlight,
+    AisHits,
+    AisIndex,
+    AisInstantSearch,
+    AisSearchBox
+} from 'vue-instantsearch'
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
 
diff --git a/resources/views/listing/partials/filter/select.blade.php b/resources/views/listing/partials/filter/select.blade.php
index 9c307bb99..98950003f 100644
--- a/resources/views/listing/partials/filter/select.blade.php
+++ b/resources/views/listing/partials/filter/select.blade.php
@@ -18,11 +18,6 @@
                         class="flex justify-between text-base text-muted"
                     >
                         <div class="flex">
-                            {{--
-                            TODO: Maybe we should change these checkboxes
-                            to anchors so we can use createURL(item)
-                            within a href. Maybe useful for SEO?
-                            --}}
                             <x-rapidez::input.checkbox
                                 v-bind:checked="item.isRefined"
                                 v-on:change="refine(item.value)"
diff --git a/src/Models/Category.php b/src/Models/Category.php
index 72a8bab63..bbd79b7f1 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -107,7 +107,13 @@ public function getParentcategoriesAttribute()
     protected function makeAllSearchableUsing(Builder $query)
     {
         // TODO: Is this filter still useful? You could override and
-        // extend the existing model which gives you full control
+        // extend the existing model which gives you full control.
+        // But... that will be applied always, this one is just
+        // for the index. Another option could be to have 2
+        // category models; a default and one specificly
+        // for the index: Models/IndexCategory.php
+        // directly handy to give these Scout
+        // methods their own place...
         return $query->withEventyGlobalScopes('index.categories.scopes')
             ->select((new (config('rapidez.models.category')))->qualifyColumns(['entity_id', 'name']))
             ->whereNotNull('url_key')

From c34aff08d626d07295a00077ed4e5b1374aebe78 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Wed, 5 Mar 2025 10:02:45 +0000
Subject: [PATCH 075/244] Apply fixes from Prettier

---
 resources/js/components/Search/Autocomplete.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index fbe5c0bda..2edb64147 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,12 +1,5 @@
 <script>
-import {
-    AisConfigure,
-    AisHighlight,
-    AisHits,
-    AisIndex,
-    AisInstantSearch,
-    AisSearchBox
-} from 'vue-instantsearch'
+import { AisConfigure, AisHighlight, AisHits, AisIndex, AisInstantSearch, AisSearchBox } from 'vue-instantsearch'
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
 

From d6a3c9f2abc831058bab91be592e492005dc9d56 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 5 Mar 2025 15:39:54 +0100
Subject: [PATCH 076/244] Update src/Http/ViewComposers/ConfigComposer.php

Co-authored-by: indykoning <15870933+indykoning@users.noreply.github.com>
---
 src/Http/ViewComposers/ConfigComposer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 77736a71b..4abeaed38 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -58,7 +58,7 @@ public function getConfig(): array
             'show_tax'                     => (bool) Rapidez::config('tax/display/type', 1),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
-            'max_category_level'           => Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->selectRaw('MAX(level) as maxlevel')->first()->maxlevel),
+            'max_category_level'           => Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->max('level')),
 
             // TODO: For the products we've the `rapidez.index` config
             // set from the `src/Rapidez.php` which is accessible

From b7d1435b56b303c5c703d36a882a0d5e1af35a3e Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Thu, 6 Mar 2025 11:34:53 +0100
Subject: [PATCH 077/244] Cleanup index usages

---
 resources/js/components/Listing/Listing.vue  |  6 +++++-
 resources/views/components/listing.blade.php |  5 ++---
 src/Commands/IndexCommand.php                |  2 --
 src/Models/Traits/Searchable.php             | 20 ++++++++++++++++----
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index adc89f061..a9dd21ef4 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -50,7 +50,7 @@ export default {
             type: Array,
             default: () => [],
         },
-        index: {
+        indexModel: {
             type: String,
         },
 
@@ -172,6 +172,10 @@ export default {
         rangeAttributes() {
             return this.filters.filter((filter) => filter.input == 'price').map((filter) => filter.code)
         },
+
+        index() {
+            return [config.index_prefix, this.indexModel, config.store].join('_')
+        },
     },
 
     watch: {
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 3930e57d6..418af453f 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -14,11 +14,10 @@
             field: 'created_at',
             order: 'desc',
             {{-- TODO: Extract this somewhere? --}}
-            value: config.index_prefix + '_products_' + config.store + '_created_at_desc',
+            value: config.index_prefix + '_{{ config('rapidez.models.product')::indexName() }}_' + config.store + '_created_at_desc',
             key: '_created_at_desc'
         }]"
-        {{-- TODO: Extract this somewhere? --}}
-        :index="config.index_prefix + '_products_' + config.store"
+        index-model="{{ config('rapidez.models.product')::indexName() }}"
         v-cloak
     >
         <div slot-scope="{ loaded, filters, sortOptions, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 92be53191..cf0e5ab55 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -38,8 +38,6 @@ public function handle()
             $this->line('Store: ' . $store['name']);
 
             foreach ($types as $type => $model) {
-                config()->set('rapidez.index', $type);
-
                 $this->call('scout:import', [
                     'searchable' => $model,
                 ]);
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 92ccddab1..2aea0e22b 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
 use Laravel\Scout\Searchable as ScoutSearchable;
 use TorMorten\Eventy\Facades\Eventy;
 
@@ -13,12 +14,14 @@ trait Searchable
 {
     use ScoutSearchable;
 
+    public ?string $indexName;
+
     public function toSearchableArray(): array
     {
         $data = $this->searchableData($this->toArray(), $this);
 
         // TODO: Is this filter still useful? Overriding the model gives you full control
-        return Eventy::filter('index.' . config('rapidez.index') . '.data', $data, $this);
+        return Eventy::filter('index.' . $this->getIndexName() . '.data', $data, $this);
     }
 
     // TODO: Not sure if this is the best idea, we already
@@ -38,16 +41,25 @@ public function shouldBeSearchable(): bool
         return true;
     }
 
+    public function getIndexName(): string
+    {
+        return $this->indexName ?? Str::snake(Str::pluralStudly(class_basename(static::class)));
+    }
+
+    protected function indexName(): string
+    {
+        return $this->getIndexName();
+    }
+
     public function searchableAs(): string
     {
-        if (! config('rapidez.index')) {
+        if (! config('rapidez.store')) {
             throw new Exception('Do not use Scout directly. Please use `php artisan rapidez:index`.');
         }
 
         return implode('_', array_values([
             config('scout.prefix'),
-            // TODO: Maybe use the model name here?
-            config('rapidez.index'),
+            $this->getIndexName(),
             config('rapidez.store'),
         ]));
     }

From f2693bc951a9ee80adb62e6aef11adb77b3d10ac Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Thu, 6 Mar 2025 11:55:07 +0100
Subject: [PATCH 078/244] Use searchableAs & don't use static calling for now

---
 resources/js/components/Listing/Listing.vue  | 6 +-----
 resources/views/components/listing.blade.php | 2 +-
 src/Models/Traits/Searchable.php             | 5 -----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index d1b4c2d2e..0cb5719d1 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -42,7 +42,7 @@ export default {
         sortOptionsCallback: {
             type: Function,
         },
-        indexModel: {
+        index: {
             type: String,
         },
 
@@ -182,10 +182,6 @@ export default {
         rangeAttributes() {
             return this.filters.filter((filter) => filter.input == 'price').map((filter) => filter.code)
         },
-
-        index() {
-            return [config.index_prefix, this.indexModel, config.store].join('_')
-        },
     },
 
     watch: {
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 832403fd2..7f7b41e90 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -9,7 +9,7 @@
 <div class="min-h-screen">
     <listing
         {{ $attributes }}
-        index-model="{{ config('rapidez.models.product')::indexName() }}"
+        index="{{ (new (config('rapidez.models.product')))->searchableAs() }}"
         v-cloak
     >
         <div slot-scope="{ loaded, filters, sortOptions, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 2aea0e22b..26b8b33b5 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -46,11 +46,6 @@ public function getIndexName(): string
         return $this->indexName ?? Str::snake(Str::pluralStudly(class_basename(static::class)));
     }
 
-    protected function indexName(): string
-    {
-        return $this->getIndexName();
-    }
-
     public function searchableAs(): string
     {
         if (! config('rapidez.store')) {

From 6a55b6d00b11282bf1d84456b300569d1acd2993 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Thu, 6 Mar 2025 12:02:21 +0100
Subject: [PATCH 079/244] Fix indexer types & simplify config for extra models

---
 config/rapidez/indexer.php    | 2 +-
 src/Commands/IndexCommand.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/rapidez/indexer.php b/config/rapidez/indexer.php
index 924298c11..8d9a571c2 100644
--- a/config/rapidez/indexer.php
+++ b/config/rapidez/indexer.php
@@ -14,6 +14,6 @@
     // The Rapidez indexer will automatically start indexing any models with the Searchable trait that exist within `models.php`.
     // If you want to add extra models you can add them here. Only Eloquent models are supported.
     'extra_models' => [
-        // 'book' => \App\Models\Book::class,
+        // \App\Models\Book::class,
     ],
 ];
diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index cf0e5ab55..e6a7a0507 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -21,7 +21,7 @@ public function handle()
             ->merge(config('rapidez.indexer.extra_models'));
 
         $types = $this->option('types')
-            ? $baseSearchableModels->only(explode(',', $this->option('types')))
+            ? $baseSearchableModels->filter(fn($model) => in_array((new $model)->getIndexName(), explode(',', $this->option('types'))))
             : $baseSearchableModels;
 
         $stores = $this->option('store')

From fd7879b04e44486e0648711bb80cc2fbc2f9ee47 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Thu, 6 Mar 2025 11:02:48 +0000
Subject: [PATCH 080/244] Apply fixes from Duster

---
 src/Commands/IndexCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index e6a7a0507..f138f8b9a 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -21,7 +21,7 @@ public function handle()
             ->merge(config('rapidez.indexer.extra_models'));
 
         $types = $this->option('types')
-            ? $baseSearchableModels->filter(fn($model) => in_array((new $model)->getIndexName(), explode(',', $this->option('types'))))
+            ? $baseSearchableModels->filter(fn ($model) => in_array((new $model)->getIndexName(), explode(',', $this->option('types'))))
             : $baseSearchableModels;
 
         $stores = $this->option('store')

From 1a3c659177e268c6379aba6074e1a73f6fab3be6 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Thu, 6 Mar 2025 12:05:41 +0100
Subject: [PATCH 081/244] Use index name through model everywhere

---
 resources/views/layouts/partials/header/autocomplete.blade.php  | 2 +-
 .../layouts/partials/header/autocomplete/categories.blade.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 43593ede2..be0d19481 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -17,7 +17,7 @@
         <ais-instant-search
             class="contents"
             :search-client="searchClient"
-            :index-name="config.index_prefix + '_products_' + config.store"
+            index-name="{{ (new (config('rapidez.models.product')))->searchableAs() }}"
         >
             <div class="contents">
                 <!-- TODO: This is a Vue 3 thing -->
diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index 664e8b397..1fcf10391 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -1,4 +1,4 @@
-<ais-index :index-name="config.index_prefix + '_categories_' + config.store">
+<ais-index index-name="{{ (new (config('rapidez.models.category')))->searchableAs() }}">
     <ais-hits v-slot="{ items }">
         <div class="border-b p-2" v-if="items && items.length">
             <x-rapidez::autocomplete.title>@lang('Categories')</x-rapidez::autocomplete.title>

From 07d89d449dfbfae43bafff2d9fed8020f305b888 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 7 Mar 2025 09:21:57 +0000
Subject: [PATCH 082/244] Added filterQueryString and filterScoreString to
 Listing (#766)

---
 resources/js/components/Listing/Listing.vue | 34 ++++++++++++++++++++-
 resources/views/category/overview.blade.php | 15 ++-------
 resources/views/search/overview.blade.php   |  2 +-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 022fcd335..77f0f0e3e 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -60,6 +60,13 @@ export default {
         },
         baseFilters: {
             type: Function,
+            default: () => [],
+        },
+        filterQueryString: {
+            type: String,
+        },
+        filterScoreScript: {
+            type: String,
         },
     },
 
@@ -192,7 +199,7 @@ export default {
         // directly due the JS size
         initSearchClient() {
             return Client(this.searchkit, {
-                getBaseFilters: this.baseFilters,
+                getBaseFilters: this.getBaseFilters,
                 getQuery: this.query,
             })
         },
@@ -239,6 +246,31 @@ export default {
             })
         },
 
+        getBaseFilters() {
+            let extraFilters = []
+            if (this.filterQueryString) {
+                extraFilters.push({
+                    query_string: {
+                        query: this.filterQueryString,
+                    },
+                })
+            }
+
+            if (this.filterScoreScript) {
+                extraFilters.push({
+                    function_score: {
+                        script_score: {
+                            script: {
+                                source: this.filterScoreScript,
+                            },
+                        },
+                    },
+                })
+            }
+
+            return this.baseFilters().concat(extraFilters)
+        },
+
         stateToRoute(uiState) {
             let data = uiState[this.index]
 
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index 40b6fc4c3..8bf214df3 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -13,19 +13,8 @@
         @if ($category->is_anchor)
             <x-rapidez::listing
                 :root-path="$category->parentcategories->pluck('name')->join(' > ')"
-                v-bind:base-filters="() => [{
-                    query_string: {
-                        query: 'visibility:(2 OR 4) AND category_ids:{{ $category->entity_id }}'
-                    }
-                }, {
-                    function_score: {
-                        script_score: {
-                            script: {
-                                source: `Integer.parseInt(doc['positions.{{ $category->entity_id }}'].empty ? '0' : doc['positions.{{ $category->entity_id }}'].value)`,
-                            },
-                        },
-                    },
-                }]"
+                filter-query-string="visibility:(2 OR 4) AND category_ids:{{ $category->entity_id }}"
+                filter-score-script="Integer.parseInt(doc['positions.{{ $category->entity_id }}'].empty ? '0' : doc['positions.{{ $category->entity_id }}'].value)"
             />
         @else
             <div class="flex max-md:flex-col">
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 1756aa787..e499d4bc8 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -8,6 +8,6 @@
     <div class="container">
         <h1 class="font-bold text-3xl">@lang('Search for'): {{ request()->q }}</h1>
 
-        <x-rapidez::listing v-bind:base-filters="() => [{ query_string: { query: 'visibility:(3 OR 4)' }}]"/>
+        <x-rapidez::listing filter-query-string="visibility:(3 OR 4)"/>
     </div>
 @endsection

From 3e08470f4bb8454e282978f226bc099395c9c387 Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Mon, 10 Mar 2025 11:20:27 +0100
Subject: [PATCH 083/244] Remove need to preload lazy loaded components (#765)

---
 resources/js/components/Listing/Listing.vue   | 58 +++++++++----------
 .../js/components/Search/Autocomplete.vue     | 21 ++++---
 resources/views/components/listing.blade.php  |  9 +--
 .../views/components/productlist.blade.php    |  4 +-
 resources/views/layouts/app.blade.php         |  6 --
 .../partials/header/autocomplete.blade.php    |  4 +-
 .../partials/filter/category.blade.php        |  2 +-
 .../listing/partials/filter/price.blade.php   |  2 +-
 .../listing/partials/toolbar/pages.blade.php  |  2 +-
 9 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 77f0f0e3e..3f0c1573b 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,43 +1,43 @@
 <script>
-import {
-    AisClearRefinements,
-    AisConfigure,
-    AisCurrentRefinements,
-    AisHierarchicalMenu,
-    AisHits,
-    AisHitsPerPage,
-    AisInstantSearch,
-    AisPagination,
-    AisRangeInput,
-    AisRefinementList,
-    AisSearchBox,
-    AisSortBy,
-    AisStats,
-} from 'vue-instantsearch'
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
-import deepmerge from 'deepmerge'
 
 import { history } from 'instantsearch.js/es/lib/routers'
 
-Vue.component('ais-instant-search', AisInstantSearch)
-Vue.component('ais-configure', AisConfigure)
-Vue.component('ais-refinement-list', AisRefinementList)
-Vue.component('ais-hierarchical-menu', AisHierarchicalMenu)
-Vue.component('ais-range-input', AisRangeInput)
-Vue.component('ais-search-box', AisSearchBox)
-Vue.component('ais-current-refinements', AisCurrentRefinements)
-Vue.component('ais-clear-refinements', AisClearRefinements)
-Vue.component('ais-hits', AisHits)
-Vue.component('ais-hits-per-page', AisHitsPerPage)
-Vue.component('ais-sort-by', AisSortBy)
-Vue.component('ais-pagination', AisPagination)
-Vue.component('ais-stats', AisStats)
+import AisInstantSearch from 'vue-instantsearch/vue2/es/src/components/InstantSearch'
+import AisSearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
+import AisHits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
+import AisConfigure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
+
+import AisRefinementList from 'vue-instantsearch/vue2/es/src/components/RefinementList.vue.js'
+import AisHierarchicalMenu from 'vue-instantsearch/vue2/es/src/components/HierarchicalMenu.vue.js'
+import AisRangeInput from 'vue-instantsearch/vue2/es/src/components/RangeInput.vue.js'
+import AisCurrentRefinements from 'vue-instantsearch/vue2/es/src/components/CurrentRefinements.vue.js'
+import AisClearRefinements from 'vue-instantsearch/vue2/es/src/components/ClearRefinements.vue.js'
+import AisHitsPerPage from 'vue-instantsearch/vue2/es/src/components/HitsPerPage.vue.js'
+import AisSortBy from 'vue-instantsearch/vue2/es/src/components/SortBy.vue.js'
+import AisPagination from 'vue-instantsearch/vue2/es/src/components/Pagination.vue.js'
+import AisStats from 'vue-instantsearch/vue2/es/src/components/Stats.vue.js'
 
 import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
 
 export default {
+    components: {
+        'ais-instant-search': AisInstantSearch,
+        'ais-search-box': AisSearchBox,
+        'ais-hits': AisHits,
+        'ais-configure': AisConfigure,
+        'ais-refinement-list': AisRefinementList,
+        'ais-hierarchical-menu': AisHierarchicalMenu,
+        'ais-range-input': AisRangeInput,
+        'ais-current-refinements': AisCurrentRefinements,
+        'ais-clear-refinements': AisClearRefinements,
+        'ais-hits-per-page': AisHitsPerPage,
+        'ais-sort-by': AisSortBy,
+        'ais-pagination': AisPagination,
+        'ais-stats': AisStats,
+    },
     props: {
         // TODO: Do we still use/need this?
         // Maybe transform it to a callback
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 2edb64147..cee1e1b75 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,16 +1,23 @@
 <script>
-import { AisConfigure, AisHighlight, AisHits, AisIndex, AisInstantSearch, AisSearchBox } from 'vue-instantsearch'
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
 
-Vue.component('ais-instant-search', AisInstantSearch)
-Vue.component('ais-search-box', AisSearchBox)
-Vue.component('ais-hits', AisHits)
-Vue.component('ais-index', AisIndex)
-Vue.component('ais-configure', AisConfigure)
-Vue.component('ais-highlight', AisHighlight)
+import AisInstantSearch from 'vue-instantsearch/vue2/es/src/components/InstantSearch'
+import AisSearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
+import AisHits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
+import AisIndex from 'vue-instantsearch/vue2/es/src/components/Index.js'
+import AisConfigure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
+import AisHighlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
 
 export default {
+    components: {
+        'ais-instant-search': AisInstantSearch,
+        'ais-search-box': AisSearchBox,
+        'ais-hits': AisHits,
+        'ais-index': AisIndex,
+        'ais-configure': AisConfigure,
+        'ais-highlight': AisHighlight,
+    },
     data: () => ({
         loaded: false,
     }),
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 57964bf63..63287f83e 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -21,14 +21,15 @@
         }]"
         {{-- TODO: Extract this somewhere? --}}
         :index="config.index_prefix + '_products_' + config.store"
+        inline-template
         v-cloak
     >
-        <div slot-scope="{ loaded, filters, sortOptions, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
+        <div>
             <ais-instant-search
                 v-if="loaded"
-                :search-client="listingSlotProps.searchClient"
-                :index-name="listingSlotProps.index"
-                :routing="listingSlotProps.routing"
+                :search-client="searchClient"
+                :index-name="index"
+                :routing="routing"
             >
                 {{ $before ?? '' }}
                 @if ($slot->isEmpty())
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index ba30bde5c..c1592f804 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -13,12 +13,12 @@
 
 @if ($value)
     <lazy v-slot="{ intersected }">
-        <listing v-if="intersected" v-cloak>
+        <listing v-if="intersected" v-cloak inline-template>
             {{--
             TODO: Maybe better to have a wrapper
             component again like reactive-base?
             --}}
-            <div slot-scope="{ loaded, searchClient }">
+            <div>
                 <ais-instant-search
                     v-if="loaded"
                     :search-client="searchClient"
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index f2c610d8f..cef6bf4df 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,12 +21,6 @@
     <link rel="canonical" href="@yield('canonical', url()->current())" />
 
     @vite(['resources/css/app.css', 'resources/js/app.js'])
-
-    {{-- TODO fix nested lazy loading components --}}
-    @if ($file = vite_filename_path('Autocomplete.vue'))
-        @vite([$file])
-    @endif
-
     @stack('head')
     @config('design/head/includes')
 </head>
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 43593ede2..3cb937110 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -12,8 +12,8 @@
     <x-rapidez::autocomplete.magnifying-glass />
 </div>
 
-<autocomplete v-else>
-    <div slot-scope="{ searchClient, loaded }" class="relative w-full" v-if="loaded">
+<autocomplete v-else inline-template>
+    <div class="relative w-full">
         <ais-instant-search
             class="contents"
             :search-client="searchClient"
diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 2cce244e8..6018f5a7a 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -1,5 +1,5 @@
 <ais-hierarchical-menu
-    v-bind:attributes="listingSlotProps.categoryAttributes"
+    v-bind:attributes="categoryAttributes"
     @attributes(['root-path' => $rootPath])
     show-more
 >
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 63d6dba22..643a9a686 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -1,5 +1,5 @@
 <ais-range-input
-    v-if="listingSlotProps.rangeAttributes.includes(filter.code)"
+    v-if="rangeAttributes.includes(filter.code)"
     :attribute="filter.code"
 >
     <template v-slot="{ currentRefinement, range, canRefine, refine, sendEvent }">
diff --git a/resources/views/listing/partials/toolbar/pages.blade.php b/resources/views/listing/partials/toolbar/pages.blade.php
index a66963936..5cf8cdfe9 100644
--- a/resources/views/listing/partials/toolbar/pages.blade.php
+++ b/resources/views/listing/partials/toolbar/pages.blade.php
@@ -1,4 +1,4 @@
-<ais-hits-per-page :items="listingSlotProps.hitsPerPage">
+<ais-hits-per-page :items="hitsPerPage">
     <template v-slot="{ items, refine }">
         <x-rapidez::input.select
             v-bind:value="items.find(item => item.isRefined)?.value"

From f30f7480c7401c624e423a96d095dd93d9a216b3 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 10 Mar 2025 11:22:14 +0100
Subject: [PATCH 084/244] Refactor config files

---
 config/rapidez/frontend.php                  | 11 +--
 config/rapidez/indexer.php                   | 19 -----
 config/rapidez/searchkit.php                 | 22 ++++--
 resources/js/callbacks.js                    |  2 +-
 resources/js/components/Listing/Listing.vue  | 80 ++++++--------------
 resources/js/package.js                      |  2 -
 resources/js/stores/useAttributes.js         | 40 ----------
 resources/js/stores/useSwatches.js           |  2 +-
 resources/views/components/listing.blade.php |  2 +-
 resources/views/layouts/app.blade.php        |  3 +-
 resources/views/layouts/config.blade.php     |  1 +
 resources/views/listing/filters.blade.php    |  2 +-
 routes/api.php                               |  8 --
 routes/web.php                               |  9 +++
 src/Commands/IndexCommand.php                |  3 +-
 src/Http/Controllers/CheckoutController.php  |  3 +-
 src/Http/ViewComposers/ConfigComposer.php    | 25 ++++--
 src/Models/Attribute.php                     | 19 +++++
 src/Models/Product.php                       |  6 +-
 src/Rapidez.php                              | 17 +++++
 src/RapidezServiceProvider.php               | 38 ++++------
 tests/Browser/OnestepCheckoutTest.php        |  2 +-
 22 files changed, 132 insertions(+), 184 deletions(-)
 delete mode 100644 config/rapidez/indexer.php
 delete mode 100644 resources/js/stores/useAttributes.js
 create mode 100644 resources/views/layouts/config.blade.php

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index c108189b1..6e507a108 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -21,12 +21,11 @@
     ],
 
     // The checkout steps which are used to name the steps
-    // in the url and in the progressbar on steps. You can
-    // add different steps for different stores. Keep
+    // in the url and in the progressbar on steps. Keep
     // them lowercase and do not include any spaces.
     'checkout_steps' => [
-        // 'default' => ['onestep'],
-        'default' => ['login', 'credentials', 'payment'],
+        'login', 'credentials', 'payment',
+        // 'onestep',
     ],
 
     'autocomplete' => [
@@ -50,9 +49,7 @@
 
     // Link store codes to theme folders
     // The structure is `'store_code' => 'folder_path'`
-    'themes' => [
-        'default' => resource_path('themes/default'),
-    ],
+    'theme' => resource_path('themes/default'),
 
     // The fully qualified class names of the widgets.
     'widgets' => [
diff --git a/config/rapidez/indexer.php b/config/rapidez/indexer.php
deleted file mode 100644
index 8d9a571c2..000000000
--- a/config/rapidez/indexer.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-return [
-    // TODO: This configuration is a bit lonely here,
-    // maybe we can move this to Scout later?
-
-    // Which product visibilities should be indexed?
-    // VISIBILITY_NOT_VISIBLE    = 1
-    // VISIBILITY_IN_CATALOG     = 2
-    // VISIBILITY_IN_SEARCH      = 3
-    // VISIBILITY_BOTH           = 4
-    'visibility' => [2, 3, 4],
-
-    // The Rapidez indexer will automatically start indexing any models with the Searchable trait that exist within `models.php`.
-    // If you want to add extra models you can add them here. Only Eloquent models are supported.
-    'extra_models' => [
-        // \App\Models\Book::class,
-    ],
-];
diff --git a/config/rapidez/searchkit.php b/config/rapidez/searchkit.php
index 4b880f5fe..b62ec5502 100644
--- a/config/rapidez/searchkit.php
+++ b/config/rapidez/searchkit.php
@@ -34,6 +34,11 @@
         'reviews_score',
     ],
 
+    // Extra attributes that should be a range slider. Only supports numeric values.
+    'range_attributes' => [
+        // 'attribute_code'
+    ],
+
     // Additional attributes that are used to create facets.
     // From Magento only "Yes/No, Dropdown, Multiple Select and Price" attribute types
     // can be configured as filter. If you'd like to have a filter for an attribute
@@ -42,19 +47,20 @@
         // ['attribute' => 'brand', 'field' => 'brand.keyword', 'type' => 'string'],
     ],
 
-    // Additional sorting options to be added to the product listings
-    // Given directions can only be an array of 'asc' and/or 'desc'
-    // Order shown here will be the order shown in the dropdown (including the order of the given directions!)
-    'additional_sorting' => [
-        'created_at' => ['desc'],
-    ],
-
     // Attributes that are used to create filters.
     // Required so that SearchKit can keep track of the type and field of each attribute.
-    // TODO: Do the undocumented nestedPath and filterQuery parameters have any use case for us?
+    // TODO: Does the undocumented nestedPath parameter have any use case for us?
+    // TODO: Should we pass the filterQuery parameter? If so, how?
     'filter_attributes' => [
         ['attribute' => 'entity_id', 'field' => 'entity_id', 'type' => 'numeric'],
         ['attribute' => 'category_ids', 'field' => 'category_ids', 'type' => 'numeric'],
         ['attribute' => 'visibility', 'field' => 'visibility', 'type' => 'numeric'],
     ],
+
+    // Additional sorting options to be added to the product listings
+    // Given directions can only be an array of 'asc' and/or 'desc'
+    // Order shown here will be the order shown in the dropdown (including the order of the given directions!)
+    'sorting' => [
+        'created_at' => ['desc'],
+    ],
 ];
diff --git a/resources/js/callbacks.js b/resources/js/callbacks.js
index a2ed198ea..f1fc214ae 100644
--- a/resources/js/callbacks.js
+++ b/resources/js/callbacks.js
@@ -12,7 +12,7 @@ Vue.prototype.scrollToElement = (selector) => {
 }
 
 Vue.prototype.getCheckoutStep = (stepName) => {
-    return (config.checkout_steps[config.store_code] ?? config.checkout_steps['default'])?.indexOf(stepName)
+    return config.checkout_steps?.indexOf(stepName)
 }
 
 Vue.prototype.submitPartials = async function (form) {
diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index c3b2e20ac..bcc7ac2b1 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -35,7 +35,6 @@ Vue.component('ais-pagination', AisPagination)
 Vue.component('ais-stats', AisStats)
 
 import categoryFilter from './Filters/CategoryFilter.vue'
-import useAttributes from '../../stores/useAttributes.js'
 
 export default {
     props: {
@@ -64,7 +63,6 @@ export default {
 
     data: () => ({
         loaded: false,
-        attributes: useAttributes(),
 
         searchkit: null,
         searchClient: null,
@@ -78,23 +76,13 @@ export default {
         this.searchkit = this.initSearchkit()
         this.searchClient = this.initSearchClient()
 
-        this.loaded = Object.keys(this.attributes).length > 0
+        this.loaded = true
     },
 
     computed: {
-        // TODO: Maybe move this completely to PHP?
-        // Any drawbacks? A window.config that
-        // becomes to big? Is that an issue?
-        filters() {
-            return Object.values(this.attributes)
-                .filter((attribute) => attribute.filter)
-                .map((filter) => ({ ...filter, code: this.filterPrefix(filter) + filter.code, base_code: filter.code }))
-                .sort((a, b) => a.position - b.position)
-        },
-
         facets() {
             return [
-                ...this.filters.map((filter) => ({
+                ...config.filterable_attributes.map((filter) => ({
                     attribute: filter.code,
                     field: filter.code + (this.filterType(filter) == 'string' ? '.keyword' : ''),
                     type: this.filterType(filter),
@@ -104,9 +92,7 @@ export default {
                     field: attribute + '.keyword',
                     type: 'string',
                 })),
-            ]
-            // TODO: Double check this and how it's used.
-            // .concat(this.additionalFilters)
+            ].concat(config.searchkit.facet_attributes)
         },
 
         categoryAttributes() {
@@ -114,10 +100,10 @@ export default {
         },
 
         sortings() {
-            return Object.values(this.attributes)
+            return Object.values(config.filterable_attributes)
                 .filter((attribute) => attribute.sorting)
                 .concat(
-                    Object.entries(config.searchkit.additional_sorting).map(([code, directions]) => ({
+                    Object.entries(config.searchkit.sorting).map(([code, directions]) => ({
                         code: code,
                         directions: directions,
                     })),
@@ -190,15 +176,25 @@ export default {
             }
         },
 
-        // TODO: Do we want to make this extendable?
         rangeAttributes() {
-            return this.filters.filter((filter) => filter.input == 'price').map((filter) => filter.code)
+            return config.filterable_attributes
+                .filter((filter) => filter.input == 'price')
+                .map((filter) => filter.code)
+                .concat(config.searchkit.range_attributes ?? [])
         },
-    },
 
-    watch: {
-        attributes(value) {
-            this.loaded = Object.keys(value).length > 0
+        searchSettings() {
+            return {
+                ...config.searchkit,
+                facet_attributes: this.facets,
+                sorting: this.sortOptions.reduce((acc, item) => {
+                    acc[item.key] = {
+                        field: item.field,
+                        order: item.order,
+                    }
+                    return acc
+                }),
+            }
         },
     },
 
@@ -229,25 +225,7 @@ export default {
                 // TODO: Maybe just do: search_settings: config.searchkit
                 // so it's possible to add anything to the PHP config
                 // and that will appear here?
-                search_settings: {
-                    highlight_attributes: config.searchkit.highlight_attributes,
-                    search_attributes: config.searchkit.search_attributes,
-                    result_attributes: config.searchkit.result_attributes,
-
-                    // TODO: For consistency maybe make it possible to do this:
-                    // facet_attributes: config.searchkit.facet_attributes,
-                    facet_attributes: this.facets,
-
-                    filter_attributes: config.searchkit.filter_attributes,
-
-                    sorting: this.sortOptions.reduce((acc, item) => {
-                        acc[item.key] = {
-                            field: item.field,
-                            order: item.order,
-                        }
-                        return acc
-                    }),
-                },
+                search_settings: this.searchSettings,
             })
         },
 
@@ -315,22 +293,10 @@ export default {
             return ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string'
         },
 
-        filterPrefix(filter) {
-            if (filter.super) {
-                return 'super_'
-            }
-
-            if (filter.visual_swatch) {
-                return 'visual_'
-            }
-
-            return ''
-        },
-
         withFilters(items) {
             return items
                 .map((item) => ({
-                    filter: this.filters.find((filter) => filter.code === item.attribute),
+                    filter: config.filterable_attributes.find((filter) => filter.code === item.attribute),
                     ...item,
                 }))
                 .filter((item) => item.filter)
diff --git a/resources/js/package.js b/resources/js/package.js
index cc40b4075..d753722d5 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -13,7 +13,6 @@ import useCart from './stores/useCart'
 import useUser from './stores/useUser'
 import useMask from './stores/useMask'
 import { swatches, clear as clearSwatches } from './stores/useSwatches'
-import { clear as clearAttributes } from './stores/useAttributes.js'
 import './vue'
 import './fetch'
 import './filters'
@@ -45,7 +44,6 @@ if (import.meta.env.VITE_DEBUG === 'true') {
 document.addEventListener('vue:loaded', () => {
     const lastStoreCode = useLocalStorage('last_store_code', window.config.store_code)
     if (lastStoreCode.value !== window.config.store_code) {
-        clearAttributes()
         clearSwatches()
         lastStoreCode.value = window.config.store_code
     }
diff --git a/resources/js/stores/useAttributes.js b/resources/js/stores/useAttributes.js
deleted file mode 100644
index 4ecc29051..000000000
--- a/resources/js/stores/useAttributes.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// TODO: In this file there is a lot of duplication compared to useSwatches. Can we improve that?
-import { computedAsync, useLocalStorage } from '@vueuse/core'
-
-export const attributesStorage = useLocalStorage('attributes', {})
-let isRefreshing = false
-
-export const refresh = async function () {
-    if (isRefreshing) {
-        console.debug('Refresh canceled, request already in progress...')
-        return
-    }
-
-    try {
-        isRefreshing = true
-        attributesStorage.value = (await window.rapidezAPI('get', 'attributes')) || {}
-        isRefreshing = false
-    } catch (error) {
-        isRefreshing = false
-        console.error(error)
-        Notify(window.config.translations.errors.wrong, 'error')
-    }
-}
-
-export const clear = async function () {
-    attributesStorage.value = {}
-}
-
-export const attributes = computedAsync(
-    async () => {
-        if (Object.keys(attributesStorage.value).length === 0) {
-            await refresh()
-        }
-
-        return attributesStorage
-    },
-    attributesStorage.value,
-    { lazy: true, shallow: false },
-)
-
-export default () => attributes
diff --git a/resources/js/stores/useSwatches.js b/resources/js/stores/useSwatches.js
index 42772dedc..c52372ff1 100644
--- a/resources/js/stores/useSwatches.js
+++ b/resources/js/stores/useSwatches.js
@@ -1,4 +1,4 @@
-// TODO: In this file there is a lot of duplication compared to useAttributes. Can we improve that?
+// TODO: Should we move the swatches to the `config` data?
 import { computedAsync, useLocalStorage } from '@vueuse/core'
 
 export const swatchesStorage = useLocalStorage('swatches', {})
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index d44e98cf2..f1356160c 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -14,7 +14,7 @@
         index="{{ (new (config('rapidez.models.product')))->searchableAs() }}"
         v-cloak
     >
-        <div slot-scope="{ loaded, filters, sortOptions, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
+        <div slot-scope="{ loaded, sortOptions, withFilters, withSwatches, filterPrefix, _renderProxy: listingSlotProps }">
             <ais-instant-search
                 v-if="loaded"
                 :search-client="listingSlotProps.searchClient"
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index f2c610d8f..85bdb3a2e 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -19,6 +19,7 @@
     <meta name="description" content="@yield('description', Rapidez::config('design/head/default_description', ''))"/>
     <meta name="robots" content="@yield('robots', Rapidez::config('design/search_engine_robots/default_robots', 'INDEX,FOLLOW'))"/>
     <link rel="canonical" href="@yield('canonical', url()->current())" />
+    <link href="{{ route('config') }}" rel="preload" as="script">
 
     @vite(['resources/css/app.css', 'resources/js/app.js'])
 
@@ -43,7 +44,7 @@
         @stack('page_end')
     </div>
 
-    <script>window.config = @json(config('frontend'));</script>
+    <script src="{{ route('config') }}"></script>
     @if (session('notifications'))
         <script async>
             document.addEventListener('vue:loaded', function() {
diff --git a/resources/views/layouts/config.blade.php b/resources/views/layouts/config.blade.php
new file mode 100644
index 000000000..496c14379
--- /dev/null
+++ b/resources/views/layouts/config.blade.php
@@ -0,0 +1 @@
+window.config = @json(config('frontend'));
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index 41dd82660..c0f57d822 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -4,7 +4,7 @@
         @include('rapidez::listing.partials.filter.selected')
         @include('rapidez::listing.partials.filter.search')
         @include('rapidez::listing.partials.filter.category')
-        <template v-for="filter in filters">
+        <template v-for="filter in config.filterable_attributes">
             @include('rapidez::listing.partials.filter.price')
             @include('rapidez::listing.partials.filter.swatch')
             @include('rapidez::listing.partials.filter.boolean')
diff --git a/routes/api.php b/routes/api.php
index 98467c891..ff7c5ecbc 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -7,14 +7,6 @@
 use Rapidez\Core\Http\Middleware\VerifyAdminToken;
 
 Route::middleware('api')->prefix('api')->group(function () {
-    Route::get('attributes', function () {
-        $attributeModel = config('rapidez.models.attribute');
-
-        return $attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['filter'] || $attribute['sorting'];
-        });
-    });
-
     Route::get('swatches', function () {
         $optionswatchModel = config('rapidez.models.option_swatch');
 
diff --git a/routes/web.php b/routes/web.php
index ae4b598bc..24935e8bf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Http\Controllers\SignedCheckoutController;
 use Rapidez\Core\Http\Middleware\AuthenticateHealthCheck;
@@ -20,4 +21,12 @@
     Route::get('checkout/{step?}', config('rapidez.routing.controllers.checkout'))->middleware('auth:magento-cart')->name('checkout');
     Route::get('search', config('rapidez.routing.controllers.search'))->name('search');
     Route::fallback(config('rapidez.routing.controllers.fallback'));
+
+    Route::get('config.js', fn() =>
+        response()->view(
+            view: 'rapidez::layouts.config',
+            headers: ['Content-Type' => 'text/javascript'],
+        )
+    )->name('config');
 });
+
diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index f138f8b9a..4a92781e1 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -17,8 +17,7 @@ class IndexCommand extends Command
     public function handle()
     {
         $baseSearchableModels = collect(config('rapidez.models'))
-            ->filter(fn ($class) => in_array(Searchable::class, class_uses_recursive($class)))
-            ->merge(config('rapidez.indexer.extra_models'));
+            ->filter(fn ($class) => in_array(Searchable::class, class_uses_recursive($class)));
 
         $types = $this->option('types')
             ? $baseSearchableModels->filter(fn ($model) => in_array((new $model)->getIndexName(), explode(',', $this->option('types'))))
diff --git a/src/Http/Controllers/CheckoutController.php b/src/Http/Controllers/CheckoutController.php
index fb75f6304..dc988d866 100644
--- a/src/Http/Controllers/CheckoutController.php
+++ b/src/Http/Controllers/CheckoutController.php
@@ -8,8 +8,7 @@ class CheckoutController
 {
     public function __invoke(Request $request, ?string $step = null)
     {
-        $checkoutSteps = config('rapidez.frontend.checkout_steps.' . config('rapidez.store_code'))
-            ?: config('rapidez.frontend.checkout_steps.default');
+        $checkoutSteps = config('rapidez.frontend.checkout_steps');
 
         if (! $step) {
             $step = $checkoutSteps[0];
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 4abeaed38..8fc2686a9 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -25,7 +25,6 @@ public function compose(View $view)
             array_merge_recursive(
                 config('rapidez'),
                 config('rapidez.frontend'),
-                config('rapidez.searchkit'),
             ),
             array_merge(
                 config('rapidez.frontend.exposed'),
@@ -59,12 +58,7 @@ public function getConfig(): array
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
             'max_category_level'           => Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->max('level')),
-
-            // TODO: For the products we've the `rapidez.index` config
-            // set from the `src/Rapidez.php` which is accessible
-            // in the frontend with `config.index`, maybe we
-            // should change that to `config.index.TYPE`?
-            'index_prefix' => config('scout.prefix'),
+            'filterable_attributes'        => $this->getFilterableAttributes(),
         ];
     }
 
@@ -89,6 +83,23 @@ public function getCustomerAddressFields(): array
         ];
     }
 
+    public function getFilterableAttributes(): array
+    {
+        $attributes = config('rapidez.models.attribute')::getCachedWhere(function ($attribute) {
+            return $attribute['filter'] || $attribute['sorting'];
+        });
+
+        return collect($attributes)
+            ->map(fn($attribute) => [
+                ...$attribute,
+                'code' => $attribute['prefix'] . $attribute['code'],
+                'base_code' => $attribute['code'],
+            ])
+            ->sortBy('position')
+            ->values()
+            ->toArray();
+    }
+
     public function exposeGraphqlQueries(): self
     {
         $checkoutQueries = [
diff --git a/src/Models/Attribute.php b/src/Models/Attribute.php
index 4f5f40bc3..ad9c27f25 100644
--- a/src/Models/Attribute.php
+++ b/src/Models/Attribute.php
@@ -13,6 +13,8 @@ class Attribute extends Model
 
     protected $primaryKey = 'attribute_id';
 
+    protected $appends = ['prefix'];
+
     protected static function booting()
     {
         static::addGlobalScope(new OnlyProductAttributesScope);
@@ -27,6 +29,23 @@ protected function filter(): CastsAttribute
         )->shouldCache();
     }
 
+    protected function prefix(): CastsAttribute
+    {
+        return CastsAttribute::make(
+            get: function() {
+                if ($this->super) {
+                    return 'super_';
+                }
+
+                if ($this->visual_swatch) {
+                    return 'visual_';
+                }
+
+                return '';
+            }
+        )->shouldCache();
+    }
+
     public static function getCachedWhere(callable $callback): array
     {
         $attributes = Cache::store('rapidez:multi')->rememberForever('attributes.' . config('rapidez.store'), function () {
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 40ba16120..a004e2ebf 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -271,7 +271,11 @@ protected function makeAllSearchableUsing(Builder $query)
 
     public function shouldBeSearchable(): bool
     {
-        if (! in_array($this->visibility, config('rapidez.indexer.visibility'))) {
+        // VISIBILITY_NOT_VISIBLE    = 1
+        // VISIBILITY_IN_CATALOG     = 2
+        // VISIBILITY_IN_SEARCH      = 3
+        // VISIBILITY_BOTH           = 4
+        if (! in_array($this->visibility, [2, 3, 4])) {
             return false;
         }
 
diff --git a/src/Rapidez.php b/src/Rapidez.php
index 264fef95e..2a7ed1810 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -130,6 +130,13 @@ public function setStore(Store|array|callable|int|string $store): void
         config()->set('rapidez.root_category_id', $store['root_category_id']);
         config()->set('frontend.base_url', url('/'));
 
+        // Set all store-specific values
+        foreach(array_keys(config('rapidez')) as $config) {
+            foreach (config('rapidez.stores.' . $store['code'] . '.' . $config, []) as $key => $value) {
+                config()->set('rapidez.' . $config . '.' . $key, $value);
+            }
+        }
+
         if (config()->get('rapidez.magento_url_from_db', false)) {
             $magentoUrl = trim(
                 Config::getValue('web/secure/base_url', ConfigScopes::SCOPE_WEBSITE) ?? config()->get('rapidez.magento_url'),
@@ -165,6 +172,16 @@ public function setStore(Store|array|callable|int|string $store): void
             }
         }
 
+        $path = config('rapidez.frontend.theme', false);
+        if ($path) {
+            config([
+                'view.paths' => [
+                    $path,
+                    ...config('view.paths'),
+                ],
+            ]);
+        }
+
         config()->set('frontend.base_url', url('/'));
         App::setLocale(strtok(Rapidez::config('general/locale/code', 'en_US'), '_'));
 
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 02148fd88..8223777db 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -42,7 +42,6 @@ class RapidezServiceProvider extends ServiceProvider
     protected $configFiles = [
         'frontend',
         'healthcheck',
-        'indexer',
         'jwt',
         'models',
         'routing',
@@ -70,7 +69,6 @@ public function register()
         $this
             ->registerConfigs()
             ->registerBindings()
-            ->registerThemes()
             ->registerBladeDirectives()
             ->registerExceptionHandlers()
             ->registerBladeIconConfig();
@@ -154,33 +152,11 @@ protected function bootRoutes(): self
         return $this;
     }
 
-    protected function registerThemes(): self
-    {
-        if (app()->runningInConsole()) {
-            return $this;
-        }
-
-        $path = config('rapidez.frontend.themes.' . request()->server('MAGE_RUN_CODE', request()->has('_store') && ! app()->isProduction() ? request()->get('_store') : 'default'), false);
-
-        if (! $path) {
-            return $this;
-        }
-
-        config([
-            'view.paths' => [
-                $path,
-                ...config('view.paths'),
-            ],
-        ]);
-
-        return $this;
-    }
-
     protected function bootViews(): self
     {
         $this->loadViewsFrom(__DIR__ . '/../resources/views', 'rapidez');
 
-        View::composer('rapidez::layouts.app', ConfigComposer::class);
+        View::composer('rapidez::layouts.config', ConfigComposer::class);
 
         View::addExtension('graphql', 'blade');
 
@@ -287,6 +263,18 @@ protected function registerConfigs(): self
             $this->mergeConfigFrom(__DIR__ . '/../config/rapidez/' . $configFile . '.php', 'rapidez.' . $configFile);
         }
 
+        // Find all store-specific config files and merge them in
+        foreach (glob(__DIR__ . '../config/rapidez/stores/*/*.php') as $configFile) {
+            @[$store, $path] = explode('/', Str::after($configFile, '/config/rapidez/stores/'), 2);
+            $path = str($path)->beforeLast('.php')->replace('/', '.')->toString();
+
+            if (!$store || !$path) {
+                continue;
+            }
+
+            $this->mergeConfigFrom($configFile, 'rapidez.stores.' . $store . '.' . $path);
+        }
+
         if (! config('cache.stores.rapidez:multi', false)) {
             $fallbackDriver = config('cache.default');
             if ($fallbackDriver === 'rapidez:multi') {
diff --git a/tests/Browser/OnestepCheckoutTest.php b/tests/Browser/OnestepCheckoutTest.php
index 68a0e8176..797b04a61 100644
--- a/tests/Browser/OnestepCheckoutTest.php
+++ b/tests/Browser/OnestepCheckoutTest.php
@@ -14,7 +14,7 @@ protected function setUp(): void
 
         $this->config = file_get_contents(__DIR__ . '/../../config/rapidez/frontend.php');
         $config = config('rapidez.frontend');
-        $config['checkout_steps']['default'] = ['onestep'];
+        $config['checkout_steps'] = ['onestep'];
         file_put_contents(__DIR__ . '/../../config/rapidez/frontend.php', '<?php return ' . var_export($config, true) . ';');
     }
 

From 938cab5c52f778a582a30663cc69403270a45fa6 Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Mon, 10 Mar 2025 11:44:38 +0100
Subject: [PATCH 085/244] Move duplicate instantsearch code to mixin, improve
 autocomplete loading (#768)

---
 resources/css/app.css                         |  3 +-
 resources/js/components/Listing/Listing.vue   | 95 +++++++------------
 .../js/components/Search/Autocomplete.vue     | 56 ++---------
 .../components/Search/InstantSearchMixin.vue  | 61 ++++++++++++
 resources/js/package.js                       |  2 +-
 resources/js/vue-components.js                | 19 +++-
 resources/views/components/listing.blade.php  |  2 +-
 .../views/components/productlist.blade.php    |  2 +-
 .../partials/header/autocomplete.blade.php    | 38 +++++---
 9 files changed, 147 insertions(+), 131 deletions(-)
 create mode 100644 resources/js/components/Search/InstantSearchMixin.vue

diff --git a/resources/css/app.css b/resources/css/app.css
index 193081bec..3ad9898cb 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -14,7 +14,8 @@
     -webkit-tap-highlight-color: transparant;
 }
 
-listing {
+listing,
+autocomplete {
     /*  Reset browser added styling causing unexpected behavior */
     display: contents;
     font-family: unset;
diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 3f0c1573b..6184fd6e7 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,14 +1,7 @@
 <script>
-import Client from '@searchkit/instantsearch-client'
-import Searchkit from 'searchkit'
-
 import { history } from 'instantsearch.js/es/lib/routers'
 
-import AisInstantSearch from 'vue-instantsearch/vue2/es/src/components/InstantSearch'
 import AisSearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
-import AisHits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
-import AisConfigure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
-
 import AisRefinementList from 'vue-instantsearch/vue2/es/src/components/RefinementList.vue.js'
 import AisHierarchicalMenu from 'vue-instantsearch/vue2/es/src/components/HierarchicalMenu.vue.js'
 import AisRangeInput from 'vue-instantsearch/vue2/es/src/components/RangeInput.vue.js'
@@ -22,12 +15,12 @@ import AisStats from 'vue-instantsearch/vue2/es/src/components/Stats.vue.js'
 import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
 
+import InstantSearchMixin from '../Search/InstantSearchMixin.vue'
+
 export default {
+    mixins: [InstantSearchMixin],
     components: {
-        'ais-instant-search': AisInstantSearch,
         'ais-search-box': AisSearchBox,
-        'ais-hits': AisHits,
-        'ais-configure': AisConfigure,
         'ais-refinement-list': AisRefinementList,
         'ais-hierarchical-menu': AisHierarchicalMenu,
         'ais-range-input': AisRangeInput,
@@ -54,7 +47,7 @@ export default {
             type: String,
         },
 
-        // TODO: Document these two props in the Rapidez docs
+        // TODO: Document these Four props in the Rapidez docs
         query: {
             type: Function,
         },
@@ -83,9 +76,6 @@ export default {
     },
 
     mounted() {
-        this.searchkit = this.initSearchkit()
-        this.searchClient = this.initSearchClient()
-
         this.loaded = Object.keys(this.attributes).length > 0
     },
 
@@ -193,57 +183,38 @@ export default {
     },
 
     methods: {
-        // TODO: Not sure if this is the right place,
-        // the autocomplete also needs this but
-        // we don't want to load everything
-        // directly due the JS size
-        initSearchClient() {
-            return Client(this.searchkit, {
-                getBaseFilters: this.getBaseFilters,
-                getQuery: this.query,
-            })
-        },
+        async getInstantSearchClientConfig() {
+            const config = await InstantSearchMixin.methods.getInstantSearchClientConfig.bind(this).call()
 
-        initSearchkit() {
-            let url = new URL(config.es_url)
+            config.getBaseFilters = this.getBaseFilters
+            config.getQuery = this.query
 
-            return new Searchkit({
-                connection: {
-                    host: url.origin,
-                    auth: {
-                        username: url.username,
-                        password: url.password,
-                    },
-                },
+            return config
+        },
 
-                // TODO: Maybe just do: search_settings: config.searchkit
-                // so it's possible to add anything to the PHP config
-                // and that will appear here?
-                search_settings: {
-                    highlight_attributes: config.searchkit.highlight_attributes,
-                    search_attributes: config.searchkit.search_attributes,
-                    result_attributes: config.searchkit.result_attributes,
-
-                    // TODO: For consistency maybe make it possible to do this:
-                    // facet_attributes: config.searchkit.facet_attributes,
-                    facet_attributes: this.facets,
-
-                    filter_attributes: config.searchkit.filter_attributes,
-
-                    // TODO: Let's also change this to a PHP config.
-                    // So we start there and that will be merged
-                    // with the Magento configured attributes
-                    // and lastly from a prop it's possible
-                    // to manipulate it from a callback?
-                    sorting: this.sortOptions.reduce((acc, item) => {
-                        acc[item.key] = {
-                            field: item.field,
-                            order: item.order,
-                        }
-                        return acc
-                    }),
-                },
-            })
+        async getSearchSettings() {
+            let config = await InstantSearchMixin.methods.getSearchSettings.bind(this).call()
+
+            return {
+                ...config,
+
+                // TODO: For consistency maybe make it possible to do this:
+                // facet_attributes: config.searchkit.facet_attributes,
+                facet_attributes: this.facets,
+
+                // TODO: Let's also change this to a PHP config.
+                // So we start there and that will be merged
+                // with the Magento configured attributes
+                // and lastly from a prop it's possible
+                // to manipulate it from a callback?
+                sorting: this.sortOptions.reduce((acc, item) => {
+                    acc[item.key] = {
+                        field: item.field,
+                        order: item.order,
+                    }
+                    return acc
+                }),
+            }
         },
 
         getBaseFilters() {
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index cee1e1b75..f1256c690 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,21 +1,15 @@
 <script>
-import Client from '@searchkit/instantsearch-client'
-import Searchkit from 'searchkit'
-
-import AisInstantSearch from 'vue-instantsearch/vue2/es/src/components/InstantSearch'
 import AisSearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
-import AisHits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
 import AisIndex from 'vue-instantsearch/vue2/es/src/components/Index.js'
-import AisConfigure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
 import AisHighlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
 
+import InstantSearchMixin from './InstantSearchMixin.vue'
+
 export default {
+    mixins: [InstantSearchMixin],
     components: {
-        'ais-instant-search': AisInstantSearch,
         'ais-search-box': AisSearchBox,
-        'ais-hits': AisHits,
         'ais-index': AisIndex,
-        'ais-configure': AisConfigure,
         'ais-highlight': AisHighlight,
     },
     data: () => ({
@@ -28,24 +22,14 @@ export default {
 
     mounted() {
         this.$nextTick(() => {
-            this.$emit('mounted')
+            requestAnimationFrame(() => this.$emit('mounted'))
             this.loaded = true
         })
     },
 
-    computed: {
-        // TODO: Not sure if this is the right place,
-        // the autocomplete also needs this but
-        // we don't want to load everything
-        // directly due the JS size
-        searchClient: function () {
-            let client = Client(this.searchkit, {
-                hooks: {
-                    beforeSearch: async (searchRequests) => {
-                        return searchRequests
-                    },
-                },
-            })
+    methods: {
+        async initSearchClient() {
+            const client = await InstantSearchMixin.methods.initSearchClient.bind(this).call()
 
             // Ensure no query is done if the search field is empty
             const oldSearch = client.search
@@ -71,32 +55,6 @@ export default {
 
             return client
         },
-
-        // TODO: Maybe extract this so we have this once?
-        searchkit: function () {
-            let url = new URL(config.es_url)
-
-            let searchkit = new Searchkit({
-                connection: {
-                    host: url.origin,
-                    auth: {
-                        username: url.username,
-                        password: url.password,
-                    },
-                },
-
-                // TODO: Should we split this as it could
-                // diff from the settings on listings.
-                search_settings: {
-                    highlight_attributes: config.searchkit.highlight_attributes,
-                    search_attributes: config.searchkit.search_attributes,
-                    result_attributes: config.searchkit.result_attributes,
-                    filter_attributes: config.searchkit.filter_attributes,
-                },
-            })
-
-            return searchkit
-        },
     },
 }
 </script>
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
new file mode 100644
index 000000000..bec6da693
--- /dev/null
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -0,0 +1,61 @@
+<script>
+import Client from '@searchkit/instantsearch-client'
+import Searchkit from 'searchkit'
+
+import AisInstantSearch from 'vue-instantsearch/vue2/es/src/components/InstantSearch'
+import AisHits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
+import AisConfigure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
+
+export default {
+    components: {
+        'ais-instant-search': AisInstantSearch,
+        'ais-hits': AisHits,
+        'ais-configure': AisConfigure,
+    },
+    data: () => ({
+        searchkit: null,
+        searchClient: null,
+    }),
+    async mounted() {
+        this.searchkit = await this.initSearchkit()
+        this.searchClient = await this.initSearchClient()
+    },
+    methods: {
+        async initSearchClient() {
+            return Client(this.searchkit, await this.getInstantSearchClientConfig())
+        },
+
+        async initSearchkit() {
+            let url = new URL(config.es_url)
+
+            return new Searchkit({
+                connection: {
+                    host: url.origin,
+                    auth: {
+                        username: url.username,
+                        password: url.password,
+                    },
+                },
+
+                search_settings: await this.getSearchSettings(),
+            })
+        },
+
+        async getInstantSearchClientConfig() {
+            return {}
+        },
+
+        async getSearchSettings() {
+            // TODO: Maybe just do: return config.searchkit;
+            // so it's possible to add anything to the PHP config
+            // and that will appear here?
+            return {
+                highlight_attributes: config.searchkit.highlight_attributes,
+                search_attributes: config.searchkit.search_attributes,
+                result_attributes: config.searchkit.result_attributes,
+                filter_attributes: config.searchkit.filter_attributes,
+            }
+        },
+    },
+}
+</script>
diff --git a/resources/js/package.js b/resources/js/package.js
index cc40b4075..391f87583 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -100,7 +100,7 @@ function init() {
                 config: window.config,
                 loadingCount: 0,
                 loading: false,
-                loadAutocomplete: false,
+                autocompleteFacadeQuery: '',
                 csrfToken: document.querySelector('[name=csrf-token]')?.content,
                 cart: useCart(),
                 order: useOrder(),
diff --git a/resources/js/vue-components.js b/resources/js/vue-components.js
index ae249d615..71dfabcd3 100644
--- a/resources/js/vue-components.js
+++ b/resources/js/vue-components.js
@@ -34,7 +34,24 @@ Vue.component('images', images)
 import quantitySelect from './components/Product/QuantitySelect.vue'
 Vue.component('quantity-select', quantitySelect)
 
-Vue.component('autocomplete', () => import('./components/Search/Autocomplete.vue'))
+Vue.component('autocomplete', () => ({
+    // https://v2.vuejs.org/v2/guide/components-dynamic-async.html#Async-Components
+    component: new Promise(function (resolve, reject) {
+        document.addEventListener('loadAutoComplete', () => import('./components/Search/Autocomplete.vue').then(resolve))
+    }),
+    // https://v2.vuejs.org/v2/guide/components-dynamic-async.html#Handling-Loading-State
+    loading: {
+        data: () => ({
+            loaded: false,
+            searchClient: null,
+        }),
+
+        render() {
+            return this.$scopedSlots.default(this)
+        },
+    },
+    delay: 0,
+}))
 Vue.component('checkout-login', () => import('./components/Checkout/CheckoutLogin.vue'))
 Vue.component('login', () => import('./components/User/Login.vue'))
 Vue.component('listing', () => import('./components/Listing/Listing.vue'))
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 63287f83e..5f6080447 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -26,7 +26,7 @@
     >
         <div>
             <ais-instant-search
-                v-if="loaded"
+                v-if="loaded && searchClient"
                 :search-client="searchClient"
                 :index-name="index"
                 :routing="routing"
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index c1592f804..48678c2ba 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -20,7 +20,7 @@
             --}}
             <div>
                 <ais-instant-search
-                    v-if="loaded"
+                    v-if="loaded && searchClient"
                     :search-client="searchClient"
                     :index-name="config.index"
                 >
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 3cb937110..8a4fdecc9 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,22 +1,11 @@
-<div v-if="!$root.loadAutocomplete" class="relative w-full">
-    {{-- TODO: Do we still need this double input? --}}
-    <form method="get" action="{{ route('search') }}">
-        <x-rapidez::input
-            type="search"
-            name="q"
-            :placeholder="__('What are you looking for?')"
-            v-on:focus="$root.loadAutocomplete = true"
-            v-on:mouseover="$root.loadAutocomplete = true"
-        />
-    </form>
-    <x-rapidez::autocomplete.magnifying-glass />
-</div>
 
-<autocomplete v-else inline-template>
+<autocomplete inline-template v-on:mounted="() => window.document.getElementById('autocomplete-input').focus()">
     <div class="relative w-full">
         <ais-instant-search
+            v-if="searchClient"
+            v-cloak
             class="contents"
-            :search-client="searchClient"
+            :search-client="searchClient "
             :index-name="config.index_prefix + '_products_' + config.store"
         >
             <div class="contents">
@@ -27,6 +16,7 @@ class="contents"
                         <template v-slot="{ currentRefinement, isSearchStalled, refine }">
                             <form name="autocomplete-form" id="autocomplete-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
                                 <x-rapidez::input
+                                    id="autocomplete-input"
                                     type="search"
                                     focus="true"
                                     autocomplete="off"
@@ -35,6 +25,10 @@ class="contents"
                                     spellcheck="false"
                                     name="q"
                                     v-bind:value="currentRefinement"
+                                    v-on:focus="() => {
+                                        refine($root.autocompleteFacadeQuery || currentRefinement);
+                                        $root.autocompleteFacadeQuery = null;
+                                    }"
                                     v-on:input="refine($event.currentTarget.value)"
                                     :placeholder="__('What are you looking for?')"
                                 />
@@ -50,5 +44,19 @@ class="contents"
                 </div>
             </div>
         </ais-instant-search>
+        <div v-else class="relative w-full">
+            {{-- TODO: Do we still need this double input? --}}
+            <form name="autocomplete-form" id="autocomplete-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
+                <x-rapidez::input
+                    type="search"
+                    name="q"
+                    :placeholder="__('What are you looking for?')"
+                    v-model="$root.autocompleteFacadeQuery"
+                    v-on:focus="window.document.dispatchEvent(new window.Event('loadAutoComplete'))"
+                    v-on:mouseover="window.document.dispatchEvent(new window.Event('loadAutoComplete'))"
+                />
+            </form>
+            <x-rapidez::autocomplete.magnifying-glass />
+        </div>
     </div>
 </autocomplete>

From 5c5e814260b4d11e7801e2c0f1454bae08d852b3 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 10 Mar 2025 10:45:22 +0000
Subject: [PATCH 086/244] Index name from models (#764)

---
 config/rapidez/indexer.php                        |  2 +-
 resources/views/components/listing.blade.php      |  3 +--
 .../partials/header/autocomplete.blade.php        |  2 +-
 .../header/autocomplete/categories.blade.php      |  2 +-
 src/Commands/IndexCommand.php                     |  4 +---
 src/Models/Traits/Searchable.php                  | 15 +++++++++++----
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/config/rapidez/indexer.php b/config/rapidez/indexer.php
index 924298c11..8d9a571c2 100644
--- a/config/rapidez/indexer.php
+++ b/config/rapidez/indexer.php
@@ -14,6 +14,6 @@
     // The Rapidez indexer will automatically start indexing any models with the Searchable trait that exist within `models.php`.
     // If you want to add extra models you can add them here. Only Eloquent models are supported.
     'extra_models' => [
-        // 'book' => \App\Models\Book::class,
+        // \App\Models\Book::class,
     ],
 ];
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 7a38e3a07..9aff75b25 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -11,8 +11,7 @@
 <div class="min-h-screen">
     <listing
         {{ $attributes }}
-        {{-- TODO: Extract this somewhere? --}}
-        :index="config.index_prefix + '_products_' + config.store"
+        index="{{ (new (config('rapidez.models.product')))->searchableAs() }}"
         inline-template
         v-cloak
     >
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 3cb937110..84e33189d 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -17,7 +17,7 @@
         <ais-instant-search
             class="contents"
             :search-client="searchClient"
-            :index-name="config.index_prefix + '_products_' + config.store"
+            index-name="{{ (new (config('rapidez.models.product')))->searchableAs() }}"
         >
             <div class="contents">
                 <!-- TODO: This is a Vue 3 thing -->
diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index 664e8b397..1fcf10391 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -1,4 +1,4 @@
-<ais-index :index-name="config.index_prefix + '_categories_' + config.store">
+<ais-index index-name="{{ (new (config('rapidez.models.category')))->searchableAs() }}">
     <ais-hits v-slot="{ items }">
         <div class="border-b p-2" v-if="items && items.length">
             <x-rapidez::autocomplete.title>@lang('Categories')</x-rapidez::autocomplete.title>
diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 92be53191..f138f8b9a 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -21,7 +21,7 @@ public function handle()
             ->merge(config('rapidez.indexer.extra_models'));
 
         $types = $this->option('types')
-            ? $baseSearchableModels->only(explode(',', $this->option('types')))
+            ? $baseSearchableModels->filter(fn ($model) => in_array((new $model)->getIndexName(), explode(',', $this->option('types'))))
             : $baseSearchableModels;
 
         $stores = $this->option('store')
@@ -38,8 +38,6 @@ public function handle()
             $this->line('Store: ' . $store['name']);
 
             foreach ($types as $type => $model) {
-                config()->set('rapidez.index', $type);
-
                 $this->call('scout:import', [
                     'searchable' => $model,
                 ]);
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 92ccddab1..26b8b33b5 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
 use Laravel\Scout\Searchable as ScoutSearchable;
 use TorMorten\Eventy\Facades\Eventy;
 
@@ -13,12 +14,14 @@ trait Searchable
 {
     use ScoutSearchable;
 
+    public ?string $indexName;
+
     public function toSearchableArray(): array
     {
         $data = $this->searchableData($this->toArray(), $this);
 
         // TODO: Is this filter still useful? Overriding the model gives you full control
-        return Eventy::filter('index.' . config('rapidez.index') . '.data', $data, $this);
+        return Eventy::filter('index.' . $this->getIndexName() . '.data', $data, $this);
     }
 
     // TODO: Not sure if this is the best idea, we already
@@ -38,16 +41,20 @@ public function shouldBeSearchable(): bool
         return true;
     }
 
+    public function getIndexName(): string
+    {
+        return $this->indexName ?? Str::snake(Str::pluralStudly(class_basename(static::class)));
+    }
+
     public function searchableAs(): string
     {
-        if (! config('rapidez.index')) {
+        if (! config('rapidez.store')) {
             throw new Exception('Do not use Scout directly. Please use `php artisan rapidez:index`.');
         }
 
         return implode('_', array_values([
             config('scout.prefix'),
-            // TODO: Maybe use the model name here?
-            config('rapidez.index'),
+            $this->getIndexName(),
             config('rapidez.store'),
         ]));
     }

From abe082f945d282d0d4e84757e6688b7400cba9d1 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Mon, 10 Mar 2025 13:15:29 +0100
Subject: [PATCH 087/244] Fix search button background

---
 .../views/layouts/partials/header/autocomplete.blade.php    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 8a4fdecc9..1adf1bf78 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -32,7 +32,7 @@ class="contents"
                                     v-on:input="refine($event.currentTarget.value)"
                                     :placeholder="__('What are you looking for?')"
                                 />
-                                <x-rapidez::button class="absolute right-0 bg-none border-none" type="submit">
+                                <x-rapidez::button class="absolute right-0 bg-opacity-0 hover:bg-opacity-0 border-none" type="submit">
                                     <x-rapidez::autocomplete.magnifying-glass />
                                 </x-rapidez::button>
                             </form>
@@ -49,6 +49,10 @@ class="contents"
             <form name="autocomplete-form" id="autocomplete-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
                 <x-rapidez::input
                     type="search"
+                    autocomplete="off"
+                    autocorrect="off"
+                    autocapitalize="none"
+                    spellcheck="false"
                     name="q"
                     :placeholder="__('What are you looking for?')"
                     v-model="$root.autocompleteFacadeQuery"

From 7232049813c1f30b17f5262f4ea7b1b6b25a7495 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 10 Mar 2025 13:32:01 +0100
Subject: [PATCH 088/244] Move sortings to php

---
 resources/js/components/Listing/Listing.vue   | 75 +------------------
 .../components/Search/InstantSearchMixin.vue  | 10 +--
 .../partials/toolbar/sorting.blade.php        |  2 +-
 src/Http/ViewComposers/ConfigComposer.php     | 34 +++++++++
 4 files changed, 39 insertions(+), 82 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index af67006f7..0357d19a3 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -31,7 +31,7 @@ export default {
         'ais-stats': AisStats,
     },
     props: {
-        sortOptionsCallback: {
+        configCallback: {
             type: Function,
         },
         index: {
@@ -89,17 +89,6 @@ export default {
             return Array.from({ length: config.max_category_level ?? 3 }).map((_, index) => 'category_lvl' + (index + 1))
         },
 
-        sortings() {
-            return Object.values(config.filterable_attributes)
-                .filter((attribute) => attribute.sorting)
-                .concat(
-                    Object.entries(config.searchkit.sorting).map(([code, directions]) => ({
-                        code: code,
-                        directions: directions,
-                    })),
-                )
-        },
-
         hitsPerPage() {
             return this.$root.config.grid_per_page_values
                 .map(function (pages, index) {
@@ -112,48 +101,6 @@ export default {
                 .concat({ label: this.$root.config.translations.all, value: 10000 })
         },
 
-        sortOptions() {
-            let sortOptions = [
-                {
-                    label: config.translations.relevance,
-                    field: '_score',
-                    order: 'desc',
-                    value: this.index,
-                    key: 'default',
-                },
-            ].concat(
-                this.sortings.flatMap((sorting) =>
-                    (sorting.directions ?? ['asc', 'desc']).map((direction) => {
-                        let label = ''
-                        if (config.translations.sorting?.[sorting.code]?.[direction]) {
-                            label = config.translations.sorting?.[sorting.code]?.[direction]
-                        } else {
-                            label = config.translations[sorting.code] ?? sorting.name ?? sorting.code
-
-                            // Add asc/desc if relevant
-                            if (sorting.directions?.length != 1) {
-                                label += ' ' + (config.translations[direction] ?? direction)
-                            }
-                        }
-
-                        return {
-                            label: label,
-                            field: sorting.code + (sorting.input == 'text' ? '.keyword' : ''),
-                            order: direction,
-                            value: [this.index, sorting.code, direction].join('_'),
-                            key: '_' + [sorting.code, direction].join('_'),
-                        }
-                    }),
-                ),
-            )
-
-            if (this.sortOptionsCallback) {
-                sortOptions = this.sortOptionsCallback(sortOptions)
-            }
-
-            return sortOptions
-        },
-
         routing() {
             return {
                 router: history({
@@ -186,27 +133,11 @@ export default {
 
         async getSearchSettings() {
             let config = await InstantSearchMixin.methods.getSearchSettings.bind(this).call()
-
-            return {
+            config = {
                 ...config,
-
-                // TODO: For consistency maybe make it possible to do this:
-                // facet_attributes: config.searchkit.facet_attributes,
                 facet_attributes: this.facets,
-
-                // TODO: Let's also change this to a PHP config.
-                // So we start there and that will be merged
-                // with the Magento configured attributes
-                // and lastly from a prop it's possible
-                // to manipulate it from a callback?
-                sorting: this.sortOptions.reduce((acc, item) => {
-                    acc[item.key] = {
-                        field: item.field,
-                        order: item.order,
-                    }
-                    return acc
-                }),
             }
+            return this.configCallback ? this.configCallback(config) : config
         },
 
         getBaseFilters() {
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index bec6da693..99ed79abd 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -46,15 +46,7 @@ export default {
         },
 
         async getSearchSettings() {
-            // TODO: Maybe just do: return config.searchkit;
-            // so it's possible to add anything to the PHP config
-            // and that will appear here?
-            return {
-                highlight_attributes: config.searchkit.highlight_attributes,
-                search_attributes: config.searchkit.search_attributes,
-                result_attributes: config.searchkit.result_attributes,
-                filter_attributes: config.searchkit.filter_attributes,
-            }
+            return config.searchkit
         },
     },
 }
diff --git a/resources/views/listing/partials/toolbar/sorting.blade.php b/resources/views/listing/partials/toolbar/sorting.blade.php
index 3707877f9..e59c30064 100644
--- a/resources/views/listing/partials/toolbar/sorting.blade.php
+++ b/resources/views/listing/partials/toolbar/sorting.blade.php
@@ -1,4 +1,4 @@
-<ais-sort-by :items="sortOptions">
+<ais-sort-by :items="Object.values(config.searchkit.sorting)">
     <template v-slot="{ items, currentRefinement, refine }">
         <x-rapidez::input.select
             v-bind:value="items.find(item => item.value === currentRefinement)?.value"
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 8fc2686a9..12b0b0a0f 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -153,6 +153,40 @@ public function configureSearchkit(): self
 
         Config::set('rapidez.searchkit.search_attributes', $searchableAttributes);
 
+
+        // Get all sortable attributes from Magento
+        $sortableAttributes = $attributeModel::getCachedWhere(function ($attribute) {
+            return $attribute['sorting'] || in_array($attribute['code'], array_keys(config('rapidez.searchkit.sorting')));
+        });
+
+        foreach(config('rapidez.searchkit.sorting') as $code => $directions) {
+            $attribute = collect($sortableAttributes)->search(fn($attribute) => $attribute['code'] == $code);
+            if ($attribute) {
+                $sortableAttributes[$attribute]['directions'] = $directions;
+            }
+        }
+
+        $index = (new (config('rapidez.models.product')))->searchableAs();
+
+        $sortableAttributes = collect($sortableAttributes)
+            ->flatMap(fn ($attribute) => Arr::map(($attribute['directions'] ?? null) ?: ['asc', 'desc'], fn($direction) => [
+                'label' => __("{$attribute['code']} {$direction}"),
+                'field' => $attribute['code'] . ($attribute['input'] == 'text' ? '.keyword' : ''),
+                'order' => $direction,
+                'value' => "{$index}_{$attribute['code']}_{$direction}",
+                'key' => "_{$attribute['code']}_{$direction}",
+            ]));
+
+        $sortableAttributes->prepend([
+            'label' => 'relevance',
+            'field' => '_score',
+            'order' => 'desc',
+            'value' => $index,
+            'key' => 'default',
+        ]);
+
+        Config::set('rapidez.searchkit.sorting', $sortableAttributes->keyBy('key')->toArray());
+
         return $this;
     }
 }

From 6557c985737f985cdeca99778d8f3bc6b21470fd Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 10 Mar 2025 14:02:10 +0100
Subject: [PATCH 089/244] Make facets come from php

---
 resources/js/components/Listing/Listing.vue | 27 ------------
 src/Http/ViewComposers/ConfigComposer.php   | 49 +++++++++++++++++++--
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 0357d19a3..360b0dad9 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -70,21 +70,6 @@ export default {
     },
 
     computed: {
-        facets() {
-            return [
-                ...config.filterable_attributes.map((filter) => ({
-                    attribute: filter.code,
-                    field: filter.code + (this.filterType(filter) == 'string' ? '.keyword' : ''),
-                    type: this.filterType(filter),
-                })),
-                ...this.categoryAttributes.map((attribute) => ({
-                    attribute: attribute,
-                    field: attribute + '.keyword',
-                    type: 'string',
-                })),
-            ].concat(config.searchkit.facet_attributes)
-        },
-
         categoryAttributes() {
             return Array.from({ length: config.max_category_level ?? 3 }).map((_, index) => 'category_lvl' + (index + 1))
         },
@@ -133,10 +118,6 @@ export default {
 
         async getSearchSettings() {
             let config = await InstantSearchMixin.methods.getSearchSettings.bind(this).call()
-            config = {
-                ...config,
-                facet_attributes: this.facets,
-            }
             return this.configCallback ? this.configCallback(config) : config
         },
 
@@ -196,14 +177,6 @@ export default {
             }
         },
 
-        filterType(filter) {
-            if (filter.super) {
-                return 'numeric'
-            }
-
-            return ['price', 'boolean'].includes(filter.input) ? 'numeric' : 'string'
-        },
-
         withFilters(items) {
             return items
                 .map((item) => ({
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 12b0b0a0f..313bb1a2f 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -19,7 +19,9 @@ public function compose(View $view)
     {
         $this
             ->exposeGraphqlQueries()
-            ->configureSearchkit();
+            ->configureSearchkitFacetAttributes()
+            ->configureSearchkitSearchAttributes()
+            ->configureSearchkitSorting();
 
         $exposedFrontendConfigValues = Arr::only(
             array_merge_recursive(
@@ -135,7 +137,39 @@ public function exposeGraphqlQueries(): self
         return $this;
     }
 
-    public function configureSearchkit(): self
+    public function configureSearchkitFacetAttributes(): self
+    {
+        $attributeModel = config('rapidez.models.attribute');
+
+        // Get the filterable attributes and category levels
+        $filterableAttributes = collect($this->getFilterableAttributes())
+            ->map(function ($attribute) {
+                $isNumeric = $attribute['super'] || in_array($attribute['input'], ['boolean', 'price']);
+                return [
+                    'attribute' => $attribute['code'],
+                    'field' => $attribute['code'] . ($isNumeric ? '' : '.keyword'),
+                    'type' => $isNumeric ? 'numeric' : 'string'
+                ];
+            });
+
+        $maxLevel = Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->max('level'));
+        $categoryLevels = collect(array_fill(1, $maxLevel, 'category_lvl'))
+            ->map(fn ($value, $key) => [
+                'attribute' => $value . $key,
+                'field' => $value . $key . '.keyword',
+                'type' => 'string'
+            ]);
+
+        $facetAttributes = $filterableAttributes
+            ->concat($categoryLevels)
+            ->concat(config('rapidez.searchkit.facet_attributes'));
+
+        Config::set('rapidez.searchkit.facet_attributes', $facetAttributes->toArray());
+
+        return $this;
+    }
+
+    public function configureSearchkitSearchAttributes(): self
     {
         $attributeModel = config('rapidez.models.attribute');
 
@@ -153,12 +187,19 @@ public function configureSearchkit(): self
 
         Config::set('rapidez.searchkit.search_attributes', $searchableAttributes);
 
+        return $this;
+    }
+
+    public function configureSearchkitSorting(): self
+    {
+        $attributeModel = config('rapidez.models.attribute');
 
-        // Get all sortable attributes from Magento
+        // Get all sortable attributes from Magento and any that have been set manually in the config
         $sortableAttributes = $attributeModel::getCachedWhere(function ($attribute) {
             return $attribute['sorting'] || in_array($attribute['code'], array_keys(config('rapidez.searchkit.sorting')));
         });
 
+        // Add `direction` to custom sortings
         foreach(config('rapidez.searchkit.sorting') as $code => $directions) {
             $attribute = collect($sortableAttributes)->search(fn($attribute) => $attribute['code'] == $code);
             if ($attribute) {
@@ -167,7 +208,6 @@ public function configureSearchkit(): self
         }
 
         $index = (new (config('rapidez.models.product')))->searchableAs();
-
         $sortableAttributes = collect($sortableAttributes)
             ->flatMap(fn ($attribute) => Arr::map(($attribute['directions'] ?? null) ?: ['asc', 'desc'], fn($direction) => [
                 'label' => __("{$attribute['code']} {$direction}"),
@@ -177,6 +217,7 @@ public function configureSearchkit(): self
                 'key' => "_{$attribute['code']}_{$direction}",
             ]));
 
+        // Add default relevance sort
         $sortableAttributes->prepend([
             'label' => 'relevance',
             'field' => '_score',

From d6699823eaf7983a6b748511ddd1839fff22030b Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Mon, 10 Mar 2025 13:09:21 +0000
Subject: [PATCH 090/244] Apply fixes from Duster

---
 routes/web.php                            | 10 ++++------
 src/Http/ViewComposers/ConfigComposer.php | 23 ++++++++++++-----------
 src/Models/Attribute.php                  |  2 +-
 src/Rapidez.php                           |  2 +-
 src/RapidezServiceProvider.php            |  2 +-
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 24935e8bf..484bad447 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,11 +22,9 @@
     Route::get('search', config('rapidez.routing.controllers.search'))->name('search');
     Route::fallback(config('rapidez.routing.controllers.fallback'));
 
-    Route::get('config.js', fn() =>
-        response()->view(
-            view: 'rapidez::layouts.config',
-            headers: ['Content-Type' => 'text/javascript'],
-        )
+    Route::get('config.js', fn () => response()->view(
+        view: 'rapidez::layouts.config',
+        headers: ['Content-Type' => 'text/javascript'],
+    )
     )->name('config');
 });
-
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 313bb1a2f..0365ee7d3 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -92,9 +92,9 @@ public function getFilterableAttributes(): array
         });
 
         return collect($attributes)
-            ->map(fn($attribute) => [
+            ->map(fn ($attribute) => [
                 ...$attribute,
-                'code' => $attribute['prefix'] . $attribute['code'],
+                'code'      => $attribute['prefix'] . $attribute['code'],
                 'base_code' => $attribute['code'],
             ])
             ->sortBy('position')
@@ -145,10 +145,11 @@ public function configureSearchkitFacetAttributes(): self
         $filterableAttributes = collect($this->getFilterableAttributes())
             ->map(function ($attribute) {
                 $isNumeric = $attribute['super'] || in_array($attribute['input'], ['boolean', 'price']);
+
                 return [
                     'attribute' => $attribute['code'],
-                    'field' => $attribute['code'] . ($isNumeric ? '' : '.keyword'),
-                    'type' => $isNumeric ? 'numeric' : 'string'
+                    'field'     => $attribute['code'] . ($isNumeric ? '' : '.keyword'),
+                    'type'      => $isNumeric ? 'numeric' : 'string',
                 ];
             });
 
@@ -156,8 +157,8 @@ public function configureSearchkitFacetAttributes(): self
         $categoryLevels = collect(array_fill(1, $maxLevel, 'category_lvl'))
             ->map(fn ($value, $key) => [
                 'attribute' => $value . $key,
-                'field' => $value . $key . '.keyword',
-                'type' => 'string'
+                'field'     => $value . $key . '.keyword',
+                'type'      => 'string',
             ]);
 
         $facetAttributes = $filterableAttributes
@@ -200,8 +201,8 @@ public function configureSearchkitSorting(): self
         });
 
         // Add `direction` to custom sortings
-        foreach(config('rapidez.searchkit.sorting') as $code => $directions) {
-            $attribute = collect($sortableAttributes)->search(fn($attribute) => $attribute['code'] == $code);
+        foreach (config('rapidez.searchkit.sorting') as $code => $directions) {
+            $attribute = collect($sortableAttributes)->search(fn ($attribute) => $attribute['code'] == $code);
             if ($attribute) {
                 $sortableAttributes[$attribute]['directions'] = $directions;
             }
@@ -209,12 +210,12 @@ public function configureSearchkitSorting(): self
 
         $index = (new (config('rapidez.models.product')))->searchableAs();
         $sortableAttributes = collect($sortableAttributes)
-            ->flatMap(fn ($attribute) => Arr::map(($attribute['directions'] ?? null) ?: ['asc', 'desc'], fn($direction) => [
+            ->flatMap(fn ($attribute) => Arr::map(($attribute['directions'] ?? null) ?: ['asc', 'desc'], fn ($direction) => [
                 'label' => __("{$attribute['code']} {$direction}"),
                 'field' => $attribute['code'] . ($attribute['input'] == 'text' ? '.keyword' : ''),
                 'order' => $direction,
                 'value' => "{$index}_{$attribute['code']}_{$direction}",
-                'key' => "_{$attribute['code']}_{$direction}",
+                'key'   => "_{$attribute['code']}_{$direction}",
             ]));
 
         // Add default relevance sort
@@ -223,7 +224,7 @@ public function configureSearchkitSorting(): self
             'field' => '_score',
             'order' => 'desc',
             'value' => $index,
-            'key' => 'default',
+            'key'   => 'default',
         ]);
 
         Config::set('rapidez.searchkit.sorting', $sortableAttributes->keyBy('key')->toArray());
diff --git a/src/Models/Attribute.php b/src/Models/Attribute.php
index ad9c27f25..29b1bcee6 100644
--- a/src/Models/Attribute.php
+++ b/src/Models/Attribute.php
@@ -32,7 +32,7 @@ protected function filter(): CastsAttribute
     protected function prefix(): CastsAttribute
     {
         return CastsAttribute::make(
-            get: function() {
+            get: function () {
                 if ($this->super) {
                     return 'super_';
                 }
diff --git a/src/Rapidez.php b/src/Rapidez.php
index 2a7ed1810..1a6859533 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -131,7 +131,7 @@ public function setStore(Store|array|callable|int|string $store): void
         config()->set('frontend.base_url', url('/'));
 
         // Set all store-specific values
-        foreach(array_keys(config('rapidez')) as $config) {
+        foreach (array_keys(config('rapidez')) as $config) {
             foreach (config('rapidez.stores.' . $store['code'] . '.' . $config, []) as $key => $value) {
                 config()->set('rapidez.' . $config . '.' . $key, $value);
             }
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 8223777db..2e23102fe 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -268,7 +268,7 @@ protected function registerConfigs(): self
             @[$store, $path] = explode('/', Str::after($configFile, '/config/rapidez/stores/'), 2);
             $path = str($path)->beforeLast('.php')->replace('/', '.')->toString();
 
-            if (!$store || !$path) {
+            if (! $store || ! $path) {
                 continue;
             }
 

From 5fa00c931ec166e010b9227e17bf459da73b8844 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 10 Mar 2025 14:22:13 +0100
Subject: [PATCH 091/244] Fix translations

---
 lang/en.json                              |  7 +++++
 lang/en/frontend.php                      | 16 -----------
 lang/nl.json                              | 34 +++++++++++++----------
 lang/nl/frontend.php                      | 17 ------------
 src/Http/ViewComposers/ConfigComposer.php |  4 +--
 5 files changed, 29 insertions(+), 49 deletions(-)
 create mode 100644 lang/en.json

diff --git a/lang/en.json b/lang/en.json
new file mode 100644
index 000000000..c12b57926
--- /dev/null
+++ b/lang/en.json
@@ -0,0 +1,7 @@
+{
+    "Created_at desc": "Newest",
+    "Name asc": "Name A-Z",
+    "Name desc": "Name Z-A",
+    "Price asc": "Price ascending",
+    "Price desc": "Price descending"
+}
diff --git a/lang/en/frontend.php b/lang/en/frontend.php
index fab5d6197..c916e799c 100644
--- a/lang/en/frontend.php
+++ b/lang/en/frontend.php
@@ -27,20 +27,4 @@
         'no'  => 'No',
         'yes' => 'Yes',
     ],
-
-    'asc'       => 'ascending',
-    'desc'      => 'descending',
-    'relevance' => 'Relevance',
-    'all'       => 'All',
-
-    'sorting' => [
-        'created_at' => [
-            'asc'  => 'Oldest',
-            'desc' => 'Newest',
-        ],
-        'name' => [
-            'asc'  => 'Name A-Z',
-            'desc' => 'Name Z-A',
-        ],
-    ],
 ];
diff --git a/lang/nl.json b/lang/nl.json
index 4a4501f89..05df58fc8 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -7,14 +7,14 @@
     "Adding": "Aan het toevoegen",
     "Addition": "Toevoeging",
     "All rights reserved.": "Alle rechten voorbehouden.",
-    "Apply coupon code": "Kortingscode toepassen",
     "Apply": "Toepassen",
+    "Apply coupon code": "Kortingscode toepassen",
     "Billing address": "Factuuradres",
     "Cart": "Winkelwagen",
     "Categories": "Categorieën",
     "Category": "Categorie",
-    "Checkout": "Afrekenen",
     "Check the spelling of your search term": "De spelling van je zoekterm te controleren",
+    "Checkout": "Afrekenen",
     "City": "Stad",
     "Close": "Sluiten",
     "Company": "Bedrijf",
@@ -22,18 +22,23 @@
     "Continue": "Verder gaan",
     "Country": "Land",
     "Create an account": "Account aanmaken",
+    "Created_at desc": "Nieuwste",
     "Credentials": "Gegevens",
+    "Decrease": "Verlagen",
     "Description": "Beschrijving",
     "Email": "Email",
     "Fax": "Fax",
     "Filters": "Filters",
+    "First": "Eerste",
     "Firstname": "Voornaam",
     "Forgot your password?": "Wachtwoord vergeten?",
     "Go to home": "Naar de homepagina",
     "Have you tried:": "Heb je gedacht aan:",
     "Home": "Homepagina",
     "Housenumber": "Huisnummer",
+    "Increase": "Verhogen",
     "Items per page": "Producten per pagina",
+    "Last": "Laatste",
     "Lastname": "Achternaam",
     "Less options": "Minder opties",
     "Loading": "Aan het laden",
@@ -45,42 +50,44 @@
     "Middlename": "Tussenvoegsel",
     "More options": "Meer opties",
     "My billing and shipping address are the same": "Mijn factuur- en verzendadres zijn hetzelfde",
-    "Please enter a shipping address first": "Voer eerst een verzendadres in",
+    "Name asc": "Naam A-Z",
+    "Name desc": "Naam Z-A",
     "New address": "Nieuw adres",
     "Next": "Volgende",
     "No": "Nee",
     "No results found for :searchterm": "Geen resultaten voor :searchterm",
     "Order placed succesfully": "Bestelling succesvol geplaatst",
     "Orders": "Bestellingen",
+    "Out of stock": "Niet op voorraad",
     "page": "pagina",
     "Password": "Wachtwoord",
-    "Payment method": "Betaalmethode",
     "Payment": "Betalen",
+    "Payment method": "Betaalmethode",
     "Place order": "Bestelling plaatsen",
+    "Please enter a shipping address first": "Voer eerst een verzendadres in",
     "Please log in": "Log hier in",
     "Postcode": "Postcode",
     "Prefix": "Aanhef",
     "Prev": "Vorige",
+    "Price asc": "Prijs oplopend",
+    "Price desc": "Prijs aflopend",
     "Privacy Policy": "Privacybeleid",
     "products": "producten",
     "Products": "Producten",
     "Quantity": "Hoeveelheid",
-    "Increase": "Verhogen",
-    "Decrease": "Verlagen",
     "Related products": "Gerelateerde producten",
+    "Relevance": "Relevantie",
     "Remove": "Verwijderen",
     "Repeat password": "Wachtwoord herhalen",
     "Reset filters": "Filters resetten",
-    "Search for": "Zoeken naar",
     "Search": "Zoeken",
+    "Search for": "Zoeken naar",
     "Select": "Selecteer",
+    "Shipping": "Verzending",
     "Shipping & billing address": "Verzend- en factuuradres",
     "Shipping address": "Verzendadres",
     "Shipping method": "Verzendmethode",
-    "Shipping": "Verzending",
     "Show cart": "Bekijk winkelwagen",
-    "This product is out of stock, remove it to continue your order.": "Dit product is niet op voorraad, verwijder het om verder te gaan met je bestelling.",
-    "Out of stock": "Niet op voorraad",
     "Show results": "Bekijk resultaten",
     "Sign up for our newsletter to stay up to date.": "Meld je aan voor onze nieuwsbrief om op de hoogte te blijven.",
     "Sorry! No image": "Sorry! Geen afbeelding",
@@ -96,23 +103,22 @@
     "Tax ID": "Btw-id",
     "Telephone": "Telefoonnummer",
     "Thank you for subscribing!": "Bedankt voor het inschrijven!",
+    "This product is out of stock, remove it to continue your order.": "Dit product is niet op voorraad, verwijder het om verder te gaan met je bestelling.",
     "This product will be backordered": "Dit product zal worden nageleverd",
     "This website uses cookies": "Deze website maakt gebruik van cookies",
     "Total": "Totaal",
     "Update": "Update",
     "Use other search terms": "Andere zoektermen te gebruiken",
     "View all products": "Bekijk alle producten",
-    "What are you looking for?": "Waar ben je naar op zoek?",
     "Want product news and updates?": "Wil je productnieuws en updates?",
     "We care about the protection of your data. Read our": "Wij geven om de bescherming van uw gegevens. Lees onze",
     "We found other products you might like!": "We hebben andere producten gevonden die je misschien leuk vindt!",
     "We will get to work for you right away": "Wij gaan meteen aan de slag",
     "We will send a confirmation of your order to": "Wij zullen een confirmatie sturen naar",
+    "What are you looking for?": "Waar ben je naar op zoek?",
     "Wishlist": "Wensenlijst",
     "Yes": "Ja",
     "You don't have anything in your cart.": "Je hebt geen producten in je winkelwagen.",
     "You have filtered for:": "Je hebt gefilterd op:",
-    "Your order is currently:": "Je bestelling is op dit moment:",
-    "First": "Eerste",
-    "Last": "Laatste"
+    "Your order is currently:": "Je bestelling is op dit moment:"
 }
diff --git a/lang/nl/frontend.php b/lang/nl/frontend.php
index e543b0238..dcbaf3ccb 100644
--- a/lang/nl/frontend.php
+++ b/lang/nl/frontend.php
@@ -22,21 +22,4 @@
         'email_password'    => 'Je hebt geen email of wachtwoord opgegeven.',
         'email'             => 'Een email adres is verplicht.',
     ],
-
-    'asc'       => 'oplopend',
-    'desc'      => 'aflopend',
-    'relevance' => 'Relevantie',
-    'all'       => 'Alles',
-    'price'     => 'Prijs',
-
-    'sorting' => [
-        'created_at' => [
-            'asc'  => 'Oudste',
-            'desc' => 'Nieuwste',
-        ],
-        'name' => [
-            'asc'  => 'Naam A-Z',
-            'desc' => 'Naam Z-A',
-        ],
-    ],
 ];
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 0365ee7d3..817ec1731 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -211,7 +211,7 @@ public function configureSearchkitSorting(): self
         $index = (new (config('rapidez.models.product')))->searchableAs();
         $sortableAttributes = collect($sortableAttributes)
             ->flatMap(fn ($attribute) => Arr::map(($attribute['directions'] ?? null) ?: ['asc', 'desc'], fn ($direction) => [
-                'label' => __("{$attribute['code']} {$direction}"),
+                'label' => __(ucfirst("{$attribute['code']} {$direction}")),
                 'field' => $attribute['code'] . ($attribute['input'] == 'text' ? '.keyword' : ''),
                 'order' => $direction,
                 'value' => "{$index}_{$attribute['code']}_{$direction}",
@@ -220,7 +220,7 @@ public function configureSearchkitSorting(): self
 
         // Add default relevance sort
         $sortableAttributes->prepend([
-            'label' => 'relevance',
+            'label' => __('Relevance'),
             'field' => '_score',
             'order' => 'desc',
             'value' => $index,

From 4cc9d141d4eddbcdc93255a84d26070124347780 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 10 Mar 2025 14:32:52 +0100
Subject: [PATCH 092/244] Add documentation todo

---
 src/RapidezServiceProvider.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 2e23102fe..0d6c1a6a7 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -264,6 +264,7 @@ protected function registerConfigs(): self
         }
 
         // Find all store-specific config files and merge them in
+        // TODO: Add how to use this in the Rapidez documentation
         foreach (glob(__DIR__ . '../config/rapidez/stores/*/*.php') as $configFile) {
             @[$store, $path] = explode('/', Str::after($configFile, '/config/rapidez/stores/'), 2);
             $path = str($path)->beforeLast('.php')->replace('/', '.')->toString();

From 108738ab25e5dd02073d2dc415161d3d013a394c Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 10 Mar 2025 16:04:24 +0100
Subject: [PATCH 093/244] Make basic highlight component that doesn't break
 when the attribute is not in the config

---
 resources/css/app.css                                |  4 ++++
 resources/js/components/Search/Autocomplete.vue      |  2 --
 .../js/components/Search/InstantSearchMixin.vue      |  2 ++
 resources/views/components/highlight.blade.php       | 12 ++++++++++++
 .../header/autocomplete/categories.blade.php         |  8 +-------
 .../partials/header/autocomplete/products.blade.php  |  8 +-------
 resources/views/listing/partials/item.blade.php      |  4 +++-
 7 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 resources/views/components/highlight.blade.php

diff --git a/resources/css/app.css b/resources/css/app.css
index 3ad9898cb..e09dc6228 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -29,3 +29,7 @@ input[type='number']::-webkit-inner-spin-button,
 input[type='number']::-webkit-outer-spin-button {
     @apply appearance-none m-0;
 }
+
+mark {
+    @apply bg-transparent font-bold
+}
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index f1256c690..7597f8d30 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,7 +1,6 @@
 <script>
 import AisSearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
 import AisIndex from 'vue-instantsearch/vue2/es/src/components/Index.js'
-import AisHighlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
 
 import InstantSearchMixin from './InstantSearchMixin.vue'
 
@@ -10,7 +9,6 @@ export default {
     components: {
         'ais-search-box': AisSearchBox,
         'ais-index': AisIndex,
-        'ais-highlight': AisHighlight,
     },
     data: () => ({
         loaded: false,
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index bec6da693..f507adf31 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -5,12 +5,14 @@ import Searchkit from 'searchkit'
 import AisInstantSearch from 'vue-instantsearch/vue2/es/src/components/InstantSearch'
 import AisHits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
 import AisConfigure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
+import AisHighlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
 
 export default {
     components: {
         'ais-instant-search': AisInstantSearch,
         'ais-hits': AisHits,
         'ais-configure': AisConfigure,
+        'ais-highlight': AisHighlight,
     },
     data: () => ({
         searchkit: null,
diff --git a/resources/views/components/highlight.blade.php b/resources/views/components/highlight.blade.php
new file mode 100644
index 000000000..a8dec90e5
--- /dev/null
+++ b/resources/views/components/highlight.blade.php
@@ -0,0 +1,12 @@
+@props(['attribute', 'item' => 'item'])
+
+@if (in_array($attribute, config('rapidez.searchkit.highlight_attributes')))
+    <ais-highlight
+        {{ $attributes }}
+        attribute="{{ $attribute }}"
+        :hit="{{ $item }}"
+        highlighted-tag-name="mark"
+    />
+@else
+    <span {{ $attributes }} v-text="{{ $item }}.{{ $attribute }}"></span>
+@endif
diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index 664e8b397..fbecb12f3 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -5,13 +5,7 @@
             <ul class="flex flex-col font-sans">
                 <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
                     <a v-bind:href="item.url" class="relative flex items-center group w-full py-2 text-sm gap-x-4">
-                        <span class="ml-2 line-clamp-2">
-                            <ais-highlight
-                                attribute="name"
-                                :hit="item"
-                                highlighted-tag-name="mark"
-                            />
-                        </span>
+                        <x-rapidez::highlight attribute="name" class="ml-2 line-clamp-2"/>
                     </a>
                 </li>
             </ul>
diff --git a/resources/views/layouts/partials/header/autocomplete/products.blade.php b/resources/views/layouts/partials/header/autocomplete/products.blade.php
index bfadfebf9..a758d7f08 100644
--- a/resources/views/layouts/partials/header/autocomplete/products.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/products.blade.php
@@ -14,13 +14,7 @@ class="shrink-0 self-center object-contain size-16 mix-blend-multiply" :alt="ite
                         />
                         <x-rapidez::no-image v-else class="mb-3 h-48 rounded-t" />
                         <div class="flex flex-1 justify-center flex-col px-2">
-                            <span>
-                                <ais-highlight
-                                    attribute="name"
-                                    :hit="item"
-                                    highlighted-tag-name="mark"
-                                />
-                            </span>
+                            <x-rapidez::highlight attribute="name"/>
 
                             <div class="flex items-center gap-x-0.5 mt-0.5">
                                 <div v-if="item.special_price" class="text-muted font-sans line-through text-xs">
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index 3f21929a8..8b1dcc41c 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -16,7 +16,9 @@ class="mb-3 h-48 w-full rounded-t object-contain" :alt="item.name" :loading="con
                 />
                 <x-rapidez::no-image v-else class="mb-3 h-48 rounded-t" />
                 <div class="px-2">
-                    <div class="text-base font-medium">@{{ item.name }}</div>
+                    <div class="text-base font-medium">
+                        <x-rapidez::highlight attribute="name"/>
+                    </div>
                     @if (!Rapidez::config('catalog/frontend/show_swatches_in_product_list', 1))
                         <div class="flex items-center space-x-2">
                             <div class="font-semibold">@{{ (item.special_price || item.price) | price }}</div>

From d5e540258d1ad749cf2c9cea626a69b491115de2 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:05:00 +0000
Subject: [PATCH 094/244] Apply fixes from Prettier

---
 resources/css/app.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/css/app.css b/resources/css/app.css
index e09dc6228..48f37fcf5 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -31,5 +31,5 @@ input[type='number']::-webkit-outer-spin-button {
 }
 
 mark {
-    @apply bg-transparent font-bold
+    @apply bg-transparent font-bold;
 }

From acb52aab39f4becb1ef4c72b80bd3dd30ce01bc2 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Mon, 10 Mar 2025 16:52:48 +0100
Subject: [PATCH 095/244] Refactor searchable models

---
 src/Models/Category.php                  |  11 +-
 src/Models/Product.php                   | 105 +------------------
 src/Models/Traits/Product/Searchable.php | 122 +++++++++++++++++++++++
 src/Models/Traits/Searchable.php         |  42 ++------
 4 files changed, 133 insertions(+), 147 deletions(-)
 create mode 100644 src/Models/Traits/Product/Searchable.php

diff --git a/src/Models/Category.php b/src/Models/Category.php
index cbbe1ab82..e1a62f533 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -104,16 +104,11 @@ public function getParentcategoriesAttribute()
             ->get();
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function makeAllSearchableUsing(Builder $query)
     {
-        // TODO: Is this filter still useful? You could override and
-        // extend the existing model which gives you full control.
-        // But... that will be applied always, this one is just
-        // for the index. Another option could be to have 2
-        // category models; a default and one specificly
-        // for the index: Models/IndexCategory.php
-        // directly handy to give these Scout
-        // methods their own place...
         return $query->withEventyGlobalScopes('index.categories.scopes')
             ->select((new (config('rapidez.models.category')))->qualifyColumns(['entity_id', 'name']))
             ->whereNotNull('url_key')
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 29dba49d2..cacd817c5 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -8,8 +8,6 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasOneThrough;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Cache;
 use Rapidez\Core\Casts\Children;
 use Rapidez\Core\Casts\CommaSeparatedToArray;
 use Rapidez\Core\Casts\CommaSeparatedToIntegerArray;
@@ -26,7 +24,7 @@
 use Rapidez\Core\Models\Traits\Product\CastMultiselectAttributes;
 use Rapidez\Core\Models\Traits\Product\CastSuperAttributes;
 use Rapidez\Core\Models\Traits\Product\SelectAttributeScopes;
-use Rapidez\Core\Models\Traits\Searchable;
+use Rapidez\Core\Models\Traits\Product\Searchable;
 use TorMorten\Eventy\Facades\Eventy;
 
 class Product extends Model
@@ -259,105 +257,4 @@ public static function exist($productId): bool
     {
         return self::withoutGlobalScopes()->where('entity_id', $productId)->exists();
     }
-
-    protected function makeAllSearchableUsing(Builder $query)
-    {
-        return $query->selectOnlyIndexable()
-            ->with(['categoryProducts', 'reviewSummary'])
-            ->withEventyGlobalScopes('index.product.scopes');
-    }
-
-    public function shouldBeSearchable(): bool
-    {
-        if (! in_array($this->visibility, config('rapidez.indexer.visibility'))) {
-            return false;
-        }
-
-        $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
-        if (! $showOutOfStock && ! $this->in_stock) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function searchableData(array $data, Product $product): array
-    {
-        $data['store'] = config('rapidez.store');
-
-        // TODO: Can we do this without having to cache this?
-        $maxPositions = Cache::driver('array')->rememberForever('max-positions-' . config('rapidez.store'), function () {
-            return CategoryProduct::query()
-                ->selectRaw('GREATEST(MAX(position), 0) as position')
-                ->addSelect('category_id')
-                ->groupBy('category_id')
-                ->pluck('position', 'category_id');
-        });
-
-        foreach ($product->super_attributes ?: [] as $superAttribute) {
-            $data['super_' . $superAttribute->code] = $superAttribute->text_swatch || $superAttribute->visual_swatch
-                ? array_keys((array) $product->{'super_' . $superAttribute->code})
-                : Arr::pluck($product->{'super_' . $superAttribute->code} ?: [], 'label');
-        }
-
-        $data = $this->withCategories($data);
-
-        $data['positions'] = $product->categoryProducts
-            ->pluck('position', 'category_id')
-            // Turn all positions positive
-            ->mapWithKeys(fn ($position, $category_id) => [$category_id => $maxPositions[$category_id] - $position]);
-
-        return $data;
-    }
-
-    // TODO: With this and all methods above this model
-    // is getting pretty big... can we move this?
-    public function withCategories(array $data): array
-    {
-        // TODO: Do we still need to do this in this way? Can we refactor this to be nicer now that we're using Scout?
-        $categories = Cache::driver('array')->rememberForever('categories-' . config('rapidez.store'), function () {
-            return Category::withEventyGlobalScopes('index.category.scopes')
-                ->where('catalog_category_flat_store_' . config('rapidez.store') . '.entity_id', '<>', Rapidez::config('catalog/category/root_id', 2))
-                ->pluck('name', 'entity_id');
-        });
-
-        foreach ($data['category_paths'] as $categoryPath) {
-            $category = [];
-            foreach (explode('/', $categoryPath) as $categoryId) {
-                if (isset($categories[$categoryId])) {
-                    $category[] = $categoryId . '::' . $categories[$categoryId];
-                }
-            }
-            if (! empty($category)) {
-                $data['categories'][] = implode(' /// ', $category);
-            }
-        }
-
-        foreach ($data['category_paths'] as $categoryPath) {
-            $paths = explode('/', $categoryPath);
-            $paths = array_slice($paths, array_search(config('rapidez.root_category_id'), $paths) + 1);
-
-            $categoryHierarchy = [];
-            $currentPath = '';
-
-            foreach ($paths as $categoryId) {
-                if (isset($categories[$categoryId])) {
-                    $currentPath .= ($currentPath ? ' > ' : '') . $categories[$categoryId];
-                    $categoryHierarchy[] = $currentPath;
-                }
-            }
-
-            foreach ($categoryHierarchy as $level => $category) {
-                $data['category_lvl' . ($level + 1)][] = $category;
-            }
-        }
-
-        foreach ($data as $key => &$value) {
-            if (str_starts_with($key, 'category_lvl')) {
-                $value = array_values(array_unique($value));
-            }
-        }
-
-        return $data;
-    }
 }
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
new file mode 100644
index 000000000..2e5494058
--- /dev/null
+++ b/src/Models/Traits/Product/Searchable.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Rapidez\Core\Models\Traits\Product;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Cache;
+use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\Category;
+use Rapidez\Core\Models\CategoryProduct;
+use Rapidez\Core\Models\Product;
+use Rapidez\Core\Models\Traits\Searchable as ParentSearchable;
+use TorMorten\Eventy\Facades\Eventy;
+
+trait Searchable
+{
+    use ParentSearchable;
+
+    /**
+     * @inheritdoc
+     */
+    protected function makeAllSearchableUsing(Builder $query)
+    {
+        return $query->selectOnlyIndexable()
+            ->with(['categoryProducts', 'reviewSummary'])
+            ->withEventyGlobalScopes('index.product.scopes');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function shouldBeSearchable(): bool
+    {
+        if (! in_array($this->visibility, config('rapidez.indexer.visibility'))) {
+            return false;
+        }
+
+        $showOutOfStock = (bool) Rapidez::config('cataloginventory/options/show_out_of_stock', 0);
+        if (! $showOutOfStock && ! $this->in_stock) {
+            return false;
+        }
+
+        return true;
+    }
+
+
+    /**
+     * @inheritdoc
+     */
+    public function toSearchableArray(): array
+    {
+        $data = $this->toArray();
+
+        $data['store'] = config('rapidez.store');
+
+        // TODO: Can we do this without having to cache this?
+        // Since this function is scoped to this product i don't think we can.
+        $maxPositions = Cache::driver('array')->rememberForever('max-positions-' . config('rapidez.store'), function () {
+            return CategoryProduct::query()
+                ->selectRaw('GREATEST(MAX(position), 0) as position')
+                ->addSelect('category_id')
+                ->groupBy('category_id')
+                ->pluck('position', 'category_id');
+        });
+
+        foreach ($this->super_attributes ?: [] as $superAttribute) {
+            $data['super_' . $superAttribute->code] = $superAttribute->text_swatch || $superAttribute->visual_swatch
+                ? array_keys((array) $this->{'super_' . $superAttribute->code})
+                : Arr::pluck($this->{'super_' . $superAttribute->code} ?: [], 'label');
+        }
+
+        $data = $this->withCategories($data);
+
+        $data['positions'] = $this->categoryProducts
+            ->pluck('position', 'category_id')
+            // Turn all positions positive
+            ->mapWithKeys(fn ($position, $category_id) => [$category_id => $maxPositions[$category_id] - $position]);
+
+        return Eventy::filter('index.' . $this->getIndexName() . '.data', $data, $this);
+    }
+
+    /**
+     * Add the category paths
+     */
+    public function withCategories(array $data): array
+    {
+        // TODO: Do we still need to do this in this way? Can we refactor this to be nicer now that we're using Scout?
+        // We could solve this using a relationship on the product. But it would be less efficient.
+        $categories = Cache::driver('array')->rememberForever('categories-' . config('rapidez.store'), function () {
+            return Category::withEventyGlobalScopes('index.category.scopes')
+                ->where('catalog_category_flat_store_' . config('rapidez.store') . '.entity_id', '<>', config('rapidez.root_category_id'))
+                ->pluck('name', 'entity_id');
+        });
+
+        foreach ($data['category_paths'] as $categoryPath) {
+            $paths = explode('/', $categoryPath);
+            $paths = array_slice($paths, array_search(config('rapidez.root_category_id'), $paths) + 1);
+
+            $categoryHierarchy = [];
+            $currentPath = '';
+
+            foreach ($paths as $categoryId) {
+                if (isset($categories[$categoryId])) {
+                    $currentPath .= ($currentPath ? ' > ' : '') . $categories[$categoryId];
+                    $categoryHierarchy[] = $currentPath;
+                }
+            }
+
+            foreach ($categoryHierarchy as $level => $category) {
+                $data['category_lvl' . ($level + 1)][] = $category;
+            }
+        }
+
+        foreach ($data as $key => &$value) {
+            if (str_starts_with($key, 'category_lvl')) {
+                $value = array_values(array_unique($value));
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 92ccddab1..c21382052 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -2,10 +2,6 @@
 
 namespace Rapidez\Core\Models\Traits;
 
-use Exception;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
 use Laravel\Scout\Searchable as ScoutSearchable;
 use TorMorten\Eventy\Facades\Eventy;
 
@@ -13,31 +9,17 @@ trait Searchable
 {
     use ScoutSearchable;
 
+    /**
+     * @inheritdoc
+     */
     public function toSearchableArray(): array
     {
-        $data = $this->searchableData($this->toArray(), $this);
-
-        // TODO: Is this filter still useful? Overriding the model gives you full control
-        return Eventy::filter('index.' . config('rapidez.index') . '.data', $data, $this);
-    }
-
-    // TODO: Not sure if this is the best idea, we already
-    // have the toSearchableArray for this.
-    public function searchableData(array $data, Model $model): array
-    {
-        // Customize the data with this function.
-        // - $data is the actual array with data.
-        // - $model is useful for when you want to retrieve data from the actual model (e.g. relations).
-        // Return the array with data that you want to send to ES.
-
-        return $data;
-    }
-
-    public function shouldBeSearchable(): bool
-    {
-        return true;
+        return Eventy::filter('index.' . $this->getIndexName() . '.data', $this->toArray(), $this);
     }
 
+    /**
+     * @inheritdoc
+     */
     public function searchableAs(): string
     {
         if (! config('rapidez.index')) {
@@ -51,14 +33,4 @@ public function searchableAs(): string
             config('rapidez.store'),
         ]));
     }
-
-    protected function makeAllSearchableUsing(Builder $query)
-    {
-        return $query;
-    }
-
-    public function makeSearchableUsing(Collection $models): Collection
-    {
-        return $models;
-    }
 }

From 0f0deaa54689786139b2e2c945b6b4db95823fe4 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:53:22 +0000
Subject: [PATCH 096/244] Apply fixes from Duster

---
 src/Models/Category.php                  | 2 +-
 src/Models/Product.php                   | 2 +-
 src/Models/Traits/Product/Searchable.php | 7 +++----
 src/Models/Traits/Searchable.php         | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Models/Category.php b/src/Models/Category.php
index e1a62f533..ba4cfa8be 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -105,7 +105,7 @@ public function getParentcategoriesAttribute()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected function makeAllSearchableUsing(Builder $query)
     {
diff --git a/src/Models/Product.php b/src/Models/Product.php
index cacd817c5..54a736bb0 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -23,8 +23,8 @@
 use Rapidez\Core\Models\Traits\HasAlternatesThroughRewrites;
 use Rapidez\Core\Models\Traits\Product\CastMultiselectAttributes;
 use Rapidez\Core\Models\Traits\Product\CastSuperAttributes;
-use Rapidez\Core\Models\Traits\Product\SelectAttributeScopes;
 use Rapidez\Core\Models\Traits\Product\Searchable;
+use Rapidez\Core\Models\Traits\Product\SelectAttributeScopes;
 use TorMorten\Eventy\Facades\Eventy;
 
 class Product extends Model
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 2e5494058..2208c223f 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -17,7 +17,7 @@ trait Searchable
     use ParentSearchable;
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected function makeAllSearchableUsing(Builder $query)
     {
@@ -27,7 +27,7 @@ protected function makeAllSearchableUsing(Builder $query)
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function shouldBeSearchable(): bool
     {
@@ -43,9 +43,8 @@ public function shouldBeSearchable(): bool
         return true;
     }
 
-
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function toSearchableArray(): array
     {
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index c21382052..2ce65b5cc 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -10,7 +10,7 @@ trait Searchable
     use ScoutSearchable;
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function toSearchableArray(): array
     {
@@ -18,7 +18,7 @@ public function toSearchableArray(): array
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function searchableAs(): string
     {

From 544c42463edcd8d4e76dc087a800a7b82b26d1f6 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Mon, 10 Mar 2025 16:58:53 +0100
Subject: [PATCH 097/244] Remove todos

---
 src/Models/Traits/Product/Searchable.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 2e5494058..3128906f0 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -53,8 +53,6 @@ public function toSearchableArray(): array
 
         $data['store'] = config('rapidez.store');
 
-        // TODO: Can we do this without having to cache this?
-        // Since this function is scoped to this product i don't think we can.
         $maxPositions = Cache::driver('array')->rememberForever('max-positions-' . config('rapidez.store'), function () {
             return CategoryProduct::query()
                 ->selectRaw('GREATEST(MAX(position), 0) as position')
@@ -84,8 +82,6 @@ public function toSearchableArray(): array
      */
     public function withCategories(array $data): array
     {
-        // TODO: Do we still need to do this in this way? Can we refactor this to be nicer now that we're using Scout?
-        // We could solve this using a relationship on the product. But it would be less efficient.
         $categories = Cache::driver('array')->rememberForever('categories-' . config('rapidez.store'), function () {
             return Category::withEventyGlobalScopes('index.category.scopes')
                 ->where('catalog_category_flat_store_' . config('rapidez.store') . '.entity_id', '<>', config('rapidez.root_category_id'))

From e003ebffc99239e7c49cd6952936056ff8864466 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:59:30 +0000
Subject: [PATCH 098/244] Apply fixes from Duster

---
 src/Models/Traits/Product/Searchable.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 2dd1f92c3..8c4dbeda0 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -8,7 +8,6 @@
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Category;
 use Rapidez\Core\Models\CategoryProduct;
-use Rapidez\Core\Models\Product;
 use Rapidez\Core\Models\Traits\Searchable as ParentSearchable;
 use TorMorten\Eventy\Facades\Eventy;
 

From ee0d8e6c25f6da8d2eeca8a04a3b3ee10a211bab Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Mon, 10 Mar 2025 17:03:22 +0100
Subject: [PATCH 099/244] Fix index name

---
 src/Models/Traits/Searchable.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 2ce65b5cc..6b11e1d01 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -14,7 +14,8 @@ trait Searchable
      */
     public function toSearchableArray(): array
     {
-        return Eventy::filter('index.' . $this->getIndexName() . '.data', $this->toArray(), $this);
+        // TODO: Maybe use the model name here?
+        return Eventy::filter('index.' . config('rapidez.index') . '.data', $this->toArray(), $this);
     }
 
     /**

From 6baefa02f3287fc50c99b227216a993a2ddf7be4 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Mon, 10 Mar 2025 17:09:28 +0100
Subject: [PATCH 100/244] Fix index name

---
 src/Models/Traits/Product/Searchable.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 8c4dbeda0..66648953b 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -72,7 +72,8 @@ public function toSearchableArray(): array
             // Turn all positions positive
             ->mapWithKeys(fn ($position, $category_id) => [$category_id => $maxPositions[$category_id] - $position]);
 
-        return Eventy::filter('index.' . $this->getIndexName() . '.data', $data, $this);
+        // TODO: Maybe use the model name here?
+        return Eventy::filter('index.' . config('rapidez.index') . '.data', $data, $this);
     }
 
     /**

From db962f362f0584b6c3c78c4954cb85ec0475eecb Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 11 Mar 2025 11:45:38 +0100
Subject: [PATCH 101/244] Update src/Models/Traits/Searchable.php

Co-authored-by: indykoning <15870933+indykoning@users.noreply.github.com>
---
 src/Models/Traits/Searchable.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 26b8b33b5..00884100f 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -48,9 +48,6 @@ public function getIndexName(): string
 
     public function searchableAs(): string
     {
-        if (! config('rapidez.store')) {
-            throw new Exception('Do not use Scout directly. Please use `php artisan rapidez:index`.');
-        }
 
         return implode('_', array_values([
             config('scout.prefix'),

From 6583b177e039ef6acbff9ff00571d28ddc72cfc3 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Tue, 11 Mar 2025 10:46:01 +0000
Subject: [PATCH 102/244] Apply fixes from Duster

---
 src/Models/Traits/Searchable.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 00884100f..71d67dcfd 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -2,7 +2,6 @@
 
 namespace Rapidez\Core\Models\Traits;
 
-use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;

From 75af11bb6ab7f77585db2e3628a58ae5ce9cd35e Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 12 Mar 2025 11:41:37 +0100
Subject: [PATCH 103/244] Feedback

---
 resources/views/layouts/app.blade.php     |  2 +-
 routes/web.php                            | 11 ++++++-----
 src/Http/ViewComposers/ConfigComposer.php |  9 +++++++--
 src/Models/Product.php                    | 15 ++++++++++-----
 src/Rapidez.php                           | 10 ----------
 src/RapidezServiceProvider.php            | 22 ++++++++++++++++++++++
 6 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 612e85583..b4e09cbfa 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,6 +21,7 @@
     <link rel="canonical" href="@yield('canonical', url()->current())" />
     <link href="{{ route('config') }}" rel="preload" as="script">
 
+    <script defer src="{{ route('config') }}"></script>
     @vite(['resources/css/app.css', 'resources/js/app.js'])
     @stack('head')
     @config('design/head/includes')
@@ -38,7 +39,6 @@
         @stack('page_end')
     </div>
 
-    <script src="{{ route('config') }}"></script>
     @if (session('notifications'))
         <script async>
             document.addEventListener('vue:loaded', function() {
diff --git a/routes/web.php b/routes/web.php
index c9349a5f5..76104d19d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,9 +22,10 @@
     Route::get('search', config('rapidez.routing.controllers.search'))->name('search');
     Route::fallback(config('rapidez.routing.controllers.fallback'));
 
-    Route::get('config.js', fn () => response()->view(
-        view: 'rapidez::layouts.config',
-        headers: ['Content-Type' => 'text/javascript'],
-    )
-    )->name('config');
+    Route::middleware('cache.headers:public;max_age=3600;s_maxage=3600;stale_while_revalidate=3600;etag')->group(function() {
+        Route::get('config.js', fn () => response()->view(
+            view: 'rapidez::layouts.config',
+            headers: ['Content-Type' => 'text/javascript'],
+        ))->name('config');
+    });
 });
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 17318e7dc..8912ac591 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -59,7 +59,7 @@ public function getConfig(): array
             'show_tax'                     => in_array(Rapidez::config('tax/display/type', 1), [2, 3]),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
-            'max_category_level'           => Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->max('level')),
+            'max_category_level'           => $this->getMaxCategoryLevel(),
             'filterable_attributes'        => $this->getFilterableAttributes(),
         ];
     }
@@ -102,6 +102,11 @@ public function getFilterableAttributes(): array
             ->toArray();
     }
 
+    public function getMaxCategoryLevel(): int
+    {
+        return Cache::rememberForever('max_category_level_' . config('rapidez.store'), fn () => Category::withoutGlobalScopes()->max('level'));
+    }
+
     public function exposeGraphqlQueries(): self
     {
         $checkoutQueries = [
@@ -151,7 +156,7 @@ public function configureSearchkitFacetAttributes(): self
                 ];
             });
 
-        $maxLevel = Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->max('level'));
+        $maxLevel = $this->getMaxCategoryLevel();
         $categoryLevels = collect(array_fill(1, $maxLevel, 'category_lvl'))
             ->map(fn ($value, $key) => [
                 'attribute' => $value . $key,
diff --git a/src/Models/Product.php b/src/Models/Product.php
index b2773f636..57f10c85f 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -37,6 +37,11 @@ class Product extends Model
     use Searchable;
     use SelectAttributeScopes;
 
+    public const VISIBILITY_NOT_VISIBLE = 1;
+    public const VISIBILITY_IN_CATALOG = 2;
+    public const VISIBILITY_IN_SEARCH = 3;
+    public const VISIBILITY_BOTH = 4;
+
     public array $attributesToSelect = [];
 
     protected $primaryKey = 'entity_id';
@@ -269,11 +274,11 @@ protected function makeAllSearchableUsing(Builder $query)
 
     public function shouldBeSearchable(): bool
     {
-        // VISIBILITY_NOT_VISIBLE    = 1
-        // VISIBILITY_IN_CATALOG     = 2
-        // VISIBILITY_IN_SEARCH      = 3
-        // VISIBILITY_BOTH           = 4
-        if (! in_array($this->visibility, [2, 3, 4])) {
+        if (! in_array($this->visibility, [
+            static::VISIBILITY_IN_CATALOG,
+            static::VISIBILITY_IN_SEARCH,
+            static::VISIBILITY_BOTH
+        ])) {
             return false;
         }
 
diff --git a/src/Rapidez.php b/src/Rapidez.php
index 59f70875d..d5149a9e8 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -172,16 +172,6 @@ public function setStore(Store|array|callable|int|string $store): void
             }
         }
 
-        $path = config('rapidez.frontend.theme', false);
-        if ($path) {
-            config([
-                'view.paths' => [
-                    $path,
-                    ...config('view.paths'),
-                ],
-            ]);
-        }
-
         config()->set('frontend.base_url', url('/'));
         App::setLocale(strtok(Rapidez::config('general/locale/code', 'en_US'), '_'));
 
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index a8bd6d541..1fbb5e3b6 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -294,6 +294,28 @@ protected function registerConfigs(): self
         return $this;
     }
 
+    protected function registerThemes(): self
+    {
+        if (app()->runningInConsole()) {
+            return $this;
+        }
+
+        $path = config('rapidez.frontend.theme', false);
+
+        if (!$path) {
+            return $this;
+        }
+
+        config([
+            'view.paths' => [
+                $path,
+                ...config('view.paths'),
+            ],
+        ]);
+
+        return $this;
+    }
+
     protected function registerBindings(): self
     {
         $this->app->singleton('rapidez', Rapidez::class);

From 8b6360dd850092ed72d372dcf31c01a9b7ca46f3 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 12 Mar 2025 11:41:51 +0100
Subject: [PATCH 104/244] Add defaults to reset to when switching stores

---
 src/Rapidez.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Rapidez.php b/src/Rapidez.php
index d5149a9e8..dd3aad2ac 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -130,9 +130,15 @@ public function setStore(Store|array|callable|int|string $store): void
         config()->set('rapidez.root_category_id', $store['root_category_id']);
         config()->set('frontend.base_url', url('/'));
 
-        // Set all store-specific values
         foreach (array_keys(config('rapidez')) as $config) {
+            // Reset defaults if they've been set previously
+            foreach (config('rapidez.defaults.' . $config, []) as $key => $value) {
+                config()->set('rapidez.' . $config . '.' . $key, $value);
+            }
+
+            // Set all store-specific values and define the relevant defaults
             foreach (config('rapidez.stores.' . $store['code'] . '.' . $config, []) as $key => $value) {
+                config()->set('rapidez.defaults.' . $config . '.' . $key, config('rapidez.' . $config . '.' . $key));
                 config()->set('rapidez.' . $config . '.' . $key, $value);
             }
         }

From ed8369b57e71cb07cfe74dcd928622a9afb3db5b Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Wed, 12 Mar 2025 10:42:13 +0000
Subject: [PATCH 105/244] Apply fixes from Duster

---
 routes/web.php                 | 2 +-
 src/Models/Product.php         | 2 +-
 src/RapidezServiceProvider.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 76104d19d..33e80c0f0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,7 +22,7 @@
     Route::get('search', config('rapidez.routing.controllers.search'))->name('search');
     Route::fallback(config('rapidez.routing.controllers.fallback'));
 
-    Route::middleware('cache.headers:public;max_age=3600;s_maxage=3600;stale_while_revalidate=3600;etag')->group(function() {
+    Route::middleware('cache.headers:public;max_age=3600;s_maxage=3600;stale_while_revalidate=3600;etag')->group(function () {
         Route::get('config.js', fn () => response()->view(
             view: 'rapidez::layouts.config',
             headers: ['Content-Type' => 'text/javascript'],
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 57f10c85f..569ba64a8 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -277,7 +277,7 @@ public function shouldBeSearchable(): bool
         if (! in_array($this->visibility, [
             static::VISIBILITY_IN_CATALOG,
             static::VISIBILITY_IN_SEARCH,
-            static::VISIBILITY_BOTH
+            static::VISIBILITY_BOTH,
         ])) {
             return false;
         }
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 1fbb5e3b6..7d2d92d89 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -302,7 +302,7 @@ protected function registerThemes(): self
 
         $path = config('rapidez.frontend.theme', false);
 
-        if (!$path) {
+        if (! $path) {
             return $this;
         }
 

From c2ab9ec609497356cd95f7376e47749cd2eb53ef Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 14 Mar 2025 10:00:14 +0100
Subject: [PATCH 106/244] Re-add registerthemes to register function

---
 src/RapidezServiceProvider.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 1fbb5e3b6..15caa4d0a 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -69,6 +69,7 @@ public function register()
         $this
             ->registerConfigs()
             ->registerBindings()
+            ->registerThemes()
             ->registerBladeDirectives()
             ->registerExceptionHandlers()
             ->registerBladeIconConfig();

From 7ddb3d2b8313fe0ff7e552493d2b635f16ed74a7 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 19 Mar 2025 10:41:08 +0100
Subject: [PATCH 107/244] Use php translations & add proper fallbacks

---
 lang/en.json                              |  7 -------
 lang/en/frontend.php                      | 16 ++++++++++++++++
 lang/nl.json                              |  5 -----
 lang/nl/frontend.php                      | 17 +++++++++++++++++
 src/Http/ViewComposers/ConfigComposer.php |  5 ++++-
 src/helpers.php                           |  8 ++++++++
 6 files changed, 45 insertions(+), 13 deletions(-)
 delete mode 100644 lang/en.json

diff --git a/lang/en.json b/lang/en.json
deleted file mode 100644
index c12b57926..000000000
--- a/lang/en.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "Created_at desc": "Newest",
-    "Name asc": "Name A-Z",
-    "Name desc": "Name Z-A",
-    "Price asc": "Price ascending",
-    "Price desc": "Price descending"
-}
diff --git a/lang/en/frontend.php b/lang/en/frontend.php
index c916e799c..fab5d6197 100644
--- a/lang/en/frontend.php
+++ b/lang/en/frontend.php
@@ -27,4 +27,20 @@
         'no'  => 'No',
         'yes' => 'Yes',
     ],
+
+    'asc'       => 'ascending',
+    'desc'      => 'descending',
+    'relevance' => 'Relevance',
+    'all'       => 'All',
+
+    'sorting' => [
+        'created_at' => [
+            'asc'  => 'Oldest',
+            'desc' => 'Newest',
+        ],
+        'name' => [
+            'asc'  => 'Name A-Z',
+            'desc' => 'Name Z-A',
+        ],
+    ],
 ];
diff --git a/lang/nl.json b/lang/nl.json
index 05df58fc8..086a134e2 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -22,7 +22,6 @@
     "Continue": "Verder gaan",
     "Country": "Land",
     "Create an account": "Account aanmaken",
-    "Created_at desc": "Nieuwste",
     "Credentials": "Gegevens",
     "Decrease": "Verlagen",
     "Description": "Beschrijving",
@@ -50,8 +49,6 @@
     "Middlename": "Tussenvoegsel",
     "More options": "Meer opties",
     "My billing and shipping address are the same": "Mijn factuur- en verzendadres zijn hetzelfde",
-    "Name asc": "Naam A-Z",
-    "Name desc": "Naam Z-A",
     "New address": "Nieuw adres",
     "Next": "Volgende",
     "No": "Nee",
@@ -69,8 +66,6 @@
     "Postcode": "Postcode",
     "Prefix": "Aanhef",
     "Prev": "Vorige",
-    "Price asc": "Prijs oplopend",
-    "Price desc": "Prijs aflopend",
     "Privacy Policy": "Privacybeleid",
     "products": "producten",
     "Products": "Producten",
diff --git a/lang/nl/frontend.php b/lang/nl/frontend.php
index dcbaf3ccb..e543b0238 100644
--- a/lang/nl/frontend.php
+++ b/lang/nl/frontend.php
@@ -22,4 +22,21 @@
         'email_password'    => 'Je hebt geen email of wachtwoord opgegeven.',
         'email'             => 'Een email adres is verplicht.',
     ],
+
+    'asc'       => 'oplopend',
+    'desc'      => 'aflopend',
+    'relevance' => 'Relevantie',
+    'all'       => 'Alles',
+    'price'     => 'Prijs',
+
+    'sorting' => [
+        'created_at' => [
+            'asc'  => 'Oudste',
+            'desc' => 'Nieuwste',
+        ],
+        'name' => [
+            'asc'  => 'Naam A-Z',
+            'desc' => 'Naam Z-A',
+        ],
+    ],
 ];
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 8912ac591..d2cc657f0 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -214,7 +214,10 @@ public function configureSearchkitSorting(): self
         $index = (new (config('rapidez.models.product')))->searchableAs();
         $sortableAttributes = collect($sortableAttributes)
             ->flatMap(fn ($attribute) => Arr::map(($attribute['directions'] ?? null) ?: ['asc', 'desc'], fn ($direction) => [
-                'label' => __(ucfirst("{$attribute['code']} {$direction}")),
+                'label' => trans_fallback(
+                    "rapidez::frontend.sorting.{$attribute['code']}.{$direction}",
+                    trans_fallback("rapidez::frontend.{$attribute['code']}", $attribute['code']) . ' ' . trans_fallback("rapidez::frontend.{$direction}", $direction),
+                ),
                 'field' => $attribute['code'] . ($attribute['input'] == 'text' ? '.keyword' : ''),
                 'order' => $direction,
                 'value' => "{$index}_{$attribute['code']}_{$direction}",
diff --git a/src/helpers.php b/src/helpers.php
index b002fa9af..51bd6ccbe 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -38,3 +38,11 @@ function vite_filename_path($file)
         }
     }
 }
+
+if (! function_exists('trans_fallback')) {
+    function trans_fallback($key, $fallback, $replace = [], $locale = null)
+    {
+        $translator = app('translator');
+        return $translator->has($key) ? $translator->get($key, $replace, $locale) : $fallback;
+    }
+}

From 0d2f9ff272096e23aae542cd0ed30547ebf40a8a Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Wed, 19 Mar 2025 09:41:28 +0000
Subject: [PATCH 108/244] Apply fixes from Duster

---
 src/helpers.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/helpers.php b/src/helpers.php
index 51bd6ccbe..ec6b0d8db 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -43,6 +43,7 @@ function vite_filename_path($file)
     function trans_fallback($key, $fallback, $replace = [], $locale = null)
     {
         $translator = app('translator');
+
         return $translator->has($key) ? $translator->get($key, $replace, $locale) : $fallback;
     }
 }

From ffe28b608a8863a09847d5cebb643dec2be6662e Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 19 Mar 2025 10:51:56 +0100
Subject: [PATCH 109/244] Add comment explaining loop

---
 src/Rapidez.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Rapidez.php b/src/Rapidez.php
index dd3aad2ac..436df4937 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -130,6 +130,9 @@ public function setStore(Store|array|callable|int|string $store): void
         config()->set('rapidez.root_category_id', $store['root_category_id']);
         config()->set('frontend.base_url', url('/'));
 
+        // This loop goes through all the Rapidez config files and retrieves the store-specific values.
+        // We also remember some `default` values along the way. This allows us to switch stores multiple
+        // times in one session, without losing any data that got overwritten by the store-specific values.
         foreach (array_keys(config('rapidez')) as $config) {
             // Reset defaults if they've been set previously
             foreach (config('rapidez.defaults.' . $config, []) as $key => $value) {

From 4b106b8aa1a553550805d872b0ca6ee060a554e4 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 19 Mar 2025 15:33:03 +0100
Subject: [PATCH 110/244] Remove unneeded div wrapper

---
 resources/views/listing/partials/item.blade.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index 8b1dcc41c..fc8ad0436 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -16,9 +16,7 @@ class="mb-3 h-48 w-full rounded-t object-contain" :alt="item.name" :loading="con
                 />
                 <x-rapidez::no-image v-else class="mb-3 h-48 rounded-t" />
                 <div class="px-2">
-                    <div class="text-base font-medium">
-                        <x-rapidez::highlight attribute="name"/>
-                    </div>
+                    <x-rapidez::highlight attribute="name" class="text-base font-medium"/>
                     @if (!Rapidez::config('catalog/frontend/show_swatches_in_product_list', 1))
                         <div class="flex items-center space-x-2">
                             <div class="font-semibold">@{{ (item.special_price || item.price) | price }}</div>

From fecd91296e989a751602223a62048aea3dba3598 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Thu, 20 Mar 2025 16:14:11 +0100
Subject: [PATCH 111/244] Simplify & allow custom tag

---
 resources/views/components/highlight.blade.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/resources/views/components/highlight.blade.php b/resources/views/components/highlight.blade.php
index a8dec90e5..84c4aa0b4 100644
--- a/resources/views/components/highlight.blade.php
+++ b/resources/views/components/highlight.blade.php
@@ -1,12 +1,11 @@
-@props(['attribute', 'item' => 'item'])
+@props(['attribute', 'item' => 'item', 'highlightTag' => 'mark'])
 
 @if (in_array($attribute, config('rapidez.searchkit.highlight_attributes')))
-    <ais-highlight
-        {{ $attributes }}
-        attribute="{{ $attribute }}"
-        :hit="{{ $item }}"
-        highlighted-tag-name="mark"
-    />
+    <ais-highlight {{ $attributes->merge([
+        'v-bind:hit' => $item,
+        'attribute' => $attribute,
+        'highlighted-tag-name' => $highlightTag,
+    ]) }}/>
 @else
     <span {{ $attributes }} v-text="{{ $item }}.{{ $attribute }}"></span>
 @endif

From 499e3fc592d87be969c9670bd1bf1ec70cd6cfd2 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 21 Mar 2025 13:26:00 +0100
Subject: [PATCH 112/244] Select super attributes when filtering by them

---
 resources/js/components/Listing/Listing.vue   |  2 +
 .../js/components/Listing/SuperAttribute.vue  | 65 +++++++++++++++++++
 .../partials/item/super_attributes.blade.php  | 46 ++++++-------
 3 files changed, 91 insertions(+), 22 deletions(-)
 create mode 100644 resources/js/components/Listing/SuperAttribute.vue

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 6184fd6e7..20738d8f8 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -11,6 +11,7 @@ import AisHitsPerPage from 'vue-instantsearch/vue2/es/src/components/HitsPerPage
 import AisSortBy from 'vue-instantsearch/vue2/es/src/components/SortBy.vue.js'
 import AisPagination from 'vue-instantsearch/vue2/es/src/components/Pagination.vue.js'
 import AisStats from 'vue-instantsearch/vue2/es/src/components/Stats.vue.js'
+import SuperAttribute from './SuperAttribute.vue'
 
 import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
@@ -30,6 +31,7 @@ export default {
         'ais-sort-by': AisSortBy,
         'ais-pagination': AisPagination,
         'ais-stats': AisStats,
+        'super-attribute': SuperAttribute,
     },
     props: {
         // TODO: Do we still use/need this?
diff --git a/resources/js/components/Listing/SuperAttribute.vue b/resources/js/components/Listing/SuperAttribute.vue
new file mode 100644
index 000000000..19ef1d4a1
--- /dev/null
+++ b/resources/js/components/Listing/SuperAttribute.vue
@@ -0,0 +1,65 @@
+<script>
+export default {
+    inject: { instantSearchInstance: { from: '$_ais_instantSearchInstance' } },
+
+    props: {
+        parent: Object,
+        attribute: Object,
+        id: Number,
+    },
+
+    render() {
+        return this.$scopedSlots.default(this)
+    },
+
+    data() {
+        return {
+            option: undefined,
+        }
+    },
+
+    mounted() {
+        this.option = this.refinement
+    },
+
+    methods: {
+        isDisabled(optionId) {
+            this.parent.disabledOptions['super_'+this.attribute.code].includes(optionId)
+        },
+    },
+
+    computed: {
+        options() {
+            return this.parent.getOptions(this.attribute.code)
+        },
+
+        superRefinements() {
+            let disjunctiveFacetsRefinements = this.instantSearchInstance.helper.state.disjunctiveFacetsRefinements
+            return Object.fromEntries(
+                Object.entries(disjunctiveFacetsRefinements)
+                    .filter(([key, value]) => key.startsWith('super_') && value.length > 0)
+                    .map(([key, value]) => [key.replace('super_', ''), value])
+            )
+        },
+
+        refinement() {
+            let refinement = this.superRefinements[this.attribute.code]
+            if (refinement?.length != 1) {
+                return undefined
+            }
+
+            return refinement[0]
+        }
+    },
+
+    watch: {
+        option() {
+            Vue.set(this.parent.options, this.id, this.option)
+        },
+
+        refinement() {
+            this.option = this.refinement
+        },
+    }
+}
+</script>
diff --git a/resources/views/listing/partials/item/super_attributes.blade.php b/resources/views/listing/partials/item/super_attributes.blade.php
index 07475172a..376b1b81e 100644
--- a/resources/views/listing/partials/item/super_attributes.blade.php
+++ b/resources/views/listing/partials/item/super_attributes.blade.php
@@ -1,24 +1,26 @@
 <div v-for="(superAttribute, superAttributeId) in item.super_attributes">
-    <label>
-        <x-rapidez::label v-bind:for="item.entity_id+'_super_attribute_'+superAttributeId">
-            @{{ superAttribute.label }}
-        </x-rapidez::label>
-        <x-rapidez::input.select
-            v-bind:id="item.entity_id+'_super_attribute_'+superAttributeId"
-            v-bind:name="superAttributeId"
-            v-model="addToCart.options[superAttributeId]"
-            class="mb-3"
-            required
-        >
-            <option disabled selected hidden :value="undefined">
-                @lang('Select') @{{ superAttribute.label.toLowerCase() }}
-            </option>
-            <option
-                v-for="(option, optionId) in addToCart.getOptions(superAttribute.code)"
-                v-text="option.label"
-                :value="optionId"
-                :disabled="addToCart.disabledOptions['super_'+superAttribute.code].includes(optionId)"
-            />
-        </x-rapidez::input.select>
-    </label>
+    <super-attribute v-bind:attribute="superAttribute" v-bind:id="+superAttributeId" v-bind:parent="addToCart">
+        <label slot-scope="superAttributeScope">
+            <x-rapidez::label v-bind:for="item.entity_id+'_super_attribute_'+superAttributeId">
+                @{{ superAttribute.label }}
+            </x-rapidez::label>
+            <x-rapidez::input.select
+                v-bind:id="item.entity_id+'_super_attribute_'+superAttributeId"
+                v-bind:name="superAttributeId"
+                v-model="superAttributeScope.option"
+                class="mb-3"
+                required
+            >
+                <option disabled selected hidden :value="undefined">
+                    @lang('Select') @{{ superAttribute.label.toLowerCase() }}
+                </option>
+                <option
+                    v-for="(option, optionId) in superAttributeScope.options"
+                    v-text="option.label"
+                    :value="optionId"
+                    :disabled="superAttributeScope.isDisabled(optionId)"
+                />
+            </x-rapidez::input.select>
+        </label>
+    </super-attribute>
 </div>

From 557e076fd003981cec74726de95e6a6db27144df Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Fri, 21 Mar 2025 12:26:38 +0000
Subject: [PATCH 113/244] Apply fixes from Prettier

---
 resources/js/components/Listing/SuperAttribute.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/Listing/SuperAttribute.vue b/resources/js/components/Listing/SuperAttribute.vue
index 19ef1d4a1..18b103196 100644
--- a/resources/js/components/Listing/SuperAttribute.vue
+++ b/resources/js/components/Listing/SuperAttribute.vue
@@ -24,7 +24,7 @@ export default {
 
     methods: {
         isDisabled(optionId) {
-            this.parent.disabledOptions['super_'+this.attribute.code].includes(optionId)
+            this.parent.disabledOptions['super_' + this.attribute.code].includes(optionId)
         },
     },
 
@@ -38,7 +38,7 @@ export default {
             return Object.fromEntries(
                 Object.entries(disjunctiveFacetsRefinements)
                     .filter(([key, value]) => key.startsWith('super_') && value.length > 0)
-                    .map(([key, value]) => [key.replace('super_', ''), value])
+                    .map(([key, value]) => [key.replace('super_', ''), value]),
             )
         },
 
@@ -49,7 +49,7 @@ export default {
             }
 
             return refinement[0]
-        }
+        },
     },
 
     watch: {
@@ -60,6 +60,6 @@ export default {
         refinement() {
             this.option = this.refinement
         },
-    }
+    },
 }
 </script>

From 59aa2a5b1a938d07943fe56169aecbb6c0297d68 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 21 Mar 2025 13:29:07 +0100
Subject: [PATCH 114/244] Add comment

---
 resources/js/components/Listing/SuperAttribute.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/js/components/Listing/SuperAttribute.vue b/resources/js/components/Listing/SuperAttribute.vue
index 19ef1d4a1..9bb174a73 100644
--- a/resources/js/components/Listing/SuperAttribute.vue
+++ b/resources/js/components/Listing/SuperAttribute.vue
@@ -34,6 +34,8 @@ export default {
         },
 
         superRefinements() {
+            // Note that `disjunctiveFacetsRefinements` is only one of 5 total sets of refinements that gets exposed by the state
+            // It looks like all super attributes will end up in there, so right now it's the only one we check
             let disjunctiveFacetsRefinements = this.instantSearchInstance.helper.state.disjunctiveFacetsRefinements
             return Object.fromEntries(
                 Object.entries(disjunctiveFacetsRefinements)

From e16df762dee53460a562d23b390f98a26af7ab95 Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Tue, 25 Mar 2025 09:46:18 +0100
Subject: [PATCH 115/244] Update Turbo when navigating away and Turbo state is
 missing (#777)

---
 resources/js/turbolinks.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/resources/js/turbolinks.js b/resources/js/turbolinks.js
index b37705119..0e800b9e3 100644
--- a/resources/js/turbolinks.js
+++ b/resources/js/turbolinks.js
@@ -4,3 +4,10 @@ import TurbolinksAdapter from 'vue-turbolinks'
 Vue.use(TurbolinksAdapter)
 
 Turbo.config.drive.progressBarDelay = 5
+
+document.addEventListener('turbo:before-visit', function (e) {
+    if (typeof history.state.turbo === 'undefined') {
+        // Trigger turbo to add the state.
+        Turbo?.navigator?.history?.replace(window.location)
+    }
+})

From ae03f5903cf3565cd8ba55de789843dc6933ed40 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Mar 2025 15:05:17 +0100
Subject: [PATCH 116/244] Remove glob

---
 src/Rapidez.php                |  1 +
 src/RapidezServiceProvider.php | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Rapidez.php b/src/Rapidez.php
index 436df4937..846def4cc 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -133,6 +133,7 @@ public function setStore(Store|array|callable|int|string $store): void
         // This loop goes through all the Rapidez config files and retrieves the store-specific values.
         // We also remember some `default` values along the way. This allows us to switch stores multiple
         // times in one session, without losing any data that got overwritten by the store-specific values.
+        // TODO: Add how to use this in the Rapidez documentation
         foreach (array_keys(config('rapidez')) as $config) {
             // Reset defaults if they've been set previously
             foreach (config('rapidez.defaults.' . $config, []) as $key => $value) {
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index a1813b0fc..0b1cc425c 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -262,19 +262,6 @@ protected function registerConfigs(): self
             $this->mergeConfigFrom(__DIR__ . '/../config/rapidez/' . $configFile . '.php', 'rapidez.' . $configFile);
         }
 
-        // Find all store-specific config files and merge them in
-        // TODO: Add how to use this in the Rapidez documentation
-        foreach (glob(__DIR__ . '../config/rapidez/stores/*/*.php') as $configFile) {
-            @[$store, $path] = explode('/', Str::after($configFile, '/config/rapidez/stores/'), 2);
-            $path = str($path)->beforeLast('.php')->replace('/', '.')->toString();
-
-            if (! $store || ! $path) {
-                continue;
-            }
-
-            $this->mergeConfigFrom($configFile, 'rapidez.stores.' . $store . '.' . $path);
-        }
-
         if (! config('cache.stores.rapidez:multi', false)) {
             $fallbackDriver = config('cache.default');
             if ($fallbackDriver === 'rapidez:multi') {

From d76a34a1be129f2572b69a95ee348d444cdf30af Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 4 Apr 2025 17:35:16 +0200
Subject: [PATCH 117/244] Lazily load instantsearch globally

---
 resources/js/components/Listing/Listing.vue   | 23 -------------------
 .../js/components/Search/Autocomplete.vue     | 19 +++++++++++----
 .../components/Search/InstantSearchMixin.vue  | 11 ---------
 resources/js/instantsearch.js                 | 21 +++++++++++++++++
 resources/js/package.js                       |  1 +
 resources/views/components/listing.blade.php  |  5 +---
 .../views/components/productlist.blade.php    | 11 ---------
 resources/views/listing/filters.blade.php     | 13 +++++++++++
 resources/views/listing/products.blade.php    | 14 +++++++++++
 src/RapidezServiceProvider.php                | 19 +++++++++++++++
 src/helpers.php                               | 18 ++++++++-------
 11 files changed, 93 insertions(+), 62 deletions(-)
 create mode 100644 resources/js/instantsearch.js

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 6184fd6e7..c54e84a0e 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,17 +1,6 @@
 <script>
 import { history } from 'instantsearch.js/es/lib/routers'
 
-import AisSearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
-import AisRefinementList from 'vue-instantsearch/vue2/es/src/components/RefinementList.vue.js'
-import AisHierarchicalMenu from 'vue-instantsearch/vue2/es/src/components/HierarchicalMenu.vue.js'
-import AisRangeInput from 'vue-instantsearch/vue2/es/src/components/RangeInput.vue.js'
-import AisCurrentRefinements from 'vue-instantsearch/vue2/es/src/components/CurrentRefinements.vue.js'
-import AisClearRefinements from 'vue-instantsearch/vue2/es/src/components/ClearRefinements.vue.js'
-import AisHitsPerPage from 'vue-instantsearch/vue2/es/src/components/HitsPerPage.vue.js'
-import AisSortBy from 'vue-instantsearch/vue2/es/src/components/SortBy.vue.js'
-import AisPagination from 'vue-instantsearch/vue2/es/src/components/Pagination.vue.js'
-import AisStats from 'vue-instantsearch/vue2/es/src/components/Stats.vue.js'
-
 import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
 
@@ -19,18 +8,6 @@ import InstantSearchMixin from '../Search/InstantSearchMixin.vue'
 
 export default {
     mixins: [InstantSearchMixin],
-    components: {
-        'ais-search-box': AisSearchBox,
-        'ais-refinement-list': AisRefinementList,
-        'ais-hierarchical-menu': AisHierarchicalMenu,
-        'ais-range-input': AisRangeInput,
-        'ais-current-refinements': AisCurrentRefinements,
-        'ais-clear-refinements': AisClearRefinements,
-        'ais-hits-per-page': AisHitsPerPage,
-        'ais-sort-by': AisSortBy,
-        'ais-pagination': AisPagination,
-        'ais-stats': AisStats,
-    },
     props: {
         // TODO: Do we still use/need this?
         // Maybe transform it to a callback
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 7597f8d30..48ebfe640 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -1,14 +1,23 @@
 <script>
-import AisSearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
-import AisIndex from 'vue-instantsearch/vue2/es/src/components/Index.js'
-
 import InstantSearchMixin from './InstantSearchMixin.vue'
 
+import InstantSearch from 'vue-instantsearch/vue2/es/src/components/InstantSearch'
+import Hits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
+import Configure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
+import highlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
+import SearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
+import Index from 'vue-instantsearch/vue2/es/src/components/Index.js';
+
+
 export default {
     mixins: [InstantSearchMixin],
     components: {
-        'ais-search-box': AisSearchBox,
-        'ais-index': AisIndex,
+        InstantSearch,
+        Hits,
+        Configure,
+        highlight,
+        SearchBox,
+        Index,
     },
     data: () => ({
         loaded: false,
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index f507adf31..e727f9709 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -2,18 +2,7 @@
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
 
-import AisInstantSearch from 'vue-instantsearch/vue2/es/src/components/InstantSearch'
-import AisHits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
-import AisConfigure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
-import AisHighlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
-
 export default {
-    components: {
-        'ais-instant-search': AisInstantSearch,
-        'ais-hits': AisHits,
-        'ais-configure': AisConfigure,
-        'ais-highlight': AisHighlight,
-    },
     data: () => ({
         searchkit: null,
         searchClient: null,
diff --git a/resources/js/instantsearch.js b/resources/js/instantsearch.js
new file mode 100644
index 000000000..9f1bb2feb
--- /dev/null
+++ b/resources/js/instantsearch.js
@@ -0,0 +1,21 @@
+// Shared between Autocomplete and Listing
+Vue.component('ais-instant-search', () => import('vue-instantsearch/vue2/es/src/components/InstantSearch'))
+Vue.component('ais-hits', () => import('vue-instantsearch/vue2/es/src/components/Hits.js'))
+Vue.component('ais-configure', () => import('vue-instantsearch/vue2/es/src/components/Configure.js'))
+Vue.component('ais-highlight', () => import('vue-instantsearch/vue2/es/src/components/Highlight.vue.js'))
+Vue.component('ais-search-box', () => import('vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'))
+
+// Used by Autocomplete
+Vue.component('ais-index', () => import('vue-instantsearch/vue2/es/src/components/Index.js'));
+
+// Used by Listing
+Vue.component('ais-refinement-list', () => import('vue-instantsearch/vue2/es/src/components/RefinementList.vue.js'))
+Vue.component('ais-hierarchical-menu', () => import('vue-instantsearch/vue2/es/src/components/HierarchicalMenu.vue.js'))
+Vue.component('ais-range-input', () => import('vue-instantsearch/vue2/es/src/components/RangeInput.vue.js'))
+Vue.component('ais-current-refinements', () => import('vue-instantsearch/vue2/es/src/components/CurrentRefinements.vue.js'))
+Vue.component('ais-clear-refinements', () => import('vue-instantsearch/vue2/es/src/components/ClearRefinements.vue.js'))
+Vue.component('ais-hits-per-page', () => import('vue-instantsearch/vue2/es/src/components/HitsPerPage.vue.js'))
+Vue.component('ais-sort-by', () => import('vue-instantsearch/vue2/es/src/components/SortBy.vue.js'))
+Vue.component('ais-pagination', () => import('vue-instantsearch/vue2/es/src/components/Pagination.vue.js'))
+Vue.component('ais-stats', () => import('vue-instantsearch/vue2/es/src/components/Stats.vue.js'))
+
diff --git a/resources/js/package.js b/resources/js/package.js
index 391f87583..dc62963c3 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -21,6 +21,7 @@ import './mixins'
 import './cookies'
 import './callbacks'
 import './vue-components'
+import './instantsearch'
 ;(() => import('./turbolinks'))()
 
 if (import.meta.env.VITE_DEBUG === 'true') {
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 5f6080447..a0ff351b4 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -2,10 +2,7 @@
 
 @pushOnce('head', 'es_url-preconnect')
     <link rel="preconnect" href="{{ config('rapidez.es_url') }}">
-
-    @if ($file = vite_filename_path('Listing.vue'))
-        @vite([$file])
-    @endif
+    @vite(vite_filename_paths(['Listing.vue', 'InstantSearch']))
 @endPushOnce
 
 <div class="min-h-screen">
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 48678c2ba..175aa0d2d 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -1,16 +1,5 @@
 @props(['value', 'title' => false, 'field' => 'sku.keyword'])
 
-{{--
-TODO: We should NOT have this here! It should be loaded
-lazily when "intersected" by scrolling to down
-But it currently doesn't work without it.
---}}
-@pushOnce('head')
-    @if ($file = vite_filename_path('Listing.vue'))
-        @vite([$file])
-    @endif
-@endPushOnce
-
 @if ($value)
     <lazy v-slot="{ intersected }">
         <listing v-if="intersected" v-cloak inline-template>
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index 6ac1e2119..f987a7456 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -1,4 +1,17 @@
 @php($id = uniqid('filters-'))
+@pushOnce('head', 'listing-filters')
+    @vite(
+        vite_filename_paths([
+            'ClearRefinements.vue',
+            'CurrentRefinements.vue',
+            'SearchBox.vue',
+            'RangeInput.vue',
+            'RangeSlider.vue',
+            'RefinementList.vue',
+            'HierarchicalMenu.vue',
+        ])
+    )
+@endPushOnce
 <x-rapidez::slideover.mobile :$id :title="__('Filters')">
     <div class="w-full p-2 max-lg:bg-white max-lg:p-5">
         @include('rapidez::listing.partials.filter.selected')
diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index 6587da694..f22eee2e4 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -1,4 +1,18 @@
 {{-- TODO: Is this wrapper with these classes still the cleanest option? --}}
+@pushOnce('head', 'listing-products')
+    @vite(
+        vite_filename_paths([
+            'HitsPerPage.vue',
+            'SortBy.vue',
+            'Stats.vue',
+            'Hits.vue',
+            'Highlight.vue',
+            'Pagination.vue',
+            'Hits'
+        ])
+    )
+@endPushOnce
+
 <div id="products" class="flex flex-col gap-3 *:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end">
     @include('rapidez::listing.partials.toolbar')
 
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 87692a5b3..6c7f3341a 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -275,6 +275,25 @@ protected function bootMacros(): self
                 ->squish();
         });
 
+        Vite::macro('getPathsByFilenames', function ($filenames) {
+            /** @var \Illuminate\Foundation\Vite $this */
+            $filenames = is_array($filenames) ? $filenames : func_get_args();
+            $manifest = $this->manifest($this->buildDirectory);
+
+            return array_filter(
+                array_map(
+                    function ($filename) use ($manifest) {
+                        foreach ($manifest as $path => $asset) {
+                            if (Str::endsWith($asset['name'] ?? '', $filename)|| Str::endsWith($path, $filename)) {
+                                return $path;
+                            }
+                        }
+                    },
+                    $filenames
+                )
+            );
+        });
+
         return $this;
     }
 
diff --git a/src/helpers.php b/src/helpers.php
index b002fa9af..efce006f1 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 if (! function_exists('price')) {
     function price($price)
     {
@@ -28,13 +30,13 @@ function vite_filename_with_chunkhash($file)
 if (! function_exists('vite_filename_path')) {
     function vite_filename_path($file)
     {
-        $manifest = @json_decode(@file_get_contents(public_path('build/manifest.json')));
-        if ($manifest) {
-            foreach ($manifest as $path => $asset) {
-                if (Str::endsWith($path, $file)) {
-                    return $path;
-                }
-            }
-        }
+        return vite_filename_paths($file)[0] ?? null;
+    }
+}
+
+if (! function_exists('vite_filename_paths')) {
+    function vite_filename_paths($file)
+    {
+        return Vite::getPathsByFilenames($file);
     }
 }

From 709cda603228dd34dcf2f9b39195cbb9e6098c40 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Fri, 4 Apr 2025 15:35:42 +0000
Subject: [PATCH 118/244] Apply fixes from Duster

---
 src/RapidezServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 6c7f3341a..fd0f3bc00 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -284,7 +284,7 @@ protected function bootMacros(): self
                 array_map(
                     function ($filename) use ($manifest) {
                         foreach ($manifest as $path => $asset) {
-                            if (Str::endsWith($asset['name'] ?? '', $filename)|| Str::endsWith($path, $filename)) {
+                            if (Str::endsWith($asset['name'] ?? '', $filename) || Str::endsWith($path, $filename)) {
                                 return $path;
                             }
                         }

From 3706b224cc4b3294e39245825c90f9b9b016c5ac Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Fri, 4 Apr 2025 15:36:10 +0000
Subject: [PATCH 119/244] Apply fixes from Prettier

---
 resources/js/components/Search/Autocomplete.vue | 3 +--
 resources/js/instantsearch.js                   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 48ebfe640..752ecfa1e 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -6,8 +6,7 @@ import Hits from 'vue-instantsearch/vue2/es/src/components/Hits.js'
 import Configure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
 import highlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
 import SearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
-import Index from 'vue-instantsearch/vue2/es/src/components/Index.js';
-
+import Index from 'vue-instantsearch/vue2/es/src/components/Index.js'
 
 export default {
     mixins: [InstantSearchMixin],
diff --git a/resources/js/instantsearch.js b/resources/js/instantsearch.js
index 9f1bb2feb..06e98dfa8 100644
--- a/resources/js/instantsearch.js
+++ b/resources/js/instantsearch.js
@@ -6,7 +6,7 @@ Vue.component('ais-highlight', () => import('vue-instantsearch/vue2/es/src/compo
 Vue.component('ais-search-box', () => import('vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'))
 
 // Used by Autocomplete
-Vue.component('ais-index', () => import('vue-instantsearch/vue2/es/src/components/Index.js'));
+Vue.component('ais-index', () => import('vue-instantsearch/vue2/es/src/components/Index.js'))
 
 // Used by Listing
 Vue.component('ais-refinement-list', () => import('vue-instantsearch/vue2/es/src/components/RefinementList.vue.js'))
@@ -18,4 +18,3 @@ Vue.component('ais-hits-per-page', () => import('vue-instantsearch/vue2/es/src/c
 Vue.component('ais-sort-by', () => import('vue-instantsearch/vue2/es/src/components/SortBy.vue.js'))
 Vue.component('ais-pagination', () => import('vue-instantsearch/vue2/es/src/components/Pagination.vue.js'))
 Vue.component('ais-stats', () => import('vue-instantsearch/vue2/es/src/components/Stats.vue.js'))
-

From 906de502607c83b85b3c7285b54fd80ed4ab22f4 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Mon, 7 Apr 2025 17:06:35 +0200
Subject: [PATCH 120/244] Move refinement attributes to addToCart.vue

---
 resources/js/components/Listing/Listing.vue   |  2 -
 .../js/components/Listing/SuperAttribute.vue  | 67 -------------------
 resources/js/components/Product/AddToCart.vue | 52 ++++++++++++++
 .../partials/item/super_attributes.blade.php  | 46 ++++++-------
 4 files changed, 74 insertions(+), 93 deletions(-)
 delete mode 100644 resources/js/components/Listing/SuperAttribute.vue

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 20738d8f8..6184fd6e7 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -11,7 +11,6 @@ import AisHitsPerPage from 'vue-instantsearch/vue2/es/src/components/HitsPerPage
 import AisSortBy from 'vue-instantsearch/vue2/es/src/components/SortBy.vue.js'
 import AisPagination from 'vue-instantsearch/vue2/es/src/components/Pagination.vue.js'
 import AisStats from 'vue-instantsearch/vue2/es/src/components/Stats.vue.js'
-import SuperAttribute from './SuperAttribute.vue'
 
 import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
@@ -31,7 +30,6 @@ export default {
         'ais-sort-by': AisSortBy,
         'ais-pagination': AisPagination,
         'ais-stats': AisStats,
-        'super-attribute': SuperAttribute,
     },
     props: {
         // TODO: Do we still use/need this?
diff --git a/resources/js/components/Listing/SuperAttribute.vue b/resources/js/components/Listing/SuperAttribute.vue
deleted file mode 100644
index b5d1832ac..000000000
--- a/resources/js/components/Listing/SuperAttribute.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<script>
-export default {
-    inject: { instantSearchInstance: { from: '$_ais_instantSearchInstance' } },
-
-    props: {
-        parent: Object,
-        attribute: Object,
-        id: Number,
-    },
-
-    render() {
-        return this.$scopedSlots.default(this)
-    },
-
-    data() {
-        return {
-            option: undefined,
-        }
-    },
-
-    mounted() {
-        this.option = this.refinement
-    },
-
-    methods: {
-        isDisabled(optionId) {
-            this.parent.disabledOptions['super_' + this.attribute.code].includes(optionId)
-        },
-    },
-
-    computed: {
-        options() {
-            return this.parent.getOptions(this.attribute.code)
-        },
-
-        superRefinements() {
-            // Note that `disjunctiveFacetsRefinements` is only one of 5 total sets of refinements that gets exposed by the state
-            // It looks like all super attributes will end up in there, so right now it's the only one we check
-            let disjunctiveFacetsRefinements = this.instantSearchInstance.helper.state.disjunctiveFacetsRefinements
-            return Object.fromEntries(
-                Object.entries(disjunctiveFacetsRefinements)
-                    .filter(([key, value]) => key.startsWith('super_') && value.length > 0)
-                    .map(([key, value]) => [key.replace('super_', ''), value]),
-            )
-        },
-
-        refinement() {
-            let refinement = this.superRefinements[this.attribute.code]
-            if (refinement?.length != 1) {
-                return undefined
-            }
-
-            return refinement[0]
-        },
-    },
-
-    watch: {
-        option() {
-            Vue.set(this.parent.options, this.id, this.option)
-        },
-
-        refinement() {
-            this.option = this.refinement
-        },
-    },
-}
-</script>
diff --git a/resources/js/components/Product/AddToCart.vue b/resources/js/components/Product/AddToCart.vue
index f7c23a8c7..4e3174f90 100644
--- a/resources/js/components/Product/AddToCart.vue
+++ b/resources/js/components/Product/AddToCart.vue
@@ -3,6 +3,21 @@ import { GraphQLError } from '../../fetch'
 import { mask, refreshMask } from '../../stores/useMask'
 
 export default {
+    inject: {
+        instantSearchInstance: {
+            from: '$_ais_instantSearchInstance',
+            default: () => {
+                return {
+                    helper: {
+                        state: {
+                            disjunctiveFacetsRefinements: {},
+                        },
+                    },
+                }
+            },
+        }
+    },
+
     props: {
         product: {
             type: Object,
@@ -50,6 +65,7 @@ export default {
         this.$nextTick(() => {
             this.setDefaultOptions()
             this.setDefaultCustomSelectedOptions()
+            this.setOptionsFromRefinements()
         })
     },
 
@@ -255,6 +271,15 @@ export default {
                 Vue.set(this.customSelectedOptions, option.option_id, value)
             })
         },
+        async setOptionsFromRefinements() {
+            Object.entries(this.refinementOptions).forEach(([key, availableValue]) => {
+                if (!availableValue.length) {
+                    return
+                }
+
+                Vue.set(this.options, key, availableValue[0])
+            })
+        }
     },
 
     computed: {
@@ -410,9 +435,36 @@ export default {
             })
             return valuesPerAttribute
         },
+
+        superRefinements() {
+            // Note that `disjunctiveFacetsRefinements` is only one of 5 total sets of refinements that gets exposed by the state
+            // It looks like all super attributes will end up in there, so right now it's the only one we check
+            let disjunctiveFacetsRefinements = this.instantSearchInstance.helper.state.disjunctiveFacetsRefinements
+            return Object.fromEntries(
+                Object.entries(disjunctiveFacetsRefinements)
+                    .filter(([key, value]) => key.startsWith('super_') && value.length > 0)
+                    .map(([key, value]) => [key.replace('super_', ''), value]),
+            )
+        },
+
+        refinementOptions() {
+            // Options per super attribute that match the current refinements.
+            return Object.fromEntries(Object.entries(this.product.super_attributes).map(([index, attribute]) => {
+                return [
+                    index,
+                    (Object.entries(this.superRefinements).find(([key, value]) => key === attribute.code)?.[1] || [])
+                        .filter((val) => this.enabledOptions[index].includes(val * 1))] // Filter out disabled options
+            }))
+        },
     },
 
     watch: {
+        superRefinements: {
+            handler(refinements) {
+                this.setOptionsFromRefinements()
+            },
+            deep: true,
+        },
         customOptions: {
             handler() {
                 this.calculatePrices()
diff --git a/resources/views/listing/partials/item/super_attributes.blade.php b/resources/views/listing/partials/item/super_attributes.blade.php
index 376b1b81e..07475172a 100644
--- a/resources/views/listing/partials/item/super_attributes.blade.php
+++ b/resources/views/listing/partials/item/super_attributes.blade.php
@@ -1,26 +1,24 @@
 <div v-for="(superAttribute, superAttributeId) in item.super_attributes">
-    <super-attribute v-bind:attribute="superAttribute" v-bind:id="+superAttributeId" v-bind:parent="addToCart">
-        <label slot-scope="superAttributeScope">
-            <x-rapidez::label v-bind:for="item.entity_id+'_super_attribute_'+superAttributeId">
-                @{{ superAttribute.label }}
-            </x-rapidez::label>
-            <x-rapidez::input.select
-                v-bind:id="item.entity_id+'_super_attribute_'+superAttributeId"
-                v-bind:name="superAttributeId"
-                v-model="superAttributeScope.option"
-                class="mb-3"
-                required
-            >
-                <option disabled selected hidden :value="undefined">
-                    @lang('Select') @{{ superAttribute.label.toLowerCase() }}
-                </option>
-                <option
-                    v-for="(option, optionId) in superAttributeScope.options"
-                    v-text="option.label"
-                    :value="optionId"
-                    :disabled="superAttributeScope.isDisabled(optionId)"
-                />
-            </x-rapidez::input.select>
-        </label>
-    </super-attribute>
+    <label>
+        <x-rapidez::label v-bind:for="item.entity_id+'_super_attribute_'+superAttributeId">
+            @{{ superAttribute.label }}
+        </x-rapidez::label>
+        <x-rapidez::input.select
+            v-bind:id="item.entity_id+'_super_attribute_'+superAttributeId"
+            v-bind:name="superAttributeId"
+            v-model="addToCart.options[superAttributeId]"
+            class="mb-3"
+            required
+        >
+            <option disabled selected hidden :value="undefined">
+                @lang('Select') @{{ superAttribute.label.toLowerCase() }}
+            </option>
+            <option
+                v-for="(option, optionId) in addToCart.getOptions(superAttribute.code)"
+                v-text="option.label"
+                :value="optionId"
+                :disabled="addToCart.disabledOptions['super_'+superAttribute.code].includes(optionId)"
+            />
+        </x-rapidez::input.select>
+    </label>
 </div>

From bf8b35a0f2ee098ef99b1ce967b84e2804af1250 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Mon, 7 Apr 2025 15:07:16 +0000
Subject: [PATCH 121/244] Apply fixes from Prettier

---
 resources/js/components/Product/AddToCart.vue | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/Product/AddToCart.vue b/resources/js/components/Product/AddToCart.vue
index 4e3174f90..445f32444 100644
--- a/resources/js/components/Product/AddToCart.vue
+++ b/resources/js/components/Product/AddToCart.vue
@@ -15,7 +15,7 @@ export default {
                     },
                 }
             },
-        }
+        },
     },
 
     props: {
@@ -279,7 +279,7 @@ export default {
 
                 Vue.set(this.options, key, availableValue[0])
             })
-        }
+        },
     },
 
     computed: {
@@ -449,12 +449,16 @@ export default {
 
         refinementOptions() {
             // Options per super attribute that match the current refinements.
-            return Object.fromEntries(Object.entries(this.product.super_attributes).map(([index, attribute]) => {
-                return [
-                    index,
-                    (Object.entries(this.superRefinements).find(([key, value]) => key === attribute.code)?.[1] || [])
-                        .filter((val) => this.enabledOptions[index].includes(val * 1))] // Filter out disabled options
-            }))
+            return Object.fromEntries(
+                Object.entries(this.product.super_attributes).map(([index, attribute]) => {
+                    return [
+                        index,
+                        (Object.entries(this.superRefinements).find(([key, value]) => key === attribute.code)?.[1] || []).filter((val) =>
+                            this.enabledOptions[index].includes(val * 1),
+                        ),
+                    ] // Filter out disabled options
+                }),
+            )
         },
     },
 

From a5661f2c83562b598b37e96d28069247d1ce03a6 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 8 Apr 2025 10:12:31 +0200
Subject: [PATCH 122/244] Move duplicate autocomplete parts to component

---
 .../components/autocomplete/input.blade.php   | 27 ++++++++++
 .../partials/header/autocomplete.blade.php    | 51 +++++--------------
 2 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 resources/views/components/autocomplete/input.blade.php

diff --git a/resources/views/components/autocomplete/input.blade.php b/resources/views/components/autocomplete/input.blade.php
new file mode 100644
index 000000000..e0bb4d593
--- /dev/null
+++ b/resources/views/components/autocomplete/input.blade.php
@@ -0,0 +1,27 @@
+@props([
+    'id' => 'autocomplete'
+])
+
+<form name="{{ $id }}-form" id="{{ $id }}-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
+    <x-rapidez::input
+        {{ $attributes->merge([
+            'id' => $id . '-input',
+            'type' => 'search',
+            'name' => 'q',
+            'autocomplete' => 'off',
+            'autocorrect' => 'off',
+            'autocapitalize' => 'none',
+            'spellcheck' => 'false',
+            'placeholder' => __('What are you looking for?'),
+        ]) }}
+        v-bind:value="currentRefinement"
+        v-on:focus="() => {
+            refine($root.autocompleteFacadeQuery || currentRefinement);
+            $root.autocompleteFacadeQuery = null;
+        }"
+        v-on:input="refine($event.currentTarget.value)"
+    />
+    <x-rapidez::button class="absolute right-0 bg-opacity-0 hover:bg-opacity-0 border-none" type="submit">
+        <x-rapidez::autocomplete.magnifying-glass />
+    </x-rapidez::button>
+</form>
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 1adf1bf78..94c6c3b48 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -14,28 +14,14 @@ class="contents"
                 <div class="searchbox">
                     <ais-search-box>
                         <template v-slot="{ currentRefinement, isSearchStalled, refine }">
-                            <form name="autocomplete-form" id="autocomplete-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
-                                <x-rapidez::input
-                                    id="autocomplete-input"
-                                    type="search"
-                                    focus="true"
-                                    autocomplete="off"
-                                    autocorrect="off"
-                                    autocapitalize="none"
-                                    spellcheck="false"
-                                    name="q"
-                                    v-bind:value="currentRefinement"
-                                    v-on:focus="() => {
-                                        refine($root.autocompleteFacadeQuery || currentRefinement);
-                                        $root.autocompleteFacadeQuery = null;
-                                    }"
-                                    v-on:input="refine($event.currentTarget.value)"
-                                    :placeholder="__('What are you looking for?')"
-                                />
-                                <x-rapidez::button class="absolute right-0 bg-opacity-0 hover:bg-opacity-0 border-none" type="submit">
-                                    <x-rapidez::autocomplete.magnifying-glass />
-                                </x-rapidez::button>
-                            </form>
+                            <x-rapidez::autocomplete.input
+                                v-bind:value="currentRefinement"
+                                v-on:focus="() => {
+                                    refine($root.autocompleteFacadeQuery || currentRefinement);
+                                    $root.autocompleteFacadeQuery = null;
+                                }"
+                                v-on:input="refine($event.currentTarget.value)"
+                            />
                         </template>
                     </ais-search-box>
                 </div>
@@ -45,22 +31,11 @@ class="contents"
             </div>
         </ais-instant-search>
         <div v-else class="relative w-full">
-            {{-- TODO: Do we still need this double input? --}}
-            <form name="autocomplete-form" id="autocomplete-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
-                <x-rapidez::input
-                    type="search"
-                    autocomplete="off"
-                    autocorrect="off"
-                    autocapitalize="none"
-                    spellcheck="false"
-                    name="q"
-                    :placeholder="__('What are you looking for?')"
-                    v-model="$root.autocompleteFacadeQuery"
-                    v-on:focus="window.document.dispatchEvent(new window.Event('loadAutoComplete'))"
-                    v-on:mouseover="window.document.dispatchEvent(new window.Event('loadAutoComplete'))"
-                />
-            </form>
-            <x-rapidez::autocomplete.magnifying-glass />
+            <x-rapidez::autocomplete.input
+                v-model="$root.autocompleteFacadeQuery"
+                v-on:focus="window.document.dispatchEvent(new window.Event('loadAutoComplete'))"
+                v-on:mouseover="window.document.dispatchEvent(new window.Event('loadAutoComplete'))"
+            />
         </div>
     </div>
 </autocomplete>

From 2cf2e77630032be60f204ac3b5c0c1f5ccd40429 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 8 Apr 2025 10:13:25 +0200
Subject: [PATCH 123/244] Remove attributes

---
 resources/views/components/autocomplete/input.blade.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/resources/views/components/autocomplete/input.blade.php b/resources/views/components/autocomplete/input.blade.php
index e0bb4d593..42d28b154 100644
--- a/resources/views/components/autocomplete/input.blade.php
+++ b/resources/views/components/autocomplete/input.blade.php
@@ -14,12 +14,6 @@
             'spellcheck' => 'false',
             'placeholder' => __('What are you looking for?'),
         ]) }}
-        v-bind:value="currentRefinement"
-        v-on:focus="() => {
-            refine($root.autocompleteFacadeQuery || currentRefinement);
-            $root.autocompleteFacadeQuery = null;
-        }"
-        v-on:input="refine($event.currentTarget.value)"
     />
     <x-rapidez::button class="absolute right-0 bg-opacity-0 hover:bg-opacity-0 border-none" type="submit">
         <x-rapidez::autocomplete.magnifying-glass />

From cdfcb9d200ea7f90405cb60b10d061f5272753c6 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Tue, 8 Apr 2025 10:58:42 +0200
Subject: [PATCH 124/244] InstantSearch parameters in the url

---
 lang/en/frontend.php                          |  4 +++
 lang/nl/frontend.php                          |  4 +++
 resources/js/components/Listing/Listing.vue   | 29 ++++++++++++-------
 resources/views/components/listing.blade.php  |  2 +-
 .../partials/header/autocomplete.blade.php    |  2 +-
 resources/views/search/overview.blade.php     |  1 -
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/lang/en/frontend.php b/lang/en/frontend.php
index 9c57ff6fb..1b9d67a27 100644
--- a/lang/en/frontend.php
+++ b/lang/en/frontend.php
@@ -40,4 +40,8 @@
     //         'desc' => 'Attrribute desc',
     //     ],
     // ],
+
+    'search' => [
+        'title' => 'Search for',
+    ],
 ];
diff --git a/lang/nl/frontend.php b/lang/nl/frontend.php
index d87809a0f..496f31229 100644
--- a/lang/nl/frontend.php
+++ b/lang/nl/frontend.php
@@ -39,4 +39,8 @@
             'desc' => 'Naam Z-A',
         ],
     ],
+
+    'search' => [
+        'title' => 'Zoeken naar',
+    ],
 ];
diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 6184fd6e7..8f7f8e568 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -162,6 +162,7 @@ export default {
             return {
                 router: history({
                     cleanUrlOnDispose: false,
+                    windowTitle: this.windowTitle,
                 }),
                 stateMapping: {
                     routeToState: this.routeToState,
@@ -242,33 +243,41 @@ export default {
             return this.baseFilters().concat(extraFilters)
         },
 
+        windowTitle(routeState) {
+            return window.config.translations.search.title + ': ' + routeState.q
+        },
+
         stateToRoute(uiState) {
             let data = uiState[this.index]
 
-            let parameters = {
+            return {
                 ...(data.range || {}),
                 ...(data.refinementList || {}),
+                category: data.hierarchicalMenu?.category_lvl1?.join('--'),
+                q: data.query,
+                page: data.page > 0 ? String(data.page) : undefined,
+                sort: data.sortBy,
+                hits: data.hitsPerPage != config.grid_per_page ? data.hitsPerPage : undefined
             }
-
-            if ('query' in data) {
-                parameters['q'] = data['query']
-            }
-
-            return parameters
         },
 
         routeToState(routeState) {
-            let ranges = Object.fromEntries(Object.entries(routeState).filter(([key, _]) => this.rangeAttributes.includes(key)))
+            let ranges = Object.fromEntries(Object.entries(routeState).filter(([key]) => this.rangeAttributes.includes(key)))
+
 
             let refinementList = Object.fromEntries(
-                Object.entries(routeState).filter(([key, _]) => key != 'q' && !this.rangeAttributes.includes(key)),
+                Object.entries(routeState).filter(([key]) => !['q', 'hits', 'sort', 'page', 'category'].includes(key) && !this.rangeAttributes.includes(key)),
             )
 
             return {
                 [this.index]: {
-                    refinementList: refinementList,
                     range: ranges,
+                    refinementList: refinementList,
+                    hierarchicalMenu: { category_lvl1: routeState.category?.split('--') },
                     query: routeState.q,
+                    page: Number(routeState.page),
+                    sortBy: routeState.sort,
+                    hitsPerPage: Number(routeState.hits)
                 },
             }
         },
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 5f6080447..1921ec192 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -20,7 +20,7 @@
             key: '_created_at_desc'
         }]"
         {{-- TODO: Extract this somewhere? --}}
-        :index="config.index_prefix + '_products_' + config.store"
+        :index="config.index_prefix + '_product_' + config.store"
         inline-template
         v-cloak
     >
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 1adf1bf78..908f02612 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -6,7 +6,7 @@
             v-cloak
             class="contents"
             :search-client="searchClient "
-            :index-name="config.index_prefix + '_products_' + config.store"
+            :index-name="config.index_prefix + '_product_' + config.store"
         >
             <div class="contents">
                 <!-- TODO: This is a Vue 3 thing -->
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index e499d4bc8..5e2abbc6f 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -1,7 +1,6 @@
 @extends('rapidez::layouts.app')
 
 @section('title', __('Search for').': '.request()->q)
-@section('description', __('Search for').': '.request()->q)
 @section('robots', 'NOINDEX,NOFOLLOW')
 
 @section('content')

From 73a7a30bf26199a8862930b065506736a17ad62a Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Tue, 8 Apr 2025 08:59:15 +0000
Subject: [PATCH 125/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 8f7f8e568..21974ad2a 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -257,16 +257,17 @@ export default {
                 q: data.query,
                 page: data.page > 0 ? String(data.page) : undefined,
                 sort: data.sortBy,
-                hits: data.hitsPerPage != config.grid_per_page ? data.hitsPerPage : undefined
+                hits: data.hitsPerPage != config.grid_per_page ? data.hitsPerPage : undefined,
             }
         },
 
         routeToState(routeState) {
             let ranges = Object.fromEntries(Object.entries(routeState).filter(([key]) => this.rangeAttributes.includes(key)))
 
-
             let refinementList = Object.fromEntries(
-                Object.entries(routeState).filter(([key]) => !['q', 'hits', 'sort', 'page', 'category'].includes(key) && !this.rangeAttributes.includes(key)),
+                Object.entries(routeState).filter(
+                    ([key]) => !['q', 'hits', 'sort', 'page', 'category'].includes(key) && !this.rangeAttributes.includes(key),
+                ),
             )
 
             return {
@@ -277,7 +278,7 @@ export default {
                     query: routeState.q,
                     page: Number(routeState.page),
                     sortBy: routeState.sort,
-                    hitsPerPage: Number(routeState.hits)
+                    hitsPerPage: Number(routeState.hits),
                 },
             }
         },

From 759ad4057c0a72e608ee2a004fd65b504d06c0a3 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Tue, 8 Apr 2025 11:03:39 +0200
Subject: [PATCH 126/244] Title fallback

---
 resources/js/components/Listing/Listing.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 8f7f8e568..6eb4a6aa0 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -244,6 +244,10 @@ export default {
         },
 
         windowTitle(routeState) {
+            if (!routeState.q) {
+                return window.config.translations.search.title
+            }
+
             return window.config.translations.search.title + ': ' + routeState.q
         },
 

From 8cf9e1173d5d673d40ec22d697029247cff0409c Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 8 Apr 2025 11:43:06 +0200
Subject: [PATCH 127/244] Remove filterScoreScript

---
 resources/js/components/Listing/Listing.vue | 15 ---------------
 resources/js/package.js                     | 12 ++++++++++++
 resources/views/category/overview.blade.php |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 6184fd6e7..c949e6946 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -58,9 +58,6 @@ export default {
         filterQueryString: {
             type: String,
         },
-        filterScoreScript: {
-            type: String,
-        },
     },
 
     data: () => ({
@@ -227,18 +224,6 @@ export default {
                 })
             }
 
-            if (this.filterScoreScript) {
-                extraFilters.push({
-                    function_score: {
-                        script_score: {
-                            script: {
-                                source: this.filterScoreScript,
-                            },
-                        },
-                    },
-                })
-            }
-
             return this.baseFilters().concat(extraFilters)
         },
 
diff --git a/resources/js/package.js b/resources/js/package.js
index 391f87583..9e1e0906d 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -139,6 +139,18 @@ function init() {
 
                     return `/storage/${store}/resizes/${size}/magento${url}`
                 },
+
+                categoryPositions(categoryId) {
+                    return {
+                        function_score: {
+                            script_score: {
+                                script: {
+                                    source: `Integer.parseInt(doc['positions.${categoryId}'].empty ? '0' : doc['positions.${categoryId}'].value)`
+                                }
+                            }
+                        }
+                    }
+                },
             },
             computed: {
                 // Wrap the local storage in getter and setter functions so you do not have to interact using .value
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index 8bf214df3..148e4121d 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -14,7 +14,7 @@
             <x-rapidez::listing
                 :root-path="$category->parentcategories->pluck('name')->join(' > ')"
                 filter-query-string="visibility:(2 OR 4) AND category_ids:{{ $category->entity_id }}"
-                filter-score-script="Integer.parseInt(doc['positions.{{ $category->entity_id }}'].empty ? '0' : doc['positions.{{ $category->entity_id }}'].value)"
+                v-bind:base-filters="() => [ categoryPositions({{ $category->entity_id }}) ]"
             />
         @else
             <div class="flex max-md:flex-col">

From fdee53452634117022a7a5c9fbbd313d62be2ede Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Tue, 8 Apr 2025 09:43:39 +0000
Subject: [PATCH 128/244] Apply fixes from Prettier

---
 resources/js/package.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/js/package.js b/resources/js/package.js
index 9e1e0906d..e8cf9c03e 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -145,10 +145,10 @@ function init() {
                         function_score: {
                             script_score: {
                                 script: {
-                                    source: `Integer.parseInt(doc['positions.${categoryId}'].empty ? '0' : doc['positions.${categoryId}'].value)`
-                                }
-                            }
-                        }
+                                    source: `Integer.parseInt(doc['positions.${categoryId}'].empty ? '0' : doc['positions.${categoryId}'].value)`,
+                                },
+                            },
+                        },
                     }
                 },
             },

From d6a992d9e97805b93b257d61f240bb0d4c212e7c Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Tue, 8 Apr 2025 14:43:35 +0200
Subject: [PATCH 129/244] Apply suggestions from code review

---
 resources/views/components/autocomplete/input.blade.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/resources/views/components/autocomplete/input.blade.php b/resources/views/components/autocomplete/input.blade.php
index 42d28b154..ed8082a36 100644
--- a/resources/views/components/autocomplete/input.blade.php
+++ b/resources/views/components/autocomplete/input.blade.php
@@ -1,6 +1,4 @@
-@props([
-    'id' => 'autocomplete'
-])
+@props(['id' => 'autocomplete'])
 
 <form name="{{ $id }}-form" id="{{ $id }}-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
     <x-rapidez::input

From 19c59ac1b29e378beb47ce254634c94fadfb9be4 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 8 Apr 2025 16:00:19 +0200
Subject: [PATCH 130/244] remove unnecessary whitespace

---
 resources/views/layouts/partials/header/autocomplete.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index d0c71c3d9..835314d89 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -5,7 +5,7 @@
             v-if="searchClient"
             v-cloak
             class="contents"
-            :search-client="searchClient "
+            :search-client="searchClient"
             :index-name="config.index_prefix + '_product_' + config.store"
         >
             <div class="contents">

From 66e59a22124e06d3a54f8e910ac9c7ec05532ebb Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 8 Apr 2025 16:06:18 +0200
Subject: [PATCH 131/244] Move filter_attributes to listing

---
 resources/js/components/Listing/Listing.vue           | 1 +
 resources/js/components/Search/InstantSearchMixin.vue | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 61028a6b1..ee5632a9c 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -175,6 +175,7 @@ export default {
 
             return {
                 ...config,
+                filter_attributes: window.config.searchkit.filter_attributes,
 
                 // TODO: For consistency maybe make it possible to do this:
                 // facet_attributes: config.searchkit.facet_attributes,
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index e727f9709..c17a8cbf3 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -44,7 +44,6 @@ export default {
                 highlight_attributes: config.searchkit.highlight_attributes,
                 search_attributes: config.searchkit.search_attributes,
                 result_attributes: config.searchkit.result_attributes,
-                filter_attributes: config.searchkit.filter_attributes,
             }
         },
     },

From 0ca355aae81b68f5fb56a10fe42c5159a80ee5c9 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 16 Apr 2025 15:57:42 +0200
Subject: [PATCH 132/244] Add prop for categoryId

---
 resources/js/components/Listing/Listing.vue | 10 ++++++++++
 resources/views/category/overview.blade.php |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index c949e6946..0d2eb9f48 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -51,6 +51,9 @@ export default {
         query: {
             type: Function,
         },
+        categoryId: {
+            type: Number,
+        },
         baseFilters: {
             type: Function,
             default: () => [],
@@ -215,6 +218,13 @@ export default {
         },
 
         getBaseFilters() {
+            if (this.categoryId) {
+                return this.baseFilters().concat([
+                    { query_string: { query: 'visibility:(2 OR 4) AND category_ids:' + this.categoryId } },
+                    this.$root.categoryPositions(this.categoryId),
+                ])
+            }
+
             let extraFilters = []
             if (this.filterQueryString) {
                 extraFilters.push({
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index 148e4121d..84da2e90e 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -13,8 +13,7 @@
         @if ($category->is_anchor)
             <x-rapidez::listing
                 :root-path="$category->parentcategories->pluck('name')->join(' > ')"
-                filter-query-string="visibility:(2 OR 4) AND category_ids:{{ $category->entity_id }}"
-                v-bind:base-filters="() => [ categoryPositions({{ $category->entity_id }}) ]"
+                v-bind:category-id="{{ $category->entity_id }}"
             />
         @else
             <div class="flex max-md:flex-col">

From 62cf3fdd23df08b6464c022b35267d8079cd0b6c Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 16 Apr 2025 16:09:07 +0200
Subject: [PATCH 133/244] Move index name to window.config

---
 resources/views/components/listing.blade.php           |  2 +-
 .../layouts/partials/header/autocomplete.blade.php     |  4 ++--
 .../partials/header/autocomplete/categories.blade.php  |  2 +-
 src/Http/ViewComposers/ConfigComposer.php              | 10 ++++++++++
 src/Models/Traits/Searchable.php                       |  1 -
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 2dfe6d9ea..3b297617c 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -11,7 +11,7 @@
 <div class="min-h-screen">
     <listing
         {{ $attributes }}
-        index="{{ (new (config('rapidez.models.product')))->searchableAs() }}"
+        v-bind:index="config.index.product"
         inline-template
         v-cloak
     >
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index dbef37719..eef2d1079 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -5,8 +5,8 @@
             v-if="searchClient"
             v-cloak
             class="contents"
-            :search-client="searchClient"
-            index-name="{{ (new (config('rapidez.models.product')))->searchableAs() }}"
+            v-bind:search-client="searchClient"
+            v-bind:index-name="config.index.product"
         >
             <div class="contents">
                 <!-- TODO: This is a Vue 3 thing -->
diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index 1fcf10391..96b335b06 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -1,4 +1,4 @@
-<ais-index index-name="{{ (new (config('rapidez.models.category')))->searchableAs() }}">
+<ais-index v-bind:index-name="config.index.category">
     <ais-hits v-slot="{ items }">
         <div class="border-b p-2" v-if="items && items.length">
             <x-rapidez::autocomplete.title>@lang('Categories')</x-rapidez::autocomplete.title>
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index d2cc657f0..6fc2545b4 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -10,6 +10,7 @@
 use Illuminate\View\View;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Category;
+use Rapidez\Core\Models\Traits\Searchable;
 
 // TODO: Can we improve anything in this file?
 // It doesn't feel very clean currently.
@@ -61,9 +62,18 @@ public function getConfig(): array
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
             'max_category_level'           => $this->getMaxCategoryLevel(),
             'filterable_attributes'        => $this->getFilterableAttributes(),
+            'index'                        => $this->getIndexNames(),
         ];
     }
 
+    public function getIndexNames(): array
+    {
+        return collect(config('rapidez.models'))
+            ->filter(fn ($class) => in_array(Searchable::class, class_uses_recursive($class)))
+            ->map(fn ($class) => (new $class)->searchableAs())
+            ->toArray();
+    }
+
     public function getCustomerAddressFields(): array
     {
         return [
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 71d67dcfd..70864ad12 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -47,7 +47,6 @@ public function getIndexName(): string
 
     public function searchableAs(): string
     {
-
         return implode('_', array_values([
             config('scout.prefix'),
             $this->getIndexName(),

From ec2e9686ec1d41d913523e0b724fc04547d4583b Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 16 Apr 2025 16:12:15 +0200
Subject: [PATCH 134/244] Remove loaded variable

---
 resources/js/components/Listing/Listing.vue      | 6 ------
 resources/js/components/Search/Autocomplete.vue  | 4 ----
 resources/views/components/listing.blade.php     | 2 +-
 resources/views/components/productlist.blade.php | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 360b0dad9..44fba2525 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -55,8 +55,6 @@ export default {
     },
 
     data: () => ({
-        loaded: false,
-
         searchkit: null,
         searchClient: null,
     }),
@@ -65,10 +63,6 @@ export default {
         return this.$scopedSlots.default(this)
     },
 
-    mounted() {
-        this.loaded = true
-    },
-
     computed: {
         categoryAttributes() {
             return Array.from({ length: config.max_category_level ?? 3 }).map((_, index) => 'category_lvl' + (index + 1))
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index f1256c690..141464263 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -12,9 +12,6 @@ export default {
         'ais-index': AisIndex,
         'ais-highlight': AisHighlight,
     },
-    data: () => ({
-        loaded: false,
-    }),
 
     render() {
         return this.$scopedSlots.default(this)
@@ -23,7 +20,6 @@ export default {
     mounted() {
         this.$nextTick(() => {
             requestAnimationFrame(() => this.$emit('mounted'))
-            this.loaded = true
         })
     },
 
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 3b297617c..0e87e2c51 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -17,7 +17,7 @@
     >
         <div>
             <ais-instant-search
-                v-if="loaded && searchClient"
+                v-if="searchClient"
                 :search-client="searchClient"
                 :index-name="index"
                 :routing="routing"
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 48678c2ba..d3e406e6c 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -20,7 +20,7 @@
             --}}
             <div>
                 <ais-instant-search
-                    v-if="loaded && searchClient"
+                    v-if="searchClient"
                     :search-client="searchClient"
                     :index-name="config.index"
                 >

From 4921933650fc330c66c3ec3c06a7982d9b44dcb5 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Thu, 17 Apr 2025 11:53:03 +0200
Subject: [PATCH 135/244] Display search suggestions if no results are
 available

---
 lang/nl.json                                  |  1 +
 .../components/Listing/SearchSuggestions.vue  | 89 +++++++++++++++++++
 resources/js/vue-components.js                |  1 +
 .../listing/partials/no-results.blade.php     | 25 +++++-
 resources/views/listing/products.blade.php    |  2 +-
 src/Http/Controllers/SearchController.php     |  7 +-
 src/Models/SearchQuery.php                    | 18 ++++
 7 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 resources/js/components/Listing/SearchSuggestions.vue

diff --git a/lang/nl.json b/lang/nl.json
index 4a4501f89..d7f18c0d4 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -86,6 +86,7 @@
     "Sorry! No image": "Sorry! Geen afbeelding",
     "Sorry! This product is currently out of stock.": "Sorry! Dit product is momenteel niet op voorraad.",
     "Sorry! We did not find any products.": "Sorry! We hebben geen producten gevonden.",
+    "But here are some suggestions!": "Maar hier zijn enkele suggesties!",
     "Specifications": "Specificaties",
     "Street": "Straat",
     "Subscribe": "Inschrijven",
diff --git a/resources/js/components/Listing/SearchSuggestions.vue b/resources/js/components/Listing/SearchSuggestions.vue
new file mode 100644
index 000000000..6b0543af5
--- /dev/null
+++ b/resources/js/components/Listing/SearchSuggestions.vue
@@ -0,0 +1,89 @@
+<script>
+import InstantSearchMixin from '../Search/InstantSearchMixin.vue'
+
+export default {
+    mixins: [InstantSearchMixin],
+
+    render() {
+        return this.$scopedSlots.default(this)
+    },
+
+    mounted() {
+        this.$nextTick(() => {
+            requestAnimationFrame(() => this.$emit('mounted'))
+        })
+    },
+
+    methods: {
+        async getInstantSearchClientConfig() {
+            const config = await InstantSearchMixin.methods.getInstantSearchClientConfig.bind(this).call()
+
+            config.getQuery = (query, search_attributes) => {
+                return [
+                    {
+                        function_score: {
+                            functions: [
+                                {
+                                    filter: { match: { query_text: query } },
+                                    weight: 18
+                                },
+                                {
+                                    filter: { term: { redirect: query } },
+                                    weight: 24
+                                },
+                                {
+                                    field_value_factor: {
+                                        field: "popularity",
+                                        factor: 1,
+                                        modifier: "log1p",
+                                        missing: 0
+                                    },
+                                    weight: 5
+                                },
+                                {
+                                    filter: { exists: { field: "redirect" } },
+                                    weight: 10
+                                },
+                                {
+                                    filter: { term: { display_in_terms: 1 } },
+                                    weight: 2
+                                },
+                                {
+                                    filter: { term: { is_processed: 1 } },
+                                    weight: 2
+                                }
+                            ]
+                        },
+                    },
+                ]
+            }
+
+            return config
+        },
+
+        async getSearchSettings() {
+            return {
+                highlight_attributes: ['query_text'],
+                search_attributes: [
+                    {
+                        field: 'query_text',
+                        weight: 2.0,
+                    },
+                    {
+                        field: 'redirect',
+                        weight: 8.0,
+                    },
+                ],
+                result_attributes: [
+                    'query_text',
+                    'redirect',
+                    'popularity',
+                    'num_results',
+                    'display_in_terms',
+                    'is_processed',
+                ],
+            }
+        },
+    },
+}
+</script>
diff --git a/resources/js/vue-components.js b/resources/js/vue-components.js
index 71dfabcd3..afb56a7fc 100644
--- a/resources/js/vue-components.js
+++ b/resources/js/vue-components.js
@@ -55,6 +55,7 @@ Vue.component('autocomplete', () => ({
 Vue.component('checkout-login', () => import('./components/Checkout/CheckoutLogin.vue'))
 Vue.component('login', () => import('./components/User/Login.vue'))
 Vue.component('listing', () => import('./components/Listing/Listing.vue'))
+Vue.component('search-suggestions', () => import('./components/Listing/SearchSuggestions.vue'))
 Vue.component('checkout-success', () => import('./components/Checkout/CheckoutSuccess.vue'))
 Vue.component('popup', () => import('./components/Popup.vue'))
 Vue.component('selected-filters-values', () => import('./components/Listing/Filters/SelectedFiltersValues.vue'))
diff --git a/resources/views/listing/partials/no-results.blade.php b/resources/views/listing/partials/no-results.blade.php
index f78a5b6a9..47a806b4c 100644
--- a/resources/views/listing/partials/no-results.blade.php
+++ b/resources/views/listing/partials/no-results.blade.php
@@ -1,2 +1,25 @@
 @lang('Sorry! We did not find any products.')
-{{-- TODO: Can we make this more useful? --}}
+{{-- TODO: We will want to make this look better --}}
+<search-suggestions v-slot="searchSuggestions">
+    <ais-instant-search
+        v-if="searchSuggestions.searchClient"
+        {{-- TODO: Use the new index names --}}
+        :index-name="config.index_prefix + '_search_query_' + config.store"
+        :search-client="searchSuggestions.searchClient"
+    >
+        <ais-search-box value="{{ request()->q ?? ' ' }}" />
+        <ais-configure :hits-per-page.camel="5"/>
+        <ais-hits v-slot="{ items }">
+            <div class="mt-1" v-if="items && items.length">
+                @lang('But here are some suggestions!')
+                <ul class="flex flex-row font-sans">
+                    <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
+                        <a v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))" class="relative flex items-center group w-full py-2 text-sm gap-x-4">
+                            <span v-text="item.query_text"></span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </ais-hits>
+    </ais-instant-search>
+</search-suggestions>
diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index f22eee2e4..62f8c8401 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -18,7 +18,7 @@
 
     <ais-hits>
         <template v-slot="{ items }">
-            <div v-if="items" class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 overflow-hidden">
+            <div v-if="items && items.length" class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 overflow-hidden">
                 <template v-for="(item, count) in items">
                     @include('rapidez::listing.partials.item')
                 </template>
diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php
index 5184a01b1..dbddcd4b5 100644
--- a/src/Http/Controllers/SearchController.php
+++ b/src/Http/Controllers/SearchController.php
@@ -4,12 +4,17 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
+use Rapidez\Core\Models\Scopes\IsActiveScope;
 
 class SearchController
 {
     public function __invoke(Request $request)
     {
-        $searchQuery = config('rapidez.models.search_query')::firstOrNew([
+        if (!$request->q) {
+            return view('rapidez::search.overview');
+        }
+
+        $searchQuery = config('rapidez.models.search_query')::withoutGlobalScope(IsActiveScope::class)->firstOrNew([
             'query_text' => Str::lower($request->q),
             'store_id'   => config('rapidez.store'),
         ], ['popularity' => 1]);
diff --git a/src/Models/SearchQuery.php b/src/Models/SearchQuery.php
index b43a43ecf..8a28f6785 100644
--- a/src/Models/SearchQuery.php
+++ b/src/Models/SearchQuery.php
@@ -2,8 +2,14 @@
 
 namespace Rapidez\Core\Models;
 
+use Rapidez\Core\Models\Traits\Searchable;
+use Illuminate\Database\Eloquent\Builder;
+use Rapidez\Core\Models\Scopes\IsActiveScope;
+
 class SearchQuery extends Model
 {
+    use Searchable;
+
     const CREATED_AT = null;
 
     protected $table = 'search_query';
@@ -11,4 +17,16 @@ class SearchQuery extends Model
     protected $primaryKey = 'query_id';
 
     protected $guarded = [];
+
+    protected static function booting()
+    {
+        static::addGlobalScope('ForCurrentStore', fn (Builder $query) => $query->where('store_id', config('rapidez.store')));
+        static::addGlobalScope(new IsActiveScope);
+    }
+
+    protected function makeAllSearchableUsing(Builder $query)
+    {
+        return $query
+            ->where('popularity', '>', 10);
+    }
 }

From 1930ec1c86beea7aa871260e32e171592b209c4f Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Thu, 17 Apr 2025 09:53:37 +0000
Subject: [PATCH 136/244] Apply fixes from Duster

---
 src/Http/Controllers/SearchController.php | 2 +-
 src/Models/SearchQuery.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php
index dbddcd4b5..e3dd0c33c 100644
--- a/src/Http/Controllers/SearchController.php
+++ b/src/Http/Controllers/SearchController.php
@@ -10,7 +10,7 @@ class SearchController
 {
     public function __invoke(Request $request)
     {
-        if (!$request->q) {
+        if (! $request->q) {
             return view('rapidez::search.overview');
         }
 
diff --git a/src/Models/SearchQuery.php b/src/Models/SearchQuery.php
index 8a28f6785..6351f3728 100644
--- a/src/Models/SearchQuery.php
+++ b/src/Models/SearchQuery.php
@@ -2,9 +2,9 @@
 
 namespace Rapidez\Core\Models;
 
-use Rapidez\Core\Models\Traits\Searchable;
 use Illuminate\Database\Eloquent\Builder;
 use Rapidez\Core\Models\Scopes\IsActiveScope;
+use Rapidez\Core\Models\Traits\Searchable;
 
 class SearchQuery extends Model
 {

From 944ee45173f1451b2896b1815eb116f3b266d133 Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Thu, 17 Apr 2025 09:54:05 +0000
Subject: [PATCH 137/244] Apply fixes from Prettier

---
 .../components/Listing/SearchSuggestions.vue  | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/resources/js/components/Listing/SearchSuggestions.vue b/resources/js/components/Listing/SearchSuggestions.vue
index 6b0543af5..52c97931a 100644
--- a/resources/js/components/Listing/SearchSuggestions.vue
+++ b/resources/js/components/Listing/SearchSuggestions.vue
@@ -25,34 +25,34 @@ export default {
                             functions: [
                                 {
                                     filter: { match: { query_text: query } },
-                                    weight: 18
+                                    weight: 18,
                                 },
                                 {
                                     filter: { term: { redirect: query } },
-                                    weight: 24
+                                    weight: 24,
                                 },
                                 {
                                     field_value_factor: {
-                                        field: "popularity",
+                                        field: 'popularity',
                                         factor: 1,
-                                        modifier: "log1p",
-                                        missing: 0
+                                        modifier: 'log1p',
+                                        missing: 0,
                                     },
-                                    weight: 5
+                                    weight: 5,
                                 },
                                 {
-                                    filter: { exists: { field: "redirect" } },
-                                    weight: 10
+                                    filter: { exists: { field: 'redirect' } },
+                                    weight: 10,
                                 },
                                 {
                                     filter: { term: { display_in_terms: 1 } },
-                                    weight: 2
+                                    weight: 2,
                                 },
                                 {
                                     filter: { term: { is_processed: 1 } },
-                                    weight: 2
-                                }
-                            ]
+                                    weight: 2,
+                                },
+                            ],
                         },
                     },
                 ]
@@ -74,14 +74,7 @@ export default {
                         weight: 8.0,
                     },
                 ],
-                result_attributes: [
-                    'query_text',
-                    'redirect',
-                    'popularity',
-                    'num_results',
-                    'display_in_terms',
-                    'is_processed',
-                ],
+                result_attributes: ['query_text', 'redirect', 'popularity', 'num_results', 'display_in_terms', 'is_processed'],
             }
         },
     },

From 2f5bc36ec8771588cadb0c9118ca05cabc16d383 Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Thu, 17 Apr 2025 12:06:09 +0200
Subject: [PATCH 138/244] Reduce weight on redirect url existence

---
 resources/js/components/Listing/SearchSuggestions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/Listing/SearchSuggestions.vue b/resources/js/components/Listing/SearchSuggestions.vue
index 52c97931a..5fda00957 100644
--- a/resources/js/components/Listing/SearchSuggestions.vue
+++ b/resources/js/components/Listing/SearchSuggestions.vue
@@ -42,7 +42,7 @@ export default {
                                 },
                                 {
                                     filter: { exists: { field: 'redirect' } },
-                                    weight: 10,
+                                    weight: 4,
                                 },
                                 {
                                     filter: { term: { display_in_terms: 1 } },

From 016e571d1a4e00c8df8235646d514a6c73fdfe0e Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 18 Apr 2025 09:13:51 +0200
Subject: [PATCH 139/244] Fixes

---
 .../Filters/CategoryFilterCategory.vue        |  1 +
 .../Listing/Filters/SelectedFiltersValues.vue |  1 +
 .../views/components/productlist.blade.php    |  1 +
 .../partials/header/autocomplete.blade.php    |  9 ++--
 .../header/autocomplete/categories.blade.php  |  5 ++-
 .../header/autocomplete/no-results.blade.php  |  4 +-
 .../header/autocomplete/products.blade.php    |  8 +++-
 resources/views/listing/filters.blade.php     | 20 ++++-----
 .../listing/partials/filter/boolean.blade.php | 14 +++++--
 .../partials/filter/category.blade.php        | 42 ++++++++++---------
 .../listing/partials/filter/search.blade.php  |  1 +
 11 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/resources/js/components/Listing/Filters/CategoryFilterCategory.vue b/resources/js/components/Listing/Filters/CategoryFilterCategory.vue
index e772015f0..e807449ea 100644
--- a/resources/js/components/Listing/Filters/CategoryFilterCategory.vue
+++ b/resources/js/components/Listing/Filters/CategoryFilterCategory.vue
@@ -1,3 +1,4 @@
+<!-- TODO: This one can be removed as it's not used anymore right? -->
 <template>
     <li :class="classes.li">
         <label :class="[classes.label, value === category.id ? classes.active : '']">
diff --git a/resources/js/components/Listing/Filters/SelectedFiltersValues.vue b/resources/js/components/Listing/Filters/SelectedFiltersValues.vue
index 5c683151e..6ede51919 100644
--- a/resources/js/components/Listing/Filters/SelectedFiltersValues.vue
+++ b/resources/js/components/Listing/Filters/SelectedFiltersValues.vue
@@ -1,3 +1,4 @@
+<!-- TODO: Is this one still in use and up-to-date? -->
 <script>
 import { swatches } from '../../../stores/useSwatches'
 
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 175aa0d2d..22ca34f23 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -13,6 +13,7 @@
                     :search-client="searchClient"
                     :index-name="config.index"
                 >
+                    {{-- TODO: Is it possible to make this more readable? --}}
                     <ais-configure :filters="'{{ $field }}:({{ is_array($value)
                         ? implode(' OR ', $value)
                         : "'+".$value.".join(' OR ')+'"
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 835314d89..056c71cbb 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,16 +1,15 @@
-
 <autocomplete inline-template v-on:mounted="() => window.document.getElementById('autocomplete-input').focus()">
     <div class="relative w-full">
         <ais-instant-search
             v-if="searchClient"
-            v-cloak
-            class="contents"
             :search-client="searchClient"
+            {{-- TODO: The index name should come from the model --}}
             :index-name="config.index_prefix + '_product_' + config.store"
+            class="contents"
+            v-cloak
         >
             <div class="contents">
-                <!-- TODO: This is a Vue 3 thing -->
-                <ais-configure :hits-per-page.camel="3"/>
+                <ais-configure :hitsPerPage="3" />
                 <div class="searchbox">
                     <ais-search-box>
                         <template v-slot="{ currentRefinement, isSearchStalled, refine }">
diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index fbecb12f3..e4c2b2717 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -1,7 +1,10 @@
+{{-- TODO: The index name should come from the model --}}
 <ais-index :index-name="config.index_prefix + '_categories_' + config.store">
     <ais-hits v-slot="{ items }">
         <div class="border-b p-2" v-if="items && items.length">
-            <x-rapidez::autocomplete.title>@lang('Categories')</x-rapidez::autocomplete.title>
+            <x-rapidez::autocomplete.title>
+                @lang('Categories')
+            </x-rapidez::autocomplete.title>
             <ul class="flex flex-col font-sans">
                 <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
                     <a v-bind:href="item.url" class="relative flex items-center group w-full py-2 text-sm gap-x-4">
diff --git a/resources/views/layouts/partials/header/autocomplete/no-results.blade.php b/resources/views/layouts/partials/header/autocomplete/no-results.blade.php
index 5d846e9c9..53ffb105c 100644
--- a/resources/views/layouts/partials/header/autocomplete/no-results.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/no-results.blade.php
@@ -1,5 +1,7 @@
 <div class="font-bold text text-lg break-all">
-    @lang('No results found for :searchterm', ['searchterm' => '<span class="text-primary">"@{{ value }}"</span>'])
+    @lang('No results found for :searchterm', [
+        'searchterm' => '<span class="text-primary">"@{{ value }}"</span>'
+    ])
 </div>
 <div class="flex flex-col text-sm pt-7">
     <span class="font-bold">@lang('Have you tried:')</span>
diff --git a/resources/views/layouts/partials/header/autocomplete/products.blade.php b/resources/views/layouts/partials/header/autocomplete/products.blade.php
index a758d7f08..dd136c146 100644
--- a/resources/views/layouts/partials/header/autocomplete/products.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/products.blade.php
@@ -1,14 +1,18 @@
 <ais-hits>
     <template v-slot="{ items }">
         <div v-if="items && items.length" class="p-2">
-            <x-rapidez::autocomplete.title>@lang('Products')</x-rapidez::autocomplete.title>
+            <x-rapidez::autocomplete.title>
+                @lang('Products')
+            </x-rapidez::autocomplete.title>
             <ul v-for="(item, count) in items" class="gap-2 flex flex-col">
                 <li>
                     <a :href="item.url | url" class="group relative flex flex-wrap py-2">
                         <img
                             v-if="item.thumbnail"
                             :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + item.thumbnail + '.webp'"
-                            class="shrink-0 self-center object-contain size-16 mix-blend-multiply" :alt="item.name" :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
+                            class="shrink-0 self-center object-contain size-16 mix-blend-multiply"
+                            :alt="item.name"
+                            :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
                             width="200"
                             height="200"
                         />
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index f987a7456..6f6cc9ea8 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -1,16 +1,14 @@
 @php($id = uniqid('filters-'))
 @pushOnce('head', 'listing-filters')
-    @vite(
-        vite_filename_paths([
-            'ClearRefinements.vue',
-            'CurrentRefinements.vue',
-            'SearchBox.vue',
-            'RangeInput.vue',
-            'RangeSlider.vue',
-            'RefinementList.vue',
-            'HierarchicalMenu.vue',
-        ])
-    )
+    @vite(vite_filename_paths([
+        'ClearRefinements.vue',
+        'CurrentRefinements.vue',
+        'SearchBox.vue',
+        'RangeInput.vue',
+        'RangeSlider.vue',
+        'RefinementList.vue',
+        'HierarchicalMenu.vue',
+    ]))
 @endPushOnce
 <x-rapidez::slideover.mobile :$id :title="__('Filters')">
     <div class="w-full p-2 max-lg:bg-white max-lg:p-5">
diff --git a/resources/views/listing/partials/filter/boolean.blade.php b/resources/views/listing/partials/filter/boolean.blade.php
index 9dbb6d343..3fa84a7fc 100644
--- a/resources/views/listing/partials/filter/boolean.blade.php
+++ b/resources/views/listing/partials/filter/boolean.blade.php
@@ -4,7 +4,7 @@
     operator="and"
 >
     <template v-slot="{ items, refine }">
-        <div v-if="items.length" class="relative pb-4">
+        <div v-show="items.length" class="relative pb-4">
             <x-rapidez::filter.heading>
                 <ul class="flex flex-col gap-1">
                     <li
@@ -20,9 +20,15 @@ class="flex justify-between text-base text-muted"
                                     class="font-sans font-medium items-center text-sm flex"
                                     :class="item.isRefined ? 'text' : 'text-muted'"
                                 >
-                                    <template v-if="item.value == '1'">@lang('Yes')</template>
-                                    <template v-if="item.value == '0'">@lang('No')</template>
-                                    <span class="block ml-0.5 text-xs">(@{{ item.count }})</span>
+                                    <template v-if="item.value == '1'">
+                                        @lang('Yes')
+                                    </template>
+                                    <template v-if="item.value == '0'">
+                                        @lang('No')
+                                    </template>
+                                    <span class="block ml-0.5 text-xs">
+                                        (@{{ item.count }})
+                                    </span>
                                 </span>
                             </x-rapidez::input.checkbox>
                         </div>
diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 6018f5a7a..0f329899f 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -4,26 +4,28 @@
     show-more
 >
     <template v-slot="{ items, refine, createURL }">
-        <x-rapidez::filter.heading>
-            <x-slot:title>
-                @lang('Category')
-            </x-slot:title>
-            <recursion :data="items" v-slot="{ data, components }">
-                <ul>
-                    <li class="pl-3" v-for="(item, index) in data" :key="item.value">
-                        <a
-                            :href="createURL(item.value)"
-                            :class="{ 'font-bold': item.isRefined }"
-                            v-on:click.exact.left.prevent="refine(item.value)"
-                        >
-                            @{{ item.label }}
-                            (@{{ item.count }})
-                        </a>
+        <div v-show="items.length">
+            <x-rapidez::filter.heading>
+                <x-slot:title>
+                    @lang('Category')
+                </x-slot:title>
+                <recursion :data="items" v-slot="{ data, components }">
+                    <ul>
+                        <li class="pl-3" v-for="(item, index) in data" :key="item.value">
+                            <a
+                                :href="createURL(item.value)"
+                                :class="{ 'font-bold': item.isRefined }"
+                                v-on:click.exact.left.prevent="refine(item.value)"
+                            >
+                                @{{ item.label }}
+                                (@{{ item.count }})
+                            </a>
 
-                        <component :is="components[index]" />
-                    </li>
-                </ul>
-            </recursion>
-        </x-rapidez::filter.heading>
+                            <component :is="components[index]" />
+                        </li>
+                    </ul>
+                </recursion>
+            </x-rapidez::filter.heading>
+        </div>
     </template>
 </ais-hierarchical-menu>
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index cb8d8b7fb..e3a23b964 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -9,6 +9,7 @@
         />
         {{--
         TODO: Maybe use this for a loading icon with the input?
+        But it's super duper fast, does it make sense?
         <span :hidden="!isSearchStalled">Loading...</span>
         --}}
     </template>

From 5ced80daddbab7394f3d303eadcc928d8fdb547c Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 18 Apr 2025 10:10:16 +0200
Subject: [PATCH 140/244] Add cache key as url param to avoid caching when not
 needed

---
 resources/views/layouts/app.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index b4e09cbfa..7330587ff 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,7 +21,7 @@
     <link rel="canonical" href="@yield('canonical', url()->current())" />
     <link href="{{ route('config') }}" rel="preload" as="script">
 
-    <script defer src="{{ route('config') }}"></script>
+    <script defer src="{{ route('config') }}?v={{ Cache::get($cacheKey) }}"></script>
     @vite(['resources/css/app.css', 'resources/js/app.js'])
     @stack('head')
     @config('design/head/includes')

From 738b10a4156b63ffcb7bd4949072655aafa22d3e Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 18 Apr 2025 10:12:35 +0200
Subject: [PATCH 141/244] Use cachekey string

---
 resources/views/layouts/app.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 7330587ff..5242c91cc 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,7 +21,7 @@
     <link rel="canonical" href="@yield('canonical', url()->current())" />
     <link href="{{ route('config') }}" rel="preload" as="script">
 
-    <script defer src="{{ route('config') }}?v={{ Cache::get($cacheKey) }}"></script>
+    <script defer src="{{ route('config') }}?v={{ Cache::get('cachekey') }}"></script>
     @vite(['resources/css/app.css', 'resources/js/app.js'])
     @stack('head')
     @config('design/head/includes')

From 01dc51d3ac5cdc1a0b3a3fbe950c74cadbad0a91 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 18 Apr 2025 10:14:11 +0200
Subject: [PATCH 142/244] Generate cache key when it doesn't exist

---
 resources/views/layouts/app.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 5242c91cc..4ff949185 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,7 +21,7 @@
     <link rel="canonical" href="@yield('canonical', url()->current())" />
     <link href="{{ route('config') }}" rel="preload" as="script">
 
-    <script defer src="{{ route('config') }}?v={{ Cache::get('cachekey') }}"></script>
+    <script defer src="{{ route('config') }}?v={{ Cache::rememberForever('cachekey', fn () => md5(Str::random())) }}"></script>
     @vite(['resources/css/app.css', 'resources/js/app.js'])
     @stack('head')
     @config('design/head/includes')

From 7e5437d0e17fb4547dc5e27c58e1d687c297c6ba Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 18 Apr 2025 10:38:40 +0200
Subject: [PATCH 143/244] Cleanup

---
 .../Listing/Filters/CategoryFilter.vue        | 155 ------------------
 .../Filters/CategoryFilterCategory.vue        |  46 ------
 .../Listing/Filters/SelectedFiltersValues.vue |  57 -------
 resources/js/components/Listing/Listing.vue   |   3 -
 resources/js/vue-components.js                |   1 -
 .../views/components/productlist.blade.php    |   5 -
 .../listing/partials/filter/search.blade.php  |   1 -
 .../partials/filter/selected/swatch.blade.php |   2 -
 8 files changed, 270 deletions(-)
 delete mode 100644 resources/js/components/Listing/Filters/CategoryFilter.vue
 delete mode 100644 resources/js/components/Listing/Filters/CategoryFilterCategory.vue
 delete mode 100644 resources/js/components/Listing/Filters/SelectedFiltersValues.vue

diff --git a/resources/js/components/Listing/Filters/CategoryFilter.vue b/resources/js/components/Listing/Filters/CategoryFilter.vue
deleted file mode 100644
index 4561a17f5..000000000
--- a/resources/js/components/Listing/Filters/CategoryFilter.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<script>
-import { useWebWorkerFn } from '@vueuse/core'
-import categoryFilterCategory from './CategoryFilterCategory.vue'
-Vue.component('category-filter-category', categoryFilterCategory)
-
-export default {
-    props: {
-        aggregations: Object,
-        setQuery: Function,
-        value: String,
-    },
-
-    render() {
-        return this.$scopedSlots.default(this)
-    },
-
-    data: () => ({
-        results: [],
-    }),
-
-    created() {
-        this.processValue(this.value)
-    },
-
-    watch: {
-        value: function (value) {
-            this.processValue(value)
-        },
-        hasResults: async function (value) {
-            if (!value) {
-                return
-            }
-
-            this.createCategoryPaths()
-        },
-    },
-
-    methods: {
-        processValue(value) {
-            if (!value) {
-                this.setQuery({})
-                return
-            }
-
-            this.setQuery({
-                query: { match_phrase: { category_paths: value } },
-                value: value,
-            })
-        },
-
-        async createCategoryPaths() {
-            if (!this.aggregations?.category_paths?.buckets?.length || !this.aggregations?.categories?.buckets?.length) {
-                this.results = []
-                return
-            }
-
-            // Calculating and unpacking the category structure is a heavy task.
-            // Hand this down to a webworker thread to free the main thread.
-            const { workerFn: getCategoryStructureWorker } = useWebWorkerFn((categories, allCategoryPaths, currentCategory) => {
-                function getCategoryStructure(categories, allCategoryPaths, currentCategory) {
-                    const lowestCategories = categories
-                        .map((bucket) => {
-                            const key = bucket.key.split(' /// ').pop()
-                            const [id, label] = key.split('::')
-
-                            return {
-                                id: id,
-                                key: bucket.key,
-                                structure: bucket.key.split(' /// '),
-                                label: label,
-                                doc_count: bucket.doc_count,
-                            }
-                        })
-                        .filter((bucket) =>
-                            getCategoryPaths(allCategoryPaths, currentCategory).find((path) => path.key.includes(bucket.id)),
-                        )
-
-                    return buildCategoryStructure(lowestCategories).children
-                }
-
-                function getCategoryPaths(allCategoryPaths, currentCategory) {
-                    if (!currentCategory?.entity_id || !allCategoryPaths) {
-                        return allCategoryPaths
-                    }
-
-                    // Get children of current category.
-                    let categoryPaths = allCategoryPaths.filter(
-                        (bucket) =>
-                            bucket.key.includes(String(currentCategory.entity_id)) &&
-                            bucket.key.at(-1) !== String(currentCategory.entity_id),
-                    )
-
-                    if (categoryPaths.length > 1) {
-                        return categoryPaths
-                    }
-
-                    // No child categories, get siblings instead.
-                    let parentCategoryId = categoryPaths[0].key.at(-2)
-                    return allCategoryPaths.filter(
-                        (bucket) => bucket.key.includes(parentCategoryId) && bucket.key.at(-1) !== parentCategoryId,
-                    )
-                }
-
-                function buildCategoryStructure(categories, results = { children: {} }) {
-                    categories.map((category) => {
-                        if (!category.structure.length) {
-                            return
-                        }
-
-                        const key = category.structure.shift()
-                        const [id, label] = key.split('::')
-
-                        if (!results.children) {
-                            results.children = {}
-                        }
-
-                        if (!results?.children?.hasOwnProperty(id)) {
-                            results.children[id] = {
-                                id: id,
-                                key: key,
-                                label: label,
-                                structure: category.structure,
-                                doc_count: category.doc_count,
-                                children: {},
-                            }
-                        }
-
-                        results.children[id] = buildCategoryStructure([category], results.children[id])
-                    })
-
-                    return results
-                }
-
-                return getCategoryStructure(categories, allCategoryPaths, currentCategory)
-            })
-
-            this.results = await getCategoryStructureWorker(
-                this.aggregations.categories.buckets,
-                this.aggregations.category_paths.buckets,
-                this.currentCategory,
-            )
-        },
-    },
-
-    computed: {
-        hasResults: function () {
-            return this.aggregations?.categories?.buckets?.length
-        },
-
-        currentCategory: function () {
-            return config.category
-        },
-    },
-}
-</script>
diff --git a/resources/js/components/Listing/Filters/CategoryFilterCategory.vue b/resources/js/components/Listing/Filters/CategoryFilterCategory.vue
deleted file mode 100644
index e807449ea..000000000
--- a/resources/js/components/Listing/Filters/CategoryFilterCategory.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- TODO: This one can be removed as it's not used anymore right? -->
-<template>
-    <li :class="classes.li">
-        <label :class="[classes.label, value === category.id ? classes.active : '']">
-            <input
-                type="radio"
-                name="category"
-                :checked="value === category.id"
-                :value="category.id"
-                v-on:change="setQuery({ value: category.id })"
-                class="hidden"
-            />
-            <span :class="classes.span">{{ category.label }}</span>
-            <small :class="classes.small" v-if="category.doc_count">({{ category.doc_count }})</small>
-        </label>
-
-        <ul :class="classes.ul" v-if="category.children">
-            <template v-for="child in category.children">
-                <category-filter-category :category="child" :key="child.key" :value="value" :set-query="setQuery" :classes="classes" />
-            </template>
-        </ul>
-    </li>
-</template>
-
-<script>
-export default {
-    props: {
-        category: Object,
-        value: String,
-        setQuery: Function,
-        classes: {
-            type: Object,
-            default: function () {
-                return {
-                    li: '',
-                    ul: 'pl-3',
-                    label: 'block cursor-pointer',
-                    active: 'font-semibold',
-                    span: '',
-                    small: '',
-                }
-            },
-        },
-    },
-}
-</script>
diff --git a/resources/js/components/Listing/Filters/SelectedFiltersValues.vue b/resources/js/components/Listing/Filters/SelectedFiltersValues.vue
deleted file mode 100644
index 6ede51919..000000000
--- a/resources/js/components/Listing/Filters/SelectedFiltersValues.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- TODO: Is this one still in use and up-to-date? -->
-<script>
-import { swatches } from '../../../stores/useSwatches'
-
-export default {
-    props: {
-        selectedValues: {
-            type: Object,
-            default: () => {},
-        },
-    },
-
-    render() {
-        return this.$scopedSlots.default(this)
-    },
-
-    computed: {
-        activeFilters() {
-            return Object.keys(this.selectedValues)
-                .filter((filterKey) => {
-                    let { showFilter, value } = this.selectedValues[filterKey]
-                    return showFilter && (Array.isArray(value) ? value.length : !!value)
-                })
-                .reduce((result, filterKey) => {
-                    let { value } = this.selectedValues[filterKey]
-
-                    if (filterKey === 'category') {
-                        return result.concat({ code: filterKey, value: config.subcategories[value] })
-                    }
-
-                    if (filterKey === 'price') {
-                        let [minPrice, maxPrice] = value
-                        return result.concat({ code: filterKey, value: price(minPrice) + ' - ' + price(maxPrice) })
-                    }
-
-                    if (Array.isArray(value)) {
-                        // Check if the value is a swatch value, boolean or just an array
-                        let items = Object.keys(swatches.value).includes(filterKey)
-                            ? value.map((selected) => swatches.value[filterKey].options[selected].label)
-                            : value.map((item) =>
-                                  item === '0'
-                                      ? window.config.translations.filters.no
-                                      : item === '1'
-                                        ? window.config.translations.filters.yes
-                                        : item,
-                              )
-
-                        // We can have a filter where multiple values may be selected, so we need to map and concat all of them
-                        return result.concat(items.map((item) => ({ code: filterKey, value: item })))
-                    }
-
-                    return result
-                }, [])
-        },
-    },
-}
-</script>
diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 2bd653cda..426ee1293 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -1,9 +1,6 @@
 <script>
 import { history } from 'instantsearch.js/es/lib/routers'
-
-import categoryFilter from './Filters/CategoryFilter.vue'
 import useAttributes from '../../stores/useAttributes.js'
-
 import InstantSearchMixin from '../Search/InstantSearchMixin.vue'
 
 export default {
diff --git a/resources/js/vue-components.js b/resources/js/vue-components.js
index 71dfabcd3..33905a8ed 100644
--- a/resources/js/vue-components.js
+++ b/resources/js/vue-components.js
@@ -57,5 +57,4 @@ Vue.component('login', () => import('./components/User/Login.vue'))
 Vue.component('listing', () => import('./components/Listing/Listing.vue'))
 Vue.component('checkout-success', () => import('./components/Checkout/CheckoutSuccess.vue'))
 Vue.component('popup', () => import('./components/Popup.vue'))
-Vue.component('selected-filters-values', () => import('./components/Listing/Filters/SelectedFiltersValues.vue'))
 Vue.component('range-slider', () => import('./components/Elements/RangeSlider.vue'))
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 22ca34f23..e319a4314 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -3,17 +3,12 @@
 @if ($value)
     <lazy v-slot="{ intersected }">
         <listing v-if="intersected" v-cloak inline-template>
-            {{--
-            TODO: Maybe better to have a wrapper
-            component again like reactive-base?
-            --}}
             <div>
                 <ais-instant-search
                     v-if="loaded && searchClient"
                     :search-client="searchClient"
                     :index-name="config.index"
                 >
-                    {{-- TODO: Is it possible to make this more readable? --}}
                     <ais-configure :filters="'{{ $field }}:({{ is_array($value)
                         ? implode(' OR ', $value)
                         : "'+".$value.".join(' OR ')+'"
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index e3a23b964..75c119bf0 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -1,4 +1,3 @@
-{{-- TODO: Can/should we hide this filter when there are no results? --}}
 <ais-search-box>
     <template v-slot="{ currentRefinement, isSearchStalled, refine }">
         <x-rapidez::input
diff --git a/resources/views/listing/partials/filter/selected/swatch.blade.php b/resources/views/listing/partials/filter/selected/swatch.blade.php
index a7cbc96bc..7d83b96ae 100644
--- a/resources/views/listing/partials/filter/selected/swatch.blade.php
+++ b/resources/views/listing/partials/filter/selected/swatch.blade.php
@@ -1,5 +1,3 @@
-{{-- TODO: Display swatches correctly here --}}
-
 <template v-else-if="item.filter.super">
     @{{ refinement.swatch?.label ?? refinement.label }}
 </template>

From d0f08222ac3acca5e6960809ee10f6f91a6ad854 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 18 Apr 2025 12:00:00 +0200
Subject: [PATCH 144/244] Add store code to config route params

---
 resources/views/layouts/app.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 4ff949185..1e3e3c576 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,7 +21,7 @@
     <link rel="canonical" href="@yield('canonical', url()->current())" />
     <link href="{{ route('config') }}" rel="preload" as="script">
 
-    <script defer src="{{ route('config') }}?v={{ Cache::rememberForever('cachekey', fn () => md5(Str::random())) }}"></script>
+    <script defer src="{{ route('config') }}?v={{ Cache::rememberForever('cachekey', fn () => md5(Str::random())) }}&s={{ config('rapidez.store') }}"></script>
     @vite(['resources/css/app.css', 'resources/js/app.js'])
     @stack('head')
     @config('design/head/includes')

From 0ac267d40a64f870a09188525930adfbae7d31d9 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 18 Apr 2025 12:01:00 +0200
Subject: [PATCH 145/244] Move swatches to config as well

---
 resources/js/components/Listing/Listing.vue   |  2 +-
 resources/js/components/Product/AddToCart.vue |  4 +-
 resources/js/package.js                       | 10 -----
 resources/js/stores/useSwatches.js            | 43 -------------------
 routes/api.php                                |  6 ---
 src/Http/ViewComposers/ConfigComposer.php     |  8 ++++
 6 files changed, 11 insertions(+), 62 deletions(-)
 delete mode 100644 resources/js/stores/useSwatches.js

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index eacfcc262..a8f4a38b0 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -166,7 +166,7 @@ export default {
 
         withSwatches(items, filter) {
             return items.map((item) => ({
-                swatch: this.$root.swatches[filter?.base_code]?.options?.[item.value] ?? null,
+                swatch: window.config.swatches[filter?.base_code]?.options?.[item.value] ?? null,
                 ...item,
             }))
         },
diff --git a/resources/js/components/Product/AddToCart.vue b/resources/js/components/Product/AddToCart.vue
index 445f32444..affef9441 100644
--- a/resources/js/components/Product/AddToCart.vue
+++ b/resources/js/components/Product/AddToCart.vue
@@ -166,8 +166,8 @@ export default {
         },
 
         getOptions: function (superAttributeCode) {
-            if (this.$root.swatches.hasOwnProperty(superAttributeCode)) {
-                let swatchOptions = this.$root.swatches[superAttributeCode].options
+            if (window.config.swatches.hasOwnProperty(superAttributeCode)) {
+                let swatchOptions = window.config.swatches[superAttributeCode].options
                 let values = {}
 
                 Object.entries(this.product['super_' + superAttributeCode]).forEach(([key, val]) => {
diff --git a/resources/js/package.js b/resources/js/package.js
index b53cb4eef..da446bf6a 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -12,7 +12,6 @@ import useOrder from './stores/useOrder.js'
 import useCart from './stores/useCart'
 import useUser from './stores/useUser'
 import useMask from './stores/useMask'
-import { swatches, clear as clearSwatches } from './stores/useSwatches'
 import './vue'
 import './fetch'
 import './filters'
@@ -42,14 +41,6 @@ if (import.meta.env.VITE_DEBUG === 'true') {
     })
 }
 
-document.addEventListener('vue:loaded', () => {
-    const lastStoreCode = useLocalStorage('last_store_code', window.config.store_code)
-    if (lastStoreCode.value !== window.config.store_code) {
-        clearSwatches()
-        lastStoreCode.value = window.config.store_code
-    }
-})
-
 let booting = false
 function init() {
     if (booting || document.body.contains(window.app.$el)) {
@@ -106,7 +97,6 @@ function init() {
                 user: useUser(),
                 mask: useMask(),
                 showTax: window.config.show_tax,
-                swatches: swatches,
                 scrollLock: useScrollLock(document.body),
             },
             methods: {
diff --git a/resources/js/stores/useSwatches.js b/resources/js/stores/useSwatches.js
deleted file mode 100644
index c52372ff1..000000000
--- a/resources/js/stores/useSwatches.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// TODO: Should we move the swatches to the `config` data?
-import { computedAsync, useLocalStorage } from '@vueuse/core'
-
-export const swatchesStorage = useLocalStorage('swatches', {})
-let isRefreshing = false
-let hasFetched = false
-
-export const refresh = async function () {
-    if (isRefreshing) {
-        console.debug('Refresh canceled, request already in progress...')
-        return
-    }
-
-    try {
-        isRefreshing = true
-        swatchesStorage.value = (await window.rapidezAPI('get', 'swatches')) || {}
-        isRefreshing = false
-        hasFetched = true
-    } catch (error) {
-        isRefreshing = false
-        console.error(error)
-        Notify(window.config.translations.errors.wrong, 'error')
-    }
-}
-
-export const clear = async function () {
-    swatchesStorage.value = {}
-    hasFetched = false
-}
-
-export const swatches = computedAsync(
-    async () => {
-        if (!hasFetched && Object.keys(swatchesStorage.value).length === 0) {
-            await refresh()
-        }
-
-        return swatchesStorage
-    },
-    swatchesStorage.value,
-    { lazy: true, shallow: false },
-)
-
-export default () => swatches
diff --git a/routes/api.php b/routes/api.php
index ff7c5ecbc..dc5bf6495 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -7,12 +7,6 @@
 use Rapidez\Core\Http\Middleware\VerifyAdminToken;
 
 Route::middleware('api')->prefix('api')->group(function () {
-    Route::get('swatches', function () {
-        $optionswatchModel = config('rapidez.models.option_swatch');
-
-        return $optionswatchModel::getCachedSwatchValues();
-    });
-
     Route::get('order', OrderController::class);
 
     Route::post('get-checkout-url', GetSignedCheckoutController::class);
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 6fc2545b4..c8257f98b 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -63,9 +63,17 @@ public function getConfig(): array
             'max_category_level'           => $this->getMaxCategoryLevel(),
             'filterable_attributes'        => $this->getFilterableAttributes(),
             'index'                        => $this->getIndexNames(),
+            'swatches'                     => $this->getSwatches(),
         ];
     }
 
+    public function getSwatches(): array
+    {
+        $optionswatchModel = config('rapidez.models.option_swatch');
+
+        return $optionswatchModel::getCachedSwatchValues();
+    }
+
     public function getIndexNames(): array
     {
         return collect(config('rapidez.models'))

From 8ce4309eb83230b59889f38e76ae2d6e7f749e72 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 18 Apr 2025 12:04:59 +0200
Subject: [PATCH 146/244] No results fix

---
 resources/views/listing/products.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index f22eee2e4..6ab5ef48e 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -18,7 +18,7 @@
 
     <ais-hits>
         <template v-slot="{ items }">
-            <div v-if="items" class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 overflow-hidden">
+            <div v-if="items.length" class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 overflow-hidden">
                 <template v-for="(item, count) in items">
                     @include('rapidez::listing.partials.item')
                 </template>

From d42f95ecb73377b2b4d9198639304edf55feb166 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Fri, 18 Apr 2025 11:11:51 +0000
Subject: [PATCH 147/244] Apply fixes from Duster

---
 src/Http/ViewComposers/ConfigComposer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 4c57269f0..4d97b55c8 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -58,7 +58,7 @@ public function getConfig(): array
             'show_tax'             => in_array(Rapidez::config('tax/display/type'), [2, 3]),
             'grid_per_page'        => Rapidez::config('catalog/frontend/grid_per_page'),
             'grid_per_page_values' => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values')),
-            'max_category_level'           => Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->max('level')),
+            'max_category_level'   => Cache::rememberForever('max_category_level', fn () => Category::withoutGlobalScopes()->max('level')),
 
             // TODO: For the products we've the `rapidez.index` config
             // set from the `src/Rapidez.php` which is accessible

From b5d9590cf901a78c1d8ffc1a2e2971043bac6e78 Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Fri, 18 Apr 2025 11:12:41 +0000
Subject: [PATCH 148/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 03f7754f2..0bbe74921 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -146,7 +146,6 @@ export default {
                     stateToRoute: this.stateToRoute,
                 },
             }
-
         },
 
         isSearchPage: function () {

From a37bff8474d4e0084d6bcb2505583945605e15fd Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 18 Apr 2025 13:18:39 +0200
Subject: [PATCH 149/244] Merge fix

---
 src/Http/ViewComposers/ConfigComposer.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
index 4c57269f0..ddc8bd50d 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/ViewComposers/ConfigComposer.php
@@ -53,7 +53,6 @@ public function getConfig(): array
             'show_swatches'        => (bool) Rapidez::config('catalog/frontend/show_swatches_in_product_list'),
             'translations'         => __('rapidez::frontend'),
             'recaptcha'            => Rapidez::config('recaptcha_frontend/type_recaptcha_v3/public_key', null, true),
-            'searchable'           => array_merge($searchableAttributes, config('rapidez.indexer.searchable')),
             'street_lines'         => Rapidez::config('customer/address/street_lines'),
             'show_tax'             => in_array(Rapidez::config('tax/display/type'), [2, 3]),
             'grid_per_page'        => Rapidez::config('catalog/frontend/grid_per_page'),

From 18fc48aafd3ab24d388cb38d34271e4b0ed5a4c2 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 18 Apr 2025 13:23:02 +0200
Subject: [PATCH 150/244] Merge fix

---
 resources/js/components/Listing/Listing.vue     | 7 -------
 resources/js/package.js                         | 4 ----
 resources/views/listing/partials/item.blade.php | 9 +++++++--
 resources/views/search/overview.blade.php       | 4 ++--
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index 03f7754f2..b7e05a715 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -51,9 +51,6 @@ export default {
 
     mounted() {
         this.loaded = Object.keys(this.attributes).length > 0
-        if (this.isSearchPage) {
-            document.title = config.translations.search.title + ': ' + this.$root.queryParams.get('q')
-        }
     },
 
     computed: {
@@ -149,10 +146,6 @@ export default {
 
         },
 
-        isSearchPage: function () {
-            return this.$root.queryParams.has('q')
-        },
-
         // TODO: Do we want to make this extendable?
         rangeAttributes() {
             return this.filters.filter((filter) => filter.input == 'price').map((filter) => filter.code)
diff --git a/resources/js/package.js b/resources/js/package.js
index 604abec55..268458d3a 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -170,10 +170,6 @@ function init() {
                 canOrder() {
                     return this.cart.items.every((item) => item.is_available)
                 },
-
-                queryParams() {
-                    return new URLSearchParams(window.location.search)
-                },
             },
             watch: {
                 loadingCount: function (count) {
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index db6101fd4..0472d0059 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -19,9 +19,14 @@ class="mb-3 h-48 w-full rounded-t object-contain" :alt="item.name" :loading="con
                     <x-rapidez::highlight attribute="name" class="text-base font-medium"/>
                     @if (!Rapidez::config('catalog/frontend/show_swatches_in_product_list'))
                         <div class="flex items-center space-x-2">
-                            <div class="font-semibold">@{{ (item.special_price || item.price) | price }}</div>
-                            <div class="text-sm line-through" v-if="item.special_price">@{{ item.price | price }}</div>
+                            <div class="font-semibold">
+                                @{{ (item.special_price || item.price) | price }}
+                            </div>
+                            <div class="text-sm line-through" v-if="item.special_price">
+                                @{{ item.price | price }}
+                            </div>
                         </div>
+                    @endif
                     @if (App::providerIsLoaded('Rapidez\Reviews\ReviewsServiceProvider'))
                         <x-dynamic-component component="rapidez-reviews::stars" v-if="item.reviews_count" count="item.reviews_count" score="item.reviews_score" />
                     @endif
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 451f87bbe..8e4f7d2a1 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -5,8 +5,8 @@
 @section('content')
     <div class="container" v-cloak>
         <h1 class="font-bold text-3xl">
-            {{-- TODO: Maybe have this dynamic while typing? --}}
-            @lang('Search for'): @{{ $root.queryParams.get('q') }}
+            @lang('Search')
+            {{-- TODO: Re-add the search term reactive? --}}
         </h1>
 
         <x-rapidez::listing filter-query-string="visibility:(3 OR 4)"/>

From 5d5845abcadb2a3f006876c4fecc2d9ca53dc0e7 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 18 Apr 2025 13:40:36 +0200
Subject: [PATCH 151/244] Reactive search page h1 with the state results
 component

---
 resources/js/instantsearch.js             |  1 +
 resources/views/search/overview.blade.php | 28 +++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/resources/js/instantsearch.js b/resources/js/instantsearch.js
index 06e98dfa8..c0728e903 100644
--- a/resources/js/instantsearch.js
+++ b/resources/js/instantsearch.js
@@ -4,6 +4,7 @@ Vue.component('ais-hits', () => import('vue-instantsearch/vue2/es/src/components
 Vue.component('ais-configure', () => import('vue-instantsearch/vue2/es/src/components/Configure.js'))
 Vue.component('ais-highlight', () => import('vue-instantsearch/vue2/es/src/components/Highlight.vue.js'))
 Vue.component('ais-search-box', () => import('vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'))
+Vue.component('ais-state-results', () => import('vue-instantsearch/vue2/es/src/components/StateResults.vue.js'))
 
 // Used by Autocomplete
 Vue.component('ais-index', () => import('vue-instantsearch/vue2/es/src/components/Index.js'))
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 8e4f7d2a1..95d7abaca 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -2,13 +2,27 @@
 
 @section('robots', 'NOINDEX,NOFOLLOW')
 
-@section('content')
-    <div class="container" v-cloak>
-        <h1 class="font-bold text-3xl">
-            @lang('Search')
-            {{-- TODO: Re-add the search term reactive? --}}
-        </h1>
+@pushOnce('head', 'search-overview')
+    @vite(vite_filename_paths(['StateResults.vue']))
+@endPushOnce
 
-        <x-rapidez::listing filter-query-string="visibility:(3 OR 4)"/>
+@section('content')
+    <div class="container">
+        <x-rapidez::listing filter-query-string="visibility:(3 OR 4)">
+            <x-slot:before>
+                <ais-state-results>
+                    <template v-slot="{ state: { query } }">
+                        <h1 class="font-bold text-3xl">
+                            <template v-if="query">
+                                @lang('Search for'): @{{ query }}
+                            </template>
+                            <template v-else>
+                                @lang('Search')
+                            </template>
+                        </h1>
+                    </template>
+                </ais-state-results>
+            </x-slot:before>
+        </x-rapidez::listing>
     </div>
 @endsection

From 5c4ce542516332a03d3cb4f30e8b7c55560fffa8 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 18 Apr 2025 13:49:35 +0200
Subject: [PATCH 152/244] Import

---
 src/Models/Traits/Searchable.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 6b11e1d01..8eef15327 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -2,6 +2,7 @@
 
 namespace Rapidez\Core\Models\Traits;
 
+use Exception;
 use Laravel\Scout\Searchable as ScoutSearchable;
 use TorMorten\Eventy\Facades\Eventy;
 

From 3b277829c2cf67f1bfde3b98121444bd8cc634f9 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 18 Apr 2025 14:42:10 +0200
Subject: [PATCH 153/244] Refactor configcomposer into controller

---
 resources/views/layouts/app.blade.php         |   6 +-
 resources/views/layouts/config.blade.php      |   2 +-
 routes/web.php                                |   6 +-
 .../ConfigController.php}                     | 123 +++++++++---------
 src/RapidezServiceProvider.php                |   2 -
 5 files changed, 70 insertions(+), 69 deletions(-)
 rename src/Http/{ViewComposers/ConfigComposer.php => Controllers/ConfigController.php} (83%)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 1e3e3c576..b916512df 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -19,9 +19,11 @@
     <meta name="description" content="@yield('description', Rapidez::config('design/head/default_description', ''))"/>
     <meta name="robots" content="@yield('robots', Rapidez::config('design/search_engine_robots/default_robots', 'INDEX,FOLLOW'))"/>
     <link rel="canonical" href="@yield('canonical', url()->current())" />
-    <link href="{{ route('config') }}" rel="preload" as="script">
 
-    <script defer src="{{ route('config') }}?v={{ Cache::rememberForever('cachekey', fn () => md5(Str::random())) }}&s={{ config('rapidez.store') }}"></script>
+    @php($configPath = route('config') . '?v=' . Cache::rememberForever('cachekey', fn () => md5(Str::random())) . '&s=' . config('rapidez.store'))
+    <link href="{{ $configPath }}" rel="preload" as="script">
+    <script defer src="{{ $configPath }}"></script>
+
     @vite(['resources/css/app.css', 'resources/js/app.js'])
     @stack('head')
     @config('design/head/includes')
diff --git a/resources/views/layouts/config.blade.php b/resources/views/layouts/config.blade.php
index 496c14379..b538a0609 100644
--- a/resources/views/layouts/config.blade.php
+++ b/resources/views/layouts/config.blade.php
@@ -1 +1 @@
-window.config = @json(config('frontend'));
+window.config = @json($config);
diff --git a/routes/web.php b/routes/web.php
index 33e80c0f0..42dd5506f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Support\Facades\Route;
 use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Http\Controllers\ConfigController;
 use Rapidez\Core\Http\Controllers\SignedCheckoutController;
 use Rapidez\Core\Http\Middleware\AuthenticateHealthCheck;
 
@@ -23,9 +24,6 @@
     Route::fallback(config('rapidez.routing.controllers.fallback'));
 
     Route::middleware('cache.headers:public;max_age=3600;s_maxage=3600;stale_while_revalidate=3600;etag')->group(function () {
-        Route::get('config.js', fn () => response()->view(
-            view: 'rapidez::layouts.config',
-            headers: ['Content-Type' => 'text/javascript'],
-        ))->name('config');
+        Route::get('config.js', ConfigController::class)->name('config');
     });
 });
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/Controllers/ConfigController.php
similarity index 83%
rename from src/Http/ViewComposers/ConfigComposer.php
rename to src/Http/Controllers/ConfigController.php
index c8257f98b..78202db68 100644
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ b/src/Http/Controllers/ConfigController.php
@@ -1,30 +1,34 @@
 <?php
 
-namespace Rapidez\Core\Http\ViewComposers;
+namespace Rapidez\Core\Http\Controllers;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
-use Illuminate\View\View;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Category;
 use Rapidez\Core\Models\Traits\Searchable;
 
-// TODO: Can we improve anything in this file?
-// It doesn't feel very clean currently.
-class ConfigComposer
+class ConfigController
 {
-    public function compose(View $view)
+    public function __invoke()
     {
-        $this
-            ->exposeGraphqlQueries()
-            ->configureSearchkitFacetAttributes()
-            ->configureSearchkitSearchAttributes()
-            ->configureSearchkitSorting();
+        $config = array_merge(
+            config('frontend') ?: [],
+            $this->getExposedConfigValues(),
+            $this->getConfig(),
+        );
 
-        $exposedFrontendConfigValues = Arr::only(
+        return response()->view(
+            view: 'rapidez::layouts.config',
+            headers: ['Content-Type' => 'text/javascript'],
+            data: ['config' => $config],
+        );
+    }
+
+    public function getExposedConfigValues(): array
+    {
+        return Arr::only(
             array_merge_recursive(
                 config('rapidez'),
                 config('rapidez.frontend'),
@@ -34,36 +38,34 @@ public function compose(View $view)
                 ['store_code', 'index', 'searchkit'],
             ),
         );
-
-        Config::set('frontend', array_merge(
-            config('frontend') ?: [],
-            $exposedFrontendConfigValues,
-            $this->getConfig(),
-        ));
-
-        Event::dispatch('rapidez:frontend-config-composed');
     }
 
     public function getConfig(): array
     {
         return [
-            'locale'                       => Rapidez::config('general/locale/code', 'en_US'),
-            'default_country'              => Rapidez::config('general/country/default', 'NL'),
-            'currency'                     => Rapidez::config('currency/options/default'),
             'cachekey'                     => Cache::rememberForever('cachekey', fn () => md5(Str::random())),
-            'redirect_cart'                => (bool) Rapidez::config('checkout/cart/redirect_to_cart'),
-            'show_swatches'                => (bool) Rapidez::config('catalog/frontend/show_swatches_in_product_list'),
             'translations'                 => __('rapidez::frontend'),
-            'recaptcha'                    => Rapidez::config('recaptcha_frontend/type_recaptcha_v3/public_key', null, true),
+
+            'index'                        => $this->getIndexNames(),
+            'filterable_attributes'        => $this->getFilterableAttributes(),
+            'fragments'                    => $this->getGraphqlQueryFragments(),
+            'max_category_level'           => $this->getMaxCategoryLevel(),
+            'queries'                      => $this->getGraphqlQueries(),
+            'searchkit'                    => $this->getSearchkitConfig(),
             'show_customer_address_fields' => $this->getCustomerAddressFields(),
-            'street_lines'                 => Rapidez::config('customer/address/street_lines', 2),
-            'show_tax'                     => in_array(Rapidez::config('tax/display/type', 1), [2, 3]),
+            'swatches'                     => $this->getSwatches(),
+
+            // Magento config data
+            'currency'                     => Rapidez::config('currency/options/default'),
+            'default_country'              => Rapidez::config('general/country/default', 'NL'),
             'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
             'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
-            'max_category_level'           => $this->getMaxCategoryLevel(),
-            'filterable_attributes'        => $this->getFilterableAttributes(),
-            'index'                        => $this->getIndexNames(),
-            'swatches'                     => $this->getSwatches(),
+            'locale'                       => Rapidez::config('general/locale/code', 'en_US'),
+            'recaptcha'                    => Rapidez::config('recaptcha_frontend/type_recaptcha_v3/public_key', null, true),
+            'redirect_cart'                => (bool) Rapidez::config('checkout/cart/redirect_to_cart'),
+            'street_lines'                 => Rapidez::config('customer/address/street_lines', 2),
+            'show_swatches'                => (bool) Rapidez::config('catalog/frontend/show_swatches_in_product_list'),
+            'show_tax'                     => in_array(Rapidez::config('tax/display/type', 1), [2, 3]),
         ];
     }
 
@@ -125,7 +127,7 @@ public function getMaxCategoryLevel(): int
         return Cache::rememberForever('max_category_level_' . config('rapidez.store'), fn () => Category::withoutGlobalScopes()->max('level'));
     }
 
-    public function exposeGraphqlQueries(): self
+    public function getGraphqlQueries(): array
     {
         $checkoutQueries = [
             'setGuestEmailOnCart',
@@ -139,28 +141,35 @@ public function exposeGraphqlQueries(): self
         ];
 
         // TODO: Maybe limit this to just the checkout pages?
-        foreach ($checkoutQueries as $checkoutQuery) {
-            Config::set(
-                'frontend.queries.' . $checkoutQuery,
-                view('rapidez::checkout.queries.' . $checkoutQuery)->renderOneliner()
-            );
-        }
+        $queries = Arr::mapWithKeys($checkoutQueries, fn($query) => [$query, view('rapidez::checkout.queries.' . $query)->renderOneliner()]);
+        $queries['customer'] = view('rapidez::customer.queries.customer')->renderOneliner();
 
-        Config::set(
-            'frontend.queries.customer',
-            view('rapidez::customer.queries.customer')->renderOneliner()
-        );
+        return $queries;
+    }
 
-        Config::set('frontend.fragments', [
+    public function getGraphqlQueryFragments(): array
+    {
+        return [
             'cart'    => view('rapidez::cart.queries.fragments.cart')->renderOneliner(),
             'order'   => view('rapidez::checkout.queries.fragments.order')->renderOneliner(),
             'orderV2' => view('rapidez::checkout.queries.fragments.orderV2')->renderOneliner(),
-        ]);
+        ];
+    }
+
+    public function getSearchkitConfig(): array
+    {
+        return array_merge(
+            config('rapidez.searchkit'),
+            [
+                'facet_attributes' => $this->getSearchkitFacetAttributes(),
+                'search_attributes' => $this->getSearchkitSearchAttributes(),
+                'sorting' => $this->getSearchkitSorting(),
+            ]
+        );
 
-        return $this;
     }
 
-    public function configureSearchkitFacetAttributes(): self
+    public function getSearchkitFacetAttributes(): array
     {
         // Get the filterable attributes and category levels
         $filterableAttributes = collect($this->getFilterableAttributes())
@@ -186,12 +195,10 @@ public function configureSearchkitFacetAttributes(): self
             ->concat($categoryLevels)
             ->concat(config('rapidez.searchkit.facet_attributes'));
 
-        Config::set('rapidez.searchkit.facet_attributes', $facetAttributes->toArray());
-
-        return $this;
+        return $facetAttributes->toArray();
     }
 
-    public function configureSearchkitSearchAttributes(): self
+    public function getSearchkitSearchAttributes(): array
     {
         $attributeModel = config('rapidez.models.attribute');
 
@@ -207,12 +214,10 @@ public function configureSearchkitSearchAttributes(): self
             'weight' => $attribute['search_weight'],
         ])->merge(config('rapidez.searchkit.search_attributes'))->values()->toArray();
 
-        Config::set('rapidez.searchkit.search_attributes', $searchableAttributes);
-
-        return $this;
+        return $searchableAttributes;
     }
 
-    public function configureSearchkitSorting(): self
+    public function getSearchkitSorting(): array
     {
         $attributeModel = config('rapidez.models.attribute');
 
@@ -251,8 +256,6 @@ public function configureSearchkitSorting(): self
             'key'   => 'default',
         ]);
 
-        Config::set('rapidez.searchkit.sorting', $sortableAttributes->keyBy('key')->toArray());
-
-        return $this;
+        return $sortableAttributes->keyBy('key')->toArray();
     }
 }
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index e852598e1..4cd64ba6b 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -157,8 +157,6 @@ protected function bootViews(): self
     {
         $this->loadViewsFrom(__DIR__ . '/../resources/views', 'rapidez');
 
-        View::composer('rapidez::layouts.config', ConfigComposer::class);
-
         View::addExtension('graphql', 'blade');
 
         Vite::useScriptTagAttributes(fn (string $src, string $url, ?array $chunk, ?array $manifest) => [

From 88c595099a67471358766d20470f6d3f90ff7227 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 18 Apr 2025 15:05:23 +0200
Subject: [PATCH 154/244] Removed inline-template

---
 config/rapidez/searchkit.php                           |  1 +
 resources/views/components/listing.blade.php           |  2 +-
 resources/views/components/productlist.blade.php       | 10 ++++++++--
 .../layouts/partials/header/autocomplete.blade.php     |  2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/config/rapidez/searchkit.php b/config/rapidez/searchkit.php
index 86448434f..0ea447bcc 100644
--- a/config/rapidez/searchkit.php
+++ b/config/rapidez/searchkit.php
@@ -47,6 +47,7 @@
     // we didn't need to keep a list to filter.
     'filter_attributes' => [
         ['attribute' => 'entity_id', 'field' => 'entity_id', 'type' => 'numeric'],
+        ['attribute' => 'sku', 'field' => 'sku.keyword', 'type' => 'string'],
         ['attribute' => 'category_ids', 'field' => 'category_ids', 'type' => 'numeric'],
         ['attribute' => 'visibility', 'field' => 'visibility', 'type' => 'numeric'],
     ],
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 9a85d2984..e2d5f5438 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -18,7 +18,7 @@
         }]"
         {{-- TODO: Extract this somewhere? --}}
         :index="config.index_prefix + '_product_' + config.store"
-        inline-template
+        v-slot="{ loaded, index, searchClient, rangeAttributes, categoryAttributes, hitsPerPage, filters, sortOptions, withFilters, withSwatches, routing }"
         v-cloak
     >
         <div>
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 175aa0d2d..367a0f7ae 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -2,7 +2,13 @@
 
 @if ($value)
     <lazy v-slot="{ intersected }">
-        <listing v-if="intersected" v-cloak inline-template>
+        <listing
+            v-if="intersected"
+            {{-- TODO: Extract this somewhere? --}}
+            :index="config.index_prefix + '_product_' + config.store"
+            v-cloak
+            v-slot="{ loaded, index, searchClient }"
+        >
             {{--
             TODO: Maybe better to have a wrapper
             component again like reactive-base?
@@ -11,7 +17,7 @@
                 <ais-instant-search
                     v-if="loaded && searchClient"
                     :search-client="searchClient"
-                    :index-name="config.index"
+                    :index-name="index"
                 >
                     <ais-configure :filters="'{{ $field }}:({{ is_array($value)
                         ? implode(' OR ', $value)
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 835314d89..188764f68 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,5 +1,5 @@
 
-<autocomplete inline-template v-on:mounted="() => window.document.getElementById('autocomplete-input').focus()">
+<autocomplete v-on:mounted="() => window.document.getElementById('autocomplete-input').focus()" v-slot="{ searchClient}">
     <div class="relative w-full">
         <ais-instant-search
             v-if="searchClient"

From f615ce41f65a0862cb3ae72bdf2a444bab168de9 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 18 Apr 2025 15:20:39 +0200
Subject: [PATCH 155/244] Fix attribute filter attribute

---
 src/Models/Attribute.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Models/Attribute.php b/src/Models/Attribute.php
index 29b1bcee6..ed2056e57 100644
--- a/src/Models/Attribute.php
+++ b/src/Models/Attribute.php
@@ -22,10 +22,8 @@ protected static function booting()
 
     protected function filter(): CastsAttribute
     {
-        // TODO: Double check; this config has been (re)moved.
         return CastsAttribute::make(
-            get: fn ($value) => $value || []
-            // in_array($this->code, config('rapidez.indexer.additional_filters')),
+            get: fn ($value) => $value || in_array($this->code, Arr::pluck(config('rapidez.searchkit.filter_attributes'), 'field')),
         )->shouldCache();
     }
 

From 10366bf4402eb71fc5c9f99bbc33f13b6617f331 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Fri, 18 Apr 2025 13:21:09 +0000
Subject: [PATCH 156/244] Apply fixes from Duster

---
 src/Http/Controllers/ConfigController.php | 30 +++++++++++------------
 src/RapidezServiceProvider.php            |  1 -
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Http/Controllers/ConfigController.php b/src/Http/Controllers/ConfigController.php
index 78202db68..13afe0f30 100644
--- a/src/Http/Controllers/ConfigController.php
+++ b/src/Http/Controllers/ConfigController.php
@@ -43,8 +43,8 @@ public function getExposedConfigValues(): array
     public function getConfig(): array
     {
         return [
-            'cachekey'                     => Cache::rememberForever('cachekey', fn () => md5(Str::random())),
-            'translations'                 => __('rapidez::frontend'),
+            'cachekey'     => Cache::rememberForever('cachekey', fn () => md5(Str::random())),
+            'translations' => __('rapidez::frontend'),
 
             'index'                        => $this->getIndexNames(),
             'filterable_attributes'        => $this->getFilterableAttributes(),
@@ -56,16 +56,16 @@ public function getConfig(): array
             'swatches'                     => $this->getSwatches(),
 
             // Magento config data
-            'currency'                     => Rapidez::config('currency/options/default'),
-            'default_country'              => Rapidez::config('general/country/default', 'NL'),
-            'grid_per_page'                => Rapidez::config('catalog/frontend/grid_per_page', 12),
-            'grid_per_page_values'         => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
-            'locale'                       => Rapidez::config('general/locale/code', 'en_US'),
-            'recaptcha'                    => Rapidez::config('recaptcha_frontend/type_recaptcha_v3/public_key', null, true),
-            'redirect_cart'                => (bool) Rapidez::config('checkout/cart/redirect_to_cart'),
-            'street_lines'                 => Rapidez::config('customer/address/street_lines', 2),
-            'show_swatches'                => (bool) Rapidez::config('catalog/frontend/show_swatches_in_product_list'),
-            'show_tax'                     => in_array(Rapidez::config('tax/display/type', 1), [2, 3]),
+            'currency'             => Rapidez::config('currency/options/default'),
+            'default_country'      => Rapidez::config('general/country/default', 'NL'),
+            'grid_per_page'        => Rapidez::config('catalog/frontend/grid_per_page', 12),
+            'grid_per_page_values' => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values', '12,24,36')),
+            'locale'               => Rapidez::config('general/locale/code', 'en_US'),
+            'recaptcha'            => Rapidez::config('recaptcha_frontend/type_recaptcha_v3/public_key', null, true),
+            'redirect_cart'        => (bool) Rapidez::config('checkout/cart/redirect_to_cart'),
+            'street_lines'         => Rapidez::config('customer/address/street_lines', 2),
+            'show_swatches'        => (bool) Rapidez::config('catalog/frontend/show_swatches_in_product_list'),
+            'show_tax'             => in_array(Rapidez::config('tax/display/type', 1), [2, 3]),
         ];
     }
 
@@ -141,7 +141,7 @@ public function getGraphqlQueries(): array
         ];
 
         // TODO: Maybe limit this to just the checkout pages?
-        $queries = Arr::mapWithKeys($checkoutQueries, fn($query) => [$query, view('rapidez::checkout.queries.' . $query)->renderOneliner()]);
+        $queries = Arr::mapWithKeys($checkoutQueries, fn ($query) => [$query, view('rapidez::checkout.queries.' . $query)->renderOneliner()]);
         $queries['customer'] = view('rapidez::customer.queries.customer')->renderOneliner();
 
         return $queries;
@@ -161,9 +161,9 @@ public function getSearchkitConfig(): array
         return array_merge(
             config('rapidez.searchkit'),
             [
-                'facet_attributes' => $this->getSearchkitFacetAttributes(),
+                'facet_attributes'  => $this->getSearchkitFacetAttributes(),
                 'search_attributes' => $this->getSearchkitSearchAttributes(),
-                'sorting' => $this->getSearchkitSorting(),
+                'sorting'           => $this->getSearchkitSorting(),
             ]
         );
 
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 4cd64ba6b..7d2c13a2d 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -28,7 +28,6 @@
 use Rapidez\Core\Http\Controllers\Fallback\UrlRewriteController;
 use Rapidez\Core\Http\Middleware\CheckStoreCode;
 use Rapidez\Core\Http\Middleware\DetermineAndSetShop;
-use Rapidez\Core\Http\ViewComposers\ConfigComposer;
 use Rapidez\Core\Listeners\Healthcheck\ElasticsearchHealthcheck;
 use Rapidez\Core\Listeners\Healthcheck\MagentoSettingsHealthcheck;
 use Rapidez\Core\Listeners\Healthcheck\ModelsHealthcheck;

From 7a1dd6e4cf992ff83c8c4f363eefb6f1465bc9b5 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 22 Apr 2025 10:07:39 +0200
Subject: [PATCH 157/244] Ignored irrelevant phpstan warnings

---
 src/Models/Traits/Searchable.php | 1 +
 src/RapidezServiceProvider.php   | 2 +-
 src/helpers.php                  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 6b11e1d01..8eef15327 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -2,6 +2,7 @@
 
 namespace Rapidez\Core\Models\Traits;
 
+use Exception;
 use Laravel\Scout\Searchable as ScoutSearchable;
 use TorMorten\Eventy\Facades\Eventy;
 
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index fd0f3bc00..40cc66fc7 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -278,7 +278,7 @@ protected function bootMacros(): self
         Vite::macro('getPathsByFilenames', function ($filenames) {
             /** @var \Illuminate\Foundation\Vite $this */
             $filenames = is_array($filenames) ? $filenames : func_get_args();
-            $manifest = $this->manifest($this->buildDirectory);
+            $manifest = $this->manifest($this->buildDirectory); // @phpstan-ignore-line False positive, the macro bind allows us to access protected properties.
 
             return array_filter(
                 array_map(
diff --git a/src/helpers.php b/src/helpers.php
index efce006f1..49c954c16 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -37,6 +37,6 @@ function vite_filename_path($file)
 if (! function_exists('vite_filename_paths')) {
     function vite_filename_paths($file)
     {
-        return Vite::getPathsByFilenames($file);
+        return Vite::getPathsByFilenames($file); // @phpstan-ignore-line This is a macro bind, which is not recognized by PHPStan.
     }
 }

From 055d64244376d88374a460aeef0b4fd1953b7cb8 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 22 Apr 2025 10:20:18 +0200
Subject: [PATCH 158/244] Fix cart item

---
 resources/views/cart/item.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/cart/item.blade.php b/resources/views/cart/item.blade.php
index 0596a6a22..963cb2f2f 100644
--- a/resources/views/cart/item.blade.php
+++ b/resources/views/cart/item.blade.php
@@ -35,7 +35,7 @@ class="mx-auto"
                     </div>
                     <div v-for="option in config.cart_attributes">
                         <template v-if="item.product.attribute_values?.[option] && typeof item.product.attribute_values[option] === 'object'">
-                            @{{ window.attributeLabel(option) }}: <span v-html="item.product.attribute_values[option]?.join(', ')"></span>
+                            @{{ $root.attributeLabel(option) }}: <span v-html="item.product.attribute_values[option]?.join(', ')"></span>
                         </template>
                     </div>
                     @include('rapidez::cart.item.remove')

From 0981d0be999f98deb1f51099e9eaf6f58f23f18b Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Tue, 22 Apr 2025 11:06:14 +0200
Subject: [PATCH 159/244] Dutch translations

---
 lang/nl.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lang/nl.json b/lang/nl.json
index 3437b423d..e46764647 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -116,5 +116,12 @@
     "Yes": "Ja",
     "You don't have anything in your cart.": "Je hebt geen producten in je winkelwagen.",
     "You have filtered for:": "Je hebt gefilterd op:",
-    "Your order is currently:": "Je bestelling is op dit moment:"
+    "Your order is currently:": "Je bestelling is op dit moment:",
+    "Search within the results": "Zoeken binnen resultaten",
+    "Selected filters": "Geselecteerde filters",
+    "First Page": "Eerste pagina",
+    "Previous Page": "Vorige pagina",
+    "Page": "Pagina",
+    "Next Page": "Volgende pagina",
+    "Last Page": "Laatste pagina"
 }

From cb86385c3a6a65264dba0df5fd00d589cc60ab14 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 22 Apr 2025 11:39:17 +0200
Subject: [PATCH 160/244] Populate search queries using the analytics
 middleware

---
 .../js/components/Search/Autocomplete.vue     | 29 ++++++++++++
 .../components/Search/InstantSearchMixin.vue  | 10 ++++
 .../js/stores/useInstantsearchMiddlewares.js  |  9 ++++
 resources/views/components/listing.blade.php  |  1 +
 .../views/components/productlist.blade.php    |  1 +
 .../partials/header/autocomplete.blade.php    |  1 +
 routes/api.php                                |  4 ++
 src/Http/Controllers/SearchController.php     | 47 +++++++++++++++----
 src/RapidezServiceProvider.php                |  6 +++
 9 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 resources/js/stores/useInstantsearchMiddlewares.js

diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 752ecfa1e..3c20825b3 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -7,6 +7,8 @@ import Configure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
 import highlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
 import SearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
 import Index from 'vue-instantsearch/vue2/es/src/components/Index.js'
+import { useDebounceFn } from '@vueuse/core'
+import { rapidezAPI } from '../../fetch'
 
 export default {
     mixins: [InstantSearchMixin],
@@ -61,6 +63,33 @@ export default {
 
             return client
         },
+
+        getMiddlewares() {
+            let middlewares = InstantSearchMixin.methods.getMiddlewares.bind(this).call();
+
+            const stateChanged = useDebounceFn((changes) => {
+                const query = Object.entries(changes.uiState).find(([id, state]) => {
+                    return state?.query
+                })?.[1]?.query
+
+                if (!query) {
+                    return
+                }
+
+                rapidezAPI('post', '/search', {
+                    q: query,
+                })
+            }, 3000)
+
+            return [
+                ...middlewares,
+                () => ({
+                    onStateChange(changes) {
+                        stateChanged(changes)
+                    },
+                })
+            ]
+        },
     },
 }
 </script>
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index c17a8cbf3..4d5bb8b15 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -1,6 +1,7 @@
 <script>
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
+import { instantsearchMiddlewares } from '../../stores/useInstantsearchMiddlewares'
 
 export default {
     data: () => ({
@@ -46,6 +47,15 @@ export default {
                 result_attributes: config.searchkit.result_attributes,
             }
         },
+
+        getMiddlewares() {
+            return instantsearchMiddlewares;
+        },
+    },
+    computed: {
+        middlewares() {
+            return this.getMiddlewares()
+        },
     },
 }
 </script>
diff --git a/resources/js/stores/useInstantsearchMiddlewares.js b/resources/js/stores/useInstantsearchMiddlewares.js
new file mode 100644
index 000000000..ed1a964ca
--- /dev/null
+++ b/resources/js/stores/useInstantsearchMiddlewares.js
@@ -0,0 +1,9 @@
+export let instantsearchMiddlewares = []
+
+export async function addInstansearchMiddleware(middlewareFn) {
+    instantsearchMiddlewares.push(middlewareFn)
+}
+
+export async function removeInstansearchMiddleware(middlewareFn) {
+    instantsearchMiddlewares = instantsearchMiddlewares.filter((registeredMiddleware) => registeredMiddleware !== middlewareFn)
+}
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 9a85d2984..8edc0c822 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -25,6 +25,7 @@
             <ais-instant-search
                 v-if="loaded && searchClient"
                 :search-client="searchClient"
+                :middlewares="middlewares"
                 :index-name="index"
                 :routing="routing"
             >
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index e319a4314..4ce847b7b 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -8,6 +8,7 @@
                     v-if="loaded && searchClient"
                     :search-client="searchClient"
                     :index-name="config.index"
+                    :middlewares="middlewares"
                 >
                     <ais-configure :filters="'{{ $field }}:({{ is_array($value)
                         ? implode(' OR ', $value)
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 056c71cbb..39637f02b 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -3,6 +3,7 @@
         <ais-instant-search
             v-if="searchClient"
             :search-client="searchClient"
+            :middlewares="middlewares"
             {{-- TODO: The index name should come from the model --}}
             :index-name="config.index_prefix + '_product_' + config.store"
             class="contents"
diff --git a/routes/api.php b/routes/api.php
index 98467c891..fc6f782e0 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -4,6 +4,7 @@
 use Illuminate\Support\Facades\Artisan;
 use Rapidez\Core\Http\Controllers\GetSignedCheckoutController;
 use Rapidez\Core\Http\Controllers\OrderController;
+use Rapidez\Core\Http\Controllers\SearchController;
 use Rapidez\Core\Http\Middleware\VerifyAdminToken;
 
 Route::middleware('api')->prefix('api')->group(function () {
@@ -21,6 +22,9 @@
         return $optionswatchModel::getCachedSwatchValues();
     });
 
+    Route::post('search', [SearchController::class, 'store'])
+        ->middleware('throttle:search-analytics');
+
     Route::get('order', OrderController::class);
 
     Route::post('get-checkout-url', GetSignedCheckoutController::class);
diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php
index dbddcd4b5..573093ad5 100644
--- a/src/Http/Controllers/SearchController.php
+++ b/src/Http/Controllers/SearchController.php
@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Rapidez\Core\Models\Scopes\IsActiveScope;
+use Rapidez\Core\Models\SearchQuery;
 
 class SearchController
 {
@@ -14,23 +15,49 @@ public function __invoke(Request $request)
             return view('rapidez::search.overview');
         }
 
-        $searchQuery = config('rapidez.models.search_query')::withoutGlobalScope(IsActiveScope::class)->firstOrNew([
-            'query_text' => Str::lower($request->q),
-            'store_id'   => config('rapidez.store'),
-        ], ['popularity' => 1]);
+        $searchQuery = $this->track($request);
+
+        if ($searchQuery->is_active === 1 && $searchQuery->redirect) {
+            return redirect($searchQuery->redirect, 301);
+        }
+
+        return view('rapidez::search.overview');
+    }
+
+    public function store(Request $request)
+    {
+        if (!$request->q) {
+            return response()->json(['success' => true]);
+        }
+
+        $this->track($request);
+
+        return response()->json(['success' => true]);
+    }
+
+    public function track(Request $request): SearchQuery
+    {
+        // Prevent automatic indexing each time it is updated.
+        config('rapidez.models.search_query')::disableSearchSyncing();
+        $searchQuery = config('rapidez.models.search_query')::withoutGlobalScope(IsActiveScope::class)
+            ->firstOrNew(
+                [
+                    'query_text' => Str::lower($request->q),
+                    'store_id'   => config('rapidez.store'),
+                ],
+                [
+                    'popularity' => 1
+                ]
+            );
 
         if (! $searchQuery->exists) {
             $searchQuery->save();
 
-            return view('rapidez::search.overview');
+            return $searchQuery;
         }
 
         $searchQuery->increment('popularity');
 
-        if ($searchQuery->is_active === 1 && $searchQuery->redirect) {
-            return redirect($searchQuery->redirect, 301);
-        }
-
-        return view('rapidez::search.overview');
+        return $searchQuery;
     }
 }
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 64476b38b..57d0c13af 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Rapidez\Core;
 
+use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Http\Request;
@@ -9,6 +10,7 @@
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Vite;
 use Illuminate\Support\ServiceProvider;
@@ -133,6 +135,10 @@ protected function bootPublishables(): self
 
     protected function bootRoutes(): self
     {
+        RateLimiter::for('search-analytics', function (Request $request) {
+            return Limit::perMinute(30)->by($request->ip());
+        });
+
         if (config('rapidez.routing.enabled')) {
             $this->loadRoutesFrom(__DIR__ . '/../routes/web.php');
             $this->loadRoutesFrom(__DIR__ . '/../routes/api.php');

From dd9f20cd3f2cc441d801254923f599f0dab7ec8d Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Tue, 22 Apr 2025 09:40:01 +0000
Subject: [PATCH 161/244] Apply fixes from Duster

---
 src/Http/Controllers/SearchController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php
index cd3420cb6..112248c09 100644
--- a/src/Http/Controllers/SearchController.php
+++ b/src/Http/Controllers/SearchController.php
@@ -26,7 +26,7 @@ public function __invoke(Request $request)
 
     public function store(Request $request)
     {
-        if (!$request->q) {
+        if (! $request->q) {
             return response()->json(['success' => true]);
         }
 
@@ -46,7 +46,7 @@ public function track(Request $request): SearchQuery
                     'store_id'   => config('rapidez.store'),
                 ],
                 [
-                    'popularity' => 1
+                    'popularity' => 1,
                 ]
             );
 

From 29028401b7dadd2c02eaa3151318848bfcb40bdf Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Tue, 22 Apr 2025 09:40:28 +0000
Subject: [PATCH 162/244] Apply fixes from Prettier

---
 resources/js/components/Search/Autocomplete.vue       | 4 ++--
 resources/js/components/Search/InstantSearchMixin.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 3c20825b3..50222b0ea 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -65,7 +65,7 @@ export default {
         },
 
         getMiddlewares() {
-            let middlewares = InstantSearchMixin.methods.getMiddlewares.bind(this).call();
+            let middlewares = InstantSearchMixin.methods.getMiddlewares.bind(this).call()
 
             const stateChanged = useDebounceFn((changes) => {
                 const query = Object.entries(changes.uiState).find(([id, state]) => {
@@ -87,7 +87,7 @@ export default {
                     onStateChange(changes) {
                         stateChanged(changes)
                     },
-                })
+                }),
             ]
         },
     },
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index 4d5bb8b15..7e6f0466c 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -49,7 +49,7 @@ export default {
         },
 
         getMiddlewares() {
-            return instantsearchMiddlewares;
+            return instantsearchMiddlewares
         },
     },
     computed: {

From bf9e2aad24e809e52ac431176bcdb5d9a98480ab Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 22 Apr 2025 11:56:05 +0200
Subject: [PATCH 163/244] Fixed errors indexing and getting config

---
 src/Http/Controllers/ConfigController.php                | 2 +-
 src/Models/Scopes/Product/WithProductAttributesScope.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/ConfigController.php b/src/Http/Controllers/ConfigController.php
index 13afe0f30..6c7aefb69 100644
--- a/src/Http/Controllers/ConfigController.php
+++ b/src/Http/Controllers/ConfigController.php
@@ -114,7 +114,7 @@ public function getFilterableAttributes(): array
         return collect($attributes)
             ->map(fn ($attribute) => [
                 ...$attribute,
-                'code'      => $attribute['prefix'] . $attribute['code'],
+                'code'      => ($attribute['prefix'] ?? '') . $attribute['code'],
                 'base_code' => $attribute['code'],
             ])
             ->sortBy('position')
diff --git a/src/Models/Scopes/Product/WithProductAttributesScope.php b/src/Models/Scopes/Product/WithProductAttributesScope.php
index 98add83ee..d63f61504 100644
--- a/src/Models/Scopes/Product/WithProductAttributesScope.php
+++ b/src/Models/Scopes/Product/WithProductAttributesScope.php
@@ -25,7 +25,8 @@ public function apply(Builder $builder, Model $model)
 
         $attributeModel = config('rapidez.models.attribute');
         $attributes = $attributeModel::getCachedWhere(function ($attribute) use ($model) {
-            return in_array($attribute['code'], $model->attributesToSelect);
+            return in_array($attribute['code'], $model->attributesToSelect)
+                && !in_array($attribute['code'], ['visibility', 'sku', 'type_id', $model->getKeyName()]);
         });
 
         $attributes = array_filter($attributes, fn ($a) => $a['type'] !== 'static');

From f2f4baf336376fb615a6e7775d22a008d543f9e3 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Tue, 22 Apr 2025 09:56:39 +0000
Subject: [PATCH 164/244] Apply fixes from Duster

---
 src/Models/Scopes/Product/WithProductAttributesScope.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/Scopes/Product/WithProductAttributesScope.php b/src/Models/Scopes/Product/WithProductAttributesScope.php
index d63f61504..53bfcc135 100644
--- a/src/Models/Scopes/Product/WithProductAttributesScope.php
+++ b/src/Models/Scopes/Product/WithProductAttributesScope.php
@@ -26,7 +26,7 @@ public function apply(Builder $builder, Model $model)
         $attributeModel = config('rapidez.models.attribute');
         $attributes = $attributeModel::getCachedWhere(function ($attribute) use ($model) {
             return in_array($attribute['code'], $model->attributesToSelect)
-                && !in_array($attribute['code'], ['visibility', 'sku', 'type_id', $model->getKeyName()]);
+                && ! in_array($attribute['code'], ['visibility', 'sku', 'type_id', $model->getKeyName()]);
         });
 
         $attributes = array_filter($attributes, fn ($a) => $a['type'] !== 'static');

From bb5d935eca43a9ba0b9f8f3035d41bffcab3ebd7 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Thu, 24 Apr 2025 15:49:58 +0200
Subject: [PATCH 165/244] Fixed typo

---
 resources/js/stores/useInstantsearchMiddlewares.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/stores/useInstantsearchMiddlewares.js b/resources/js/stores/useInstantsearchMiddlewares.js
index ed1a964ca..9bb2fef86 100644
--- a/resources/js/stores/useInstantsearchMiddlewares.js
+++ b/resources/js/stores/useInstantsearchMiddlewares.js
@@ -1,9 +1,9 @@
 export let instantsearchMiddlewares = []
 
-export async function addInstansearchMiddleware(middlewareFn) {
+export async function addInstantsearchMiddleware(middlewareFn) {
     instantsearchMiddlewares.push(middlewareFn)
 }
 
-export async function removeInstansearchMiddleware(middlewareFn) {
+export async function removeInstantsearchMiddleware(middlewareFn) {
     instantsearchMiddlewares = instantsearchMiddlewares.filter((registeredMiddleware) => registeredMiddleware !== middlewareFn)
 }

From 6f7e1ebc816a1070c8893060c20a7139e2bbd2b8 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 22 Apr 2025 11:56:05 +0200
Subject: [PATCH 166/244] Fixed errors indexing and getting config

---
 src/Http/Controllers/ConfigController.php                | 2 +-
 src/Models/Scopes/Product/WithProductAttributesScope.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/ConfigController.php b/src/Http/Controllers/ConfigController.php
index 13afe0f30..6c7aefb69 100644
--- a/src/Http/Controllers/ConfigController.php
+++ b/src/Http/Controllers/ConfigController.php
@@ -114,7 +114,7 @@ public function getFilterableAttributes(): array
         return collect($attributes)
             ->map(fn ($attribute) => [
                 ...$attribute,
-                'code'      => $attribute['prefix'] . $attribute['code'],
+                'code'      => ($attribute['prefix'] ?? '') . $attribute['code'],
                 'base_code' => $attribute['code'],
             ])
             ->sortBy('position')
diff --git a/src/Models/Scopes/Product/WithProductAttributesScope.php b/src/Models/Scopes/Product/WithProductAttributesScope.php
index 98add83ee..d63f61504 100644
--- a/src/Models/Scopes/Product/WithProductAttributesScope.php
+++ b/src/Models/Scopes/Product/WithProductAttributesScope.php
@@ -25,7 +25,8 @@ public function apply(Builder $builder, Model $model)
 
         $attributeModel = config('rapidez.models.attribute');
         $attributes = $attributeModel::getCachedWhere(function ($attribute) use ($model) {
-            return in_array($attribute['code'], $model->attributesToSelect);
+            return in_array($attribute['code'], $model->attributesToSelect)
+                && !in_array($attribute['code'], ['visibility', 'sku', 'type_id', $model->getKeyName()]);
         });
 
         $attributes = array_filter($attributes, fn ($a) => $a['type'] !== 'static');

From 4ef3f2410cc1f4ae289b090f5bbf86c9cc94d204 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Thu, 24 Apr 2025 13:52:20 +0000
Subject: [PATCH 167/244] Apply fixes from Duster

---
 src/Models/Scopes/Product/WithProductAttributesScope.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/Scopes/Product/WithProductAttributesScope.php b/src/Models/Scopes/Product/WithProductAttributesScope.php
index d63f61504..53bfcc135 100644
--- a/src/Models/Scopes/Product/WithProductAttributesScope.php
+++ b/src/Models/Scopes/Product/WithProductAttributesScope.php
@@ -26,7 +26,7 @@ public function apply(Builder $builder, Model $model)
         $attributeModel = config('rapidez.models.attribute');
         $attributes = $attributeModel::getCachedWhere(function ($attribute) use ($model) {
             return in_array($attribute['code'], $model->attributesToSelect)
-                && !in_array($attribute['code'], ['visibility', 'sku', 'type_id', $model->getKeyName()]);
+                && ! in_array($attribute['code'], ['visibility', 'sku', 'type_id', $model->getKeyName()]);
         });
 
         $attributes = array_filter($attributes, fn ($a) => $a['type'] !== 'static');

From 8910f6638a91a993da1a2c9672f266c00b8d5830 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 25 Apr 2025 13:47:48 +0200
Subject: [PATCH 168/244] Move config.js outside of web middleware

---
 routes/web.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index c9d10eb22..7cd235559 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -25,8 +25,8 @@
     Route::get('checkout/{step?}', config('rapidez.routing.controllers.checkout'))->middleware('auth:magento-cart')->name('checkout');
     Route::get('search', config('rapidez.routing.controllers.search'))->name('search');
     Route::fallback(config('rapidez.routing.controllers.fallback'));
+});
 
-    Route::middleware('cache.headers:public;max_age=3600;s_maxage=3600;stale_while_revalidate=3600;etag')->group(function () {
-        Route::get('config.js', ConfigController::class)->name('config');
-    });
+Route::middleware('cache.headers:public;max_age=3600;s_maxage=3600;stale_while_revalidate=3600;etag')->group(function () {
+    Route::get('config.js', ConfigController::class)->name('config');
 });

From 7b3a0e2f90feb2de41780900428197f2cbe5dde5 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 25 Apr 2025 13:49:02 +0200
Subject: [PATCH 169/244] Move up

---
 routes/web.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 7cd235559..4923ca9e2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -9,6 +9,9 @@
 Route::get('healthcheck', config('rapidez.routing.controllers.healthcheck'))->middleware(AuthenticateHealthCheck::class);
 Route::get('robots.txt', fn () => response(Rapidez::config('design/search_engine_robots/custom_instructions'))
     ->header('Content-Type', 'text/plain; charset=UTF-8'));
+Route::middleware('cache.headers:public;max_age=3600;s_maxage=3600;stale_while_revalidate=3600;etag')->group(function () {
+    Route::get('config.js', ConfigController::class)->name('config');
+});
 
 Route::middleware('web')->group(function () {
     Route::get('catalog/product/view/id/{productId}', [config('rapidez.routing.controllers.product'), 'show'])->whereNumber('productId');
@@ -26,7 +29,3 @@
     Route::get('search', config('rapidez.routing.controllers.search'))->name('search');
     Route::fallback(config('rapidez.routing.controllers.fallback'));
 });
-
-Route::middleware('cache.headers:public;max_age=3600;s_maxage=3600;stale_while_revalidate=3600;etag')->group(function () {
-    Route::get('config.js', ConfigController::class)->name('config');
-});

From b8dc2a69cb5c7062108fca0801f18d476b9b50e4 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 25 Apr 2025 15:48:12 +0200
Subject: [PATCH 170/244] Keep track of returned results for search queries

---
 .../components/Search/AisStatsAnalytics.vue   | 44 +++++++++++++++++++
 .../js/components/Search/Autocomplete.vue     | 21 +++++++++
 .../components/Search/InstantSearchMixin.vue  |  8 +++-
 resources/js/instantsearch.js                 |  1 +
 .../partials/header/autocomplete.blade.php    |  3 +-
 .../listing/partials/filter/search.blade.php  |  1 +
 src/Http/Controllers/SearchController.php     |  7 ++-
 src/Models/SearchQuery.php                    |  5 ++-
 8 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 resources/js/components/Search/AisStatsAnalytics.vue

diff --git a/resources/js/components/Search/AisStatsAnalytics.vue b/resources/js/components/Search/AisStatsAnalytics.vue
new file mode 100644
index 000000000..b23e20ece
--- /dev/null
+++ b/resources/js/components/Search/AisStatsAnalytics.vue
@@ -0,0 +1,44 @@
+<script>
+import { connectStats } from 'instantsearch.js/es/connectors';
+import { createSuitMixin } from 'vue-instantsearch/vue2/es/src/mixins/suit';
+import { createWidgetMixin } from 'vue-instantsearch/vue2/es/src/mixins/widget';
+
+export default {
+    name: 'AisStatsAnalytics',
+    mixins: [
+        createWidgetMixin(
+            { connector: connectStats },
+            {
+                $$widgetType: 'ais.stats-analytics',
+            }
+        ),
+        createSuitMixin({ name: 'Stats-Analytics' }),
+    ],
+    watch: {
+        'state.query': {
+            handler(query) {
+                this.instantSearchInstance.sendEventToInsights({
+                    insightsMethod: 'viewedObjectIDs',
+                    eventType: 'search',
+                    eventModifier: 'external',
+                    widgetType: 'ais.stats-analytics',
+                    payload: {
+                        eventName: 'Query',
+                        query: query,
+                        nbHits: this.state.nbHits,
+                        processingTimeMS: this.state.processingTimeMS,
+                    },
+                    instantSearchInstance: this.instantSearchInstance,
+                });
+            },
+        },
+    },
+    computed: {
+        widgetParams() {
+            return {};
+        },
+    },
+};
+</script>
+<template>
+</template>
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 370c4614e..d0e9bf8f0 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -29,6 +29,27 @@ export default {
         this.$nextTick(() => {
             requestAnimationFrame(() => this.$emit('mounted'))
         })
+
+        const stateChanged = useDebounceFn((event) => {
+            const query = event?.payload?.query
+
+            if (!query) {
+                return
+            }
+
+            rapidezAPI('post', '/search', {
+                q: query,
+                results: event?.payload?.nbHits,
+            })
+        }, 3000)
+
+        this.$on('insights-event:viewedObjectIDs', (event) => {
+            if (event?.eventType !== 'search') {
+                return;
+            }
+
+            stateChanged(event);
+        })
     },
 
     methods: {
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index e8f9e552f..9bd38d423 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -2,6 +2,7 @@
 import Client from '@searchkit/instantsearch-client'
 import Searchkit from 'searchkit'
 import { instantsearchMiddlewares } from '../../stores/useInstantsearchMiddlewares'
+import { createInsightsMiddleware } from 'instantsearch.js/es/middlewares/createInsightsMiddleware'
 
 export default {
     data: () => ({
@@ -47,7 +48,12 @@ export default {
     },
     computed: {
         middlewares() {
-            return this.getMiddlewares()
+            return [createInsightsMiddleware({
+                insightsClient: null,
+                onEvent: (event) => {
+                    this.$emit('insights-event:' + event.insightsMethod, event);
+                },
+            }), ...this.getMiddlewares()]
         },
     },
 }
diff --git a/resources/js/instantsearch.js b/resources/js/instantsearch.js
index c0728e903..eb3531809 100644
--- a/resources/js/instantsearch.js
+++ b/resources/js/instantsearch.js
@@ -19,3 +19,4 @@ Vue.component('ais-hits-per-page', () => import('vue-instantsearch/vue2/es/src/c
 Vue.component('ais-sort-by', () => import('vue-instantsearch/vue2/es/src/components/SortBy.vue.js'))
 Vue.component('ais-pagination', () => import('vue-instantsearch/vue2/es/src/components/Pagination.vue.js'))
 Vue.component('ais-stats', () => import('vue-instantsearch/vue2/es/src/components/Stats.vue.js'))
+Vue.component('ais-stats-analytics', () => import('./components/Search/AisStatsAnalytics.vue'))
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index bc7ecdca5..3547b9a2e 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -9,7 +9,7 @@ class="contents"
             v-cloak
         >
             <div class="contents">
-                <ais-configure :hitsPerPage="3" />
+                <ais-configure :hits-per-page.camel="3" />
                 <div class="searchbox">
                     <ais-search-box>
                         <template v-slot="{ currentRefinement, isSearchStalled, refine }">
@@ -23,6 +23,7 @@ class="contents"
                             />
                         </template>
                     </ais-search-box>
+                    <ais-stats-analytics></ais-stats-analytics>
                 </div>
                 <div class="absolute inset-x-0 bg-white border">
                     @include('rapidez::layouts.partials.header.autocomplete.results')
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index 75c119bf0..4dd3f13c8 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -13,3 +13,4 @@
         --}}
     </template>
 </ais-search-box>
+<ais-stats-analytics></ais-stats-analytics>
diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php
index 112248c09..798913e7e 100644
--- a/src/Http/Controllers/SearchController.php
+++ b/src/Http/Controllers/SearchController.php
@@ -46,6 +46,7 @@ public function track(Request $request): SearchQuery
                     'store_id'   => config('rapidez.store'),
                 ],
                 [
+                    'num_results' => $request->results ?? 0,
                     'popularity' => 1,
                 ]
             );
@@ -56,7 +57,11 @@ public function track(Request $request): SearchQuery
             return $searchQuery;
         }
 
-        $searchQuery->increment('popularity');
+        $searchQuery->popularity++;
+        if ($request->has('results')) {
+            $searchQuery->num_results = $request->results;
+        }
+        $searchQuery->save();
 
         return $searchQuery;
     }
diff --git a/src/Models/SearchQuery.php b/src/Models/SearchQuery.php
index 6351f3728..5c658b01e 100644
--- a/src/Models/SearchQuery.php
+++ b/src/Models/SearchQuery.php
@@ -27,6 +27,9 @@ protected static function booting()
     protected function makeAllSearchableUsing(Builder $query)
     {
         return $query
-            ->where('popularity', '>', 10);
+            ->where(fn($subQuery) => $subQuery
+                ->where('num_results', '>', 0)
+                ->orWhereNotNull('redirect')
+            );
     }
 }

From ea6e19e34ee5dfb4bd163353c488a4aa0fb4fb3a Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Fri, 25 Apr 2025 13:48:39 +0000
Subject: [PATCH 171/244] Apply fixes from Duster

---
 src/Http/Controllers/SearchController.php | 2 +-
 src/Models/SearchQuery.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php
index 798913e7e..2fc917ea2 100644
--- a/src/Http/Controllers/SearchController.php
+++ b/src/Http/Controllers/SearchController.php
@@ -47,7 +47,7 @@ public function track(Request $request): SearchQuery
                 ],
                 [
                     'num_results' => $request->results ?? 0,
-                    'popularity' => 1,
+                    'popularity'  => 1,
                 ]
             );
 
diff --git a/src/Models/SearchQuery.php b/src/Models/SearchQuery.php
index 5c658b01e..5fa1c4eb4 100644
--- a/src/Models/SearchQuery.php
+++ b/src/Models/SearchQuery.php
@@ -27,7 +27,7 @@ protected static function booting()
     protected function makeAllSearchableUsing(Builder $query)
     {
         return $query
-            ->where(fn($subQuery) => $subQuery
+            ->where(fn ($subQuery) => $subQuery
                 ->where('num_results', '>', 0)
                 ->orWhereNotNull('redirect')
             );

From e4a80b7056cc24b3d48f4b69e4d244324ad8df2a Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Fri, 25 Apr 2025 13:49:07 +0000
Subject: [PATCH 172/244] Apply fixes from Prettier

---
 .../js/components/Search/AisStatsAnalytics.vue  | 17 ++++++++---------
 resources/js/components/Search/Autocomplete.vue |  4 ++--
 .../js/components/Search/InstantSearchMixin.vue | 15 +++++++++------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/resources/js/components/Search/AisStatsAnalytics.vue b/resources/js/components/Search/AisStatsAnalytics.vue
index b23e20ece..15d21c2fb 100644
--- a/resources/js/components/Search/AisStatsAnalytics.vue
+++ b/resources/js/components/Search/AisStatsAnalytics.vue
@@ -1,7 +1,7 @@
 <script>
-import { connectStats } from 'instantsearch.js/es/connectors';
-import { createSuitMixin } from 'vue-instantsearch/vue2/es/src/mixins/suit';
-import { createWidgetMixin } from 'vue-instantsearch/vue2/es/src/mixins/widget';
+import { connectStats } from 'instantsearch.js/es/connectors'
+import { createSuitMixin } from 'vue-instantsearch/vue2/es/src/mixins/suit'
+import { createWidgetMixin } from 'vue-instantsearch/vue2/es/src/mixins/widget'
 
 export default {
     name: 'AisStatsAnalytics',
@@ -10,7 +10,7 @@ export default {
             { connector: connectStats },
             {
                 $$widgetType: 'ais.stats-analytics',
-            }
+            },
         ),
         createSuitMixin({ name: 'Stats-Analytics' }),
     ],
@@ -29,16 +29,15 @@ export default {
                         processingTimeMS: this.state.processingTimeMS,
                     },
                     instantSearchInstance: this.instantSearchInstance,
-                });
+                })
             },
         },
     },
     computed: {
         widgetParams() {
-            return {};
+            return {}
         },
     },
-};
+}
 </script>
-<template>
-</template>
+<template></template>
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index d0e9bf8f0..c21c1ee23 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -45,10 +45,10 @@ export default {
 
         this.$on('insights-event:viewedObjectIDs', (event) => {
             if (event?.eventType !== 'search') {
-                return;
+                return
             }
 
-            stateChanged(event);
+            stateChanged(event)
         })
     },
 
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index 9bd38d423..8bd11801d 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -48,12 +48,15 @@ export default {
     },
     computed: {
         middlewares() {
-            return [createInsightsMiddleware({
-                insightsClient: null,
-                onEvent: (event) => {
-                    this.$emit('insights-event:' + event.insightsMethod, event);
-                },
-            }), ...this.getMiddlewares()]
+            return [
+                createInsightsMiddleware({
+                    insightsClient: null,
+                    onEvent: (event) => {
+                        this.$emit('insights-event:' + event.insightsMethod, event)
+                    },
+                }),
+                ...this.getMiddlewares(),
+            ]
         },
     },
 }

From f15f623a20c3f044f70eef0e6df37d851931a12f Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 28 Apr 2025 11:03:51 +0200
Subject: [PATCH 173/244] Add frontend values to config & fix productlist

---
 resources/views/components/productlist.blade.php | 3 +--
 resources/views/layouts/app.blade.php            | 1 +
 resources/views/layouts/config.blade.php         | 2 +-
 src/Http/Controllers/ConfigController.php        | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 2c3a7c70c..162576533 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -4,8 +4,7 @@
     <lazy v-slot="{ intersected }">
         <listing
             v-if="intersected"
-            {{-- TODO: Extract this somewhere? --}}
-            :index="config.index_prefix + '_product_' + config.store"
+            :index="config.index.product"
             v-cloak
             v-slot="{ loaded, index, searchClient }"
         >
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index bdf9ccccb..68f4b4cdf 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -51,6 +51,7 @@
         </script>
     @endif
     @stack('foot')
+    <script>window.config = { ...window.config ?? {}, ...@json(config('frontend')) }</script>
     <svg hidden class="hidden">
         @stack('bladeicons')
     </svg>
diff --git a/resources/views/layouts/config.blade.php b/resources/views/layouts/config.blade.php
index b538a0609..66e70216e 100644
--- a/resources/views/layouts/config.blade.php
+++ b/resources/views/layouts/config.blade.php
@@ -1 +1 @@
-window.config = @json($config);
+window.config = { ...window.config ?? {}, ...@json($config) };
diff --git a/src/Http/Controllers/ConfigController.php b/src/Http/Controllers/ConfigController.php
index 6c7aefb69..ea723d4cd 100644
--- a/src/Http/Controllers/ConfigController.php
+++ b/src/Http/Controllers/ConfigController.php
@@ -14,7 +14,6 @@ class ConfigController
     public function __invoke()
     {
         $config = array_merge(
-            config('frontend') ?: [],
             $this->getExposedConfigValues(),
             $this->getConfig(),
         );

From 50dea39ae869915010987ac8af40395930d837c5 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 28 Apr 2025 11:11:55 +0200
Subject: [PATCH 174/244] Small category frontend fix

---
 .../layouts/partials/header/autocomplete/products.blade.php   | 1 -
 resources/views/listing/partials/item.blade.php               | 4 +++-
 src/Http/Controllers/CategoryController.php                   | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/layouts/partials/header/autocomplete/products.blade.php b/resources/views/layouts/partials/header/autocomplete/products.blade.php
index dd136c146..84df860c4 100644
--- a/resources/views/layouts/partials/header/autocomplete/products.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/products.blade.php
@@ -12,7 +12,6 @@
                             :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + item.thumbnail + '.webp'"
                             class="shrink-0 self-center object-contain size-16 mix-blend-multiply"
                             :alt="item.name"
-                            :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
                             width="200"
                             height="200"
                         />
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index 0472d0059..d8354f3f3 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -10,7 +10,9 @@
                 <img
                     v-if="addToCart.currentThumbnail"
                     :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + addToCart.currentThumbnail + '.webp'"
-                    class="mb-3 h-48 w-full rounded-t object-contain" :alt="item.name" :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
+                    class="mb-3 h-48 w-full rounded-t object-contain"
+                    :alt="item.name"
+                    :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
                     width="200"
                     height="200"
                 />
diff --git a/src/Http/Controllers/CategoryController.php b/src/Http/Controllers/CategoryController.php
index 615c8bbb7..17772347f 100644
--- a/src/Http/Controllers/CategoryController.php
+++ b/src/Http/Controllers/CategoryController.php
@@ -10,7 +10,6 @@ public function show(int $categoryId)
         $category = $categoryModel::findOrFail($categoryId);
 
         config(['frontend.category' => $category->only('entity_id')]);
-        config(['frontend.subcategories' => $category->subcategories->pluck('name', 'entity_id')]);
         session(['latest_category_path' => $category->path]);
 
         $response = response()->view('rapidez::category.overview', compact('category'));

From 5b9a56292b32459fb4bac6d9192dd411513d07c1 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 29 Apr 2025 16:01:22 +0200
Subject: [PATCH 175/244] Implement CSRF validation for search API

---
 resources/js/fetch.js | 1 +
 routes/api.php        | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/js/fetch.js b/resources/js/fetch.js
index cb3ae0aab..3fb77c0d8 100644
--- a/resources/js/fetch.js
+++ b/resources/js/fetch.js
@@ -47,6 +47,7 @@ export const rapidezAPI = (window.rapidezAPI = async (method, endpoint, data = {
         method: method.toUpperCase(),
         headers: Object.assign(
             {
+                Accept: 'application/json',
                 Store: window.config.store_code,
                 Authorization: token.value ? `Bearer ${token.value}` : null,
                 'Content-Type': 'application/json',
diff --git a/routes/api.php b/routes/api.php
index 1d097fa46..5d0716762 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -9,7 +9,12 @@
 
 Route::middleware('api')->prefix('api')->group(function () {
     Route::post('search', [SearchController::class, 'store'])
-        ->middleware('throttle:search-analytics');
+        ->middleware([
+            \Illuminate\Cookie\Middleware\EncryptCookies::class,
+            \Illuminate\Session\Middleware\StartSession::class,
+            \Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class,
+            'throttle:search-analytics'
+        ]);
 
     Route::get('order', OrderController::class);
 

From fe17a2c72cf64724ae983e5c110ab9e6b0e529a1 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Tue, 29 Apr 2025 14:01:54 +0000
Subject: [PATCH 176/244] Apply fixes from Duster

---
 routes/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/api.php b/routes/api.php
index 5d0716762..29f8d88ab 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,7 +13,7 @@
             \Illuminate\Cookie\Middleware\EncryptCookies::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class,
-            'throttle:search-analytics'
+            'throttle:search-analytics',
         ]);
 
     Route::get('order', OrderController::class);

From 21cac988f3be6594fadb2bf277a21234d943e5b6 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Wed, 30 Apr 2025 12:07:13 +0200
Subject: [PATCH 177/244] Implement endpoints to add/update or remove ids to
 index

---
 routes/api.php                           |   8 ++
 src/Http/Controllers/IndexController.php | 102 +++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 src/Http/Controllers/IndexController.php

diff --git a/routes/api.php b/routes/api.php
index dc5bf6495..9edd181b0 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -2,7 +2,9 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Route;
 use Rapidez\Core\Http\Controllers\GetSignedCheckoutController;
+use Rapidez\Core\Http\Controllers\IndexController;
 use Rapidez\Core\Http\Controllers\OrderController;
 use Rapidez\Core\Http\Middleware\VerifyAdminToken;
 
@@ -19,5 +21,11 @@
                 'store' => $request->store ?: false,
             ]);
         });
+
+        Route::post('index/{model}', [IndexController::class, 'store'])
+            ->where('model', '[a-zA-Z0-9_]+');
+
+        Route::delete('index/{model}', [IndexController::class, 'destroy'])
+            ->where('model', '[a-zA-Z0-9_]+');
     });
 });
diff --git a/src/Http/Controllers/IndexController.php b/src/Http/Controllers/IndexController.php
new file mode 100644
index 000000000..e251eba3c
--- /dev/null
+++ b/src/Http/Controllers/IndexController.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Rapidez\Core\Http\Controllers;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\Traits\Searchable;
+use ReflectionMethod;
+
+class IndexController
+{
+    public function store(string $model, Request $request)
+    {
+        $request->validate([
+            'ids' => 'array|required',
+            'ids.*' => 'integer',
+        ]);
+
+        abort_if(!($model = $this->resolveModel($model)), 404);
+
+        $passedStores = $request->input('stores');
+        if (!$passedStores) {
+            return $this->updateSearchable($model, $request->input('ids'));
+        }
+
+        $passedStores = Arr::wrap($passedStores);
+
+        if ($passedStores[0] === 'all' || $passedStores[0] === '*') {
+            $stores = Rapidez::getStores();
+        } else {
+            $stores = Rapidez::getStores($passedStores);
+        }
+
+        foreach ($stores as $store) {
+            Rapidez::setStore($store);
+
+            $this->updateSearchable($model, $request->input('ids'));
+        }
+    }
+
+    public function destroy(string $model, Request $request)
+    {
+        $request->validate([
+            'ids' => 'array|required',
+            'ids.*' => 'integer',
+        ]);
+
+        abort_if(!($model = $this->resolveModel($model)), 404);
+
+        $passedStores = $request->input('stores');
+        if (!$passedStores) {
+            return $this->deleteSearchable($model, $request->input('ids'));
+        }
+
+        $passedStores = Arr::wrap($passedStores);
+
+        if ($passedStores[0] === 'all' || $passedStores[0] === '*') {
+            $stores = Rapidez::getStores();
+        } else {
+            $stores = Rapidez::getStores($passedStores);
+        }
+
+        foreach ($stores as $store) {
+            Rapidez::setStore($store);
+
+            $this->deleteSearchable($model, $request->input('ids'));
+        }
+    }
+
+    protected function deleteSearchable(string $model, array $ids): void
+    {
+        if (empty($ids)) {
+            $model::unsearchable();
+        } else {
+            $model::whereIn((new $model)->getQualifiedKeyName(), $ids)->unsearchable();
+        }
+    }
+
+    protected function updateSearchable(string $model, array $ids): void
+    {
+        $query = $model::where(fn($query) => $model::makeAllSearchableUsing($query));
+
+        if (empty($ids)) {
+            $query->searchable();
+        } else {
+            $query->whereIn((new $model)->getQualifiedKeyName(), $ids)->searchable();
+        }
+    }
+
+    protected function resolveModel(string $model): ?string
+    {
+        $modelClass = Arr::get(config('rapidez.models'), $model);
+
+        if (!$modelClass || !in_array(Searchable::class, class_uses_recursive($modelClass))) {
+            return null;
+        }
+
+        return $modelClass;
+    }
+}

From 0a2bad3b6c6a3ab0586122eee24caee71c3c938a Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Wed, 30 Apr 2025 10:07:42 +0000
Subject: [PATCH 178/244] Apply fixes from Duster

---
 src/Http/Controllers/IndexController.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Http/Controllers/IndexController.php b/src/Http/Controllers/IndexController.php
index e251eba3c..c88154913 100644
--- a/src/Http/Controllers/IndexController.php
+++ b/src/Http/Controllers/IndexController.php
@@ -2,26 +2,24 @@
 
 namespace Rapidez\Core\Http\Controllers;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Traits\Searchable;
-use ReflectionMethod;
 
 class IndexController
 {
     public function store(string $model, Request $request)
     {
         $request->validate([
-            'ids' => 'array|required',
+            'ids'   => 'array|required',
             'ids.*' => 'integer',
         ]);
 
-        abort_if(!($model = $this->resolveModel($model)), 404);
+        abort_if(! ($model = $this->resolveModel($model)), 404);
 
         $passedStores = $request->input('stores');
-        if (!$passedStores) {
+        if (! $passedStores) {
             return $this->updateSearchable($model, $request->input('ids'));
         }
 
@@ -43,14 +41,14 @@ public function store(string $model, Request $request)
     public function destroy(string $model, Request $request)
     {
         $request->validate([
-            'ids' => 'array|required',
+            'ids'   => 'array|required',
             'ids.*' => 'integer',
         ]);
 
-        abort_if(!($model = $this->resolveModel($model)), 404);
+        abort_if(! ($model = $this->resolveModel($model)), 404);
 
         $passedStores = $request->input('stores');
-        if (!$passedStores) {
+        if (! $passedStores) {
             return $this->deleteSearchable($model, $request->input('ids'));
         }
 
@@ -80,7 +78,7 @@ protected function deleteSearchable(string $model, array $ids): void
 
     protected function updateSearchable(string $model, array $ids): void
     {
-        $query = $model::where(fn($query) => $model::makeAllSearchableUsing($query));
+        $query = $model::where(fn ($query) => $model::makeAllSearchableUsing($query));
 
         if (empty($ids)) {
             $query->searchable();
@@ -93,7 +91,7 @@ protected function resolveModel(string $model): ?string
     {
         $modelClass = Arr::get(config('rapidez.models'), $model);
 
-        if (!$modelClass || !in_array(Searchable::class, class_uses_recursive($modelClass))) {
+        if (! $modelClass || ! in_array(Searchable::class, class_uses_recursive($modelClass))) {
             return null;
         }
 

From a6244d50646dd5b03bdb7230ea58cfeebd159917 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 30 Apr 2025 13:01:10 +0200
Subject: [PATCH 179/244] Fix queries in config

---
 src/Http/Controllers/ConfigController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/ConfigController.php b/src/Http/Controllers/ConfigController.php
index ea723d4cd..7bdfaa8da 100644
--- a/src/Http/Controllers/ConfigController.php
+++ b/src/Http/Controllers/ConfigController.php
@@ -140,7 +140,7 @@ public function getGraphqlQueries(): array
         ];
 
         // TODO: Maybe limit this to just the checkout pages?
-        $queries = Arr::mapWithKeys($checkoutQueries, fn ($query) => [$query, view('rapidez::checkout.queries.' . $query)->renderOneliner()]);
+        $queries = Arr::mapWithKeys($checkoutQueries, fn ($query) => [$query => view('rapidez::checkout.queries.' . $query)->renderOneliner()]);
         $queries['customer'] = view('rapidez::customer.queries.customer')->renderOneliner();
 
         return $queries;

From c2d8d13a3fdf2b28eda6c02393b1e6161f6f5490 Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Wed, 30 Apr 2025 13:09:31 +0200
Subject: [PATCH 180/244] Frontend - Instantsearch - Autocomplete - Pagination
 - Equal grid items height

---
 .../components/autocomplete/input.blade.php   | 17 +++-
 .../autocomplete/magnifying-glass.blade.php   |  2 +-
 .../components/input/range-slider.blade.php   | 88 ++++++++++++-------
 .../partials/header/autocomplete.blade.php    |  9 +-
 .../header/autocomplete/all-results.blade.php |  2 +-
 .../header/autocomplete/categories.blade.php  |  8 +-
 .../header/autocomplete/products.blade.php    |  6 +-
 .../listing/partials/filter/price.blade.php   | 25 +-----
 .../listing/partials/filter/search.blade.php  |  7 +-
 .../views/listing/partials/item.blade.php     |  2 +-
 .../listing/partials/item/addtocart.blade.php |  2 +-
 .../listing/partials/pagination.blade.php     | 42 ++-------
 .../views/listing/partials/toolbar.blade.php  |  3 +-
 .../partials/toolbar/sorting.blade.php        |  1 +
 14 files changed, 101 insertions(+), 113 deletions(-)

diff --git a/resources/views/components/autocomplete/input.blade.php b/resources/views/components/autocomplete/input.blade.php
index ed8082a36..e74f1843a 100644
--- a/resources/views/components/autocomplete/input.blade.php
+++ b/resources/views/components/autocomplete/input.blade.php
@@ -1,6 +1,6 @@
 @props(['id' => 'autocomplete'])
 
-<form name="{{ $id }}-form" id="{{ $id }}-form" method="get" action="{{ route('search') }}" class="flex flex-row relative">
+<form name="{{ $id }}-form" id="{{ $id }}-form" method="get" action="{{ route('search') }}" class="flex relative z-header-autocomplete">
     <x-rapidez::input
         {{ $attributes->merge([
             'id' => $id . '-input',
@@ -11,9 +11,22 @@
             'autocapitalize' => 'none',
             'spellcheck' => 'false',
             'placeholder' => __('What are you looking for?'),
+            'class' => 'h-12 peer',
         ]) }}
     />
-    <x-rapidez::button class="absolute right-0 bg-opacity-0 hover:bg-opacity-0 border-none" type="submit">
+    <x-rapidez::button
+        v-on:click="refine('')"
+        class="absolute right-10 bg-opacity-0 hover:bg-opacity-0 border-none transition-all opacity-100 peer-placeholder-shown:opacity-0"
+        type="reset"
+        title="__('Clear the search query')"
+        v-cloak
+    >
+        <x-heroicon-s-x-mark class="size-7" />
+    </x-rapidez::button>
+    <x-rapidez::button
+        class="absolute right-0 bg-opacity-0 hover:bg-opacity-0 border-none *:peer-placeholder-shown:bg-muted *:peer-placeholder-shown:text"
+        type="submit"
+    >
         <x-rapidez::autocomplete.magnifying-glass />
     </x-rapidez::button>
 </form>
diff --git a/resources/views/components/autocomplete/magnifying-glass.blade.php b/resources/views/components/autocomplete/magnifying-glass.blade.php
index 749f8ac0a..6d7864901 100644
--- a/resources/views/components/autocomplete/magnifying-glass.blade.php
+++ b/resources/views/components/autocomplete/magnifying-glass.blade.php
@@ -1,4 +1,4 @@
 {{-- This is the search icon in the autocomplete --}}
-<div {{ $attributes->twMerge('transition-colors duration-300 rounded-lg bg-muted absolute right-1 inset-y-1 w-11 pointer-events-none flex items-center justify-center text z-header-autocomplete-button') }}>
+<div {{ $attributes->twMerge('transition-colors duration-300 rounded-lg bg-primary text-white absolute right-1 inset-y-1 w-11 pointer-events-none flex items-center justify-center z-header-autocomplete-button') }}>
     <x-heroicon-o-magnifying-glass class="size-5" />
 </div>
diff --git a/resources/views/components/input/range-slider.blade.php b/resources/views/components/input/range-slider.blade.php
index 636a1850f..e61ca9b9f 100644
--- a/resources/views/components/input/range-slider.blade.php
+++ b/resources/views/components/input/range-slider.blade.php
@@ -1,36 +1,64 @@
+@props(['inputs' => true])
+
 <range-slider v-slot="rangeInputScope" {{ $attributes }}>
-    <div class="flex flex-1 relative h-16 mx-5">
-        <input
-            type="range"
-            v-bind:disabled="!canRefine"
-            v-bind:min="rangeInputScope.range.min"
-            v-bind:max="rangeInputScope.range.max"
-            v-model="rangeInputScope.minValue"
-            v-on:change="rangeInputScope.updateRefinement"
-            class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cursor-pointer [&::-moz-range-thumb]:pointer-events-auto [&::-webkit-slider-thumb]:pointer-events-auto"
-        >
+    <div class="w-full">
+        <div class="flex flex-1 relative h-8">
+            <input
+                type="range"
+                v-bind:disabled="!canRefine"
+                v-bind:min="rangeInputScope.range.min"
+                v-bind:max="rangeInputScope.range.max"
+                v-model="rangeInputScope.minValue"
+                v-on:change="rangeInputScope.updateRefinement"
+                class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cursor-pointer [&::-moz-range-thumb]:pointer-events-auto [&::-webkit-slider-thumb]:pointer-events-auto"
+            >
 
-        <input
-            type="range"
-            v-bind:disabled="!canRefine"
-            v-bind:min="rangeInputScope.range.min"
-            v-bind:max="rangeInputScope.range.max"
-            v-model="rangeInputScope.maxValue"
-            v-on:change="rangeInputScope.updateRefinement"
-            class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cursor-pointer [&::-moz-range-thumb]:pointer-events-auto [&::-webkit-slider-thumb]:pointer-events-auto"
-        >
+            <input
+                type="range"
+                v-bind:disabled="!canRefine"
+                v-bind:min="rangeInputScope.range.min"
+                v-bind:max="rangeInputScope.range.max"
+                v-model="rangeInputScope.maxValue"
+                v-on:change="rangeInputScope.updateRefinement"
+                class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cursor-pointer [&::-moz-range-thumb]:pointer-events-auto [&::-webkit-slider-thumb]:pointer-events-auto"
+            >
 
-        <div class="relative z-10 h-1 w-full mt-2 mx-2">
-            <div class="absolute z-10 inset-0 rounded-md bg-border"></div>
-            <div class="absolute z-20 inset-y-0 rounded-md bg-primary" v-bind:style="'right:'+rangeInputScope.maxThumb+'%; left:'+rangeInputScope.minThumb+'%'"></div>
-            <div class="absolute z-30 size-5 top-0 left-0 bg-white border rounded-full -mt-2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
-            <div class="absolute z-30 size-5 top-0 right-0 bg-white border rounded-full -mt-2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
-            <div class="absolute z-30 top-4 left-0 bg-white border px-2 py-0.5 rounded-full -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
-                @{{ rangeInputScope.minValue }}
-            </div>
-            <div class="absolute z-30 top-4 right-0 bg-white border px-2 py-0.5 rounded-full translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'">
-                @{{ rangeInputScope.maxValue }}
+            <div class="relative z-10 h-1 w-full mt-2 mx-2">
+                <div class="absolute z-10 inset-0 rounded-md bg-border"></div>
+                <div class="absolute z-20 inset-y-0 rounded-md bg-primary" v-bind:style="'right:'+rangeInputScope.maxThumb+'%; left:'+rangeInputScope.minThumb+'%'"></div>
+                <div class="absolute z-30 size-5 top-0 left-0 bg-white border rounded-full -mt-2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
+                <div class="absolute z-30 size-5 top-0 right-0 bg-white border rounded-full -mt-2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
+                @if (!$inputs)
+                    <div class="absolute z-30 top-4 left-0 bg-white border px-2 py-0.5 rounded-full -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
+                        @{{ rangeInputScope.minValue }}
+                    </div>
+                    <div class="absolute z-30 top-4 right-0 bg-white border px-2 py-0.5 rounded-full translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'">
+                        @{{ rangeInputScope.maxValue }}
+                    </div>
+                @endif
             </div>
         </div>
+        @if ($inputs)
+            <div class="flex items-center gap-x-5">
+                <x-rapidez::input
+                    type="number"
+                    v-bind:disabled="!canRefine"
+                    v-bind:min="rangeInputScope.range.min"
+                    v-bind:max="rangeInputScope.range.max"
+                    v-model="rangeInputScope.minValue"
+                    v-on:input="rangeInputScope.updateRefinement"
+                    class="text-center"
+                />
+                <x-rapidez::input
+                    type="number"
+                    v-bind:disabled="!canRefine"
+                    v-bind:min="rangeInputScope.range.min"
+                    v-bind:max="rangeInputScope.range.max"
+                    v-model="rangeInputScope.maxValue"
+                    v-on:input="rangeInputScope.updateRefinement"
+                    class="text-center"
+                />
+            </div>
+        @endif
     </div>
-</range-input>
+</range-slider>
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 21f713d06..3af2306fc 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -10,7 +10,7 @@ class="contents"
             v-cloak
         >
             <div class="contents">
-                <ais-configure :hitsPerPage="3" />
+                <ais-configure :hits-per-page.camel="3" />
                 <div class="searchbox">
                     <ais-search-box>
                         <template v-slot="{ currentRefinement, isSearchStalled, refine }">
@@ -22,12 +22,13 @@ class="contents"
                                 }"
                                 v-on:input="refine($event.currentTarget.value)"
                             />
+                            <div v-if="currentRefinement" class="absolute inset-x-0 top-14 bg-white border rounded-md z-header-autocomplete">
+                                @include('rapidez::layouts.partials.header.autocomplete.results')
+                            </div>
+                            <div v-if="currentRefinement" class="fixed inset-0 bg-backdrop z-header-autocomplete-overlay"></div>
                         </template>
                     </ais-search-box>
                 </div>
-                <div class="absolute inset-x-0 bg-white border">
-                    @include('rapidez::layouts.partials.header.autocomplete.results')
-                </div>
             </div>
         </ais-instant-search>
         <div v-else class="relative w-full">
diff --git a/resources/views/layouts/partials/header/autocomplete/all-results.blade.php b/resources/views/layouts/partials/header/autocomplete/all-results.blade.php
index ce8f875b4..cbedb24c2 100644
--- a/resources/views/layouts/partials/header/autocomplete/all-results.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/all-results.blade.php
@@ -1,6 +1,6 @@
 <ais-hits>
     <template v-slot="{ items }">
-        <div v-if="items && items.length" class="font-sans px-5 py-2">
+        <div v-if="items && items.length" class="font-sans px-5 py-2.5">
             <x-rapidez::button.primary
                 type="submit"
                 form="autocomplete-form"
diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index 06e4d69ad..a54aa2cd1 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -1,13 +1,13 @@
 <ais-index v-bind:index-name="config.index.category">
     <ais-hits v-slot="{ items }">
-        <div class="border-b p-2" v-if="items && items.length">
+        <div class="border-b py-2.5" v-if="items && items.length">
             <x-rapidez::autocomplete.title>
                 @lang('Categories')
             </x-rapidez::autocomplete.title>
             <ul class="flex flex-col font-sans">
-                <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
-                    <a v-bind:href="item.url" class="relative flex items-center group w-full py-2 text-sm gap-x-4">
-                        <x-rapidez::highlight attribute="name" class="ml-2 line-clamp-2"/>
+                <li v-for="(item, count) in items" class="flex flex-1 items-center w-full hover:bg-muted">
+                    <a v-bind:href="item.url" class="relative flex items-center group w-full px-5 py-2 text-sm gap-x-4">
+                        <x-rapidez::highlight attribute="name" class="line-clamp-2"/>
                     </a>
                 </li>
             </ul>
diff --git a/resources/views/layouts/partials/header/autocomplete/products.blade.php b/resources/views/layouts/partials/header/autocomplete/products.blade.php
index dd136c146..7e0d8ba37 100644
--- a/resources/views/layouts/partials/header/autocomplete/products.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/products.blade.php
@@ -1,12 +1,12 @@
 <ais-hits>
     <template v-slot="{ items }">
-        <div v-if="items && items.length" class="p-2">
+        <div v-if="items && items.length" class="py-2.5">
             <x-rapidez::autocomplete.title>
                 @lang('Products')
             </x-rapidez::autocomplete.title>
             <ul v-for="(item, count) in items" class="gap-2 flex flex-col">
-                <li>
-                    <a :href="item.url | url" class="group relative flex flex-wrap py-2">
+                <li class="hover:bg-muted">
+                    <a :href="item.url | url" class="group relative flex flex-wrap p-2">
                         <img
                             v-if="item.thumbnail"
                             :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento/catalog/product' + item.thumbnail + '.webp'"
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 643a9a686..7d2e0abfc 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -5,8 +5,7 @@
     <template v-slot="{ currentRefinement, range, canRefine, refine, sendEvent }">
         <div v-show="range.max">
             <x-rapidez::filter.heading>
-                {{-- TODO: Handle the padding globally within the component? --}}
-                <div class="flex flex-col pb-4">
+                <div class="flex flex-col">
                     <div class="flex flex-1">
                         <x-rapidez::input.range-slider
                             v-bind:range="range"
@@ -14,28 +13,6 @@
                             v-on:change="refine"
                         />
                     </div>
-
-                    <div class="flex gap-10">
-                        <x-rapidez::input
-                            type="number"
-                            v-bind:min="range.min"
-                            v-bind:max="range.max"
-                            v-bind:placeholder="range.min"
-                            v-bind:disabled="!canRefine"
-                            v-bind:value="currentRefinement.min ?? range.min"
-                            v-on:input="refine({ min: $event.currentTarget.value, max: currentRefinement.max })"
-                        />
-                        <x-rapidez::input
-                            class="text-right"
-                            type="number"
-                            v-bind:min="range.min"
-                            v-bind:max="range.max"
-                            v-bind:placeholder="range.max"
-                            v-bind:disabled="!canRefine"
-                            v-bind:value="currentRefinement.max ?? range.max"
-                            v-on:input="refine({ min: currentRefinement.min, max: $event.currentTarget.value })"
-                        />
-                    </div>
                 </div>
             </x-rapidez::filter.heading>
         </div>
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index 75c119bf0..fe0eeffce 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -1,4 +1,4 @@
-<ais-search-box>
+<ais-search-box class="mb-5">
     <template v-slot="{ currentRefinement, isSearchStalled, refine }">
         <x-rapidez::input
             type="search"
@@ -6,10 +6,5 @@
             v-on:input="refine($event.currentTarget.value)"
             :placeholder="__('Search within the results')"
         />
-        {{--
-        TODO: Maybe use this for a loading icon with the input?
-        But it's super duper fast, does it make sense?
-        <span :hidden="!isSearchStalled">Loading...</span>
-        --}}
     </template>
 </ais-search-box>
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index 0472d0059..8d78e46f7 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -1,6 +1,6 @@
 <div class="size-full" v-bind:key="item.entity_id">
     <add-to-cart v-bind:product="item" v-slot="addToCart" v-cloak>
-        <div class="group relative flex flex-1 flex-col rounded border bg-white p-5">
+        <div class="group relative flex flex-1 flex-col rounded border bg-white p-5 h-full">
             @if (App::providerIsLoaded('Rapidez\Wishlist\WishlistServiceProvider'))
                 <div class="group absolute right-0 top-0 z-10 p-2">
                     @include('rapidez::wishlist.button')
diff --git a/resources/views/listing/partials/item/addtocart.blade.php b/resources/views/listing/partials/item/addtocart.blade.php
index c36d428e2..307720038 100644
--- a/resources/views/listing/partials/item/addtocart.blade.php
+++ b/resources/views/listing/partials/item/addtocart.blade.php
@@ -1,4 +1,4 @@
-<form class="px-2 pb-2" v-on:submit.prevent="addToCart.add">
+<form class="px-2 pb-2 mt-auto" v-on:submit.prevent="addToCart.add">
     <div class="flex items-center space-x-2 mb-2">
         <div class="font-semibold">
             @{{ (addToCart.simpleProduct.special_price || addToCart.simpleProduct.price) | price }}
diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
index 77fd16e06..641960bbe 100644
--- a/resources/views/listing/partials/pagination.blade.php
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -1,51 +1,25 @@
-<ais-pagination class="flex" v-on:page-change="scrollToElement('#products')">
+<ais-pagination :padding="2" class="flex w-full" v-on:page-change="window.scrollTo({ top: 0, behavior: 'smooth' })">
     <template v-slot="{ currentRefinement, nbPages, pages, isFirstPage, isLastPage, refine, createURL }">
-        <ul v-show="nbPages" class="flex gap-2 mx-auto">
-            <li v-if="!isFirstPage">
-                <x-rapidez::button
-                    ::href="createURL(0)"
-                    v-on:click.exact.left.prevent="refine(0)"
-                    :aria-label="__('First Page')"
-                >
-                    @lang('First')
-                </x-rapidez::button>
-            </li>
-            <li v-if="!isFirstPage">
-                <x-rapidez::button
-                    ::href="createURL(currentRefinement - 1)"
-                    v-on:click.exact.left.prevent="refine(currentRefinement - 1)"
-                    :aria-label="__('Previous Page')"
-                >
-                    @lang('Prev')
-                </x-rapidez::button>
-            </li>
+        <ul v-show="nbPages > 1" class="flex flex-wrap gap-2 w-full">
             <li v-for="page in pages" :key="page">
-                <x-rapidez::button
+                <x-rapidez::button.primary
                     ::href="createURL(page)"
                     ::class="{ '!font-bold': page === currentRefinement }"
                     v-on:click.exact.left.prevent="refine(page)"
                     ::aria-label="`{{ __('Page') }} ${page + 1}`"
                 >
                     @{{ page + 1 }}
-                </x-rapidez::button>
+                </x-rapidez::button.primary>
             </li>
-            <li v-if="!isLastPage">
-                <x-rapidez::button
+            <li v-if="!isLastPage" class="max-sm:w-full sm:ml-auto">
+                <x-rapidez::button.primary
                     ::href="createURL(currentRefinement + 1)"
                     v-on:click.exact.left.prevent="refine(currentRefinement + 1)"
                     :aria-label="__('Next Page')"
+                    class="max-sm:w-full"
                 >
                     @lang('Next')
-                </x-rapidez::button>
-            </li>
-            <li v-if="!isLastPage">
-                <x-rapidez::button
-                    ::href="createURL(nbPages)"
-                    v-on:click.exact.left.prevent="refine(nbPages)"
-                    :aria-label="__('Last Page')"
-                >
-                    @lang('Last')
-                </x-rapidez::button>
+                </x-rapidez::button.primary>
             </li>
         </ul>
     </template>
diff --git a/resources/views/listing/partials/toolbar.blade.php b/resources/views/listing/partials/toolbar.blade.php
index b842aa1fc..e7d95c610 100644
--- a/resources/views/listing/partials/toolbar.blade.php
+++ b/resources/views/listing/partials/toolbar.blade.php
@@ -1,5 +1,4 @@
-{{-- TODO: Double check the responsiveness --}}
-<div class="flex gap-1 items-center text-sm">
+<div class="flex gap-1 sm:items-center text-sm max-sm:flex-col-reverse">
     <div class="flex-1">
         @include('rapidez::listing.partials.toolbar.stats')
     </div>
diff --git a/resources/views/listing/partials/toolbar/sorting.blade.php b/resources/views/listing/partials/toolbar/sorting.blade.php
index e59c30064..9c82ca5d3 100644
--- a/resources/views/listing/partials/toolbar/sorting.blade.php
+++ b/resources/views/listing/partials/toolbar/sorting.blade.php
@@ -3,6 +3,7 @@
         <x-rapidez::input.select
             v-bind:value="items.find(item => item.value === currentRefinement)?.value"
             v-on:change="event => refine(event.target.value)"
+            class="pr-8"
         >
             <option
                 v-for="item in items"

From 3393f7791294ae7617f1147a3ab2013fa433bb20 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Wed, 30 Apr 2025 14:23:58 +0200
Subject: [PATCH 181/244] Added Update index command

---
 src/Commands/UpdateIndexCommand.php     | 77 +++++++++++++++++++++++++
 src/Listeners/UpdateLatestIndexDate.php | 26 +++++++++
 src/RapidezServiceProvider.php          |  4 ++
 3 files changed, 107 insertions(+)
 create mode 100644 src/Commands/UpdateIndexCommand.php
 create mode 100644 src/Listeners/UpdateLatestIndexDate.php

diff --git a/src/Commands/UpdateIndexCommand.php b/src/Commands/UpdateIndexCommand.php
new file mode 100644
index 000000000..9fac6af28
--- /dev/null
+++ b/src/Commands/UpdateIndexCommand.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Rapidez\Core\Commands;
+
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+use Rapidez\Core\Events\IndexAfterEvent;
+use Rapidez\Core\Events\IndexBeforeEvent;
+use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\Traits\Searchable;
+
+class UpdateIndexCommand extends Command
+{
+    protected $signature = 'rapidez:index:update {--t|types= : To specify types of models to index, separated by commas} {--s|store= : To specify store IDs from Magento, separated by commas}';
+
+    protected $description = 'Attempt to update changed searchable models into ElasticSearch';
+
+    private ?Carbon $latestIndexDate = null;
+
+    public function handle()
+    {
+        if (!$this->getLatestIndexDate()) {
+            $this->error(__('No latest index date has been found yet, please run php artisan rapidez:index first.'));
+            return;
+        }
+
+        $baseSearchableModels = collect(config('rapidez.models'))
+            ->filter(fn ($class) => in_array(Searchable::class, class_uses_recursive($class)) && (new $class)->getQualifiedUpdatedAtColumn());
+
+        $types = $this->option('types')
+            ? $baseSearchableModels->filter(fn ($model) => in_array((new $model)->getIndexName(), explode(',', $this->option('types'))))
+            : $baseSearchableModels;
+
+        $stores = $this->option('store')
+            ? Rapidez::getStores(explode(',', $this->option('store')))
+            : Rapidez::getStores();
+
+        IndexBeforeEvent::dispatch($this);
+
+        foreach ($stores as $store) {
+            Rapidez::setStore($store);
+
+            $this->line('Store: ' . $store['name']);
+
+            foreach ($types as $type => $model) {
+                $this->updateSearchable($model);
+            }
+        }
+
+        IndexAfterEvent::dispatch($this);
+    }
+
+    protected function updateSearchable(string $model): void
+    {
+        $model::where(fn($query) => $model::makeAllSearchableUsing($query))
+            ->where(
+                (new $model)->getQualifiedUpdatedAtColumn(),
+                '>=',
+                $this->getLatestIndexDate()
+            )
+            ->searchable();
+    }
+
+    protected function getLatestIndexDate(): ?Carbon
+    {
+        if ($this->latestIndexDate) {
+            return $this->latestIndexDate;
+        }
+
+        if(! Storage::disk('local')->exists('/.last-index')) {
+            return null;
+        }
+
+        return $this->latestIndexDate ??= Carbon::parse(Storage::disk('local')->get('/.last-index'));
+    }
+}
diff --git a/src/Listeners/UpdateLatestIndexDate.php b/src/Listeners/UpdateLatestIndexDate.php
new file mode 100644
index 000000000..19c0ee00f
--- /dev/null
+++ b/src/Listeners/UpdateLatestIndexDate.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Rapidez\Core\Listeners;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
+use Rapidez\Core\Events\IndexAfterEvent;
+
+class UpdateLatestIndexDate
+{
+    public function handle()
+    {
+        return Storage::disk('local')->put(
+            '/.last-index',
+            // With this we're just making sure the comparison
+            // is done within the same timezone in MySQL.
+            DB::selectOne('SELECT NOW() AS `current_time`')->current_time
+        );
+    }
+
+    public static function register()
+    {
+        Event::listen(IndexAfterEvent::class, static::class);
+    }
+}
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 847c42028..cecff8d44 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -20,6 +20,7 @@
 use Rapidez\Core\Commands\IndexCommand;
 use Rapidez\Core\Commands\InstallCommand;
 use Rapidez\Core\Commands\InstallTestsCommand;
+use Rapidez\Core\Commands\UpdateIndexCommand;
 use Rapidez\Core\Commands\ValidateCommand;
 use Rapidez\Core\Events\ProductViewEvent;
 use Rapidez\Core\Facades\Rapidez as RapidezFacade;
@@ -32,6 +33,7 @@
 use Rapidez\Core\Listeners\Healthcheck\MagentoSettingsHealthcheck;
 use Rapidez\Core\Listeners\Healthcheck\ModelsHealthcheck;
 use Rapidez\Core\Listeners\ReportProductView;
+use Rapidez\Core\Listeners\UpdateLatestIndexDate;
 use Rapidez\Core\ViewComponents\PlaceholderComponent;
 use Rapidez\Core\ViewDirectives\WidgetDirective;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -87,6 +89,7 @@ protected function bootCommands(): self
     {
         $this->commands([
             IndexCommand::class,
+            UpdateIndexCommand::class,
             ValidateCommand::class,
             InstallCommand::class,
             InstallTestsCommand::class,
@@ -230,6 +233,7 @@ protected function bootListeners(): self
         ModelsHealthcheck::register();
         MagentoSettingsHealthcheck::register();
         ElasticsearchHealthcheck::register();
+        UpdateLatestIndexDate::register();
 
         return $this;
     }

From 73ef3f051d0fa6c01c37eccc21da0dfd157ee27b Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Wed, 30 Apr 2025 12:25:00 +0000
Subject: [PATCH 182/244] Apply fixes from Duster

---
 src/Commands/UpdateIndexCommand.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Commands/UpdateIndexCommand.php b/src/Commands/UpdateIndexCommand.php
index 9fac6af28..b4d0752a1 100644
--- a/src/Commands/UpdateIndexCommand.php
+++ b/src/Commands/UpdateIndexCommand.php
@@ -20,8 +20,9 @@ class UpdateIndexCommand extends Command
 
     public function handle()
     {
-        if (!$this->getLatestIndexDate()) {
+        if (! $this->getLatestIndexDate()) {
             $this->error(__('No latest index date has been found yet, please run php artisan rapidez:index first.'));
+
             return;
         }
 
@@ -53,7 +54,7 @@ public function handle()
 
     protected function updateSearchable(string $model): void
     {
-        $model::where(fn($query) => $model::makeAllSearchableUsing($query))
+        $model::where(fn ($query) => $model::makeAllSearchableUsing($query))
             ->where(
                 (new $model)->getQualifiedUpdatedAtColumn(),
                 '>=',
@@ -68,7 +69,7 @@ protected function getLatestIndexDate(): ?Carbon
             return $this->latestIndexDate;
         }
 
-        if(! Storage::disk('local')->exists('/.last-index')) {
+        if (! Storage::disk('local')->exists('/.last-index')) {
             return null;
         }
 

From 3947d3c0b45cfab68859e7af16096b8f63f19cc3 Mon Sep 17 00:00:00 2001
From: Jordy de Vulder <jordy@justbetter.nl>
Date: Wed, 30 Apr 2025 14:59:06 +0200
Subject: [PATCH 183/244] Prettifying instant search styling

---
 resources/views/category/overview.blade.php   | 14 ++++--
 .../views/components/filter/heading.blade.php | 14 +++---
 resources/views/components/listing.blade.php  | 16 +++---
 resources/views/listing/filters.blade.php     |  6 ++-
 .../listing/partials/filter/boolean.blade.php | 49 +++++++++----------
 .../partials/filter/category.blade.php        | 34 ++++++++++---
 .../listing/partials/filter/select.blade.php  | 40 +++++++--------
 .../partials/filter/selected.blade.php        |  2 +-
 .../listing/partials/filter/swatch.blade.php  | 13 ++---
 resources/views/search/overview.blade.php     |  6 +--
 tailwind.config.js                            | 12 ++++-
 11 files changed, 118 insertions(+), 88 deletions(-)

diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index 84da2e90e..cae769e53 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -8,19 +8,23 @@
 @section('content')
     <div class="container">
         @include('rapidez::category.partials.breadcrumbs')
-        <h1 class="mb-5 text-3xl font-bold">{{ $category->name }}</h1>
 
         @if ($category->is_anchor)
             <x-rapidez::listing
                 :root-path="$category->parentcategories->pluck('name')->join(' > ')"
                 v-bind:category-id="{{ $category->entity_id }}"
-            />
+            >
+                <x-slot:title>
+                    <h1 class="text-3xl font-medium">{{ $category->name }}</h1>
+                </x-slot:title>
+            </x-rapidez::listing>
         @else
-            <div class="flex max-md:flex-col">
-                <div class="xl:w-1/5">
+            <div class="flex flex-col lg:flex-row gap-x-12 gap-y-3">
+                <div class="lg:w-80 shrink-0">
+                    <h1 class="mb-5 text-3xl font-medium">{{ $category->name }}</h1>
                     @widget('sidebar.main', 'anchor_categories', 'catalog_category_view_type_layered', $category->entity_id)
                 </div>
-                <div class="xl:w-4/5">
+                <div class="flex-1">
                     @widget('content.top', 'anchor_categories', 'catalog_category_view_type_layered', $category->entity_id)
                 </div>
             </div>
diff --git a/resources/views/components/filter/heading.blade.php b/resources/views/components/filter/heading.blade.php
index beb8ea0bf..1affbd651 100644
--- a/resources/views/components/filter/heading.blade.php
+++ b/resources/views/components/filter/heading.blade.php
@@ -12,18 +12,20 @@
 do we've pb-4 wrapped around
 it from the filters?
 --}}
-<label class="flex items-center justify-between gap-x-2 border-t pb-2.5 pt-4 text cursor-pointer peer-checked:[&>.chevron]:rotate-180" :for="id">
-    <span class="block font-sans text-base font-semibold">
+<label class="flex items-center justify-between gap-x-2 border-t pt-4 text cursor-pointer peer-checked:[&_svg]:rotate-180" :for="id">
+    <span class="block font-sans font-medium">
         @slotdefault('title')
             @{{ filter?.name?.replace('_', ' ') }}
         @endslotdefault
     </span>
 
-    <x-heroicon-o-chevron-down class="size-4 chevron transition" />
+    <x-heroicon-o-chevron-down class="size-4 transition text-muted" stroke-width="2" />
 </label>
-<div class="peer-checked:*:-my-1 peer-checked:*:py-1 grid grid-rows-[0fr] transition-all peer-checked:grid-rows-[1fr]">
+<div class="grid grid-rows-[0fr] transition-[grid-template-rows] peer-checked:grid-rows-[1fr]">
     {{-- TODO: Why do we need these classes? --}}
-    <div class="-mx-1 overflow-hidden px-1">
-        {{ $slot }}
+    <div class="overflow-hidden px-2 pb-2 -mx-2 -mb-2">
+        <div class="pt-3">
+            {{ $slot }}
+        </div>
     </div>
 </div>
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 79ffbedf0..b9c206b40 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -20,20 +20,22 @@
                 :routing="routing"
             >
                 {{ $before ?? '' }}
-                @if ($slot->isEmpty())
-                    <div class="flex flex-col lg:flex-row gap-x-6 gap-y-3">
-                        <div class="xl:w-1/5">
+
+                @slotdefault('slot')
+                    <div class="flex flex-col lg:flex-row gap-x-12 gap-y-3">
+                        <div class="lg:w-80 shrink-0">
                             @include('rapidez::listing.filters')
                         </div>
                         <div class="flex-1">
+                            {{ $title ?? '' }}
+                            
                             @include('rapidez::listing.products')
                         </div>
                     </div>
-                @else
-                    {{ $slot }}
-                @endif
+                @endslotdefault
+
                 {{ $after ?? '' }}
             </ais-instant-search>
         </div>
     </listing>
-</div>
+</div>3
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index 4b2fc0231..bf953739a 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -11,16 +11,20 @@
     ]))
 @endPushOnce
 <x-rapidez::slideover.mobile :$id :title="__('Filters')">
-    <div class="w-full p-2 max-lg:bg-white max-lg:p-5">
+    <div class="max-lg:container max-lg:py-6">
+        <p class="text-xl/9 font-medium mb-3">@lang('Filters')</p>
+
         @include('rapidez::listing.partials.filter.selected')
         @include('rapidez::listing.partials.filter.search')
         @include('rapidez::listing.partials.filter.category')
+
         <template v-for="filter in config.filterable_attributes">
             @include('rapidez::listing.partials.filter.price')
             @include('rapidez::listing.partials.filter.swatch')
             @include('rapidez::listing.partials.filter.boolean')
             @include('rapidez::listing.partials.filter.select')
         </template>
+
         <x-rapidez::button.primary for="{{ $id }}" class="w-full text-sm lg:hidden">
             @lang('Show results')
         </x-rapidez::button.primary>
diff --git a/resources/views/listing/partials/filter/boolean.blade.php b/resources/views/listing/partials/filter/boolean.blade.php
index 3fa84a7fc..bf9c679ef 100644
--- a/resources/views/listing/partials/filter/boolean.blade.php
+++ b/resources/views/listing/partials/filter/boolean.blade.php
@@ -4,36 +4,31 @@
     operator="and"
 >
     <template v-slot="{ items, refine }">
-        <div v-show="items.length" class="relative pb-4">
+        <div v-show="items.length" class="relative pb-5">
             <x-rapidez::filter.heading>
-                <ul class="flex flex-col gap-1">
-                    <li
-                        v-for="item in items"
-                        class="flex justify-between text-base text-muted"
-                    >
-                        <div class="flex">
-                            <x-rapidez::input.checkbox
-                                v-bind:checked="item.isRefined"
-                                v-on:change="refine(item.value)"
+                <div class="flex flex-col *:py-1 first:*:pt-0 last:*:pb-0">
+                    <template v-for="item in items">
+                        <x-rapidez::input.checkbox
+                            v-bind:checked="item.isRefined"
+                            v-on:change="refine(item.value)"
+                        >
+                            <span
+                                class="items-baseline flex text-base/5"
+                                :class="item.isRefined ? 'text' : 'text-muted hover:text'"
                             >
-                                <span
-                                    class="font-sans font-medium items-center text-sm flex"
-                                    :class="item.isRefined ? 'text' : 'text-muted'"
-                                >
-                                    <template v-if="item.value == '1'">
-                                        @lang('Yes')
-                                    </template>
-                                    <template v-if="item.value == '0'">
-                                        @lang('No')
-                                    </template>
-                                    <span class="block ml-0.5 text-xs">
-                                        (@{{ item.count }})
-                                    </span>
+                                <template v-if="item.value == '1'">
+                                    @lang('Yes')
+                                </template>
+                                <template v-if="item.value == '0'">
+                                    @lang('No')
+                                </template>
+                                <span class="block ml-0.5 text-xs">
+                                    (@{{ item.count }})
                                 </span>
-                            </x-rapidez::input.checkbox>
-                        </div>
-                    </li>
-                </ul>
+                            </span>
+                        </x-rapidez::input.checkbox>
+                    </template>
+                </div>
             </x-rapidez::filter.heading>
         </div>
     </template>
diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 0f329899f..69d485ff9 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -2,30 +2,48 @@
     v-bind:attributes="categoryAttributes"
     @attributes(['root-path' => $rootPath])
     show-more
+    :limit="6"
 >
-    <template v-slot="{ items, refine, createURL }">
-        <div v-show="items.length">
+    <template v-slot="{ items, refine, createURL, isShowingMore, toggleShowMore, canToggleShowMore }">
+        <div v-show="items.length" class="relative pb-5">
             <x-rapidez::filter.heading>
                 <x-slot:title>
                     @lang('Category')
                 </x-slot:title>
-                <recursion :data="items" v-slot="{ data, components }">
-                    <ul>
-                        <li class="pl-3" v-for="(item, index) in data" :key="item.value">
+                <recursion :data="items" v-slot="{ data, components }" class="text-base/5">
+                    <ul class="relative before:absolute before:left-0 before:border-l before:bottom-2.5 before:-translate-y-1 before:top-1.5 -my-1">
+                        <li class="pl-6 relative before:absolute before:left-0 before:w-3 before:border-b before:top-3 before:translate-y-0.5" v-for="(item, index) in data" :key="item.value">
                             <a
+                                class="hover:text inline-block py-1"
                                 :href="createURL(item.value)"
-                                :class="{ 'font-bold': item.isRefined }"
+                                :class="{ 
+                                    'font-medium': item.isRefined,
+                                    'text-muted': !item.isRefined,
+                                }"
                                 v-on:click.exact.left.prevent="refine(item.value)"
                             >
                                 @{{ item.label }}
-                                (@{{ item.count }})
+                                <span class="text-xs">(@{{ item.count }})</span>
                             </a>
 
-                            <component :is="components[index]" />
+                            <component :is="components[index]" class="mt-1.5 mb-2.5 text-sm/5" />
                         </li>
                     </ul>
                 </recursion>
             </x-rapidez::filter.heading>
+
+            <button
+                v-if="canToggleShowMore"
+                v-on:click="toggleShowMore"
+                class="text-sm text-primary font-medium mt-3 hover:underline"
+            >
+                <span v-if="isShowingMore" class="flex gap-x-4">
+                    @lang('Less options')
+                </span>
+                <span v-else class="flex gap-x-4">
+                    @lang('More options')
+                </span>
+            </button>
         </div>
     </template>
 </ais-hierarchical-menu>
diff --git a/resources/views/listing/partials/filter/select.blade.php b/resources/views/listing/partials/filter/select.blade.php
index 98950003f..45883bdfe 100644
--- a/resources/views/listing/partials/filter/select.blade.php
+++ b/resources/views/listing/partials/filter/select.blade.php
@@ -2,6 +2,7 @@
     v-if="['select', 'multiselect'].includes(filter.input) && !(filter.text_swatch || filter.visual_swatch)"
     :operator="filter.input == 'multiselect' ? 'and' : 'or'"
     :attribute="filter.code"
+    :limit="6"
     show-more
 >
     <template v-slot="{ items, refine, isShowingMore, toggleShowMore, canToggleShowMore }">
@@ -10,34 +11,29 @@
         We also have padding in the heading?
         Maybe handle that in 1 place?
         --}}
-        <div v-show="items.length" class="relative pb-4">
+        <div v-show="items.length" class="relative pb-5">
             <x-rapidez::filter.heading>
-                <ul class="flex flex-col gap-1">
-                    <li
-                        v-for="item in items"
-                        class="flex justify-between text-base text-muted"
-                    >
-                        <div class="flex">
-                            <x-rapidez::input.checkbox
-                                v-bind:checked="item.isRefined"
-                                v-on:change="refine(item.value)"
+                <div class="flex flex-col *:py-1 first:*:pt-0 last:*:pb-0">
+                    <template v-for="item in items">
+                        <x-rapidez::input.checkbox
+                            v-bind:checked="item.isRefined"
+                            v-on:change="refine(item.value)"
+                        >
+                            <span
+                                class="items-baseline flex text-base/5"
+                                :class="item.isRefined ? 'text' : 'text-muted hover:text'"
                             >
-                                <span
-                                    class="font-sans font-medium items-center text-sm flex"
-                                    :class="item.isRefined ? 'text' : 'text-muted'"
-                                >
-                                    @{{ item.label }}
-                                    <span class="block ml-0.5 text-xs">(@{{ item.count }})</span>
-                                </span>
-                            </x-rapidez::input.checkbox>
-                        </div>
-                    </li>
-                </ul>
+                                @{{ item.label }}
+                                <span class="block ml-0.5 text-xs">(@{{ item.count }})</span>
+                            </span>
+                        </x-rapidez::input.checkbox>
+                    </template>
+                </div>
 
                 <button
                     v-if="canToggleShowMore"
                     v-on:click="toggleShowMore"
-                    class="text-sm text-primary"
+                    class="text-sm text-primary font-medium mt-3 hover:underline"
                 >
                     <span v-if="isShowingMore" class="flex gap-x-4">
                         @lang('Less options')
diff --git a/resources/views/listing/partials/filter/selected.blade.php b/resources/views/listing/partials/filter/selected.blade.php
index cc75b9a93..99ec9d6e5 100644
--- a/resources/views/listing/partials/filter/selected.blade.php
+++ b/resources/views/listing/partials/filter/selected.blade.php
@@ -1,7 +1,7 @@
 <ais-clear-refinements>
     <template v-slot="{ canRefine, refine, createURL }">
         <div v-show="canRefine" class="flex flex-wrap items-baseline justify-between gap-2 w-full pb-2">
-            <div class="font-semibold text-base">
+            <div class="font-medium text-base">
                 @lang('Selected filters'):
             </div>
             <a
diff --git a/resources/views/listing/partials/filter/swatch.blade.php b/resources/views/listing/partials/filter/swatch.blade.php
index 76e414eae..d9acc03ef 100644
--- a/resources/views/listing/partials/filter/swatch.blade.php
+++ b/resources/views/listing/partials/filter/swatch.blade.php
@@ -5,14 +5,14 @@
     :attribute="filter.code"
 >
     <template v-slot="{ items, refine }">
-        <div v-show="items.length" class="relative pb-4">
+        <div v-show="items.length" class="relative pb-5">
             <x-rapidez::filter.heading>
-                <ul class="flex flex-wrap gap-2 items-center my-1">
+                <ul class="flex flex-wrap gap-x-1.5 gap-y-2 items-center pr-14 pb-1">
                     <li v-for="item in withSwatches(items, filter)">
                         <label
                             v-if="filter.visual_swatch"
-                            class="size-6 ring-1 ring-emphasis/10 ring-inset cursor-pointer flex items-center justify-center hover:opacity-75 rounded-full transition"
-                            v-bind:class="{ 'outline outline-2 outline-emphasis outline-offset-1': item.isRefined }"
+                            class="block size-6 cursor-pointer flex border items-center justify-center hover:opacity-75 rounded-full border-black/15"
+                            v-bind:class="{ 'ring-black ring-1 ring-offset-2': item.isRefined }"
                             v-bind:style="{ background: item.swatch?.swatch ?? 'none' }"
                         >
                             <input
@@ -24,8 +24,9 @@ class="hidden"
                         </label>
                         <label
                             v-else
-                            class="border px-3 transition-all rounded cursor-pointer text-sm text-muted font-medium"
-                            v-bind:class="{ 'outline outline-2 outline-emphasis outline-offset-1': item.isRefined }"
+                            class="block border px-3 py-1.5 rounded-md cursor-pointer text-sm text-muted font-medium hover:border-emphasis"
+                            v-bind:class="{ 'bg-severe-emphasis !border-severe-emphasis text-white': item.isRefined }"
+                            v-bind:style="{ background: item.swatch?.swatch ?? 'none' }"
                         >
                             @{{ item.swatch?.swatch ?? item.value }}
                             <input
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 95d7abaca..0293288a1 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -9,10 +9,10 @@
 @section('content')
     <div class="container">
         <x-rapidez::listing filter-query-string="visibility:(3 OR 4)">
-            <x-slot:before>
+            <x-slot:title>
                 <ais-state-results>
                     <template v-slot="{ state: { query } }">
-                        <h1 class="font-bold text-3xl">
+                        <h1 class="font-medium text-3xl">
                             <template v-if="query">
                                 @lang('Search for'): @{{ query }}
                             </template>
@@ -22,7 +22,7 @@
                         </h1>
                     </template>
                 </ais-state-results>
-            </x-slot:before>
+            </x-slot:title>
         </x-rapidez::listing>
     </div>
 @endsection
diff --git a/tailwind.config.js b/tailwind.config.js
index 98e144059..a7c4bed17 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -48,12 +48,14 @@ export default {
                 },
 
                 border: {
+                    'severe-emphasis': color('--border-severe-emphasis', colors.slate[800]),
                     emphasis: color('--border-emphasis', colors.slate[400]),
                     DEFAULT: color('--border', colors.slate[300]),
                     muted: color('--border-muted', colors.slate[100]),
                 },
 
                 background: {
+                    'severe-emphasis': color('--background-severe-emphasis', colors.slate[800]),
                     emphasis: color('--background-emphasis', colors.slate[200]),
                     DEFAULT: color('--background', colors.slate[100]),
                     muted: color('--background-muted', colors.slate[50]),
@@ -79,12 +81,18 @@ export default {
 
                 'cookie': '140',
             },
-            textColor: (theme) => theme('colors.foreground'),
+            textColor: (theme) => ({
+                default: theme('colors.foreground'),
+                ...theme('colors.foreground'),
+            }),
             borderColor: (theme) => ({
                 default: theme('colors.border'),
                 ...theme('colors.border'),
             }),
-            backgroundColor: (theme) => theme('colors.background'),
+            backgroundColor: (theme) => ({
+                default: theme('colors.background'),
+                ...theme('colors.background'),
+            }),
             ringColor: (theme) => ({
                 default: theme('colors.border'),
                 ...theme('colors.border'),

From 41661088694f150d3b5ba0b4950a819a75fa9574 Mon Sep 17 00:00:00 2001
From: jordythevulder <jordythevulder@users.noreply.github.com>
Date: Wed, 30 Apr 2025 12:59:33 +0000
Subject: [PATCH 184/244] Apply fixes from Duster

---
 resources/views/components/listing.blade.php               | 2 +-
 resources/views/listing/partials/filter/category.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index b9c206b40..de8b16f95 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -28,7 +28,7 @@
                         </div>
                         <div class="flex-1">
                             {{ $title ?? '' }}
-                            
+
                             @include('rapidez::listing.products')
                         </div>
                     </div>
diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 69d485ff9..e392194b8 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -16,7 +16,7 @@
                             <a
                                 class="hover:text inline-block py-1"
                                 :href="createURL(item.value)"
-                                :class="{ 
+                                :class="{
                                     'font-medium': item.isRefined,
                                     'text-muted': !item.isRefined,
                                 }"

From 7cb691ce3987f13b55fab974d774be4083e66be6 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Wed, 30 Apr 2025 15:07:23 +0200
Subject: [PATCH 185/244] Return after delete and update function

---
 src/Http/Controllers/IndexController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/IndexController.php b/src/Http/Controllers/IndexController.php
index c88154913..e8252a0bf 100644
--- a/src/Http/Controllers/IndexController.php
+++ b/src/Http/Controllers/IndexController.php
@@ -20,7 +20,9 @@ public function store(string $model, Request $request)
 
         $passedStores = $request->input('stores');
         if (! $passedStores) {
-            return $this->updateSearchable($model, $request->input('ids'));
+            $this->updateSearchable($model, $request->input('ids'));
+
+            return;
         }
 
         $passedStores = Arr::wrap($passedStores);
@@ -49,7 +51,9 @@ public function destroy(string $model, Request $request)
 
         $passedStores = $request->input('stores');
         if (! $passedStores) {
-            return $this->deleteSearchable($model, $request->input('ids'));
+            $this->deleteSearchable($model, $request->input('ids'));
+
+            return;
         }
 
         $passedStores = Arr::wrap($passedStores);

From f9667c6b0cae8a89c403569d15c427d4d1f2e178 Mon Sep 17 00:00:00 2001
From: Jordy de Vulder <jordy@justbetter.nl>
Date: Wed, 30 Apr 2025 15:10:21 +0200
Subject: [PATCH 186/244] Cleaning code

---
 resources/views/components/listing.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index b9c206b40..e7795d7e8 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -28,7 +28,7 @@
                         </div>
                         <div class="flex-1">
                             {{ $title ?? '' }}
-                            
+
                             @include('rapidez::listing.products')
                         </div>
                     </div>
@@ -38,4 +38,4 @@
             </ais-instant-search>
         </div>
     </listing>
-</div>3
+</div>

From 4f5d384dcc1b4a470f85f305110980242e93f25e Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Wed, 30 Apr 2025 15:56:48 +0200
Subject: [PATCH 187/244] Frontend - Range slider fixes

---
 .../views/components/input/range-slider.blade.php  | 14 +++++++-------
 .../views/listing/partials/filter/price.blade.php  |  1 +
 resources/views/listing/products.blade.php         |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/resources/views/components/input/range-slider.blade.php b/resources/views/components/input/range-slider.blade.php
index e61ca9b9f..4439f4b36 100644
--- a/resources/views/components/input/range-slider.blade.php
+++ b/resources/views/components/input/range-slider.blade.php
@@ -2,7 +2,7 @@
 
 <range-slider v-slot="rangeInputScope" {{ $attributes }}>
     <div class="w-full">
-        <div class="flex flex-1 relative h-8">
+        <div class="flex flex-1 relative">
             <input
                 type="range"
                 v-bind:disabled="!canRefine"
@@ -23,11 +23,11 @@ class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cu
                 class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cursor-pointer [&::-moz-range-thumb]:pointer-events-auto [&::-webkit-slider-thumb]:pointer-events-auto"
             >
 
-            <div class="relative z-10 h-1 w-full mt-2 mx-2">
-                <div class="absolute z-10 inset-0 rounded-md bg-border"></div>
-                <div class="absolute z-20 inset-y-0 rounded-md bg-primary" v-bind:style="'right:'+rangeInputScope.maxThumb+'%; left:'+rangeInputScope.minThumb+'%'"></div>
-                <div class="absolute z-30 size-5 top-0 left-0 bg-white border rounded-full -mt-2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
-                <div class="absolute z-30 size-5 top-0 right-0 bg-white border rounded-full -mt-2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
+            <div class="relative z-10 w-full mx-2 h-4">
+                <div class="absolute top-1/2 -translate-y-1/2 h-1 z-10 -inset-x-2 rounded-md bg-emphasis"></div>
+                <div class="absolute top-1/2 -translate-y-1/2 h-1 z-20 rounded-md bg-severe-emphasis" v-bind:style="'right:'+rangeInputScope.maxThumb+'%; left:'+rangeInputScope.minThumb+'%'"></div>
+                <div class="absolute z-30 size-4 top-1/2 left-0 bg-severe-emphasis rounded-full -translate-y-1/2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
+                <div class="absolute z-30 size-4 top-1/2 right-0 bg-severe-emphasis rounded-full -translate-y-1/2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
                 @if (!$inputs)
                     <div class="absolute z-30 top-4 left-0 bg-white border px-2 py-0.5 rounded-full -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
                         @{{ rangeInputScope.minValue }}
@@ -39,7 +39,7 @@ class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cu
             </div>
         </div>
         @if ($inputs)
-            <div class="flex items-center gap-x-5">
+            <div class="flex items-center gap-x-4 mt-4">
                 <x-rapidez::input
                     type="number"
                     v-bind:disabled="!canRefine"
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 7d2e0abfc..abf39b8a6 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -1,6 +1,7 @@
 <ais-range-input
     v-if="rangeAttributes.includes(filter.code)"
     :attribute="filter.code"
+    class="pb-5"
 >
     <template v-slot="{ currentRefinement, range, canRefine, refine, sendEvent }">
         <div v-show="range.max">
diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index 6ab5ef48e..c9c63937e 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -13,7 +13,7 @@
     )
 @endPushOnce
 
-<div id="products" class="flex flex-col gap-3 *:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end">
+<div id="products" class="flex flex-col gap-3 max-md:mt-3 *:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end">
     @include('rapidez::listing.partials.toolbar')
 
     <ais-hits>

From 0e537869c8c50fdba162d8a7f349168d58d2b2ca Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Thu, 1 May 2025 14:01:39 +0200
Subject: [PATCH 188/244] shorten current time query

Co-authored-by: Jade Geels <jade@justbetter.nl>
---
 src/Listeners/UpdateLatestIndexDate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Listeners/UpdateLatestIndexDate.php b/src/Listeners/UpdateLatestIndexDate.php
index 19c0ee00f..1c83d9cdf 100644
--- a/src/Listeners/UpdateLatestIndexDate.php
+++ b/src/Listeners/UpdateLatestIndexDate.php
@@ -15,7 +15,7 @@ public function handle()
             '/.last-index',
             // With this we're just making sure the comparison
             // is done within the same timezone in MySQL.
-            DB::selectOne('SELECT NOW() AS `current_time`')->current_time
+            DB::scalar('SELECT NOW()')
         );
     }
 

From 546675b62aacb4189f0608fcca7b08f268a95404 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Thu, 1 May 2025 16:59:36 +0200
Subject: [PATCH 189/244] Listen to the autocomplete config for size

---
 config/rapidez/frontend.php                                 | 6 +-----
 .../views/layouts/partials/header/autocomplete.blade.php    | 2 +-
 .../partials/header/autocomplete/categories.blade.php       | 3 +++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index ddff059e9..b0feebded 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -31,18 +31,14 @@
         // Attach additional indexes to the autocomplete
         // Uses the views in rapidez::layouts.partials.header.autocomplete
         'additionals' => [
-            'categories' => ['name^3', 'description'],
+            'categories' => [],
 
             // For example:
             // 'blogs' => [
-            //     'fields' => ['title^3', 'description'],  // Required
             //     'size' => 3,                             // Optional; Overrides the default `size` as defined below
-            //     'stores' => ['my_second_store'],         // Optional; Define this only if you want to specify which stores use this index
-            //     'sort' => ['date' => 'desc'],            // Optional; See: https://www.elastic.co/guide/en/elasticsearch/reference/7.17/sort-search-results.html)
             // ],
         ],
 
-        'debounce' => 500,
         'size'     => 3,
     ],
 
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 21f713d06..99ae11e13 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -10,7 +10,7 @@ class="contents"
             v-cloak
         >
             <div class="contents">
-                <ais-configure :hitsPerPage="3" />
+                <ais-configure :hits-per-page.camel="{{ config('rapidez.frontend.autocomplete.size', 3) }}" />
                 <div class="searchbox">
                     <ais-search-box>
                         <template v-slot="{ currentRefinement, isSearchStalled, refine }">
diff --git a/resources/views/layouts/partials/header/autocomplete/categories.blade.php b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
index 06e4d69ad..cd85ec0c2 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -1,4 +1,7 @@
 <ais-index v-bind:index-name="config.index.category">
+    @if ($size = Arr::get($fields, 'size'))
+        <ais-configure :hits-per-page.camel="{{ $size }}" />
+    @endif
     <ais-hits v-slot="{ items }">
         <div class="border-b p-2" v-if="items && items.length">
             <x-rapidez::autocomplete.title>

From efb019eedc234eeba097d8e87c57d546ef79b24d Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Thu, 1 May 2025 15:00:04 +0000
Subject: [PATCH 190/244] Apply fixes from Duster

---
 config/rapidez/frontend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index b0feebded..9a3a1a948 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -39,7 +39,7 @@
             // ],
         ],
 
-        'size'     => 3,
+        'size' => 3,
     ],
 
     // Link store codes to theme folders

From 602499a57f3a54a9053a63e35548f60165389189 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 2 May 2025 10:02:30 +0200
Subject: [PATCH 191/244] Fix closing tag on items breaking some elements

---
 resources/views/components/highlight.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/highlight.blade.php b/resources/views/components/highlight.blade.php
index 84c4aa0b4..cb7b9528e 100644
--- a/resources/views/components/highlight.blade.php
+++ b/resources/views/components/highlight.blade.php
@@ -5,7 +5,7 @@
         'v-bind:hit' => $item,
         'attribute' => $attribute,
         'highlighted-tag-name' => $highlightTag,
-    ]) }}/>
+    ]) }}></ais-highlight>
 @else
     <span {{ $attributes }} v-text="{{ $item }}.{{ $attribute }}"></span>
 @endif

From cb0e0f3d12f067b7710081eae7b81f7cadcb8bda Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Fri, 2 May 2025 10:08:09 +0200
Subject: [PATCH 192/244] Move read more / less button in accordion

---
 .../partials/filter/category.blade.php        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index e392194b8..8c454d62e 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -14,7 +14,7 @@
                     <ul class="relative before:absolute before:left-0 before:border-l before:bottom-2.5 before:-translate-y-1 before:top-1.5 -my-1">
                         <li class="pl-6 relative before:absolute before:left-0 before:w-3 before:border-b before:top-3 before:translate-y-0.5" v-for="(item, index) in data" :key="item.value">
                             <a
-                                class="hover:text inline-block py-1"
+                                class="break-words inline-block py-1 hover:text"
                                 :href="createURL(item.value)"
                                 :class="{
                                     'font-medium': item.isRefined,
@@ -30,20 +30,20 @@ class="hover:text inline-block py-1"
                         </li>
                     </ul>
                 </recursion>
-            </x-rapidez::filter.heading>
 
-            <button
-                v-if="canToggleShowMore"
-                v-on:click="toggleShowMore"
-                class="text-sm text-primary font-medium mt-3 hover:underline"
-            >
-                <span v-if="isShowingMore" class="flex gap-x-4">
-                    @lang('Less options')
-                </span>
-                <span v-else class="flex gap-x-4">
-                    @lang('More options')
-                </span>
-            </button>
+                <button
+                    v-if="canToggleShowMore"
+                    v-on:click="toggleShowMore"
+                    class="text-sm text-primary font-medium mt-3 hover:underline"
+                >
+                    <span v-if="isShowingMore" class="flex gap-x-4">
+                        @lang('Less options')
+                    </span>
+                    <span v-else class="flex gap-x-4">
+                        @lang('More options')
+                    </span>
+                </button>
+            </x-rapidez::filter.heading>
         </div>
     </template>
 </ais-hierarchical-menu>

From 83b9619ef93309fd7666297a7f8142807fc74763 Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Fri, 2 May 2025 10:35:05 +0200
Subject: [PATCH 193/244] Small fixes

---
 resources/views/listing/filters.blade.php             |  9 +++------
 resources/views/listing/partials/pagination.blade.php | 10 +++++-----
 resources/views/listing/products.blade.php            | 10 +++++++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index bf953739a..da68b4504 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -1,4 +1,3 @@
-@php($id = uniqid('filters-'))
 @pushOnce('head', 'listing-filters')
     @vite(vite_filename_paths([
         'ClearRefinements.vue',
@@ -10,7 +9,7 @@
         'HierarchicalMenu.vue',
     ]))
 @endPushOnce
-<x-rapidez::slideover.mobile :$id :title="__('Filters')">
+<x-rapidez::slideover.mobile id="category-filters-slideover" :title="__('Filters')">
     <div class="max-lg:container max-lg:py-6">
         <p class="text-xl/9 font-medium mb-3">@lang('Filters')</p>
 
@@ -25,12 +24,10 @@
             @include('rapidez::listing.partials.filter.select')
         </template>
 
-        <x-rapidez::button.primary for="{{ $id }}" class="w-full text-sm lg:hidden">
+        <x-rapidez::button.primary for="category-filters-slideover" class="w-full text-sm lg:hidden">
             @lang('Show results')
         </x-rapidez::button.primary>
     </div>
 </x-rapidez::slideover.mobile>
 
-<x-rapidez::button.secondary :for="$id" class="w-full lg:hidden">
-    @lang('Filters')
-</x-rapidez::button.secondary>
+
diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
index 641960bbe..d951a6a23 100644
--- a/resources/views/listing/partials/pagination.blade.php
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -2,24 +2,24 @@
     <template v-slot="{ currentRefinement, nbPages, pages, isFirstPage, isLastPage, refine, createURL }">
         <ul v-show="nbPages > 1" class="flex flex-wrap gap-2 w-full">
             <li v-for="page in pages" :key="page">
-                <x-rapidez::button.primary
+                <x-rapidez::button
                     ::href="createURL(page)"
-                    ::class="{ '!font-bold': page === currentRefinement }"
+                    ::class="{ '!bg-white !border !border-severe-emphasis !border-b-severe-emphasis': page === currentRefinement }"
                     v-on:click.exact.left.prevent="refine(page)"
                     ::aria-label="`{{ __('Page') }} ${page + 1}`"
                 >
                     @{{ page + 1 }}
-                </x-rapidez::button.primary>
+                </x-rapidez::button>
             </li>
             <li v-if="!isLastPage" class="max-sm:w-full sm:ml-auto">
-                <x-rapidez::button.primary
+                <x-rapidez::button
                     ::href="createURL(currentRefinement + 1)"
                     v-on:click.exact.left.prevent="refine(currentRefinement + 1)"
                     :aria-label="__('Next Page')"
                     class="max-sm:w-full"
                 >
                     @lang('Next')
-                </x-rapidez::button.primary>
+                </x-rapidez::button>
             </li>
         </ul>
     </template>
diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index c9c63937e..231f023c1 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -13,9 +13,13 @@
     )
 @endPushOnce
 
-<div id="products" class="flex flex-col gap-3 max-md:mt-3 *:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end">
-    @include('rapidez::listing.partials.toolbar')
-
+<div id="products" class="flex flex-col gap-3 max-lg:mt-3 max-lg:flex-wrap">
+    <x-rapidez::button.secondary for="category-filters-slideover" class="w-full lg:hidden">
+        @lang('Filters')
+    </x-rapidez::button.secondary>
+    <div class="*:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end">
+        @include('rapidez::listing.partials.toolbar')
+    </div>
     <ais-hits>
         <template v-slot="{ items }">
             <div v-if="items.length" class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 overflow-hidden">

From 57233bd47448ad0946d681a2682459f680ca6b39 Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Fri, 2 May 2025 10:37:18 +0200
Subject: [PATCH 194/244] Close autocomplete on backdrop click

---
 resources/views/layouts/partials/header/autocomplete.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 3af2306fc..7cf5e2032 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -25,7 +25,7 @@ class="contents"
                             <div v-if="currentRefinement" class="absolute inset-x-0 top-14 bg-white border rounded-md z-header-autocomplete">
                                 @include('rapidez::layouts.partials.header.autocomplete.results')
                             </div>
-                            <div v-if="currentRefinement" class="fixed inset-0 bg-backdrop z-header-autocomplete-overlay"></div>
+                            <div v-if="currentRefinement" v-on:click="refine('')" class="fixed inset-0 bg-backdrop z-header-autocomplete-overlay"></div>
                         </template>
                     </ais-search-box>
                 </div>

From e34b59005c8d9a5f7f3890a314c2cb73a3261906 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 2 May 2025 11:09:32 +0200
Subject: [PATCH 195/244] Allow setting of mappings & settings per index for
 individual models

---
 src/Commands/IndexCommand.php            | 10 +++++++++-
 src/Models/Traits/Product/Searchable.php | 23 +++++++++++++++++++++++
 src/Models/Traits/Searchable.php         | 10 ++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 4a92781e1..46f4881a1 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -36,7 +36,15 @@ public function handle()
 
             $this->line('Store: ' . $store['name']);
 
-            foreach ($types as $type => $model) {
+            foreach ($types as $model) {
+                $searchableAs = (new $model)->searchableAs();
+                if ($model::getIndexMappings()) {
+                    config()->set('elasticsearch.indices.mappings.' . $searchableAs, $model::getIndexMappings());
+                }
+                if ($model::getIndexSettings()) {
+                    config()->set('elasticsearch.indices.settings.' . $searchableAs, $model::getIndexSettings());
+                }
+
                 $this->call('scout:import', [
                     'searchable' => $model,
                 ]);
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 1b45e11b5..4fa24bb9d 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -119,4 +119,27 @@ public function withCategories(array $data): array
 
         return $data;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getIndexMappings(): ?array
+    {
+        return [
+            'properties' => [
+                'price' => [
+                    'type' => 'double',
+                ],
+                'children' => [
+                    'type' => 'flattened',
+                ],
+                'grouped' => [
+                    'type' => 'flattened',
+                ],
+                'positions' => [
+                    'type' => 'flattened',
+                ],
+            ],
+        ];
+    }
 }
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index e5d405e37..cea86cf0e 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -37,4 +37,14 @@ public function searchableAs(): string
             config('rapidez.store'),
         ]));
     }
+
+    public static function getIndexMappings(): ?array
+    {
+        return null;
+    }
+
+    public static function getIndexSettings(): ?array
+    {
+        return null;
+    }
 }

From 88a0feabb9f1bbb083e1777d24399a15fb4e69d4 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Fri, 2 May 2025 14:43:36 +0200
Subject: [PATCH 196/244] Fix price input not being emptyable

---
 .../views/listing/partials/filter/price.blade.php      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 643a9a686..c89519e84 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -23,7 +23,10 @@
                             v-bind:placeholder="range.min"
                             v-bind:disabled="!canRefine"
                             v-bind:value="currentRefinement.min ?? range.min"
-                            v-on:input="refine({ min: $event.currentTarget.value, max: currentRefinement.max })"
+                            v-on:input="if (!$event.currentTarget.validationMessage) {
+                                refine({ min: Math.max($event.currentTarget.value, range.min), max: currentRefinement.max })
+                            }"
+                            required
                         />
                         <x-rapidez::input
                             class="text-right"
@@ -33,7 +36,10 @@ class="text-right"
                             v-bind:placeholder="range.max"
                             v-bind:disabled="!canRefine"
                             v-bind:value="currentRefinement.max ?? range.max"
-                            v-on:input="refine({ min: currentRefinement.min, max: $event.currentTarget.value })"
+                            v-on:input="if (!$event.currentTarget.validationMessage) {
+                                refine({ min: currentRefinement.min, max: Math.min($event.currentTarget.value, range.max) })
+                            }"
+                            required
                         />
                     </div>
                 </div>

From 79ff23b5bf6d7d34739d84e4570bcc4d40fb58dc Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 2 May 2025 16:22:33 +0200
Subject: [PATCH 197/244] Productlist; merge the attributes in the listing

---
 resources/views/components/productlist.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 162576533..07befd7e0 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -3,10 +3,11 @@
 @if ($value)
     <lazy v-slot="{ intersected }">
         <listing
+            {{ $attributes }}
             v-if="intersected"
             :index="config.index.product"
-            v-cloak
             v-slot="{ loaded, index, searchClient }"
+            v-cloak
         >
             <div>
                 <ais-instant-search

From 6cc91e18da760f9f88d1934523170f46eaf34492 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 2 May 2025 16:28:32 +0200
Subject: [PATCH 198/244] Listing default product index

---
 resources/js/components/Listing/Listing.vue      | 9 ++++-----
 resources/views/components/listing.blade.php     | 1 -
 resources/views/components/productlist.blade.php | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index a8f4a38b0..d5c8a3001 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -5,14 +5,10 @@ import InstantSearchMixin from '../Search/InstantSearchMixin.vue'
 export default {
     mixins: [InstantSearchMixin],
     props: {
-        configCallback: {
-            type: Function,
-        },
         index: {
             type: String,
+            default: window.config.index.product
         },
-
-        // TODO: Document these four props in the Rapidez docs
         query: {
             type: Function,
         },
@@ -26,6 +22,9 @@ export default {
         filterQueryString: {
             type: String,
         },
+        configCallback: {
+            type: Function,
+        },
     },
 
     data: () => ({
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 79ffbedf0..529647572 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -8,7 +8,6 @@
 <div class="min-h-screen">
     <listing
         {{ $attributes }}
-        v-bind:index="config.index.product"
         v-slot="{ loaded, index, searchClient, rangeAttributes, categoryAttributes, hitsPerPage, filters, sortOptions, withFilters, withSwatches, routing }"
         v-cloak
     >
diff --git a/resources/views/components/productlist.blade.php b/resources/views/components/productlist.blade.php
index 162576533..b11baa76f 100644
--- a/resources/views/components/productlist.blade.php
+++ b/resources/views/components/productlist.blade.php
@@ -4,9 +4,8 @@
     <lazy v-slot="{ intersected }">
         <listing
             v-if="intersected"
-            :index="config.index.product"
-            v-cloak
             v-slot="{ loaded, index, searchClient }"
+            v-cloak
         >
             <div>
                 <ais-instant-search

From 570e3f903fd84454b0b5f34936170df92660dcd2 Mon Sep 17 00:00:00 2001
From: royduin <royduin@users.noreply.github.com>
Date: Fri, 2 May 2025 14:29:18 +0000
Subject: [PATCH 199/244] Apply fixes from Prettier

---
 resources/js/components/Listing/Listing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/Listing/Listing.vue b/resources/js/components/Listing/Listing.vue
index d5c8a3001..8ba9f3718 100644
--- a/resources/js/components/Listing/Listing.vue
+++ b/resources/js/components/Listing/Listing.vue
@@ -7,7 +7,7 @@ export default {
     props: {
         index: {
             type: String,
-            default: window.config.index.product
+            default: window.config.index.product,
         },
         query: {
             type: Function,

From 9bb9f9a4a7dd483f0b25c0d601f55deaeaeed9bb Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 6 May 2025 11:13:28 +0200
Subject: [PATCH 200/244] Add slot & use it for price display

---
 resources/js/filters.js                       |  3 +-
 .../components/input/range-slider.blade.php   | 28 +++++++++++++++----
 .../listing/partials/filter/price.blade.php   | 10 +++++--
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/resources/js/filters.js b/resources/js/filters.js
index 077e90e2b..0ec51eb33 100644
--- a/resources/js/filters.js
+++ b/resources/js/filters.js
@@ -8,10 +8,11 @@ window.truncate = function (value, limit) {
 
 Vue.filter('truncate', window.truncate)
 
-window.price = function (value) {
+window.price = function (value, extra = {}) {
     return new Intl.NumberFormat(config.locale.replace('_', '-'), {
         style: 'currency',
         currency: config.currency,
+        ...extra,
     }).format(value)
 }
 
diff --git a/resources/views/components/input/range-slider.blade.php b/resources/views/components/input/range-slider.blade.php
index 636a1850f..c8e0b2b83 100644
--- a/resources/views/components/input/range-slider.blade.php
+++ b/resources/views/components/input/range-slider.blade.php
@@ -1,4 +1,6 @@
-<range-slider v-slot="rangeInputScope" {{ $attributes }}>
+@slots(['value'])
+
+<range-slider v-slot="{ _renderProxy: rangeInputScope, value }" {{ $attributes }}>
     <div class="flex flex-1 relative h-16 mx-5">
         <input
             type="range"
@@ -25,11 +27,27 @@ class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cu
             <div class="absolute z-20 inset-y-0 rounded-md bg-primary" v-bind:style="'right:'+rangeInputScope.maxThumb+'%; left:'+rangeInputScope.minThumb+'%'"></div>
             <div class="absolute z-30 size-5 top-0 left-0 bg-white border rounded-full -mt-2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
             <div class="absolute z-30 size-5 top-0 right-0 bg-white border rounded-full -mt-2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
-            <div class="absolute z-30 top-4 left-0 bg-white border px-2 py-0.5 rounded-full -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
-                @{{ rangeInputScope.minValue }}
+            <div
+                class="absolute z-30 top-4 left-0 bg-white border px-2 py-0.5 rounded-full -translate-x-1/2"
+                v-bind:style="'left: '+rangeInputScope.minThumb+'%'"
+                v-bind:set="value = rangeInputScope.minValue"
+            >
+                @if ($value->isNotEmpty())
+                    {{ $value }}
+                @else
+                    <span v-text="value"></span>
+                @endif
             </div>
-            <div class="absolute z-30 top-4 right-0 bg-white border px-2 py-0.5 rounded-full translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'">
-                @{{ rangeInputScope.maxValue }}
+            <div
+                class="absolute z-30 top-4 right-0 bg-white border px-2 py-0.5 rounded-full translate-x-1/2"
+                v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"
+                v-bind:set="value = rangeInputScope.maxValue"
+            >
+                @if ($value->isNotEmpty())
+                    {{ $value }}
+                @else
+                    <span v-text="value"></span>
+                @endif
             </div>
         </div>
     </div>
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index c89519e84..dd74247eb 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -12,11 +12,16 @@
                             v-bind:range="range"
                             v-bind:current="currentRefinement"
                             v-on:change="refine"
-                        />
+                        >
+                            <x-slot:value>
+                                @{{ window.price(value, { maximumFractionDigits: 0 }) }}
+                            </x-slot:value>
+                        </x-rapidez::input.range-slider>
                     </div>
 
                     <div class="flex gap-10">
                         <x-rapidez::input
+                            required
                             type="number"
                             v-bind:min="range.min"
                             v-bind:max="range.max"
@@ -26,10 +31,10 @@
                             v-on:input="if (!$event.currentTarget.validationMessage) {
                                 refine({ min: Math.max($event.currentTarget.value, range.min), max: currentRefinement.max })
                             }"
-                            required
                         />
                         <x-rapidez::input
                             class="text-right"
+                            required
                             type="number"
                             v-bind:min="range.min"
                             v-bind:max="range.max"
@@ -39,7 +44,6 @@ class="text-right"
                             v-on:input="if (!$event.currentTarget.validationMessage) {
                                 refine({ min: currentRefinement.min, max: Math.min($event.currentTarget.value, range.max) })
                             }"
-                            required
                         />
                     </div>
                 </div>

From 49e3e1e3beb449f884826adac5b12c32be9eb75b Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 6 May 2025 11:14:24 +0200
Subject: [PATCH 201/244] Fix reset filters always showing & category filter
 jumping

---
 resources/views/listing/partials/filter/category.blade.php | 7 ++++++-
 resources/views/listing/partials/filter/selected.blade.php | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 0f329899f..773240522 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -1,5 +1,6 @@
 <ais-hierarchical-menu
     v-bind:attributes="categoryAttributes"
+    v-bind:sort-by="['count','name']"
     @attributes(['root-path' => $rootPath])
     show-more
 >
@@ -11,7 +12,11 @@
                 </x-slot:title>
                 <recursion :data="items" v-slot="{ data, components }">
                     <ul>
-                        <li class="pl-3" v-for="(item, index) in data" :key="item.value">
+                        <li
+                            class="pl-3"
+                            v-for="(item, index) in data"
+                            :key="item.value"
+                        >
                             <a
                                 :href="createURL(item.value)"
                                 :class="{ 'font-bold': item.isRefined }"
diff --git a/resources/views/listing/partials/filter/selected.blade.php b/resources/views/listing/partials/filter/selected.blade.php
index cc75b9a93..a74ee7e12 100644
--- a/resources/views/listing/partials/filter/selected.blade.php
+++ b/resources/views/listing/partials/filter/selected.blade.php
@@ -1,4 +1,4 @@
-<ais-clear-refinements>
+<ais-clear-refinements v-bind:excluded-attributes="[...categoryAttributes, 'query']">
     <template v-slot="{ canRefine, refine, createURL }">
         <div v-show="canRefine" class="flex flex-wrap items-baseline justify-between gap-2 w-full pb-2">
             <div class="font-semibold text-base">
@@ -6,6 +6,7 @@
             </div>
             <a
                 v-bind:href="createURL()"
+                v-if="canRefine"
                 v-on:click.prevent="refine"
                 class="text-sm text-muted transition-all hover:underline"
             >

From 4f9b0b44c76951b986b2b6a8d28b2a5b72802474 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 6 May 2025 11:18:53 +0200
Subject: [PATCH 202/244] Undo formatting

---
 resources/views/listing/partials/filter/category.blade.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 773240522..a66a46bef 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -12,11 +12,7 @@
                 </x-slot:title>
                 <recursion :data="items" v-slot="{ data, components }">
                     <ul>
-                        <li
-                            class="pl-3"
-                            v-for="(item, index) in data"
-                            :key="item.value"
-                        >
+                        <li class="pl-3" v-for="(item, index) in data" :key="item.value">
                             <a
                                 :href="createURL(item.value)"
                                 :class="{ 'font-bold': item.isRefined }"

From d6f66c65dff1de2d1a3af4cb771107106ca80107 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 7 May 2025 11:29:57 +0200
Subject: [PATCH 203/244] Add eventy filter usage

---
 src/Models/Traits/Product/Searchable.php | 4 ++--
 src/Models/Traits/Searchable.php         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 4fa24bb9d..895f007fa 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -125,7 +125,7 @@ public function withCategories(array $data): array
      */
     public static function getIndexMappings(): ?array
     {
-        return [
+        return Eventy::filter('index.' . (new static)->getIndexName() . '.mapping', [
             'properties' => [
                 'price' => [
                     'type' => 'double',
@@ -140,6 +140,6 @@ public static function getIndexMappings(): ?array
                     'type' => 'flattened',
                 ],
             ],
-        ];
+        ]);
     }
 }
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index cea86cf0e..d8dba0413 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -40,11 +40,11 @@ public function searchableAs(): string
 
     public static function getIndexMappings(): ?array
     {
-        return null;
+        return Eventy::filter('index.' . (new static)->getIndexName() . '.mapping', null);
     }
 
     public static function getIndexSettings(): ?array
     {
-        return null;
+        return Eventy::filter('index.' . (new static)->getIndexName() . '.settings', null);
     }
 }

From d1c59bf3ccf42bb2c2a9598c011517c7d9fc84cc Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 7 May 2025 11:38:43 +0200
Subject: [PATCH 204/244] Make static function for indexName

---
 src/Commands/IndexCommand.php            |  2 +-
 src/Models/Traits/Product/Searchable.php |  2 +-
 src/Models/Traits/Searchable.php         | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 46f4881a1..9dd3c9b17 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -20,7 +20,7 @@ public function handle()
             ->filter(fn ($class) => in_array(Searchable::class, class_uses_recursive($class)));
 
         $types = $this->option('types')
-            ? $baseSearchableModels->filter(fn ($model) => in_array((new $model)->getIndexName(), explode(',', $this->option('types'))))
+            ? $baseSearchableModels->filter(fn ($model) => in_array($model::indexName(), explode(',', $this->option('types'))))
             : $baseSearchableModels;
 
         $stores = $this->option('store')
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 895f007fa..906d0e455 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -125,7 +125,7 @@ public function withCategories(array $data): array
      */
     public static function getIndexMappings(): ?array
     {
-        return Eventy::filter('index.' . (new static)->getIndexName() . '.mapping', [
+        return Eventy::filter('index.' . static::indexName() . '.mapping', [
             'properties' => [
                 'price' => [
                     'type' => 'double',
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index d8dba0413..841dd1c41 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -29,6 +29,12 @@ public function getIndexName(): string
         return $this->indexName ?? Str::snake(Str::pluralStudly(class_basename(static::class)));
     }
 
+    public static function indexName(): string
+    {
+        // @phpstan-ignore-next-line
+        return (new static)->getIndexName();
+    }
+
     public function searchableAs(): string
     {
         return implode('_', array_values([
@@ -40,11 +46,11 @@ public function searchableAs(): string
 
     public static function getIndexMappings(): ?array
     {
-        return Eventy::filter('index.' . (new static)->getIndexName() . '.mapping', null);
+        return Eventy::filter('index.' . static::indexName() . '.mapping', null);
     }
 
     public static function getIndexSettings(): ?array
     {
-        return Eventy::filter('index.' . (new static)->getIndexName() . '.settings', null);
+        return Eventy::filter('index.' . static::indexName() . '.settings', null);
     }
 }

From 6823ecd669b9a7bd765f5aca6c4e5b35994e92ef Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 7 May 2025 11:46:39 +0200
Subject: [PATCH 205/244] Make getIndexName static itself

---
 src/Commands/IndexCommand.php            |  2 +-
 src/Models/Traits/Product/Searchable.php |  2 +-
 src/Models/Traits/Searchable.php         | 23 +++++++----------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 9dd3c9b17..646c8539c 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -20,7 +20,7 @@ public function handle()
             ->filter(fn ($class) => in_array(Searchable::class, class_uses_recursive($class)));
 
         $types = $this->option('types')
-            ? $baseSearchableModels->filter(fn ($model) => in_array($model::indexName(), explode(',', $this->option('types'))))
+            ? $baseSearchableModels->filter(fn ($model) => in_array($model::getIndexName(), explode(',', $this->option('types'))))
             : $baseSearchableModels;
 
         $stores = $this->option('store')
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 906d0e455..543eec0bc 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -125,7 +125,7 @@ public function withCategories(array $data): array
      */
     public static function getIndexMappings(): ?array
     {
-        return Eventy::filter('index.' . static::indexName() . '.mapping', [
+        return Eventy::filter('index.' . static::getIndexName() . '.mapping', [
             'properties' => [
                 'price' => [
                     'type' => 'double',
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 841dd1c41..b8088f307 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -10,7 +10,7 @@ trait Searchable
 {
     use ScoutSearchable;
 
-    public ?string $indexName;
+    public static ?string $indexName;
 
     /**
      * {@inheritdoc}
@@ -18,39 +18,30 @@ trait Searchable
     public function toSearchableArray(): array
     {
         // TODO: Maybe use the model name here?
-        return Eventy::filter('index.' . $this->getIndexName() . '.data', $this->toArray(), $this);
+        return Eventy::filter('index.' . static::getIndexName() . '.data', $this->toArray(), $this);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getIndexName(): string
-    {
-        return $this->indexName ?? Str::snake(Str::pluralStudly(class_basename(static::class)));
-    }
-
-    public static function indexName(): string
+    public static function getIndexName(): string
     {
-        // @phpstan-ignore-next-line
-        return (new static)->getIndexName();
+        return static::$indexName ?? Str::snake(Str::pluralStudly(class_basename(static::class)));
     }
 
     public function searchableAs(): string
     {
         return implode('_', array_values([
             config('scout.prefix'),
-            $this->getIndexName(),
+            static::getIndexName(),
             config('rapidez.store'),
         ]));
     }
 
     public static function getIndexMappings(): ?array
     {
-        return Eventy::filter('index.' . static::indexName() . '.mapping', null);
+        return Eventy::filter('index.' . static::getIndexName() . '.mapping', null);
     }
 
     public static function getIndexSettings(): ?array
     {
-        return Eventy::filter('index.' . static::indexName() . '.settings', null);
+        return Eventy::filter('index.' . static::getIndexName() . '.settings', null);
     }
 }

From f94c90d867eaf79dcd8dbbdb8cb300207c515ebf Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 12 May 2025 15:37:03 +0200
Subject: [PATCH 206/244] Use parent:: instead

---
 src/Models/Traits/Product/Searchable.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 543eec0bc..c3b2cd4fe 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -125,7 +125,7 @@ public function withCategories(array $data): array
      */
     public static function getIndexMappings(): ?array
     {
-        return Eventy::filter('index.' . static::getIndexName() . '.mapping', [
+        return array_merge([
             'properties' => [
                 'price' => [
                     'type' => 'double',
@@ -140,6 +140,6 @@ public static function getIndexMappings(): ?array
                     'type' => 'flattened',
                 ],
             ],
-        ]);
+        ], parent::getIndexMappings());
     }
 }

From f55ac76bb769a7fa726341e667492a39ee73876d Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 12 May 2025 16:28:59 +0200
Subject: [PATCH 207/244] Use absolute styling to add currency symbol to inputs

---
 .../components/Elements/CurrencyDisplay.vue   | 24 ++++++
 resources/js/vue-components.js                |  1 +
 .../listing/partials/filter/price.blade.php   | 79 ++++++++++++-------
 3 files changed, 77 insertions(+), 27 deletions(-)
 create mode 100644 resources/js/components/Elements/CurrencyDisplay.vue

diff --git a/resources/js/components/Elements/CurrencyDisplay.vue b/resources/js/components/Elements/CurrencyDisplay.vue
new file mode 100644
index 000000000..081b1e7c1
--- /dev/null
+++ b/resources/js/components/Elements/CurrencyDisplay.vue
@@ -0,0 +1,24 @@
+<script>
+export default {
+    render() {
+        return this.$scopedSlots.default(this)
+    },
+
+    computed: {
+        shouldFormatCurrencyLeft() {
+            return new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                style: 'currency',
+                currency: config.currency,
+            }).formatToParts(1)?.[0]?.type === 'currency'
+        },
+
+        currencySymbol() {
+            return new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                style: 'currency',
+                currency: config.currency,
+                maximumFractionDigits: 0,
+            }).format(0).replace(/\d/g, '').trim()
+        },
+    }
+}
+</script>
diff --git a/resources/js/vue-components.js b/resources/js/vue-components.js
index 33905a8ed..0a7e236ca 100644
--- a/resources/js/vue-components.js
+++ b/resources/js/vue-components.js
@@ -58,3 +58,4 @@ Vue.component('listing', () => import('./components/Listing/Listing.vue'))
 Vue.component('checkout-success', () => import('./components/Checkout/CheckoutSuccess.vue'))
 Vue.component('popup', () => import('./components/Popup.vue'))
 Vue.component('range-slider', () => import('./components/Elements/RangeSlider.vue'))
+Vue.component('currency-display', () => import('./components/Elements/CurrencyDisplay.vue'))
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index dd74247eb..971ce401c 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -19,33 +19,58 @@
                         </x-rapidez::input.range-slider>
                     </div>
 
-                    <div class="flex gap-10">
-                        <x-rapidez::input
-                            required
-                            type="number"
-                            v-bind:min="range.min"
-                            v-bind:max="range.max"
-                            v-bind:placeholder="range.min"
-                            v-bind:disabled="!canRefine"
-                            v-bind:value="currentRefinement.min ?? range.min"
-                            v-on:input="if (!$event.currentTarget.validationMessage) {
-                                refine({ min: Math.max($event.currentTarget.value, range.min), max: currentRefinement.max })
-                            }"
-                        />
-                        <x-rapidez::input
-                            class="text-right"
-                            required
-                            type="number"
-                            v-bind:min="range.min"
-                            v-bind:max="range.max"
-                            v-bind:placeholder="range.max"
-                            v-bind:disabled="!canRefine"
-                            v-bind:value="currentRefinement.max ?? range.max"
-                            v-on:input="if (!$event.currentTarget.validationMessage) {
-                                refine({ min: currentRefinement.min, max: Math.min($event.currentTarget.value, range.max) })
-                            }"
-                        />
-                    </div>
+                    <currency-display v-slot="{ shouldFormatCurrencyLeft, currencySymbol }">
+                        <div class="flex gap-10">
+                            <div class="relative w-full">
+                                <x-rapidez::input
+                                    class="text-right"
+                                    required
+                                    type="number"
+                                    v-bind:min="range.min"
+                                    v-bind:max="range.max"
+                                    v-bind:placeholder="range.min"
+                                    v-bind:disabled="!canRefine"
+                                    v-bind:value="currentRefinement.min ?? range.min"
+                                    v-on:input="if (!$event.currentTarget.validationMessage) {
+                                        refine({ min: Math.max($event.currentTarget.value, range.min), max: currentRefinement.max })
+                                    }"
+                                />
+                                <span
+                                    class="absolute bottom-1/2 translate-y-1/2"
+                                    v-bind:class="{
+                                        'left-2': shouldFormatCurrencyLeft,
+                                        'right-2': !shouldFormatCurrencyLeft
+                                    }"
+                                >
+                                    @{{ currencySymbol }}
+                                </span>
+                            </div>
+                            <div class="relative w-full">
+                                <x-rapidez::input
+                                    class="text-right"
+                                    required
+                                    type="number"
+                                    v-bind:min="range.min"
+                                    v-bind:max="range.max"
+                                    v-bind:placeholder="range.max"
+                                    v-bind:disabled="!canRefine"
+                                    v-bind:value="currentRefinement.max ?? range.max"
+                                    v-on:input="if (!$event.currentTarget.validationMessage) {
+                                        refine({ min: currentRefinement.min, max: Math.min($event.currentTarget.value, range.max) })
+                                    }"
+                                />
+                                <span
+                                    class="absolute bottom-1/2 translate-y-1/2"
+                                    v-bind:class="{
+                                        'left-2': shouldFormatCurrencyLeft,
+                                        'right-2': !shouldFormatCurrencyLeft
+                                    }"
+                                >
+                                    @{{ currencySymbol }}
+                                </span>
+                            </div>
+                        </div>
+                    </currency-display>
                 </div>
             </x-rapidez::filter.heading>
         </div>

From 35736de3d0038b98c0e65249ff2d6e98a1c823b6 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Mon, 12 May 2025 14:29:44 +0000
Subject: [PATCH 208/244] Apply fixes from Prettier

---
 .../js/components/Elements/CurrencyDisplay.vue  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/Elements/CurrencyDisplay.vue b/resources/js/components/Elements/CurrencyDisplay.vue
index 081b1e7c1..79266b046 100644
--- a/resources/js/components/Elements/CurrencyDisplay.vue
+++ b/resources/js/components/Elements/CurrencyDisplay.vue
@@ -6,10 +6,12 @@ export default {
 
     computed: {
         shouldFormatCurrencyLeft() {
-            return new Intl.NumberFormat(config.locale.replace('_', '-'), {
-                style: 'currency',
-                currency: config.currency,
-            }).formatToParts(1)?.[0]?.type === 'currency'
+            return (
+                new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                    style: 'currency',
+                    currency: config.currency,
+                }).formatToParts(1)?.[0]?.type === 'currency'
+            )
         },
 
         currencySymbol() {
@@ -17,8 +19,11 @@ export default {
                 style: 'currency',
                 currency: config.currency,
                 maximumFractionDigits: 0,
-            }).format(0).replace(/\d/g, '').trim()
+            })
+                .format(0)
+                .replace(/\d/g, '')
+                .trim()
         },
-    }
+    },
 }
 </script>

From 75d237ce2b7700740016dc9b724606b0e0a58fbd Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Mon, 12 May 2025 16:35:48 +0200
Subject: [PATCH 209/244] Frontend - Pagination - No results search & grid -
 Filters responsive - Selected filters

---
 config/rapidez/frontend.php                   |  7 +++
 lang/nl.json                                  |  5 +-
 resources/css/app.css                         | 15 ++++-
 resources/js/callbacks.js                     | 12 ++--
 resources/views/category/overview.blade.php   |  2 +-
 .../components/autocomplete/input.blade.php   | 12 ++--
 .../components/input/range-slider.blade.php   | 16 +++--
 resources/views/components/quantity.blade.php |  2 +-
 .../views/layouts/partials/header.blade.php   |  4 +-
 .../partials/header/autocomplete.blade.php    |  2 +-
 .../header/autocomplete/no-results.blade.php  | 50 ++++++++-------
 .../header/autocomplete/results.blade.php     |  2 +-
 resources/views/listing/filters.blade.php     | 14 +++--
 .../listing/partials/filter/search.blade.php  | 12 +++-
 .../partials/filter/selected.blade.php        |  2 +-
 .../listing/partials/no-results.blade.php     | 61 +++++++++++--------
 .../listing/partials/pagination.blade.php     | 45 +++++++++++---
 .../views/listing/partials/toolbar.blade.php  |  4 +-
 18 files changed, 179 insertions(+), 88 deletions(-)

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index 9a3a1a948..df27c1357 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -89,4 +89,11 @@
 
     // The path to redirect to after a failed checkout
     'checkout_success_fail_redirect_path' => 'cart',
+
+    'filters' => [
+        // Show inputs below a range slider (true/false)
+        'range_slider' => [
+            'inputs' => true,
+        ]
+    ]
 ];
diff --git a/lang/nl.json b/lang/nl.json
index 260087051..cb4854d89 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -89,7 +89,7 @@
     "Sorry! No image": "Sorry! Geen afbeelding",
     "Sorry! This product is currently out of stock.": "Sorry! Dit product is momenteel niet op voorraad.",
     "Sorry! We did not find any products.": "Sorry! We hebben geen producten gevonden.",
-    "But here are some suggestions!": "Maar hier zijn enkele suggesties!",
+    "But here are some suggestions:": "Maar hier zijn enkele suggesties:",
     "Specifications": "Specificaties",
     "Street": "Straat",
     "Subscribe": "Inschrijven",
@@ -124,5 +124,6 @@
     "Previous Page": "Vorige pagina",
     "Page": "Pagina",
     "Next Page": "Volgende pagina",
-    "Last Page": "Laatste pagina"
+    "Last Page": "Laatste pagina",
+    "Sort on": "Sorteer op"
 }
diff --git a/resources/css/app.css b/resources/css/app.css
index 48f37fcf5..761fb02fc 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -25,11 +25,22 @@ autocomplete {
 }
 
 /* Remove default browser arrows for input type="number" */
-input[type='number']::-webkit-inner-spin-button,
-input[type='number']::-webkit-outer-spin-button {
+.arrows-hidden[type='number']::-webkit-inner-spin-button,
+.arrows-hidden[type='number']::-webkit-outer-spin-button {
     @apply appearance-none m-0;
 }
 
+.arrows-hidden[type='number'] {
+    -moz-appearance: textfield;
+}
+
 mark {
     @apply bg-transparent font-bold;
 }
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-results-button,
+input[type="search"]::-webkit-search-results-decoration {
+    display: none;
+}
\ No newline at end of file
diff --git a/resources/js/callbacks.js b/resources/js/callbacks.js
index 6784ab76e..f2012f8ea 100644
--- a/resources/js/callbacks.js
+++ b/resources/js/callbacks.js
@@ -3,12 +3,14 @@ import { fillFromGraphqlResponse as updateOrder } from './stores/useOrder'
 import { runAfterPlaceOrderHandlers, runBeforePaymentMethodHandlers, runBeforePlaceOrderHandlers } from './stores/usePaymentHandlers'
 import { refresh as refreshUser, token } from './stores/useUser'
 
-Vue.prototype.scrollToElement = (selector) => {
+Vue.prototype.scrollToElement = (selector, offset = 0) => {
     let el = window.document.querySelector(selector)
-    window.scrollTo({
-        top: el.offsetTop,
-        behavior: 'smooth',
-    })
+    if (el) {
+        window.scrollTo({
+            top: el.offsetTop - offset,
+            behavior: 'smooth',
+        })
+    }
 }
 
 Vue.prototype.getCheckoutStep = (stepName) => {
diff --git a/resources/views/category/overview.blade.php b/resources/views/category/overview.blade.php
index cae769e53..738084fed 100644
--- a/resources/views/category/overview.blade.php
+++ b/resources/views/category/overview.blade.php
@@ -19,7 +19,7 @@
                 </x-slot:title>
             </x-rapidez::listing>
         @else
-            <div class="flex flex-col lg:flex-row gap-x-12 gap-y-3">
+            <div class="flex gap-x-12 gap-y-3 max-lg:flex-col">
                 <div class="lg:w-80 shrink-0">
                     <h1 class="mb-5 text-3xl font-medium">{{ $category->name }}</h1>
                     @widget('sidebar.main', 'anchor_categories', 'catalog_category_view_type_layered', $category->entity_id)
diff --git a/resources/views/components/autocomplete/input.blade.php b/resources/views/components/autocomplete/input.blade.php
index e74f1843a..5fd3a0f1a 100644
--- a/resources/views/components/autocomplete/input.blade.php
+++ b/resources/views/components/autocomplete/input.blade.php
@@ -1,9 +1,7 @@
-@props(['id' => 'autocomplete'])
-
-<form name="{{ $id }}-form" id="{{ $id }}-form" method="get" action="{{ route('search') }}" class="flex relative z-header-autocomplete">
+<form method="get" action="{{ route('search') }}" class="flex relative z-header-autocomplete">
     <x-rapidez::input
         {{ $attributes->merge([
-            'id' => $id . '-input',
+            'id' => 'autocomplete-input',
             'type' => 'search',
             'name' => 'q',
             'autocomplete' => 'off',
@@ -14,15 +12,15 @@
             'class' => 'h-12 peer',
         ]) }}
     />
-    <x-rapidez::button
+    <button
         v-on:click="refine('')"
-        class="absolute right-10 bg-opacity-0 hover:bg-opacity-0 border-none transition-all opacity-100 peer-placeholder-shown:opacity-0"
+        class="absolute right-14 top-1/2 -translate-y-1/2 transition-opacity opacity-100 peer-placeholder-shown:opacity-0"
         type="reset"
         title="__('Clear the search query')"
         v-cloak
     >
         <x-heroicon-s-x-mark class="size-7" />
-    </x-rapidez::button>
+    </button>
     <x-rapidez::button
         class="absolute right-0 bg-opacity-0 hover:bg-opacity-0 border-none *:peer-placeholder-shown:bg-muted *:peer-placeholder-shown:text"
         type="submit"
diff --git a/resources/views/components/input/range-slider.blade.php b/resources/views/components/input/range-slider.blade.php
index 4439f4b36..a11ac6f10 100644
--- a/resources/views/components/input/range-slider.blade.php
+++ b/resources/views/components/input/range-slider.blade.php
@@ -1,8 +1,12 @@
-@props(['inputs' => true])
+@props(['inputs' => config('rapidez.frontend.filters.range_slider.inputs')])
 
 <range-slider v-slot="rangeInputScope" {{ $attributes }}>
     <div class="w-full">
-        <div class="flex flex-1 relative">
+        <div @class([
+                'flex flex-1 relative',
+                'h-12 mx-1' => !$inputs
+            ])
+        >
             <input
                 type="range"
                 v-bind:disabled="!canRefine"
@@ -29,10 +33,10 @@ class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cu
                 <div class="absolute z-30 size-4 top-1/2 left-0 bg-severe-emphasis rounded-full -translate-y-1/2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
                 <div class="absolute z-30 size-4 top-1/2 right-0 bg-severe-emphasis rounded-full -translate-y-1/2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
                 @if (!$inputs)
-                    <div class="absolute z-30 top-4 left-0 bg-white border px-2 py-0.5 rounded-full -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
+                    <div class="absolute z-30 top-5 left-0 bg-severe-emphasis text-white px-2 py-0.5 rounded-md -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
                         @{{ rangeInputScope.minValue }}
                     </div>
-                    <div class="absolute z-30 top-4 right-0 bg-white border px-2 py-0.5 rounded-full translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'">
+                    <div class="absolute z-30 top-5 right-0 bg-severe-emphasis text-white px-2 py-0.5 rounded-md translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'">
                         @{{ rangeInputScope.maxValue }}
                     </div>
                 @endif
@@ -47,7 +51,7 @@ class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cu
                     v-bind:max="rangeInputScope.range.max"
                     v-model="rangeInputScope.minValue"
                     v-on:input="rangeInputScope.updateRefinement"
-                    class="text-center"
+                    class="text-center arrows-hidden"
                 />
                 <x-rapidez::input
                     type="number"
@@ -56,7 +60,7 @@ class="text-center"
                     v-bind:max="rangeInputScope.range.max"
                     v-model="rangeInputScope.maxValue"
                     v-on:input="rangeInputScope.updateRefinement"
-                    class="text-center"
+                    class="text-center arrows-hidden"
                 />
             </div>
         @endif
diff --git a/resources/views/components/quantity.blade.php b/resources/views/components/quantity.blade.php
index 689229add..b17ce6559 100644
--- a/resources/views/components/quantity.blade.php
+++ b/resources/views/components/quantity.blade.php
@@ -19,7 +19,7 @@ class="shrink-0 pl-2.5 text disabled:cursor-not-allowed disabled:opacity-50"
             type="number"
             dusk="qty"
             value="1"
-            class="outline-0 ring-0 border-none w-12 bg-transparent font-medium text-center px-0 sm:text-base focus:ring-transparent"
+            class="outline-0 ring-0 border-none w-12 bg-transparent font-medium text-center px-0 sm:text-base focus:ring-transparent arrows-hidden"
             aria-label="@lang('Quantity')"
             {{ $attributes }}
         />
diff --git a/resources/views/layouts/partials/header.blade.php b/resources/views/layouts/partials/header.blade.php
index 79c3503ec..0b129743e 100644
--- a/resources/views/layouts/partials/header.blade.php
+++ b/resources/views/layouts/partials/header.blade.php
@@ -2,7 +2,7 @@
     <div class="container flex flex-wrap items-center max-sm:px-3">
         <input id="navigation" class="peer hidden" type="checkbox" />
         <div class="py-2">
-            <div class="mr-3 flex items-center text-xl sm:text-3xl">
+            <div class="mr-3 flex items-center text-xl max-sm:flex-row-reverse sm:text-3xl">
                 <a href="{{ url('/') }}" aria-label="@lang('Go to home')">
                     <span class="hidden sm:inline">
                         <img src="https://raw.githubusercontent.com/rapidez/art/master/logo.svg" alt="Rapidez logo" height="48" width="152">
@@ -11,7 +11,7 @@
                         <img src="https://raw.githubusercontent.com/rapidez/art/master/r.svg" alt="Rapidez logo" height="30" width="30">
                     </span>
                 </a>
-                <label for="navigation" class="ml-3 cursor-pointer sm:hidden">
+                <label for="navigation" class="mr-3 cursor-pointer sm:hidden">
                     <x-heroicon-o-bars-3 class="inline w-7" />
                 </label>
             </div>
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index dccac9039..54ce3258b 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -21,7 +21,7 @@ class="contents"
                                 }"
                                 v-on:input="refine($event.currentTarget.value)"
                             />
-                            <div v-if="currentRefinement" class="absolute inset-x-0 top-14 bg-white border rounded-md z-header-autocomplete">
+                            <div v-if="currentRefinement" class="absolute inset-x-0 top-[52px] bg-white border rounded-md z-header-autocomplete">
                                 @include('rapidez::layouts.partials.header.autocomplete.results')
                             </div>
                             <div v-if="currentRefinement" v-on:click="refine('')" class="fixed inset-0 bg-backdrop z-header-autocomplete-overlay"></div>
diff --git a/resources/views/layouts/partials/header/autocomplete/no-results.blade.php b/resources/views/layouts/partials/header/autocomplete/no-results.blade.php
index 53ffb105c..e02c4df28 100644
--- a/resources/views/layouts/partials/header/autocomplete/no-results.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/no-results.blade.php
@@ -1,22 +1,28 @@
-<div class="font-bold text text-lg break-all">
-    @lang('No results found for :searchterm', [
-        'searchterm' => '<span class="text-primary">"@{{ value }}"</span>'
-    ])
-</div>
-<div class="flex flex-col text-sm pt-7">
-    <span class="font-bold">@lang('Have you tried:')</span>
-    <ul class="flex flex-col pt-1.5 gap-y-1 *:flex *:gap-x-2 *:items-center">
-        <li>
-            <x-heroicon-s-check class="size-4"/>
-            @lang('Check the spelling of your search term')
-        </li>
-        <li>
-            <x-heroicon-s-check class="size-4"/>
-            @lang('Make your search term less specific')
-        </li>
-        <li>
-            <x-heroicon-s-check class="size-4"/>
-            @lang('Use other search terms')
-        </li>
-    </ul>
-</div>
+<ais-hits>
+    <template v-slot="{ items }">
+        <div v-if="items.length === 0 && currentRefinement !== ''" class="p-5">
+            <div class="font-bold text text-lg break-all">
+                @lang('No results found for :searchterm', [
+                    'searchterm' => '<span class="text-primary">"@{{ currentRefinement }}"</span>'
+                ])
+            </div>
+            <div class="flex flex-col text-sm pt-7">
+                <span class="font-bold">@lang('Have you tried:')</span>
+                <ul class="flex flex-col pt-1.5 gap-y-1 *:flex *:gap-x-2 *:items-center">
+                    <li>
+                        <x-heroicon-s-check class="size-4"/>
+                        @lang('Check the spelling of your search term')
+                    </li>
+                    <li>
+                        <x-heroicon-s-check class="size-4"/>
+                        @lang('Make your search term less specific')
+                    </li>
+                    <li>
+                        <x-heroicon-s-check class="size-4"/>
+                        @lang('Use other search terms')
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </template>
+</ais-hits>
diff --git a/resources/views/layouts/partials/header/autocomplete/results.blade.php b/resources/views/layouts/partials/header/autocomplete/results.blade.php
index 6c1880920..e99be7fe5 100644
--- a/resources/views/layouts/partials/header/autocomplete/results.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/results.blade.php
@@ -2,5 +2,5 @@
     @includeIf('rapidez::layouts.partials.header.autocomplete.' . $key)
 @endforeach
 @include('rapidez::layouts.partials.header.autocomplete.products')
-<!-- TODO: What about the no-results view? -->
 @include('rapidez::layouts.partials.header.autocomplete.all-results')
+@include('rapidez::layouts.partials.header.autocomplete.no-results')
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index da68b4504..45c70052b 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -10,7 +10,11 @@
     ]))
 @endPushOnce
 <x-rapidez::slideover.mobile id="category-filters-slideover" :title="__('Filters')">
-    <div class="max-lg:container max-lg:py-6">
+    <div class="max-lg:container max-lg:pt-6">
+        <div class="max-md:mb-3 md:hidden">
+            <p class="text-xl/9 font-medium mb-1">@lang('Sort on'):</p>
+            @include('rapidez::listing.partials.toolbar.sorting')
+        </div>
         <p class="text-xl/9 font-medium mb-3">@lang('Filters')</p>
 
         @include('rapidez::listing.partials.filter.selected')
@@ -24,9 +28,11 @@
             @include('rapidez::listing.partials.filter.select')
         </template>
 
-        <x-rapidez::button.primary for="category-filters-slideover" class="w-full text-sm lg:hidden">
-            @lang('Show results')
-        </x-rapidez::button.primary>
+        <div class="bg-white -mx-5 p-5 sticky bottom-0 lg:hidden">
+            <x-rapidez::button.primary for="category-filters-slideover" class="w-full text-sm">
+                @lang('Show results')
+            </x-rapidez::button.primary>
+        </div>
     </div>
 </x-rapidez::slideover.mobile>
 
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index 2107236ff..62cc21ced 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -1,11 +1,21 @@
-<ais-search-box class="mb-5">
+<ais-search-box class="relative mb-5">
     <template v-slot="{ currentRefinement, isSearchStalled, refine }">
         <x-rapidez::input
             type="search"
             v-bind:value="currentRefinement"
             v-on:input="refine($event.currentTarget.value)"
+            class="peer"
             :placeholder="__('Search within the results')"
         />
+        <button
+            v-on:click="refine('')"
+            class="absolute top-1/2 -translate-y-1/2 right-4 transition-opacity opacity-100 peer-placeholder-shown:opacity-0"
+            type="reset"
+            title="__('Clear the search query')"
+            v-cloak
+        >
+            <x-heroicon-s-x-mark class="size-5" />
+        </button>
     </template>
 </ais-search-box>
 <ais-stats-analytics></ais-stats-analytics>
diff --git a/resources/views/listing/partials/filter/selected.blade.php b/resources/views/listing/partials/filter/selected.blade.php
index 293ba4b7a..df7bd7a2d 100644
--- a/resources/views/listing/partials/filter/selected.blade.php
+++ b/resources/views/listing/partials/filter/selected.blade.php
@@ -33,7 +33,7 @@ class="flex flex-wrap gap-2 relative"
                     <a
                         v-bind:href="createURL(refinement)"
                         v-on:click.prevent="item.refine(refinement)"
-                        class="flex items-center gap-1 p-1 text-xs rounded-lg bg transition hover:opacity-80"
+                        class="flex items-center gap-1 p-1 text-xs rounded-full bg transition hover:opacity-80"
                     >
                         @{{ item.filter.name }}:
                         <template v-if="false"></template>
diff --git a/resources/views/listing/partials/no-results.blade.php b/resources/views/listing/partials/no-results.blade.php
index 5ce3697c9..425308aa6 100644
--- a/resources/views/listing/partials/no-results.blade.php
+++ b/resources/views/listing/partials/no-results.blade.php
@@ -1,24 +1,37 @@
-@lang('Sorry! We did not find any products.')
-{{-- TODO: We will want to make this look better --}}
-<search-suggestions v-slot="searchSuggestions">
-    <ais-instant-search
-        v-if="searchSuggestions.searchClient"
-        :index-name="config.index.search_query"
-        :search-client="searchSuggestions.searchClient"
-    >
-        <ais-search-box value="{{ request()->q ?? ' ' }}" />
-        <ais-configure :hits-per-page.camel="5"/>
-        <ais-hits v-slot="{ items }">
-            <div class="mt-1" v-if="items && items.length">
-                @lang('But here are some suggestions!')
-                <ul class="flex flex-row font-sans">
-                    <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
-                        <a v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))" class="relative flex items-center group w-full py-2 text-sm gap-x-4">
-                            <span v-text="item.query_text"></span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </ais-hits>
-    </ais-instant-search>
-</search-suggestions>
+<div class="border py-4 sm:py-7">
+    <h2 class="font-sans font-bold text-2xl text px-4 sm:px-7">@lang('Sorry! We did not find any products.')</h2>
+    <search-suggestions v-slot="searchSuggestions">
+        <ais-instant-search
+            v-if="searchSuggestions.searchClient"
+            :index-name="config.index.search_query"
+            :search-client="searchSuggestions.searchClient"
+        >
+            <ais-search-box value="{{ request()->q ?? ' ' }}" />
+            <ais-configure :hits-per-page.camel="5"/>
+            <ais-hits v-slot="{ items }">
+                <div class="mt-3" v-if="items && items.length">
+                    <div class="px-4 sm:px-7">
+                        <div class="font-sans text-sm text mb-2">@lang('But here are some suggestions:')</div>
+                        <ul class="flex flex-col font-sans">
+                            <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
+                                <a
+                                    v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))" 
+                                    class="flex items-center group py-1 text-sm gap-x-0.5 hover:underline"
+                                >
+                                    <x-heroicon-o-chevron-right class="size-3.5 shrink-0"/> <span v-text="item.query_text"></span>
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="mt-4 border-t">
+                        <div class="px-4 sm:px-7">
+                            <a href="/" class="flex items-center group mt-3 py-1 text-sm gap-x-0.5 hover:underline" aria-label="@lang('Go to home')">
+                                <x-heroicon-o-chevron-right class="size-3.5 shrink-0"/> <span>@lang('Go to home')</span>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </ais-hits>
+        </ais-instant-search>
+    </search-suggestions>
+</div>
diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
index d951a6a23..190557808 100644
--- a/resources/views/listing/partials/pagination.blade.php
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -1,24 +1,55 @@
-<ais-pagination :padding="2" class="flex w-full" v-on:page-change="window.scrollTo({ top: 0, behavior: 'smooth' })">
+<ais-pagination :padding="2" v-on:page-change="scrollToElement('#products', 50)">
     <template v-slot="{ currentRefinement, nbPages, pages, isFirstPage, isLastPage, refine, createURL }">
-        <ul v-show="nbPages > 1" class="flex flex-wrap gap-2 w-full">
-            <li v-for="page in pages" :key="page">
+        <ul v-show="nbPages > 1" class="flex flex-wrap sm:justify-center w-full gap-y-2 max-sm:*:px-1 sm:gap-2">
+            <li v-if="!isFirstPage" class="max-sm:w-1/2">
+                <x-rapidez::button
+                    ::href="createURL(0)"
+                    v-on:click.exact.left.prevent="refine(0)"
+                    :aria-label="__('First Page')"
+                    class="max-w-12 max-sm:w-full max-sm:max-w-none"
+                >
+                    <x-heroicon-s-chevron-double-left class="shrink-0 size-4" />
+                </x-rapidez::button>
+            </li>
+            <li v-if="!isFirstPage" class="max-sm:w-1/2">
+                <x-rapidez::button
+                    ::href="createURL(currentRefinement - 1)"
+                    v-on:click.exact.left.prevent="refine(currentRefinement - 1)"
+                    :aria-label="__('Previous Page')"
+                    class="max-w-12 max-sm:w-full max-sm:max-w-none"
+                >
+                    <x-heroicon-s-chevron-left class="shrink-0 size-4" />
+                </x-rapidez::button>
+            </li>
+            <li v-for="page in pages" :key="page" class="max-sm:flex-1">
                 <x-rapidez::button
                     ::href="createURL(page)"
-                    ::class="{ '!bg-white !border !border-severe-emphasis !border-b-severe-emphasis': page === currentRefinement }"
+                    ::class="{ '!bg-white !border !border-default !border-b-default': page === currentRefinement }"
                     v-on:click.exact.left.prevent="refine(page)"
                     ::aria-label="`{{ __('Page') }} ${page + 1}`"
+                    class="max-sm:w-full sm:max-w-12"
                 >
                     @{{ page + 1 }}
                 </x-rapidez::button>
             </li>
-            <li v-if="!isLastPage" class="max-sm:w-full sm:ml-auto">
+            <li v-if="!isLastPage" class="max-sm:w-1/2">
                 <x-rapidez::button
                     ::href="createURL(currentRefinement + 1)"
                     v-on:click.exact.left.prevent="refine(currentRefinement + 1)"
                     :aria-label="__('Next Page')"
-                    class="max-sm:w-full"
+                    class="max-w-12 max-sm:w-full max-sm:max-w-none"
+                >
+                    <x-heroicon-s-chevron-right class="shrink-0 size-4" />
+                </x-rapidez::button>
+            </li>
+            <li v-if="!isLastPage" class="max-sm:w-1/2">
+                <x-rapidez::button
+                    ::href="createURL(nbPages)"
+                    v-on:click.exact.left.prevent="refine(nbPages)"
+                    :aria-label="__('Last Page')"
+                    class="max-w-12 max-sm:w-full max-sm:max-w-none"
                 >
-                    @lang('Next')
+                    <x-heroicon-s-chevron-double-right class="shrink-0 size-4" />
                 </x-rapidez::button>
             </li>
         </ul>
diff --git a/resources/views/listing/partials/toolbar.blade.php b/resources/views/listing/partials/toolbar.blade.php
index e7d95c610..797128b39 100644
--- a/resources/views/listing/partials/toolbar.blade.php
+++ b/resources/views/listing/partials/toolbar.blade.php
@@ -8,5 +8,7 @@
         </x-rapidez::label>
         @include('rapidez::listing.partials.toolbar.pages')
     </label>
-    @include('rapidez::listing.partials.toolbar.sorting')
+    <div class="max-md:hidden">
+        @include('rapidez::listing.partials.toolbar.sorting')
+    </div>
 </div>

From c278ff7cd0f4071b370b1575d13d3f3dcea8275f Mon Sep 17 00:00:00 2001
From: Roene-JustBetter <Roene-JustBetter@users.noreply.github.com>
Date: Mon, 12 May 2025 14:36:21 +0000
Subject: [PATCH 210/244] Apply fixes from Duster

---
 config/rapidez/frontend.php                           | 4 ++--
 resources/views/listing/partials/no-results.blade.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index df27c1357..26d022045 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -94,6 +94,6 @@
         // Show inputs below a range slider (true/false)
         'range_slider' => [
             'inputs' => true,
-        ]
-    ]
+        ],
+    ],
 ];
diff --git a/resources/views/listing/partials/no-results.blade.php b/resources/views/listing/partials/no-results.blade.php
index 425308aa6..424fc4109 100644
--- a/resources/views/listing/partials/no-results.blade.php
+++ b/resources/views/listing/partials/no-results.blade.php
@@ -15,7 +15,7 @@
                         <ul class="flex flex-col font-sans">
                             <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
                                 <a
-                                    v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))" 
+                                    v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))"
                                     class="flex items-center group py-1 text-sm gap-x-0.5 hover:underline"
                                 >
                                     <x-heroicon-o-chevron-right class="size-3.5 shrink-0"/> <span v-text="item.query_text"></span>

From d3f0ab3abb5e88508cbdc273f1f984a250f35f63 Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Mon, 12 May 2025 14:37:21 +0000
Subject: [PATCH 211/244] Apply fixes from Prettier

---
 resources/css/app.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/css/app.css b/resources/css/app.css
index 761fb02fc..ac555cc06 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -38,9 +38,9 @@ mark {
     @apply bg-transparent font-bold;
 }
 
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-results-button,
-input[type="search"]::-webkit-search-results-decoration {
+input[type='search']::-webkit-search-decoration,
+input[type='search']::-webkit-search-cancel-button,
+input[type='search']::-webkit-search-results-button,
+input[type='search']::-webkit-search-results-decoration {
     display: none;
-}
\ No newline at end of file
+}

From ee87f0e770e996452573bc1b9ca7f06fb37ff6f2 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 13 May 2025 12:57:40 +0200
Subject: [PATCH 212/244] Use computed var on root instead

---
 .../components/Elements/CurrencyDisplay.vue   |  24 -----
 resources/js/package.js                       |  15 +++
 resources/js/vue-components.js                |   1 -
 .../listing/partials/filter/price.blade.php   | 100 +++++++++---------
 4 files changed, 64 insertions(+), 76 deletions(-)
 delete mode 100644 resources/js/components/Elements/CurrencyDisplay.vue

diff --git a/resources/js/components/Elements/CurrencyDisplay.vue b/resources/js/components/Elements/CurrencyDisplay.vue
deleted file mode 100644
index 081b1e7c1..000000000
--- a/resources/js/components/Elements/CurrencyDisplay.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<script>
-export default {
-    render() {
-        return this.$scopedSlots.default(this)
-    },
-
-    computed: {
-        shouldFormatCurrencyLeft() {
-            return new Intl.NumberFormat(config.locale.replace('_', '-'), {
-                style: 'currency',
-                currency: config.currency,
-            }).formatToParts(1)?.[0]?.type === 'currency'
-        },
-
-        currencySymbol() {
-            return new Intl.NumberFormat(config.locale.replace('_', '-'), {
-                style: 'currency',
-                currency: config.currency,
-                maximumFractionDigits: 0,
-            }).format(0).replace(/\d/g, '').trim()
-        },
-    }
-}
-</script>
diff --git a/resources/js/package.js b/resources/js/package.js
index 777ac3698..490a07638 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -159,6 +159,21 @@ function init() {
                 canOrder() {
                     return this.cart.items.every((item) => item.is_available)
                 },
+
+                currencyDisplay() {
+                    return {
+                        symbolLocation: new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                            style: 'currency',
+                            currency: config.currency,
+                        }).formatToParts(1)?.[0]?.type === 'currency' ? 'left' : 'right',
+
+                        symbol: new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                            style: 'currency',
+                            currency: config.currency,
+                            maximumFractionDigits: 0,
+                        }).format(0).replace(/\d/g, '').trim()
+                    }
+                },
             },
             watch: {
                 loadingCount: function (count) {
diff --git a/resources/js/vue-components.js b/resources/js/vue-components.js
index 0a7e236ca..33905a8ed 100644
--- a/resources/js/vue-components.js
+++ b/resources/js/vue-components.js
@@ -58,4 +58,3 @@ Vue.component('listing', () => import('./components/Listing/Listing.vue'))
 Vue.component('checkout-success', () => import('./components/Checkout/CheckoutSuccess.vue'))
 Vue.component('popup', () => import('./components/Popup.vue'))
 Vue.component('range-slider', () => import('./components/Elements/RangeSlider.vue'))
-Vue.component('currency-display', () => import('./components/Elements/CurrencyDisplay.vue'))
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 971ce401c..865cec51c 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -19,58 +19,56 @@
                         </x-rapidez::input.range-slider>
                     </div>
 
-                    <currency-display v-slot="{ shouldFormatCurrencyLeft, currencySymbol }">
-                        <div class="flex gap-10">
-                            <div class="relative w-full">
-                                <x-rapidez::input
-                                    class="text-right"
-                                    required
-                                    type="number"
-                                    v-bind:min="range.min"
-                                    v-bind:max="range.max"
-                                    v-bind:placeholder="range.min"
-                                    v-bind:disabled="!canRefine"
-                                    v-bind:value="currentRefinement.min ?? range.min"
-                                    v-on:input="if (!$event.currentTarget.validationMessage) {
-                                        refine({ min: Math.max($event.currentTarget.value, range.min), max: currentRefinement.max })
-                                    }"
-                                />
-                                <span
-                                    class="absolute bottom-1/2 translate-y-1/2"
-                                    v-bind:class="{
-                                        'left-2': shouldFormatCurrencyLeft,
-                                        'right-2': !shouldFormatCurrencyLeft
-                                    }"
-                                >
-                                    @{{ currencySymbol }}
-                                </span>
-                            </div>
-                            <div class="relative w-full">
-                                <x-rapidez::input
-                                    class="text-right"
-                                    required
-                                    type="number"
-                                    v-bind:min="range.min"
-                                    v-bind:max="range.max"
-                                    v-bind:placeholder="range.max"
-                                    v-bind:disabled="!canRefine"
-                                    v-bind:value="currentRefinement.max ?? range.max"
-                                    v-on:input="if (!$event.currentTarget.validationMessage) {
-                                        refine({ min: currentRefinement.min, max: Math.min($event.currentTarget.value, range.max) })
-                                    }"
-                                />
-                                <span
-                                    class="absolute bottom-1/2 translate-y-1/2"
-                                    v-bind:class="{
-                                        'left-2': shouldFormatCurrencyLeft,
-                                        'right-2': !shouldFormatCurrencyLeft
-                                    }"
-                                >
-                                    @{{ currencySymbol }}
-                                </span>
-                            </div>
+                    <div class="flex gap-10">
+                        <div class="relative w-full">
+                            <x-rapidez::input
+                                class="text-right"
+                                required
+                                type="number"
+                                v-bind:min="range.min"
+                                v-bind:max="range.max"
+                                v-bind:placeholder="range.min"
+                                v-bind:disabled="!canRefine"
+                                v-bind:value="currentRefinement.min ?? range.min"
+                                v-on:input="if (!$event.currentTarget.validationMessage) {
+                                    refine({ min: Math.max($event.currentTarget.value, range.min), max: currentRefinement.max })
+                                }"
+                            />
+                            <span
+                                class="absolute bottom-1/2 translate-y-1/2"
+                                v-bind:class="{
+                                    'left-2': $root.currencyDisplay.symbolLocation === 'left',
+                                    'right-2': $root.currencyDisplay.symbolLocation === 'right',
+                                }"
+                            >
+                                @{{ $root.currencyDisplay.symbol }}
+                            </span>
                         </div>
-                    </currency-display>
+                        <div class="relative w-full">
+                            <x-rapidez::input
+                                class="text-right"
+                                required
+                                type="number"
+                                v-bind:min="range.min"
+                                v-bind:max="range.max"
+                                v-bind:placeholder="range.max"
+                                v-bind:disabled="!canRefine"
+                                v-bind:value="currentRefinement.max ?? range.max"
+                                v-on:input="if (!$event.currentTarget.validationMessage) {
+                                    refine({ min: currentRefinement.min, max: Math.min($event.currentTarget.value, range.max) })
+                                }"
+                            />
+                            <span
+                                class="absolute bottom-1/2 translate-y-1/2"
+                                v-bind:class="{
+                                    'left-2': $root.currencyDisplay.symbolLocation === 'left',
+                                    'right-2': $root.currencyDisplay.symbolLocation === 'right',
+                                }"
+                            >
+                                @{{ $root.currencyDisplay.symbol }}
+                            </span>
+                        </div>
+                    </div>
                 </div>
             </x-rapidez::filter.heading>
         </div>

From 8113988704f66d712208e7dd652ec7e0c4d13570 Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Tue, 13 May 2025 10:58:33 +0000
Subject: [PATCH 213/244] Apply fixes from Prettier

---
 resources/js/package.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/resources/js/package.js b/resources/js/package.js
index 490a07638..4e8c3d0d9 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -162,16 +162,22 @@ function init() {
 
                 currencyDisplay() {
                     return {
-                        symbolLocation: new Intl.NumberFormat(config.locale.replace('_', '-'), {
-                            style: 'currency',
-                            currency: config.currency,
-                        }).formatToParts(1)?.[0]?.type === 'currency' ? 'left' : 'right',
+                        symbolLocation:
+                            new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                                style: 'currency',
+                                currency: config.currency,
+                            }).formatToParts(1)?.[0]?.type === 'currency'
+                                ? 'left'
+                                : 'right',
 
                         symbol: new Intl.NumberFormat(config.locale.replace('_', '-'), {
                             style: 'currency',
                             currency: config.currency,
                             maximumFractionDigits: 0,
-                        }).format(0).replace(/\d/g, '').trim()
+                        })
+                            .format(0)
+                            .replace(/\d/g, '')
+                            .trim(),
                     }
                 },
             },

From 9f6ca4bfd0c7c12c89837f920c365b5d4a12b0a8 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 13 May 2025 13:00:37 +0200
Subject: [PATCH 214/244] Formatting

---
 resources/js/package.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/resources/js/package.js b/resources/js/package.js
index 4e8c3d0d9..2125a9838 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -170,14 +170,15 @@ function init() {
                                 ? 'left'
                                 : 'right',
 
-                        symbol: new Intl.NumberFormat(config.locale.replace('_', '-'), {
-                            style: 'currency',
-                            currency: config.currency,
-                            maximumFractionDigits: 0,
-                        })
-                            .format(0)
-                            .replace(/\d/g, '')
-                            .trim(),
+                        symbol:
+                            new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                                style: 'currency',
+                                currency: config.currency,
+                                maximumFractionDigits: 0,
+                            })
+                                .format(0)
+                                .replace(/\d/g, '')
+                                .trim(),
                     }
                 },
             },

From 2f31d7098bb29a3c9f287e58d510fe4465dd5c4b Mon Sep 17 00:00:00 2001
From: Jade-GG <Jade-GG@users.noreply.github.com>
Date: Tue, 13 May 2025 11:01:09 +0000
Subject: [PATCH 215/244] Apply fixes from Prettier

---
 resources/js/package.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/resources/js/package.js b/resources/js/package.js
index 2125a9838..4e8c3d0d9 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -170,15 +170,14 @@ function init() {
                                 ? 'left'
                                 : 'right',
 
-                        symbol:
-                            new Intl.NumberFormat(config.locale.replace('_', '-'), {
-                                style: 'currency',
-                                currency: config.currency,
-                                maximumFractionDigits: 0,
-                            })
-                                .format(0)
-                                .replace(/\d/g, '')
-                                .trim(),
+                        symbol: new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                            style: 'currency',
+                            currency: config.currency,
+                            maximumFractionDigits: 0,
+                        })
+                            .format(0)
+                            .replace(/\d/g, '')
+                            .trim(),
                     }
                 },
             },

From 8211af471e5898eb8ffedd0146a7ee68886eab45 Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Tue, 13 May 2025 17:29:37 +0200
Subject: [PATCH 216/244] InstantSearch - Visual changes

---
 lang/nl.json                                  |  4 +-
 resources/css/app.css                         |  5 +++
 .../components/input/range-slider.blade.php   | 10 ++---
 resources/views/listing/filters.blade.php     |  5 +--
 .../listing/partials/filter/search.blade.php  |  3 +-
 .../partials/filter/selected.blade.php        |  4 +-
 .../listing/partials/filter/swatch.blade.php  |  2 +-
 .../listing/partials/no-results.blade.php     | 38 ++++++++-----------
 .../views/listing/partials/toolbar.blade.php  |  5 +--
 .../listing/partials/toolbar/pages.blade.php  |  6 +--
 .../partials/toolbar/sorting.blade.php        |  6 +--
 .../listing/partials/toolbar/stats.blade.php  |  2 +-
 resources/views/listing/products.blade.php    |  4 +-
 tailwind.config.js                            |  4 +-
 14 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/lang/nl.json b/lang/nl.json
index cb4854d89..8cb261119 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -88,8 +88,8 @@
     "Sign up for our newsletter to stay up to date.": "Meld je aan voor onze nieuwsbrief om op de hoogte te blijven.",
     "Sorry! No image": "Sorry! Geen afbeelding",
     "Sorry! This product is currently out of stock.": "Sorry! Dit product is momenteel niet op voorraad.",
-    "Sorry! We did not find any products.": "Sorry! We hebben geen producten gevonden.",
-    "But here are some suggestions:": "Maar hier zijn enkele suggesties:",
+    "No products found.": "Geen producten gevonden.",
+    "Here are some suggestions:": "Hier zijn enkele suggesties:",
     "Specifications": "Specificaties",
     "Street": "Straat",
     "Subscribe": "Inschrijven",
diff --git a/resources/css/app.css b/resources/css/app.css
index 761fb02fc..e3da68f3c 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -43,4 +43,9 @@ input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-results-button,
 input[type="search"]::-webkit-search-results-decoration {
     display: none;
+}
+
+.custom-select {
+    background-position: right center;
+    field-sizing: content;
 }
\ No newline at end of file
diff --git a/resources/views/components/input/range-slider.blade.php b/resources/views/components/input/range-slider.blade.php
index a11ac6f10..54abed4fb 100644
--- a/resources/views/components/input/range-slider.blade.php
+++ b/resources/views/components/input/range-slider.blade.php
@@ -29,14 +29,14 @@ class="absolute pointer-events-none appearance-none z-20 h-5 w-full opacity-0 cu
 
             <div class="relative z-10 w-full mx-2 h-4">
                 <div class="absolute top-1/2 -translate-y-1/2 h-1 z-10 -inset-x-2 rounded-md bg-emphasis"></div>
-                <div class="absolute top-1/2 -translate-y-1/2 h-1 z-20 rounded-md bg-severe-emphasis" v-bind:style="'right:'+rangeInputScope.maxThumb+'%; left:'+rangeInputScope.minThumb+'%'"></div>
-                <div class="absolute z-30 size-4 top-1/2 left-0 bg-severe-emphasis rounded-full -translate-y-1/2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
-                <div class="absolute z-30 size-4 top-1/2 right-0 bg-severe-emphasis rounded-full -translate-y-1/2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
+                <div class="absolute top-1/2 -translate-y-1/2 h-1 z-20 rounded-md bg-active" v-bind:style="'right:'+rangeInputScope.maxThumb+'%; left:'+rangeInputScope.minThumb+'%'"></div>
+                <div class="absolute z-30 size-4 top-1/2 left-0 bg-active rounded-full -translate-y-1/2 -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'"></div>
+                <div class="absolute z-30 size-4 top-1/2 right-0 bg-active rounded-full -translate-y-1/2 translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'"></div>
                 @if (!$inputs)
-                    <div class="absolute z-30 top-5 left-0 bg-severe-emphasis text-white px-2 py-0.5 rounded-md -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
+                    <div class="absolute z-30 top-5 left-0 bg-active text-white px-2 py-0.5 rounded-md -translate-x-1/2" v-bind:style="'left: '+rangeInputScope.minThumb+'%'">
                         @{{ rangeInputScope.minValue }}
                     </div>
-                    <div class="absolute z-30 top-5 right-0 bg-severe-emphasis text-white px-2 py-0.5 rounded-md translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'">
+                    <div class="absolute z-30 top-5 right-0 bg-active text-white px-2 py-0.5 rounded-md translate-x-1/2" v-bind:style="'right: '+rangeInputScope.maxThumb+'%'">
                         @{{ rangeInputScope.maxValue }}
                     </div>
                 @endif
diff --git a/resources/views/listing/filters.blade.php b/resources/views/listing/filters.blade.php
index 45c70052b..026d90bc3 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -11,11 +11,10 @@
 @endPushOnce
 <x-rapidez::slideover.mobile id="category-filters-slideover" :title="__('Filters')">
     <div class="max-lg:container max-lg:pt-6">
-        <div class="max-md:mb-3 md:hidden">
-            <p class="text-xl/9 font-medium mb-1">@lang('Sort on'):</p>
+        <div class="text-right max-md:mb-3 md:hidden">
             @include('rapidez::listing.partials.toolbar.sorting')
         </div>
-        <p class="text-xl/9 font-medium mb-3">@lang('Filters')</p>
+        <p class="text-xl/9 font-medium mb-3 max-lg:hidden">@lang('Filters')</p>
 
         @include('rapidez::listing.partials.filter.selected')
         @include('rapidez::listing.partials.filter.search')
diff --git a/resources/views/listing/partials/filter/search.blade.php b/resources/views/listing/partials/filter/search.blade.php
index 62cc21ced..7de7ee29b 100644
--- a/resources/views/listing/partials/filter/search.blade.php
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -7,9 +7,10 @@
             class="peer"
             :placeholder="__('Search within the results')"
         />
+        <x-heroicon-o-magnifying-glass class="size-5 absolute top-1/2 -translate-y-1/2 right-4 transition-opacity opacity-0 peer-placeholder-shown:opacity-100" />
         <button
             v-on:click="refine('')"
-            class="absolute top-1/2 -translate-y-1/2 right-4 transition-opacity opacity-100 peer-placeholder-shown:opacity-0"
+            class="absolute top-1/2 -translate-y-1/2 right-4 transition-opacity opacity-100 peer-placeholder-shown:pointer-events-none peer-placeholder-shown:opacity-0"
             type="reset"
             title="__('Clear the search query')"
             v-cloak
diff --git a/resources/views/listing/partials/filter/selected.blade.php b/resources/views/listing/partials/filter/selected.blade.php
index df7bd7a2d..5b5fc0539 100644
--- a/resources/views/listing/partials/filter/selected.blade.php
+++ b/resources/views/listing/partials/filter/selected.blade.php
@@ -33,8 +33,9 @@ class="flex flex-wrap gap-2 relative"
                     <a
                         v-bind:href="createURL(refinement)"
                         v-on:click.prevent="item.refine(refinement)"
-                        class="flex items-center gap-1 p-1 text-xs rounded-full bg transition hover:opacity-80"
+                        class="flex items-center gap-1 p-1.5 text-xs font-medium text-white rounded-full bg-active transition hover:opacity-80"
                     >
+                        <x-heroicon-o-x-mark class="size-3.5 shrink-0 stroke-2"/>
                         @{{ item.filter.name }}:
                         <template v-if="false"></template>
                         @include('rapidez::listing.partials.filter.selected.boolean')
@@ -42,7 +43,6 @@ class="flex items-center gap-1 p-1 text-xs rounded-full bg transition hover:opac
                         <template v-else>
                             @{{ refinement.label }}
                         </template>
-                        <x-heroicon-o-x-mark class="size-3 shrink-0"/>
                     </a>
                 </li>
             </template>
diff --git a/resources/views/listing/partials/filter/swatch.blade.php b/resources/views/listing/partials/filter/swatch.blade.php
index d9acc03ef..6d142ce25 100644
--- a/resources/views/listing/partials/filter/swatch.blade.php
+++ b/resources/views/listing/partials/filter/swatch.blade.php
@@ -25,7 +25,7 @@ class="hidden"
                         <label
                             v-else
                             class="block border px-3 py-1.5 rounded-md cursor-pointer text-sm text-muted font-medium hover:border-emphasis"
-                            v-bind:class="{ 'bg-severe-emphasis !border-severe-emphasis text-white': item.isRefined }"
+                            v-bind:class="{ 'bg-active !border-active text-white': item.isRefined }"
                             v-bind:style="{ background: item.swatch?.swatch ?? 'none' }"
                         >
                             @{{ item.swatch?.swatch ?? item.value }}
diff --git a/resources/views/listing/partials/no-results.blade.php b/resources/views/listing/partials/no-results.blade.php
index 425308aa6..9dd457d0b 100644
--- a/resources/views/listing/partials/no-results.blade.php
+++ b/resources/views/listing/partials/no-results.blade.php
@@ -1,5 +1,5 @@
-<div class="border py-4 sm:py-7">
-    <h2 class="font-sans font-bold text-2xl text px-4 sm:px-7">@lang('Sorry! We did not find any products.')</h2>
+<div class="bg rounded-md p-10">
+    <h2 class="font-sans text-xl font-medium">@lang('No products found.')</h2>
     <search-suggestions v-slot="searchSuggestions">
         <ais-instant-search
             v-if="searchSuggestions.searchClient"
@@ -9,27 +9,21 @@
             <ais-search-box value="{{ request()->q ?? ' ' }}" />
             <ais-configure :hits-per-page.camel="5"/>
             <ais-hits v-slot="{ items }">
-                <div class="mt-3" v-if="items && items.length">
-                    <div class="px-4 sm:px-7">
-                        <div class="font-sans text-sm text mb-2">@lang('But here are some suggestions:')</div>
-                        <ul class="flex flex-col font-sans">
-                            <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
-                                <a
-                                    v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))" 
-                                    class="flex items-center group py-1 text-sm gap-x-0.5 hover:underline"
-                                >
-                                    <x-heroicon-o-chevron-right class="size-3.5 shrink-0"/> <span v-text="item.query_text"></span>
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="mt-4 border-t">
-                        <div class="px-4 sm:px-7">
-                            <a href="/" class="flex items-center group mt-3 py-1 text-sm gap-x-0.5 hover:underline" aria-label="@lang('Go to home')">
-                                <x-heroicon-o-chevron-right class="size-3.5 shrink-0"/> <span>@lang('Go to home')</span>
+                <div class="mt-1" v-if="items && items.length">
+                    <div class="font-sans text mb-2">@lang('Here are some suggestions:')</div>
+                    <ul class="flex flex-col font-sans">
+                        <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
+                            <a
+                                v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))" 
+                                class="flex items-center group py-1 gap-x-0.5 hover:underline"
+                            >
+                                <x-heroicon-o-chevron-right class="text-primary size-3.5 shrink-0"/> <span v-text="item.query_text"></span>
                             </a>
-                        </div>
-                    </div>
+                        </li>
+                    </ul>
+                    <x-rapidez::button.outline class="mt-4 bg-white" href="/" aria-label="@lang('Go to home')">
+                        @lang('Go to home')
+                    </x-rapidez::button.outline>
                 </div>
             </ais-hits>
         </ais-instant-search>
diff --git a/resources/views/listing/partials/toolbar.blade.php b/resources/views/listing/partials/toolbar.blade.php
index 797128b39..82ac6217f 100644
--- a/resources/views/listing/partials/toolbar.blade.php
+++ b/resources/views/listing/partials/toolbar.blade.php
@@ -1,11 +1,8 @@
-<div class="flex gap-1 sm:items-center text-sm max-sm:flex-col-reverse">
+<div class="flex gap-1 sm:items-center text-sm">
     <div class="flex-1">
         @include('rapidez::listing.partials.toolbar.stats')
     </div>
     <label class="flex items-center gap-x-1.5">
-        <x-rapidez::label class="whitespace-nowrap mb-0">
-            @lang('Items per page'):
-        </x-rapidez::label>
         @include('rapidez::listing.partials.toolbar.pages')
     </label>
     <div class="max-md:hidden">
diff --git a/resources/views/listing/partials/toolbar/pages.blade.php b/resources/views/listing/partials/toolbar/pages.blade.php
index 5cf8cdfe9..03ff0fd1f 100644
--- a/resources/views/listing/partials/toolbar/pages.blade.php
+++ b/resources/views/listing/partials/toolbar/pages.blade.php
@@ -1,9 +1,9 @@
 <ais-hits-per-page :items="hitsPerPage">
     <template v-slot="{ items, refine }">
-        <x-rapidez::input.select
+        <select
             v-bind:value="items.find(item => item.isRefined)?.value"
             v-on:change="event => refine(event.target.value)"
-            class="w-20"
+            class="py-0 pr-5 border-none text text-sm focus:outline-none focus:ring-0 focus:ring-offset-0 custom-select"
         >
             <option
                 v-for="item in items"
@@ -12,6 +12,6 @@ class="w-20"
             >
                 @{{ item.label }}
             </option>
-        </x-rapidez::input.select>
+        </select>
     </template>
 </ais-hits-per-page>
diff --git a/resources/views/listing/partials/toolbar/sorting.blade.php b/resources/views/listing/partials/toolbar/sorting.blade.php
index 9c82ca5d3..3aa83bbde 100644
--- a/resources/views/listing/partials/toolbar/sorting.blade.php
+++ b/resources/views/listing/partials/toolbar/sorting.blade.php
@@ -1,9 +1,9 @@
 <ais-sort-by :items="Object.values(config.searchkit.sorting)">
     <template v-slot="{ items, currentRefinement, refine }">
-        <x-rapidez::input.select
+        <select
             v-bind:value="items.find(item => item.value === currentRefinement)?.value"
             v-on:change="event => refine(event.target.value)"
-            class="pr-8"
+            class="py-0 pr-5 border-none text text-sm focus:outline-none focus:ring-0 focus:ring-offset-0 custom-select"
         >
             <option
                 v-for="item in items"
@@ -12,6 +12,6 @@ class="pr-8"
             >
                 @{{ item.label }}
             </option>
-        </x-rapidez::input.select>
+        </select>
     </template>
 </ais-sort-by>
diff --git a/resources/views/listing/partials/toolbar/stats.blade.php b/resources/views/listing/partials/toolbar/stats.blade.php
index 04f2c76cd..dfaa72d58 100644
--- a/resources/views/listing/partials/toolbar/stats.blade.php
+++ b/resources/views/listing/partials/toolbar/stats.blade.php
@@ -1,4 +1,4 @@
-<ais-stats>
+<ais-stats class="text-sm">
     <template v-slot="{ nbPages, nbHits, page, processingTimeMS }">
         @{{ nbHits }} @lang('products')
         <template v-if="nbPages > 1">
diff --git a/resources/views/listing/products.blade.php b/resources/views/listing/products.blade.php
index f2a9110b7..2411ecb8b 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -13,11 +13,11 @@
     )
 @endPushOnce
 
-<div id="products" class="flex flex-col gap-3 max-lg:mt-3 max-lg:flex-wrap">
+<div id="products" class="flex flex-col max-lg:mt-3 max-lg:flex-wrap">
     <x-rapidez::button.secondary for="category-filters-slideover" class="w-full lg:hidden">
         @lang('Filters')
     </x-rapidez::button.secondary>
-    <div class="*:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end">
+    <div class="mt-2 mb-4 *:flex-wrap *:gap-3 *:max-sm:gap-y-3 *:max-md:justify-end">
         @include('rapidez::listing.partials.toolbar')
     </div>
     <ais-hits>
diff --git a/tailwind.config.js b/tailwind.config.js
index a7c4bed17..212703a51 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -48,14 +48,14 @@ export default {
                 },
 
                 border: {
-                    'severe-emphasis': color('--border-severe-emphasis', colors.slate[800]),
+                    active: color('--border-active', colors.slate[800]),
                     emphasis: color('--border-emphasis', colors.slate[400]),
                     DEFAULT: color('--border', colors.slate[300]),
                     muted: color('--border-muted', colors.slate[100]),
                 },
 
                 background: {
-                    'severe-emphasis': color('--background-severe-emphasis', colors.slate[800]),
+                    active: color('--background-active', colors.slate[800]),
                     emphasis: color('--background-emphasis', colors.slate[200]),
                     DEFAULT: color('--background', colors.slate[100]),
                     muted: color('--background-muted', colors.slate[50]),

From 09fb85c443a79fa82995f60e0afc0695469ce046 Mon Sep 17 00:00:00 2001
From: Roene-JustBetter <Roene-JustBetter@users.noreply.github.com>
Date: Tue, 13 May 2025 15:33:10 +0000
Subject: [PATCH 217/244] Apply fixes from Duster

---
 resources/views/listing/partials/no-results.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/listing/partials/no-results.blade.php b/resources/views/listing/partials/no-results.blade.php
index 9dd457d0b..492fc374d 100644
--- a/resources/views/listing/partials/no-results.blade.php
+++ b/resources/views/listing/partials/no-results.blade.php
@@ -14,7 +14,7 @@
                     <ul class="flex flex-col font-sans">
                         <li v-for="(item, count) in items" class="flex flex-1 items-center w-full">
                             <a
-                                v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))" 
+                                v-bind:href="window.url(item.redirect || '{{ route('search', ['q' => 'searchPlaceholder']) }}'.replace('searchPlaceholder', encodeURIComponent(item.query_text)))"
                                 class="flex items-center group py-1 gap-x-0.5 hover:underline"
                             >
                                 <x-heroicon-o-chevron-right class="text-primary size-3.5 shrink-0"/> <span v-text="item.query_text"></span>

From 83546d0008881b432987595f6b92f1cf06b48f2b Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Wed, 14 May 2025 11:03:17 +0200
Subject: [PATCH 218/244] Visual changes pagination

---
 config/rapidez/frontend.php                   |  7 --
 lang/nl.json                                  |  2 +-
 .../components/input/range-slider.blade.php   |  2 +-
 .../listing/partials/pagination.blade.php     | 90 ++++++++++---------
 4 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index 26d022045..9a3a1a948 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -89,11 +89,4 @@
 
     // The path to redirect to after a failed checkout
     'checkout_success_fail_redirect_path' => 'cart',
-
-    'filters' => [
-        // Show inputs below a range slider (true/false)
-        'range_slider' => [
-            'inputs' => true,
-        ],
-    ],
 ];
diff --git a/lang/nl.json b/lang/nl.json
index 8cb261119..5cb560110 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -125,5 +125,5 @@
     "Page": "Pagina",
     "Next Page": "Volgende pagina",
     "Last Page": "Laatste pagina",
-    "Sort on": "Sorteer op"
+    "Clear the search query": "De zoekopdracht wissen"
 }
diff --git a/resources/views/components/input/range-slider.blade.php b/resources/views/components/input/range-slider.blade.php
index 54abed4fb..4f4c6a122 100644
--- a/resources/views/components/input/range-slider.blade.php
+++ b/resources/views/components/input/range-slider.blade.php
@@ -1,4 +1,4 @@
-@props(['inputs' => config('rapidez.frontend.filters.range_slider.inputs')])
+@props(['inputs' => true ])
 
 <range-slider v-slot="rangeInputScope" {{ $attributes }}>
     <div class="w-full">
diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
index 190557808..661ecf996 100644
--- a/resources/views/listing/partials/pagination.blade.php
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -1,56 +1,64 @@
-<ais-pagination :padding="2" v-on:page-change="scrollToElement('#products', 50)">
+<ais-pagination :padding="1" v-on:page-change="scrollToElement('#products', 50)">
     <template v-slot="{ currentRefinement, nbPages, pages, isFirstPage, isLastPage, refine, createURL }">
-        <ul v-show="nbPages > 1" class="flex flex-wrap sm:justify-center w-full gap-y-2 max-sm:*:px-1 sm:gap-2">
-            <li v-if="!isFirstPage" class="max-sm:w-1/2">
-                <x-rapidez::button
-                    ::href="createURL(0)"
-                    v-on:click.exact.left.prevent="refine(0)"
-                    :aria-label="__('First Page')"
-                    class="max-w-12 max-sm:w-full max-sm:max-w-none"
+        <ul v-show="nbPages > 1" class="flex flex-wrap w-full pb-0.5 mt-5 gap-1 sm:gap-2 justify-center">
+            <li v-if="!isFirstPage">
+                <button
+                    href="createURL(currentRefinement - 1)"
+                    v-on:click.exact.left.prevent="refine(currentRefinement - 1)"
+                    aria-label="@lang('Previous Page')"
+                    class="flex justify-center items-center rounded border hover:border-emphasis max-sm:size-9 sm:pl-2 sm:pr-3 sm:h-full"
                 >
-                    <x-heroicon-s-chevron-double-left class="shrink-0 size-4" />
-                </x-rapidez::button>
+                    <x-heroicon-o-chevron-left class="shrink-0 stroke-2 size-4" />
+                    <span class="max-sm:hidden">@lang('Prev')</span>
+                </button>
             </li>
-            <li v-if="!isFirstPage" class="max-sm:w-1/2">
-                <x-rapidez::button
-                    ::href="createURL(currentRefinement - 1)"
-                    v-on:click.exact.left.prevent="refine(currentRefinement - 1)"
-                    :aria-label="__('Previous Page')"
-                    class="max-w-12 max-sm:w-full max-sm:max-w-none"
+            <li v-if="!isFirstPage && currentRefinement !== 1">
+                <button
+                    href="createURL(0)"
+                    v-on:click.exact.left.prevent="refine(0)"
+                    aria-label="@lang('First Page')"
+                    class="flex justify-center items-center size-9 rounded border hover:border-emphasis sm:size-10"
                 >
-                    <x-heroicon-s-chevron-left class="shrink-0 size-4" />
-                </x-rapidez::button>
+                    1
+                </button>
+            </li>
+            <li v-if="!isFirstPage && currentRefinement !== 1 && currentRefinement !== 2" class="flex items-center text-muted max-sm:text-xs">
+                ...
             </li>
-            <li v-for="page in pages" :key="page" class="max-sm:flex-1">
-                <x-rapidez::button
-                    ::href="createURL(page)"
-                    ::class="{ '!bg-white !border !border-default !border-b-default': page === currentRefinement }"
+            <li v-for="page in pages" :key="page">
+                <button
+                    href="createURL(page)"
+                    v-bind:class="{ 'ring-1 bg-primary/10 ring-primary border-primary font-semibold hover:border-primary': page === currentRefinement }"
                     v-on:click.exact.left.prevent="refine(page)"
-                    ::aria-label="`{{ __('Page') }} ${page + 1}`"
-                    class="max-sm:w-full sm:max-w-12"
+                    v-bind:aria-label="`{{ __('Page') }} ${page + 1}`"
+                    class="size-9 sm:size-10 rounded border hover:border-emphasis"
                 >
                     @{{ page + 1 }}
-                </x-rapidez::button>
+                </button>
             </li>
-            <li v-if="!isLastPage" class="max-sm:w-1/2">
-                <x-rapidez::button
-                    ::href="createURL(currentRefinement + 1)"
-                    v-on:click.exact.left.prevent="refine(currentRefinement + 1)"
-                    :aria-label="__('Next Page')"
-                    class="max-w-12 max-sm:w-full max-sm:max-w-none"
-                >
-                    <x-heroicon-s-chevron-right class="shrink-0 size-4" />
-                </x-rapidez::button>
+            <li v-if="!isLastPage && currentRefinement !== nbPages - 2 && currentRefinement !== nbPages - 3" class="flex items-center text-muted max-sm:text-xs">
+                ...
             </li>
-            <li v-if="!isLastPage" class="max-sm:w-1/2">
-                <x-rapidez::button
-                    ::href="createURL(nbPages)"
+            <li v-if="!isLastPage && currentRefinement !== nbPages - 2">
+                <button
+                    href="createURL(nbPages)"
                     v-on:click.exact.left.prevent="refine(nbPages)"
-                    :aria-label="__('Last Page')"
-                    class="max-w-12 max-sm:w-full max-sm:max-w-none"
+                    aria-label="@lang('Last Page')"
+                    class="flex justify-center items-center size-9 sm:size-10 rounded border hover:border-emphasis"
+                >
+                    @{{ nbPages }}
+                </button>
+            </li>
+            <li v-if="!isLastPage">
+                <button
+                    href="createURL(currentRefinement + 1)"
+                    v-on:click.exact.left.prevent="refine(currentRefinement + 1)"
+                    aria-label="@lang('Next Page')"
+                    class="flex justify-center items-center rounded border hover:border-emphasis max-sm:size-9 sm:pr-2 sm:pl-3 sm:h-full"
                 >
-                    <x-heroicon-s-chevron-double-right class="shrink-0 size-4" />
-                </x-rapidez::button>
+                    <span class="max-sm:hidden">@lang('Next')</span>
+                    <x-heroicon-o-chevron-right class="shrink-0 stroke-2 size-4 mt-0.5" />
+                </button>
             </li>
         </ul>
     </template>

From 92d3d29e942a414e9bbfa61afdee97eaeaaecb7a Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Wed, 14 May 2025 11:17:08 +0200
Subject: [PATCH 219/244] Readded id on form for all results button

---
 resources/views/components/autocomplete/input.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/autocomplete/input.blade.php b/resources/views/components/autocomplete/input.blade.php
index 5fd3a0f1a..b1bc7f1d7 100644
--- a/resources/views/components/autocomplete/input.blade.php
+++ b/resources/views/components/autocomplete/input.blade.php
@@ -1,4 +1,4 @@
-<form method="get" action="{{ route('search') }}" class="flex relative z-header-autocomplete">
+<form id="autocomplete-form" method="get" action="{{ route('search') }}" class="flex relative z-header-autocomplete">
     <x-rapidez::input
         {{ $attributes->merge([
             'id' => 'autocomplete-input',

From 81ce688fd9d452aa3fc73d37ae159d9e32ea3f1e Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Wed, 14 May 2025 11:28:15 +0200
Subject: [PATCH 220/244] Make use of max-lg to reduce classes

---
 resources/views/components/listing.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 88c5f8ac9..1c2f24768 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -22,7 +22,7 @@
                 {{ $before ?? '' }}
 
                 @slotdefault('slot')
-                    <div class="flex flex-col lg:flex-row gap-x-12 gap-y-3">
+                    <div class="flex gap-x-12 gap-y-3 max-lg:flex-col">
                         <div class="lg:w-80 shrink-0">
                             @include('rapidez::listing.filters')
                         </div>

From 3464806abac221b749edef6359c2180e07416899 Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Wed, 14 May 2025 11:46:10 +0200
Subject: [PATCH 221/244] Make use of text-primary-text instead of text-white |
 Remove JIT for tailwind classes

---
 .../views/components/autocomplete/magnifying-glass.blade.php    | 2 +-
 resources/views/layouts/partials/header/autocomplete.blade.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/autocomplete/magnifying-glass.blade.php b/resources/views/components/autocomplete/magnifying-glass.blade.php
index 6d7864901..27f390da7 100644
--- a/resources/views/components/autocomplete/magnifying-glass.blade.php
+++ b/resources/views/components/autocomplete/magnifying-glass.blade.php
@@ -1,4 +1,4 @@
 {{-- This is the search icon in the autocomplete --}}
-<div {{ $attributes->twMerge('transition-colors duration-300 rounded-lg bg-primary text-white absolute right-1 inset-y-1 w-11 pointer-events-none flex items-center justify-center z-header-autocomplete-button') }}>
+<div {{ $attributes->twMerge('transition-colors duration-300 rounded-lg bg-primary text-primary-text absolute right-1 inset-y-1 w-11 pointer-events-none flex items-center justify-center z-header-autocomplete-button') }}>
     <x-heroicon-o-magnifying-glass class="size-5" />
 </div>
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 54ce3258b..8ae257432 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -21,7 +21,7 @@ class="contents"
                                 }"
                                 v-on:input="refine($event.currentTarget.value)"
                             />
-                            <div v-if="currentRefinement" class="absolute inset-x-0 top-[52px] bg-white border rounded-md z-header-autocomplete">
+                            <div v-if="currentRefinement" class="absolute inset-x-0 top-full mt-1 bg-white border rounded-md z-header-autocomplete">
                                 @include('rapidez::layouts.partials.header.autocomplete.results')
                             </div>
                             <div v-if="currentRefinement" v-on:click="refine('')" class="fixed inset-0 bg-backdrop z-header-autocomplete-overlay"></div>

From 84154cf3f2b0549a5292daadb9c5b41196ca75e1 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 11:58:19 +0200
Subject: [PATCH 222/244] Move to mixins

---
 resources/js/mixins.js                        | 20 ++++++++++++++++++
 resources/js/package.js                       | 21 -------------------
 .../listing/partials/filter/price.blade.php   | 12 +++++------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/resources/js/mixins.js b/resources/js/mixins.js
index 783a5bb22..c7d9cb924 100644
--- a/resources/js/mixins.js
+++ b/resources/js/mixins.js
@@ -20,4 +20,24 @@ Vue.mixin({
             return Object.values(window.config.attributes)?.find((attribute) => attribute.code === attributeCode)?.name
         },
     },
+    computed: {
+        currencySymbolLocation() {
+            return new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                style: 'currency',
+                currency: config.currency,
+            }).formatToParts(1)?.[0]?.type === 'currency'
+                ? 'left'
+                : 'right'
+        },
+        currencySymbol() {
+            return new Intl.NumberFormat(config.locale.replace('_', '-'), {
+                style: 'currency',
+                currency: config.currency,
+                maximumFractionDigits: 0,
+            })
+                .format(0)
+                .replace(/\d/g, '')
+                .trim()
+        },
+    },
 })
diff --git a/resources/js/package.js b/resources/js/package.js
index 4e8c3d0d9..777ac3698 100644
--- a/resources/js/package.js
+++ b/resources/js/package.js
@@ -159,27 +159,6 @@ function init() {
                 canOrder() {
                     return this.cart.items.every((item) => item.is_available)
                 },
-
-                currencyDisplay() {
-                    return {
-                        symbolLocation:
-                            new Intl.NumberFormat(config.locale.replace('_', '-'), {
-                                style: 'currency',
-                                currency: config.currency,
-                            }).formatToParts(1)?.[0]?.type === 'currency'
-                                ? 'left'
-                                : 'right',
-
-                        symbol: new Intl.NumberFormat(config.locale.replace('_', '-'), {
-                            style: 'currency',
-                            currency: config.currency,
-                            maximumFractionDigits: 0,
-                        })
-                            .format(0)
-                            .replace(/\d/g, '')
-                            .trim(),
-                    }
-                },
             },
             watch: {
                 loadingCount: function (count) {
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 865cec51c..5c7ef144f 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -37,11 +37,11 @@ class="text-right"
                             <span
                                 class="absolute bottom-1/2 translate-y-1/2"
                                 v-bind:class="{
-                                    'left-2': $root.currencyDisplay.symbolLocation === 'left',
-                                    'right-2': $root.currencyDisplay.symbolLocation === 'right',
+                                    'left-2': $root.currencySymbolLocation === 'left',
+                                    'right-2': $root.currencySymbolLocation === 'right',
                                 }"
                             >
-                                @{{ $root.currencyDisplay.symbol }}
+                                @{{ $root.currencySymbol }}
                             </span>
                         </div>
                         <div class="relative w-full">
@@ -61,11 +61,11 @@ class="text-right"
                             <span
                                 class="absolute bottom-1/2 translate-y-1/2"
                                 v-bind:class="{
-                                    'left-2': $root.currencyDisplay.symbolLocation === 'left',
-                                    'right-2': $root.currencyDisplay.symbolLocation === 'right',
+                                    'left-2': $root.currencySymbolLocation === 'left',
+                                    'right-2': $root.currencySymbolLocation === 'right',
                                 }"
                             >
-                                @{{ $root.currencyDisplay.symbol }}
+                                @{{ $root.currencySymbol }}
                             </span>
                         </div>
                     </div>

From 0c5bb93a5ce56f6c07dea947565f7aa502bdfaeb Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 11:59:17 +0200
Subject: [PATCH 223/244] Add newlines

---
 resources/js/mixins.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/js/mixins.js b/resources/js/mixins.js
index c7d9cb924..46bb7eb4c 100644
--- a/resources/js/mixins.js
+++ b/resources/js/mixins.js
@@ -20,6 +20,7 @@ Vue.mixin({
             return Object.values(window.config.attributes)?.find((attribute) => attribute.code === attributeCode)?.name
         },
     },
+
     computed: {
         currencySymbolLocation() {
             return new Intl.NumberFormat(config.locale.replace('_', '-'), {
@@ -29,6 +30,7 @@ Vue.mixin({
                 ? 'left'
                 : 'right'
         },
+
         currencySymbol() {
             return new Intl.NumberFormat(config.locale.replace('_', '-'), {
                 style: 'currency',

From aee896c66360b60a394900afc9eb69d8612ea5cb Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 12:50:56 +0200
Subject: [PATCH 224/244] Set driver directly in boot

---
 src/RapidezServiceProvider.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index 8da901794..cd219da83 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -63,6 +63,7 @@ public function boot()
             ->bootViews()
             ->bootBladeComponents()
             ->bootMiddleware()
+            ->bootScout()
             ->bootTranslations()
             ->bootListeners()
             ->bootMacros();
@@ -225,6 +226,13 @@ protected function bootMiddleware(): self
         return $this;
     }
 
+    protected function bootScout(): self
+    {
+        config()->set('scout.driver', 'Matchish\\ScoutElasticSearch\\Engines\\ElasticSearchEngine');
+
+        return $this;
+    }
+
     protected function bootTranslations(): self
     {
         $this->loadTranslationsFrom(__DIR__ . '/../lang', 'rapidez');

From d1876158acac537db42b038d17149082cb1ef159 Mon Sep 17 00:00:00 2001
From: Roene <roene@justbetter.nl>
Date: Wed, 14 May 2025 12:57:51 +0200
Subject: [PATCH 225/244] Added top for absolute position | Fix arbitrary value
 for svg

---
 resources/views/components/autocomplete/input.blade.php | 2 +-
 resources/views/components/filter/heading.blade.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/autocomplete/input.blade.php b/resources/views/components/autocomplete/input.blade.php
index b1bc7f1d7..892202d1a 100644
--- a/resources/views/components/autocomplete/input.blade.php
+++ b/resources/views/components/autocomplete/input.blade.php
@@ -22,7 +22,7 @@ class="absolute right-14 top-1/2 -translate-y-1/2 transition-opacity opacity-100
         <x-heroicon-s-x-mark class="size-7" />
     </button>
     <x-rapidez::button
-        class="absolute right-0 bg-opacity-0 hover:bg-opacity-0 border-none *:peer-placeholder-shown:bg-muted *:peer-placeholder-shown:text"
+        class="absolute right-0 top-0 bg-opacity-0 hover:bg-opacity-0 border-none *:peer-placeholder-shown:bg-muted *:peer-placeholder-shown:text"
         type="submit"
     >
         <x-rapidez::autocomplete.magnifying-glass />
diff --git a/resources/views/components/filter/heading.blade.php b/resources/views/components/filter/heading.blade.php
index 1affbd651..1cbb65024 100644
--- a/resources/views/components/filter/heading.blade.php
+++ b/resources/views/components/filter/heading.blade.php
@@ -12,7 +12,7 @@
 do we've pb-4 wrapped around
 it from the filters?
 --}}
-<label class="flex items-center justify-between gap-x-2 border-t pt-4 text cursor-pointer peer-checked:[&_svg]:rotate-180" :for="id">
+<label class="flex items-center justify-between gap-x-2 border-t pt-4 text cursor-pointer peer-checked:[&>svg]:rotate-180" :for="id">
     <span class="block font-sans font-medium">
         @slotdefault('title')
             @{{ filter?.name?.replace('_', ' ') }}

From 4e64c1ba512510d7afc13f23f1f74b7e7c1d72d0 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 14:01:00 +0200
Subject: [PATCH 226/244] Go back to filter method because parent:: doesn't
 work for trait inheritance

---
 src/Models/Traits/Product/Searchable.php | 4 ++--
 src/Models/Traits/Searchable.php         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index c3b2cd4fe..af16e225c 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -125,7 +125,7 @@ public function withCategories(array $data): array
      */
     public static function getIndexMappings(): ?array
     {
-        return array_merge([
+        return Eventy::filter('index.' . static::getIndexName() . '.mapping', [
             'properties' => [
                 'price' => [
                     'type' => 'double',
@@ -140,6 +140,6 @@ public static function getIndexMappings(): ?array
                     'type' => 'flattened',
                 ],
             ],
-        ], parent::getIndexMappings());
+        ]) ?: null;
     }
 }
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index b8088f307..bb5fed19e 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -37,11 +37,11 @@ public function searchableAs(): string
 
     public static function getIndexMappings(): ?array
     {
-        return Eventy::filter('index.' . static::getIndexName() . '.mapping', null);
+        return Eventy::filter('index.' . static::getIndexName() . '.mapping', null) ?: null;
     }
 
     public static function getIndexSettings(): ?array
     {
-        return Eventy::filter('index.' . static::getIndexName() . '.settings', null);
+        return Eventy::filter('index.' . static::getIndexName() . '.settings', null) ?: null;
     }
 }

From d085e2154b4d59fbb5edd57e2a2f181fb1d7f073 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 14:08:17 +0200
Subject: [PATCH 227/244] Factor filters out to the index command itself

---
 src/Commands/IndexCommand.php            | 13 +++++++++----
 src/Models/Traits/Product/Searchable.php |  4 ++--
 src/Models/Traits/Searchable.php         |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Commands/IndexCommand.php b/src/Commands/IndexCommand.php
index 646c8539c..6d26b0ea4 100644
--- a/src/Commands/IndexCommand.php
+++ b/src/Commands/IndexCommand.php
@@ -7,6 +7,7 @@
 use Rapidez\Core\Events\IndexBeforeEvent;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\Models\Traits\Searchable;
+use TorMorten\Eventy\Facades\Eventy;
 
 class IndexCommand extends Command
 {
@@ -38,11 +39,15 @@ public function handle()
 
             foreach ($types as $model) {
                 $searchableAs = (new $model)->searchableAs();
-                if ($model::getIndexMappings()) {
-                    config()->set('elasticsearch.indices.mappings.' . $searchableAs, $model::getIndexMappings());
+
+                $indexMappings = Eventy::filter('index.' . $model::getIndexName() . '.mapping', $model::getIndexMappings());
+                if ($indexMappings) {
+                    config()->set('elasticsearch.indices.mappings.' . $searchableAs, $indexMappings);
                 }
-                if ($model::getIndexSettings()) {
-                    config()->set('elasticsearch.indices.settings.' . $searchableAs, $model::getIndexSettings());
+
+                $indexSettings = Eventy::filter('index.' . $model::getIndexName() . '.settings', $model::getIndexSettings());
+                if ($indexSettings) {
+                    config()->set('elasticsearch.indices.settings.' . $searchableAs, $indexSettings);
                 }
 
                 $this->call('scout:import', [
diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index af16e225c..4fa24bb9d 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -125,7 +125,7 @@ public function withCategories(array $data): array
      */
     public static function getIndexMappings(): ?array
     {
-        return Eventy::filter('index.' . static::getIndexName() . '.mapping', [
+        return [
             'properties' => [
                 'price' => [
                     'type' => 'double',
@@ -140,6 +140,6 @@ public static function getIndexMappings(): ?array
                     'type' => 'flattened',
                 ],
             ],
-        ]) ?: null;
+        ];
     }
 }
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index bb5fed19e..965944f38 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -37,11 +37,11 @@ public function searchableAs(): string
 
     public static function getIndexMappings(): ?array
     {
-        return Eventy::filter('index.' . static::getIndexName() . '.mapping', null) ?: null;
+        return null;
     }
 
     public static function getIndexSettings(): ?array
     {
-        return Eventy::filter('index.' . static::getIndexName() . '.settings', null) ?: null;
+        return null;
     }
 }

From e3062e52155be8d4521bd275d02c46853f89ce20 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 14:48:31 +0200
Subject: [PATCH 228/244] Remove comment & fix filter name on product trait

---
 src/Models/Traits/Product/Searchable.php | 3 +--
 src/Models/Traits/Searchable.php         | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
index 4fa24bb9d..2266b71a7 100644
--- a/src/Models/Traits/Product/Searchable.php
+++ b/src/Models/Traits/Product/Searchable.php
@@ -77,8 +77,7 @@ public function toSearchableArray(): array
             // Turn all positions positive
             ->mapWithKeys(fn ($position, $category_id) => [$category_id => $maxPositions[$category_id] - $position]);
 
-        // TODO: Maybe use the model name here?
-        return Eventy::filter('index.' . config('rapidez.index') . '.data', $data, $this);
+        return Eventy::filter('index.' . static::getIndexName() . '.data', $data, $this);
     }
 
     /**
diff --git a/src/Models/Traits/Searchable.php b/src/Models/Traits/Searchable.php
index 965944f38..26d86fee9 100644
--- a/src/Models/Traits/Searchable.php
+++ b/src/Models/Traits/Searchable.php
@@ -17,7 +17,6 @@ trait Searchable
      */
     public function toSearchableArray(): array
     {
-        // TODO: Maybe use the model name here?
         return Eventy::filter('index.' . static::getIndexName() . '.data', $this->toArray(), $this);
     }
 

From acca55d65ea9c815ffa5220221ed70401607068e Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 15:04:38 +0200
Subject: [PATCH 229/244] Remove TODO & bad comment

---
 config/rapidez/frontend.php | 1 -
 src/Rapidez.php             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index 9a3a1a948..b4a9f7692 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -42,7 +42,6 @@
         'size' => 3,
     ],
 
-    // Link store codes to theme folders
     // The structure is `'store_code' => 'folder_path'`
     'theme' => resource_path('themes/default'),
 
diff --git a/src/Rapidez.php b/src/Rapidez.php
index bdf77650c..d37304409 100644
--- a/src/Rapidez.php
+++ b/src/Rapidez.php
@@ -133,7 +133,6 @@ public function setStore(Store|array|callable|int|string $store): void
         // This loop goes through all the Rapidez config files and retrieves the store-specific values.
         // We also remember some `default` values along the way. This allows us to switch stores multiple
         // times in one session, without losing any data that got overwritten by the store-specific values.
-        // TODO: Add how to use this in the Rapidez documentation
         foreach (array_keys(config('rapidez')) as $config) {
             // Reset defaults if they've been set previously
             foreach (config('rapidez.defaults.' . $config, []) as $key => $value) {

From d52372ca78083dc308d0814e0a0f96c5fd1ac4cc Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 15:12:16 +0200
Subject: [PATCH 230/244] Remove TODOs

---
 config/rapidez/searchkit.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config/rapidez/searchkit.php b/config/rapidez/searchkit.php
index ecff5ba6d..8f329d6d2 100644
--- a/config/rapidez/searchkit.php
+++ b/config/rapidez/searchkit.php
@@ -49,8 +49,6 @@
 
     // Attributes that are used to create filters.
     // Required so that SearchKit can keep track of the type and field of each attribute.
-    // TODO: Does the undocumented nestedPath parameter have any use case for us?
-    // TODO: Should we pass the filterQuery parameter? If so, how?
     'filter_attributes' => [
         ['attribute' => 'entity_id', 'field' => 'entity_id', 'type' => 'numeric'],
         ['attribute' => 'sku', 'field' => 'sku.keyword', 'type' => 'string'],

From 277d9530e60338a83f73cced8af6aeca7eff9a5d Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 15:16:06 +0200
Subject: [PATCH 231/244] Remove extra TODO

---
 src/Http/Controllers/ConfigController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Http/Controllers/ConfigController.php b/src/Http/Controllers/ConfigController.php
index 7bdfaa8da..d488e6c6b 100644
--- a/src/Http/Controllers/ConfigController.php
+++ b/src/Http/Controllers/ConfigController.php
@@ -139,7 +139,6 @@ public function getGraphqlQueries(): array
             'placeOrder',
         ];
 
-        // TODO: Maybe limit this to just the checkout pages?
         $queries = Arr::mapWithKeys($checkoutQueries, fn ($query) => [$query => view('rapidez::checkout.queries.' . $query)->renderOneliner()]);
         $queries['customer'] = view('rapidez::customer.queries.customer')->renderOneliner();
 

From 4aa75655ce8e71798042cddc02244a37a613648c Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Wed, 14 May 2025 15:20:21 +0200
Subject: [PATCH 232/244] Apply suggestions from code review

Co-authored-by: Jade Geels <jade@justbetter.nl>
---
 resources/views/listing/partials/pagination.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
index 661ecf996..e6c49ad0a 100644
--- a/resources/views/listing/partials/pagination.blade.php
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -27,7 +27,7 @@ class="flex justify-center items-center size-9 rounded border hover:border-empha
             </li>
             <li v-for="page in pages" :key="page">
                 <button
-                    href="createURL(page)"
+                    v-bind:href="createURL(page)"
                     v-bind:class="{ 'ring-1 bg-primary/10 ring-primary border-primary font-semibold hover:border-primary': page === currentRefinement }"
                     v-on:click.exact.left.prevent="refine(page)"
                     v-bind:aria-label="`{{ __('Page') }} ${page + 1}`"
@@ -41,7 +41,7 @@ class="size-9 sm:size-10 rounded border hover:border-emphasis"
             </li>
             <li v-if="!isLastPage && currentRefinement !== nbPages - 2">
                 <button
-                    href="createURL(nbPages)"
+                    v-bind:href="createURL(nbPages)"
                     v-on:click.exact.left.prevent="refine(nbPages)"
                     aria-label="@lang('Last Page')"
                     class="flex justify-center items-center size-9 sm:size-10 rounded border hover:border-emphasis"
@@ -51,7 +51,7 @@ class="flex justify-center items-center size-9 sm:size-10 rounded border hover:b
             </li>
             <li v-if="!isLastPage">
                 <button
-                    href="createURL(currentRefinement + 1)"
+                    v-bind:href="createURL(currentRefinement + 1)"
                     v-on:click.exact.left.prevent="refine(currentRefinement + 1)"
                     aria-label="@lang('Next Page')"
                     class="flex justify-center items-center rounded border hover:border-emphasis max-sm:size-9 sm:pr-2 sm:pl-3 sm:h-full"

From dfb545630582892c64d33e9e9f4052e2c6201eef Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Wed, 14 May 2025 15:21:54 +0200
Subject: [PATCH 233/244] Added search history in autocomplete

---
 config/rapidez/frontend.php                   |  1 +
 lang/nl.json                                  |  1 +
 .../js/components/Search/Autocomplete.vue     |  8 +++++
 .../components/Search/InstantSearchMixin.vue  |  9 ++++++
 resources/js/instantsearch.js                 | 23 ++++++++++++++
 resources/js/stores/useSearchHistory.js       | 30 +++++++++++++++++++
 resources/js/vue-components.js                |  1 +
 .../partials/header/autocomplete.blade.php    |  7 +++--
 .../header/autocomplete/history.blade.php     | 28 +++++++++++++++++
 9 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 resources/js/stores/useSearchHistory.js
 create mode 100644 resources/views/layouts/partials/header/autocomplete/history.blade.php

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index 9a3a1a948..8be974152 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -31,6 +31,7 @@
         // Attach additional indexes to the autocomplete
         // Uses the views in rapidez::layouts.partials.header.autocomplete
         'additionals' => [
+            'history' => [],
             'categories' => [],
 
             // For example:
diff --git a/lang/nl.json b/lang/nl.json
index 5cb560110..8f0cf6929 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -106,6 +106,7 @@
     "Total": "Totaal",
     "Update": "Update",
     "Use other search terms": "Andere zoektermen te gebruiken",
+    "Previous Searches": "Vorige zoekopdrachten",
     "View all products": "Bekijk alle producten",
     "Want product news and updates?": "Wil je productnieuws en updates?",
     "We care about the protection of your data. Read our": "Wij geven om de bescherming van uw gegevens. Lees onze",
diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index c21c1ee23..87be808d0 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -9,6 +9,7 @@ import SearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js
 import Index from 'vue-instantsearch/vue2/es/src/components/Index.js'
 import { useDebounceFn } from '@vueuse/core'
 import { rapidezAPI } from '../../fetch'
+import { searchHistory } from '../../stores/useSearchHistory'
 
 export default {
     mixins: [InstantSearchMixin],
@@ -52,6 +53,13 @@ export default {
         })
     },
 
+    computed: {
+        searchHistory() {
+            return Object.entries(searchHistory.value).sort((a, b) => {
+                return Date.parse(b[1].lastSearched) - Date.parse(a[1].lastSearched)
+            })
+        },
+    },
     methods: {
         async initSearchClient() {
             const client = await InstantSearchMixin.methods.initSearchClient.bind(this).call()
diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index 8bd11801d..f017e55d9 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -53,6 +53,15 @@ export default {
                     insightsClient: null,
                     onEvent: (event) => {
                         this.$emit('insights-event:' + event.insightsMethod, event)
+                        this.$el.dispatchEvent(
+                            new CustomEvent(
+                                'insights-event:' + event.insightsMethod,
+                                {
+                                    bubbles: true,
+                                    detail: { insightsEvent: event }
+                                }
+                            )
+                        )
                     },
                 }),
                 ...this.getMiddlewares(),
diff --git a/resources/js/instantsearch.js b/resources/js/instantsearch.js
index eb3531809..6800c7e5f 100644
--- a/resources/js/instantsearch.js
+++ b/resources/js/instantsearch.js
@@ -1,3 +1,5 @@
+import { addQuery } from './stores/useSearchHistory'
+
 // Shared between Autocomplete and Listing
 Vue.component('ais-instant-search', () => import('vue-instantsearch/vue2/es/src/components/InstantSearch'))
 Vue.component('ais-hits', () => import('vue-instantsearch/vue2/es/src/components/Hits.js'))
@@ -20,3 +22,24 @@ Vue.component('ais-sort-by', () => import('vue-instantsearch/vue2/es/src/compone
 Vue.component('ais-pagination', () => import('vue-instantsearch/vue2/es/src/components/Pagination.vue.js'))
 Vue.component('ais-stats', () => import('vue-instantsearch/vue2/es/src/components/Stats.vue.js'))
 Vue.component('ais-stats-analytics', () => import('./components/Search/AisStatsAnalytics.vue'))
+
+document.addEventListener('insights-event:viewedObjectIDs', (event) => {
+    setTimeout(() => {
+        if (event?.detail?.insightsEvent?.eventType !== 'search') {
+            return
+        }
+
+        let url = new URL(window.location.href);
+        if (url.pathname !== '/search' || !url.searchParams.has('q') || url.searchParams.get('q') !== event.detail.insightsEvent.payload.query) {
+            // Do not track autocomplete
+            return;
+        }
+
+        if (event.detail.insightsEvent.payload.nbHits < 1) {
+            return;
+        }
+
+        addQuery(event.detail.insightsEvent.payload.query, {hits: event.detail.insightsEvent.payload.nbHits})
+    })
+})
+
diff --git a/resources/js/stores/useSearchHistory.js b/resources/js/stores/useSearchHistory.js
new file mode 100644
index 000000000..b08ea2780
--- /dev/null
+++ b/resources/js/stores/useSearchHistory.js
@@ -0,0 +1,30 @@
+import { useLocalStorage } from '@vueuse/core'
+
+/**
+ * @typedef {Object} SearchHistory
+ * {
+ *  [query: string]: {
+ *    count: number,
+ *    lastSearched: string,
+ *    hits: number,
+ * }
+ */
+export const searchHistory = useLocalStorage('search_history', {})
+
+export const addQuery = (query, metadata = {}) => {
+    query = query.toLowerCase();
+    Vue.set(searchHistory.value, query, {
+        ...searchHistory.value[query],
+        count: (searchHistory.value[query]?.count || 0) + 1,
+        lastSearched: new Date().toISOString(),
+        ...metadata,
+    })
+}
+
+export const removeQuery = (query) => {
+    if (searchHistory.value[query]) {
+        delete searchHistory.value[query]
+    }
+}
+
+export default () => searchHistory
diff --git a/resources/js/vue-components.js b/resources/js/vue-components.js
index 6937a7ab6..0d2e4bee1 100644
--- a/resources/js/vue-components.js
+++ b/resources/js/vue-components.js
@@ -44,6 +44,7 @@ Vue.component('autocomplete', () => ({
         data: () => ({
             loaded: false,
             searchClient: null,
+            searchHistory: {},
         }),
 
         render() {
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 8ae257432..98ec66ee5 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,4 +1,4 @@
-<autocomplete v-on:mounted="() => window.document.getElementById('autocomplete-input').focus()" v-slot="{ searchClient, middlewares }">
+<autocomplete v-on:mounted="() => window.document.getElementById('autocomplete-input').focus()" v-slot="{ searchClient, middlewares, searchHistory }">
     <div class="relative w-full">
         <ais-instant-search
             v-if="searchClient"
@@ -10,7 +10,7 @@ class="contents"
         >
             <div class="contents">
                 <ais-configure :hits-per-page.camel="{{ config('rapidez.frontend.autocomplete.size', 3) }}" />
-                <div class="searchbox">
+                <div class="searchbox group/autocomplete">
                     <ais-search-box>
                         <template v-slot="{ currentRefinement, isSearchStalled, refine }">
                             <x-rapidez::autocomplete.input
@@ -20,8 +20,9 @@ class="contents"
                                     $root.autocompleteFacadeQuery = null;
                                 }"
                                 v-on:input="refine($event.currentTarget.value)"
+                                list="search-history"
                             />
-                            <div v-if="currentRefinement" class="absolute inset-x-0 top-full mt-1 bg-white border rounded-md z-header-autocomplete">
+                            <div v-bind:class="{hidden: !currentRefinement}" class="absolute inset-x-0 top-full mt-1 bg-white border rounded-md z-header-autocomplete group-has-[:focus]/autocomplete:block hover:block">
                                 @include('rapidez::layouts.partials.header.autocomplete.results')
                             </div>
                             <div v-if="currentRefinement" v-on:click="refine('')" class="fixed inset-0 bg-backdrop z-header-autocomplete-overlay"></div>
diff --git a/resources/views/layouts/partials/header/autocomplete/history.blade.php b/resources/views/layouts/partials/header/autocomplete/history.blade.php
new file mode 100644
index 000000000..2a9ccb731
--- /dev/null
+++ b/resources/views/layouts/partials/header/autocomplete/history.blade.php
@@ -0,0 +1,28 @@
+<ais-state-results v-slot="{ state: { query: searchQuery } }">
+    <div>
+        <div class="border-b p-2" v-if="searchHistory && searchHistory?.filter(([query, metadata]) => query.includes(searchQuery.toLowerCase())).length">
+            <x-rapidez::autocomplete.title>
+                @lang('Previous Searches')
+            </x-rapidez::autocomplete.title>
+            <ul class="flex flex-col font-sans">
+                <li
+                    v-for="[query, metadata] in searchHistory
+                        .filter(([query, metadata]) => query.includes(searchQuery.toLowerCase()))
+                        .slice(0, {{ Arr::get($fields, 'size', config('rapidez.frontend.autocomplete.size', 3)) }})"
+                    class="flex flex-1 items-center w-full hover:bg-muted"
+                >
+                    <a
+                        v-bind:href="'{{ route('search', ['q' => '%query%']) }}'.replaceAll('%25query%25', query)"
+                        class="relative flex items-center group w-full px-5 py-2 text-sm gap-x-4"
+                    >
+                        @{{ query }}
+                    </a>
+                </li>
+            </ul>
+            {{-- Add search suggestions to the phone's keyboard --}}
+            <datalist id="search-history" v-if="window.matchMedia('(pointer:coarse)').matches">
+                <option v-bind:value="query" v-for="[query, metadata] in searchHistory"></option>
+            </datalist>
+        </div>
+    </div>
+</ais-state-results>

From 51b1fb85cad6316c2ececd2f8e15544ec0a3ef72 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Wed, 14 May 2025 13:22:25 +0000
Subject: [PATCH 234/244] Apply fixes from Duster

---
 config/rapidez/frontend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/rapidez/frontend.php b/config/rapidez/frontend.php
index 8be974152..0025db618 100644
--- a/config/rapidez/frontend.php
+++ b/config/rapidez/frontend.php
@@ -31,7 +31,7 @@
         // Attach additional indexes to the autocomplete
         // Uses the views in rapidez::layouts.partials.header.autocomplete
         'additionals' => [
-            'history' => [],
+            'history'    => [],
             'categories' => [],
 
             // For example:

From bfecd848ca2ccd3253e45e0819a04f36f9a27918 Mon Sep 17 00:00:00 2001
From: rapidez-actions <rapidez-actions@users.noreply.github.com>
Date: Wed, 14 May 2025 13:23:08 +0000
Subject: [PATCH 235/244] Apply fixes from Prettier

---
 .../js/components/Search/InstantSearchMixin.vue   | 11 ++++-------
 resources/js/instantsearch.js                     | 15 +++++++++------
 resources/js/stores/useSearchHistory.js           |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/js/components/Search/InstantSearchMixin.vue b/resources/js/components/Search/InstantSearchMixin.vue
index f017e55d9..761ea080c 100644
--- a/resources/js/components/Search/InstantSearchMixin.vue
+++ b/resources/js/components/Search/InstantSearchMixin.vue
@@ -54,13 +54,10 @@ export default {
                     onEvent: (event) => {
                         this.$emit('insights-event:' + event.insightsMethod, event)
                         this.$el.dispatchEvent(
-                            new CustomEvent(
-                                'insights-event:' + event.insightsMethod,
-                                {
-                                    bubbles: true,
-                                    detail: { insightsEvent: event }
-                                }
-                            )
+                            new CustomEvent('insights-event:' + event.insightsMethod, {
+                                bubbles: true,
+                                detail: { insightsEvent: event },
+                            }),
                         )
                     },
                 }),
diff --git a/resources/js/instantsearch.js b/resources/js/instantsearch.js
index 6800c7e5f..6d8499533 100644
--- a/resources/js/instantsearch.js
+++ b/resources/js/instantsearch.js
@@ -29,17 +29,20 @@ document.addEventListener('insights-event:viewedObjectIDs', (event) => {
             return
         }
 
-        let url = new URL(window.location.href);
-        if (url.pathname !== '/search' || !url.searchParams.has('q') || url.searchParams.get('q') !== event.detail.insightsEvent.payload.query) {
+        let url = new URL(window.location.href)
+        if (
+            url.pathname !== '/search' ||
+            !url.searchParams.has('q') ||
+            url.searchParams.get('q') !== event.detail.insightsEvent.payload.query
+        ) {
             // Do not track autocomplete
-            return;
+            return
         }
 
         if (event.detail.insightsEvent.payload.nbHits < 1) {
-            return;
+            return
         }
 
-        addQuery(event.detail.insightsEvent.payload.query, {hits: event.detail.insightsEvent.payload.nbHits})
+        addQuery(event.detail.insightsEvent.payload.query, { hits: event.detail.insightsEvent.payload.nbHits })
     })
 })
-
diff --git a/resources/js/stores/useSearchHistory.js b/resources/js/stores/useSearchHistory.js
index b08ea2780..f6ac505d4 100644
--- a/resources/js/stores/useSearchHistory.js
+++ b/resources/js/stores/useSearchHistory.js
@@ -12,7 +12,7 @@ import { useLocalStorage } from '@vueuse/core'
 export const searchHistory = useLocalStorage('search_history', {})
 
 export const addQuery = (query, metadata = {}) => {
-    query = query.toLowerCase();
+    query = query.toLowerCase()
     Vue.set(searchHistory.value, query, {
         ...searchHistory.value[query],
         count: (searchHistory.value[query]?.count || 0) + 1,

From c9785e495be3e4582e3d01c735ad7e9abc493dbb Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Wed, 14 May 2025 16:25:06 +0200
Subject: [PATCH 236/244] Add serviceprovider to composer.json

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3b49b5c89..55d3f9bbf 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,8 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Rapidez\\Core\\RapidezServiceProvider"
+                "Rapidez\\Core\\RapidezServiceProvider",
+                "Matchish\\ScoutElasticSearch\\ElasticSearchServiceProvider"
             ],
             "aliases": {
                 "Rapidez": "Rapidez\\Core\\Facades\\Rapidez"

From 64fefc2615264115b71321c5a8eaca1b6735a256 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Thu, 15 May 2025 09:39:24 +0200
Subject: [PATCH 237/244] Fixed onfocus error for autocomplete

---
 .../js/components/Search/Autocomplete.vue     | 27 +++++++++++++++++--
 .../partials/header/autocomplete.blade.php    |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 87be808d0..1556018a6 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -7,6 +7,10 @@ import Configure from 'vue-instantsearch/vue2/es/src/components/Configure.js'
 import highlight from 'vue-instantsearch/vue2/es/src/components/Highlight.vue.js'
 import SearchBox from 'vue-instantsearch/vue2/es/src/components/SearchBox.vue.js'
 import Index from 'vue-instantsearch/vue2/es/src/components/Index.js'
+import Stats from 'vue-instantsearch/vue2/es/src/components/Stats.vue.js'
+import StateResults from 'vue-instantsearch/vue2/es/src/components/StateResults.vue.js'
+import StatsAnalytics from './AisStatsAnalytics.vue'
+
 import { useDebounceFn } from '@vueuse/core'
 import { rapidezAPI } from '../../fetch'
 import { searchHistory } from '../../stores/useSearchHistory'
@@ -20,15 +24,34 @@ export default {
         highlight,
         SearchBox,
         Index,
+        Stats,
+        StateResults,
+        StatsAnalytics,
+    },
+
+    data() {
+        return {
+            focusId: null,
+        }
     },
 
     render() {
         return this.$scopedSlots.default(this)
     },
-
+    created() {
+        this.focusId = document.activeElement.id
+    },
     mounted() {
         this.$nextTick(() => {
-            requestAnimationFrame(() => this.$emit('mounted'))
+            this.$emit('mounted');
+            setTimeout(() => {
+                requestAnimationFrame(() => {
+                    let element = null
+                    if (this.focusId && (element = this.$el.querySelector('#' + this.focusId))) {
+                        element?.focus()
+                    }
+                })
+            })
         })
 
         const stateChanged = useDebounceFn((event) => {
diff --git a/resources/views/layouts/partials/header/autocomplete.blade.php b/resources/views/layouts/partials/header/autocomplete.blade.php
index 98ec66ee5..cb9db67e9 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,4 +1,4 @@
-<autocomplete v-on:mounted="() => window.document.getElementById('autocomplete-input').focus()" v-slot="{ searchClient, middlewares, searchHistory }">
+<autocomplete v-slot="{ searchClient, middlewares, searchHistory }">
     <div class="relative w-full">
         <ais-instant-search
             v-if="searchClient"

From af94b732c0a2f00fc830a5b37babd81a248d18de Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Thu, 15 May 2025 07:40:06 +0000
Subject: [PATCH 238/244] Apply fixes from Prettier

---
 resources/js/components/Search/Autocomplete.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/Search/Autocomplete.vue b/resources/js/components/Search/Autocomplete.vue
index 1556018a6..34a11ea1d 100644
--- a/resources/js/components/Search/Autocomplete.vue
+++ b/resources/js/components/Search/Autocomplete.vue
@@ -43,7 +43,7 @@ export default {
     },
     mounted() {
         this.$nextTick(() => {
-            this.$emit('mounted');
+            this.$emit('mounted')
             setTimeout(() => {
                 requestAnimationFrame(() => {
                     let element = null

From 7e5e271a788a7d93dc8e7845cd22a0a6374f996c Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Thu, 15 May 2025 15:54:53 +0200
Subject: [PATCH 239/244] Update inputs with slider, update model AFTER
 entering numbers

---
 .../components/input/range-slider.blade.php   | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/resources/views/components/input/range-slider.blade.php b/resources/views/components/input/range-slider.blade.php
index da6fc5fc0..41c53f620 100644
--- a/resources/views/components/input/range-slider.blade.php
+++ b/resources/views/components/input/range-slider.blade.php
@@ -65,16 +65,13 @@ class="absolute z-30 top-5 right-0 bg-active text-white px-2 py-0.5 rounded-md t
                     <div class="relative w-full">
                         <x-rapidez::input
                             required
-                            class="text-center arrows-hidden"
                             type="number"
-                            v-bind:min="range.min"
-                            v-bind:max="range.max"
-                            v-bind:placeholder="range.min"
                             v-bind:disabled="!canRefine"
-                            v-bind:value="currentRefinement.min ?? range.min"
-                            v-on:input="if (!$event.currentTarget.validationMessage) {
-                                refine({ min: Math.max($event.currentTarget.value, range.min), max: currentRefinement.max })
-                            }"
+                            v-bind:min="rangeInputScope.range.min"
+                            v-bind:max="rangeInputScope.range.max"
+                            v-model.lazy="rangeInputScope.minValue"
+                            v-on:input="rangeInputScope.updateRefinement"
+                            class="text-center arrows-hidden"
                         />
                         <span
                             class="absolute bottom-1/2 translate-y-1/2"
@@ -88,17 +85,13 @@ class="absolute bottom-1/2 translate-y-1/2"
                     </div>
                     <div class="relative w-full">
                         <x-rapidez::input
-                            required
-                            class="text-center arrows-hidden"
                             type="number"
-                            v-bind:min="range.min"
-                            v-bind:max="range.max"
-                            v-bind:placeholder="range.max"
                             v-bind:disabled="!canRefine"
-                            v-bind:value="currentRefinement.max ?? range.max"
-                            v-on:input="if (!$event.currentTarget.validationMessage) {
-                                refine({ min: currentRefinement.min, max: Math.min($event.currentTarget.value, range.max) })
-                            }"
+                            v-bind:min="rangeInputScope.range.min"
+                            v-bind:max="rangeInputScope.range.max"
+                            v-model.lazy="rangeInputScope.maxValue"
+                            v-on:input="rangeInputScope.updateRefinement"
+                            class="text-center arrows-hidden"
                         />
                         <span
                             class="absolute bottom-1/2 translate-y-1/2"
@@ -116,7 +109,7 @@ class="absolute bottom-1/2 translate-y-1/2"
                         v-bind:disabled="!canRefine"
                         v-bind:min="rangeInputScope.range.min"
                         v-bind:max="rangeInputScope.range.max"
-                        v-model="rangeInputScope.minValue"
+                        v-model.lazy="rangeInputScope.minValue"
                         v-on:input="rangeInputScope.updateRefinement"
                         class="text-center arrows-hidden"
                     />
@@ -125,7 +118,7 @@ class="text-center arrows-hidden"
                         v-bind:disabled="!canRefine"
                         v-bind:min="rangeInputScope.range.min"
                         v-bind:max="rangeInputScope.range.max"
-                        v-model="rangeInputScope.maxValue"
+                        v-model.lazy="rangeInputScope.maxValue"
                         v-on:input="rangeInputScope.updateRefinement"
                         class="text-center arrows-hidden"
                     />

From 3d3e960aba5bf4463bae007eb18ee0846aaf1fc0 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 16 May 2025 12:04:21 +0200
Subject: [PATCH 240/244] Added basic view transition

---
 resources/views/layouts/app.blade.php                     | 1 +
 resources/views/listing/partials/item.blade.php           | 1 +
 resources/views/product/partials/gallery/slider.blade.php | 1 +
 3 files changed, 3 insertions(+)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 68f4b4cdf..f8eb53894 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
+    <meta name="view-transition" content="same-origin" />
 
     <title>
         @hasSection('title')
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index ab34f6232..960cecd32 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -13,6 +13,7 @@
                     class="mb-3 h-48 w-full rounded-t object-contain"
                     :alt="item.name"
                     :loading="config.category && count <= 4 ? 'eager' : 'lazy'"
+                    v-bind:style="{ 'view-transition-name': 'image-' + item.sku }"
                     width="200"
                     height="200"
                 />
diff --git a/resources/views/product/partials/gallery/slider.blade.php b/resources/views/product/partials/gallery/slider.blade.php
index 62b7003b9..cca30dc63 100644
--- a/resources/views/product/partials/gallery/slider.blade.php
+++ b/resources/views/product/partials/gallery/slider.blade.php
@@ -10,6 +10,7 @@ class="flex h-[440px] cursor-zoom-in items-center justify-center rounded border
             v-bind:src="'/storage/{{ config('rapidez.store') }}/resizes/400/magento/catalog/product' + images[active] + '.webp'"
             alt="{{ $product->name }}"
             class="max-h-full object-contain"
+            style="view-transition-name: image-{{ $product->sku }}"
             width="400"
             height="400"
         />

From 38100a075df1ca08a10aa2b92033802eaeac7bd6 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Fri, 16 May 2025 13:06:30 +0200
Subject: [PATCH 241/244] Fixed image paths

---
 resources/views/product/partials/gallery/slider.blade.php     | 2 +-
 resources/views/product/partials/gallery/thumbnails.blade.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/product/partials/gallery/slider.blade.php b/resources/views/product/partials/gallery/slider.blade.php
index 62b7003b9..169b4d12c 100644
--- a/resources/views/product/partials/gallery/slider.blade.php
+++ b/resources/views/product/partials/gallery/slider.blade.php
@@ -6,7 +6,7 @@ class="flex h-[440px] cursor-zoom-in items-center justify-center rounded border
     >
         <img
             {{-- src should always be above v-bind:src --}}
-            src="/storage/{{ config('rapidez.store') }}/resizes/400/magento/catalog/product/{{ Arr::first($product->images) }}.webp"
+            src="/storage/{{ config('rapidez.store') }}/resizes/400/magento/catalog/product{{ Arr::first($product->images) }}.webp"
             v-bind:src="'/storage/{{ config('rapidez.store') }}/resizes/400/magento/catalog/product' + images[active] + '.webp'"
             alt="{{ $product->name }}"
             class="max-h-full object-contain"
diff --git a/resources/views/product/partials/gallery/thumbnails.blade.php b/resources/views/product/partials/gallery/thumbnails.blade.php
index dc3197966..98714cc99 100644
--- a/resources/views/product/partials/gallery/thumbnails.blade.php
+++ b/resources/views/product/partials/gallery/thumbnails.blade.php
@@ -31,9 +31,9 @@
             <img
                 {{-- src should always be above v-bind:src --}}
                 @if ($imageId < count($product->images))
-                    src="/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product/{{ $product->images[$imageId] }}.webp"
+                    src="/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product{{ $product->images[$imageId] }}.webp"
                 @endif
-                v-bind:src="'/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product/' + images[{{ $imageId }}] + '.webp'"
+                v-bind:src="'/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product' + images[{{ $imageId }}] + '.webp'"
                 alt="{{ $product->name }}"
                 class="block max-h-full w-auto object-contain"
                 width="80"

From 6b877f97b588bc89d7494f50ec1c04cdcc29664d Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 20 May 2025 11:53:14 +0200
Subject: [PATCH 242/244] Use Cache::memo

---
 composer.json                  | 10 +++++-----
 src/Models/Attribute.php       |  2 +-
 src/Models/Config.php          |  4 ++--
 src/Models/OptionValue.php     |  4 ++--
 src/Models/Store.php           |  2 +-
 src/RapidezServiceProvider.php | 17 -----------------
 6 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/composer.json b/composer.json
index 55d3f9bbf..88c5415b1 100644
--- a/composer.json
+++ b/composer.json
@@ -19,10 +19,10 @@
         "php": "^8.2",
         "blade-ui-kit/blade-heroicons": "^2.6",
         "http-interop/http-factory-guzzle": "^1.2",
-        "illuminate/database": "^11.0|^12.0",
-        "illuminate/events": "^11.0|^12.0",
-        "illuminate/queue": "^11.0|^12.0",
-        "illuminate/support": "^11.0|^12.0",
+        "illuminate/database": "^12.0",
+        "illuminate/events": "^12.0",
+        "illuminate/queue": "^12.0",
+        "illuminate/support": "^12.0",
         "justbetter/laravel-http3earlyhints": "^1.4",
         "laravel/scout": "^10.14",
         "lcobucci/clock": "^2.0|^3.2",
@@ -30,7 +30,7 @@
         "matchish/laravel-scout-elasticsearch": "^7.11",
         "rapidez/blade-components": "^1.8",
         "rapidez/blade-directives": "^1.1",
-        "rapidez/laravel-multi-cache": "^2.0",
+        "illuminate/cache": "^12.9",
         "tormjens/eventy": "^0.8"
     },
     "require-dev": {
diff --git a/src/Models/Attribute.php b/src/Models/Attribute.php
index ed2056e57..d7c2eea7e 100644
--- a/src/Models/Attribute.php
+++ b/src/Models/Attribute.php
@@ -46,7 +46,7 @@ protected function prefix(): CastsAttribute
 
     public static function getCachedWhere(callable $callback): array
     {
-        $attributes = Cache::store('rapidez:multi')->rememberForever('attributes.' . config('rapidez.store'), function () {
+        $attributes = Cache::memo()->rememberForever('attributes.' . config('rapidez.store'), function () {
             return self::all()->toArray();
         });
 
diff --git a/src/Models/Config.php b/src/Models/Config.php
index b16d9ee08..3c3535ae7 100644
--- a/src/Models/Config.php
+++ b/src/Models/Config.php
@@ -86,7 +86,7 @@ public static function getValue(
         }
 
         if ($options['cache'] ?? true) {
-            $configCache = Cache::driver('rapidez:multi')->get('magento.config', []);
+            $configCache = Cache::memo()->get('magento.config', []);
             $cacheKey = implode(
                 '.',
                 [
@@ -126,7 +126,7 @@ public static function getValue(
 
         if (($options['cache'] ?? true) && isset($cacheKey)) {
             Arr::set($configCache, $cacheKey, $resultObject ? $result : false);
-            Cache::driver('rapidez:multi')->set('magento.config', $configCache);
+            Cache::memo()->set('magento.config', $configCache);
         }
 
         return (bool) $options['decrypt'] && is_string($result) ? static::decrypt($result) : $result;
diff --git a/src/Models/OptionValue.php b/src/Models/OptionValue.php
index faadc4b89..c74838166 100644
--- a/src/Models/OptionValue.php
+++ b/src/Models/OptionValue.php
@@ -13,7 +13,7 @@ class OptionValue extends Model
     public static function getCachedByOptionId(int $optionId): string
     {
         $cacheKey = 'optionvalues.' . config('rapidez.store');
-        $cache = Cache::store('rapidez:multi')->get($cacheKey, []);
+        $cache = Cache::memo()->get($cacheKey, []);
 
         if (! isset($cache[$optionId])) {
             $cache[$optionId] = html_entity_decode(self::where('option_id', $optionId)
@@ -21,7 +21,7 @@ public static function getCachedByOptionId(int $optionId): string
                 ->orderByDesc('store_id')
                 ->first('value')
                 ->value ?? false);
-            Cache::store('rapidez:multi')->forever($cacheKey, $cache);
+            Cache::memo()->forever($cacheKey, $cache);
         }
 
         return $cache[$optionId];
diff --git a/src/Models/Store.php b/src/Models/Store.php
index bc4377cb4..ea7acde9e 100644
--- a/src/Models/Store.php
+++ b/src/Models/Store.php
@@ -27,7 +27,7 @@ protected static function booting()
 
     public static function getCached(): array
     {
-        $stores = Cache::store('rapidez:multi')->rememberForever('stores', function () {
+        $stores = Cache::memo()->rememberForever('stores', function () {
             return self::select([
                 'store_id',
                 'store.name',
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index c5f65eea7..b3d7e8892 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -298,23 +298,6 @@ protected function registerConfigs(): self
             $this->mergeConfigFrom(__DIR__ . '/../config/rapidez/' . $configFile . '.php', 'rapidez.' . $configFile);
         }
 
-        if (! config('cache.stores.rapidez:multi', false)) {
-            $fallbackDriver = config('cache.default');
-            if ($fallbackDriver === 'rapidez:multi') {
-                $fallbackDriver = config('cache.multi-fallback', 'file');
-                Log::warning('Default cache driver is rapidez:multi, setting fallback driver to ' . $fallbackDriver);
-            }
-
-            config()->set('cache.stores.rapidez:multi', [
-                'driver' => 'multi',
-                'stores' => [
-                    'array',
-                    $fallbackDriver,
-                ],
-                'sync_missed_stores' => true,
-            ]);
-        }
-
         return $this;
     }
 

From fb81e96642762c05e1a0c6d4016aa4f1fc4b5cb5 Mon Sep 17 00:00:00 2001
From: indykoning <indykoning@users.noreply.github.com>
Date: Tue, 20 May 2025 09:53:57 +0000
Subject: [PATCH 243/244] Apply fixes from Duster

---
 src/RapidezServiceProvider.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index b3d7e8892..bf1c794a0 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -9,7 +9,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Vite;

From e5deb7278df4941ddd7d2052772097465d4120c6 Mon Sep 17 00:00:00 2001
From: indy koning <indy@justbetter.nl>
Date: Tue, 20 May 2025 12:52:04 +0200
Subject: [PATCH 244/244] Removed multistore from tests

---
 .github/workflows/analyse.yml | 2 --
 .github/workflows/phpunit.yml | 4 +---
 tests/DuskTestCase.php        | 2 --
 tests/TestCase.php            | 2 --
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml
index 81aa152df..75f0f9fbd 100644
--- a/.github/workflows/analyse.yml
+++ b/.github/workflows/analyse.yml
@@ -16,8 +16,6 @@ jobs:
         php: [8.2, 8.3, 8.4]
         stability: [prefer-stable]
         include:
-          - laravel: 11.*
-            testbench: 9.*
           - laravel: 12.*
             testbench: 10.*
 
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index a813a6ca6..21fefca96 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -16,11 +16,9 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.2, 8.3, 8.4]
-        laravel: [11.*, 12.*]
+        laravel: [12.*]
         stability: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 11.*
-            testbench: ~9.2
           - laravel: 12.*
             testbench: 10.*
 
diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
index 12495df65..706d329b1 100644
--- a/tests/DuskTestCase.php
+++ b/tests/DuskTestCase.php
@@ -9,7 +9,6 @@
 use Rapidez\BladeDirectives\BladeDirectivesServiceProvider;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\RapidezServiceProvider;
-use Rapidez\LaravelMultiCache\MultiStoreServiceProvider;
 use TailwindMerge\Laravel\TailwindMergeServiceProvider;
 use TorMorten\Eventy\EventServiceProvider;
 
@@ -21,7 +20,6 @@ protected function getPackageProviders($app)
     {
         return [
             EventServiceProvider::class,
-            MultiStoreServiceProvider::class,
             RapidezServiceProvider::class,
             BladeIconsServiceProvider::class,
             BladeHeroiconsServiceProvider::class,
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 5439a6e11..9d7980641 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -6,7 +6,6 @@
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use Rapidez\Core\Facades\Rapidez;
 use Rapidez\Core\RapidezServiceProvider;
-use Rapidez\LaravelMultiCache\MultiStoreServiceProvider;
 use TorMorten\Eventy\EventServiceProvider;
 
 class TestCase extends BaseTestCase
@@ -22,7 +21,6 @@ protected function getPackageProviders($app)
     {
         return [
             EventServiceProvider::class,
-            MultiStoreServiceProvider::class,
             RapidezServiceProvider::class,
         ];
     }