Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix broken UI after a 404 #388

Merged
merged 6 commits into from
Nov 30, 2023
Merged

Fix broken UI after a 404 #388

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fad9fa6
Update Turbo so 404s are correctly handled, disable Turbo on 404 so f…
danielsmink Nov 29, 2023
6b1aabc
Merge branch 'rapidez:master' into master
danielsmink Nov 29, 2023
5269b09
Apply fixes from Prettier
danielsmink Nov 29, 2023
3e4aa40
Fallback for autocomplete styling
danielsmink Nov 29, 2023
0f76a37
Move class to component and remove obsolete div
danielsmink Nov 30, 2023
7892be6
Apply suggestions from code review
royduin Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"devDependencies": {
"@appbaseio/reactivesearch-vue": "^1.33.13",
"@hotwired/turbo": "^7.2.4",
"@hotwired/turbo": "^8.0.0-beta.1",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/typography": "^0.5.9",
"@vitejs/plugin-vue2": "^2.2.0",
Expand Down
8 changes: 8 additions & 0 deletions resources/views/errors/404.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
@section('title', $page->meta_title ?: $page->title)
@section('description', $page->meta_description)

@push('head')
<script>
document.addEventListener('turbo:load', function() {
window.Turbo.session.drive = false;
});
</script>
@endpush

@section('content')
<div class="container">
<h1 class="mb-5 text-4xl font-bold">{{ $page->content_heading }}</h1>
Expand Down
100 changes: 51 additions & 49 deletions resources/views/layouts/partials/header/autocomplete.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,61 +8,63 @@ class="{{ $inputClasses }}"
v-on:focus="$root.loadAutocomplete = true; window.setTimeout(() => window.document.getElementById('autocomplete-input').focus(), 200)"
v-if="!$root.loadAutocomplete">

<autocomplete
v-if="$root.loadAutocomplete"
v-cloak
:additionals="{ categories: ['name^3', 'meta_description^1'] }"
>
<x-rapidez::reactive-base slot-scope="{ results, searchAdditionals, additionals }">
<data-search
placeholder="@lang('Search')"
v-on:value-selected="search"
component-id="autocomplete"
:inner-class="{ input: '{{ $inputClasses }}' }"
class="[&_*]:!m-0 [&_[isclearicon=]]:!mr-2"
:data-field="Object.keys(config.searchable)"
:field-weights="Object.values(config.searchable)"
:show-icon="false"
fuzziness="AUTO"
:debounce="100"
:size="10"
v-on:value-change="searchAdditionals($event)"
>
<div
slot="render"
slot-scope="{ downshiftProps: { isOpen }, data: suggestions }"
<div class="w-full">
danielsmink marked this conversation as resolved.
Show resolved Hide resolved
<autocomplete
v-if="$root.loadAutocomplete"
v-cloak
:additionals="{ categories: ['name^3', 'meta_description^1'] }"
>
<x-rapidez::reactive-base slot-scope="{ results, searchAdditionals, additionals }">
<data-search
placeholder="@lang('Search')"
v-on:value-selected="search"
component-id="autocomplete"
:inner-class="{ input: '{{ $inputClasses }}' }"
class="relative [&_*]:!m-0 [&_[isclearicon=]]:!mr-2 [&_.cancel-icon]:!fill-[#595959] [&_[groupposition=right]]:!absolute [&_[groupposition=right]]:!top-2/4 [&_[groupposition=right]]:!right-0 [&_[groupposition=right]]:!-translate-y-2/4"
:data-field="Object.keys(config.searchable)"
:field-weights="Object.values(config.searchable)"
:show-icon="false"
fuzziness="AUTO"
:debounce="100"
:size="10"
v-on:value-change="searchAdditionals($event)"
>
<div
class="{{ config('rapidez.frontend.z-indexes.header-dropdowns') }} absolute -inset-x-10 top-full max-h-[600px] overflow-auto rounded-b-xl border bg-white p-2 md:p-5 shadow-xl md:inset-x-0 md:w-full md:-translate-y-px"
v-if="isOpen && (suggestions.length || results.count)"
slot="render"
slot-scope="{ downshiftProps: { isOpen }, data: suggestions }"
>
<div class="flex gap-5 pb-5 my-2" v-if="results.categories && results.categories.hits.length">
<div class="font-bold">
@lang('Categories')
<div
class="{{ config('rapidez.frontend.z-indexes.header-dropdowns') }} absolute -inset-x-10 top-full max-h-[600px] overflow-auto rounded-b-xl border bg-white p-2 md:p-5 shadow-xl md:inset-x-0 md:w-full md:-translate-y-px"
v-if="isOpen && (suggestions.length || results.count)"
>
<div class="flex gap-5 pb-5 my-2" v-if="results.categories && results.categories.hits.length">
<div class="font-bold">
@lang('Categories')
</div>
<ul class="flex flex-col gap-1">
<li v-for="hit in results.categories.hits" class="w-full">
<a :href="hit._source.url" class="w-full hover:text-primary flex gap-1">
<span class="ml-2">@{{ hit._source.name }}</span>
</a>
</li>
</ul>
</div>
<ul class="flex flex-col gap-1">
<li v-for="hit in results.categories.hits" class="w-full">
<a :href="hit._source.url" class="w-full hover:text-primary flex gap-1">
<span class="ml-2">@{{ hit._source.name }}</span>
<ul class="gap-5 grid md:grid-cols-2">
<li
v-for="suggestion in suggestions"
:key="suggestion.source._id">
<a :href="suggestion.source.url | url" class="flex flex-wrap flex-1" key="suggestion.source._id">
<img :src="'/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product' + suggestion.source.thumbnail + '.webp'" class="self-center object-contain w-14 aspect-square" />
<div class="flex flex-1 flex-wrap px-2">
<strong class="hyphens block w-full">@{{ suggestion.source.name }}</strong>
<div class="self-end">@{{ suggestion.source.price | price }}</div>
</div>
</a>
</li>
</ul>
</div>
<ul class="gap-5 grid md:grid-cols-2">
<li
v-for="suggestion in suggestions"
:key="suggestion.source._id">
<a :href="suggestion.source.url | url" class="flex flex-wrap flex-1" key="suggestion.source._id">
<img :src="'/storage/{{ config('rapidez.store') }}/resizes/80x80/magento/catalog/product' + suggestion.source.thumbnail + '.webp'" class="self-center object-contain w-14 aspect-square" />
<div class="flex flex-1 flex-wrap px-2">
<strong class="hyphens block w-full">@{{ suggestion.source.name }}</strong>
<div class="self-end">@{{ suggestion.source.price | price }}</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</data-search>
</x-rapidez::reactive-base>
</autocomplete>
</data-search>
</x-rapidez::reactive-base>
</autocomplete>
</div>
14 changes: 10 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,12 @@
fast-deep-equal "^3.1.3"
supercluster "^7.1.3"

"@hotwired/turbo@^7.2.4":
version "7.2.4"
resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.2.4.tgz#0d35541be32cfae3b4f78c6ab9138f5b21f28a21"
integrity sha512-c3xlOroHp/cCZHDOuLp6uzQYEbvXBUVaal0puXoGJ9M8L/KHwZ3hQozD4dVeSN9msHWLxxtmPT1TlCN7gFhj4w==
"@hotwired/turbo@^8.0.0-beta.1":
version "8.0.0-beta.1"
resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.0-beta.1.tgz#35a7086c4c959445db059ea4a9b9af85cdafa616"
integrity sha512-g66YmO/Oa+EThB3KkNDhrM9mFnNyRn6tqgwGiBHh4Vf+d3XjCznuWSG2o2e2cO/RlddVRtCwvBSMuG6sYQWX+g==
dependencies:
idiomorph "https://github.com/basecamp/idiomorph#rollout-build"

"@jridgewell/gen-mapping@^0.3.2":
version "0.3.3"
Expand Down Expand Up @@ -939,6 +941,10 @@ hotkeys-js@^3.8.7:
resolved "https://registry.yarnpkg.com/hotkeys-js/-/hotkeys-js-3.10.1.tgz#0c67e72298f235c9200e421ab112d156dc81356a"
integrity sha512-mshqjgTqx8ee0qryHvRgZaZDxTwxam/2yTQmQlqAWS3+twnq1jsY9Yng9zB7lWq6WRrjTbTOc7knNwccXQiAjQ==

"idiomorph@https://github.com/basecamp/idiomorph#rollout-build":
version "0.0.8"
resolved "https://github.com/basecamp/idiomorph#e906820368e4c9c52489a3336b8c3826b1bf6de5"

import-fresh@^3.1.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
Expand Down
Loading