From d81e4df7776b6c2adf0b7af337c2645913b60fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Sat, 18 Sep 2021 11:13:57 +0200 Subject: [PATCH] - Introduce Flash Message to refactorize code - npm i sweetalert2 --save-dev - create confirm module - replace all natives confirm with sweet alert --- app/Http/Controllers/Bo/AdsController.php | 3 +- .../Controllers/Bo/ArticlesController.php | 3 +- .../Bo/BalancedMenusController.php | 3 +- .../Bo/BreederPortraitController.php | 3 +- .../Bo/ConsumptionTimesController.php | 3 +- .../Controllers/Bo/FaqQuestionsController.php | 3 +- .../Controllers/Bo/FaqThemesController.php | 3 +- .../Bo/HomeSliderPicturesController.php | 3 +- .../Controllers/Bo/MeatTypesController.php | 3 +- app/Http/Controllers/Bo/MomentsController.php | 3 +- .../Bo/NewsSliderPicturesController.php | 3 +- .../Controllers/Bo/OCBBreedersController.php | 3 +- .../Controllers/Bo/OCBContentController.php | 3 +- .../Bo/ProductPictogramsController.php | 3 +- .../Bo/ProductSliderPicturesController.php | 3 +- .../Controllers/Bo/ProductsController.php | 3 +- app/Http/Controllers/Bo/RangesController.php | 3 +- app/Http/Controllers/Bo/RecipesController.php | 3 +- package-lock.json | 16 ++++++ package.json | 1 + resources/js/app.js | 34 ++++++++++++ resources/js/modules/confirm.js | 37 +++++++++++++ resources/views/bo/ads/create.blade.php | 9 ---- resources/views/bo/ads/edit.blade.php | 19 +------ resources/views/bo/articles/create.blade.php | 14 ----- resources/views/bo/articles/edit.blade.php | 19 +------ .../views/bo/balanced-menus/create.blade.php | 9 ---- .../views/bo/balanced-menus/edit.blade.php | 18 +------ .../bo/breederportraits/create.blade.php | 9 ---- .../views/bo/breederportraits/edit.blade.php | 18 +------ .../views/bo/consumption-times/edit.blade.php | 9 +--- resources/views/bo/engagements/edit.blade.php | 14 ----- .../views/bo/faq-questions/create.blade.php | 9 ---- .../views/bo/faq-questions/edit.blade.php | 19 +------ .../views/bo/faq-themes/create.blade.php | 9 ---- resources/views/bo/faq-themes/edit.blade.php | 19 +------ .../bo/home-slider-pictures/create.blade.php | 9 ---- .../bo/home-slider-pictures/edit.blade.php | 19 +------ resources/views/bo/meat-types/edit.blade.php | 4 +- .../views/bo/modules/flashMessage.blade.php | 53 +++++++++++++++++++ resources/views/bo/moments/create.blade.php | 9 ---- resources/views/bo/moments/edit.blade.php | 19 +------ .../bo/news-slider-pictures/create.blade.php | 9 ---- .../bo/news-slider-pictures/edit.blade.php | 19 +------ resources/views/bo/ocb/create.blade.php | 9 ---- resources/views/bo/ocb/edit.blade.php | 19 +------ .../views/bo/ocbbreeders/create.blade.php | 9 ---- resources/views/bo/ocbbreeders/edit.blade.php | 18 +------ .../bo/product-pictograms/create.blade.php | 9 ---- .../bo/product-pictograms/edit.blade.php | 18 +------ .../product-slider-pictures/create.blade.php | 9 ---- .../bo/product-slider-pictures/edit.blade.php | 19 +------ resources/views/bo/products/edit.blade.php | 4 +- resources/views/bo/ranges/create.blade.php | 9 ---- resources/views/bo/ranges/edit.blade.php | 5 +- resources/views/bo/recipes/create.blade.php | 9 ---- resources/views/bo/recipes/edit.blade.php | 18 +------ resources/views/layouts/bo.blade.php | 1 + 58 files changed, 214 insertions(+), 419 deletions(-) create mode 100644 resources/js/modules/confirm.js create mode 100644 resources/views/bo/modules/flashMessage.blade.php diff --git a/app/Http/Controllers/Bo/AdsController.php b/app/Http/Controllers/Bo/AdsController.php index d52cfbe5..cd43c1ae 100644 --- a/app/Http/Controllers/Bo/AdsController.php +++ b/app/Http/Controllers/Bo/AdsController.php @@ -99,6 +99,7 @@ class AdsController extends Controller $a->delete(); - return redirect()->route('bo.ads.index'); + return redirect()->route('bo.ads.index') + ->with('warning', 'Le contenu à bien été supprimé'); } } diff --git a/app/Http/Controllers/Bo/ArticlesController.php b/app/Http/Controllers/Bo/ArticlesController.php index 184dbd38..adf64b57 100644 --- a/app/Http/Controllers/Bo/ArticlesController.php +++ b/app/Http/Controllers/Bo/ArticlesController.php @@ -171,7 +171,8 @@ class ArticlesController extends Controller $article->notifiable()->delete(); $article->delete(); - return redirect()->route('bo.articles.index'); + return redirect()->route('bo.articles.index') + ->with('warning', 'Le contenu à bien été supprimé'); } public function exportSondage(Articles $article) diff --git a/app/Http/Controllers/Bo/BalancedMenusController.php b/app/Http/Controllers/Bo/BalancedMenusController.php index c74e5821..54b8e5e6 100644 --- a/app/Http/Controllers/Bo/BalancedMenusController.php +++ b/app/Http/Controllers/Bo/BalancedMenusController.php @@ -121,6 +121,7 @@ class BalancedMenusController extends Controller $m->delete(); - return redirect()->route('bo.balanced-menus.index'); + return redirect()->route('bo.balanced-menus.index') + ->with('warning', 'Le contenu à bien été supprimé'); } } diff --git a/app/Http/Controllers/Bo/BreederPortraitController.php b/app/Http/Controllers/Bo/BreederPortraitController.php index d57ca4bb..e9ee1090 100644 --- a/app/Http/Controllers/Bo/BreederPortraitController.php +++ b/app/Http/Controllers/Bo/BreederPortraitController.php @@ -78,6 +78,7 @@ class BreederPortraitController extends Controller $breederportrait->delete(); - return redirect()->route('bo.breederportraits.index'); + return redirect()->route('bo.breederportraits.index') + ->with('warning', 'Le contenu à bien été supprimé'); } } diff --git a/app/Http/Controllers/Bo/ConsumptionTimesController.php b/app/Http/Controllers/Bo/ConsumptionTimesController.php index 20f57765..2b460bc8 100644 --- a/app/Http/Controllers/Bo/ConsumptionTimesController.php +++ b/app/Http/Controllers/Bo/ConsumptionTimesController.php @@ -92,6 +92,7 @@ class ConsumptionTimesController extends Controller ); } - return redirect()->route('bo.consumption-times.index'); + return redirect()->route('bo.consumption-times.index') + ->with('warning', 'Le contenu à bien été supprimé'); } } diff --git a/app/Http/Controllers/Bo/FaqQuestionsController.php b/app/Http/Controllers/Bo/FaqQuestionsController.php index 1329a303..8c0a8f2c 100644 --- a/app/Http/Controllers/Bo/FaqQuestionsController.php +++ b/app/Http/Controllers/Bo/FaqQuestionsController.php @@ -100,6 +100,7 @@ class FaqQuestionsController extends Controller { $q->delete(); - return redirect()->route('bo.faq-questions.index'); + return redirect()->route('bo.faq-questions.index') + ->with('warning', 'Le contenu à bien été supprimé'); } } diff --git a/app/Http/Controllers/Bo/FaqThemesController.php b/app/Http/Controllers/Bo/FaqThemesController.php index bb80fd59..a26b1501 100644 --- a/app/Http/Controllers/Bo/FaqThemesController.php +++ b/app/Http/Controllers/Bo/FaqThemesController.php @@ -75,7 +75,8 @@ class FaqThemesController extends Controller ->withErrors('Le thème que vous souhaitez supprimer est encore lié à une ou plusieurs question(s).'); } - return redirect()->route('bo.faq-themes.index'); + return redirect()->route('bo.faq-themes.index') + ->with('warning', 'Le contenu à bien été supprimé'); } public function changeOrder($id, $action) diff --git a/app/Http/Controllers/Bo/HomeSliderPicturesController.php b/app/Http/Controllers/Bo/HomeSliderPicturesController.php index 49d42f6e..f911c893 100644 --- a/app/Http/Controllers/Bo/HomeSliderPicturesController.php +++ b/app/Http/Controllers/Bo/HomeSliderPicturesController.php @@ -191,7 +191,8 @@ class HomeSliderPicturesController extends Controller $h->delete(); - return redirect()->route('bo.home-slider-pictures.index'); + return redirect()->route('bo.home-slider-pictures.index') + ->with('warning', 'Le contenu à bien été supprimé'); } public function changeOrder($id, $action) diff --git a/app/Http/Controllers/Bo/MeatTypesController.php b/app/Http/Controllers/Bo/MeatTypesController.php index e0b9fa56..2bf7af9b 100644 --- a/app/Http/Controllers/Bo/MeatTypesController.php +++ b/app/Http/Controllers/Bo/MeatTypesController.php @@ -52,6 +52,7 @@ class MeatTypesController extends Controller } $mt->delete(); - return redirect()->route('bo.meat-types.index'); + return redirect()->route('bo.meat-types.index') + ->with('warning', 'Le contenu à bien été supprimé'); } } diff --git a/app/Http/Controllers/Bo/MomentsController.php b/app/Http/Controllers/Bo/MomentsController.php index 3a44aa26..91822031 100644 --- a/app/Http/Controllers/Bo/MomentsController.php +++ b/app/Http/Controllers/Bo/MomentsController.php @@ -438,7 +438,8 @@ class MomentsController extends Controller $m->delete(); - return redirect()->route('bo.moments.index'); + return redirect()->route('bo.moments.index') + ->with('warning', 'Le contenu à bien été supprimé'); } /** diff --git a/app/Http/Controllers/Bo/NewsSliderPicturesController.php b/app/Http/Controllers/Bo/NewsSliderPicturesController.php index 56d729f4..fe92ce58 100644 --- a/app/Http/Controllers/Bo/NewsSliderPicturesController.php +++ b/app/Http/Controllers/Bo/NewsSliderPicturesController.php @@ -115,7 +115,8 @@ class NewsSliderPicturesController extends Controller $n->delete(); - return redirect()->route('bo.news-slider-pictures.index'); + return redirect()->route('bo.news-slider-pictures.index') + ->with('warning', 'Le contenu à bien été supprimé'); } public function changeOrder($id, $action) diff --git a/app/Http/Controllers/Bo/OCBBreedersController.php b/app/Http/Controllers/Bo/OCBBreedersController.php index 3370e89c..8296c2af 100644 --- a/app/Http/Controllers/Bo/OCBBreedersController.php +++ b/app/Http/Controllers/Bo/OCBBreedersController.php @@ -125,6 +125,7 @@ class OCBBreedersController extends Controller public function destroy(OCBBreeder $b) { $b->delete(); - return redirect()->route('bo.ocbbreeders.index', $b->ocbType); + return redirect()->route('bo.ocbbreeders.index', $b->ocbType) + ->with('warning', 'Le contenu à bien été supprimé'); } } diff --git a/app/Http/Controllers/Bo/OCBContentController.php b/app/Http/Controllers/Bo/OCBContentController.php index 0c7cfad6..d2f9b2d3 100644 --- a/app/Http/Controllers/Bo/OCBContentController.php +++ b/app/Http/Controllers/Bo/OCBContentController.php @@ -112,7 +112,8 @@ class OCBContentController extends Controller $ocb->delete(); - return redirect()->route('bo.ocb.content', $ocb->type); + return redirect()->route('bo.ocb.content', $ocb->type) + ->with('warning', 'Le contenu à bien été supprimé'); } public function changeOrder(OCBContent $current, $action) diff --git a/app/Http/Controllers/Bo/ProductPictogramsController.php b/app/Http/Controllers/Bo/ProductPictogramsController.php index ac1d5eb0..12fb2dc6 100644 --- a/app/Http/Controllers/Bo/ProductPictogramsController.php +++ b/app/Http/Controllers/Bo/ProductPictogramsController.php @@ -80,6 +80,7 @@ class ProductPictogramsController extends Controller } $pp->delete(); - return redirect()->route('bo.product-pictograms.index'); + return redirect()->route('bo.product-pictograms.index') + ->with('warning', 'Le contenu à bien été supprimé'); } } diff --git a/app/Http/Controllers/Bo/ProductSliderPicturesController.php b/app/Http/Controllers/Bo/ProductSliderPicturesController.php index 49e6ed01..2b3feaa6 100644 --- a/app/Http/Controllers/Bo/ProductSliderPicturesController.php +++ b/app/Http/Controllers/Bo/ProductSliderPicturesController.php @@ -147,7 +147,8 @@ class ProductSliderPicturesController extends Controller $p->delete(); - return redirect()->route('bo.product-slider-pictures.index'); + return redirect()->route('bo.product-slider-pictures.index') + ->with('warning', 'Le contenu à bien été supprimé'); } public function changeOrder($id, $action) diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index b125ec15..b298c30b 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -441,7 +441,8 @@ class ProductsController extends Controller ->withErrors('Le produit que vous souhaitez supprimer est encore lié à une ou plusieurs recette(s).'); } - return redirect()->route('bo.products.index'); + return redirect()->route('bo.products.index') + ->with('warning', 'Le contenu à bien été supprimé'); } public function changeOrder($id, $action) diff --git a/app/Http/Controllers/Bo/RangesController.php b/app/Http/Controllers/Bo/RangesController.php index c3e44894..500e9217 100644 --- a/app/Http/Controllers/Bo/RangesController.php +++ b/app/Http/Controllers/Bo/RangesController.php @@ -146,7 +146,8 @@ class RangesController extends Controller $r->delete(); - return redirect()->route('bo.ranges.index'); + return redirect()->route('bo.ranges.index') + ->with('warning', 'Le contenu à bien été supprimé'); } public function changeOrder($id, $action) diff --git a/app/Http/Controllers/Bo/RecipesController.php b/app/Http/Controllers/Bo/RecipesController.php index 6573da90..435a34bf 100644 --- a/app/Http/Controllers/Bo/RecipesController.php +++ b/app/Http/Controllers/Bo/RecipesController.php @@ -153,7 +153,8 @@ class RecipesController extends Controller $r->notifiable()->delete(); $r->delete(); - return redirect()->route('bo.recipes.index'); + return redirect()->route('bo.recipes.index') + ->with('warning', 'Le contenu à bien été supprimé'); } public function highlights() diff --git a/package-lock.json b/package-lock.json index ec589639..ca188801 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,6 +45,7 @@ "resolve-url-loader": "^3.1.4", "sass": "1.32.*", "sass-loader": "^8.0.2", + "sweetalert2": "^11.1.5", "vue": "^2.6.14", "vue-loader": "^15.9.8", "vue-template-compiler": "^2.6.14" @@ -9562,6 +9563,15 @@ "node": ">=10.13.0" } }, + "node_modules/sweetalert2": { + "version": "11.1.5", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.1.5.tgz", + "integrity": "sha512-5cfqUK9lLbvxtjzsvORKWj+d3tcgYlzsL60FoJFXE/+mtMa5EJ3tDax9p9MBjVnZ60gQd+WGrqDIrxoNenhUjA==", + "dev": true, + "funding": { + "url": "https://sweetalert2.github.io/#donations" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -17985,6 +17995,12 @@ "stable": "^0.1.8" } }, + "sweetalert2": { + "version": "11.1.5", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.1.5.tgz", + "integrity": "sha512-5cfqUK9lLbvxtjzsvORKWj+d3tcgYlzsL60FoJFXE/+mtMa5EJ3tDax9p9MBjVnZ60gQd+WGrqDIrxoNenhUjA==", + "dev": true + }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", diff --git a/package.json b/package.json index 9dec5f04..8d15fcf5 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "resolve-url-loader": "^3.1.4", "sass": "1.32.*", "sass-loader": "^8.0.2", + "sweetalert2": "^11.1.5", "vue": "^2.6.14", "vue-loader": "^15.9.8", "vue-template-compiler": "^2.6.14" diff --git a/resources/js/app.js b/resources/js/app.js index d2f3b4e0..e4e840cd 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -10,6 +10,40 @@ require('vue-select-image/dist/vue-select-image.css'); window.Vue = require('vue/dist/vue.min.js'); import CKEditor from '@ckeditor/ckeditor5-vue2'; import VueSelectImage from 'vue-select-image'; +// ES6 Modules or TypeScript +import Swal from 'sweetalert2'; + +// bootstrap styling +window.Swal = Swal.mixin({ + customClass: { + confirmButton: 'btn btn-lg btn-success ml-3 mr-3', + cancelButton: 'btn btn-lg btn-danger ml-3 mr-3' + }, + buttonsStyling: false +}) + +// register modules +let modules = require.context("./modules", true, /\.js$/i); +window.confirmJS = modules('./confirm.js').default.methods.confirm + +$(document).ready(function () { + $('.confirmDeleteJS').on('submit', function (e) { + e.preventDefault(); + confirmJS( + 'Confirmez', + 'Voulez-vous vraiment supprimer cet élément ?', + this, + function (response) { + this.submit() + }, + { + 'icon': 'error' + } + ) + return false + }) +}) + Vue.use( CKEditor ); Vue.use( VueSelectImage ) diff --git a/resources/js/modules/confirm.js b/resources/js/modules/confirm.js new file mode 100644 index 00000000..bfdc00f6 --- /dev/null +++ b/resources/js/modules/confirm.js @@ -0,0 +1,37 @@ +export default { + methods: { + confirm(title, text = '', self, after, options = {}) { + if (!self) { + throw Error('self is needed to set "this" on callback'); + } + if (!after) { + throw Error('callback is needed when using confirm'); + } + let icon = options.icon ?? 'warning' + let confirm = options.confirm ?? 'Oui' + let cancel = options.confirm ?? 'Annuler' + Swal.fire({ + title: title, + text: text, + icon: icon, + showCancelButton: true, + confirmButtonText: confirm, + cancelButtonText: cancel, + reverseButtons: true + }).then((result) => { + if (result.isConfirmed) { + if (after) { + after.apply(self, [result]) + } + } else if ( + /* Read more about handling dismissals below */ + result.dismiss === Swal.DismissReason.cancel + ) { + Swal.fire('L\'opération n\'as pas été effectuée') + } + }) + return false; + } + }, +} + diff --git a/resources/views/bo/ads/create.blade.php b/resources/views/bo/ads/create.blade.php index 79ab3da9..237a4509 100644 --- a/resources/views/bo/ads/create.blade.php +++ b/resources/views/bo/ads/create.blade.php @@ -12,15 +12,6 @@ @csrf
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
diff --git a/resources/views/bo/ads/edit.blade.php b/resources/views/bo/ads/edit.blade.php index dc3d1b0f..22d1ba22 100644 --- a/resources/views/bo/ads/edit.blade.php +++ b/resources/views/bo/ads/edit.blade.php @@ -5,11 +5,10 @@
Saga publicitaire Retour -
+ @method('DELETE') @csrf - +
@@ -19,20 +18,6 @@ @csrf
- @if (session('success')) -
- {{ session('success') }} -
- @endif - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
diff --git a/resources/views/bo/articles/create.blade.php b/resources/views/bo/articles/create.blade.php index 4be610dc..a4a853b6 100644 --- a/resources/views/bo/articles/create.blade.php +++ b/resources/views/bo/articles/create.blade.php @@ -13,20 +13,6 @@ @csrf
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - @if (session('success')) -
- {{ session('success') }} -
- @endif
diff --git a/resources/views/bo/articles/edit.blade.php b/resources/views/bo/articles/edit.blade.php index 44c55447..579abd7a 100644 --- a/resources/views/bo/articles/edit.blade.php +++ b/resources/views/bo/articles/edit.blade.php @@ -5,11 +5,10 @@
Modification d'un article Retour -
+ @method('DELETE') @csrf - +
@@ -19,20 +18,6 @@ @csrf
- @if (session('success')) -
- {{ session('success') }} -
- @endif - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
diff --git a/resources/views/bo/balanced-menus/create.blade.php b/resources/views/bo/balanced-menus/create.blade.php index e12c3d1e..17e36149 100644 --- a/resources/views/bo/balanced-menus/create.blade.php +++ b/resources/views/bo/balanced-menus/create.blade.php @@ -13,15 +13,6 @@ @csrf
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
+
@@ -18,20 +18,6 @@ @csrf
- @if (session('success')) -
- {{ session('success') }} -
- @endif - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
diff --git a/resources/views/bo/breederportraits/edit.blade.php b/resources/views/bo/breederportraits/edit.blade.php index 52673b89..c4dd1073 100644 --- a/resources/views/bo/breederportraits/edit.blade.php +++ b/resources/views/bo/breederportraits/edit.blade.php @@ -7,10 +7,10 @@
{{__('Modification d\'un portait d\'éleveur') }} {{__('Retour') }} -
+ @method('DELETE') @csrf - +
@@ -20,20 +20,6 @@ @csrf
- @if (session('success')) -
- {{ session('success') }} -
- @endif - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif @include('bo.breederportraits.formInputs')
diff --git a/resources/views/bo/consumption-times/edit.blade.php b/resources/views/bo/consumption-times/edit.blade.php index 6d804654..58ac0ec3 100644 --- a/resources/views/bo/consumption-times/edit.blade.php +++ b/resources/views/bo/consumption-times/edit.blade.php @@ -5,10 +5,10 @@
Moments Consommations Retour -
+ @method('DELETE') @csrf - +
@@ -18,11 +18,6 @@ @csrf
- @if (session('success')) -
- {{ session('success') }} -
- @endif
diff --git a/resources/views/bo/engagements/edit.blade.php b/resources/views/bo/engagements/edit.blade.php index a9ca6c68..0d4824eb 100644 --- a/resources/views/bo/engagements/edit.blade.php +++ b/resources/views/bo/engagements/edit.blade.php @@ -13,20 +13,6 @@ @csrf
- @if (session()->has('success')) -
- {{ session()->get('success') }} -
- @endif - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif @include('bo.engagements.form-inputs')
diff --git a/resources/views/bo/faq-questions/create.blade.php b/resources/views/bo/faq-questions/create.blade.php index f75ee3f8..f633fea2 100644 --- a/resources/views/bo/faq-questions/create.blade.php +++ b/resources/views/bo/faq-questions/create.blade.php @@ -13,15 +13,6 @@ @csrf
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
diff --git a/resources/views/bo/faq-questions/edit.blade.php b/resources/views/bo/faq-questions/edit.blade.php index c903a834..009e3e6f 100644 --- a/resources/views/bo/faq-questions/edit.blade.php +++ b/resources/views/bo/faq-questions/edit.blade.php @@ -5,11 +5,10 @@
Modification d'une question Retour -
+ @method('DELETE') @csrf - +
@@ -19,20 +18,6 @@ @csrf
- @if (session('success')) -
- {{ session('success') }} -
- @endif - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
diff --git a/resources/views/bo/faq-themes/create.blade.php b/resources/views/bo/faq-themes/create.blade.php index b631d329..b58b6d1c 100644 --- a/resources/views/bo/faq-themes/create.blade.php +++ b/resources/views/bo/faq-themes/create.blade.php @@ -13,15 +13,6 @@ @csrf
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
diff --git a/resources/views/bo/faq-themes/edit.blade.php b/resources/views/bo/faq-themes/edit.blade.php index 211fdf9d..27613d92 100644 --- a/resources/views/bo/faq-themes/edit.blade.php +++ b/resources/views/bo/faq-themes/edit.blade.php @@ -5,11 +5,10 @@
Modification d'un thème Retour -
+ @method('DELETE') @csrf - +
@@ -19,20 +18,6 @@ @csrf
- @if (session('success')) -
- {{ session('success') }} -
- @endif - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
diff --git a/resources/views/bo/home-slider-pictures/create.blade.php b/resources/views/bo/home-slider-pictures/create.blade.php index 905b3be8..d33b2a20 100644 --- a/resources/views/bo/home-slider-pictures/create.blade.php +++ b/resources/views/bo/home-slider-pictures/create.blade.php @@ -8,15 +8,6 @@
@csrf - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif
  • Champs généraux
    • diff --git a/resources/views/bo/home-slider-pictures/edit.blade.php b/resources/views/bo/home-slider-pictures/edit.blade.php index ed48d6b4..fd982dcb 100644 --- a/resources/views/bo/home-slider-pictures/edit.blade.php +++ b/resources/views/bo/home-slider-pictures/edit.blade.php @@ -5,11 +5,10 @@
    Modification d'une slide pour l'accueil Retour - + @method('DELETE') @csrf - +
    @@ -17,20 +16,6 @@
    @method('PUT') @csrf - @if (session('success')) -
    - {{ session('success') }} -
    - @endif - @if ($errors->any()) -
    -
      - @foreach ($errors->all() as $error) -
    • {{ $error }}
      • - @endforeach -
    -
    - @endif
    • Champs généraux
      • diff --git a/resources/views/bo/meat-types/edit.blade.php b/resources/views/bo/meat-types/edit.blade.php index 3b79c0ac..738fd9e5 100644 --- a/resources/views/bo/meat-types/edit.blade.php +++ b/resources/views/bo/meat-types/edit.blade.php @@ -5,10 +5,10 @@
      Types de viande Retour - + @method('DELETE') @csrf - +
      diff --git a/resources/views/bo/modules/flashMessage.blade.php b/resources/views/bo/modules/flashMessage.blade.php new file mode 100644 index 00000000..3b119962 --- /dev/null +++ b/resources/views/bo/modules/flashMessage.blade.php @@ -0,0 +1,53 @@ +@if ($message = Session::get('success')) + +@endif + +@if ($message = Session::get('error')) + +@endif + + +@if ($message = Session::get('warning')) + +@endif + + +@if ($message = Session::get('info')) + +@endif + + +@if ($errors->any()) + +@endif diff --git a/resources/views/bo/moments/create.blade.php b/resources/views/bo/moments/create.blade.php index fcfde1b2..aaadfb6e 100644 --- a/resources/views/bo/moments/create.blade.php +++ b/resources/views/bo/moments/create.blade.php @@ -29,15 +29,6 @@
      @csrf - @if ($errors->any()) -
      -
        - @foreach ($errors->all() as $error) -
      • {{ $error }}
        • - @endforeach -
      -
      - @endif
      • Champs généraux
        • diff --git a/resources/views/bo/moments/edit.blade.php b/resources/views/bo/moments/edit.blade.php index d726e45d..a1d0f7c4 100644 --- a/resources/views/bo/moments/edit.blade.php +++ b/resources/views/bo/moments/edit.blade.php @@ -25,31 +25,16 @@
        Modification d'un moment Retour - + @method('DELETE') @csrf - +
        @method('PUT') @csrf - @if (session('success')) -
        - {{ session('success') }} -
        - @endif - @if ($errors->any()) -
        -
          - @foreach ($errors->all() as $error) -
        • {{ $error }}
          • - @endforeach -
        -
        - @endif
        • Champs généraux
          • diff --git a/resources/views/bo/news-slider-pictures/create.blade.php b/resources/views/bo/news-slider-pictures/create.blade.php index 32a17d8a..82b3ec49 100644 --- a/resources/views/bo/news-slider-pictures/create.blade.php +++ b/resources/views/bo/news-slider-pictures/create.blade.php @@ -8,15 +8,6 @@
          @csrf - @if ($errors->any()) -
          -
            - @foreach ($errors->all() as $error) -
          • {{ $error }}
            • - @endforeach -
          -
          - @endif
          • Champs généraux
            • diff --git a/resources/views/bo/news-slider-pictures/edit.blade.php b/resources/views/bo/news-slider-pictures/edit.blade.php index 025ac480..7cc17441 100644 --- a/resources/views/bo/news-slider-pictures/edit.blade.php +++ b/resources/views/bo/news-slider-pictures/edit.blade.php @@ -5,30 +5,15 @@
            Modification d'une slide pour les actualités Retour - + @method('DELETE') @csrf - +
            @method('PUT') @csrf - @if (session('success')) -
            - {{ session('success') }} -
            - @endif - @if ($errors->any()) -
            -
              - @foreach ($errors->all() as $error) -
            • {{ $error }}
              • - @endforeach -
            -
            - @endif
            • Champs généraux
              • diff --git a/resources/views/bo/ocb/create.blade.php b/resources/views/bo/ocb/create.blade.php index bf35cccd..348165ff 100644 --- a/resources/views/bo/ocb/create.blade.php +++ b/resources/views/bo/ocb/create.blade.php @@ -13,15 +13,6 @@ @csrf
              - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif

              diff --git a/resources/views/bo/ocb/edit.blade.php b/resources/views/bo/ocb/edit.blade.php index 8069bcd4..d502d699 100644 --- a/resources/views/bo/ocb/edit.blade.php +++ b/resources/views/bo/ocb/edit.blade.php @@ -5,11 +5,10 @@
              Modification d'un contenu Retour - + @method('DELETE') @csrf - +
              @@ -19,20 +18,6 @@ @csrf
              - @if (session('success')) -
              - {{ session('success') }} -
              - @endif - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif

              diff --git a/resources/views/bo/ocbbreeders/create.blade.php b/resources/views/bo/ocbbreeders/create.blade.php index 51ea0c96..73a6014a 100644 --- a/resources/views/bo/ocbbreeders/create.blade.php +++ b/resources/views/bo/ocbbreeders/create.blade.php @@ -12,15 +12,6 @@ @csrf
              - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif @include('bo.ocbbreeders.formInputs')
              diff --git a/resources/views/bo/ocbbreeders/edit.blade.php b/resources/views/bo/ocbbreeders/edit.blade.php index 2094a724..55c4dd01 100644 --- a/resources/views/bo/ocbbreeders/edit.blade.php +++ b/resources/views/bo/ocbbreeders/edit.blade.php @@ -5,10 +5,10 @@
              {{__('Modification d\'un éleveur') }} - {{ $type->label }} {{__('Retour') }} -
              + @method('DELETE') @csrf - +
              @@ -18,20 +18,6 @@ @csrf
              - @if (session('success')) -
              - {{ session('success') }} -
              - @endif - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif @include('bo.ocbbreeders.formInputs')
              diff --git a/resources/views/bo/product-pictograms/create.blade.php b/resources/views/bo/product-pictograms/create.blade.php index cadc43f4..23e13074 100644 --- a/resources/views/bo/product-pictograms/create.blade.php +++ b/resources/views/bo/product-pictograms/create.blade.php @@ -12,15 +12,6 @@ @csrf
              - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif
              diff --git a/resources/views/bo/product-pictograms/edit.blade.php b/resources/views/bo/product-pictograms/edit.blade.php index 75da723c..e4f7657c 100644 --- a/resources/views/bo/product-pictograms/edit.blade.php +++ b/resources/views/bo/product-pictograms/edit.blade.php @@ -5,10 +5,10 @@
              Pictogrammes produits Retour -
              + @method('DELETE') @csrf - +
              @@ -18,20 +18,6 @@ @csrf
              - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif - @if (session('success')) -
              - {{ session('success') }} -
              - @endif
              diff --git a/resources/views/bo/product-slider-pictures/create.blade.php b/resources/views/bo/product-slider-pictures/create.blade.php index b49771e9..c46098b4 100644 --- a/resources/views/bo/product-slider-pictures/create.blade.php +++ b/resources/views/bo/product-slider-pictures/create.blade.php @@ -12,15 +12,6 @@ @csrf
              - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif
              diff --git a/resources/views/bo/product-slider-pictures/edit.blade.php b/resources/views/bo/product-slider-pictures/edit.blade.php index 2a53897f..82e801a7 100644 --- a/resources/views/bo/product-slider-pictures/edit.blade.php +++ b/resources/views/bo/product-slider-pictures/edit.blade.php @@ -5,11 +5,10 @@
              Modification d'une slide pour les produits Retour -
              + @method('DELETE') @csrf - +
              @@ -17,22 +16,8 @@
              @method('PUT') @csrf - @if (session('success')) -
              - {{ session('success') }} -
              - @endif
              - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif
              diff --git a/resources/views/bo/products/edit.blade.php b/resources/views/bo/products/edit.blade.php index 0a680d72..c06330d5 100644 --- a/resources/views/bo/products/edit.blade.php +++ b/resources/views/bo/products/edit.blade.php @@ -6,10 +6,10 @@ Modification d'un produit Retour Voir le produit - + @method('DELETE') @csrf - +
              diff --git a/resources/views/bo/ranges/create.blade.php b/resources/views/bo/ranges/create.blade.php index b289d1a3..0eb5925c 100644 --- a/resources/views/bo/ranges/create.blade.php +++ b/resources/views/bo/ranges/create.blade.php @@ -12,15 +12,6 @@ @csrf
              - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif
              diff --git a/resources/views/bo/ranges/edit.blade.php b/resources/views/bo/ranges/edit.blade.php index b441a519..0e4fa510 100644 --- a/resources/views/bo/ranges/edit.blade.php +++ b/resources/views/bo/ranges/edit.blade.php @@ -5,11 +5,10 @@
              Gammes Retour -
              + @method('DELETE') @csrf - +
              diff --git a/resources/views/bo/recipes/create.blade.php b/resources/views/bo/recipes/create.blade.php index 76795dda..e09f7e5a 100644 --- a/resources/views/bo/recipes/create.blade.php +++ b/resources/views/bo/recipes/create.blade.php @@ -13,15 +13,6 @@ @csrf
              - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif @if (session('success'))
              {{ session('success') }} diff --git a/resources/views/bo/recipes/edit.blade.php b/resources/views/bo/recipes/edit.blade.php index dce2f68d..f85cacfc 100644 --- a/resources/views/bo/recipes/edit.blade.php +++ b/resources/views/bo/recipes/edit.blade.php @@ -5,10 +5,10 @@
              Modification d'une recette Retour -
              + @method('DELETE') @csrf - +
              @@ -18,20 +18,6 @@ @csrf
              - @if (session()->has('success')) -
              - {{ session()->get('success') }} -
              - @endif - @if ($errors->any()) -
              -
                - @foreach ($errors->all() as $error) -
              • {{ $error }}
                • - @endforeach -
              -
              - @endif @include('bo.recipes.form-inputs')
              diff --git a/resources/views/layouts/bo.blade.php b/resources/views/layouts/bo.blade.php index 6024e763..d97b5166 100644 --- a/resources/views/layouts/bo.blade.php +++ b/resources/views/layouts/bo.blade.php @@ -193,6 +193,7 @@
              + @include('bo.modules.flashMessage') @yield('content')