CSS Libraries and style updates (#388)
* Update now-ui frontend lib to latest instead of the beta * Update to bootstrap 4 lib * Fix flights and profile pages
This commit is contained in:
Nabeel S
@@ -33,16 +33,9 @@
|
||||
</head>
|
||||
<body>
|
||||
<!-- Navbar -->
|
||||
<nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
|
||||
<nav class="navbar navbar-expand-lg " style="background: #067ec1;">
|
||||
<div class="container" style="width: 85%!important;">
|
||||
<div class="navbar-translate">
|
||||
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
|
||||
data-target="#navigation" aria-controls="navigation-index" aria-expanded="false"
|
||||
aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-bar bar1"></span>
|
||||
<span class="navbar-toggler-bar bar2"></span>
|
||||
<span class="navbar-toggler-bar bar3"></span>
|
||||
</button>
|
||||
<p class="navbar-brand text-white" data-placement="bottom" target="_blank">
|
||||
<a href="{{ url('/') }}">
|
||||
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
|
||||
@@ -85,6 +78,7 @@
|
||||
|
||||
{{-- Start of the required tags block. Don't remove these or things will break!! --}}
|
||||
<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
|
||||
<script src="{{ public_mix('/assets/frontend/js/vendor.js') }}"></script>
|
||||
<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
|
||||
@yield('scripts')
|
||||
|
||||
|
||||
@@ -11,8 +11,7 @@
|
||||
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />
|
||||
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet" />
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" />
|
||||
<link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet" />
|
||||
<link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet" />
|
||||
<link href="{{ public_mix('/assets/frontend/css/vendor.min.css') }}" rel="stylesheet" />
|
||||
@yield('css')
|
||||
</head>
|
||||
|
||||
|
||||
@@ -2,7 +2,19 @@
|
||||
@section('title', __('common.login'))
|
||||
|
||||
@section('content')
|
||||
<div class="col-md-4 content-center">
|
||||
<div class="navbar-translate">
|
||||
<a class="navbar-brand" href="https://demos.creative-tim.com/now-ui-kit/index.html" rel="tooltip"
|
||||
title="Designed by Invision. Coded by Creative Tim" data-placement="bottom" target="_blank">
|
||||
Now Ui Kit
|
||||
</a>
|
||||
<button class="navbar-toggler navbar-toggler" type="button" data-toggle="collapse" data-target="#navigation"
|
||||
aria-controls="navigation-index" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-bar top-bar"></span>
|
||||
<span class="navbar-toggler-bar middle-bar"></span>
|
||||
<span class="navbar-toggler-bar bottom-bar"></span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="col-md-4 ml-auto mr-auto content-center">
|
||||
<div class="card card-login card-plain">
|
||||
{{ Form::open(['url' => url('/login'), 'method' => 'post']) }}
|
||||
<div class="header header-primary text-center">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@foreach($flights as $flight)
|
||||
<div class="card border-blue-bottom">
|
||||
<div class="card-block" style="min-height: 0">
|
||||
<div class="card-body" style="min-height: 0">
|
||||
<div class="row">
|
||||
<div class="col-sm-9">
|
||||
<h5>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<ul class="navbar-nav">
|
||||
<ul class="navbar-nav align-middle">
|
||||
@if(Auth::check())
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('frontend.dashboard.index') }}">
|
||||
@@ -47,7 +47,6 @@
|
||||
</li>
|
||||
|
||||
@else
|
||||
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('frontend.flights.index') }}">
|
||||
<i class="fab fa-avianex"></i>
|
||||
@@ -61,26 +60,11 @@
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('frontend.profile.index') }}">
|
||||
<i class="far fa-user"></i>
|
||||
<p>@lang('common.profile')</p>
|
||||
<a class="nav-link" href="{{ route('frontend.downloads.index') }}">
|
||||
<i class="fas fa-download"></i>
|
||||
<p>{{ trans_choice('common.download', 2) }}</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('frontend.downloads.index') }}">
|
||||
<i class="fas fa-download"></i>
|
||||
<p>{{ trans_choice('common.download', 2) }}</p>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@role('admin')
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ url('/admin') }}">
|
||||
<i class="fas fa-circle-notch"></i>
|
||||
<p>@lang('common.administration')</p>
|
||||
</a>
|
||||
</li>
|
||||
@endrole
|
||||
|
||||
{{-- Show the module links for being logged in --}}
|
||||
@foreach($moduleSvc->getFrontendLinks($logged_in=true) as &$link)
|
||||
@@ -92,11 +76,32 @@
|
||||
</li>
|
||||
@endforeach
|
||||
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ url('/logout') }}">
|
||||
<i class="fas fa-sign-out-alt"></i>
|
||||
<p>@lang('common.logout')</p>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
|
||||
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
@if (Auth::user()->avatar == null)
|
||||
<img src="{{ Auth::user()->gravatar(38) }}" style=" height: 38px; width: 38px;">
|
||||
@else
|
||||
<img src="{{ Auth::user()->avatar->url }}" style="height: 38px; width: 38px;">
|
||||
@endif
|
||||
</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
|
||||
|
||||
<a class="dropdown-item" href="{{ route('frontend.profile.index') }}">
|
||||
<i class="far fa-user"></i> @lang('common.profile')
|
||||
</a>
|
||||
|
||||
@role('admin')
|
||||
<a class="dropdown-item" href="{{ url('/admin') }}">
|
||||
<i class="fas fa-circle-notch"></i> @lang('common.administration')
|
||||
</a>
|
||||
@endrole
|
||||
|
||||
<a class="dropdown-item" href="{{ url('/logout') }}">
|
||||
<i class="fas fa-sign-out-alt"></i> @lang('common.logout')
|
||||
</a>
|
||||
</div>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
</ul>
|
||||
|
||||
@@ -11,47 +11,77 @@
|
||||
<img src="{{ $user->avatar->url }}" style="width: 123px;">
|
||||
@endif
|
||||
</div>
|
||||
<h3 class="title">{{ $user->name }}</h3>
|
||||
<h6><span class="flag-icon flag-icon-{{ $user->country }}"></span></h6>
|
||||
<h6>{{ $user->ident }}</h6>
|
||||
<h6>{{ $user->rank->name }}</h6>
|
||||
<div><br /></div>
|
||||
<div class="social-description">
|
||||
<h2>{{ $user->name }}</h2>
|
||||
<p>{{ $user->ident }}</p>
|
||||
</div>
|
||||
<p class="description" style="color: #9A9A9A;">
|
||||
{{ $user->airline->name }}
|
||||
</p>
|
||||
<h6><span class="flag-icon flag-icon-{{ $user->country }}"></span></h6>
|
||||
<div class="social-description">
|
||||
<h2>{{ $user->rank->name }}</h2>
|
||||
<p>Rank</p>
|
||||
</div>
|
||||
@if($user->home_airport)
|
||||
<div class="social-description">
|
||||
<h2>{{ $user->home_airport->icao }}</h2>
|
||||
<p>@lang('airports.home')</p>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-8 content-center">
|
||||
<div class="content">
|
||||
<div class="social-description">
|
||||
<h2>{{ $user->flights}}</h2>
|
||||
<p>{{ trans_choice('common.flight', $user->flights) }}</p>
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<div class="card text-center">
|
||||
<div class="card-body">
|
||||
<h2 class="card-title">{{ $user->flights}}</h2>
|
||||
<p class="card-text">Flights</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-6">
|
||||
<div class="card text-center">
|
||||
<div class="card-body">
|
||||
<div class="social-description">
|
||||
<h2>{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false) }}</h2>
|
||||
<p>@lang('flights.flighthours')</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
@if($user->current_airport)
|
||||
<div class="col-lg-6">
|
||||
<div class="card text-center">
|
||||
<div class="card-body">
|
||||
<div class="social-description">
|
||||
<h2>{{ $user->current_airport->icao }}</h2>
|
||||
<p>@lang('airports.current')</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="social-description">
|
||||
<h2>{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false) }}</h2>
|
||||
<p>@lang('flights.flighthours')</p>
|
||||
|
||||
@if(setting('pilots.allow_transfer_hours') === true)
|
||||
<div class="col-lg-6">
|
||||
<div class="card text-center">
|
||||
<div class="card-body">
|
||||
<div class="social-description">
|
||||
<h2>{{ \App\Facades\Utils::minutesToHours($user->transfer_time) }}h</h2>
|
||||
<p>@lang('profile.transferhours')</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
@if($user->home_airport)
|
||||
<div class="social-description">
|
||||
<h2>{{ $user->home_airport->icao }}</h2>
|
||||
<p>@lang('airports.home')</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if($user->current_airport)
|
||||
<div class="social-description">
|
||||
<h2>{{ $user->current_airport->icao }}</h2>
|
||||
<p>@lang('airports.current')</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if(setting('pilots.allow_transfer_hours') === true)
|
||||
<div class="social-description">
|
||||
<h2>{{ \App\Facades\Utils::minutesToHours($user->transfer_time) }}h</h2>
|
||||
<p>@lang('profile.transferhours')</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user