moon display
This commit is contained in:
@@ -32,9 +32,11 @@ class MoonsAdminController extends Controller
|
||||
* Function to display moon requests
|
||||
*/
|
||||
public function displayMoonRequests() {
|
||||
$requests = AllianceMoonRequest::where([
|
||||
'status' => 'Pending',
|
||||
])->get();
|
||||
|
||||
|
||||
return view('moon.admin.moonrequest');
|
||||
return view('moon.admin.moonrequest')->with('requests', $requests);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -42,8 +44,19 @@ class MoonsAdminController extends Controller
|
||||
*/
|
||||
public function storeApprovedMoonRequest(Request $request) {
|
||||
$this->validate($request, [
|
||||
|
||||
'id' => 'required',
|
||||
'status' => 'required',
|
||||
]);
|
||||
|
||||
AllianceMoonRequest::where([
|
||||
'id' => $request->id,
|
||||
])->update([
|
||||
'status' => $request->status,
|
||||
'approver_name' => auth()->user()->getName(),
|
||||
'approver_id' => auth()->user()->getId(),
|
||||
]);
|
||||
|
||||
return redirect('/moons/admin/display/requests');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,9 +17,11 @@ use App\Models\Moon\OrePrice;
|
||||
use App\Models\Moon\Price;
|
||||
use App\Models\MoonRent\MoonRental;
|
||||
use App\Models\Moon\AllianceMoon;
|
||||
use App\Models\Moon\AllianceMoonRequest;
|
||||
|
||||
//Library
|
||||
use App\Library\Moons\MoonCalc;
|
||||
use App\Library\Lookups\LookupHelper;
|
||||
|
||||
class MoonsController extends Controller
|
||||
{
|
||||
@@ -49,17 +51,117 @@ class MoonsController extends Controller
|
||||
/**
|
||||
* Function to display moon request form
|
||||
*/
|
||||
public function displayRequestMoon() {
|
||||
public function displayRequestAllianceMoon() {
|
||||
return view('moon.user.requestmoon');
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to store the moon request
|
||||
*/
|
||||
public function storeRequestMoon(Request $request) {
|
||||
public function storeRequestAllianceMoon(Request $request) {
|
||||
$this->validate($request, [
|
||||
|
||||
'system' => 'required',
|
||||
'planet' => 'required',
|
||||
'moon' => 'required',
|
||||
]);
|
||||
|
||||
//Declare some necessary arrays for figuring out what region a moon resides in
|
||||
$catch = [
|
||||
'6X7-JO',
|
||||
'A803-L',
|
||||
'I8-D0G',
|
||||
'WQH-4K',
|
||||
'GJ0-JO',
|
||||
'Q-S7ZD',
|
||||
'JWZ2-V',
|
||||
'J-ODE7',
|
||||
'OGL8-Q',
|
||||
'R-K4QY',
|
||||
];
|
||||
|
||||
$immensea = [
|
||||
'ZBP-TP',
|
||||
'XVV-21',
|
||||
'B9E-H6',
|
||||
'JDAS-0',
|
||||
'Y19P-1',
|
||||
'LN-56V',
|
||||
'O7-7UX',
|
||||
'Y2-QUV',
|
||||
'SPBS-6',
|
||||
'A4B-V5',
|
||||
'GXK-7F',
|
||||
'78TS-Q',
|
||||
'CJNF-J',
|
||||
'EA-HSA',
|
||||
'FYI-49',
|
||||
'WYF8-8',
|
||||
'NS2L-4',
|
||||
'B-S347',
|
||||
'AF0-V5',
|
||||
'QI-S9W',
|
||||
'B-A587',
|
||||
'PPFB-U',
|
||||
'L-5JCJ',
|
||||
'4-GB14',
|
||||
'REB-KR',
|
||||
'QE-E1D',
|
||||
'LK1K-5',
|
||||
'Z-H2MA',
|
||||
'B-KDOZ',
|
||||
'E8-YS9',
|
||||
];
|
||||
|
||||
//Declare lookup variables
|
||||
$lookup = new LookupHelper;
|
||||
|
||||
//Get all of the information needed to create the database entry
|
||||
$charId = auth()->user()->getId();
|
||||
$charInfo = $lookup->GetCharacterInfo($charId);
|
||||
$charName = $charInfo->name;
|
||||
$corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
|
||||
$corpId = $corpInfo->corporation_id;
|
||||
$corpName = $corpInfo->name;
|
||||
$corpTicker = $corpInfo->ticker;
|
||||
//Declare the region variable as null for the lookup if statement
|
||||
$region = null;
|
||||
|
||||
//Get the region the moon resides in from the system
|
||||
if(in_array($request->system, $catch, true)) {
|
||||
$region = 'Catch';
|
||||
} else if(in_array($request->system, $immensea, true)) {
|
||||
$region = 'Immensea';
|
||||
} else {
|
||||
//False value. Redirect back to page
|
||||
return redirct('/moons/display/request')->with('error', 'Region was not found.');
|
||||
}
|
||||
|
||||
|
||||
//Create the new object to save into the database
|
||||
$moonRequest = new AllianceMoonReqeuest;
|
||||
$moonRequest->region = $region;
|
||||
$moonRequest->system = $request->system;
|
||||
$moonRequest->planet = $request->planet;
|
||||
$moonRequest->moon = $request->moon;
|
||||
$moonRequest->corporation_id = $corpId;
|
||||
$moonRequest->corporation_name = $corpName;
|
||||
$moonRequest->corporation_ticker = $corpTicker;
|
||||
$moonRequest->requestor_name = $charName;
|
||||
$moonRequest->requestor_id = $charId;
|
||||
$moonRequest->status = 'Pending';
|
||||
$moonRequest->save();
|
||||
|
||||
//Update the current moon's status in the model AllianceMoon
|
||||
AllianceMoon::where([
|
||||
'region' => $region,
|
||||
'system' => $request->system,
|
||||
'planet' => $request->planet,
|
||||
'moon' => $request->moon,
|
||||
])->update([
|
||||
'Available' => 'Request Pending',
|
||||
]);
|
||||
|
||||
return redirect('/moons/display/request')->with('success', 'Moon request submitted.');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
37
app/Models/Moon/AllianceMoonRequest.php
Normal file
37
app/Models/Moon/AllianceMoonRequest.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models\Moon;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class AllianceMoonRequest extends Model
|
||||
{
|
||||
// Table Name
|
||||
protected $table = 'alliance_moon_requests';
|
||||
|
||||
//Primary Key
|
||||
public $primaryKey = 'id';
|
||||
|
||||
//Timestamps
|
||||
public $timestamps = true;
|
||||
|
||||
/**
|
||||
* The fillable items for each entry
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $fillable = [
|
||||
'region',
|
||||
'system',
|
||||
'planet',
|
||||
'moon',
|
||||
'corporation_name',
|
||||
'corporation_ticker',
|
||||
'corporation_id',
|
||||
'requestor_name',
|
||||
'requestor_id',
|
||||
'approver_name',
|
||||
'approver_id',
|
||||
'status',
|
||||
];
|
||||
}
|
||||
@@ -31,7 +31,35 @@ class CreateAllianceMoonsTable extends Migration
|
||||
$table->string('FourthOre')->default('None');
|
||||
$table->integer('FourthQuantity')->default('0');
|
||||
$table->string('Moon_Type');
|
||||
$table->boolean('Available')->default(true);
|
||||
$table->enum('Available', [
|
||||
'Available',
|
||||
'Request Pending',
|
||||
'Reserved',
|
||||
'Deployed',
|
||||
])->default('Available');
|
||||
});
|
||||
}
|
||||
|
||||
if(!Schema::hasTable('alliance_moon_requests')) {
|
||||
Schema::create('alliance_moon_requests', function (Blueprint $table) {
|
||||
$table->bigIncrements('id');
|
||||
$table->string('region');
|
||||
$table->string('system');
|
||||
$table->string('planet');
|
||||
$table->string('moon');
|
||||
$table->string('corporation_name');
|
||||
$table->string('corporation_ticker');
|
||||
$table->unsignedBigInteger('corporation_id');
|
||||
$table->string('requestor_name');
|
||||
$table->unsignedBigInteger('requestor_id');
|
||||
$table->string('approver_name')->nullable();
|
||||
$table->ungignedBigInteger('approver_id')->nullable();
|
||||
$table->enum('status', [
|
||||
'Pending',
|
||||
'Approved',
|
||||
'Denied',
|
||||
]);
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -44,5 +72,6 @@ class CreateAllianceMoonsTable extends Migration
|
||||
public function down()
|
||||
{
|
||||
Schema::dropIfExists('alliance_moons');
|
||||
Schema::dropIfExists('alliance_moon_requests');
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,42 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||
<head>
|
||||
<title>{{ config('app.name', 'W4RP Services') }}</title>
|
||||
<!-- Required meta tags -->
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
|
||||
<!-- CSRF Token -->
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
|
||||
<!-- Bootstrap CSS
|
||||
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css" integrity="sha384-Smlep5jCw/wG7hdkwQ/Z5nLIefveQRIY9nfy6xoR1uRYBtpZgI6339F5dgvm/e9B" crossorigin="anonymous">
|
||||
-->
|
||||
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
|
||||
<script src = "https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
|
||||
<script>
|
||||
function getMessage(){
|
||||
$.ajax({
|
||||
type:'POST',
|
||||
url:'/getmsg',
|
||||
data:'_token = <?php echo csrf_token() ?>',
|
||||
success:function(data){
|
||||
$("#msg").html(data.msg);
|
||||
}
|
||||
});
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
@include('layouts.navbar')
|
||||
<div class="container">
|
||||
@include('inc.messages')
|
||||
</div>
|
||||
@yield('content')
|
||||
<!-- Optional JavaScript -->
|
||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
|
||||
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/js/bootstrap.min.js" integrity="sha384-o+RDsa0aLu++PJvFqy8fFScvbHFLtbvScb8AjopnFD+iEQ7wo/CG0xlczd+2O/em" crossorigin="anonymous"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -9,14 +9,11 @@
|
||||
<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">Moons</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
|
||||
@if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Renter'))
|
||||
<a class="dropdown-item" href="/moons/display/rentals">Display Moons</a>
|
||||
@if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin') || auth()->user()->hasRole('Renter'))
|
||||
<a class="dropdown-item" href="/moons/display/all">Display All Moons</a>
|
||||
<a class="dropdown-item" href="/moons/display/rentals">Display Rental Moons</a>
|
||||
<a class="dropdown-item" href="/moons/display/form/worth">Moon Worth</a>
|
||||
@endif
|
||||
@if(auth()->user()->hasRole('Admin'))
|
||||
<a class="dropdown-item" href="/moons/admin/display/rentals">Display Moons</a>
|
||||
<a class="dropdown-item" href="/moons/display/form/worth">Moon Worth</a>
|
||||
<a class="dropdown-item" href="/moons/admin/updatemoon">Update Moon</a>
|
||||
<a class="dropdown-item" href="/moons/display/request">Moon Reservation</a>
|
||||
@endif
|
||||
@if(auth()->user()->hasPermission('corp.lead'))
|
||||
<a class="dropdown-item" href="/moons/ledger/display/select">Mining Ledger</a>
|
||||
@@ -30,12 +27,6 @@
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
|
||||
<a class="dropdown-item" href="/srp/form/display">SRP Form</a>
|
||||
<a class="dropdown-item" href="/srp/display/costcodes">Cost Codes</a>
|
||||
@if(auth()->user()->hasPermission('srp.admin'))
|
||||
<a class="dropdown-item" href="/srp/admin/display">SRP Admin Dashboard</a>
|
||||
<a class="dropdown-item" href="/srp/admin/statistics">SRP Statistics</a>
|
||||
<a class="dropdown-item" href="/srp/admin/costcodes/display">SRP Admin Cost Codes</a>
|
||||
<a class="dropdown-item" href="/srp/admin/display/history">SRP History</a>
|
||||
@endif
|
||||
</div>
|
||||
</li>
|
||||
@endif
|
||||
@@ -46,10 +37,6 @@
|
||||
<a class="dropdown-item" href="/contracts/display/all">Display All Contracts</a>
|
||||
<a class="dropdown-item" href="/contracts/display/public">Display Public Contracts</a>
|
||||
<a class="dropdown-item" href="/contracts/display/private">Display Private Contracts</a>
|
||||
@if(auth()->user()->hasPermission('contract.admin'))
|
||||
<a class="dropdown-item" href="/contracts/admin/display">Admin Dashboard</a>
|
||||
<a class="dropdown-item" href="/contracts/admin/new">New Contract</a>
|
||||
@endif
|
||||
</div>
|
||||
</li>
|
||||
@endif
|
||||
@@ -121,6 +108,32 @@
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item dropbox">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Moon Admin</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
|
||||
<a class="dropdown-item" href="/moons/admin/display/rentals">Display Moons</a>
|
||||
<a class="dropdown-item" href="/moons/admin/updatemoon">Update Moon</a>
|
||||
<a class="dropdown-item" href="/moons/admin/display/request">Moon Request</a>
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item dropbox">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">SRP Admin</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
|
||||
<a class="dropdown-item" href="/srp/admin/display">SRP Admin Dashboard</a>
|
||||
<a class="dropdown-item" href="/srp/admin/statistics">SRP Statistics</a>
|
||||
<a class="dropdown-item" href="/srp/admin/costcodes/display">SRP Admin Cost Codes</a>
|
||||
<a class="dropdown-item" href="/srp/admin/display/history">SRP History</a>
|
||||
</div>
|
||||
</li>
|
||||
@endif
|
||||
@if(auth()->user()->hasPermission('srp.admin'))
|
||||
<li class="nav-item dropbox">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Contract Admin</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
|
||||
<a class="dropdown-item" href="/contracts/admin/display">Admin Dashboard</a>
|
||||
<a class="dropdown-item" href="/contracts/admin/new">New Contract</a>
|
||||
</div>
|
||||
</li>
|
||||
@endif
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="/profile">Profile</a>
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
<nav class="navbar navbar-expand-lg navbar-dark bg-primary rounded">
|
||||
<a class="navbar-brand" href="#">Navbar</a>
|
||||
<ul class="navbar-nav mr-auto">
|
||||
<li class="nav-item active">
|
||||
<a class="nav-link">Left Link 1</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link">Left Link 2</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link">Right Link 1</a>
|
||||
</li>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Dropdown on Right</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
|
||||
<a class="dropdown-item" href="#">Action</a>
|
||||
<a class="dropdown-item" href="#">Another action with a lot of text inside of an item</a>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
41
resources/views/moons/admin/moonrequest.blade.php
Normal file
41
resources/views/moons/admin/moonrequest.blade.php
Normal file
@@ -0,0 +1,41 @@
|
||||
@extends('layouts.b4')
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h2>Alliance Moon Requests</h2>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table table-striped table-bordered">
|
||||
<thead>
|
||||
<th>Region</th>
|
||||
<th>System - Planet - Moon</th>
|
||||
<th>Corporation</th>
|
||||
<th>Requestor</th>
|
||||
<th> </th>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($requests as $req)
|
||||
<tr>
|
||||
{!! Form::open(['action' => 'Moons\MoonsAdminController@storeApprovedMoonRequest', 'method' => 'POST']) !!}
|
||||
<td>{{ $req->region }}</td>
|
||||
<td>{{ $req->system . " - " . $req->planet . " - " . $req->moon }}</td>
|
||||
<td>{{ $req->corporation_name }}</td>
|
||||
<td>{{ $req->requestor_name }}</td>
|
||||
<td>
|
||||
{{ Form::hidden('id', $req->id) }}
|
||||
{{ Form::select('status', [
|
||||
'Approved' => 'Approved',
|
||||
'Denied' => 'Denied',
|
||||
], 'Select') }}
|
||||
</td>
|
||||
{{ Form::submit('Update', ['class' => 'btn btn-primary']) }}
|
||||
{!! Form::close() !!}
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
68
resources/views/moons/user/requestmoon.blade.php
Normal file
68
resources/views/moons/user/requestmoon.blade.php
Normal file
@@ -0,0 +1,68 @@
|
||||
@extends('layouts.b4')
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h2>Moon Reservation Request Form</h2>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{!! Form::open(['action' => 'Moons\MoonsController@storeRequestAllianceMoon', 'method' => 'POST']) !!}
|
||||
<div class="form-group">
|
||||
{{ Form::label('system', 'System') }}
|
||||
{{ Form::select('system', [
|
||||
'4-GB14' => '4-GB14',
|
||||
'6X7-JO' => '6X7-JO',
|
||||
'78TS-Q' => '78TS-Q',
|
||||
'AF0-V5' => 'AF0-V5',
|
||||
'A4B-V5' => 'A4B-V5',
|
||||
'A803-L' => 'A803-L',
|
||||
'B-A587' => 'B-A587',
|
||||
'B-KDOZ' => 'B-KDOZ',
|
||||
'B-S347' => 'B-S347',
|
||||
'B9E-H6' => 'B9E-H6',
|
||||
'CJNF-J' => 'CJNF-J',
|
||||
'E8-YS9' => 'E8-YS9',
|
||||
'EA-HSA' => 'EA-HSA',
|
||||
'FYI-49' => 'FYI-49',
|
||||
'GJ0-JO' => 'GJ0-JO',
|
||||
'GXK-7F' => 'GXK-7F',
|
||||
'I8-D0G' => 'I8-D0G',
|
||||
'J-ODE7' => 'J-ODE7',
|
||||
'JDAS-0' => 'JDAS-0',
|
||||
'JWZ2-V' => 'JWZ2-V',
|
||||
'L-5JCJ' => 'L-5JCJ',
|
||||
'LK1K-5' => 'LK1K-5',
|
||||
'LN-56V' => 'LN-56V',
|
||||
'NS2L-4' => 'NS2L-4',
|
||||
'O7-7UX' => 'O7-7UX',
|
||||
'OGL8-Q' => 'OGL8-Q',
|
||||
'PPFB-U' => 'PPFB-U',
|
||||
'Q-S7ZD' => 'Q-S7ZD',
|
||||
'QE-E1D' => 'QE-E1D',
|
||||
'QI-S9W' => 'QI-S9W',
|
||||
'R-K4QY' => 'R-K4QY',
|
||||
'REB-KR' => 'REB-KR',
|
||||
'SPBS-6' => 'SPBS-6',
|
||||
'WQH-4K' => 'WQH-4K',
|
||||
'WYF8-8' => 'WYF8-8',
|
||||
'XVV-21' => 'XVV-21',
|
||||
'Y19P-1' => 'Y19P-1',
|
||||
'Y2-QUV' => 'Y2-QUV',
|
||||
'Z-H2MA' => 'Z-H2MA',
|
||||
'ZBP-TP' => 'ZBP-TP',
|
||||
], 'None') }}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{{ Form::label('planet', 'Planet') }}
|
||||
{{ Form::text('planet', '', ['class' => 'form-control']) }}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{{ Form::label('moon', 'Moon') }}
|
||||
{{ Form::text('moon', '', ['class' => 'form-control']) }}
|
||||
</div>
|
||||
{{ Form::submit('Submit Request', ['class' => 'btn btn-primary']) }}
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@@ -130,6 +130,8 @@ 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/request', 'Moons\MoonsController@displayRequestAllianceMoon');
|
||||
Route::post('/moon/display/request', 'Moons\MoonsController@storeRequestAllianceMoon');
|
||||
|
||||
/**
|
||||
* Moon Admin Controller display pages
|
||||
@@ -138,6 +140,8 @@ Route::group(['middleware' => ['auth']], function(){
|
||||
Route::get('/moons/admin/updatemoon', 'Moons\MoonsAdminController@updateMoon');
|
||||
Route::post('/moons/admin/updatemoon', 'Moons\MoonsAdminController@storeUpdateMoon');
|
||||
Route::post('/moons/admin/display/rentals', 'Moons\MoonsAdminController@storeMoonRemoval');
|
||||
Route::get('/moons/admin/display/request', 'Moons\MoonsAdminController@displayMoonReqquests');
|
||||
Route::post('/moons/admin/display/request', 'Moons\MoonsAdminController@storeApprovedMoonRequest');
|
||||
|
||||
/**
|
||||
* Moon Ledger Controller display pages
|
||||
|
||||
4
vendor/composer/ClassLoader.php
vendored
4
vendor/composer/ClassLoader.php
vendored
@@ -279,7 +279,7 @@ class ClassLoader
|
||||
*/
|
||||
public function setApcuPrefix($apcuPrefix)
|
||||
{
|
||||
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
|
||||
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -377,7 +377,7 @@ class ClassLoader
|
||||
$subPath = $class;
|
||||
while (false !== $lastPos = strrpos($subPath, '\\')) {
|
||||
$subPath = substr($subPath, 0, $lastPos);
|
||||
$search = $subPath.'\\';
|
||||
$search = $subPath . '\\';
|
||||
if (isset($this->prefixDirsPsr4[$search])) {
|
||||
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
|
||||
foreach ($this->prefixDirsPsr4[$search] as $dir) {
|
||||
|
||||
6
vendor/composer/autoload_classmap.php
vendored
6
vendor/composer/autoload_classmap.php
vendored
@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
|
||||
$baseDir = dirname($vendorDir);
|
||||
|
||||
return array(
|
||||
'App\\AllianceMoons' => $baseDir . '/app/Models/Moon/AllianceMoons.php',
|
||||
'App\\Console\\Commands\\CleanStaleDataCommand' => $baseDir . '/app/Console/Commands/Data/CleanStaleDataCommand.php',
|
||||
'App\\Console\\Commands\\EmptyJumpBridges' => $baseDir . '/app/Console/Commands/Data/EmptyJumpBridges.php',
|
||||
'App\\Console\\Commands\\FlexStructureCommand' => $baseDir . '/app/Console/Commands/Flex/FlexStructureCommand.php',
|
||||
@@ -108,13 +107,12 @@ return array(
|
||||
'App\\Models\\Mail\\EveMail' => $baseDir . '/app/Models/Mail/EveMail.php',
|
||||
'App\\Models\\Mail\\SentMail' => $baseDir . '/app/Models/Mail/SentMail.php',
|
||||
'App\\Models\\MoonRent\\MoonRental' => $baseDir . '/app/Models/MoonRentals/MoonRental.php',
|
||||
'App\\Models\\Moon\\AvgMineralPrices' => $baseDir . '/app/Models/Moon/AvgMineralPrices.php',
|
||||
'App\\Models\\Moon\\AvgOrePrices' => $baseDir . '/app/Models/Moon/AvgOrePrices.php',
|
||||
'App\\Models\\Moon\\AllianceMoon' => $baseDir . '/app/Models/Moon/AllianceMoon.php',
|
||||
'App\\Models\\Moon\\Config' => $baseDir . '/app/Models/Moon/Config.php',
|
||||
'App\\Models\\Moon\\ItemComposition' => $baseDir . '/app/Models/Moon/ItemComposition.php',
|
||||
'App\\Models\\Moon\\MineralPrice' => $baseDir . '/app/Models/Moon/MineralPrice.php',
|
||||
'App\\Models\\Moon\\Moon' => $baseDir . '/app/Models/Moon/Moon.php',
|
||||
'App\\Models\\Moon\\OrePrice' => $baseDir . '/app/Models/Moon/OrePrice.php',
|
||||
'App\\Models\\Moon\\Price' => $baseDir . '/app/Models/Moon/MineralPrice.php',
|
||||
'App\\Models\\SRP\\SRPShip' => $baseDir . '/app/Models/SRP/SRPShip.php',
|
||||
'App\\Models\\SRP\\SrpFleetType' => $baseDir . '/app/Models/SRP/SrpFleetType.php',
|
||||
'App\\Models\\SRP\\SrpPayout' => $baseDir . '/app/Models/SRP/SrpPayout.php',
|
||||
|
||||
6
vendor/composer/autoload_static.php
vendored
6
vendor/composer/autoload_static.php
vendored
@@ -470,7 +470,6 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
|
||||
);
|
||||
|
||||
public static $classMap = array (
|
||||
'App\\AllianceMoons' => __DIR__ . '/../..' . '/app/Models/Moon/AllianceMoons.php',
|
||||
'App\\Console\\Commands\\CleanStaleDataCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Data/CleanStaleDataCommand.php',
|
||||
'App\\Console\\Commands\\EmptyJumpBridges' => __DIR__ . '/../..' . '/app/Console/Commands/Data/EmptyJumpBridges.php',
|
||||
'App\\Console\\Commands\\FlexStructureCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Flex/FlexStructureCommand.php',
|
||||
@@ -572,13 +571,12 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
|
||||
'App\\Models\\Mail\\EveMail' => __DIR__ . '/../..' . '/app/Models/Mail/EveMail.php',
|
||||
'App\\Models\\Mail\\SentMail' => __DIR__ . '/../..' . '/app/Models/Mail/SentMail.php',
|
||||
'App\\Models\\MoonRent\\MoonRental' => __DIR__ . '/../..' . '/app/Models/MoonRentals/MoonRental.php',
|
||||
'App\\Models\\Moon\\AvgMineralPrices' => __DIR__ . '/../..' . '/app/Models/Moon/AvgMineralPrices.php',
|
||||
'App\\Models\\Moon\\AvgOrePrices' => __DIR__ . '/../..' . '/app/Models/Moon/AvgOrePrices.php',
|
||||
'App\\Models\\Moon\\AllianceMoon' => __DIR__ . '/../..' . '/app/Models/Moon/AllianceMoon.php',
|
||||
'App\\Models\\Moon\\Config' => __DIR__ . '/../..' . '/app/Models/Moon/Config.php',
|
||||
'App\\Models\\Moon\\ItemComposition' => __DIR__ . '/../..' . '/app/Models/Moon/ItemComposition.php',
|
||||
'App\\Models\\Moon\\MineralPrice' => __DIR__ . '/../..' . '/app/Models/Moon/MineralPrice.php',
|
||||
'App\\Models\\Moon\\Moon' => __DIR__ . '/../..' . '/app/Models/Moon/Moon.php',
|
||||
'App\\Models\\Moon\\OrePrice' => __DIR__ . '/../..' . '/app/Models/Moon/OrePrice.php',
|
||||
'App\\Models\\Moon\\Price' => __DIR__ . '/../..' . '/app/Models/Moon/MineralPrice.php',
|
||||
'App\\Models\\SRP\\SRPShip' => __DIR__ . '/../..' . '/app/Models/SRP/SRPShip.php',
|
||||
'App\\Models\\SRP\\SrpFleetType' => __DIR__ . '/../..' . '/app/Models/SRP/SrpFleetType.php',
|
||||
'App\\Models\\SRP\\SrpPayout' => __DIR__ . '/../..' . '/app/Models/SRP/SrpPayout.php',
|
||||
|
||||
Reference in New Issue
Block a user