diff --git a/app/Http/Controllers/Moons/MoonsController.php b/app/Http/Controllers/Moons/MoonsController.php index 0cafeabaf..d21bfc726 100644 --- a/app/Http/Controllers/Moons/MoonsController.php +++ b/app/Http/Controllers/Moons/MoonsController.php @@ -46,15 +46,6 @@ class MoonsController extends Controller ->with('moons', $moons); } - /** - * Function to display alliance moons of a particular system - */ - public function displayMoonsSystem($system) { - $moons = AllianceMoon::where(['System' => $system])->get(); - - return view('moons.user.allmoons.system')->with('moons', $moons); - } - /** * Function to display the moons and pass data to the blade template */ diff --git a/resources/views/layouts/moons/b4.blade.php b/resources/views/layouts/moons/b4.blade.php new file mode 100644 index 000000000..8ea3bd470 --- /dev/null +++ b/resources/views/layouts/moons/b4.blade.php @@ -0,0 +1,40 @@ + + + + + + + + {{ config('app.name', 'W4RP Services') }} + + + + + + + + + + + + + @include('layouts.navbar') +
+ @include('inc.messages') +
+ @yield('content') + + + + + + + \ No newline at end of file diff --git a/resources/views/moons/user/allmoons.blade.php b/resources/views/moons/user/allmoons.blade.php index 1b114a993..db08e8836 100644 --- a/resources/views/moons/user/allmoons.blade.php +++ b/resources/views/moons/user/allmoons.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.b4') +@extends('layouts.moons.b4') @section('content')
diff --git a/resources/views/moons/user/allmoons/system.blade.php b/resources/views/moons/user/allmoons/system.blade.php deleted file mode 100644 index 5ce51b6d2..000000000 --- a/resources/views/moons/user/allmoons/system.blade.php +++ /dev/null @@ -1,50 +0,0 @@ -@extends('layouts.b4') -@section('content') -
-
    - @foreach($systems as $system) -
  • - {{ $system }} -
    • - @endforeach -
- - - - - - - - - - - - - - - - - @foreach($moons as $moon) - - - - - - - - - - - - - @if($moon->Available == 1) - - @else - - @endif - - @endforeach - -
LocationCorporationStructure NameFirst OreFirst QuantitySecond OreSecond QuantityThird OreThird QuantityFourth OreFourth QuantityAvailable
{{ $moon->System . " - " . $moon->Planet . " - " . $moon->Moon }}{{ $moon->Corporation }}{{ $moon->StructureName }}{{ $moon->FirstOre }}{{ $moon->FirstQuantity }}{{ $moon->SecondOre }}{{ $moon->SecondQuantity }}{{ $moon->ThirdOre }}{{ $moon->ThirdQuantity }}{{ $moon->FourthOre }}{{ $moon->FourthQuantity }}YesNo
-
-@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 3731bcc78..d64e52861 100644 --- a/routes/web.php +++ b/routes/web.php @@ -130,7 +130,6 @@ Route::group(['middleware' => ['auth']], function(){ Route::get('/moons/display/form/worth', 'Moons\MoonsController@displayTotalWorthForm'); Route::post('/moons/worth', 'Moons\MoonsController@displayTotalWorth'); Route::get('/moons/display/all', 'Moons\MoonsController@displayMoons'); - Route::get('/moons/display/{system}', 'Moons\MoonsController@displayMoonsSystem'); /** * Moon Admin Controller display pages