Skip to content

Commit

Permalink
Merge pull request #276 from NizarBerjawi/feature/fix-ui
Browse files Browse the repository at this point in the history 
Final UI Fixes
  • Loading branch information
@NizarBerjawi
NizarBerjawi authored Nov 21, 2021
2 parents e3dd787 + 470d992 commit 2b72180
Show file tree
Hide file tree
Showing 9 changed files with 368 additions and 306 deletions.
50 changes: 29 additions & 21 deletions resources/views/additionalResources/continents.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
@extends('layouts.base')

@section('content')
<div class="content">
<article class="panel pb-4">
<p class="panel-heading">Continents</p>
<div class="container">
<section class="section">
<div class="content">
<div class="columns">
<div class="column is-10 is-offset-1">
<article class="panel pb-4">
<p class="panel-heading">Continents</p>

<div class="table-container">
<table class='table'>
<tr>
<th>Code</th>
<th>Name</th>
</tr>
<div class="table-container">
<table class='table'>
<tr>
<th>Code</th>
<th>Name</th>
</tr>

<tbody>
@foreach ($continents as $continent)
<tr>
<td>{{ $continent->code }}</td>
<td>{{ $continent->name }}</td>
</tr>
@endforeach
</tbody>
</table>
<tbody>
@foreach ($continents as $continent)
<tr>
<td>{{ $continent->code }}</td>
<td>{{ $continent->name }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>

{{ $continents->onEachSide(1)->links('partials.pagination') }}
</article>
</div>
</div>
</div>

{{ $continents->onEachSide(1)->links('partials.pagination') }}
</article>
</section>
</div>
@endsection
50 changes: 29 additions & 21 deletions resources/views/additionalResources/countries.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
@extends('layouts.base')

@section('content')
<div class="content">
<article class="panel pb-4">
<p class="panel-heading">Countries</p>
<div class="container">
<section class="section">
<div class="content">
<div class="columns">
<div class="column is-10 is-offset-1">
<article class="panel pb-4">
<p class="panel-heading">Countries</p>

<div class="table-container">
<table class='table'>
<tr>
<th>Code</th>
<th>Name</th>
</tr>
<div class="table-container">
<table class='table'>
<tr>
<th>Code</th>
<th>Name</th>
</tr>

<tbody>
@foreach ($countries as $country)
<tr>
<td>{{ $country->iso3166_alpha2 }}</td>
<td>{{ $country->name }}</td>
</tr>
@endforeach
</tbody>
</table>
<tbody>
@foreach ($countries as $country)
<tr>
<td>{{ $country->iso3166_alpha2 }}</td>
<td>{{ $country->name }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>

{{ $countries->onEachSide(1)->links('partials.pagination') }}
</article>
</div>
</div>
</div>

{{ $countries->onEachSide(1)->links('partials.pagination') }}
</article>
</section>
</div>
@endsection
96 changes: 52 additions & 44 deletions resources/views/additionalResources/featureCodes.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,61 @@
@extends('layouts.base')

@section('content')
<div class="content">
<article class="panel pb-4">
<p class="panel-heading">Feature Codes</p>
<p class="panel-tabs">
<a href={{ route('featureCodes') }} @class([
'is-active' => !request()->has('filter'),
])>
All
</a>
<div class="container">
<section class="section">
<div class="content">
<div class="columns">
<div class="column is-10 is-offset-1">
<article class="panel pb-4">
<p class="panel-heading">Feature Codes</p>
<p class="panel-tabs">
<a href={{ route('featureCodes') }} @class([
'is-active' => !request()->has('filter'),
])>
All
</a>

@foreach ($featureClasses as $featureClass)
<a href="{{ route('featureCodes', ['filter' => ['featureClassCode' => $featureClass->code]]) }}"
@class([
'is-active' =>
$featureClass->code === request()->input('filter.featureClassCode'),
])>
{{ $featureClass->code }}
</a>
@endforeach
</p>
@foreach ($featureClasses as $featureClass)
<a href="{{ route('featureCodes', ['filter' => ['featureClassCode' => $featureClass->code]]) }}"
@class([
'is-active' =>
$featureClass->code === request()->input('filter.featureClassCode'),
])>
{{ $featureClass->code }}
</a>
@endforeach
</p>

<div class="table-container">
<table class='table'>
<tr class="is-selected has-text-centered has-text-weight-bold">
<td colspan="3">
{{ $selectedFeatureClass ?? 'ALL' }}
</td>
</tr>
<tr>
<th>Code</th>
<th>Short Description</th>
<th>Full Description</th>
</tr>
<div class="table-container">
<table class='table'>
<tr class="is-selected has-text-centered has-text-weight-bold">
<td colspan="3">
{{ $selectedFeatureClass ?? 'ALL' }}
</td>
</tr>
<tr>
<th>Code</th>
<th>Short Description</th>
<th>Full Description</th>
</tr>

<tbody>
@foreach ($featureCodes as $featureCode)
<tr>
<td>{{ $featureCode->code }}</td>
<td>{{ $featureCode->short_description }}</td>
<td>{{ $featureCode->full_description }}</td>
</tr>
@endforeach
</tbody>
</table>
<tbody>
@foreach ($featureCodes as $featureCode)
<tr>
<td>{{ $featureCode->code }}</td>
<td>{{ $featureCode->short_description }}</td>
<td>{{ $featureCode->full_description }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>

{{ $featureCodes->onEachSide(1)->links('partials.pagination') }}
</article>
</div>
</div>
</div>

{{ $featureCodes->onEachSide(1)->links('partials.pagination') }}
</article>
</section>
</div>
@endsection
58 changes: 33 additions & 25 deletions resources/views/additionalResources/languages.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,41 @@
@extends('layouts.base')

@section('content')
<div class="content">
<article class="panel pb-4">
<p class="panel-heading">Languages</p>
<div class="container">
<section class="section">
<div class="content">
<div class="columns">
<div class="column is-10 is-offset-1">
<article class="panel pb-4">
<p class="panel-heading">Languages</p>

<div class="table-container">
<table class='table'>
<tr>
<th>Name</th>
<th>ISO639-1</th>
<th>ISO639-2</th>
<th>ISO639-3</th>
</tr>
<div class="table-container">
<table class='table'>
<tr>
<th>Name</th>
<th>ISO639-1</th>
<th>ISO639-2</th>
<th>ISO639-3</th>
</tr>

<tbody>
@foreach ($languages as $language)
<tr>
<td>{{ $language->name }}</td>
<td>{{ $language->iso639_1 }}</td>
<td>{{ $language->iso639_2 }}</td>
<td>{{ $language->iso639_3 }}</td>
</tr>
@endforeach
</tbody>
</table>
<tbody>
@foreach ($languages as $language)
<tr>
<td>{{ $language->name }}</td>
<td>{{ $language->iso639_1 }}</td>
<td>{{ $language->iso639_2 }}</td>
<td>{{ $language->iso639_3 }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>

{{ $languages->onEachSide(1)->links('partials.pagination') }}
</article>
</div>
</div>
</div>

{{ $languages->onEachSide(1)->links('partials.pagination') }}
</article>
</section>
</div>
@endsection
54 changes: 31 additions & 23 deletions resources/views/additionalResources/timeZones.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,39 @@
@extends('layouts.base')

@section('content')
<div class="content">
<article class="panel pb-4">
<p class="panel-heading">Time Zones</p>
<div class="container">
<section class="section">
<div class="content">
<div class="columns">
<div class="column is-10 is-offset-1">
<article class="panel pb-4">
<p class="panel-heading">Time Zones</p>

<div class="table-container">
<table class='table'>
<tr>
<th>Code</th>
<th>Time Zone</th>
<th>GMT Offset</th>
</tr>
<div class="table-container">
<table class='table'>
<tr>
<th>Code</th>
<th>Time Zone</th>
<th>GMT Offset</th>
</tr>

<tbody>
@foreach ($timeZones as $timeZone)
<tr>
<td>{{ $timeZone->code }}</td>
<td>{{ $timeZone->time_zone }}</td>
<td>{{ $timeZone->gmt_offset }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<tbody>
@foreach ($timeZones as $timeZone)
<tr>
<td>{{ $timeZone->code }}</td>
<td>{{ $timeZone->time_zone }}</td>
<td>{{ $timeZone->gmt_offset }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>

{{ $timeZones->onEachSide(1)->links('partials.pagination') }}
</article>
{{ $timeZones->onEachSide(1)->links('partials.pagination') }}
</article>
</div>
</div>
</div>
</section>
</div>
@endsection
30 changes: 20 additions & 10 deletions resources/views/docs.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,27 @@
@endsection

@section('content')
<div id='swagger'></div>
<div class="container">
<section class="section">
<div class="content">
<div class="columns">
<div class="column is-10 is-offset-1">
<div id='swagger'></div>

@if (config('app.env') === 'production')
<article class="media is-justify-content-flex-end">
<figure class="media-left">
<p class="image ">
<img src="https://validator.swagger.io/validator?url={{ url('openApi.json') }}">
</p>
</figure>
</article>
@endif
@if (config('app.env') === 'production')
<article class="media is-justify-content-flex-end">
<figure class="media-left">
<p class="image ">
<img src="https://validator.swagger.io/validator?url={{ url('openApi.json') }}">
</p>
</figure>
</article>
@endif
</div>
</div>
</div>
</section>
</div>
@endsection

@section('scripts')
Expand Down
Loading

0 comments on commit 2b72180

Please sign in to comment.