another commit

This commit is contained in:
2019-11-16 23:37:30 -06:00
parent 2a56300470
commit 2c6543185d
13 changed files with 172 additions and 180 deletions

View File

@@ -0,0 +1,63 @@
<?php
namespace App\Http\Controllers;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class AdminController extends Controller
{
/**
* Consstructor
*/
public function __construct(){
//Require the user to be logged in
$this->middleware('auth');
//Require the user to at least have administrative privileges.
$this->middleware('role:Admin');
}
/**
* Display all users
*/
public function displayUsers() {
$users = User::orderBy('name', 'desc')->get()->paginate(50);
return ('admin.user.displayUsers')->with('users', $users);
}
/**
* Display Modify User form
*/
public function displayModifyUser() {
}
/**
* Modify Users
*/
public function modifyUser(Request $request) {
}
/**
* Display Allowed Entities
*/
public function displayAllowed() {
}
/**
* Add a new allowed entity
*/
public function addAllowed(Request $request) {
}
/**
* Delete an allowed entity
*/
public function deleteAllowed(Request $request) {
}
}

View File

@@ -0,0 +1,54 @@
<?php
namespace App\Http\Controllers\Timer;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class TimerController extends Controller
{
/**
* Constructor
*/
public function __construct() {
//Require the user to be logged in
$this->middleware('auth');
//Require the user to at least have the User role.
$this->middleware('role:User');
}
/**
* Display all current timers
*/
public function dashboard() {
}
/**
* Display past timers
*/
public function pastTimers() {
}
/**
* Display new timer form
*/
public function displayTimerForm() {
}
/**
* Store New Timer
*/
public function storeTimer(Request $request) {
}
/**
* Delete Timer
*/
public function deleteTimer(Request $request) {
}
}

View File

@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateTimersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('timers', function (Blueprint $table) {
$table->bigIncrements('id');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('timers');
}
}

View File

@@ -0,0 +1,4 @@
@extends('layouts.b4')
@section('content')
@endsection

View File

@@ -1,51 +0,0 @@
@extends('layouts.b4')
@section('content')
<br>
<div class="container">
<div class="card">
<div class="card-header">
How to Make a Contract
</div>
<div class="card-body">
<ol>
<li>Get a quote from <a href="https://evepraisal.com">EvePraisal</a> and set the sell value as the collateral.</li>
<li>Issue the courier contracts as 'Private' to 'United Hauling'.</li>
<li>If utilizing a container, please note in description</li>
</ol>
<br>
Join our channel "United Hauling" in game for questions and/or concerns.
</div>
</div>
</div>
<br>
<div class="container">
<div class="card">
<div class="card-header">
Quote
</div>
<div class="card-body">
{!! Form::open(['action' => 'Hauling\HaulingController@displayFormResults', 'method' => 'POST']) !!}
<div class="form-group">
{{ Form::label('pickup', 'Pickup System') }}
{{ Form::text('pickup', '', ['class' => 'form-control']) }}
</div>
<div class="form-group">
{{ Form::label('destination', 'Destination System') }}
{{ Form::text('destination', '', ['class' => 'form-control']) }}
</div>
<div class="form-group">
{{ Form::label('size', 'Volume') }}
{{ Form::text('size', '', ['class' => 'form-control']) }}
</div>
<div class="form-group">
{{ Form::label('collateral', 'Collateral') }}
{{ Form::text('collateral', '', ['class' => 'form-control']) }}
</div>
<div class="form-group col-md-1">
{{ Form::submit('Submit', ['class' => 'btn btn-primary']) }}
{!! Form::close() !!}
</div>
</div>
</div>
</div>
@endsection

View File

@@ -1,34 +0,0 @@
@extends('layouts.b4')
@section('content')
<div class="container">
<div class="card">
<div class="card-header">
<h2>Hauling Rates</h2>
</div>
<div class="card-body">
<table class="table table-bordered table-striped">
<thead>
<th>Load Size</th>
<th>Min Load Size</th>
<th>Max Load Size</th>
<th>Price Per Jump</th>
</thead>
<tbody>
@foreach($loads as $load)
<tr>
<td>{{ ucfirst($load->load_size) }}</td>
<td>{{ number_format($load->min_load_size, 2, ".", ",") }}</td>
<td>{{ number_format($load->max_load_size, 2, ".", ",") }}</td>
<td>{{ number_format($load->price_per_jump, 2, ".", ",") }}</td>
</tr>
@endforeach
</tbody>
</table>
<br>
<div class="container">
<h3>Max Collateral should be no more than 2b ISK</h3>
</div>
</div>
</div>
</div>
@endsection

