From 3808cd50faacbc625685270ea77e4771c2617c1e Mon Sep 17 00:00:00 2001 From: Jimmy Hoenderdaal Date: Fri, 21 Apr 2023 15:38:04 +0200 Subject: [PATCH 1/8] add autoscroll to master --- resources/js/components/Elements/Slider.vue | 60 ++++++++++++++++++--- 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/resources/js/components/Elements/Slider.vue b/resources/js/components/Elements/Slider.vue index 3dfc7a9d5..0dff5b404 100644 --- a/resources/js/components/Elements/Slider.vue +++ b/resources/js/components/Elements/Slider.vue @@ -1,5 +1,6 @@ From 3e3228ace39cf8db7d750fb4f910a4e79cce564c Mon Sep 17 00:00:00 2001 From: Jimmy Hoenderdaal Date: Tue, 25 Apr 2023 14:52:51 +0200 Subject: [PATCH 2/8] useeventlistener --- resources/js/components/Elements/Slider.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/components/Elements/Slider.vue b/resources/js/components/Elements/Slider.vue index 0dff5b404..773cc68e9 100644 --- a/resources/js/components/Elements/Slider.vue +++ b/resources/js/components/Elements/Slider.vue @@ -45,7 +45,7 @@ } }, mounted() { - this.slider.addEventListener('scroll', this.scroll) + useEventListener(this.slider, 'scroll', this.scroll) this.slider.dispatchEvent(new CustomEvent('scroll')) this.mounted = true From cbde4c3cf27676f77ef8e75c30ef6f86cf30de56 Mon Sep 17 00:00:00 2001 From: Jimmy Hoenderdaal Date: Wed, 26 Apr 2023 08:33:53 +0200 Subject: [PATCH 3/8] remove before destroy --- resources/js/components/Elements/Slider.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/js/components/Elements/Slider.vue b/resources/js/components/Elements/Slider.vue index 773cc68e9..7a77d5ee3 100644 --- a/resources/js/components/Elements/Slider.vue +++ b/resources/js/components/Elements/Slider.vue @@ -59,9 +59,6 @@ this.resume = resume } }, - beforeDestroy() { - this.slider.removeEventListener('scroll', this.scroll) - }, methods: { scroll(event) { this.position = this.vertical ? event.currentTarget.scrollTop : event.currentTarget.scrollLeft From 2852decf6f880a9ea8a5bcdcd94dc2c991243de8 Mon Sep 17 00:00:00 2001 From: Jimmy Hoenderdaal Date: Tue, 24 Oct 2023 10:36:48 +0200 Subject: [PATCH 4/8] Remove old variant syle button --- resources/views/components/button.blade.php | 22 ------------------- .../views/components/button/index.blade.php | 2 +- .../views/components/button/primary.blade.php | 3 +++ .../views/components/cookie-notice.blade.php | 6 ++--- 4 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 resources/views/components/button.blade.php create mode 100644 resources/views/components/button/primary.blade.php diff --git a/resources/views/components/button.blade.php b/resources/views/components/button.blade.php deleted file mode 100644 index b406a051b..000000000 --- a/resources/views/components/button.blade.php +++ /dev/null @@ -1,22 +0,0 @@ -@props(['variant' => 'primary', 'disableWhenLoading' => true]) - -@php -$tag = $attributes->has('href') || $attributes->has(':href') ? 'a' : 'button'; -$baseClasses[] = 'inline-block font-semibold py-2 px-4 border rounded disabled:opacity-50 disabled:cursor-not-allowed hover:opacity-75 whitespace-nowrap transition'; -$variants = [ - 'primary' => 'bg-inactive text-white', - 'outline' => 'bg-transparent hover:bg-neutral text-neutral hover:text-white border-neutral hover:border-transparent', - 'slider' => ['flex items-center justify-center rounded-full w-12 h-12 bg-white border hover:bg-neutral hover:text-white'], -]; -@endphp - -<{{ $tag }} {{ $attributes->merge([ - 'type' => $attributes->has('href') || $attributes->has(':href') ? null : 'button', - 'class' => implode(' ', isset($variants[$variant]) - ? (is_array($variants[$variant]) - ? $variants[$variant] - : array_merge($baseClasses, [$variants[$variant]])) - : $baseClasses), - ':disabled' => $attributes->has('href') || $attributes->has(':href') || !$disableWhenLoading ? null : '$root.loading']) }}> - {{ $slot }} - diff --git a/resources/views/components/button/index.blade.php b/resources/views/components/button/index.blade.php index cecaa055a..8159c7c78 100644 --- a/resources/views/components/button/index.blade.php +++ b/resources/views/components/button/index.blade.php @@ -1,3 +1,3 @@ -class('bg-primary text-primary-text') }}> +class('bg-inactive text-white') }}> {{ $slot }} diff --git a/resources/views/components/button/primary.blade.php b/resources/views/components/button/primary.blade.php new file mode 100644 index 000000000..cecaa055a --- /dev/null +++ b/resources/views/components/button/primary.blade.php @@ -0,0 +1,3 @@ +class('bg-primary text-primary-text') }}> + {{ $slot }} + diff --git a/resources/views/components/cookie-notice.blade.php b/resources/views/components/cookie-notice.blade.php index ab6f7db66..acff1a15f 100644 --- a/resources/views/components/cookie-notice.blade.php +++ b/resources/views/components/cookie-notice.blade.php @@ -15,10 +15,10 @@ {{ $slot }} - + {{ $button ?? __('Accept cookies') }} - + -@endif \ No newline at end of file +@endif From d09bbdf64178427b2b865717bb49aac3d7742cc6 Mon Sep 17 00:00:00 2001 From: Jimmy Hoenderdaal Date: Tue, 14 Nov 2023 11:41:09 +0100 Subject: [PATCH 5/8] Add pricevaliduntil to micradata --- resources/views/product/partials/microdata.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/product/partials/microdata.blade.php b/resources/views/product/partials/microdata.blade.php index 4b27e7038..52470f52f 100644 --- a/resources/views/product/partials/microdata.blade.php +++ b/resources/views/product/partials/microdata.blade.php @@ -10,4 +10,7 @@ + @if($product->special_to_date && $product->special_to_date > now()->toDateTimeString()) + + @endif From aaa2cf7cac003ba22f212c00445e7d8f924b44e2 Mon Sep 17 00:00:00 2001 From: Jimmy Hoenderdaal Date: Tue, 14 Nov 2023 11:42:11 +0100 Subject: [PATCH 6/8] add comment for tierprices --- resources/views/product/partials/microdata.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/product/partials/microdata.blade.php b/resources/views/product/partials/microdata.blade.php index 52470f52f..b2cc4752b 100644 --- a/resources/views/product/partials/microdata.blade.php +++ b/resources/views/product/partials/microdata.blade.php @@ -9,6 +9,8 @@ + {{-- --}} + {{-- dont forget special price with tierprices like this ^^ --}} @if($product->special_to_date && $product->special_to_date > now()->toDateTimeString()) From 5f2b0fb534d8c0eb0c6c91d20f1a52f456dc32c7 Mon Sep 17 00:00:00 2001 From: Roy Duineveld Date: Tue, 14 Nov 2023 13:13:37 +0100 Subject: [PATCH 7/8] Update resources/views/product/partials/microdata.blade.php --- resources/views/product/partials/microdata.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/views/product/partials/microdata.blade.php b/resources/views/product/partials/microdata.blade.php index b2cc4752b..52470f52f 100644 --- a/resources/views/product/partials/microdata.blade.php +++ b/resources/views/product/partials/microdata.blade.php @@ -9,8 +9,6 @@ - {{-- --}} - {{-- dont forget special price with tierprices like this ^^ --}} @if($product->special_to_date && $product->special_to_date > now()->toDateTimeString()) From da372174f53652c228c2a34ef196b3727bb7741b Mon Sep 17 00:00:00 2001 From: Roy Duineveld Date: Tue, 14 Nov 2023 13:15:44 +0100 Subject: [PATCH 8/8] Update resources/views/product/partials/microdata.blade.php --- resources/views/product/partials/microdata.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/product/partials/microdata.blade.php b/resources/views/product/partials/microdata.blade.php index 52470f52f..938833bcb 100644 --- a/resources/views/product/partials/microdata.blade.php +++ b/resources/views/product/partials/microdata.blade.php @@ -8,7 +8,7 @@
- + @if($product->special_to_date && $product->special_to_date > now()->toDateTimeString())