diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/AzpChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/AzpChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/NameChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/NameChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/OwnerChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/OwnerChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/ScpChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/ScpChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php b/app/Library/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Library/Socialite/EveOnline/Checker/Header/TypeChecker.php b/app/Library/Socialite/EveOnline/Checker/Header/TypeChecker.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/AzpChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/AzpChecker.php new file mode 100644 index 000000000..2bde1f043 --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/AzpChecker.php @@ -0,0 +1,50 @@ +client_id = $client_id; + } + + /** + * {@inheritdoc} + */ + public function checkClaim($value) : void { + if(!is_string($value)) { + throw new InvalidClaimException('"azp" must a string.', self::NAME, $value); + } + + if ($value !== $this->client_id) + throw new InvalidClaimException('"azp" must match the originating application.', self::NAME, $value); + } + + /** + * {@inheritdoc} + */ + public function supportedClaim(): string { + return self::NAME; + } +} + +?> \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/NameChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/NameChecker.php new file mode 100644 index 000000000..c316f0d1d --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/NameChecker.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/OwnerChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/OwnerChecker.php new file mode 100644 index 000000000..cd026a22b --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/OwnerChecker.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/ScpChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/ScpChecker.php new file mode 100644 index 000000000..fc3b11989 --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/ScpChecker.php @@ -0,0 +1,54 @@ +scopes = $scopes; + } + + /** + * {@inheritdoc} + */ + public function checkClaim($value): void + { + if (! is_array($value) && ! is_string($value)) + throw new InvalidClaimException('"scp" must be an array of scopes.', self::NAME, $value); + + if (! is_array($value)) + $value = [$value]; + + if (! empty(array_diff($this->scopes, $value))) + throw new InvalidClaimException('"scp" contains scopes which does not match requested ones or miss some requested scopes.', self::NAME, $value); + } + + /** + * {@inheritdoc} + */ + public function supportedClaim(): string + { + return self::NAME; + } +} + +?> \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php b/app/Providers/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php new file mode 100644 index 000000000..03744a7fe --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Claim/SubEveCharacterChecker.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/app/Providers/Socialite/EveOnline/Checker/Header/TypeChecker.php b/app/Providers/Socialite/EveOnline/Checker/Header/TypeChecker.php new file mode 100644 index 000000000..fb6f37f2c --- /dev/null +++ b/app/Providers/Socialite/EveOnline/Checker/Header/TypeChecker.php @@ -0,0 +1,63 @@ +supported_types = $supported_types; + $this->protected_header = $protected_header; + } + + /** + * {@inheritdoc} + */ + public function checkHeader($value): void + { + if (! is_string($value)) + throw new InvalidHeaderException('"typ" must be a string.', self::HEADER_NAME, $value); + + if (! in_array($value, $this->supported_types, true)) + throw new InvalidHeaderException('Unsupported type.', self::HEADER_NAME, $value); + } + + /** + * {@inheritdoc} + */ + public function supportedHeader(): string + { + return self::HEADER_NAME; + } + + /** + * {@inheritdoc} + */ + public function protectedHeaderOnly(): bool + { + return $this->protected_header; + } +} + +?> \ No newline at end of file diff --git a/resources/views/layouts/admin/sidebarmenu/general.blade.php b/resources/views/layouts/admin/sidebarmenu/general.blade.php index 296df9171..f918611d5 100644 --- a/resources/views/layouts/admin/sidebarmenu/general.blade.php +++ b/resources/views/layouts/admin/sidebarmenu/general.blade.php @@ -27,12 +27,6 @@

Allowed Logins

- -@endif - \ No newline at end of file diff --git a/resources/views/layouts/user/sidebarmenu/general.blade.php b/resources/views/layouts/user/sidebarmenu/general.blade.php index 57f2a4926..40efec12e 100644 --- a/resources/views/layouts/user/sidebarmenu/general.blade.php +++ b/resources/views/layouts/user/sidebarmenu/general.blade.php @@ -18,12 +18,6 @@

ESI Scopes

