re-ordered all of the view directories

setup corp tax ratio for structure tax helper
modified all view functions for new directory layout

app/Http/Controllers/AdminController.php

@@ -12,6 +12,7 @@ use App\Models\User\AvailableUserPermission;
 use App\Models\Esi\EsiScope;
 use App\Models\Esi\EsiToken;
 use App\Models\Corporation\CorpStructure;
+use App\Models\Admin\AllowedLogin;
 
 class AdminController extends Controller
 {
@@ -91,14 +92,62 @@ class AdminController extends Controller
     }
 
     public function displayAllowedLogins() {
+        $logins = AllowedLogin::all();
 
+        return view('admin.allowedlogins')->with('logins', $logins);
     }
 
-    public function addAllowedLogin() {
+    public function addAllowedLogin(Request $request) {
+        //Set the parameters to validate the form
+        $this->validate($request, [
+            'entity_id' => 'required',
+            'entity_type' => 'required',
+            'entity_name' => 'required',
+            'login_type' => 'required',
+        ]);
 
+        //Check to see if the entity exists in the database already
+        $found = AllowedLogin::where([
+            'entity_type' => $request->entityType,
+            'entity_name' => $request->entityName,
+        ])->get();
+        if($found != null) {
+            AllowedLogin::where([
+                'entity_type' => $request->entityType,
+                'entity_name' => $request->entityName,
+            ])->update([
+                'entity_id' => $request->entityId,
+                'entity_type' => $request->entityType,
+                'entity_name' => $request->entityName,
+                'login_type' => $request->loginType,
+            ]);
+        } else {
+            $login = new AllowedLogin;
+            $login->entity_id = $request->entityId;
+            $login->entity_name = $request->entityName;
+            $login->entity_type = $request->entityType;
+            $login->login_type = $request->loginType;
         }
 
-    public function removeAllowedLogin() {
+        return redirect('/admin/dashboard')->with('success', 'Entity added to allowed login list.');
+    }
 
+    public function removeAllowedLogin(Request $request) {
+        //Set the parameters to validate the form
+        $this->validate($request, [
+            'entity_id' => 'required',
+            'entity_type' => 'required',
+            'entity_name' => 'required',
+            'login_type' => 'required',
+        ]);
+
+        AllowedLogin::where([
+            'entity_id' => $request->entityId,
+            'entity_type' => $request->entityType,
+            'entity_name' => $request->entityName,
+            'login_type' => $request->loginType,
+        ])->delete();
+
+        return redirect('/admin/dashboard')->with('success', 'Entity removed from allowed login list.');
     }
 }

app/Http/Controllers/DashboardController.php

@@ -51,6 +51,6 @@ class DashboardController extends Controller
             'roles' => $roles,
         ];
 
-        return view('/dashboard/profile')->with('data', $data);
+        return view('dashboard.profile')->with('data', $data);
     }
 }

app/Http/Controllers/MoonsAdminController.php

@@ -33,11 +33,11 @@ class MoonsAdminController extends Controller
 
         $journal = DB::select('SELECT amount,reason,description,date FROM `player_donation_journal` WHERE corporation_id=98287666 AND date >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 MONTH) ORDER BY date DESC');
         