View File

@@ -1,67 +0,0 @@
@extends('layouts.b4')
@section('content')
<br>
<div class="container">
<div class="card">
<div class="card-header">
Your Query
</div>
<div class="card-body">
<table class="table table-striped">
<tr>
<th>Route</th>
<td>{{ $pickup }} >> {{ $destination }}</td>
</tr>
<tr>
<th>Warps</th>
<td>{{ $jumps }}</td>
</tr>
<tr>
<th>Volume</th>
<td>{{ number_format($size, 0, ".", ",") }}</td>
</tr>
<tr>
<th>Collateral</th>
<td>{{ number_format($collateral, 2, ".", ",") }} ISK</td>
</tr>
</table>
</div>
</div>
</div>
<br>
<div class="container">
<div class="card">
<div class="card-header">
Your Quote
</div>
<div class="card-body">
<table class="table table-striped">
<tr>
<th>Service Type</th>
<td>Highsec</td>
</tr>
<tr>
<th>Issue To</th>
<td>United Hauling</td>
</tr>
<tr>
<th>Price</th>
<td>{{ number_format($cost, 2, ".", ",") }}</td>
</tr>
<tr>
<th>Container Policy</th>
<td>Containers allowed.</td>
</tr>
<tr>
<th>Expiration</th>
<td>{{ $time }}</td>
</tr>
<tr>
<th>Days To Complete</th>
<td>{{ $duration }}</td>
</tr>
</table>
</div>
</div>
</div>
@endsection

View File

@@ -1 +0,0 @@
This is a test

View File

