mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Small conflict handling bits
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
e27065fe16
commit
61cf9ec009
|
@ -24,7 +24,6 @@ use Auth;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use DB;
|
use DB;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Gate;
|
|
||||||
use App\Http\Requests\ImageUploadRequest;
|
use App\Http\Requests\ImageUploadRequest;
|
||||||
use Input;
|
use Input;
|
||||||
use Paginator;
|
use Paginator;
|
||||||
|
|
|
@ -9,7 +9,6 @@ use App\Http\Transformers\LocationsTransformer;
|
||||||
use App\Http\Transformers\SelectlistTransformer;
|
use App\Http\Transformers\SelectlistTransformer;
|
||||||
use App\Models\Location;
|
use App\Models\Location;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use App\Http\Requests\ImageUploadRequest;
|
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
|
4206
composer.lock
generated
4206
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -4,6 +4,90 @@
|
||||||
{{-- Page content --}}
|
{{-- Page content --}}
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
@livewire('login-form')
|
<form role="form" action="{{ url('/login') }}" method="POST" autocomplete="false">
|
||||||
|
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
||||||
|
|
||||||
|
<!-- this is a hack to prevent Chrome from trying to autocomplete fields -->
|
||||||
|
<input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="display:none;" aria-hidden="true">
|
||||||
|
<input type="password" name="password_fake" id="password_fake" value="" style="display:none;" aria-hidden="true">
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
<div class="row">
|
||||||
|
|
||||||
|
<div class="col-md-4 col-md-offset-4">
|
||||||
|
|
||||||
|
<div class="box login-box">
|
||||||
|
<div class="box-header with-border">
|
||||||
|
<h1 class="box-title"> {{ trans('auth/general.login_prompt') }}</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="login-box-body">
|
||||||
|
<div class="row">
|
||||||
|
|
||||||
|
@if ($snipeSettings->login_note)
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="alert alert-info">
|
||||||
|
{!! Parsedown::instance()->text(e($snipeSettings->login_note)) !!}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<!-- Notifications -->
|
||||||
|
@include('notifications')
|
||||||
|
|
||||||
|
<div class="col-md-12">
|
||||||
|
<!-- CSRF Token -->
|
||||||
|
|
||||||
|
|
||||||
|
<fieldset>
|
||||||
|
|
||||||
|
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
|
||||||
|
<label for="username"><i class="fa fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username') }}</label>
|
||||||
|
<input class="form-control" placeholder="{{ trans('admin/users/table.username') }}" name="username" type="text" id="username" autocomplete="off" autofocus>
|
||||||
|
{!! $errors->first('username', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
|
||||||
|
</div>
|
||||||
|
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
|
||||||
|
<label for="password"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password') }}</label>
|
||||||
|
<input class="form-control" placeholder="{{ trans('admin/users/table.password') }}" name="password" type="password" id="password" autocomplete="off">
|
||||||
|
{!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
|
||||||
|
</div>
|
||||||
|
<div class="checkbox">
|
||||||
|
<label style="margin-left: -20px;">
|
||||||
|
<input name="remember" type="checkbox" value="1" class="minimal"> {{ trans('auth/general.remember_me') }}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
</div> <!-- end col-md-12 -->
|
||||||
|
|
||||||
|
</div> <!-- end row -->
|
||||||
|
|
||||||
|
@if ($snipeSettings->saml_enabled)
|
||||||
|
<div class="row ">
|
||||||
|
<div class="col-md-12 text-right">
|
||||||
|
<a href="{{ route('saml.login') }}">{{ trans('auth/general.saml_login') }}</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
<div class="box-footer">
|
||||||
|
<button class="btn btn-lg btn-primary btn-block">{{ trans('auth/general.login') }}</button>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-12 col-sm-12 col-xs-12 text-right" style="padding-top: 10px;">
|
||||||
|
@if ($snipeSettings->custom_forgot_pass_url)
|
||||||
|
<a href="{{ $snipeSettings->custom_forgot_pass_url }}" rel="noopener">{{ trans('auth/general.forgot_password') }}</a>
|
||||||
|
@else
|
||||||
|
<a href="{{ route('password.request') }}">{{ trans('auth/general.forgot_password') }}</a>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div> <!-- end login box -->
|
||||||
|
|
||||||
|
</div> <!-- col-md-4 -->
|
||||||
|
|
||||||
|
</div> <!-- end row -->
|
||||||
|
</div> <!-- end container -->
|
||||||
|
</form>
|
||||||
|
|
||||||
@stop
|
@stop
|
|
@ -295,6 +295,13 @@ Route::group(['prefix' => 'v1', 'middleware' => 'api'], function () {
|
||||||
]
|
]
|
||||||
); // end depreciations API routes
|
); // end depreciations API routes
|
||||||
|
|
||||||
|
Route::get(
|
||||||
|
'reports/depreciation',
|
||||||
|
[
|
||||||
|
'as' => 'api.depreciation-report.index',
|
||||||
|
'uses' => 'AssetsController@index'
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fields API routes
|
* Fields API routes
|
||||||
|
|
Loading…
Reference in a new issue