From 2f81f1d61da677acd13f094c7ea4708ba2a4e909 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Mon, 24 Jan 2022 00:31:23 +0100
Subject: [PATCH] better integration of filters

---
 .../views/Shop/Tags/partials/filter.blade.php | 46 ++++++++++++-------
 .../layout/partials/category_add.blade.php    |  3 +-
 .../Shop/layout/partials/header-nav.blade.php |  1 +
 resources/views/Shop/shelve.blade.php         | 31 ++++++-------
 resources/views/load/layout/sidebar.blade.php | 20 ++++++++
 5 files changed, 66 insertions(+), 35 deletions(-)
 create mode 100644 resources/views/load/layout/sidebar.blade.php

diff --git a/resources/views/Shop/Tags/partials/filter.blade.php b/resources/views/Shop/Tags/partials/filter.blade.php
index 322f8eaf..d8b0124a 100644
--- a/resources/views/Shop/Tags/partials/filter.blade.php
+++ b/resources/views/Shop/Tags/partials/filter.blade.php
@@ -1,18 +1,32 @@
-<div class="row">
-    <div class="col-12">
-        @include('components.form.button', ['id' => 'reset_filters', 'txt' => 'Annuler les filtres', 'class' => 'btn-success w-100'])
-    </div>
-</div>
+<aside class="main-sidebar float-left d-none" id="sidebar" style="width: 300px;">
+    <section class="sidebar" style="height: auto;">
 
-@foreach ($tags as $group)
-    <h5>{{ $group['name'] }}</h5>
-    @foreach ($group['tags'] as $tag)
-        <div>
-            @include('components.form.checkbox', [
-                'name' => 'tag[]',
-                'val' => $tag['id'],
-            ])
-            {{ $tag['name'] }} ({{ $tag['count'] }})
+        <div class="row">
+            <div class="col-12">
+                @include('components.form.button', ['id' => 'reset_filters', 'txt' => 'Annuler les filtres', 'class' => 'btn-success w-100'])
+            </div>
         </div>
-    @endforeach
-@endforeach
\ No newline at end of file
+
+        @foreach ($tags as $group)
+            <h5>{{ $group['name'] }}</h5>
+            @foreach ($group['tags'] as $tag)
+                <div>
+                    @include('components.form.checkbox', [
+                        'name' => 'tag[]',
+                        'val' => $tag['id'],
+                    ])
+                    {{ $tag['name'] }} ({{ $tag['count'] }})
+                </div>
+            @endforeach
+        @endforeach
+    
+    </section>
+</aside>
+
+@push('js')
+    <script>
+        $('#filters').click(function() {
+            $('#sidebar').toggleClass('d-none');
+        })
+    </script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/Shop/layout/partials/category_add.blade.php b/resources/views/Shop/layout/partials/category_add.blade.php
index f0537527..9698df72 100644
--- a/resources/views/Shop/layout/partials/category_add.blade.php
+++ b/resources/views/Shop/layout/partials/category_add.blade.php
@@ -1,12 +1,13 @@
 <div class="row">
 	<div class="col-6">
 		<button type="button" class="btn btn-success">
-			<i class="fa fa-seedling"></i>
+			<i class="fa fa-2x fa-seedling"></i>
 			Ajouter au panier la liste des <strong>semences</strong>
 		</button>
 	</div>
 	<div class="col-6">
 		<button type="button" class="btn btn-warning">
+			<i class="fab fa-2x fa-pagelines"></i>
 			Ajouter au panier la liste des <strong>plants</strong>
 		</button>
 	</div>
diff --git a/resources/views/Shop/layout/partials/header-nav.blade.php b/resources/views/Shop/layout/partials/header-nav.blade.php
index da348898..32cabe14 100644
--- a/resources/views/Shop/layout/partials/header-nav.blade.php
+++ b/resources/views/Shop/layout/partials/header-nav.blade.php
@@ -2,6 +2,7 @@
 
 	<div class="col-4 col-md-2 form-inline pl-4">
 		<a href="/"><img src="/img/logo.jpg" class="img-responvive pull-left"></a>
+		<a id="filters" href="#" class="text-white pl-3"><i class="fa fa-2x fa-bars"></i></a>
 	</div>
 
 	<div class="col-8 col-md-6 form-inline">	
diff --git a/resources/views/Shop/shelve.blade.php b/resources/views/Shop/shelve.blade.php
index e8f5abf4..bf5e0efa 100644
--- a/resources/views/Shop/shelve.blade.php
+++ b/resources/views/Shop/shelve.blade.php
@@ -3,25 +3,20 @@
 ])
 
 @section('content')
+	@include('Shop.Tags.partials.filter')
+	
 	<div class="row">
-		<div class="col-3 col-lg-2">
-			@include('Shop.Tags.partials.filter')
+		<div class="col-8">
+			<h1 style="font-size: 2em;">{{ $category['name'] }}</h1>
+			<h3 style="font-size: 1.2em;">{!! $category['description'] !!}</h3>
 		</div>
-		<div class="col-9 col-lg-10">
-			<div class="row">
-				<div class="col-8">
-					<h1 style="font-size: 2em;">{{ $category['name'] }}</h1>
-					<h3 style="font-size: 1.2em;">{!! $category['description'] !!}</h3>
-				</div>
-				<div class="col-4">
-					@include('Shop.layout.partials.category_add')					
-				</div>
-			</div>
-			@if ($display_by_rows ?? false)
-				@include('Shop.layout.partials.category_articles_rows')
-			@else
-				@include('Shop.layout.partials.category_articles')
-			@endif
+		<div class="col-4">
+			@include('Shop.layout.partials.category_add')					
 		</div>
 	</div>
-@endsection
\ No newline at end of file
+	@if ($display_by_rows ?? false)
+		@include('Shop.layout.partials.category_articles_rows')
+	@else
+		@include('Shop.layout.partials.category_articles')
+	@endif
+@endsection
diff --git a/resources/views/load/layout/sidebar.blade.php b/resources/views/load/layout/sidebar.blade.php
new file mode 100644
index 00000000..163a0fe3
--- /dev/null
+++ b/resources/views/load/layout/sidebar.blade.php
@@ -0,0 +1,20 @@
+@if(!defined('LOAD_SIDEBAR'))
+	@push('scripts')
+
+		<script type="text/javascript" src="/assets/plugins/sidr/jquery.sidr.min.js"></script>
+
+		<script>
+			function initSidebar(sel) {
+				var selector = (typeof(sel) == 'undefined') ? '#sidebar' : sel;
+				$(selector).sidr();
+			}
+		</script>
+
+	@endpush
+
+	@push('css')
+		<link rel="stylesheet" href="/assets/plugins/sidr/stylesheets/jquery.sidr.light.min.css">  
+	@endpush
+
+	@php(define('LOAD_SIDEBAR', true))
+@endif
\ No newline at end of file