Skip to content

Commit

Permalink
chore: put disclosure view into blade component
Browse files Browse the repository at this point in the history
  • Loading branch information
@FrantisekMichalSebestyen
FrantisekMichalSebestyen committed Apr 21, 2023
1 parent dd17d17 commit a1970e3
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 41 deletions.
1 change: 0 additions & 1 deletion resources/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ Vue.component('filter-new-year-slider', require('./components/catalog-new/NewYea
Vue.component('filter-new-custom-checkbox', require('./components/catalog-new/NewCustomCheckbox.vue').default);
Vue.component('filter-new-sort', require('./components/catalog-new/NewSort.vue').default);
Vue.component('filter-disclosure-inline-list-button', require('./components/catalog-new/DisclosureFilterInlineListButton.vue').default);
Vue.component('filter-disclosure-view', require('./components/catalog-new/DisclosureFilterView.vue').default);
Vue.component('filter-disclosure-controller', require('./components/catalog-new/DisclosureModalController.vue').default);
Vue.component('filter-show-more', require('./components/catalog-new/ShowMore.vue').default);
Vue.component('catalog.infinite-scroll', require('./components/catalog-new/InfiniteScroll.vue').default);
Expand Down
24 changes: 0 additions & 24 deletions resources/js/components/catalog-new/DisclosureFilterView.vue
View file

This file was deleted.

19 changes: 19 additions & 0 deletions resources/views/components/filter/disclosure_view.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<div class="tw-grow tw-bg-white" v-if="{{ $attributes->get('v-if') }}">
<div class="tw-mx-4 tw-my-6 tw-flex tw-items-end tw-justify-between">
{{ $header }}
<div class="tw-flex">
{{ $reset_button }}
<button @click="{{ $attributes->get('@close') }}">
<svg xmlns="http://www.w3.org/2000/svg" class="tw-h-6 tw-w-6 tw-fill-current"
viewBox="0 0 256 256">
<path
d="M208.49,191.51a12,12,0,0,1-17,17L128,145,64.49,208.49a12,12,0,0,1-17-17L111,128,47.51,64.49a12,12,0,0,1,17-17L128,111l63.51-63.52a12,12,0,0,1,17,17L145,128Z">
</path>
</svg>
</button>
</div>
</div>
<div class="tw-flex tw-h-40 tw-flex-col">
{{ $body }}
</div>
</div>
35 changes: 19 additions & 16 deletions resources/views/frontend/catalog-new/index-new.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,14 @@ class="tw-h-6 tw-w-6 tw-fill-current" viewBox="0 0 256 256">
</div>
<x-filter.disclosure_modal v-if="dc.view !== null" @close="dc.close">
<x-slot:body>
<filter-disclosure-view v-if="dc.view === 'index'"
<x-filter.disclosure_view v-if="dc.view === 'index'"
@close="dc.close">
<template #header>
<x-slot:header>
<span class="tw-text-lg tw-font-semibold">Filter diel</span>
</template>
<template v-if="selectedOptionsAsLabels.length" #reset-button>
</x-slot>
<x-slot:reset_button>
<button
v-if="selectedOptionsAsLabels.length"
class="tw-mr-3 tw-flex tw-min-w-max tw-items-center tw-border tw-border-gray-300 tw-bg-white tw-px-1.5 tw-py-1 tw-text-sm tw-font-semibold hover:tw-border-gray-800"
@click="clearAllSelections">
<svg class="tw-mr-1.5 tw-h-4 tw-w-4 tw-fill-current"
Expand All @@ -157,8 +158,8 @@ class="tw-mr-3 tw-flex tw-min-w-max tw-items-center tw-border tw-border-gray-300
</svg>
<span>zrušiť celý výber</span>
</button>
</template>
<template #body>
</x-slot>
<x-slot:body>
<x-filter.disclosure_list_button @click="dc.goTo('author')">
<filter-new-custom-select-popover-label name="author"
:selected-values="query['author']">
Expand Down Expand Up @@ -253,11 +254,11 @@ class="tw-flex tw-min-h-0 tw-w-full tw-flex-1 tw-flex-col tw-overflow-auto tw-py
id="has_text_desktop">
</filter-new-custom-checkbox>
</div>
</template>
</filter-disclosure-view>
<filter-disclosure-view v-if="dc.view === 'author'"
</x-slot>
</x-filter.disclosure_view>
<x-filter.disclosure_view v-if="dc.view === 'author'"
@close="dc.close">
<template #header>
<x-slot:header>
<div class="tw-flex tw-items-center">
<button @click="dc.goTo('index')"
class="tw-pr-2">
Expand All @@ -271,9 +272,11 @@ class="tw-h-6 tw-w-6 tw-fill-current">
<filter-new-custom-select-popover-label name="author"
:selected-values="query['author']">
</filter-new-custom-select-popover-label>
</template>
<template v-if="query.author.length" #reset-button>
</div>
</x-slot>
<x-slot:reset_button>
<button
v-if="query.author.length"
class="tw-mr-3 tw-flex tw-min-w-max tw-items-center tw-border tw-border-gray-300 tw-bg-white tw-px-1.5 tw-py-1 tw-text-sm tw-font-semibold hover:tw-border-gray-800"
@click="clearFilterSelection('author')">
<svg class="tw-mr-1.5 tw-h-4 tw-w-4 tw-fill-current"
Expand All @@ -285,8 +288,8 @@ class="tw-mr-3 tw-flex tw-min-w-max tw-items-center tw-border tw-border-gray-300
</svg>
<span>zrušiť výber</span>
</button>
</template>
<template #body>
</x-slot>
<x-slot:body>
<div
class="tw-inset-x-0 tw-box-border tw-flex tw-min-h-0 tw-flex-1 tw-flex-col tw-overflow-auto">
<filter-new-options filter-name="author"
Expand All @@ -296,8 +299,8 @@ class="tw-inset-x-0 tw-box-border tw-flex tw-min-h-0 tw-flex-1 tw-flex-col tw-ov
:filter="aggregations['author']">
</filter-new-options>
</div>
</template>
</filter-disclosure-view>
</x-slot>
</x-filter.disclosure_view>
</x-slot>
<x-slot:footer>
<button class="tw-m-4 tw-w-full tw-bg-sky-300 tw-p-4"
Expand Down

0 comments on commit a1970e3

Please sign in to comment.