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

app/Console/Commands/getLogisticContracts.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use DB;
+use Carbon\Carbon;
+
+use App\Models\Logistics\Contract;
+use App\Models\ScheduleJob;
+
+use Seat\Eseye\Cache\NullCache;
+use Seat\Eseye\Configuration;
+use Seat\Eseye\Containers\EsiAuthentication;
+use Seat\Eseye\Eseye;
+
+class getLogisticContracts extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'services:logistics';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get the logistics jobs.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $job = new ScheduleJob;
+        $time = Carbon::now();
+        $job->job_name = "GetLogisticsContracts";
+        $job->job_state = 'Starting';
+        $job->system_time = $time;
+        $job-save();
+
+        //Create functionality to record contracts for logistical services
+
+        //If the job is finished we need to mark it in the table
+        DB::table('schedule_jobs')->where('system_time', $time)->update([
+            'job_state' => 'Finished',
+        ]);
+    }
+}

app/Http/Controllers/AdminController.php

@@ -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() {

app/Http/Controllers/DashboardController.php

@@ -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;
 

app/Http/Controllers/EsiScopeController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use DB;
 use Socialite;
 use Auth;
+
 use App\User;
 
 use Seat\Eseye\Cache\NullCache;

app/Http/Controllers/FinancesController.php

@@ -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;

app/Http/Controllers/FleetsController.php

@@ -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

app/Http/Controllers/LogisticsController.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class LogisticsController extends Controller
+{
+    //
+}

app/Http/Controllers/MoonsController.php

@@ -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

app/Http/Controllers/RegisterStructureController.php

@@ -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
 {

app/Http/Controllers/WikiController.php

@@ -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\Doku\DokuGroupNames;
-use App\Models\DokuUser;
+use App\Models\Doku\DokuMember;
+use App\Models\Doku\DokuUser;
 
 class WikiController extends Controller
 {

app/Library/Esi.php

@@ -4,7 +4,7 @@ namespace App\Library;
 
 use DB;
 
-use App\Models\EsiScope;
+use App\Models\Esi\EsiScope;
 
 use Seat\Eseye\Cache\NullCache;
 use Seat\Eseye\Configuration;

app/Library/Finances.php

@@ -9,9 +9,9 @@
 
 use DB;
 
-use App\Models\EsiScope;
+use App\Models\Esi\EsiScope;
-use App\Models\EsiToken;
+use App\Models\Esi\EsiToken;
-use App\Models\CorpJournal;
+use App\Models\Corporation\CorpJournal;
 
 use App\Library\Esi;
 

app/Library/Fleets.php

@@ -6,8 +6,8 @@ use Auth;
 use Session;
 use DB;
 
-use App\Models\EsiToken;
+use App\Models\Esi\EsiToken;
-use App\Library\Fleet;
+use App\Models\Fleet\Fleet;
 use Carbon\Carbon;
 
 use Seat\Eseye\Cache\NullCache;
@@ -15,7 +15,7 @@ use Seat\Eseye\Configuration;
 use Seat\Eseye\Containers\EsiAuthentication;
 use Seat\Eseye\Eseye;
 
-class Fleet {
+class Fleets {
 
     private $fleet;
     private $fcId;
@@ -67,7 +67,7 @@ class Fleet {
         $token = DB::table('EsiTokens')->where('character_id', $fc->character_id)->first();
         //Create the esi authentication container
         $config = config('esi');
-        $authentication = new \Seat\Eseye\Containers\EsiAuthentication([
+        $authentication = new EsiAuthentication([
             'client_id' => $config['client_id'],
             'secret' => $config['secret'],
             'refresh_token' => $token->refresh_token,
@@ -97,7 +97,7 @@ class Fleet {
         $configuration->logfile_location = '/var/www/w4rpservices/storage/logs/eseye';
         //Create the ESI Call Container
         $config = config('esi');
-        $authentication = new \Seat\Eseye\Containers\EsiAuthentication([
+        $authentication = new EsiAuthentication([
             'client_id'     => $config['client_id'],
             'secret'        => $config['secret'],
             'refresh_token' => $token[0]->refresh_token,

app/Library/Mail.php

@@ -4,8 +4,8 @@ namespace App\Library;
 
 use DB;
 
-use App\Models\EsiScope;
+use App\Models\Esi\EsiScope;
-use App\Models\Esitoken;
+use App\Models\Esi\Esitoken;
 
 use Seat\Eseye\Cache\NullCache;
 use Seat\Eseye\Configuration;

app/Library/MoonCalc.php

@@ -8,14 +8,17 @@ namespace App\Library;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+
 use Session;
 use DB;
+
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;
+
 use App\Models\Config;
-use App\Models\Moon;
+use App\Models\Moon\Moon;
-use App\Models\Price;
+use App\Models\Moon\Price;
-use App\Models\ItemComposition;
+use App\Models\Moon\ItemComposition;
 
 class MoonCalc {
 

app/Library/SeatHelper.php

@@ -4,7 +4,7 @@ namespace App\Library;
 
 use DB;
 
-use App\Models\CorpJournal;
+use App\Models\Corporation\CorpJournal;
 
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;

app/Models/Corporation/AllianceCorp.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Corporation;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Corporation/CorpJournal.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Corporation;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Corporation/CorpStructure.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Corporation;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Corporation/HoldingCorpJournal.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Corporation;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Corporation/Structure.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Corporation;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Doku/DokuGroupNames.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Doku;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Doku/DokuMember.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Doku;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Doku/DokuUser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Doku;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Esi/EsiScope.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Esi;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Esi/EsiToken.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Esi;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Fleet/Fleet.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Fleet;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Logistics/Contract.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models\Logistics;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Contract extends Model
+{
+    //
+}

app/Models/Market/MarketOrder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Market;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Moon/ItemComposition.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Moon;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Moon/Moon.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Moon;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Moon/OrePrice.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Moon;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/Moon/Price.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Moon;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/ScheduledTask/ScheduleJob.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\ScheduledTask;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/User/UserPermission.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\User;
 
 use Illuminate\Database\Eloquent\Model;
 

app/Models/User/UserRole.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\User;
 
 use Illuminate\Database\Eloquent\Model;
 

resources/views/layouts/navbar.blade.php

@@ -32,12 +32,22 @@
                 </div>
             </li>
             <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Fleet</a>
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Fleet</a>
-                    <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
+                <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
-                        <a class="dropdown-item" href="/fleets/display">Display</a>
+                    <a class="dropdown-item" href="/fleets/display">Display</a>
-                        <a class="dropdown-item" href="/fleets/register">Register</a>
+                    <a class="dropdown-item" href="/fleets/register">Register</a>
-                    </div>
+                </div>
-                </li>
+            </li>
+            @if(Auth()->user()->hasPermission('logistics.minion'))
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Fleet</a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
+                    <a class="dropdown-item" href="/logistics/contracts/available">Available Contracts</a>
+                    <a class="dropdown-item" href="/logistics/contracts/completed">Completed Contracts</a>
+                    <a class="dropdown-item" href="/logistics/insurance/request">Insurance Request</a>
+                </div>
+            </li>
+            @endif
         </ul>
         <ul class="navbar-nav m1-auto">
             <li class="nav-item">

resources/views/logistics/dashboard.blade.php

@@ -0,0 +1,4 @@
+@extends('layouts.b4')
+@section('content')
+
+@endsection