From 0cb98f1920688fcfd8306e995c4f0e3c644100ca Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Thu, 8 Jun 2017 20:46:50 -0500 Subject: [PATCH] rename 'enabled' to 'active' --- app/Models/Airlines.php | 4 ++-- ...2017_06_08_191703_create_airlines_table.php | 2 +- resources/views/admin/airlines/edit.blade.php | 2 +- .../views/admin/airlines/fields.blade.php | 8 ++++---- resources/views/admin/airlines/index.blade.php | 2 +- resources/views/admin/airlines/show.blade.php | 2 +- .../views/admin/airlines/show_fields.blade.php | 6 +++--- resources/views/admin/airlines/table.blade.php | 18 +++++++++--------- resources/views/admin/app.blade.php | 2 +- routes/web.php | 15 +++++---------- 10 files changed, 28 insertions(+), 33 deletions(-) diff --git a/app/Models/Airlines.php b/app/Models/Airlines.php index e1b9c127..3d6d6f63 100644 --- a/app/Models/Airlines.php +++ b/app/Models/Airlines.php @@ -20,7 +20,7 @@ class Airlines extends Model public $fillable = [ 'code', 'name', - 'enabled' + 'active' ]; /** @@ -31,7 +31,7 @@ class Airlines extends Model protected $casts = [ 'code' => 'string', 'name' => 'string', - 'enabled' => 'boolean' + 'active' => 'boolean' ]; /** diff --git a/database/migrations/2017_06_08_191703_create_airlines_table.php b/database/migrations/2017_06_08_191703_create_airlines_table.php index 71d9ed35..5bb18452 100644 --- a/database/migrations/2017_06_08_191703_create_airlines_table.php +++ b/database/migrations/2017_06_08_191703_create_airlines_table.php @@ -17,7 +17,7 @@ class CreateAirlinesTable extends Migration $table->increments('id'); $table->string('code'); $table->string('name'); - $table->boolean('enabled'); + $table->boolean('active'); $table->timestamps(); $table->softDeletes(); }); diff --git a/resources/views/admin/airlines/edit.blade.php b/resources/views/admin/airlines/edit.blade.php index 1def4188..d6480b9a 100644 --- a/resources/views/admin/airlines/edit.blade.php +++ b/resources/views/admin/airlines/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.admin.app') +@extends('admin.app') @section('content')
diff --git a/resources/views/admin/airlines/fields.blade.php b/resources/views/admin/airlines/fields.blade.php index 3ed29f76..f078d988 100644 --- a/resources/views/admin/airlines/fields.blade.php +++ b/resources/views/admin/airlines/fields.blade.php @@ -10,12 +10,12 @@ {!! Form::text('name', null, ['class' => 'form-control']) !!} - +
- {!! Form::label('enabled', 'Enabled:') !!} + {!! Form::label('active', 'Active:') !!}
diff --git a/resources/views/admin/airlines/index.blade.php b/resources/views/admin/airlines/index.blade.php index 8e2fa7e1..06d54c89 100644 --- a/resources/views/admin/airlines/index.blade.php +++ b/resources/views/admin/airlines/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.admin.app') +@extends('admin.app') @section('content')
diff --git a/resources/views/admin/airlines/show.blade.php b/resources/views/admin/airlines/show.blade.php index 954b27a2..19d805d0 100644 --- a/resources/views/admin/airlines/show.blade.php +++ b/resources/views/admin/airlines/show.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.admin.app') +@extends('admin.app') @section('content')
diff --git a/resources/views/admin/airlines/show_fields.blade.php b/resources/views/admin/airlines/show_fields.blade.php index f4e5c9b7..0744a127 100644 --- a/resources/views/admin/airlines/show_fields.blade.php +++ b/resources/views/admin/airlines/show_fields.blade.php @@ -16,10 +16,10 @@

{!! $airlines->name !!}

- +
- {!! Form::label('enabled', 'Enabled:') !!} -

{!! $airlines->enabled !!}

+ {!! Form::label('active', 'Active:') !!} +

{!! $airlines->active !!}

diff --git a/resources/views/admin/airlines/table.blade.php b/resources/views/admin/airlines/table.blade.php index 0f5d7693..6f946936 100644 --- a/resources/views/admin/airlines/table.blade.php +++ b/resources/views/admin/airlines/table.blade.php @@ -2,20 +2,20 @@ Code Name - Enabled + Active? Action - @foreach($airlines as $airlines) + @foreach($airlines as $al) - {!! $airlines->code !!} - {!! $airlines->name !!} - {!! $airlines->enabled !!} + {!! $al->code !!} + {!! $al->name !!} + {!! $al->active !!} - {!! Form::open(['route' => ['airlines.destroy', $airlines->id], 'method' => 'delete']) !!} + {!! Form::open(['route' => ['airlines.destroy', $al->id], 'method' => 'delete']) !!}
- - + + {!! Form::button('', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!}
{!! Form::close() !!} @@ -23,4 +23,4 @@ @endforeach - \ No newline at end of file + diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php index 6d9b7b1f..9c279e28 100644 --- a/resources/views/admin/app.blade.php +++ b/resources/views/admin/app.blade.php @@ -25,7 +25,7 @@ diff --git a/routes/web.php b/routes/web.php index 4fcdeab7..19acaa91 100755 --- a/routes/web.php +++ b/routes/web.php @@ -19,11 +19,15 @@ Route::get('/', function () { Route::get('/home', 'HomeController@index'); -//Auth::routes(); /** * Admin routes */ + +Route::get('/admin', function () { + return redirect('/admin/airlines'); +}); + Route::group([ 'namespace' => 'Admin', 'middleware' => 'auth', @@ -31,15 +35,6 @@ Route::group([ ], function () { Route::resource('airlines', 'AirlinesController'); Route::resource('aircraft', 'AircraftController'); - -// Route::get('admin/aircrafts', ['as'=> 'admin.aircrafts.index', 'uses' => 'AircraftController@index']); -// Route::post('admin/aircrafts', ['as'=> 'admin.aircrafts.store', 'uses' => 'AircraftController@store']); -// Route::get('admin/aircrafts/create', ['as'=> 'admin.aircrafts.create', 'uses' => 'AircraftController@create']); -// Route::put('admin/aircrafts/{aircrafts}', ['as'=> 'admin.aircrafts.update', 'uses' => 'AircraftController@update']); -// Route::patch('admin/aircrafts/{aircrafts}', ['as'=> 'admin.aircrafts.update', 'uses' => 'AircraftController@update']); -// Route::delete('admin/aircrafts/{aircrafts}', ['as'=> 'admin.aircrafts.destroy', 'uses' => 'AircraftController@destroy']); -// Route::get('admin/aircrafts/{aircrafts}', ['as'=> 'admin.aircrafts.show', 'uses' => 'AircraftController@show']); -// Route::get('admin/aircrafts/{aircrafts}/edit', ['as'=> 'admin.aircrafts.edit', 'uses' => 'AircraftController@edit']); });