- \ No newline at end of file diff --git a/resources/views/layouts/user/sidebarmenu/wiki.blade.php b/resources/views/layouts/user/sidebarmenu/wiki.blade.php deleted file mode 100644 index ac2d5ca0a..000000000 --- a/resources/views/layouts/user/sidebarmenu/wiki.blade.php +++ /dev/null @@ -1,28 +0,0 @@ - \ No newline at end of file diff --git a/resources/views/moons/admin/adminmoon.blade.php b/resources/views/moons/admin/adminmoon.blade.php deleted file mode 100644 index 3200c2eea..000000000 --- a/resources/views/moons/admin/adminmoon.blade.php +++ /dev/null @@ -1,81 +0,0 @@ -@extends('layouts.admin.b4') -@section('content') -
-{!! Form::open(['action' => 'Moons\MoonsAdminController@storeMoonRemoval', 'method' => 'POST']) !!} -
- - - - - - - - - - - - - - - @foreach($table as $row) - - - - - - - - - @if($row['Paid'] == 'Yes') - - @else - - @endif - - - - @endforeach - -
SystemNameRental PriceAlly Rental PriceRenterContactRental EndPaid?Paid UntilRemove Renter
{{ $row['SPM'] }}{{ $row['StructureName'] }}{{ number_format($row['AlliancePrice'], 0, ".", ",") }}{{ number_format($row['OutOfAlliancePrice'], 0, ".", ",") }}{{ $row['Renter'] }}{{ $row['Contact'] }}{{ $row['RentalEnd'] }}YesNo{{ $row['PaidUntil'] }}{{ Form::radio('remove', $row['SPM'], false, ['class' => 'form-control']) }}
-
- -{{ Form::submit('Update', ['class' => 'btn btn-primary']) }} -{!! Form::close() !!} -
-
-
-
-
-
- Legend -
-
- - - - - - - - - - - - - - - -
Moon Available
Moon Rented
Moon Rent Due
Alliance Use
-
-
-
-
-
-
-
-
-
-
- - -@endsection \ No newline at end of file diff --git a/resources/views/moons/admin/moonrequest.blade.php b/resources/views/moons/admin/moonrequest.blade.php deleted file mode 100644 index e609fcb42..000000000 --- a/resources/views/moons/admin/moonrequest.blade.php +++ /dev/null @@ -1,45 +0,0 @@ -@extends('layouts.admin.b4') -@section('content') -
-
-
-

Alliance Moon Requests

-
-
- - - - - - - - - - @foreach($requests as $req) - - {!! Form::open(['action' => 'Moons\MoonsAdminController@storeApprovedMoonRequest', 'method' => 'POST']) !!} - - - - - - - {!! Form::close() !!} - - @endforeach - -
RegionSystem - Planet - MoonCorporationRequestor
{{ $req->region }}{{ $req->system . " - " . $req->planet . " - " . $req->moon }}{{ $req->corporation_name }}{{ $req->requestor_name }} - {{ Form::hidden('id', $req->id) }} - {{ Form::hidden('system', $req->system) }} - {{ Form::hidden('planet', $req->planet) }} - {{ Form::hidden('moon', $req->moon) }} - {{ Form::select('status', [ - 'Approved' => 'Approved', - 'Denied' => 'Denied', - ], 'Select') }} - {{ Form::submit('Update', ['class' => 'btn btn-primary']) }} -
-
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/moons/admin/payments.blade.php b/resources/views/moons/admin/payments.blade.php deleted file mode 100644 index 57abcc948..000000000 --- a/resources/views/moons/admin/payments.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -@extends('layouts.admin.b4') -@section('content') - -
- - - - - - - - - - - - - @foreach($rentals as $rental) - - - - - - - - - - @endforeach - -
SystemPlanetMoonRental CorpRental EndPricePaid?
{{ $rental['System'] }}{{ $rental['Planet'] }}{{ $rental['Moon'] }}{{ $rental['RentalCorp'] }}{{ $rental['RentalEnd'] }}{{ $rental['Price'] }}
-
- -@endsection \ No newline at end of file diff --git a/resources/views/moons/admin/rentalmoon.blade.php b/resources/views/moons/admin/rentalmoon.blade.php deleted file mode 100644 index 3482e0457..000000000 --- a/resources/views/moons/admin/rentalmoon.blade.php +++ /dev/null @@ -1,23 +0,0 @@ -@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/resources/views/moons/admin/updatemoon.blade.php b/resources/views/moons/admin/updatemoon.blade.php deleted file mode 100644 index 11b9d8af7..000000000 --- a/resources/views/moons/admin/updatemoon.blade.php +++ /dev/null @@ -1,42 +0,0 @@ -@extends('layouts.admin.b4') -@section('content') -
-
-
-

Update Existing Moon

