Merge remote-tracking branch 'origin/main' into prettier-fix

lang/cs/item.php

@@ -26,8 +26,8 @@
     'identifier' => 'inventární číslo',
     'author' => 'autor / autorka',
     'item_authorities' => 'autoři - vztahy',
-    'tags' => 'tagy',
-    'tag' => 'tag',
+    'tags' => 'klíčová slova',
+    'tag' => 'klíčové slovo',
     'date_earliest' => 'datace od',
     'date_latest' => 'datace do',
     'lat' => 'latitúda',
@@ -73,7 +73,7 @@
             'search' => 'výsledky vyhledávání pro: ":value"',
             'author' => 'autor: :value',
             'work_type' => 'výtvarný druh: :value',
-            'tag' => 'tagy: :value',
+            'tag' => 'klíčové slovo: :value',
             'gallery' => 'galerie: :value',
             'credit' => 'nabytí: :value',
             'topic' => 'námět: :value',

lang/en/item.php

@@ -26,8 +26,8 @@
     'identifier' => 'identifier',
     'author' => 'artist',
     'item_authorities' => 'artists - relations',
-    'tags' => 'tags',
-    'tag' => 'tag',
+    'tags' => 'keywords',
+    'tag' => 'keyword',
     'date_earliest' => 'date earliest',
     'date_latest' => 'date latest',
     'lat' => 'latitude',
@@ -81,7 +81,7 @@
             'search' => 'search results for: ":value"',
             'author' => 'artist: :value',
             'work_type' => 'work type: :value',
-            'tag' => 'tags: :value',
+            'tag' => 'keyword: :value',
             'gallery' => 'institution: :value',
             'credit' => 'credit: :value',
             'topic' => 'genre: :value',

lang/sk/item.php

@@ -26,8 +26,8 @@
     'identifier' => 'inventárne číslo',
     'author' => 'autor / autorka',
     'item_authorities' => 'autori - vzťahy',
-    'tags' => 'tagy',
-    'tag' => 'tag',
+    'tags' => 'kľúčové slová',
+    'tag' => 'kľúčové slovo',
     'date_earliest' => 'datovanie najskôr',
     'date_latest' => 'datovanie najneskôr',
     'lat' => 'latitúda',
@@ -73,7 +73,7 @@
             'search' => 'výsledky vyhľadávania pre: ":value"',
             'author' => 'autor: :value',
             'work_type' => 'výtvarný druh: :value',
-            'tag' => 'tag: :value',
+            'tag' => 'kľúčové slovo :value',
             'gallery' => 'galéria: :value',
             'credit' => 'nadobudnutie: :value',
             'topic' => 'žáner: :value',

package.json

@@ -24,7 +24,6 @@
         "vue": "^3.2.47"
     },
     "dependencies": {
-        "@lottiefiles/lottie-player": "^1.7.1",
         "@popperjs/core": "^2.11.7",
         "axios": "^1.6.0",
         "bootstrap": "^3.4.1",
@@ -53,6 +52,6 @@
         "vue-masonry": "^0.16.0",
         "vue-select": "^4.0.0-beta.6",
         "vue-slider-component": "^4.1.0-beta.7",
-        "vue3-click-away": "^1.2.4"
+        "vue3-lottie": "^3.3.0"
     }
 }

resources/js/app.js

@@ -13,7 +13,6 @@ import 'lazysizes'
 import 'lazysizes/plugins/unveilhooks/ls.unveilhooks'
 import 'lazysizes/plugins/respimg/ls.respimg'
 import 'jquery.easing'
-import '@lottiefiles/lottie-player'
 
 // Components
 import './components/searchbar'
@@ -22,28 +21,29 @@ import './components/clipboard-button'
 // // Vue
 import { createApp } from 'vue'
 import { VueMasonryPlugin } from 'vue-masonry'
-import VueClickAway from 'vue3-click-away'
 import { i18nVue } from 'laravel-vue-i18n'
 import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist/vue.es'
 
 import FeaturedPieceClickTracker from './components/FeaturedPieceClickTracker.vue'
 import FilterSortBy from './components/filter/SortBy.vue'
 import FilterCheckbox from './components/filter/Checkbox.vue'
 import FilterCustomSelect from './components/filter/CustomSelect.vue'
+import CatalogNewAuthorSelectOptions from './components/catalog-new/AuthorSelectOptions.vue'
+import CatalogNewEmptyAnimation from './components/catalog-new/EmptyAnimation.vue'
 import CatalogNewItemsFilterController from './components/catalog-new/ItemsFilterController.vue'
-import CatalogNewPopoverGroupController from './components/catalog-new/PopoverGroupController.vue'
 import CatalogNewNewCustomSelectPopoverLabel from './components/catalog-new/NewCustomSelectPopoverLabel.vue'
 import CatalogNewNewColorSlider from './components/catalog-new/NewColorSlider.vue'
 import CatalogNewNewYearSlider from './components/catalog-new/NewYearSlider.vue'
 import CatalogNewNewCustomCheckbox from './components/catalog-new/NewCustomCheckbox.vue'
 import CatalogNewDisclosureModalController from './components/catalog-new/DisclosureModalController.vue'
