login dashboard and other lookup changes

This commit is contained in:
2019-09-29 04:31:36 -05:00
parent d2b6476165
commit 2b4e913aed
5 changed files with 84 additions and 56 deletions

View File

@@ -6,20 +6,49 @@ use Illuminate\Http\Request;
//Library
use App\Library\Contracts\ContractHelper;
use App\Library\Lookups\LookupHelper;
class DashboardController extends Controller
{
public function __construct() {
$this->middleware('auth');
$this->middleware('role:User');
}
public function index() {
//Declare the contract helper
$contractHelper = new ContractHelper;
$lookupHelper = new LookupHelper;
//Declare array variable
$contracts = array();
//Get the current amount of contracts availabe to the corporation for displaying on the dashboard with the relevant
//information such as pickup and destination, jumps, and profit margin.
$tempContracts = $contractHelper->GetContracts(98615428);
return redirect('/');
foreach($tempContracts as $con) {
$startSystem = $lookupHelper->GetSolarSystemName($con->start_location_id);
$endSystem = $lookupHelper->GetSolarSystemName($con->end_location_id);
$final = [
'pickup' => $startSystem,
'destination' => $endSystem,
'type' => $con->type,
'volume' => $con->volume,
'expired' => $con->date_expired,
'collateral' => $con->collateral,
'reward' => $con->reward,
'availability' => $con->availability,
];
array_push($contracts, $final);
}
$num = sizeof($contracts);
return view('dashboard.dashboard')->with('contracts', $contracts)
->with('num', $num);
}
public function profile() {

View File

@@ -38,12 +38,18 @@ class ContractHelper {
$this->esi = $esiHelper->SetupEsiAuthentication($token);
}
public function GetNumOfContracts() {
}
public function GetContracts($corpId) {
$contracts = null;
public function GetContractDetails($contract) {
try {
$contracts = $this->esi->invoke('get', '/corporations/{corporation_id}/contracts/', [
'corporation_id' => $corpId,
]);
} catch(RequestFailedException $e) {
return null;
}
return $contracts;
}
}

View File

@@ -18,6 +18,7 @@ use App\Library\Esi\Esi;
use App\Models\Lookups\CharacterLookup;
use App\Models\Lookups\CorporationLookup;
use App\Models\Lookups\AllianceLookup;
use App\Models\Lookups\SolarSystem;
class NewLookupHelper {
//Variables
@@ -692,6 +693,16 @@ class NewLookupHelper {
}
}
}
public function GetSolarSystemName($systemId) {
$count = SolarSystem::where(['solar_system_id' => $systemId])->count();
if($count != 0) {
$system = SolarSystem::where(['solar_system_id' => $systemId])->first();
return $system->name;
} else {
return 'N/A';
}
}
}
?>

View File

@@ -52,7 +52,7 @@ return [
|
*/
'prefix' => env('HORIZON_PREFIX', 'horizon:'),
'prefix' => env('HORIZON_PREFIX', 'unitedhauling:'),
/*
|--------------------------------------------------------------------------

View File

@@ -1,50 +1,32 @@
<?php
namespace App\Http\Controllers\Dashboard;
//Internal Libraries
use App\Http\Controllers\Controller;
use Auth;
use DB;
use Log;
//Models
use App\Models\Esi\EsiScope;
use App\Models\Esi\EsiToken;
use App\Models\User\UserPermission;
use App\Models\User\UserRole;
class DashboardController extends Controller
{
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
$this->middleware('role:Guest');
}
/**
* Create dashboard where user logs in
*
* @return void
*/
public function index() {
return view('dashboard.dashboard');
}
/**
* Create profile for user
*
* @return void
*/
public function profile() {
return view('dashboard.profile');
}
}
?>
@extends('layouts.b4')
@section('content')
<br>
<div class="container">
<table class="table table-striped table-bordered">
<thead>
<th>Pickup System</th>
<th>Destination System</th>
<th>Type</th>
<th>Volume</th>
<th>Date Expired</th>
<th>Collateral</th>
<th>Reward</th>
<th>Availability</th>
</thead>
<tbody>
@foreach($contracts as $contract)
<tr>
<td>{{ $contract['pickup'] }}</td>
<td>{{ $contract['destination'] }}</td>
<td>{{ $contract['type'] }}</td>
<td>{{ $contract['volume'] }}</td>
<td>{{ $contract['expired'] }}</td>
<td>{{ $contract['collateral'] }}</td>
<td>{{ $contract['reward'] }}</td>
<td>{{ $contract['availability'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endsection