From 87867746aa43a65d73740aa2af90526e5c439205 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Sat, 30 Dec 2017 12:53:16 -0600
Subject: [PATCH] cleanup creation templates

---
 .../Controllers/Admin/AirlinesController.php  |  9 ++++---
 .../views/admin/airlines/create.blade.php     | 22 +++++-----------
 resources/views/admin/fares/create.blade.php  | 22 +++++-----------
 .../views/admin/flash/check_error.blade.php   |  6 +++++
 resources/views/admin/flash/message.blade.php |  4 +--
 .../views/admin/flights/create.blade.php      |  6 ++---
 .../views/admin/pirep_fields/create.blade.php | 22 +++++-----------
 resources/views/admin/ranks/create.blade.php  | 19 +++++---------
 .../views/admin/subfleets/create.blade.php    | 24 +++++------------
 resources/views/admin/users/create.blade.php  | 26 +++++--------------
 10 files changed, 56 insertions(+), 104 deletions(-)
 create mode 100644 resources/views/admin/flash/check_error.blade.php

diff --git a/app/Http/Controllers/Admin/AirlinesController.php b/app/Http/Controllers/Admin/AirlinesController.php
index f4ce4086..599ab380 100644
--- a/app/Http/Controllers/Admin/AirlinesController.php
+++ b/app/Http/Controllers/Admin/AirlinesController.php
@@ -2,13 +2,14 @@
 
 namespace App\Http\Controllers\Admin;
 
+use Flash;
+use Response;
+use Illuminate\Http\Request;
+use Prettus\Repository\Criteria\RequestCriteria;
+
 use App\Http\Requests\CreateAirlineRequest;
 use App\Http\Requests\UpdateAirlineRequest;
 use App\Repositories\AirlineRepository;
-use Illuminate\Http\Request;
-use Flash;
-use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
 
 class AirlinesController extends BaseController
 {
diff --git a/resources/views/admin/airlines/create.blade.php b/resources/views/admin/airlines/create.blade.php
index 08524876..314e0eda 100644
--- a/resources/views/admin/airlines/create.blade.php
+++ b/resources/views/admin/airlines/create.blade.php
@@ -1,22 +1,12 @@
 @extends('admin.app')
-@section('title', 'Airlines')
+@section('title', 'Add Airline')
 @section('content')
-    <section class="content-header">
-        <h1>Airlines</h1>
-    </section>
-    <div class="content">
+    <div class="card border-blue-bottom">
+        <div class="content">
         @include('admin.flash.message')
-        <div class="box box-primary">
-
-            <div class="box-body">
-                <div class="row">
-                    {!! Form::open(['route' => 'admin.airlines.store']) !!}
-
-                        @include('admin.airlines.fields')
-
-                    {!! Form::close() !!}
-                </div>
-            </div>
+            {!! Form::open(['route' => 'admin.airlines.store']) !!}
+             @include('admin.airlines.fields')
+            {!! Form::close() !!}
         </div>
     </div>
 @endsection
diff --git a/resources/views/admin/fares/create.blade.php b/resources/views/admin/fares/create.blade.php
index b338d013..3908c2e6 100644
--- a/resources/views/admin/fares/create.blade.php
+++ b/resources/views/admin/fares/create.blade.php
@@ -1,22 +1,12 @@
 @extends('admin.app')
-
+@section('title', 'Add Fare')
 @section('content')
-    <section class="content-header">
-        <h1>Fare</h1>
-    </section>
-    <div class="content">
+    <div class="card border-blue-bottom">
+        <div class="content">
         @include('admin.flash.message')
-        <div class="box box-primary">
-
-            <div class="box-body">
-                <div class="row">
-                    {!! Form::open(['route' => 'admin.fares.store']) !!}
-
-                        @include('admin.fares.fields')
-
-                    {!! Form::close() !!}
-                </div>
-            </div>
+            {!! Form::open(['route' => 'admin.fares.store']) !!}
+            @include('admin.fares.fields')
+            {!! Form::close() !!}
         </div>
     </div>
 @endsection
diff --git a/resources/views/admin/flash/check_error.blade.php b/resources/views/admin/flash/check_error.blade.php
new file mode 100644
index 00000000..ac154f9c
--- /dev/null
+++ b/resources/views/admin/flash/check_error.blade.php
@@ -0,0 +1,6 @@
+@if($errors->has($field))
+    <p class="text-danger" style="margin-top: 10px;">{!! $errors->first($field); !!}</p>
+{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+    {!! $errors->first($field); !!}
+</div>--}}
+@endif
diff --git a/resources/views/admin/flash/message.blade.php b/resources/views/admin/flash/message.blade.php
index f21e829a..894e8e60 100644
--- a/resources/views/admin/flash/message.blade.php
+++ b/resources/views/admin/flash/message.blade.php
@@ -1,10 +1,10 @@
-@foreach (session('flash_notification', collect())->toArray() as $message)
+@foreach ($errors->all() as $message)
 <div class="alert alert-danger" role="alert">
     <div class="container">
         <div class="alert-icon">
             <i class="now-ui-icons ui-2_like"></i>
         </div>
