diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php index e552d3314..0cd35cea5 100644 --- a/app/Http/Controllers/Dashboard/AdminController.php +++ b/app/Http/Controllers/Dashboard/AdminController.php @@ -132,7 +132,15 @@ class AdminController extends Controller ->with('pigross', $pigross); } - public function modifyRole(Request $request) { + public function displayModifyUser($name) { + //Get the user information from the name + $user = User::where(['name' => $name])->get()->toArray(); + + //Pass the user information to the page for hidden text entries + return view('admin.user.modify')->with('user', $user); + } + + public function modifyUser(Request $request) { return redirect('/admin/dashboard')->with('error', 'Not implemented yet.'); } diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 3b575d3d8..8cf255650 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -45,9 +45,13 @@ @endif + {!! Form::open(['action' => 'Dashboard\AdminController@displayModifyUser', 'method' => 'POST']) !!} + {{ Form::hidden('user', $user['name']) }} + {{ Form::submit('Modify User', ['class' => 'btn btn-primary']) }} + {!! Form::close() !!} {!! Form::open(['action' => 'Dashboard\AdminController@removeUser', 'method' => 'POST']) !!} {{ Form::hidden('user', $user['name']) }} - {{ Form::submit('Remove User', ['class' => 'btn btn-primary']) }} + {{ Form::submit('Remove User', ['class' => 'btn btn-danger']) }} {!! Form::close() !!} diff --git a/resources/views/admin/newdashboard.blade.php b/resources/views/admin/newdashboard.blade.php deleted file mode 100644 index 9020ea3f6..000000000 --- a/resources/views/admin/newdashboard.blade.php +++ /dev/null @@ -1,341 +0,0 @@ -@extends('layouts.b4') -@section('content') - -
-

Admin Dashboard

-
-
- -
-
-
-
-
- - - - - - - - - @foreach($userArr as $user) - - - - - - - @endforeach - -
NameRolePermissionsAction
{{ $user['name'] }}{{ $user['role'] }} - @foreach($user['permissions'] as $perm) - {{ implode(', ', $perm) }} - @endforeach - - {!! Form::open(['action' => 'Dashboard\AdminController@removeUser', 'method' => 'POST']) !!} - {{ Form::hidden('user', $user['name']) }} - {{ Form::submit('Remove User', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
- - - -
-
-
-
-
- Add Permission for User -
-
- {!! Form::open(['action' => 'Dashboard\AdminController@addPermission', 'method' => 'POST']) !!} -
- {{ Form::label('user', 'User') }} - {{ Form::select('user', $users, null, ['class' => 'form-control']) }} - {{ Form::select('permission', $permissions, null, ['class' => 'form-control']) }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-
-
-
-
-
-
-
- Modify User Role -
-
- {!! Form::open(['action' => 'Dashboard\AdminController@modifyRole', 'method' => 'POST']) !!} -
- {{ Form::label('user', 'User') }} - {{ Form::select('user', $users, null, ['class' => 'form-control']) }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-
-
-
-
-
-
-
-
- Add Allowed Login -
-
- {!! Form::open(['action' => 'Dashboard\AdminController@addAllowedLogin', 'method' => 'POST']) !!} -
- {{ Form::label('allowedEntityId', 'Allowed Entity ID') }} - {{ Form::text('allowedEntityId', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('allowedEntityType', 'Allowed Entity Type') }} - {{ Form::select('allowedEtntityType', ['Corporation' => 'Corporation', 'Alliance' => 'Alliance'], null, ['class' => 'form-control']) }} -
-
- {{ Form::label('allowedEntityName', 'Allowed Entity Name') }} - {{ Form::text('allowedEntityName', '', ['class' => 'form-control']) }} -
-
- {{ Form::label('allowedLoginType', 'Allowed Login Type') }} - {{ Form::select('allowedLoginType', ['Legacy' => 'Legacy', 'Renter' => 'Renter'], null, ['class' => 'form-control']) }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-
-
-
- Remove Allowed Login -
-
- {!! Form::open(['action' => 'Dashboard\AdminController@removeAllowedLogin', 'method' => 'POST']) !!} -
- {{ Form::label('removeAllowedLogin', 'Remove Entity') }} - {{ Form::select('removeAllowedLogin', $entities, null, ['class' => 'form-control']) }} -
- {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-
-
-
-
-
-
- {!! Form::open(['action' => 'Wiki\WikiController@purgeUsers', 'method' => 'POST']) !!} -
- {{ Form::label('admin', 'This action will log the administrator who peformed the action.') }} - {{ Form::hidden('admin', auth()->user()->character_id) }} -
- {{ Form::submit('Purge Wiki', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} -
-
-
-
-
-
-
-
-
- PI Taxes -
-
-
- - - - - - @foreach($pis as $pi) - - - - - @endforeach - -
MonthPI Taxes
{{ $pi['date'] }}{{ $pi['gross'] }}
-
-
-
-
-
-
- Office Taxes -
-
- - - - - - - @foreach($offices as $office) - - - - - @endforeach - -
MonthOffice Taxes
{{ $office['date'] }}{{ $office['gross'] }}
-
-
-
-
-
-
- Industry Taxes -
-
- - - - - - - @foreach($industrys as $industry) - - - - - @endforeach - -
MonthIndustry Taxes
{{ $industry['date'] }}{{ $industry['gross'] }}
-
-
-
-
- -
-
-
-
-
-
- Reprocessing Taxes -
-
- - - - - - - @foreach($reprocessings as $reprocessing) - - - - - @endforeach - -
MonthReprocessing Taxes
{{ $reprocessing['date'] }}{{ $reprocessing['gross'] }}
-
-
-
-
-
-
- Market Taxes -
-
- - - - - - - @foreach($markets as $market) - - - - - @endforeach - -
MonthMarket Taxes
{{ $market['date'] }}{{ $market['gross'] }}
-
-
-
-
-
-
- Jump Gate Taxes -
-
- - - - - - - @foreach($jumpgates as $jumpgate) - - - - - @endforeach - -
MonthJump Gate Taxes
{{ $jumpgate['date'] }}{{ $jumpgate['gross'] }}
-
-
-
-
-
-
-
-
-
-
- PI Transactions -
-
- - - - - - - @foreach($pigross as $pi) - - - - - @endforeach - -
MonthPI Transactions
{{ $pi['date'] }}{{ $pi['gross'] }}
-
-
-
-
- -
-
- -
-
-
- - - -@endsection \ No newline at end of file diff --git a/resources/views/admin/olddashboard.blade.php b/resources/views/admin/olddashboard.blade.php deleted file mode 100644 index e7ee62b56..000000000 --- a/resources/views/admin/olddashboard.blade.php +++ /dev/null @@ -1,330 +0,0 @@ -@extends('layouts.b4') -@section('content') - -
-

Admin Dashboard

-
-
-