From ba5a9e0417053f3612d8b1f14ce1d085d8c02b3a Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Thu, 20 Aug 2020 01:11:05 +0200 Subject: [PATCH] New layout for website --- resources/js/app.js | 2 +- resources/js/bootstrap.js | 2 - resources/lang/fr/shop.php | 12 ++++ .../Shop/Admin/Categories/list.blade.php | 4 -- resources/views/Shop/home.blade.php | 11 +++ .../views/Shop/{home.twig => home2.twig} | 0 resources/views/Shop/layout/layout.blade.php | 68 +++++++++++++++++++ .../Shop/layout/{layout.twig => layout2.twig} | 5 +- .../Shop/layout/partials/article.blade.php | 23 +++++++ .../partials/block-breadcrumb.blade.php | 12 ++++ .../layout/partials/block-products.blade.php | 40 +++++++++++ .../Shop/layout/partials/category.blade.php | 15 ++++ .../layout/partials/category_add.blade.php | 18 +++++ .../partials/category_articles.blade.php | 3 + .../layout/partials/header-basket.blade.php | 13 ++++ .../Shop/layout/partials/header-nav.blade.php | 20 ++++++ .../layout/partials/header-profile.blade.php | 13 ++++ .../Shop/layout/partials/header.blade.php | 4 ++ .../Shop/layout/partials/loader.blade.php | 4 ++ .../Shop/layout/partials/search.blade.php | 13 ++++ .../Shop/layout/partials/sections.blade.php | 30 ++++++++ 21 files changed, 302 insertions(+), 10 deletions(-) create mode 100644 resources/views/Shop/home.blade.php rename resources/views/Shop/{home.twig => home2.twig} (100%) create mode 100644 resources/views/Shop/layout/layout.blade.php rename resources/views/Shop/layout/{layout.twig => layout2.twig} (89%) create mode 100644 resources/views/Shop/layout/partials/article.blade.php create mode 100644 resources/views/Shop/layout/partials/block-breadcrumb.blade.php create mode 100644 resources/views/Shop/layout/partials/block-products.blade.php create mode 100644 resources/views/Shop/layout/partials/category.blade.php create mode 100644 resources/views/Shop/layout/partials/category_add.blade.php create mode 100644 resources/views/Shop/layout/partials/category_articles.blade.php create mode 100644 resources/views/Shop/layout/partials/header-basket.blade.php create mode 100644 resources/views/Shop/layout/partials/header-nav.blade.php create mode 100644 resources/views/Shop/layout/partials/header-profile.blade.php create mode 100644 resources/views/Shop/layout/partials/header.blade.php create mode 100644 resources/views/Shop/layout/partials/loader.blade.php create mode 100644 resources/views/Shop/layout/partials/search.blade.php create mode 100644 resources/views/Shop/layout/partials/sections.blade.php diff --git a/resources/js/app.js b/resources/js/app.js index 40c55f65..79d4cffa 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1 +1 @@ -require('./bootstrap'); +// require('./bootstrap'); diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index 11c378ce..9955fae0 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -32,8 +32,6 @@ try { window.$ = window.jQuery = require('jquery'); require('bootstrap'); - require('datatables.net-bs4'); - require('datatables.net-buttons-bs4'); } catch (e) {} diff --git a/resources/lang/fr/shop.php b/resources/lang/fr/shop.php index a7990d0c..8b84380a 100644 --- a/resources/lang/fr/shop.php +++ b/resources/lang/fr/shop.php @@ -66,6 +66,18 @@ return [ 'successdel' => 'L\'attribut d\'articles a été correctement effacée', 'confirmdelete' => 'Confirmez-vous la suppression de l\'attribut d\'article ?', ], + 'article_price_generics' => [ + 'title' => 'Prix génériques', + 'description' => 'Gérer les prix génériques', + 'add' => 'Ajouter un prix générique', + 'edit' => 'Editer un prix générique', + 'del' => 'Effacer un prix générique', + 'list' => 'Liste des prix générique', + 'successadd' => 'Le prix générique été correctement ajouté', + 'successmod' => 'Le prix générique a été correctement modifiée', + 'successdel' => 'Le prix générique a été correctement effacée', + 'confirmdelete' => 'Confirmez-vous la suppression du prix générique ?', + ], 'tags' => [ 'title' => 'Tags', 'description' => 'Gérer les tags', diff --git a/resources/views/Shop/Admin/Categories/list.blade.php b/resources/views/Shop/Admin/Categories/list.blade.php index f7683f8c..b8e0976f 100644 --- a/resources/views/Shop/Admin/Categories/list.blade.php +++ b/resources/views/Shop/Admin/Categories/list.blade.php @@ -19,7 +19,3 @@ @endsection -@push('scripts') - @include('components.js.datatable', ['route' => route('Shop.Admin.Categories.index'), 'model' => 'categories']) -@endpush - diff --git a/resources/views/Shop/home.blade.php b/resources/views/Shop/home.blade.php new file mode 100644 index 00000000..2571ac13 --- /dev/null +++ b/resources/views/Shop/home.blade.php @@ -0,0 +1,11 @@ +@extends('shop.layout.layout', [ + 'title' => __('home.title'), +]) + +@section('content') + + @include("Shop.layout.partials.block-breadcrumb") + + @include("Shop.layout.partials.block-products") + +@endsection \ No newline at end of file diff --git a/resources/views/Shop/home.twig b/resources/views/Shop/home2.twig similarity index 100% rename from resources/views/Shop/home.twig rename to resources/views/Shop/home2.twig diff --git a/resources/views/Shop/layout/layout.blade.php b/resources/views/Shop/layout/layout.blade.php new file mode 100644 index 00000000..5fe4a2b2 --- /dev/null +++ b/resources/views/Shop/layout/layout.blade.php @@ -0,0 +1,68 @@ + + + + + + + + + + + + OpenSemis + + + + + + + + @stack('css') + + + + + +
+
+ + @include("Shop.layout.partials.header") + +
+
+
+ @yield('content') +
+
+
+ + @include("Shop._partials.footer") + +
+
+ + + + + @stack('scripts') + + + @if(Session::has('growl')) + + @endif + + @stack('js') + + + + \ No newline at end of file diff --git a/resources/views/Shop/layout/layout.twig b/resources/views/Shop/layout/layout2.twig similarity index 89% rename from resources/views/Shop/layout/layout.twig rename to resources/views/Shop/layout/layout2.twig index d756e61d..3eaced46 100644 --- a/resources/views/Shop/layout/layout.twig +++ b/resources/views/Shop/layout/layout2.twig @@ -14,15 +14,14 @@ - - +
- {{ include("Shop._partials.header") }} + {{ include("Shop.layout.partials.header") }} {{ include("Shop._partials.notifications") }}
diff --git a/resources/views/Shop/layout/partials/article.blade.php b/resources/views/Shop/layout/partials/article.blade.php new file mode 100644 index 00000000..14fd8694 --- /dev/null +++ b/resources/views/Shop/layout/partials/article.blade.php @@ -0,0 +1,23 @@ +
+
+
+ + {{ $article['name'] }} + + + +
+
+ +
+
+ 3.10 €
+ Semence +
+ +
+ 1.65 €
+ Plant +
+
+
\ No newline at end of file diff --git a/resources/views/Shop/layout/partials/block-breadcrumb.blade.php b/resources/views/Shop/layout/partials/block-breadcrumb.blade.php new file mode 100644 index 00000000..c75757e9 --- /dev/null +++ b/resources/views/Shop/layout/partials/block-breadcrumb.blade.php @@ -0,0 +1,12 @@ +
+ +
\ No newline at end of file diff --git a/resources/views/Shop/layout/partials/block-products.blade.php b/resources/views/Shop/layout/partials/block-products.blade.php new file mode 100644 index 00000000..7ed3f38a --- /dev/null +++ b/resources/views/Shop/layout/partials/block-products.blade.php @@ -0,0 +1,40 @@ +
+
+

