restructured models directory and namespaces to include an extra directory for sorting

This commit is contained in:
2018-12-01 21:46:04 -06:00
parent 5c073d85ee
commit 67e606ad54
38 changed files with 168 additions and 58 deletions
+3 -4
View File
@@ -3,12 +3,11 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\UserRole;
use App\Models\UserPermission;
use DB;
use App\Models\User\UserRole;
use App\Models\User\UserPermission;
class AdminController extends Controller
{
public function __construct() {
@@ -3,7 +3,6 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Library;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
use DB;
use Socialite;
use Auth;
use App\User;
use Seat\Eseye\Cache\NullCache;
+5 -3
View File
@@ -7,14 +7,16 @@ use Illuminate\Http\Request;
use DB;
use Socialite;
use Auth;
use Carbon\Carbon;
use App\User;
use App\Models\User\UserRole;
use App\Models\User\UserPermission;
use App\Models\Corporation\CorpJournal;
use App\Library\Finances;
use App\Library\Esi;
use App\Library\SeatHelper;
use App\Models\CorpJournal;
use Carbon\Carbon;
use Seat\Eseye\Cache\NullCache;
use Seat\Eseye\Configuration;
+7 -5
View File
@@ -8,9 +8,11 @@ use Auth;
use DB;
use Carbon\Carbon;
use App\Library\Fleet;
use App\Library\Fleets;
use App\Library\Esi;
use App\Models\Fleet\Fleet;
class FleetsController extends Controller
{
@@ -24,7 +26,7 @@ class FleetsController extends Controller
}
public function displayFleets() {
$fleets = \App\Models\Fleet::all();
$fleets = Fleet::all();
$data = array();
$fc = array();
$fleet = array();
@@ -52,7 +54,7 @@ class FleetsController extends Controller
public function registerFleet(Request $request) {
//Register a new instance of the fleet class
$fleet = new Fleet(Auth::user()->character_id);
$fleet = new Fleets(Auth::user()->character_id);
$esiHelper = new Esi();
if(!$esiHelper->HaveEsiScope(Auth::user()->character_id, 'esi-fleets.write_fleet.v1')) {
return view('inc.error')->with('error', 'User does not have the write fleet scope.');
@@ -102,7 +104,7 @@ class FleetsController extends Controller
}
public function addPilot($fleetId, $charId) {
$newPilot = new Fleet();
$newPilot = new Fleets();
//Retrieve the fleet data
$fleet = DB::table('Fleets')->where('fleet', $fleetId)->get();
@@ -123,7 +125,7 @@ class FleetsController extends Controller
}
public function addPilotName($fleetId, $name) {
$newPilot = new Fleet();
$newPilot = new Fleets();
$esiHelper = new Esi();
//Retrieve the fleet data
@@ -0,0 +1,11 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class LogisticsController extends Controller
{
//
}
+4 -1
View File
@@ -5,11 +5,14 @@ namespace App\Http\Controllers;
use Auth;
use DB;
use Illuminate\Http\Request;
use App\Models\Moon;
use App\Models\Moon\Moon;
use Seat\Eseye\Cache\NullCache;
use Seat\Eseye\Configuration;
use Seat\Eseye\Containers\EsiAuthentication;
use Seat\Eseye\Eseye;
use App\Library\MoonCalc;
class MoonsController extends Controller
@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
use Auth;
use DB;
use App\Models\CorpStructure;
use App\Models\Corporation\CorpStructure;
class RegisterStructureController extends Controller
{
+5 -3
View File
@@ -3,11 +3,13 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use DB;
use Auth;
use App\Models\DokuGroupNames;
use App\Models\DokuMember;
use App\Models\DokuUser;
use App\Models\Doku\DokuGroupNames;
use App\Models\Doku\DokuMember;
use App\Models\Doku\DokuUser;
class WikiController extends Controller
{