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

Various fixes for new Catalog #1000

Merged
merged 7 commits into from
Apr 25, 2024
Merged

Various fixes for new Catalog #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
692b929
catalog-new/index-new -> catalog-new/index
eronisko Apr 19, 2024
660deb7
Move useTitleupdater into composables
eronisko Apr 19, 2024
599be70
New Popover component for catalog
eronisko Apr 19, 2024
b9939cd
Removed search_popover Blade component
eronisko Apr 19, 2024
5802cb3
Fix re-setting of colourslider
eronisko Apr 19, 2024
f342336
YearSlider reacts to clicks
eronisko Apr 19, 2024
b18fd7b
Add explanatory comment for .tailwind-rules wrapper in Popover
eronisko Apr 25, 2024
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
4 changes: 2 additions & 2 deletions app/Http/Controllers/NewCatalogController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class NewCatalogController extends Controller
*/
public function index(Request $request)
{
return view('frontend.catalog-new.index-new', ['title' => self::generateTitle($request)]);
return view('frontend.catalog-new.index', ['title' => self::generateTitle($request)]);
}

public static function generateTitle(Request $request)
Expand Down Expand Up @@ -56,7 +56,7 @@ public static function generateTitle(Request $request)
}

$values = collect(
is_array($filters[$attribute]) ? $filters[$attribute] : [$filters[$attribute]]
is_array($filters[$attribute]) ? $filters[$attribute] : [$filters[$attribute]],
);

if ($attribute === 'author') {
Expand Down
245 changes: 244 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"match-sorter": "^6.3.1",
"openseadragon": "^3.0.0",
"qs": "^6.11.0",
"radix-vue": "^1.7.0",
"selectize": "^0.12.1",
"slick-carousel": "1.7.1",
"tinycolor2": "1.4.2",
Expand Down
2 changes: 2 additions & 0 deletions resources/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import CatalogNewInfiniteScroll from './components/catalog-new/InfiniteScroll.vu
import CatalogNewArtworkImageController from './components/catalog-new/ArtworkImageController.vue'
import CatalogNewNumberFormatter from './components/catalog-new/NumberFormatter.vue'
import CatalogNewAuthorFormatter from './components/catalog-new/AuthorFormatter.vue'
import CatalogNewPopover from './components/catalog-new/Popover.vue'
import Flickity from './components/Flickity.vue'
import HomeShuffleOrchestrator from './components/home/ShuffleOrchestrator.vue'
import HomeTransitionInPlace from './components/home/TransitionInPlace.vue'
Expand Down Expand Up @@ -101,6 +102,7 @@ createApp({
.component('catalog.artwork-image-controller', CatalogNewArtworkImageController)
.component('catalog.number-formatter', CatalogNewNumberFormatter)
.component('catalog.author-formatter', CatalogNewAuthorFormatter)
.component('catalog.popover', CatalogNewPopover)
.component('flickity', Flickity)
.component('home.shuffle-orchestrator', HomeShuffleOrchestrator)
.component('home.transition-in-place', HomeTransitionInPlace)
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/catalog-new/ItemsFilterController.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script>
import qs from 'qs'
import { useApiClient } from '../composables/useApiClient'
import { useTitleUpdater } from './useTitleUpdater'
import { useTitleUpdater } from './composables/useTitleUpdater'

function getQueryFromCurrentUrl() {
const parsedUrl = qs.parse(window.location.search, {
Expand Down
2 changes: 2 additions & 0 deletions resources/js/components/catalog-new/NewYearSlider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
:height="2"
@update:model-value="value = { from: $event[0], to: $event[1] }"
@drag-end="$emit('change', value)"
@change="$emit('change', value)"
@dragging="value = { from: $event[0], to: $event[1] }"
class="tw-cursor-pointer"
lazy
>
<template #dot>
<div class="tw-flex tw-h-full tw-w-full tw-justify-center tw-items-center">
Expand Down
Loading