-
-
- {!! Form::open(['action' => 'Moons\MoonsAdminController@storeUpdateMoon', 'method' => 'POST']) !!} -
- {{ Form::label('spmn', 'Moon') }} - {{ Form::select('spmn', $spmn, null, ['class' => 'form-control', 'placeholder' => 'Select Moon...']) }} -
-
- {{ Form::label('contact', 'Contact') }} - {{ Form::text('contact', '', ['class' => 'form-control', 'placeholder' => 'Character']) }} -
-
- {{ Form::label('contact_type', 'Contact Type') }} - {{ Form::select('contact_type', ['Character' => 'Character', 'Corporation' => 'Corporation'], 'Character') }} -
-
- {{ Form::label('rental_end', 'Rental End Date') }} - {{ Form::date('rental_end', \Carbon\Carbon::now()->endOfMonth(), ['class' => 'form-control']) }} -
-
- {{ Form::label('paid_until', 'Paid Until') }} - {{ Form::date('paid_until', \Carbon\Carbon::now()->endOfMonth(), ['class' => 'form-control']) }} -
-
- Paid?
- {{ Form::label('paid', 'No') }} - {{ Form::radio('paid', 'No', true) }} - {{ Form::label('paid', 'Yes') }} - {{ Form::radio('paid', 'Yes') }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/moons/ledger/displayledger.blade.php b/resources/views/moons/ledger/displayledger.blade.php deleted file mode 100644 index de97a6a47..000000000 --- a/resources/views/moons/ledger/displayledger.blade.php +++ /dev/null @@ -1,47 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-

Moon Ledger

-
-
-
- -
-
- @foreach($structures as $key => $value) -
- - - - - - - - - - @foreach($miningLedgers as $ledger) - @if($ledger['structure'] == $value) - - - - - - - - @endif - @endforeach - -
CharacterCorp TickerOre NameQuantityDate
{{ $ledger['character'] }}{{ $ledger['corpTicker'] }}{{ $ledger['ore'] }}{{ $ledger['quantity'] }}{{ $ledger['updated'] }}
-
- @endforeach -
-
-@endsection \ No newline at end of file diff --git a/resources/views/moons/ledger/displayselect.blade.php b/resources/views/moons/ledger/displayselect.blade.php deleted file mode 100644 index df1e891a7..000000000 --- a/resources/views/moons/ledger/displayselect.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-

Select the Structure To View the Ledger For

-
-
- {!! Form::open(['action' => 'Moons\MoonLedgerController@displayLedger', 'method' => 'POST']) !!} -
- {{ Form::label('structure', 'Structure') }} - {{ Form::select('structure', $structures, null, ['placeholder' => 'Select Structure']) }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/moons/ledger/rentalledger.blade.php b/resources/views/moons/ledger/rentalledger.blade.php deleted file mode 100644 index de97a6a47..000000000 --- a/resources/views/moons/ledger/rentalledger.blade.php +++ /dev/null @@ -1,47 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-

Moon Ledger

-
-
-
- -
-
- @foreach($structures as $key => $value) -
- - - - - - - - - - @foreach($miningLedgers as $ledger) - @if($ledger['structure'] == $value) - - - - - - - - @endif - @endforeach - -
CharacterCorp TickerOre NameQuantityDate
{{ $ledger['character'] }}{{ $ledger['corpTicker'] }}{{ $ledger['ore'] }}{{ $ledger['quantity'] }}{{ $ledger['updated'] }}
-
- @endforeach -
-
-@endsection \ No newline at end of file diff --git a/resources/views/moons/logistics/adminmoon.blade.php b/resources/views/moons/logistics/adminmoon.blade.php deleted file mode 100644 index 37ea19673..000000000 --- a/resources/views/moons/logistics/adminmoon.blade.php +++ /dev/null @@ -1,57 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
- - - - - - - - @foreach($table as $row) - - - - - - @endforeach - -
SystemNameRental End
{{ $row['SPM'] }}{{ $row['StructureName'] }}{{ $row['RentalEnd'] }}
-
- -
-
-
-
-
-
- Legend -
-
- - - - - - - - - - - - -
Moon Available
Moon Rented
Moon Rent Due
-
-
-
-
-
-
-
-
-
-
- - -@endsection \ No newline at end of file diff --git a/resources/views/moons/user/moon.blade.php b/resources/views/moons/user/moon.blade.php deleted file mode 100644 index e351390c7..000000000 --- a/resources/views/moons/user/moon.blade.php +++ /dev/null @@ -1,69 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
- - - - - - - - - - - - - - @foreach($table as $row) - - - - - - - - - - - - @endforeach - -
SystemNameFirst OreSecond OreThird OreFourth OreRental PriceMoon WorthRental End
{{ $row['SPM'] }}{{ $row['StructureName'] }}{{ $row['FirstOre'] }} - {{ $row['FirstQuantity'] }}{{ $row['SecondOre'] }} - {{ $row['SecondQuantity'] }}{{ $row['ThirdOre'] }} - {{ $row['ThirdQuantity'] }}{{ $row['FourthOre'] }} - {{ $row['FourthQuantity'] }}{{ $row['Price'] }}{{ $row['Worth'] }}{{ $row['RentalEnd'] }}
-
- - -
-
-
-
-
- Legend -
-
- - - - - - - - - - - - - - - -
Moon Available
Moon Rented
Moon Rent Due
Alliance Use
-
-
-
-
-
-
-
-
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/moons/user/requestmoon.blade.php b/resources/views/moons/user/requestmoon.blade.php deleted file mode 100644 index a7304e150..000000000 --- a/resources/views/moons/user/requestmoon.blade.php +++ /dev/null @@ -1,69 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-

Moon Reservation Request Form

-
-
- {!! Form::open(['action' => 'Moons\MoonsController@storeRequestAllianceMoon', 'method' => 'POST']) !!} -
- {{ 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', - 'DY-P7Q' => 'DY-P7Q', - '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') }} -
-
- {{ Form::label('planet', 'Planet') }} - {{ Form::text('planet', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('moon', 'Moon') }} - {{ Form::text('moon', '', ['class' => 'form-control']) }} -
- {{ Form::submit('Submit Request', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/moons/user/requestrental.blade.php b/resources/views/moons/user/requestrental.blade.php deleted file mode 100644 index d41b059d2..000000000 --- a/resources/views/moons/user/requestrental.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-

Request Rental Moon

-
-
- Send an in game mail to Rock Onzo about requesting a rental moon. -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/rental/add.blade.php b/resources/views/rental/add.blade.php deleted file mode 100644 index a9fc07ffe..000000000 --- a/resources/views/rental/add.blade.php +++ /dev/null @@ -1,35 +0,0 @@ -@extends('layouts.admin.b4') -@section('content') -
-
-
-

New Rental Contract

-
-
- {!! Form::open(['action' => 'SystemRentals\RentalAdminController@addRentalSystem', 'method' => 'POST']) !!} -
- {{ Form::label('contact_name', 'Contact Name') }} - {{ Form::text('contact_name', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('contact_corp_name', 'Corporation Name') }} - {{ Form::text('contact_corp_name', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('system', 'System') }} - {{ Form::text('system', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('rental_cost', 'Rental Cost') }} - {{ Form::text('rental_cost', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('paid_until', 'Paid Until') }} - {{ Form::date('paid_until', \Carbon\Carbon::now()->addMonth(), ['class' => 'form-control']) }} -
- {{ Form::submit('Add Rental', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/rental/list.blade.php b/resources/views/rental/list.blade.php deleted file mode 100644 index 8053fce48..000000000 --- a/resources/views/rental/list.blade.php +++ /dev/null @@ -1,56 +0,0 @@ -@extends('layouts.admin.b4') -@section('content') -
-
-
-
-

Rental Systems

-
-
- - - - - - - - - - - - - @foreach($rentals as $rental) - - - - - - - - - - - @endforeach - -
ContactCorporationSystemCostPaid UntilUpdateRemove?
{{ $rental->contact_name }}{{ $rental->corporation_name }}{{ $rental->system_name }}{{ $rental->rental_cost }}{{ $rental->paid_until }} - {!! Form::open(['action' => 'SystemRentals\RentalAdminController@updateRentalSystem', 'method' => 'POST']) !!} - {{ Form::date('paid_until', \Carbon\Carbon::now()->endOfMonth(), ['class' => 'form-control']) }} - {{ Form::hidden('contact_id', $rental->contact_id) }} - {{ Form::hidden('corporation_id', $rental->corporation_id) }} - {{ Form::hidden('system_id', $rental->system_id) }} - {{ Form::submit('Update', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} - - {!! Form::open(['action' => 'SystemRentals\RentalAdminController@removeRentalSystem', 'method' => 'POST']) !!} - {{ Form::radio('remove', 'Yes', false, ['class' => 'form-control']) }} - {{ Form::hidden('contact_id', $rental->contact_id) }} - {{ Form::hidden('corporation_id', $rental->corporation_id) }} - {{ Form::hidden('system_id', $rental->system_id) }} - - {{ Form::submit('Remove', ['class' => 'btn btn-danger']) }} - {!! Form::close() !!} -
-
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/structurerequest/display/structurerequests.blade.php b/resources/views/structurerequest/display/structurerequests.blade.php deleted file mode 100644 index a0d94ddb0..000000000 --- a/resources/views/structurerequest/display/structurerequests.blade.php +++ /dev/null @@ -1,50 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-

Structure Requests

-
-
- - - - - - - - - - - - - @if($reqs != null) - @foreach($reqs as $req) - - - - - - - - {!! Form::open(['action' => 'Logistics\StructureRequestAdminController@deleteRequest', 'method' => 'POST']) !!} - - - {!! Form::close() !!} - - @endforeach - @else - - - - @endif - -
CorporationSystemStructure SizeStructure TypeDrop TimeRequesterDelete
{{ $req->corporation_name }}{{ $req->system }}{{ $req->structure_size }}{{ $req->structure_type }}{{ $req->requested_drop_time }}{{ $req->requester }} - {{ Form::hidden('id', $req->id, ['class' => 'form-control']) }} - {{ Form::radio('delete', 'Delete', false, ['class' => 'form-conotrol']) }} - - {{ Form::submit('Delete', ['class' => 'btn btn-danger']) }} -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/structurerequest/requeststructure.blade.php b/resources/views/structurerequest/requeststructure.blade.php deleted file mode 100644 index 33ec7cdd4..000000000 --- a/resources/views/structurerequest/requeststructure.blade.php +++ /dev/null @@ -1,40 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-
-

Structure Request Form

-
-
- {!! Form::open(['action' => 'Logistics\StructureRequestController@storeForm', 'method' => 'POST']) !!} -
- {{ Form::label('corporation_name', 'Corporation Name') }} - {{ Form::text('corporation_name', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('system', 'System') }} - {{ Form::text('system', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('structure_size', 'Structure Size') }} - {{ Form::select('structure_size', ['M' => 'M', 'L' => 'L', 'XL' => 'XL'], null, ['class' => 'form-control']) }} -
-
- {{ Form::label('structure_type', 'Structure Type') }} - {{ Form::select('structure_type', ['Citadel' => 'Citadel', 'Refinery' => 'Refinery', 'Engineering' => 'Engineering', 'Flex' => 'Flex'], null, ['class' => 'form-control']) }} -
-
- {{ Form::label('requested_drop_time', 'Requested Drop Time') }} - {{ Form::dateTime('requested_drop_time', \Carbon\Carbon::now()->toDateTimeString(), ['class' => 'form-control']) }} -
-
- {{ Form::label('requester', 'Requester') }} - {{ Form::text('requester', '', ['class' => 'form-control']) }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/wiki/user/changepassword.blade.php b/resources/views/wiki/user/changepassword.blade.php deleted file mode 100644 index 3490ff2cc..000000000 --- a/resources/views/wiki/user/changepassword.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-
-
-

Change Wiki Password

-
-
-

Your username is: {{ $name }}


- {!! Form::open(['action' => 'Wiki\WikiController@changePassword', 'method' => 'POST']) !!} -
- {{ Form::label('password', 'Password') }} - {{ Form::password('password', ['class' => 'form-control']) }} - {{ Form::label('password2', 'Repeat Password') }} - {{ Form::password('password2', ['class' => 'form-control']) }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/wiki/user/register.blade.php b/resources/views/wiki/user/register.blade.php deleted file mode 100644 index e53186b73..000000000 --- a/resources/views/wiki/user/register.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -@extends('layouts.user.dashb4') -@section('content') -
-
-
-
-
-

Register for Warped Intentions Wiki

-
-
-

Your Username is: {{ $name }}


- {!! Form::open(['action' => 'Wiki\WikiController@storeRegister', 'method' => 'POST']) !!} -
- {{ Form::label('password', 'Password') }} - {{ Form::password('password', ['class' => 'form-control']) }} - {{ Form::label('password2', 'Repeat Password') }} - {{ Form::password('password2', ['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 3972b9362..881d24815 100644 --- a/routes/web.php +++ b/routes/web.php @@ -43,13 +43,6 @@ Route::group(['middleware' => ['auth']], function(){ Route::post('/admin/add/allowedlogin', 'Dashboard\AdminController@addAllowedLogin'); Route::post('/admin/rmoeve/allowedlogin', 'Dashboard\AdminController@removeAllowedLogin'); Route::get('/admin/dashboard/journal', 'Dashboard\AdminController@showJournalEntries'); - Route::get('/admin/dashboard/wiki', 'Dashboard\AdminController@displayWikiDashboard'); - Route::post('/admin/dashboard/wiki/deleteuser', 'Dashboard\AdminController@deleteWikiUser'); - Route::post('/admin/dashboard/wiki/adduser', 'Dashboard\AdminController@addWikiUserGroup'); - Route::post('/admin/dashboard/wiki/removegroup', 'Dashboard\AdminController@removeWikiUserGroup'); - Route::post('/admin/dashboard/wiki/removeallgroups', 'Dashboard\AdminController@removeWikiUserAllGroups'); - Route::post('/admin/dashboard/wiki/newgroup', 'Dashboard\AdminController@insertNewWikiUserGroup'); - Route::post('/admin/dashboard/wiki/purge', 'Dashboard\AdminController@purgeWikiUsers'); Route::get('/admin/dashboard/test', 'Dashboard\AdminController@displayTestAdminDashboard'); Route::get('/admin/dashboard', 'Dashboard\AdminDashboardController@displayAdminDashboard'); @@ -81,42 +74,10 @@ Route::group(['middleware' => ['auth']], function(){ */ //Route::get('/mining/display', 'Mining\MiningsController@displayMiningTax'); - /** - * Moon Controller display pages - */ - Route::get('/moons/display/rentals', 'Moons\MoonsController@displayRentalMoons'); - 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'); - Route::get('/moons/display/rental/request', 'Moons\MoonsController@displayRentalMoonPage'); - - /** - * Moon Admin Controller display pages - */ - Route::get('/moons/admin/display/rentals', 'Moons\MoonsAdminController@displayRentalMoonsAdmin'); - 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@displayMoonRequests'); - Route::post('/moons/admin/display/request', 'Moons\MoonsAdminController@storeApprovedMoonRequest'); - /** * Moon Ledger Controller display pages */ Route::get('/moons/ledger/display/moons', 'Moons\MoonLedgerController@displayMoonLedger'); - 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 @@ -145,17 +106,6 @@ Route::group(['middleware' => ['auth']], function(){ Route::get('/srp/admin/update/shiptype/{id}/{value}', 'SRP\SRPAdminController@updateShipType'); Route::get('/srp/admin/update/lossvalue/{id}/{value}', 'SRP\SRPAdminController@updateLossValue'); - /** - * Structure Request Controller display pages - */ - Route::get('/structures/display/form', 'Logistics\StructureRequestController@displayForm'); - Route::post('/structures/display/form', 'Logistics\StructureRequestController@storeForm'); - - /** - * Structure Request Admin Controller display pages - */ - Route::get('/structures/display/requests', 'Logistics\StructureRequestAdminController@displayRequests'); - Route::post('/structures/display/requests/delete', 'Logistics\StructureRequestAdminController@deleteRequest'); /** * Supply Chain Contracts Controller display pages @@ -175,26 +125,11 @@ Route::group(['middleware' => ['auth']], function(){ Route::get('/supplychain/modify/bid', 'Contracts\SupplyChainController@displayModifySupplyChainContractBid'); Route::post('/supplychain/modify/bid', 'Contracts\SupplyChainController@modifySupplyChainContractBid'); - /** - * System Rentals Controller display pages - */ - Route::get('/system/rental/dashboard', 'SystemRentals\RentalAdminController@displayRentalSystems'); - Route::get('/system/rental/add', 'SystemRentals\RentalAdminController@displayAddRentalSystem'); - Route::post('/system/rental/add', 'SystemRentals\RentalAdminController@addRentalSystem'); - Route::post('/system/rental/update', 'SystemRentals\RentalAdminController@updateRentalSystem'); - Route::post('/system/rental/remove', 'SystemRentals\RentalAdminController@removeRentalSystem'); - /** * Test Controller display pages */ Route::get('/test/char/display', 'Test\TestController@displayCharTest'); - /** - * Wiki Controller display pages - */ - Route::get('/wiki/register', 'Wiki\WikiController@displayRegister'); - Route::post('/wiki/register', 'Wiki\WikiController@storeRegister'); - Route::get('/wiki/changepassword', 'Wiki\WikiController@displayChangePassword'); - Route::post('/wiki/changepassword', 'Wiki\WikiController@changePassword'); - Route::post('/wiki/purge', 'Wiki\WikiController@purgeUsers'); }); + +?> \ No newline at end of file