@@ -22,7 +22,6 @@ Route::group(['middleware' => ['auth']], function(){
/**
* Dashboard Controller Display pages
*/
Route::get('/dashboard', 'Dashboard\DashboardController@index')->name('/dashboard');
//Route::get('/profile', 'Dashboard\DashboardController@profile');
/**
@@ -30,7 +29,25 @@ Route::group(['middleware' => ['auth']], function(){
*/
Route::get('/scopes/select', 'Auth\EsiScopeController@displayScopes');
Route::post('redirectToProvider', 'Auth\EsiScopeController@redirectToProvider');
/**
* Timer Controller display pages
*/
Route::get('/dashboard', 'Timer\TimerController@dashboard')->name('/dashboard');
Route::get('/dashboard/past', 'Timer\TimerController@pastTimers')->name('/past');
Route::get('/timer/form', 'Timer\TimerController@displayTimerForm');
Route::post('/timer/store', 'Timer\TimerController@storeTimer');
Route::post('/timer/delete', 'Timer\TimerController@deleteTimer');
/**
* Admin Controller display pages
*/
Route::get('/admin/display/users', 'Admin\AdminController@displayUsers');
Route::get('/admin/user/modify', 'Admin\AdminController@displayModifyUser');
Route::post('/admin/user/modify', 'Admin\AdminController@modifyUser');
Route::get('/admin/display/allowed', 'Admin\AdminController@displayAllowed');
Route::post('/admin/allowed/new', 'Admin\AdminController@addAllowed');
Route::post('/admin/allowed/delete', 'Admin\AdminController@deleteAllowed');
});
/*
Route::group(['middleware' => ['guest']], function() {

View File

@@ -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;
}
/**

View File

@@ -6,14 +6,11 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
'App\\CitadelLookup' => $baseDir . '/app/Models/Lookups/CitadelLookup.php',
'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
'App\\Http\\Controllers\\Auth\\EsiScopeController' => $baseDir . '/app/Http/Controllers/Auth/EsiScopeController.php',
'App\\Http\\Controllers\\Auth\\LoginController' => $baseDir . '/app/Http/Controllers/Auth/LoginController.php',
'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
'App\\Http\\Controllers\\Dashboard\\DashboardController' => $baseDir . '/app/Http/Controllers/Dashboard/DashboardController.php',
'App\\Http\\Controllers\\Hauling\\HaulingController' => $baseDir . '/app/Http/Controllers/Hauling/HaulingController.php',
'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php',
'App\\Http\\Middleware\\Authenticate' => $baseDir . '/app/Http/Middleware/Authenticate.php',
'App\\Http\\Middleware\\CheckForMaintenanceMode' => $baseDir . '/app/Http/Middleware/CheckForMaintenanceMode.php',
@@ -24,21 +21,14 @@ return array(
'App\\Http\\Middleware\\TrimStrings' => $baseDir . '/app/Http/Middleware/TrimStrings.php',
'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php',
'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php',
'App\\Jobs\\ProcessSendEveMailJob' => $baseDir . '/app/Jobs/ProcessSendEveMailJob.php',
'App\\Library\\Contracts\\ContractHelper' => $baseDir . '/app/Library/Contracts/ContractHelper.php',
'App\\Library\\Esi\\Esi' => $baseDir . '/app/Library/Esi/Esi.php',
'App\\Library\\Hauling\\HaulingHelper' => $baseDir . '/app/Library/Hauling/HaulingHelper.php',
'App\\Library\\Lookups\\LookupHelper' => $baseDir . '/app/Library/Lookups/LookupHelper.php',
'App\\Models\\Admin\\AllowedLogin' => $baseDir . '/app/Models/Admin/AllowedLogin.php',
'App\\Models\\Esi\\EsiScope' => $baseDir . '/app/Models/Esi/EsiScope.php',
'App\\Models\\Esi\\EsiToken' => $baseDir . '/app/Models/Esi/EsiToken.php',
'App\\Models\\Jobs\\JobSendEveMail' => $baseDir . '/app/Models/Jobs/JobSendEveMail.php',
'App\\Models\\Lookups\\AllianceLookup' => $baseDir . '/app/Models/Lookups/AllianceLookup.php',
'App\\Models\\Lookups\\CharacterLookup' => $baseDir . '/app/Models/Lookups/CharacterLookup.php',
'App\\Models\\Lookups\\CorporationLookup' => $baseDir . '/app/Models/Lookups/CorporationLookup.php',
'App\\Models\\Lookups\\SolarSystem' => $baseDir . '/app/Models/Lookups/SolarSystem.php',
'App\\Models\\Lookups\\SolarSystemDistance' => $baseDir . '/app/Models/Lookups/SolarSystemDistance.php',
'App\\Models\\Lookups\\StationLookup' => $baseDir . '/app/Models/Lookups/StationLookup.php',
'App\\Models\\User\\AvailableUserPermission' => $baseDir . '/app/Models/User/AvailableUserPermission.php',
'App\\Models\\User\\User' => $baseDir . '/app/Models/User/User.php',
'App\\Models\\User\\UserPermission' => $baseDir . '/app/Models/User/UserPermission.php',
@@ -1026,7 +1016,6 @@ return array(
'Hamcrest\\Type\\IsString' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsString.php',
'Hamcrest\\Util' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Util.php',
'Hamcrest\\Xml\\HasXPath' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Xml/HasXPath.php',
'HaulingConfigSeeder' => $baseDir . '/database/seeds/HaulingConfigSeeder.php',
'Highlight\\Autoloader' => $vendorDir . '/scrivo/highlight.php/Highlight/Autoloader.php',
'Highlight\\Highlighter' => $vendorDir . '/scrivo/highlight.php/Highlight/Highlighter.php',
'Highlight\\JsonRef' => $vendorDir . '/scrivo/highlight.php/Highlight/JsonRef.php',
@@ -3822,7 +3811,6 @@ return array(
'SebastianBergmann\\Type\\UnknownType' => $vendorDir . '/sebastian/type/src/UnknownType.php',
'SebastianBergmann\\Type\\VoidType' => $vendorDir . '/sebastian/type/src/VoidType.php',
'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
'SolarSystemSeeder' => $baseDir . '/database/seeds/SolarSystemSeeder.php',
'Symfony\\Component\\Console\\Application' => $vendorDir . '/symfony/console/Application.php',
'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => $vendorDir . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
'Symfony\\Component\\Console\\CommandLoader\\ContainerCommandLoader' => $vendorDir . '/symfony/console/CommandLoader/ContainerCommandLoader.php',

View File

@@ -486,14 +486,11 @@ class ComposerStaticInit33afb8ba5b252c3933eb137784fa7f04
);
public static $classMap = array (
'App\\CitadelLookup' => __DIR__ . '/../..' . '/app/Models/Lookups/CitadelLookup.php',
'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
'App\\Http\\Controllers\\Auth\\EsiScopeController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/EsiScopeController.php',
'App\\Http\\Controllers\\Auth\\LoginController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/LoginController.php',
'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
'App\\Http\\Controllers\\Dashboard\\DashboardController' => __DIR__ . '/../..' . '/app/Http/Controllers/Dashboard/DashboardController.php',
'App\\Http\\Controllers\\Hauling\\HaulingController' => __DIR__ . '/../..' . '/app/Http/Controllers/Hauling/HaulingController.php',
'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php',
'App\\Http\\Middleware\\Authenticate' => __DIR__ . '/../..' . '/app/Http/Middleware/Authenticate.php',
'App\\Http\\Middleware\\CheckForMaintenanceMode' => __DIR__ . '/../..' . '/app/Http/Middleware/CheckForMaintenanceMode.php',
@@ -504,21 +501,14 @@ class ComposerStaticInit33afb8ba5b252c3933eb137784fa7f04
'App\\Http\\Middleware\\TrimStrings' => __DIR__ . '/../..' . '/app/Http/Middleware/TrimStrings.php',
'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php',
'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php',
'App\\Jobs\\ProcessSendEveMailJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessSendEveMailJob.php',
'App\\Library\\Contracts\\ContractHelper' => __DIR__ . '/../..' . '/app/Library/Contracts/ContractHelper.php',
'App\\Library\\Esi\\Esi' => __DIR__ . '/../..' . '/app/Library/Esi/Esi.php',
'App\\Library\\Hauling\\HaulingHelper' => __DIR__ . '/../..' . '/app/Library/Hauling/HaulingHelper.php',
'App\\Library\\Lookups\\LookupHelper' => __DIR__ . '/../..' . '/app/Library/Lookups/LookupHelper.php',
'App\\Models\\Admin\\AllowedLogin' => __DIR__ . '/../..' . '/app/Models/Admin/AllowedLogin.php',
'App\\Models\\Esi\\EsiScope' => __DIR__ . '/../..' . '/app/Models/Esi/EsiScope.php',
'App\\Models\\Esi\\EsiToken' => __DIR__ . '/../..' . '/app/Models/Esi/EsiToken.php',
'App\\Models\\Jobs\\JobSendEveMail' => __DIR__ . '/../..' . '/app/Models/Jobs/JobSendEveMail.php',
'App\\Models\\Lookups\\AllianceLookup' => __DIR__ . '/../..' . '/app/Models/Lookups/AllianceLookup.php',
'App\\Models\\Lookups\\CharacterLookup' => __DIR__ . '/../..' . '/app/Models/Lookups/CharacterLookup.php',
'App\\Models\\Lookups\\CorporationLookup' => __DIR__ . '/../..' . '/app/Models/Lookups/CorporationLookup.php',
'App\\Models\\Lookups\\SolarSystem' => __DIR__ . '/../..' . '/app/Models/Lookups/SolarSystem.php',
'App\\Models\\Lookups\\SolarSystemDistance' => __DIR__ . '/../..' . '/app/Models/Lookups/SolarSystemDistance.php',
'App\\Models\\Lookups\\StationLookup' => __DIR__ . '/../..' . '/app/Models/Lookups/StationLookup.php',
'App\\Models\\User\\AvailableUserPermission' => __DIR__ . '/../..' . '/app/Models/User/AvailableUserPermission.php',
'App\\Models\\User\\User' => __DIR__ . '/../..' . '/app/Models/User/User.php',
'App\\Models\\User\\UserPermission' => __DIR__ . '/../..' . '/app/Models/User/UserPermission.php',
@@ -1506,7 +1496,6 @@ class ComposerStaticInit33afb8ba5b252c3933eb137784fa7f04
'Hamcrest\\Type\\IsString' => __DIR__ . '/..' . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsString.php',
'Hamcrest\\Util' => __DIR__ . '/..' . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Util.php',
'Hamcrest\\Xml\\HasXPath' => __DIR__ . '/..' . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Xml/HasXPath.php',
'HaulingConfigSeeder' => __DIR__ . '/../..' . '/database/seeds/HaulingConfigSeeder.php',
'Highlight\\Autoloader' => __DIR__ . '/..' . '/scrivo/highlight.php/Highlight/Autoloader.php',
'Highlight\\Highlighter' => __DIR__ . '/..' . '/scrivo/highlight.php/Highlight/Highlighter.php',
'Highlight\\JsonRef' => __DIR__ . '/..' . '/scrivo/highlight.php/Highlight/JsonRef.php',
@@ -4302,7 +4291,6 @@ class ComposerStaticInit33afb8ba5b252c3933eb137784fa7f04
'SebastianBergmann\\Type\\UnknownType' => __DIR__ . '/..' . '/sebastian/type/src/UnknownType.php',
'SebastianBergmann\\Type\\VoidType' => __DIR__ . '/..' . '/sebastian/type/src/VoidType.php',
'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php',
'SolarSystemSeeder' => __DIR__ . '/../..' . '/database/seeds/SolarSystemSeeder.php',
'Symfony\\Component\\Console\\Application' => __DIR__ . '/..' . '/symfony/console/Application.php',
'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => __DIR__ . '/..' . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
'Symfony\\Component\\Console\\CommandLoader\\ContainerCommandLoader' => __DIR__ . '/..' . '/symfony/console/CommandLoader/ContainerCommandLoader.php',