Cleanup Controller inheritance

app/Http/Controllers/Admin/BaseController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Http\Controllers\AppBaseController;
+use App\Http\Controllers\Controller;
 use Response;
 
 
-class BaseController extends AppBaseController
+class BaseController extends Controller
 {
 
 }

app/Http/Controllers/AppBaseController.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Response;
-
-/**
- * @SWG\Swagger(
- *   basePath="/api/v1",
- *   @SWG\Info(
- *     title="Laravel Generator APIs",
- *     version="1.0.0",
- *   )
- * )
- * This class should be parent class for other API controllers
- * Class AppBaseController
- */
-class AppBaseController extends Controller
-{
-
-}

app/Http/Controllers/Controller.php

@@ -20,7 +20,6 @@ class Controller extends BaseController
      */
     public function view($template, array $vars=[], $merge_data=[])
     {
-        $tpl = 'layouts/' . config('phpvms.skin') . '/' . $template;
+        return skin_view($template, $vars, $merge_data);
-        return view($tpl, $vars, $merge_data);
     }
 }

app/Http/Controllers/Frontend/DashboardController.php

@@ -5,11 +5,11 @@ namespace App\Http\Controllers\Frontend;
 use Log;
 use Illuminate\Support\Facades\Auth;
 
+use App\Http\Controllers\Controller;
 use App\Repositories\PirepRepository;
 use App\Repositories\UserRepository;
-use App\Http\Controllers\AppBaseController;
 
-class DashboardController extends AppBaseController
+class DashboardController extends Controller
 {
     private $pirepRepo, $userRepo;
 

app/Http/Controllers/Frontend/FlightController.php

@@ -10,7 +10,7 @@ use Log;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\AppBaseController;
+use App\Http\Controllers\Controller;
 use App\Models\UserBid;
 use App\Repositories\FlightRepository;
 use App\Repositories\Criteria\WhereCriteria;
@@ -18,7 +18,7 @@ use App\Repositories\Criteria\WhereCriteria;
 use Mockery\Exception;
 use Prettus\Repository\Exceptions\RepositoryException;
 
-class FlightController extends AppBaseController
+class FlightController extends Controller
 {
     private $airlineRepo,
             $airportRepo,

app/Http/Controllers/Frontend/HomeController.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Frontend;
 
-use App\Models\User;
 use Illuminate\Database\QueryException;
+use App\Http\Controllers\Controller;
+use App\Models\User;
 
-class HomeController extends AppBaseController
+class HomeController extends Controller
 {
     /**
      * Show the application dashboard.

app/Http/Controllers/Frontend/ProfileController.php

@@ -10,14 +10,15 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Jackiedo\Timezonelist\Facades\Timezonelist;
 
+use App\Http\Controllers\Controller;
+
 use App\Models\User;
 use App\Facades\Utils;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\UserRepository;
-use App\Http\Controllers\AppBaseController;
 
-class ProfileController extends AppBaseController
+class ProfileController extends Controller
 {
     private $airlineRepo,
             $airportRepo,

app/Routes/web.php

@@ -1,6 +1,5 @@
 <?php
 
-Route::get('/', 'HomeController@index')->name('home');
 
 /**
  * User doesn't need to be logged in for these
@@ -8,6 +7,7 @@ Route::get('/', 'HomeController@index')->name('home');
 Route::group([
     'namespace' => 'Frontend', 'prefix' => '', 'as' => 'frontend.'
 ], function() {
+    Route::get('/', 'HomeController@index')->name('home');
     Route::get('r/{id}', 'PirepController@show')->name('pirep.show.public');
     Route::get('p/{id}', 'ProfileController@show')->name('profile.show.public');
 

modules/Installer/Http/Controllers/InstallerController.php

@@ -13,7 +13,8 @@ use App\Models\Setting;
 use App\Repositories\AirlineRepository;
 use App\Facades\Utils;
 use App\Services\UserService;
-use App\Http\Controllers\AppBaseController;
+
+use App\Http\Controllers\Controller;
 
 use Modules\Installer\Services\DatabaseService;
 use Modules\Installer\Services\EnvironmentService;
@@ -21,7 +22,7 @@ use Modules\Installer\Services\RequirementsService;
 
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 
-class InstallerController extends AppBaseController
+class InstallerController extends Controller
 {
     protected $airlineRepo,
               $dbService,

modules/Sample/Http/Controllers/AdminController.php

@@ -2,11 +2,11 @@
 
 namespace Modules\Sample\Http\Controllers;
 
-use App\Http\Controllers\AppBaseController;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 
-class AdminController extends AppBaseController
+class AdminController extends Controller
 {
     /**
      * Display a listing of the resource.

modules/Sample/Http/Controllers/SampleController.php

@@ -2,11 +2,11 @@
 
 namespace Modules\Sample\Http\Controllers;
 
-use App\Http\Controllers\AppBaseController;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 
-class SampleController extends AppBaseController
+class SampleController extends Controller
 {
     /**
      * Display a listing of the resource.

resources/stubs/modules/controller-admin.stub

@@ -2,11 +2,11 @@
 
 namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Http\Controllers;
 
-use App\Http\Controllers\AppBaseController;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 
-class AdminController extends AppBaseController
+class AdminController extends Controller
 {
     /**
      * Display a listing of the resource.

resources/stubs/modules/controller-plain.stub

@@ -2,7 +2,7 @@
 
 namespace $CLASS_NAMESPACE$;
 
-use Illuminate\Routing\Controller;
+use App\Http\Controllers\Controller;
 
 class $CLASS$ extends Controller
 {

resources/stubs/modules/controller.stub

@@ -2,11 +2,11 @@
 
 namespace $CLASS_NAMESPACE$;
 
-use App\Http\Controllers\AppBaseController;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 
-class $CLASS$ extends AppBaseController
+class $CLASS$ extends Controller
 {
     /**
      * Display a listing of the resource.