-import CatalogNewSearchOptionsController from './components/catalog-new/SearchOptionsController.vue'
-import CatalogNewPopoverController from './components/catalog-new/PopoverController.vue'
 import CatalogNewInfiniteScroll from './components/catalog-new/InfiniteScroll.vue'
 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 CatalogNewResetButton from './components/catalog-new/ResetButton.vue'
+import CatalogNewSortSelect from './components/catalog-new/SortSelect.vue'
+import CatalogNewSelectOptions from './components/catalog-new/SelectOptions.vue'
 import Flickity from './components/Flickity.vue'
 import HomeShuffleOrchestrator from './components/home/ShuffleOrchestrator.vue'
 import HomeTransitionInPlace from './components/home/TransitionInPlace.vue'
@@ -74,7 +74,6 @@ createApp({
     },
 })
     .use(VueMasonryPlugin)
-    .use(VueClickAway)
     .use(i18nVue, {
         resolve: async (lang) => {
             const langs = import.meta.glob('../../lang/*.json')
@@ -88,21 +87,23 @@ createApp({
     .component('filter-checkbox', FilterCheckbox)
     .component('filter-custom-select', FilterCustomSelect)
     .component('filter-new-items-controller', CatalogNewItemsFilterController)
-    .component('filter-new-popover.group-controller', CatalogNewPopoverGroupController)
     .component('filter-new-custom-select-popover-label', CatalogNewNewCustomSelectPopoverLabel)
     .component('filter-new-color-slider', CatalogNewNewColorSlider)
     .component('filter-new-year-slider', CatalogNewNewYearSlider)
     .component('filter-new-custom-checkbox', CatalogNewNewCustomCheckbox)
     .component('filter-disclosure-controller', CatalogNewDisclosureModalController)
     .component('toggle-controller', ToggleController)
     .component('reload-controller', ReloadController)
-    .component('filter-search-options-controller', CatalogNewSearchOptionsController)
-    .component('filter-popover-controller', CatalogNewPopoverController)
+    .component('catalog.author-select-options', CatalogNewAuthorSelectOptions)
+    .component('catalog.empty-animation', CatalogNewEmptyAnimation)
     .component('catalog.infinite-scroll', CatalogNewInfiniteScroll)
     .component('catalog.artwork-image-controller', CatalogNewArtworkImageController)
     .component('catalog.number-formatter', CatalogNewNumberFormatter)
     .component('catalog.author-formatter', CatalogNewAuthorFormatter)
     .component('catalog.popover', CatalogNewPopover)
+    .component('catalog.reset-button', CatalogNewResetButton)
+    .component('catalog.sort-select', CatalogNewSortSelect)
+    .component('catalog.select-options', CatalogNewSelectOptions)
     .component('flickity', Flickity)
     .component('home.shuffle-orchestrator', HomeShuffleOrchestrator)
     .component('home.transition-in-place', HomeTransitionInPlace)

resources/js/components/catalog-new/AuthorSelectOptions.vue

@@ -0,0 +1,8 @@
+<script setup>
+import SelectOptions from './SelectOptions.vue'
+import { formatAuthorName } from './formatters.js'
+</script>
+
+<template>
+    <SelectOptions :formatLabel="formatAuthorName" />
+</template>

resources/js/components/catalog-new/EmptyAnimation.vue

@@ -0,0 +1,7 @@
+<script setup>
+import { Vue3Lottie as LottiePlayer } from 'vue3-lottie'
+</script>
+
+<template>
+    <LottiePlayer autoPlay loop animationLink="/animations/empty.json" />
+</template>

resources/js/components/catalog-new/NumberFormatter.vue

@@ -9,7 +9,7 @@
 <script>
 export default {
     props: {
-        value: String,
+        value: Number,
     },
 }
 </script>

resources/js/components/catalog-new/Popover.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref } from 'vue'
+import { ref } from 'vue'
 import { PopoverRoot, PopoverTrigger, PopoverPortal, PopoverContent } from 'radix-vue'
 
 import CaretUpIcon from './icons/CaretUp.vue'
@@ -43,7 +43,7 @@ const isOpen = ref(false)
                         side="bottom"
                         align="start"
                         :side-offset="10"
-                        class="tw-border-2 tw-border-gray-800 tw-bg-white tw-p-6 tw-mr-8 -tw-ml-px"
+                        class="tw-hidden md:tw-block tw-border-2 tw-border-gray-800 tw-bg-white tw-p-6 tw-mr-8 -tw-ml-px"
                     >
                         <slot name="content"></slot>
                     </PopoverContent>