diff --git a/app/Http/Controllers/FleetsController.php b/app/Http/Controllers/FleetsController.php index 9712a3c5a..874c498b8 100644 --- a/app/Http/Controllers/FleetsController.php +++ b/app/Http/Controllers/FleetsController.php @@ -21,14 +21,10 @@ class FleetsController extends Controller return view('fleets.registerfleet'); } - public function displayStandingFleet() { - //Retrieve the fleet from the session - $fleet = $request->session()->get('fleet'); - //Display standing fleets - $display = $fleet->RenderFleetDisplay(); + public function displayFleets() { //Return the view with the array of the fleet - return view('fleets.displaystanding')->with('display', $display); + return view('fleets.displayfleets'); } public function registerFleet(Request $request) { diff --git a/resources/views/fleets/displaystanding.blade.php b/resources/views/fleets/displayfleets.blade.php similarity index 87% rename from resources/views/fleets/displaystanding.blade.php rename to resources/views/fleets/displayfleets.blade.php index 528eb3a46..e93bf5708 100644 --- a/resources/views/fleets/displaystanding.blade.php +++ b/resources/views/fleets/displayfleets.blade.php @@ -1,6 +1,7 @@ @extends('layouts.b4') @section('content')
+

Work in Progress aka NOTHING WORKS!


Standing Fleet

Join Standing Fleet @if($fleetCommander == true) diff --git a/resources/views/fleets/registerfleet.blade.php b/resources/views/fleets/registerfleet.blade.php index f71192984..98fa7d89a 100644 --- a/resources/views/fleets/registerfleet.blade.php +++ b/resources/views/fleets/registerfleet.blade.php @@ -4,8 +4,8 @@

Register A New Fleet

{!! Form::open(['action' => 'FleetsController@registerFleet', 'method' => 'POST']) !!}
- {{ Form::label('fleet', 'Fleet') }} - {{ Form::text('fleet', '', ['class' => 'form-control', 'placeholder' => 'Fleet URL']) }} + {{ Form::label('fleetUri', 'Fleet') }} + {{ Form::text('fleetUri', '', ['class' => 'form-control', 'placeholder' => 'Fleet URL']) }}
{{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} {!! Form::close() !!} diff --git a/routes/web.php b/routes/web.php index 8f2ba3da4..bfb0ba796 100644 --- a/routes/web.php +++ b/routes/web.php @@ -45,9 +45,8 @@ Route::get('/scopes/select', 'EsiScopeController@displayScopes'); Route::post('redirectToProvider', 'EsiScopeController@redirectToProvider'); //Fleet Controller display pages -Route::get('/fleets/display'); +Route::get('/fleets/display', 'FleetsController@displayFleets'); Route::get('/fleets/register', 'FleetsController@displayRegisterFleet'); -Route::get('/fleets/standing', 'FleetsController@displayStandingFleet'); Route::get('/fleets/addpilot/{id}', 'FleetsController@addPilot'); //Admin Controller display pages