From ed9d3ee6edeb1a9b1349258f442936a878765876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Wed, 29 Sep 2021 12:46:52 +0200
Subject: [PATCH] remove modules-error to userflashMesssage rework layout

---
 resources/views/layout/app.blade.php          |  7 +++-
 .../views/modules/error-messages.blade.php    | 14 --------
 resources/views/ticket/create.blade.php       | 26 ++++++--------
 resources/views/ticket/edit.blade.php         | 34 ++++++++-----------
 resources/views/ticket/form-inputs.blade.php  |  1 -
 5 files changed, 32 insertions(+), 50 deletions(-)
 delete mode 100644 resources/views/modules/error-messages.blade.php

diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php
index 04f4bb5..2bba5b5 100644
--- a/resources/views/layout/app.blade.php
+++ b/resources/views/layout/app.blade.php
@@ -28,7 +28,12 @@
     @include('layout.nav')
     <div id="app" class="content mt-5">
         <div class="container container-xxl">
-            @yield('content')
+            <div class="row justify-content-center">
+                <div class="col-12 @yield('bodyClass')">
+                    @include('modules.flashMessage')
+                    @yield('content')
+                </div>
+            </div>
         </div>
     </div>
     @include('layout.footer')
diff --git a/resources/views/modules/error-messages.blade.php b/resources/views/modules/error-messages.blade.php
deleted file mode 100644
index a8d92e1..0000000
--- a/resources/views/modules/error-messages.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@if ($errors->any())
-    <div class="alert alert-danger">
-        <ul>
-            @foreach ($errors->all() as $error)
-                <li>{!! $error !!}</li>
-            @endforeach
-        </ul>
-    </div>
-@endif
-@if(session('warning'))
-<div class="alert alert-warning">
-    {{ session('warning') }}
-</div>
-@endif
diff --git a/resources/views/ticket/create.blade.php b/resources/views/ticket/create.blade.php
index cc643e6..b32cd72 100644
--- a/resources/views/ticket/create.blade.php
+++ b/resources/views/ticket/create.blade.php
@@ -1,24 +1,20 @@
 @extends('layout.app')
 
+@section('bodyClass', 'col-md-8')
+
 @section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">Créer un ticket<a href="{{ route('home') }}" class="float-end btn btn-sm btn-primary">Retour</a></div>
-                <div class="card-body">
-                    <form method="POST" action="{{ route('ticket.store') }}" enctype="multipart/form-data">
-                        @csrf
+<div class="card">
+    <div class="card-header">Créer un ticket<a href="{{ route('home') }}" class="float-end btn btn-sm btn-primary">Retour</a></div>
+    <div class="card-body">
+        <form method="POST" action="{{ route('ticket.store') }}" enctype="multipart/form-data">
+            @csrf
 
-                        @include('ticket.form-inputs')
+            @include('ticket.form-inputs')
 
-                        <div class="form-group text-center">
-                            <input type="submit" class="btn btn-primary" value="Enregistrer">
-                        </div>
-                    </form>
-                </div>
+            <div class="form-group text-center">
+                <input type="submit" class="btn btn-primary" value="Enregistrer">
             </div>
-        </div>
+        </form>
     </div>
 </div>
 @endsection
diff --git a/resources/views/ticket/edit.blade.php b/resources/views/ticket/edit.blade.php
index 19bed6f..7462cbe 100644
--- a/resources/views/ticket/edit.blade.php
+++ b/resources/views/ticket/edit.blade.php
@@ -1,28 +1,24 @@
 @extends('layout.app')
 
+@section('bodyClass', 'col-md-8')
+
 @section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">Modifier un ticket<a href="{{ route('home') }}" class="float-end btn btn-sm btn-primary">Retour</a></div>
-                <div class="card-body">
-                    <form method="POST" action="{{ route('ticket.update', $ticket->id) }}" enctype="multipart/form-data">
-                        @csrf
-                        @method('PUT')
-                        @if (session('success'))
-                        <div class="alert alert-success">{!! session('success') !!}</div>
-                        @endif
+<div class="card">
+    <div class="card-header">Modifier un ticket<a href="{{ route('home') }}" class="float-end btn btn-sm btn-primary">Retour</a></div>
+    <div class="card-body">
+        <form method="POST" action="{{ route('ticket.update', $ticket->id) }}" enctype="multipart/form-data">
+            @csrf
+            @method('PUT')
+            @if (session('success'))
+            <div class="alert alert-success">{!! session('success') !!}</div>
+            @endif
 
-                        @include('ticket.form-inputs')
+            @include('ticket.form-inputs')
 
-                        <div class="form-group text-center">
-                            <input type="submit" class="btn btn-primary" value="Modifier">
-                        </div>
-                    </form>
-                </div>
+            <div class="form-group text-center">
+                <input type="submit" class="btn btn-primary" value="Modifier">
             </div>
-        </div>
+        </form>
     </div>
 </div>
 @endsection
diff --git a/resources/views/ticket/form-inputs.blade.php b/resources/views/ticket/form-inputs.blade.php
index 009f581..256db94 100644
--- a/resources/views/ticket/form-inputs.blade.php
+++ b/resources/views/ticket/form-inputs.blade.php
@@ -1,4 +1,3 @@
-@include('modules.error-messages')
 @php
 $userPr = Auth::user()->sites ?? collect([]);
 @endphp