fixed admin route prefix problem and invalid validations

Makefile

@@ -20,6 +20,7 @@ install: db
 reset:
 	@rm database/testing.sqlite
 	@php artisan optimize
+	@php artisan route:clear
 	@php artisan config:clear
 	@sqlite3 database/testing.sqlite ""
 	@php artisan migrate:refresh --seed

app/Models/Aircraft.php

@@ -24,8 +24,8 @@ class Aircraft extends Model
             'aircraft_class_id',
             'icao',
             'name',
-            'full_name',
             'registration',
+            'tail_number',
             'active',
         ];
 
@@ -38,7 +38,6 @@ class Aircraft extends Model
         = [
             'icao'         => 'string',
             'name'         => 'string',
-            'full_name'    => 'string',
             'registration' => 'string',
             'active'       => 'boolean',
         ];
@@ -50,11 +49,9 @@ class Aircraft extends Model
      */
     public static $rules
         = [
-            'icao'         => 'required|max:4',
+            'icao'         => 'required|max:5',
             'name'         => 'required',
-            'full_name'    => 'required',
+            'active'       => '',
-            'registration' => 'required',
-            'active'       => 'default:1',
         ];
 
     /**

app/Models/Fare.php

@@ -53,7 +53,6 @@ class Fare extends Model
         = [
             'code' => 'required',
             'name' => 'required',
-            'cost' => 'default:0.0',
         ];
 
     public function aircraft() {

composer.json

@@ -21,7 +21,7 @@
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.0",
+        "phpunit/phpunit": "~5.7",
         "symfony/css-selector": "3.1.*",
         "symfony/dom-crawler": "3.1.*"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d6ded0be19cfd6b1fb37f7eeb6baadb4",
+    "content-hash": "e5d6a4a09e901eae8c895fe8c97979cc",
     "packages": [
         {
             "name": "barryvdh/laravel-ide-helper",

database/migrations/2017_06_09_010621_create_aircrafts_table.php

@@ -12,7 +12,6 @@ class CreateAircraftsTable extends Migration
             $table->integer('aircraft_class_id')->unsigned()->nullable();
             $table->string('icao');
             $table->string('name');
-            $table->string('full_name')->nullable();
             $table->string('registration')->nullable();
             $table->string('tail_number')->nullable();
             $table->string('cargo_capacity')->nullable();

resources/views/admin/aircraft/fields.blade.php

@@ -1,6 +1,6 @@
 <!-- ICAO Field -->
 <div class="form-group col-sm-6">
-    {!! Form::label('icao', 'ICAO:') !!}
+    {!! Form::label('icao', 'ICAO:') !!} (<a class="small" href="https://www.icao.int/publications/DOC8643/Pages/Search.aspx" target="_blank">find</a>)
     {!! Form::text('icao', null, ['class' => 'form-control']) !!}
 </div>
 
@@ -10,24 +10,24 @@
     {!! Form::text('name', null, ['class' => 'form-control']) !!}
 </div>
 
-<!-- Full Name Field -->
-<div class="form-group col-sm-6">
-    {!! Form::label('full_name', 'Full Name:') !!}
-    {!! Form::text('full_name', null, ['class' => 'form-control']) !!}
-</div>
-
 <!-- Registration Field -->
 <div class="form-group col-sm-6">
     {!! Form::label('registration', 'Registration:') !!}
     {!! Form::text('registration', null, ['class' => 'form-control']) !!}
 </div>
 
+<!-- Tail Number Field -->
+<div class="form-group col-sm-6">
+    {!! Form::label('tail_number', 'Tail Number:') !!}
+    {!! Form::text('tail_number', null, ['class' => 'form-control']) !!}
+</div>
+
 <!-- Active Field -->
 <div class="form-group col-sm-6">
     {!! Form::label('active', 'Active:') !!}
     <label class="checkbox-inline">
         {!! Form::hidden('active', false) !!}
-        {!! Form::checkbox('active', '1', null) !!} 1
+        {!! Form::checkbox('active', '1', true) !!}
     </label>
 </div>
 

resources/views/admin/aircraft/show_fields.blade.php

@@ -1,47 +1,35 @@
-<!-- Id Field -->
-<div class="form-group">
-    {!! Form::label('id', 'ID:') !!}
-    <p>{!! $aircraft->id !!}</p>
-</div>
-
 <!-- Icao Field -->
-<div class="form-group">
+<div class="form-group col-sm-6">
     {!! Form::label('icao', 'ICAO:') !!}
     <p>{!! $aircraft->icao !!}</p>
 </div>
 
 <!-- Name Field -->
-<div class="form-group">
+<div class="form-group col-sm-6">
     {!! Form::label('name', 'Name:') !!}
     <p>{!! $aircraft->name !!}</p>
 </div>
 
-<!-- Full Name Field -->
-<div class="form-group">
-    {!! Form::label('full_name', 'Full Name:') !!}
-    <p>{!! $aircraft->full_name !!}</p>
-</div>
-
 <!-- Registration Field -->
-<div class="form-group">
+<div class="form-group col-sm-6">
     {!! Form::label('registration', 'Registration:') !!}
     <p>{!! $aircraft->registration !!}</p>
 </div>
 
 <!-- Active Field -->
-<div class="form-group">
+<div class="form-group col-sm-6">
     {!! Form::label('active', 'Active:') !!}
     <p>{!! $aircraft->active !!}</p>
 </div>
 
 <!-- Created At Field -->
-<div class="form-group">
+<div class="form-group col-sm-6">
     {!! Form::label('created_at', 'Created At:') !!}
     <p>{!! $aircraft->created_at !!}</p>
 </div>
 
 <!-- Updated At Field -->
-<div class="form-group">
+<div class="form-group col-sm-6">
     {!! Form::label('updated_at', 'Updated At:') !!}
     <p>{!! $aircraft->updated_at !!}</p>
 </div>

resources/views/admin/aircraft/table.blade.php

@@ -9,7 +9,7 @@
     <tbody>
     @foreach($aircraft as $ac)
         <tr>
-            <td>{!! $ac->icao !!}</td>
+            <td><a href="{!! route('admin.aircraft.show', [$ac->id]) !!}">{!! $ac->icao !!}</a></td>
             <td>{!! $ac->name !!}</td>
             <td>{!! $ac->registration !!}</td>
             <td>{!! $ac->active !!}</td>

resources/views/admin/app.blade.php

@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <title>phpVMS Admin</title>
+    <title>phpvms4 admin</title>
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 
     <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
@@ -17,7 +17,7 @@
     @yield('css')
 </head>
 
-<body class="skin-blue sidebar-mini">
+<body class="skin-blue-light sidebar">
 @if (!Auth::guest())
     <div class="wrapper">
         <!-- Main Header -->
@@ -37,6 +37,40 @@
                 <!-- Navbar Right Menu -->
                 <div class="navbar-custom-menu">
                     <ul class="nav navbar-nav">
+
+                        <!-- Tasks: style can be found in dropdown.less -->
+                        <li class="dropdown tasks-menu">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                <i class="fa fa-flag-o"></i>
+                                <span class="label label-danger">10</span>
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li class="header">10 PIREPs to approve</li>
+                                <li>
+                                    <!-- inner menu: contains the actual data -->
+                                    <ul class="menu">
+                                        <li><!-- Task item -->
+                                            <a href="#">
+                                                <h3>
+                                                    Design some buttons
+                                                    <small class="pull-right">20%</small>
+                                                </h3>
+                                                <div class="progress xs">
+                                                    <div class="progress-bar progress-bar-aqua" style="width: 20%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
+                                                        <span class="sr-only">20% Complete</span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </li><!-- end task item -->
+                                        ...
+                                    </ul>
+                                </li>
+                                <li class="footer">
+                                    <a href="#">View all tasks</a>
+                                </li>
+                            </ul>
+                        </li>
+
                         <!-- User Account Menu -->
                         <li class="dropdown user user-menu">
                             <!-- Menu Toggle Button -->

resources/views/admin/dashboard.blade.php

@@ -12,7 +12,21 @@
         <div class="clearfix"></div>
         <div class="box box-primary">
             <div class="box-body">
-                wassup
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    <div class="info-box bg-aqua">
+                        <span class="info-box-icon"><i class="fa fa-bookmark-o"></i></span>
+                        <div class="info-box-content">
+                            <span class="info-box-text">pireps</span>
+                            <span class="info-box-number">41,410</span>
+                            {{--<div class="progress">
+                                <div class="progress-bar" style="width: 100%"></div>
+                            </div>--}}
+                            <span class="progress-description">
+                              20 to approve
+                            </span>
+                        </div><!-- /.info-box-content -->
+                    </div><!-- /.info-box -->
+                </div>
             </div>
         </div>
     </div>

resources/views/admin/menu.blade.php

@@ -1,2 +1,17 @@
-<li><a href="{!! url('/admin/airlines') !!}">airlines</a></li>
+<li class="active">
-<li><a href="{!! url('/admin/aircraft') !!}">aircraft</a></li>
+    <a href="{!! url('/admin/dashboard') !!}"><i class="fa fa-circle-o"></i>dashboard</a>
+</li>
+
+<li class="header">operations</li>
+<li><a href="{!! url('/admin/pireps') !!}"><i class="fa fa-circle-o"></i>
+        pireps
+        <span data-toggle="tooltip" title="3 New" class="badge bg-light-blue pull-right">3</span>
+    </a>
+</li>
+<li><a href="{!! url('/admin/aircraft') !!}"><i class="fa fa-circle-o"></i>fleet</a></li>
+<li><a href="{!! url('/admin/fares') !!}"><i class="fa fa-circle-o"></i>fares</a></li>
+
+<li class="header">config</li>
+<li><a href="{!! url('/admin/airlines') !!}"><i class="fa fa-circle-o"></i>airlines</a></li>
+<li><a href="{!! url('/admin/airports') !!}"><i class="fa fa-circle-o"></i>airports</a></li>
+<li><a href="{!! url('/admin/aircraftclasses') !!}"><i class="fa fa-circle-o"></i>aircraft classes</a></li>

routes/web.php

@@ -1,44 +1,36 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Web Routes
-|--------------------------------------------------------------------------
-|
-| This file is where you may define all of the routes that are handled
-| by your application. Just tell Laravel the URIs it should respond
-| to using a Closure or controller method. Build something great!
-|
-*/
-
-Auth::routes();
-
 Route::get('/', 'HomeController@index');
 Route::get('/home', 'HomeController@index');
 
 
 Route::group([
     'namespace' => 'Frontend',
+    'as' => 'frontend.',
     'middleware' => ['role:admin|user'],
 ], function () {
     Route::resource('dashboard', 'DashboardController');
 });
 
+Auth::routes();
+
 /**
  * Admin Routes
  */
 
 Route::group([
     'namespace' => 'Admin',
-    'middleware' => ['role:admin'],
     'prefix' => 'admin',
+    'as' => 'admin.',
+    'middleware' => ['role:admin'],
 ], function () {
-    Route::get('', ['uses' => 'DashboardController@index']);
-    Route::get('/', ['uses' => 'DashboardController@index']);
-
     Route::resource('airports', 'AirportController');
     Route::resource('airlines', 'AirlinesController');
     Route::resource('aircraft', 'AircraftController');
     Route::resource('aircraftclasses', 'AircraftClassController');
     Route::resource('fares', 'FareController');
+
+    Route::get('', ['uses' => 'DashboardController@index']);
+    Route::get('/', ['uses' => 'DashboardController@index']);
+    Route::get('/dashboard', ['uses' => 'DashboardController@index','name' => 'dashboard']);
 });