From 27939b153ff4ce70c6a4edaca27f150e67db4eff Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Sun, 7 Jun 2020 22:18:15 -0500 Subject: [PATCH] navigation issue --- .../Controllers/Moons/MoonsController.php | 1 - .../Moons/RentalMoonsAdminController.php | 62 +++++++++++++++++++ .../layouts/user/dashboard/content.blade.php | 2 + .../layouts/user/dashboard/main.blade.php | 3 + .../views/moons/admin/rentalmoon.blade.php | 23 +++++++ routes/web.php | 9 +++ 6 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 app/Http/Controllers/Moons/RentalMoonsAdminController.php create mode 100644 resources/views/moons/admin/rentalmoon.blade.php diff --git a/app/Http/Controllers/Moons/MoonsController.php b/app/Http/Controllers/Moons/MoonsController.php index 57c120298..fb9846cf3 100644 --- a/app/Http/Controllers/Moons/MoonsController.php +++ b/app/Http/Controllers/Moons/MoonsController.php @@ -12,7 +12,6 @@ use Carbon\Carbon; //Models use App\Models\Moon\Config; use App\Models\Moon\ItemComposition; -use App\Models\Moon\RentalMoon; use App\Models\Moon\OrePrice; use App\Models\Moon\Price; use App\Models\Moon\AllianceMoon; diff --git a/app/Http/Controllers/Moons/RentalMoonsAdminController.php b/app/Http/Controllers/Moons/RentalMoonsAdminController.php new file mode 100644 index 000000000..985700dbe --- /dev/null +++ b/app/Http/Controllers/Moons/RentalMoonsAdminController.php @@ -0,0 +1,62 @@ +middleware('auth'); + $this->middelware('role:user'); + $this->middleware('permission:mining.director'); + } + + /** + * Function to display rental moons being used for the alliance + */ + public function displayAllianceUsageRentalMoons() { + + } + + + /** + * Display the form for requesting new rental moon for the alliance + */ + public function displayRentalMoonForAllianceForm() { + + } + + + /** + * Function to store when a new rental moon is requested + */ + public function storeRentalMoonForAlliance(Request $request) { + + } + + /** + * Function to display the form for figuring out item composition + */ + public function displayItemCompositionForm() { + + } + + /** + * Function to display the results of the form for figuring out item composition + */ + public function displayItemCompositionResults(Request $request) { + + } +} diff --git a/resources/views/layouts/user/dashboard/content.blade.php b/resources/views/layouts/user/dashboard/content.blade.php index cbcf7d64c..f78f6d621 100644 --- a/resources/views/layouts/user/dashboard/content.blade.php +++ b/resources/views/layouts/user/dashboard/content.blade.php @@ -1,5 +1,7 @@
+ + @include('inc.messages')
@yield('content') diff --git a/resources/views/layouts/user/dashboard/main.blade.php b/resources/views/layouts/user/dashboard/main.blade.php index 79ae0d3c1..c671b928a 100644 --- a/resources/views/layouts/user/dashboard/main.blade.php +++ b/resources/views/layouts/user/dashboard/main.blade.php @@ -22,6 +22,9 @@ @include('layouts.user.sidebarmenu.general') @endif + + @include('layouts.user.sidebarmenu.wiki') + @include('layouts.user.sidebarmenu.moon') diff --git a/resources/views/moons/admin/rentalmoon.blade.php b/resources/views/moons/admin/rentalmoon.blade.php new file mode 100644 index 000000000..3482e0457 --- /dev/null +++ b/resources/views/moons/admin/rentalmoon.blade.php @@ -0,0 +1,23 @@ +@extends('layous.admin.b4') +@section('content') +
+
+
+

Set Rental Moons for Alliance

+
+
+ {!! Form::open(['action' => 'Moons\MoonsAdminController@storeRentalMoonForAlliance', 'method' => 'POST']) !!} +
+ {{ Form::label('moon', 'Moon') }} + {{ Form::select('moon', $moons, ['class' => 'form-control']) }} +
+
+ {{ Form::label('until', 'End Date') }} + {{ Form::date('until', \Carbon\Carbon::now()->endOfMonth(), ['class' => 'form-control']) }} +
+ {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} + {!! Form::close() !!} +
+
+
+@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 8dfa33135..e661a3e4d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -137,6 +137,15 @@ Route::group(['middleware' => ['auth']], function(){ Route::get('/moons/ledger/display/rentals', 'Moons\MoonLedgerController@displayRentalMoonLedger'); Route::get('/moons/ledger/register', 'Moons\MoonLedgerController@registerStructures'); + /** + * Moon Rental Controller display pages + */ + Route::get('/rentals/moons/alliance/display', 'Moons\RentalMoonsAdminController@displayAllianceUsageRentalMoons'); + Route::get('/rentals/moons/alliance/request', 'Moons\RentalMoonsAdminController@displayRentalMoonForAllianceForm'); + Route::post('/rentals/moons/alliance/request', 'Moons\RentalMoonsAdminController@storeREntalMoonForAlliance'); + Route::get('/moons/composition/display', 'Moons\RentalMoonsAdminController@displayItemCompositionForm'); + Route::post('/moons/composition/display', 'Moons\RentalMoonsAdminController@displayItemCompositionResults'); + /** * Scopes Controller display pages */