-        {!! $message['message'] !!}
+        {!! $message !!}
     </div>
 </div>
 @endforeach
diff --git a/resources/views/admin/flights/create.blade.php b/resources/views/admin/flights/create.blade.php
index de047954..d3b041c8 100644
--- a/resources/views/admin/flights/create.blade.php
+++ b/resources/views/admin/flights/create.blade.php
@@ -1,9 +1,9 @@
 @extends('admin.app')
-@section('title', 'Edit Flight')
+@section('title', 'Add Flight')
 @section('content')
-    <div class="card  border-blue-bottom">
-        @include('admin.flash.message')
+    <div class="card border-blue-bottom">
         <div class="content">
+        @include('admin.flash.message')
             {!! Form::model($flight, ['route' => ['admin.flights.store']]) !!}
                 @include('admin.flights.fields')
             {!! Form::close() !!}
diff --git a/resources/views/admin/pirep_fields/create.blade.php b/resources/views/admin/pirep_fields/create.blade.php
index 2a468fc9..b238786c 100644
--- a/resources/views/admin/pirep_fields/create.blade.php
+++ b/resources/views/admin/pirep_fields/create.blade.php
@@ -1,20 +1,12 @@
 @extends('admin.app')
-
+@section('title', 'Add PIREP Field')
 @section('content')
-    <section class="content-header">
-        <h1>Add PIREP Field</h1>
-    </section>
-    <div class="content">
-        @include('admin.flash.message')
-        <div class="box box-primary">
-
-            <div class="box-body">
-                <div class="row">
-                    {!! Form::open(['route' => 'admin.pirepfields.store']) !!}
-                        @include('admin.pirep_fields.fields')
-                    {!! Form::close() !!}
-                </div>
-            </div>
+    <div class="card border-blue-bottom">
+        <div class="content">
+            @include('admin.flash.message')
+            {!! Form::open(['route' => 'admin.pirepfields.store']) !!}
+                @include('admin.pirep_fields.fields')
+            {!! Form::close() !!}
         </div>
     </div>
 @endsection
diff --git a/resources/views/admin/ranks/create.blade.php b/resources/views/admin/ranks/create.blade.php
index d1fdf4cc..684b22dc 100644
--- a/resources/views/admin/ranks/create.blade.php
+++ b/resources/views/admin/ranks/create.blade.php
@@ -1,17 +1,12 @@
 @extends('admin.app')
+@section('Add Rank')
 @section('content')
-<section class="content-header"><h1>Rank</h1></section>
-<div class="content">
-    @include('admin.flash.message')
-    <div class="box box-primary">
-
-        <div class="box-body">
-            <div class="row">
-                {!! Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) !!}
-                    @include('admin.ranks.fields')
-                {!! Form::close() !!}
-            </div>
-        </div>
+<div class="card border-blue-bottom">
+    <div class="content">
+        @include('admin.flash.message')
+        {!! Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) !!}
+            @include('admin.ranks.fields')
+        {!! Form::close() !!}
     </div>
 </div>
 @endsection
diff --git a/resources/views/admin/subfleets/create.blade.php b/resources/views/admin/subfleets/create.blade.php
index 08cdfa40..ae2e59c0 100644
--- a/resources/views/admin/subfleets/create.blade.php
+++ b/resources/views/admin/subfleets/create.blade.php
@@ -1,22 +1,12 @@
 @extends('admin.app')
-
+@section('title', 'Add Subfleet')
 @section('content')
-    <section class="content-header">
-        <h1>Add Subfleet</h1>
-    </section>
-    <div class="content">
-        @include('admin.flash.message')
-        <div class="box box-primary">
-
-            <div class="box-body">
-                <div class="row">
-                    {!! Form::open(['route' => 'admin.subfleets.store']) !!}
-
-                        @include('admin.subfleets.fields')
-
-                    {!! Form::close() !!}
-                </div>
-            </div>
+    <div class="card border-blue-bottom">
+        <div class="content">
+            @include('admin.flash.message')
+            {!! Form::open(['route' => 'admin.subfleets.store']) !!}
+                @include('admin.subfleets.fields')
+            {!! Form::close() !!}
         </div>
     </div>
 @endsection
diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php
index 338a5818..739cbbbd 100644
--- a/resources/views/admin/users/create.blade.php
+++ b/resources/views/admin/users/create.blade.php
@@ -1,24 +1,12 @@
 @extends('admin.app')
-
+@section('title', 'Add User')
 @section('content')
-    <section class="content-header">
-        <h1>
-            Airlines
-        </h1>
-    </section>
-    <div class="content">
-        @include('admin.flash.message')
-        <div class="box box-primary">
-
-            <div class="box-body">
-                <div class="row">
-                    {!! Form::open(['route' => 'admin.airlines.store']) !!}
-
-                        @include('admin.airlines.fields')
-
-                    {!! Form::close() !!}
-                </div>
-            </div>
+    <div class="card border-blue-bottom">
+        <div class="content">
+            @include('admin.flash.message')
+            {!! Form::open(['route' => 'admin.airlines.store']) !!}
+                @include('admin.airlines.fields')
+            {!! Form::close() !!}
         </div>
     </div>
 @endsection