Cleanup user edit page and show their pireps; log last IP address #110

This commit is contained in:
Nabeel Shahzad
2018-01-07 15:09:22 -06:00
parent ab7fa3b293
commit 247310b4e7
32 changed files with 131 additions and 56 deletions

View File

@@ -3,7 +3,6 @@
@section('content')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.flash.message')
{!! Form::open(['route' => 'admin.airlines.store']) !!}
@include('admin.airlines.fields')
{!! Form::close() !!}

View File

@@ -1,13 +1,27 @@
@extends('admin.app')
@section('title', "Edit \"$user->name\"")
@section('title', 'Edit '. $user->name)
@section('content')
<div class="card border-blue-bottom">
<div class="content">
@include('admin.flash.message')
{!! Form::model($user, ['route' => ['admin.users.update', $user->id], 'method' => 'patch']) !!}
@include('admin.users.fields')
{!! Form::close() !!}
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<div class="header">
<h3>PIREPs</h3>
</div>
@include('admin.pireps.table')
<div class="row">
<div class="col-12 text-center">
{{ $pireps->links('admin.pagination.default') }}
</div>
</div>
</div>
</div>
@endsection

View File

@@ -57,10 +57,42 @@
</div>
<!-- Submit Field -->
<div class="form-group col-sm-6">
<div class="pull-right">
{!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
<a href="{!! route('admin.users.index') !!}" class="btn btn-default">Cancel</a>
</div>
<div class="form-group col-sm-6 text-right">
<a href="{!! route('admin.users.regen_apikey', ['id' => $user->id]) !!}" class="btn btn-warning"
onclick="return confirm('Are you sure? This will reset this user\'s API key.')">new api key</a>
&nbsp;
{!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
<a href="{!! route('admin.users.index') !!}" class="btn btn-default">Cancel</a>
</div>
</div>
<div class="row">
<div class="form-group col-sm-12">
<table class="table table-hover">
<tr>
<td>API Key</td>
<td>{!! $user->api_key !!}</td>
</tr>
<tr>
<td>Total Flights</td>
<td>{!! $user->flights !!}</td>
</tr>
<tr>
<td>Flight Time</td>
<td>{!! Utils::minutesToTimeString($user->flight_time) !!}</td>
</tr>
<tr>
<td>IP Address</td>
<td>{!! $user->last_ip !!}</td>
</tr>
<tr>
<td>Registered On</td>
<td>{!! show_datetime($user->created_at) !!}</td>
</tr>
<tr>
<td>Last Login</td>
<td>{!! show_datetime($user->updated_at) !!}</td>
</tr>
</table>
</div>
</div>

View File

@@ -1,5 +1,5 @@
@extends('admin.app')
@section('title', 'Edit '. $user->name)
@section('content')
<div class="card">
<div class="content">

View File

@@ -9,13 +9,13 @@
<tbody>
@foreach($users as $user)
<tr>
<td><a href="{!! route('admin.users.show', [$user->id]) !!}">{!! $user->name !!}</a></td>
<td><a href="{!! route('admin.users.edit', [$user->id]) !!}">{!! $user->name !!}</a></td>
<td>{!! $user->email !!}</td>
<td>{!! show_date($user->created_at) !!}</td>
<td class="text-center">
@if($user->state == UserState::ACTIVE)
@if($user->state === UserState::ACTIVE)
<span class="label label-success">
@elseif($user->state == UserState::PENDING)
@elseif($user->state === UserState::PENDING)
<span class="label label-warning">
@else
<span class="label label-default">