mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 15:35:15 +00:00
Fixed user login and authentication.
This commit is contained in:
James Cole
@@ -20,15 +20,19 @@
|
||||
<h3 class="panel-title">Firefly III — Sign In</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<form role="form" method="POST" id="login" action="/auth/login">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
<div class="form-group">
|
||||
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="E-mail">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<input type="password" class="form-control" id="inputPassword" name="password" placeholder="Password">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label">E-Mail</label>
|
||||
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="E-Mail">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label">Password</label>
|
||||
<input type="password" class="form-control" id="inputPassword" name="password" placeholder="Password">
|
||||
</div>
|
||||
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" name="remember" value="1"> Remember me
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
@extends('app')
|
||||
@extends('layouts.guest')
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Reset Password</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
<div class="login-panel panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Firefly III — Reset Password</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
@@ -24,23 +25,17 @@
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<form class="form-horizontal" role="form" method="POST" action="/password/email">
|
||||
<form role="form" method="POST" action="/password/email">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label">E-Mail Address</label>
|
||||
<div class="col-md-6">
|
||||
<input type="email" class="form-control" name="email" value="{{ old('email') }}">
|
||||
</div>
|
||||
<label class="control-label">E-Mail</label>
|
||||
<input type="email" class="form-control" placeholder="E-Mail" name="email" value="{{ old('email') }}">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Send Password Reset Link
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<p>
|
||||
<button type="submit" class="btn btn-lg btn-success btn-block">Send Password Reset</button>
|
||||
</p>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
<div class="login-panel panel panel-default">
|
||||
<div class="panel-heading">Firefly III — Register</div>
|
||||
<div class="login-panel panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Firefly III — Register</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<p>
|
||||
Registering an account on Firefly requires an e-mail address.
|
||||
@@ -24,27 +26,30 @@
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label">E-Mail Address</label>
|
||||
<input type="email" class="form-control" name="email" value="{{ old('email') }}">
|
||||
<label class="control-label">E-Mail</label>
|
||||
<input type="email" class="form-control" placeholder="E-Mail" name="email" value="{{ old('email') }}">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label">Password</label>
|
||||
<input type="password" class="form-control" name="password">
|
||||
<input type="password" placeholder="Password" class="form-control" name="password">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label">Confirm Password</label>
|
||||
<input type="password" class="form-control" name="password_confirmation">
|
||||
<input type="password" placeholder="Confirm Password" class="form-control" name="password_confirmation">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Register
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<p>
|
||||
<button type="submit" class="btn btn-lg btn-success btn-block">Register</button>
|
||||
</p>
|
||||
|
||||
|
||||
<div class="btn-group btn-group-justified btn-group-sm">
|
||||
<a href="/auth/login" class="btn btn-default">Login</a>
|
||||
<a href="/password/email" class="btn btn-default">Forgot your password?</a>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
@extends('app')
|
||||
|
||||
@extends('layouts.guest')
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Reset Password</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
<div class="login-panel panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Firefly III — Reset Password</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
@@ -18,37 +18,29 @@
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<form class="form-horizontal" role="form" method="POST" action="/password/reset">
|
||||
<form role="form" method="POST" action="/password/reset">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="token" value="{{ $token }}">
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label">E-Mail Address</label>
|
||||
<div class="col-md-6">
|
||||
<input type="email" class="form-control" name="email" value="{{ old('email') }}">
|
||||
</div>
|
||||
<label id="email" class="control-label">E-Mail</label>
|
||||
<input type="email" class="form-control" placeholder="E-Mail" name="email" value="{{ old('email') }}">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label">Password</label>
|
||||
<div class="col-md-6">
|
||||
<input type="password" class="form-control" name="password">
|
||||
</div>
|
||||
<label class="control-label">Password</label>
|
||||
<input type="password" placeholder="Password" class="form-control" name="password">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label">Confirm Password</label>
|
||||
<div class="col-md-6">
|
||||
<input type="password" class="form-control" name="password_confirmation">
|
||||
</div>
|
||||
<label class="control-label">Confirm Password</label>
|
||||
<input type="password" placeholder="Confirm Password" class="form-control" name="password_confirmation">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Reset Password
|
||||
</button>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-success btn-lg btn-block">
|
||||
Reset Password
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user