Meilleurs produits

+ + + +
+
+ +
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/resources/views/Shop/layout/partials/category.blade.php b/resources/views/Shop/layout/partials/category.blade.php new file mode 100644 index 00000000..c0ba6c7a --- /dev/null +++ b/resources/views/Shop/layout/partials/category.blade.php @@ -0,0 +1,15 @@ +
+
+

{{ $category['name'] }}

+

{{ $category['description'] }}

+
+
+ @include('Shop.layout.partials.category_add') +
+
+ +
+
+ @include('Shop.layout.partials.category_articles') +
+
\ 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 new file mode 100644 index 00000000..b6540658 --- /dev/null +++ b/resources/views/Shop/layout/partials/category_add.blade.php @@ -0,0 +1,18 @@ +
+
+ Ajouter au panier la liste des semences +
+
+ Ajouter au panier la liste des plants +
+
+ +
+
+ Il y a {{ $nb ?? 0 }} article(s) dans la liste +
+ + @include('components.select', ['name' => ]) +
+
+
\ No newline at end of file diff --git a/resources/views/Shop/layout/partials/category_articles.blade.php b/resources/views/Shop/layout/partials/category_articles.blade.php new file mode 100644 index 00000000..1a3eace7 --- /dev/null +++ b/resources/views/Shop/layout/partials/category_articles.blade.php @@ -0,0 +1,3 @@ +@foreach ($articles as $article) + @include('Shop.layout.partials.article') +@endforeach \ No newline at end of file diff --git a/resources/views/Shop/layout/partials/header-basket.blade.php b/resources/views/Shop/layout/partials/header-basket.blade.php new file mode 100644 index 00000000..eaf806a5 --- /dev/null +++ b/resources/views/Shop/layout/partials/header-basket.blade.php @@ -0,0 +1,13 @@ +
+
+
+ +
+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/resources/views/Shop/layout/partials/header-nav.blade.php b/resources/views/Shop/layout/partials/header-nav.blade.php new file mode 100644 index 00000000..a6a48ba8 --- /dev/null +++ b/resources/views/Shop/layout/partials/header-nav.blade.php @@ -0,0 +1,20 @@ +
+ +
+ +
+ +
+ @include("Shop.layout.partials.search") +
+ +
+ @include("Shop.layout.partials.header-profile") +
+ +
+ @include("Shop.layout.partials.header-basket") +
+ +
+ diff --git a/resources/views/Shop/layout/partials/header-profile.blade.php b/resources/views/Shop/layout/partials/header-profile.blade.php new file mode 100644 index 00000000..e50fdaa0 --- /dev/null +++ b/resources/views/Shop/layout/partials/header-profile.blade.php @@ -0,0 +1,13 @@ + diff --git a/resources/views/Shop/layout/partials/header.blade.php b/resources/views/Shop/layout/partials/header.blade.php new file mode 100644 index 00000000..2c890089 --- /dev/null +++ b/resources/views/Shop/layout/partials/header.blade.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/resources/views/Shop/layout/partials/loader.blade.php b/resources/views/Shop/layout/partials/loader.blade.php new file mode 100644 index 00000000..bbc9c1ef --- /dev/null +++ b/resources/views/Shop/layout/partials/loader.blade.php @@ -0,0 +1,4 @@ +
+
+
+
diff --git a/resources/views/Shop/layout/partials/search.blade.php b/resources/views/Shop/layout/partials/search.blade.php new file mode 100644 index 00000000..f31575e8 --- /dev/null +++ b/resources/views/Shop/layout/partials/search.blade.php @@ -0,0 +1,13 @@ +
+ +
+
+ @include('components.select', ['name' => 'type', 'list' => ['Semences & Plants'] ]) +
+ +
+ +
+
+
+ diff --git a/resources/views/Shop/layout/partials/sections.blade.php b/resources/views/Shop/layout/partials/sections.blade.php new file mode 100644 index 00000000..2910f887 --- /dev/null +++ b/resources/views/Shop/layout/partials/sections.blade.php @@ -0,0 +1,30 @@ + \ No newline at end of file