-        return view('moons.moonjournal')->with('journal', $journal);
+        return view('moons.admin.moonjournal')->with('journal', $journal);
     }
 
     public function updateMoon() {
-        return view('moons.updatemoon');
+        return view('moons.admin.updatemoon');
     }
 
     public function storeUpdateMoon2(Request $request) {
@@ -119,7 +119,7 @@ class MoonsAdminController extends Controller
     }
 
     public function addMoon() {
-        return view('moons.addmoon');
+        return view('moons.admin.addmoon');
     }
 
     /**
@@ -217,6 +217,6 @@ class MoonsAdminController extends Controller
             $html .= '</tr>';
         }
 
-        return view('moons.adminmoon')->with('html', $html);
+        return view('moons.admin.adminmoon')->with('html', $html);
     }
 }

app/Http/Controllers/MoonsController.php

@@ -68,11 +68,11 @@ class MoonsController extends Controller
             $html .= '</tr>';
         }
 
-        return view('moons.moon')->with('html', $html);
+        return view('moons.user.moon')->with('html', $html);
     }
 
     public function displayTotalWorthForm() {
-        return view('moons.formTotalWorth');
+        return view('moons.user.formTotalWorth');
     }
 
     public function displayTotalWorth(Request $request) {
@@ -102,6 +102,6 @@ class MoonsController extends Controller
                                                         $fourthOre, $fourthQuantity);
         $totalWorth = number_format($totalWorth, 2, ".", ",");
 
-        return view('moons.displayTotalWorth')->with(['totalWorth' => $totalWorth, 'totalGoo' => $totalGoo]);
+        return view('moons.user.displayTotalWorth')->with(['totalWorth' => $totalWorth, 'totalGoo' => $totalGoo]);
     }
 }

app/Http/Controllers/RegisterStructureController.php

@@ -8,6 +8,7 @@ use Auth;
 use DB;
 
 use App\Models\Corporation\CorpStructure;
+use App\Models\Corporation\CorpTaxRatio;
 use App\Library\Esi\Esi;
 
 class RegisterStructureController extends Controller
@@ -18,10 +19,57 @@ class RegisterStructureController extends Controller
         $this->middleware('permission:structure.operator');
     }
 
+    public function displayRegisterTaxRatio() {
+        $this->middleware('role:Admin');
+        
+        return view('structures.register.taxratio');
+    }
+
+    public function storeTaxRatio(Request $request) {
+        $this->validate($request, [
+            'corpId',
+            'corporation',
+            'type',
+            'ratio',
+        ]);
+
+        $ratio = new CorpTaxRatio;
+        $ratio->corporation_id = $request->corpId;
+        $ratio->corporation_name = $request->corporation;
+        $ratio->structure_type = $request->type;
+        $ratio->ratio = $request->ratio;
+        $ratio->save();
+
+        return redirect('structure.admin.dashboard');
+    }
+
+    public function updateTaxRatio(Request $request) {
+        $this->validate($request, [
+            'corporation',
+            'type',
+            'ratio',
+        ]);
+
+        CorpTaxRatio::where([
+            'corporation_name' => $request->corporation,
+            'structure_type' => $request->type,
+        ])->update([
+            'ratio' => $request->ratio,
+        ]);
+
+        return redirect('structure.admin.dashboard')->with('success', 'Tax Ratio updated for structure type: ' . $request->type . ' and corporation: ' . $request->corporation);
+    }
+
+    public function displayTaxRatios() {
+        $taxRatios = CorpTaxRation::all();
+
+        return view('structure.admin.taxratios')->with('structures', $structures);
+    }
+
     public function displayRegisterStructure() {
         //Check to see if the user has the read corp journal esi scope before allowing to register a structure
         if(Auth()->user()->hasEsiScope('esi-wallet.read_corporation_wallets.v1')) {
-            return view('structures.register');
+            return view('structures.register.register');
         } else {
             return view('dashboard')->with('error', 'You need to setup your esi scope for read corporation wallets');
         }

app/Http/Controllers/StructureController.php

@@ -53,7 +53,7 @@ class StructureController extends Controller
         }
 
         //Return the view with the data passed to it
-        return view('structures.reprocessingtaxes')->with('taxes', $taxes);
+        return view('structures.user.reprocessingtaxes')->with('taxes', $taxes);
     }
 
     public function displayIndustryTaxes() {
@@ -78,12 +78,14 @@ class StructureController extends Controller
             ];    
         }
 
-        return view('structures.industrytaxes')->with('taxes', $taxes);
+        return view('structures.user.industrytaxes')->with('taxes', $taxes);
     }
 
     public function chooseCorpTaxes() {
+        $this->middleware('role:Admin');
+
         $corps = CorpStructure::pluck('corporation_name', 'corporation_id');
-        return view('structures.choosecorporation')->with('corps', $corps);
+        return view('structures.admin.choosecorporation')->with('corps', $corps);
     }
 
     public function displayCorpTaxes(Request $request) {
@@ -107,7 +109,7 @@ class StructureController extends Controller
         }
 
         //Return the view with the data passed to it
-        return view('structures.choosecorptaxes')->with('totalTaxes', $totalTaxes);
+        return view('structures.admin.choosecorptaxes')->with('totalTaxes', $totalTaxes);
     }
 
     public function displayTaxes() {
@@ -135,7 +137,7 @@ class StructureController extends Controller
             ];
         }
 
-        return view('structures.taxes')->with('totalTaxes', $totalTaxes);
+        return view('structures.user.taxes')->with('totalTaxes', $totalTaxes);
     }
 
     public function displayTaxHistory(Request $request) {
@@ -165,6 +167,6 @@ class StructureController extends Controller
             ];
         }
 
-        return view('structures.taxhistory')->with(compact('totalTaxes', 'months'));
+        return view('structures.user.taxhistory')->with(compact('totalTaxes', 'months'));
     }
 }

app/Http/Controllers/WikiController.php

@@ -30,7 +30,7 @@ class WikiController extends Controller
             return redirect('/dashboard')->with('error', 'Already registered for the wiki!');            
         }
 
-        return view('wiki.register')->with('name', $name);
+        return view('wiki.user.register')->with('name', $name);
     }
 
     public function storeRegister(Request $request) {
@@ -83,7 +83,7 @@ class WikiController extends Controller
             return redirect('/dashboard')->with('error', 'Login Not Found!');
         } 
 
-        return view('wiki.changepassword')->with('name', $name);
+        return view('wiki.user.changepassword')->with('name', $name);
     }
 
     public function changePassword(Request $request) {

app/Library/Structures/StructureTaxHelper.php

@@ -10,6 +10,7 @@ use App\User;
 use App\Models\User\UserRole;
 use App\Models\User\UserPermission;
 use App\Models\Corporation\CorpStructure;
+use App\Models\Corporation\CorpTaxRatio;
 use App\Models\Finances\CorpMarketJournal;
 use App\Models\Finances\ReprocessingTaxJournal;
 use App\Models\Finances\StructureIndustryTaxJournal;
@@ -40,7 +41,16 @@ class StructureTaxHelper {
 
         //Calculate the tax ratio to later be divided against the tax to find the
         //actual tax owed to the alliance.  Revenue will be a separate function
-        $ratio = $this->CalculateTaxRatio($corpId, $tax, $refType);
+        //$ratio = $this->CalculateTaxRatio($corpId, $tax, $refType);
+        //Get the ratio from the table
+        $ratio = CorpTaxRatio::where([
+            'corporation_id' => $corpId,
+            'structure_type' => $refType,
+        ])->get(['ratio']);
+        $ratio = $ratio[0];
+        if($ratio == null) {
+            $ratio = 1.0;
+        }
         
         //Get the total taxes produced by the structure(s) over a given set of dates
         $revenue = $this->GetRevenue($corpId, $refType, $start, $end);

resources/views/auth/login.blade.php

@@ -1,71 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Login') }}</div>
-
-                <div class="card-body">
-                    <form method="POST" action="{{ route('login') }}">
-                        @csrf
-
-                        <div class="form-group row">
-                            <label for="email" class="col-sm-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
-
-                                @if ($errors->has('email'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
-
-                                @if ($errors->has('password'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('password') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <div class="col-md-6 offset-md-4">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
-
-                                    <label class="form-check-label" for="remember">
-                                        {{ __('Remember Me') }}
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="form-group row mb-0">
-                            <div class="col-md-8 offset-md-4">
-                                <button type="submit" class="btn btn-primary">
-                                    {{ __('Login') }}
-                                </button>
-
-                                <a class="btn btn-link" href="{{ route('password.request') }}">
-                                    {{ __('Forgot Your Password?') }}
-                                </a>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection

resources/views/auth/passwords/email.blade.php

@@ -1,47 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Reset Password') }}</div>
-
-                <div class="card-body">
-                    @if (session('status'))
-                        <div class="alert alert-success" role="alert">
-                            {{ session('status') }}
-                        </div>
-                    @endif
-
-                    <form method="POST" action="{{ route('password.email') }}">
-                        @csrf
-
-                        <div class="form-group row">
-                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
-
-                                @if ($errors->has('email'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row mb-0">
-                            <div class="col-md-6 offset-md-4">
-                                <button type="submit" class="btn btn-primary">
-                                    {{ __('Send Password Reset Link') }}
-                                </button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection

resources/views/auth/passwords/reset.blade.php

@@ -1,65 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Reset Password') }}</div>
-
-                <div class="card-body">
-                    <form method="POST" action="{{ route('password.update') }}">
-                        @csrf
-
-                        <input type="hidden" name="token" value="{{ $token }}">
-
-                        <div class="form-group row">
-                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" required autofocus>
-
-                                @if ($errors->has('email'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
-
-                                @if ($errors->has('password'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('password') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
-                            </div>
-                        </div>
-
-                        <div class="form-group row mb-0">
-                            <div class="col-md-6 offset-md-4">
-                                <button type="submit" class="btn btn-primary">
-                                    {{ __('Reset Password') }}
-                                </button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection

resources/views/auth/register.blade.php

@@ -1,91 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Register') }}</div>
-
-                <div class="card-body">
-                    <form method="POST" action="{{ route('register') }}">
-                        @csrf
-
-                        <div class="form-group row">
-                            <label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
-
-                                @if ($errors->has('name'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('name') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
-
-                                @if ($errors->has('email'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="characterid" class="col-md-4 col-form-label text-md-right"> {{ __('CharacterId') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="characterid" type="text" class="form-control" name="characterid" required>
-
-                                @if ($errors->has('name'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('name') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
-
-                                @if ($errors->has('password'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('password') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
-                            </div>
-                        </div>
-
-                        <div class="form-group row mb-0">
-                            <div class="col-md-6 offset-md-4">
-                                <button type="submit" class="btn btn-primary">
-                                    {{ __('Register') }}
-                                </button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection

resources/views/auth/verify.blade.php

@@ -1,24 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Verify Your Email Address') }}</div>
-
-                <div class="card-body">
-                    @if (session('resent'))
-                        <div class="alert alert-success" role="alert">
-                            {{ __('A fresh verification link has been sent to your email address.') }}
-                        </div>
-                    @endif
-
-                    {{ __('Before proceeding, please check your email for a verification link.') }}
-                    {{ __('If you did not receive the email') }}, <a href="{{ route('verification.resend') }}">{{ __('click here to request another') }}</a>.
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection

resources/views/custom/login.blade.php

@@ -1,4 +0,0 @@
-@extends('layouts.b4')
-@include('inc.messages')
-
-{!! $html !!}

resources/views/finances/holding.blade.php

@@ -1,4 +0,0 @@
-@extends('layouts.b4')
-@section('contents')
-{!! $chart->render() !!}
-@endsection

resources/views/logistics/dashboard.blade.php

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

routes/web.php

@@ -52,6 +52,8 @@ Route::group(['middleware' => ['auth']], function(){
     //Register Structures Controller display pages
     Route::get('/structures/register', 'RegisterStructureController@displayRegisterstructure');
     Route::post('/structures/register', 'RegisterstructureController@storeStructure');
+    Route::get('/structures/admin/taxratio', 'RegisterStructureController@displayTaxRatioForm');
+    Route::post('/structures/admin/taxratio', 'RegisterStructureController@storeTaxRatio');
     //Structure Controller display pages
     Route::get('/structures/taxes/display', 'StructureController@displayTaxes');
     Route::get('/structures/admin/taxes/display', 'StructureController@chooseCorpTaxes');
@@ -59,8 +61,6 @@ Route::group(['middleware' => ['auth']], function(){
     Route::get('/structures/admin/taxes/industry', 'StructureController@displayIndustryTaxes');
     Route::get('/structures/admin/taxes/reprocessing', 'StructureController@displayReprocessingTaxes');
     Route::get('/structures/admin/display', 'StructureController@displayAdminPanel');
-    Route::get('/structures/admin/taxratio', 'StructureController@displayTaxRatioForm');
-    Route::post('/structures/admin/taxratio', 'StructureController@storeTaxRatio');
 
     //Scopes Controller display pages
     Route::get('/scopes/select', 'EsiScopeController@displayScopes');