#9 refactoring/renaming of controllers

This commit is contained in:
Nabeel Shahzad
2017-06-10 22:17:45 -05:00
parent 410a6b7a7f
commit 7d7b422707
8 changed files with 24 additions and 39 deletions

View File

@@ -1,13 +0,0 @@
<?php
namespace App\Http\Controllers\Admin;
use InfyOm\Generator\Utils\ResponseUtil;
use App\Http\Controllers\Controller;
use Response;
class AdminBaseController extends Controller
{
}

View File

@@ -5,13 +5,12 @@ namespace App\Http\Controllers\Admin;
use App\Http\Requests\CreateAircraftClassRequest;
use App\Http\Requests\UpdateAircraftClassRequest;
use App\Repositories\AircraftClassRepository;
use App\Http\Controllers\AppBaseController;
use Illuminate\Http\Request;
use Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
class AircraftClassController extends AppBaseController
class AircraftClassController extends BaseController
{
/** @var AircraftClassRepository */
private $aircraftClassRepository;
@@ -33,7 +32,7 @@ class AircraftClassController extends AppBaseController
$aircraftClasses = $this->aircraftClassRepository->all();
return view('admin.aircraft_classes.index')
->with('aircraftClasses', $aircraftClasses);
->with('aircraftClasses', $aircraftClasses);
}
/**
@@ -56,7 +55,6 @@ class AircraftClassController extends AppBaseController
public function store(CreateAircraftClassRequest $request)
{
$input = $request->all();
$aircraftClass = $this->aircraftClassRepository->create($input);
Flash::success('Aircraft Class saved successfully.');
@@ -77,7 +75,6 @@ class AircraftClassController extends AppBaseController
if (empty($aircraftClass)) {
Flash::error('Aircraft Class not found');
return redirect(route('admin.aircraftClasses.index'));
}
@@ -89,7 +86,7 @@ class AircraftClassController extends AppBaseController
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function edit($id)
{
@@ -97,7 +94,6 @@ class AircraftClassController extends AppBaseController
if (empty($aircraftClass)) {
Flash::error('Aircraft Class not found');
return redirect(route('admin.aircraftClasses.index'));
}
@@ -118,7 +114,6 @@ class AircraftClassController extends AppBaseController
if (empty($aircraftClass)) {
Flash::error('Aircraft Class not found');
return redirect(route('admin.aircraftClasses.index'));
}
@@ -142,7 +137,6 @@ class AircraftClassController extends AppBaseController
if (empty($aircraftClass)) {
Flash::error('Aircraft Class not found');
return redirect(route('admin.aircraftClasses.index'));
}

View File

@@ -10,7 +10,7 @@ use Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
class AircraftController extends AdminBaseController
class AircraftController extends BaseController
{
/** @var AircraftRepository */
private $aircraftRepository;

View File

@@ -10,7 +10,7 @@ use Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
class AirlinesController extends AdminBaseController
class AirlinesController extends BaseController
{
/** @var AirlinesRepository */
private $airlinesRepository;
@@ -46,7 +46,6 @@ class AirlinesController extends AdminBaseController
public function store(CreateAirlinesRequest $request)
{
$input = $request->all();
$airlines = $this->airlinesRepository->create($input);
Flash::success('Airlines saved successfully.');
@@ -59,7 +58,7 @@ class AirlinesController extends AdminBaseController
*
* @param int $id
*
* @return Response
* @return mixed
*/
public function show($id)
{
@@ -67,7 +66,6 @@ class AirlinesController extends AdminBaseController
if (empty($airlines)) {
Flash::error('Airlines not found');
return redirect(route('airlines.index'));
}
@@ -87,7 +85,6 @@ class AirlinesController extends AdminBaseController
if (empty($airlines)) {
Flash::error('Airlines not found');
return redirect(route('airlines.index'));
}
@@ -108,7 +105,6 @@ class AirlinesController extends AdminBaseController
if (empty($airlines)) {
Flash::error('Airlines not found');
return redirect(route('airlines.index'));
}
@@ -132,7 +128,6 @@ class AirlinesController extends AdminBaseController
if (empty($airlines)) {
Flash::error('Airlines not found');
return redirect(route('airlines.index'));
}

View File

@@ -0,0 +1,12 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\AppBaseController;
use Response;
class BaseController extends AppBaseController
{
}

View File

@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
use Flash;
use Response;
class DashboardAdminController extends AdminBaseController
class DashboardController extends BaseController
{
/**
* Display a listing of the Airlines.

View File

@@ -1,17 +1,16 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers\Admin;
use App\Http\Requests\CreateFareRequest;
use App\Http\Requests\UpdateFareRequest;
use App\Repositories\FareRepository;
use App\Http\Controllers\AppBaseController;
use Illuminate\Http\Request;
use Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
class FareController extends AppBaseController
class FareController extends BaseController
{
/** @var FareRepository */
private $fareRepository;
@@ -75,7 +74,6 @@ class FareController extends AppBaseController
$fare = $this->fareRepository->findWithoutFail($id);
if (empty($fare)) {
Flash::error('Fare not found');
return redirect(route('admin.fares.index'));
}
@@ -94,7 +92,6 @@ class FareController extends AppBaseController
$fare = $this->fareRepository->findWithoutFail($id);
if (empty($fare)) {
Flash::error('Fare not found');
return redirect(route('admin.fares.index'));
}
@@ -114,9 +111,9 @@ class FareController extends AppBaseController
$fare = $this->fareRepository->findWithoutFail($id);
if (empty($fare)) {
Flash::error('Fare not found');
return redirect(route('admin.fares.index'));
}
$fare = $this->fareRepository->update($request->all(), $id);
Flash::success('Fare updated successfully.');
@@ -135,9 +132,9 @@ class FareController extends AppBaseController
$fare = $this->fareRepository->findWithoutFail($id);
if (empty($fare)) {
Flash::error('Fare not found');
return redirect(route('admin.fares.index'));
}
$this->fareRepository->delete($id);
Flash::success('Fare deleted successfully.');

View File

@@ -5,7 +5,7 @@
Route::get('/admin', [
'middleware' => ['role:admin'],
'uses' => 'DashboardAdminController@index'
'uses' => 'DashboardController@index'
]);
Route::group([