384 Laravel 6 changes (#385)
* 384 Laravel 6 changes * Library versions * Update package versions * Add keyType to models * Remove unused dependencies * StyleCI fixes * Fix models for test * Fix tests output and update test runner * Unused imports * Update exceptions handler * Fix login page
This commit is contained in:
Nabeel S
@@ -86,6 +86,7 @@ return [
|
||||
|
||||
// Overrides config/logging.php
|
||||
'logging' => [
|
||||
'default' => 'stack',
|
||||
'channels' => [
|
||||
'single' => ['level' => 'debug'],
|
||||
'daily' => ['level' => 'debug'],
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
|
||||
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
|
||||
<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/now-ui-kit.css') }}" rel="stylesheet"/>
|
||||
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
|
||||
|
||||
{{-- Start of the required files in the head block --}}
|
||||
|
||||
@@ -11,7 +11,9 @@
|
||||
<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_mix('/assets/frontend/css/vendor.min.css') }}" rel="stylesheet" />
|
||||
<link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
|
||||
<link href="{{ public_mix('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
|
||||
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
|
||||
@yield('css')
|
||||
</head>
|
||||
|
||||
|
||||
@@ -2,80 +2,73 @@
|
||||
@section('title', __('common.login'))
|
||||
|
||||
@section('content')
|
||||
<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="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">
|
||||
<div class="logo-container" style="width: 320px;">
|
||||
<img src="{{ public_asset('/assets/frontend/img/logo.svg') }}" width="320" height="320" style="background: #FFF">
|
||||
</div>
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-error' : '' }} input-lg">
|
||||
<span class="input-group-addon">
|
||||
<i class="now-ui-icons users_circle-08"></i>
|
||||
</span>
|
||||
{{
|
||||
Form::text('email', old('email'), [
|
||||
'id' => 'email',
|
||||
'placeholder' => __('common.email'),
|
||||
'class' => 'form-control',
|
||||
'required' => true,
|
||||
])
|
||||
}}
|
||||
</div>
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('email') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
{{ Form::open(['url' => url('/login'), 'method' => 'post']) }}
|
||||
<div class="header header-primary text-center">
|
||||
<div class="logo-container" style="width: 320px;">
|
||||
<img src="{{ public_asset('/assets/frontend/img/logo.svg') }}" width="320" height="320"
|
||||
style="background: #FFF">
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-error' : '' }} input-lg">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">
|
||||
<i class="now-ui-icons users_circle-08"></i>
|
||||
</span>
|
||||
</div>
|
||||
{{
|
||||
Form::text('email', old('email'), [
|
||||
'id' => 'email',
|
||||
'placeholder' => __('common.email'),
|
||||
'class' => 'form-control',
|
||||
'required' => true,
|
||||
])
|
||||
}}
|
||||
</div>
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('email') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
|
||||
<div class="input-group form-group-no-border{{ $errors->has('password') ? ' has-error' : '' }} input-lg">
|
||||
<span class="input-group-addon">
|
||||
<i class="now-ui-icons ui-1_lock-circle-open"></i>
|
||||
</span>
|
||||
{{
|
||||
Form::password('password', [
|
||||
'name' => 'password',
|
||||
'class' => 'form-control',
|
||||
'placeholder' => __('auth.password'),
|
||||
'required' => true,
|
||||
])
|
||||
}}
|
||||
</div>
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('password') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
<div class="input-group form-group-no-border{{ $errors->has('password') ? ' has-error' : '' }} input-lg">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">
|
||||
<i class="now-ui-icons text_caps-small"></i>
|
||||
</span>
|
||||
</div>
|
||||
{{
|
||||
Form::password('password', [
|
||||
'name' => 'password',
|
||||
'class' => 'form-control',
|
||||
'placeholder' => __('auth.password'),
|
||||
'required' => true,
|
||||
])
|
||||
}}
|
||||
</div>
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('password') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
<div class="footer text-center">
|
||||
<button class="btn btn-primary btn-round btn-lg btn-block">@lang('common.login')</button>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<h6>
|
||||
<a href="{{ url('/register') }}" class="link">@lang('auth.createaccount')</a>
|
||||
</h6>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<h6>
|
||||
<a href="{{ url('/password/reset') }}" class="link">@lang('auth.forgotpassword')?</a>
|
||||
</h6>
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
<div class="footer text-center">
|
||||
<button class="btn btn-primary btn-round btn-lg btn-block">@lang('common.login')</button>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<h6>
|
||||
<a href="{{ url('/register') }}" class="link">@lang('auth.createaccount')</a>
|
||||
</h6>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<h6>
|
||||
<a href="{{ url('/password/reset') }}" class="link">@lang('auth.forgotpassword')?</a>
|
||||
</h6>
|
||||
</div>
|
||||
{{ Form::close() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -15,8 +15,14 @@
|
||||
@endif
|
||||
|
||||
{{ __('Before proceeding, please check your email for a verification link.') }}
|
||||
{{ __('If you did not receive the email') }}, <a
|
||||
href="{{ route('verification.resend') }}">{{ __('click here to request another') }}</a>.
|
||||
{{ __('If you did not receive the email') }},
|
||||
|
||||
<form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
|
||||
@csrf
|
||||
<button type="submit" class="btn btn-link p-0 m-0 align-baseline">
|
||||
{{ __('click here to request another') }}
|
||||
</button>.
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user