- {{ $slot }}
+
+ {{-- TODO: Why do we need these classes? --}}
+
diff --git a/resources/views/components/highlight.blade.php b/resources/views/components/highlight.blade.php
new file mode 100644
index 000000000..cb7b9528e
--- /dev/null
+++ b/resources/views/components/highlight.blade.php
@@ -0,0 +1,11 @@
+@props(['attribute', 'item' => 'item', 'highlightTag' => 'mark'])
+
+@if (in_array($attribute, config('rapidez.searchkit.highlight_attributes')))
+
merge([
+ 'v-bind:hit' => $item,
+ 'attribute' => $attribute,
+ 'highlighted-tag-name' => $highlightTag,
+ ]) }}>
+@else
+
+@endif
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..41c53f620
--- /dev/null
+++ b/resources/views/components/input/range-slider.blade.php
@@ -0,0 +1,129 @@
+@props(['inputs' => true, 'price' => false])
+@slots(['value'])
+
+
+
+
!$inputs
+ ])
+ >
+
+
+
+
+
+
+
+
+
+ @if (!$inputs)
+
+ @if ($value->isNotEmpty())
+ {{ $value }}
+ @else
+
+
+ @if ($value->isNotEmpty())
+ {{ $value }}
+ @else
+
+ @endif
+
+
+ @if ($inputs)
+
+ @if ($price)
+
+
+ @{{ $root.currencySymbol }}
+
+
+
+
+ @{{ $root.currencySymbol }}
+
+
+ @else
+
+
+ @endif
+
+ @endif
+
diff --git a/resources/views/components/listing.blade.php b/resources/views/components/listing.blade.php
index 853a47de2..1c2f24768 100644
--- a/resources/views/components/listing.blade.php
+++ b/resources/views/components/listing.blade.php
@@ -1,53 +1,41 @@
-@props(['query'])
+@props(['rootPath' => null])
@pushOnce('head', 'es_url-preconnect')
-
- @if ($file = vite_filename_path('Listing.vue'))
- @vite([$file])
- @endif
+ @vite(vite_filename_paths(['Listing.vue', 'InstantSearch']))
@endPushOnce
-
-
- @isset($query)
-
+
{{ $before ?? '' }}
- @if ($slot->isEmpty())
-
-
+
+ @slotdefault('slot')
+
+
@include('rapidez::listing.filters')
+ {{ $title ?? '' }}
+
@include('rapidez::listing.products')
- @else
- {{ $slot }}
- @endif
+ @endslotdefault
+
{{ $after ?? '' }}
-
+
-
-
-
+
+
- @if ($title)
-
- @lang($title)
-
- @else
-
- @endif
+
+
+
+ @if ($title)
+
+ @lang($title)
+
+ @endif
-
-
-
+ {{--
+ TODO: Look up here, there is a lot of nesting,
+ could we extract some to clean this up?
+ --}}
@endif
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 @@
-merge([
- ':app' => "config.es_prefix + '_products_' + config.store",
- ':url' => "config.es_url",
- ':set-search-params' => "setSearchParams",
-]) }} v-cloak>
- {{ $slot }}
-
-
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index b491ec71a..f8eb53894 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -5,6 +5,7 @@
@hasSection('title')
@@ -20,8 +21,11 @@
<meta name="robots" content="@yield('robots', Rapidez::config('design/search_engine_robots/default_robots'))"/>
<link rel="canonical" href="@yield('canonical', url()->current())" />
- @vite(['resources/css/app.css', 'resources/js/app.js'])
+ @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')
</head>
@@ -38,7 +42,6 @@
@stack('page_end')
</div>
- <script>window.config = @json(config('frontend'));</script>
@if (session('notifications'))
<script async>
document.addEventListener('vue:loaded', function() {
@@ -49,6 +52,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
new file mode 100644
index 000000000..66e70216e
--- /dev/null
+++ b/resources/views/layouts/config.blade.php
@@ -0,0 +1 @@
+window.config = { ...window.config ?? {}, ...@json($config) };
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 dff7921ca..cb9db67e9 100644
--- a/resources/views/layouts/partials/header/autocomplete.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete.blade.php
@@ -1,74 +1,43 @@
-@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"
- >
- <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-backdrop 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-slot="{ searchClient, middlewares, searchHistory }">
+ <div class="relative w-full">
+ <ais-instant-search
+ v-if="searchClient"
+ :search-client="searchClient"
+ :middlewares="middlewares"
+ :index-name="config.index.product"
+ class="contents"
+ v-cloak
>
- <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="{{ config('rapidez.frontend.autocomplete.size', 3) }}" />
+ <div class="searchbox group/autocomplete">
+ <ais-search-box>
+ <template v-slot="{ currentRefinement, isSearchStalled, refine }">
+ <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)"
+ list="search-history"
+ />
+ <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>
+ </template>
+ </ais-search-box>
+ <ais-stats-analytics></ais-stats-analytics>
</div>
</div>
- </data-search>
- </x-rapidez::reactive-base>
+ </ais-instant-search>
+ <div v-else class="relative w-full">
+ <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>
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..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,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.5">
+ <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..dc504c6a1 100644
--- a/resources/views/layouts/partials/header/autocomplete/categories.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/categories.blade.php
@@ -1,10 +1,19 @@
-<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 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 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 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>
+ </div>
+ </ais-hits>
+</ais-index>
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>
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..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,20 +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/products.blade.php b/resources/views/layouts/partials/header/autocomplete/products.blade.php
index b06166028..0dcf44503 100644
--- a/resources/views/layouts/partials/header/autocomplete/products.blade.php
+++ b/resources/views/layouts/partials/header/autocomplete/products.blade.php
@@ -1,21 +1,36 @@
-<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="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 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'"
+ class="shrink-0 self-center object-contain size-16 mix-blend-multiply"
+ :alt="item.name"
+ 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">
+ <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">
+ @{{ 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..e99be7fe5
--- /dev/null
+++ b/resources/views/layouts/partials/header/autocomplete/results.blade.php
@@ -0,0 +1,6 @@
+@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')
+@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 67b85d393..026d90bc3 100644
--- a/resources/views/listing/filters.blade.php
+++ b/resources/views/listing/filters.blade.php
@@ -1,23 +1,38 @@
-@php($id = uniqid('filters-'))
-<x-rapidez::slideover.mobile :$id :title="__('Filters')">
- <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')
- <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>
- <x-rapidez::button.primary for="{{ $id }}" class="w-full text-sm lg:hidden">
- @lang('Show results')
- </x-rapidez::button.primary>
+@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="category-filters-slideover" :title="__('Filters')">
+ <div class="max-lg:container max-lg:pt-6">
+ <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 max-lg:hidden">@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>
+
+ <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>
-<x-rapidez::button.secondary :for="$id" class="w-full lg:hidden">
- @lang('Filters')
-</x-rapidez::button.secondary>
+
diff --git a/resources/views/listing/partials/filter/boolean.blade.php b/resources/views/listing/partials/filter/boolean.blade.php
index 234563eeb..bf9c679ef 100644
--- a/resources/views/listing/partials/filter/boolean.blade.php
+++ b/resources/views/listing/partials/filter/boolean.blade.php
@@ -1,35 +1,36 @@
-<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"
+ operator="and"
>
- <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)"
- >
- <div
- class="font-sans font-medium text-sm items-center flex"
- :class="value[item.key] ? 'text' : 'text-muted'"
+ <template v-slot="{ items, refine }">
+ <div v-show="items.length" class="relative pb-5">
+ <x-rapidez::filter.heading>
+ <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)"
>
- <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>
- </x-rapidez::input.checkbox>
- </li>
- </ul>
- </x-rapidez::filter.heading>
- </div>
-</multi-list>
+ <span
+ class="items-baseline flex text-base/5"
+ :class="item.isRefined ? 'text' : 'text-muted hover:text'"
+ >
+ <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>
+ </template>
+ </div>
+ </x-rapidez::filter.heading>
+ </div>
+ </template>
+</ais-refinement-list>
+
diff --git a/resources/views/listing/partials/filter/category.blade.php b/resources/views/listing/partials/filter/category.blade.php
index 25c5de3db..63ceacfa9 100644
--- a/resources/views/listing/partials/filter/category.blade.php
+++ b/resources/views/listing/partials/filter/category.blade.php
@@ -1,31 +1,50 @@
-<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
+<ais-hierarchical-menu
+ v-bind:attributes="categoryAttributes"
+ v-bind:sort-by="['count','name']"
+ @attributes(['root-path' => $rootPath])
+ show-more
+ :limit="6"
>
- <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"
- />
+ <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 }" 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="break-words inline-block py-1 hover:text"
+ :href="createURL(item.value)"
+ :class="{
+ 'font-medium': item.isRefined,
+ 'text-muted': !item.isRefined,
+ }"
+ v-on:click.exact.left.prevent="refine(item.value)"
+ >
+ @{{ item.label }}
+ <span class="text-xs">(@{{ item.count }})</span>
+ </a>
+
+ <component :is="components[index]" class="mt-1.5 mb-2.5 text-sm/5" />
+ </li>
</ul>
- </x-rapidez::filter.heading>
- </div>
- </category-filter>
- </div>
-</reactive-component>
+ </recursion>
+
+ <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>
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php
index 6b3196ba3..0e924d1ed 100644
--- a/resources/views/listing/partials/filter/price.blade.php
+++ b/resources/views/listing/partials/filter/price.blade.php
@@ -1,15 +1,26 @@
-<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="rangeAttributes.includes(filter.code)"
+ :attribute="filter.code"
+ class="pb-5"
+>
+ <template v-slot="{ currentRefinement, range, canRefine, refine, sendEvent }">
+ <div v-show="range.max">
+ <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"
+ price
+ >
+ <x-slot:value>
+ @{{ window.price(value, { maximumFractionDigits: 0 }) }}
+ </x-slot:value>
+ </x-rapidez::input.range-slider>
+ </div>
+ </div>
+ </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
new file mode 100644
index 000000000..7de7ee29b
--- /dev/null
+++ b/resources/views/listing/partials/filter/search.blade.php
@@ -0,0 +1,22 @@
+<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')"
+ />
+ <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:pointer-events-none 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/select.blade.php b/resources/views/listing/partials/filter/select.blade.php
index 05b107b69..45883bdfe 100644
--- a/resources/views/listing/partials/filter/select.blade.php
+++ b/resources/views/listing/partials/filter/select.blade.php
@@ -1,54 +1,48 @@
-<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) && !(filter.text_swatch || filter.visual_swatch)"
+ :operator="filter.input == 'multiselect' ? 'and' : 'or'"
+ :attribute="filter.code"
+ :limit="6"
+ 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 }">
- <li
- v-for="item, index in data"
- v-if="index < 6 || isOpen"
- :key="item._id"
- 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)"
+ <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-show="items.length" class="relative pb-5">
+ <x-rapidez::filter.heading>
+ <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="value[item.key] ? 'text' : 'text-muted'"
- >
- @{{ item.key }}
- <span class="block ml-0.5 text-xs">(@{{ item.doc_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')
+ @{{ item.label }}
+ <span class="block ml-0.5 text-xs">(@{{ item.count }})</span>
</span>
- <span v-else class="flex gap-x-4">
- @lang('More options')
- </span>
- </button>
- </li>
- </ul>
- </toggler>
- </x-rapidez::filter.heading>
- </div>
-</multi-list>
+ </x-rapidez::input.checkbox>
+ </template>
+ </div>
+
+ <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-refinement-list>
diff --git a/resources/views/listing/partials/filter/selected.blade.php b/resources/views/listing/partials/filter/selected.blade.php
index e22895bcf..5b5fc0539 100644
--- a/resources/views/listing/partials/filter/selected.blade.php
+++ b/resources/views/listing/partials/filter/selected.blade.php
@@ -1,32 +1,51 @@
-<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>
+<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-medium text-base">
+ @lang('Selected filters'):
</div>
- </selected-filters-values>
- </div>
-</selected-filters>
+ <a
+ v-bind:href="createURL()"
+ v-if="canRefine"
+ 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 pb-2">
+ <template v-for="item in withFilters(items)">
+ <li
+ class="flex flex-wrap gap-2 relative"
+ v-for="refinement in withSwatches(item.refinements, item.filter)"
+ :key="[
+ refinement.attribute,
+ refinement.type,
+ refinement.value,
+ refinement.operator
+ ].join(':')"
+ >
+ <a
+ v-bind:href="createURL(refinement)"
+ v-on:click.prevent="item.refine(refinement)"
+ 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')
+ @include('rapidez::listing.partials.filter.selected.swatch')
+ <template v-else>
+ @{{ refinement.label }}
+ </template>
+ </a>
+ </li>
+ </template>
+ </ul>
+ </template>
+</ais-current-refinements>
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..7d83b96ae
--- /dev/null
+++ b/resources/views/listing/partials/filter/selected/swatch.blade.php
@@ -0,0 +1,3 @@
+<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 6d9ef8636..6d142ce25 100644
--- a/resources/views/listing/partials/filter/swatch.blade.php
+++ b/resources/views/listing/partials/filter/swatch.blade.php
@@ -1,38 +1,44 @@
-<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',
- }"
- :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"
- 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-5">
+ <x-rapidez::filter.heading>
+ <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="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
+ type="checkbox"
+ v-bind:checked="item.isRefined"
+ v-on:change="refine(item.value)"
+ class="hidden"
+ >
+ </label>
+ <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-active !border-active text-white': item.isRefined }"
+ v-bind:style="{ background: item.swatch?.swatch ?? 'none' }"
+ >
+ @{{ 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>
diff --git a/resources/views/listing/partials/item.blade.php b/resources/views/listing/partials/item.blade.php
index b5ab620f1..960cecd32 100644
--- a/resources/views/listing/partials/item.blade.php
+++ b/resources/views/listing/partials/item.blade.php
@@ -1,36 +1,41 @@
-<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'))
- <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="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 h-full">
+ @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'"
+ v-bind:style="{ 'view-transition-name': 'image-' + item.sku }"
+ width="200"
+ height="200"
+ />
+ <x-rapidez::no-image v-else class="mb-3 h-48 rounded-t" />
+ <div class="px-2">
+ <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>
- @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
- </div>
- </a>
- @include('rapidez::listing.partials.item.addtocart')
- </div>
- </add-to-cart>
- </div>
-</template>
+ <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
+ </div>
+ </a>
+ @include('rapidez::listing.partials.item.addtocart')
+ </div>
+ </add-to-cart>
+</div>
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/no-results.blade.php b/resources/views/listing/partials/no-results.blade.php
index e93cd3507..492fc374d 100644
--- a/resources/views/listing/partials/no-results.blade.php
+++ b/resources/views/listing/partials/no-results.blade.php
@@ -1,3 +1,31 @@
-<div slot="renderNoResults">
- @lang('Sorry! We did not find any products.')
+<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"
+ :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">
+ <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>
+ </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>
+ </search-suggestions>
</div>
diff --git a/resources/views/listing/partials/pagination.blade.php b/resources/views/listing/partials/pagination.blade.php
new file mode 100644
index 000000000..e6c49ad0a
--- /dev/null
+++ b/resources/views/listing/partials/pagination.blade.php
@@ -0,0 +1,65 @@
+<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 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-o-chevron-left class="shrink-0 stroke-2 size-4" />
+ <span class="max-sm:hidden">@lang('Prev')</span>
+ </button>
+ </li>
+ <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"
+ >
+ 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">
+ <button
+ 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}`"
+ class="size-9 sm:size-10 rounded border hover:border-emphasis"
+ >
+ @{{ page + 1 }}
+ </button>
+ </li>
+ <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 && currentRefinement !== nbPages - 2">
+ <button
+ 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"
+ >
+ @{{ nbPages }}
+ </button>
+ </li>
+ <li v-if="!isLastPage">
+ <button
+ 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"
+ >
+ <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>
+</ais-pagination>
diff --git a/resources/views/listing/partials/stats.blade.php b/resources/views/listing/partials/stats.blade.php
deleted file mode 100644
index 93d29cbdc..000000000
--- a/resources/views/listing/partials/stats.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="flex-wrap flex-1 gap-1 text-sm items-center flex justify-between sm:text-base" slot="renderResultStats" slot-scope="{ numberOfResults, numberOfPages, currentPage, time }">
- @{{ 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>
- <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>
- </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..82ac6217f
--- /dev/null
+++ b/resources/views/listing/partials/toolbar.blade.php
@@ -0,0 +1,11 @@
+<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">
+ @include('rapidez::listing.partials.toolbar.pages')
+ </label>
+ <div class="max-md:hidden">
+ @include('rapidez::listing.partials.toolbar.sorting')
+ </div>
+</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..03ff0fd1f
--- /dev/null
+++ b/resources/views/listing/partials/toolbar/pages.blade.php
@@ -0,0 +1,17 @@
+<ais-hits-per-page :items="hitsPerPage">
+ <template v-slot="{ items, refine }">
+ <select
+ v-bind:value="items.find(item => item.isRefined)?.value"
+ v-on:change="event => refine(event.target.value)"
+ 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"
+ v-bind:key="item.value"
+ v-bind:value="item.value"
+ >
+ @{{ item.label }}
+ </option>
+ </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..3aa83bbde
--- /dev/null
+++ b/resources/views/listing/partials/toolbar/sorting.blade.php
@@ -0,0 +1,17 @@
+<ais-sort-by :items="Object.values(config.searchkit.sorting)">
+ <template v-slot="{ items, currentRefinement, refine }">
+ <select
+ v-bind:value="items.find(item => item.value === currentRefinement)?.value"
+ v-on:change="event => refine(event.target.value)"
+ 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"
+ v-bind:key="item.value"
+ v-bind:value="item.value"
+ >
+ @{{ item.label }}
+ </option>
+ </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..dfaa72d58
--- /dev/null
+++ b/resources/views/listing/partials/toolbar/stats.blade.php
@@ -0,0 +1,11 @@
+<ais-stats class="text-sm">
+ <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 40867d355..2411ecb8b 100644
--- a/resources/views/listing/products.blade.php
+++ b/resources/views/listing/products.blade.php
@@ -1,26 +1,37 @@
-@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"
- component-id="products"
- data-field="name.keyword"
- list-class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2 md:gap-5 mt-5 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>
+{{-- 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 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="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>
+ <template v-slot="{ items }">
+ <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>
+ </div>
+ <div v-else>
+ @include('rapidez::listing.partials.no-results')
+ </div>
+ </template>
+ </ais-hits>
+
+ @include('rapidez::listing.partials.pagination')
+</div>
diff --git a/resources/views/product/overview.blade.php b/resources/views/product/overview.blade.php
index fc075106e..dd4422bea 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="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 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/product/partials/gallery/slider.blade.php b/resources/views/product/partials/gallery/slider.blade.php
index 62b7003b9..b2382f057 100644
--- a/resources/views/product/partials/gallery/slider.blade.php
+++ b/resources/views/product/partials/gallery/slider.blade.php
@@ -6,10 +6,11 @@ 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"
+ style="view-transition-name: image-{{ $product->sku }}"
width="400"
height="400"
/>
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"
diff --git a/resources/views/search/overview.blade.php b/resources/views/search/overview.blade.php
index 292df215f..0293288a1 100644
--- a/resources/views/search/overview.blade.php
+++ b/resources/views/search/overview.blade.php
@@ -2,42 +2,27 @@
@section('robots', 'NOINDEX,NOFOLLOW')
+@pushOnce('head', 'search-overview')
+ @vite(vite_filename_paths(['StateResults.vue']))
+@endPushOnce
+
@section('content')
- <div class="container" v-cloak>
- <h1 class="font-bold text-3xl">@lang('Search for'): @{{ $root.queryParams.get('q') }}</h1>
- <x-rapidez::listing query="{
- bool: {
- must: [
- { terms: { visibility: [3, 4] } },
- { bool: { should: [
- {
- multi_match: {
- query: $root.queryParams.get('q'),
- fields: Object.entries(config.searchable).map((value) => value[0]+'^'+value[1]),
- type: 'best_fields',
- operator: 'or',
- fuzziness: 'AUTO',
- },
- },
- {
- multi_match: {
- query: $root.queryParams.get('q'),
- fields: Object.entries(config.searchable).map((value) => value[0]+'^'+value[1]),
- type: 'phrase',
- operator: 'or',
- }
- },
- {
- multi_match: {
- query: $root.queryParams.get('q'),
- fields: Object.entries(config.searchable).map((value) => value[0]+'^'+value[1]),
- type: 'phrase_prefix',
- operator: 'or',
- }
- },
- ] } }
- ],
- }
- }"/>
+ <div class="container">
+ <x-rapidez::listing filter-query-string="visibility:(3 OR 4)">
+ <x-slot:title>
+ <ais-state-results>
+ <template v-slot="{ state: { query } }">
+ <h1 class="font-medium text-3xl">
+ <template v-if="query">
+ @lang('Search for'): @{{ query }}
+ </template>
+ <template v-else>
+ @lang('Search')
+ </template>
+ </h1>
+ </template>
+ </ais-state-results>
+ </x-slot:title>
+ </x-rapidez::listing>
</div>
@endsection
diff --git a/routes/api.php b/routes/api.php
index 98467c891..fa18acd34 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -2,24 +2,21 @@
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\Controllers\SearchController;
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');
-
- return $optionswatchModel::getCachedSwatchValues();
- });
+ Route::post('search', [SearchController::class, 'store'])
+ ->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);
@@ -33,5 +30,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/routes/web.php b/routes/web.php
index 27231a2ef..0951a3ebe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,12 +1,17 @@
<?php
+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;
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::view('cart', 'rapidez::cart.overview')->name('cart');
diff --git a/src/Commands/ElasticsearchIndexCommand.php b/src/Commands/ElasticsearchIndexCommand.php
deleted file mode 100644
index ccae869d1..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('rapidez.es_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 7556110b3..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
deleted file mode 100644
index 6bdaa4e51..000000000
--- a/src/Commands/IndexCategoriesCommand.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Commands;
-
-use Rapidez\Core\Facades\Rapidez;
-use TorMorten\Eventy\Facades\Eventy;
-
-class IndexCategoriesCommand extends ElasticsearchIndexCommand
-{
- protected $signature = 'rapidez:index:categories {store? : Store ID from Magento}';
-
- protected $description = 'Index the Rapidez categories to Elasticsearch';
-
- public function handle(): int
- {
- $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
new file mode 100644
index 000000000..6d26b0ea4
--- /dev/null
+++ b/src/Commands/IndexCommand.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Rapidez\Core\Commands;
+
+use Illuminate\Console\Command;
+use Rapidez\Core\Events\IndexAfterEvent;
+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
+{
+ 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 into ElasticSearch';
+
+ public function handle()
+ {
+ $baseSearchableModels = collect(config('rapidez.models'))
+ ->filter(fn ($class) => in_array(Searchable::class, class_uses_recursive($class)));
+
+ $types = $this->option('types')
+ ? $baseSearchableModels->filter(fn ($model) => in_array($model::getIndexName(), explode(',', $this->option('types'))))
+ : $baseSearchableModels;
+
+ $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 $model) {
+ $searchableAs = (new $model)->searchableAs();
+
+ $indexMappings = Eventy::filter('index.' . $model::getIndexName() . '.mapping', $model::getIndexMappings());
+ if ($indexMappings) {
+ config()->set('elasticsearch.indices.mappings.' . $searchableAs, $indexMappings);
+ }
+
+ $indexSettings = Eventy::filter('index.' . $model::getIndexName() . '.settings', $model::getIndexSettings());
+ if ($indexSettings) {
+ config()->set('elasticsearch.indices.settings.' . $searchableAs, $indexSettings);
+ }
+
+ $this->call('scout:import', [
+ 'searchable' => $model,
+ ]);
+ }
+ }
+
+ IndexAfterEvent::dispatch($this);
+ }
+}
diff --git a/src/Commands/IndexProductsCommand.php b/src/Commands/IndexProductsCommand.php
deleted file mode 100644
index 53e535319..000000000
--- a/src/Commands/IndexProductsCommand.php
+++ /dev/null
@@ -1,133 +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);
-
- $productModel = config('rapidez.models.product');
- $stores = Rapidez::getStores($this->argument('store'));
- foreach ($stores as $store) {
- $this->line('Store: ' . $store['name']);
- $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');
- $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);
- }
- }
-
- return $data;
- }
-}
diff --git a/src/Commands/UpdateIndexCommand.php b/src/Commands/UpdateIndexCommand.php
new file mode 100644
index 000000000..b4d0752a1
--- /dev/null
+++ b/src/Commands/UpdateIndexCommand.php
@@ -0,0 +1,78 @@
+<?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/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'));
diff --git a/src/Http/Controllers/CheckoutController.php b/src/Http/Controllers/CheckoutController.php
index 7701679f3..846ac2ca0 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/Controllers/ConfigController.php b/src/Http/Controllers/ConfigController.php
new file mode 100644
index 000000000..d488e6c6b
--- /dev/null
+++ b/src/Http/Controllers/ConfigController.php
@@ -0,0 +1,259 @@
+<?php
+
+namespace Rapidez\Core\Http\Controllers;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
+use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\Category;
+use Rapidez\Core\Models\Traits\Searchable;
+
+class ConfigController
+{
+ public function __invoke()
+ {
+ $config = array_merge(
+ $this->getExposedConfigValues(),
+ $this->getConfig(),
+ );
+
+ 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'),
+ ),
+ array_merge(
+ config('rapidez.frontend.exposed'),
+ ['store_code', 'index', 'searchkit'],
+ ),
+ );
+ }
+
+ public function getConfig(): array
+ {
+ return [
+ 'cachekey' => Cache::rememberForever('cachekey', fn () => md5(Str::random())),
+ 'translations' => __('rapidez::frontend'),
+
+ '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(),
+ '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]),
+ ];
+ }
+
+ public function getSwatches(): array
+ {
+ $optionswatchModel = config('rapidez.models.option_swatch');
+
+ return $optionswatchModel::getCachedSwatchValues();
+ }
+
+ 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 [
+ 'prefix' => strlen(Rapidez::config('customer/address/prefix_options', '')) ? Rapidez::config('customer/address/prefix_show', 'opt') : 'opt',
+ 'firstname' => 'req',
+ 'middlename' => Rapidez::config('customer/address/middlename_show', 0) ? 'opt' : false,
+ 'lastname' => 'req',
+ 'suffix' => strlen(Rapidez::config('customer/address/suffix_options', '')) ? Rapidez::config('customer/address/suffix_show', 'opt') : 'opt',
+ 'postcode' => 'req',
+ 'housenumber' => Rapidez::config('customer/address/street_lines', 2) >= 2 ? 'req' : false,
+ 'addition' => Rapidez::config('customer/address/street_lines', 2) >= 3 ? 'opt' : false,
+ 'street' => 'req',
+ 'city' => 'req',
+ 'country_id' => 'req',
+ 'telephone' => Rapidez::config('customer/address/telephone_show', 'req'),
+ 'company' => Rapidez::config('customer/address/company_show', 'opt'),
+ 'vat_id' => Rapidez::config('customer/address/taxvat_show', 'opt'),
+ 'fax' => Rapidez::config('customer/address/fax_show', 'opt'),
+ ];
+ }
+
+ 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 getMaxCategoryLevel(): int
+ {
+ return Cache::rememberForever('max_category_level_' . config('rapidez.store'), fn () => Category::withoutGlobalScopes()->max('level'));
+ }
+
+ public function getGraphqlQueries(): array
+ {
+ $checkoutQueries = [
+ 'setGuestEmailOnCart',
+ 'setNewShippingAddressesOnCart',
+ 'setExistingShippingAddressesOnCart',
+ 'setNewBillingAddressOnCart',
+ 'setExistingBillingAddressOnCart',
+ 'setShippingMethodsOnCart',
+ 'setPaymentMethodOnCart',
+ 'placeOrder',
+ ];
+
+ $queries = Arr::mapWithKeys($checkoutQueries, fn ($query) => [$query => view('rapidez::checkout.queries.' . $query)->renderOneliner()]);
+ $queries['customer'] = view('rapidez::customer.queries.customer')->renderOneliner();
+
+ return $queries;
+ }
+
+ 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(),
+ ]
+ );
+
+ }
+
+ public function getSearchkitFacetAttributes(): array
+ {
+ // 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 = $this->getMaxCategoryLevel();
+ $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'));
+
+ return $facetAttributes->toArray();
+ }
+
+ public function getSearchkitSearchAttributes(): array
+ {
+ $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();
+
+ return $searchableAttributes;
+ }
+
+ public function getSearchkitSorting(): array
+ {
+ $attributeModel = config('rapidez.models.attribute');
+
+ // 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) {
+ $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' => 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}",
+ 'key' => "_{$attribute['code']}_{$direction}",
+ ]));
+
+ // Add default relevance sort
+ $sortableAttributes->prepend([
+ 'label' => __('Relevance'),
+ 'field' => '_score',
+ 'order' => 'desc',
+ 'value' => $index,
+ 'key' => 'default',
+ ]);
+
+ return $sortableAttributes->keyBy('key')->toArray();
+ }
+}
diff --git a/src/Http/Controllers/IndexController.php b/src/Http/Controllers/IndexController.php
new file mode 100644
index 000000000..e8252a0bf
--- /dev/null
+++ b/src/Http/Controllers/IndexController.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Rapidez\Core\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+use Rapidez\Core\Facades\Rapidez;
+use Rapidez\Core\Models\Traits\Searchable;
+
+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) {
+ $this->updateSearchable($model, $request->input('ids'));
+
+ return;
+ }
+
+ $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) {
+ $this->deleteSearchable($model, $request->input('ids'));
+
+ return;
+ }
+
+ $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;
+ }
+}
diff --git a/src/Http/Controllers/SearchController.php b/src/Http/Controllers/SearchController.php
index 5184a01b1..2fc917ea2 100644
--- a/src/Http/Controllers/SearchController.php
+++ b/src/Http/Controllers/SearchController.php
@@ -4,23 +4,18 @@
use Illuminate\Http\Request;
use Illuminate\Support\Str;
+use Rapidez\Core\Models\Scopes\IsActiveScope;
+use Rapidez\Core\Models\SearchQuery;
class SearchController
{
public function __invoke(Request $request)
{
- $searchQuery = config('rapidez.models.search_query')::firstOrNew([
- 'query_text' => Str::lower($request->q),
- 'store_id' => config('rapidez.store'),
- ], ['popularity' => 1]);
-
- if (! $searchQuery->exists) {
- $searchQuery->save();
-
+ if (! $request->q) {
return view('rapidez::search.overview');
}
- $searchQuery->increment('popularity');
+ $searchQuery = $this->track($request);
if ($searchQuery->is_active === 1 && $searchQuery->redirect) {
return redirect($searchQuery->redirect, 301);
@@ -28,4 +23,46 @@ public function __invoke(Request $request)
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'),
+ ],
+ [
+ 'num_results' => $request->results ?? 0,
+ 'popularity' => 1,
+ ]
+ );
+
+ if (! $searchQuery->exists) {
+ $searchQuery->save();
+
+ return $searchQuery;
+ }
+
+ $searchQuery->popularity++;
+ if ($request->has('results')) {
+ $searchQuery->num_results = $request->results;
+ }
+ $searchQuery->save();
+
+ return $searchQuery;
+ }
}
diff --git a/src/Http/ViewComposers/ConfigComposer.php b/src/Http/ViewComposers/ConfigComposer.php
deleted file mode 100644
index 5c295c492..000000000
--- a/src/Http/ViewComposers/ConfigComposer.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Rapidez\Core\Http\ViewComposers;
-
-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;
-
-class ConfigComposer
-{
- public function compose(View $view)
- {
- $exposedFrontendConfigValues = Arr::only(
- array_merge_recursive(config('rapidez'), config('rapidez.frontend')),
- array_merge(config('rapidez.frontend.exposed'), ['store_code'])
- );
-
- Config::set('frontend', array_merge(
- config('frontend') ?: [],
- $exposedFrontendConfigValues,
- $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'),
- '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),
- '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'),
- 'grid_per_page_values' => explode(',', Rapidez::config('catalog/frontend/grid_per_page_values')),
- ];
- }
-}
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,
- ]);
- }
-}
diff --git a/src/Listeners/UpdateLatestIndexDate.php b/src/Listeners/UpdateLatestIndexDate.php
new file mode 100644
index 000000000..1c83d9cdf
--- /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::scalar('SELECT NOW()')
+ );
+ }
+
+ public static function register()
+ {
+ Event::listen(IndexAfterEvent::class, static::class);
+ }
+}
diff --git a/src/Models/Attribute.php b/src/Models/Attribute.php
index 532d04a8a..d7c2eea7e 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);
@@ -21,13 +23,30 @@ protected static function booting()
protected function filter(): CastsAttribute
{
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();
+ }
+
+ 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 () {
+ $attributes = Cache::memo()->rememberForever('attributes.' . config('rapidez.store'), function () {
return self::all()->toArray();
});
diff --git a/src/Models/Category.php b/src/Models/Category.php
index 9a5863a20..ba4cfa8be 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 $casts = [
self::UPDATED_AT => 'datetime',
@@ -52,11 +56,6 @@ protected static function booting()
});
}
- public function getKeyName()
- {
- return $this->getTable() . '.entity_id';
- }
-
public function getTable()
{
return 'catalog_category_flat_store_' . config('rapidez.store');
@@ -100,8 +99,20 @@ 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();
}
+
+ /**
+ * {@inheritdoc}
+ */
+ 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/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/Product.php b/src/Models/Product.php
index 99dbeb9e5..77498b0a5 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -23,6 +23,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;
@@ -31,8 +32,14 @@ class Product extends Model
use CastMultiselectAttributes;
use CastSuperAttributes;
use HasAlternatesThroughRewrites;
+ 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';
diff --git a/src/Models/Scopes/Product/WithProductAttributesScope.php b/src/Models/Scopes/Product/WithProductAttributesScope.php
index 98add83ee..53bfcc135 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');
diff --git a/src/Models/SearchQuery.php b/src/Models/SearchQuery.php
index b43a43ecf..5fa1c4eb4 100644
--- a/src/Models/SearchQuery.php
+++ b/src/Models/SearchQuery.php
@@ -2,8 +2,14 @@
namespace Rapidez\Core\Models;
+use Illuminate\Database\Eloquent\Builder;
+use Rapidez\Core\Models\Scopes\IsActiveScope;
+use Rapidez\Core\Models\Traits\Searchable;
+
class SearchQuery extends Model
{
+ use Searchable;
+
const CREATED_AT = null;
protected $table = 'search_query';
@@ -11,4 +17,19 @@ 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(fn ($subQuery) => $subQuery
+ ->where('num_results', '>', 0)
+ ->orWhereNotNull('redirect')
+ );
+ }
}
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/Models/Traits/Product/Searchable.php b/src/Models/Traits/Product/Searchable.php
new file mode 100644
index 000000000..2266b71a7
--- /dev/null
+++ b/src/Models/Traits/Product/Searchable.php
@@ -0,0 +1,144 @@
+<?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, [
+ Product::VISIBILITY_IN_CATALOG,
+ Product::VISIBILITY_IN_SEARCH,
+ Product::VISIBILITY_BOTH,
+ ])) {
+ 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');
+
+ $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.' . static::getIndexName() . '.data', $data, $this);
+ }
+
+ /**
+ * Add the category paths
+ */
+ public function withCategories(array $data): array
+ {
+ $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;
+ }
+
+ /**
+ * {@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
new file mode 100644
index 000000000..26d86fee9
--- /dev/null
+++ b/src/Models/Traits/Searchable.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Rapidez\Core\Models\Traits;
+
+use Illuminate\Support\Str;
+use Laravel\Scout\Searchable as ScoutSearchable;
+use TorMorten\Eventy\Facades\Eventy;
+
+trait Searchable
+{
+ use ScoutSearchable;
+
+ public static ?string $indexName;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function toSearchableArray(): array
+ {
+ return Eventy::filter('index.' . static::getIndexName() . '.data', $this->toArray(), $this);
+ }
+
+ public static function getIndexName(): string
+ {
+ return static::$indexName ?? Str::snake(Str::pluralStudly(class_basename(static::class)));
+ }
+
+ public function searchableAs(): string
+ {
+ return implode('_', array_values([
+ config('scout.prefix'),
+ static::getIndexName(),
+ config('rapidez.store'),
+ ]));
+ }
+
+ public static function getIndexMappings(): ?array
+ {
+ return null;
+ }
+
+ public static function getIndexSettings(): ?array
+ {
+ return null;
+ }
+}
diff --git a/src/Rapidez.php b/src/Rapidez.php
index d1adef240..d37304409 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))
);
}
@@ -130,6 +130,22 @@ 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) {
+ 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);
+ }
+ }
+
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'),
diff --git a/src/RapidezServiceProvider.php b/src/RapidezServiceProvider.php
index aa5bcca3d..bf1c794a0 100644
--- a/src/RapidezServiceProvider.php
+++ b/src/RapidezServiceProvider.php
@@ -2,13 +2,14 @@
namespace Rapidez\Core;
+use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Contracts\Debug\ExceptionHandler;
use Illuminate\Contracts\Http\Kernel;
use Illuminate\Http\Request;
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;
use Illuminate\Support\ServiceProvider;
@@ -17,12 +18,11 @@
use Lcobucci\JWT\Validation\RequiredConstraintsViolated;
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\UpdateIndexCommand;
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;
@@ -30,11 +30,11 @@
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;
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;
@@ -44,11 +44,11 @@ class RapidezServiceProvider extends ServiceProvider
protected $configFiles = [
'frontend',
'healthcheck',
- 'indexer',
'jwt',
'magento-defaults',
'models',
'routing',
+ 'searchkit',
'system',
];
@@ -62,6 +62,7 @@ public function boot()
->bootViews()
->bootBladeComponents()
->bootMiddleware()
+ ->bootScout()
->bootTranslations()
->bootListeners()
->bootMacros();
@@ -89,17 +90,13 @@ protected function bootAuth(): self
protected function bootCommands(): self
{
$this->commands([
- IndexProductsCommand::class,
- IndexCategoriesCommand::class,
+ IndexCommand::class,
+ UpdateIndexCommand::class,
ValidateCommand::class,
InstallCommand::class,
InstallTestsCommand::class,
]);
- Event::listen(IndexBeforeEvent::class, function ($event) {
- $event->context->call('rapidez:index:categories');
- });
-
return $this;
}
@@ -139,6 +136,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/api.php');
$this->loadRoutesFrom(__DIR__ . '/../routes/magento-redirects.php');
@@ -162,34 +163,10 @@ 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::addExtension('graphql', 'blade');
Vite::useScriptTagAttributes(fn (string $src, string $url, ?array $chunk, ?array $manifest) => [
@@ -249,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');
@@ -263,6 +247,7 @@ protected function bootListeners(): self
ModelsHealthcheck::register();
MagentoSettingsHealthcheck::register();
ElasticsearchHealthcheck::register();
+ UpdateLatestIndexDate::register();
return $this;
}
@@ -283,6 +268,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); // @phpstan-ignore-line False positive, the macro bind allows us to access protected properties.
+
+ 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;
}
@@ -293,23 +297,28 @@ 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);
- }
+ return $this;
+ }
+
+ protected function registerThemes(): self
+ {
+ if (app()->runningInConsole()) {
+ return $this;
+ }
+
+ $path = config('rapidez.frontend.theme', false);
- config()->set('cache.stores.rapidez:multi', [
- 'driver' => 'multi',
- 'stores' => [
- 'array',
- $fallbackDriver,
- ],
- 'sync_missed_stores' => true,
- ]);
+ if (! $path) {
+ return $this;
}
+ config([
+ 'view.paths' => [
+ $path,
+ ...config('view.paths'),
+ ],
+ ]);
+
return $this;
}
diff --git a/src/helpers.php b/src/helpers.php
index cb1a89699..485a7c53c 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,22 @@ 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); // @phpstan-ignore-line This is a macro bind, which is not recognized by PHPStan.
+ }
+}
+
+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;
}
}
diff --git a/tailwind.config.js b/tailwind.config.js
index 98e144059..212703a51 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -48,12 +48,14 @@ export default {
},
border: {
+ 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: {
+ 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]),
@@ -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'),
diff --git a/tests/Browser/OnestepCheckoutTest.php b/tests/Browser/OnestepCheckoutTest.php
index 36da369cf..03f545017 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) . ';');
}
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,
];
}