Bootstrap 4への移行完了
This commit is contained in:
shibafu
@@ -1,49 +1,42 @@
|
||||
@extends('layouts.base-old')
|
||||
@extends('layouts.base')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<h2 class="grey-text">ログイン</h2>
|
||||
<div class="row">
|
||||
<form method="post" action="{{ route('login') }}" class="col s12 push-m3 m6">
|
||||
{{ csrf_field() }}
|
||||
<h2>ログイン</h2>
|
||||
<hr>
|
||||
<div class="row justify-content-center my-5">
|
||||
<div class="col-lg-6">
|
||||
<form method="post" action="{{ route('login') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="row">
|
||||
<div class="input-field col s12">
|
||||
<i class="material-icons prefix">email</i>
|
||||
<input id="email" name="email" class="validate{{ $errors->has('email') ? ' invalid' : '' }}" type="text" value="{{ old('email') }}" required autofocus>
|
||||
<label for="email">メールアドレス</label>
|
||||
<div class="form-group">
|
||||
<label for="email"><span class="oi oi-envelope-closed"></span> メールアドレス</label>
|
||||
<input id="email" name="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" type="text" value="{{ old('email') }}" required autofocus>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<span class="red-text"><strong>{{ $errors->first('email') }}</strong></span>
|
||||
<div class="invalid-feedback">{{ $errors->first('email') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="input-field col s12">
|
||||
<i class="material-icons prefix">lock</i>
|
||||
<input id="password" name="password" class="validate{{ $errors->has('password') ? ' invalid' : '' }}" type="password" required>
|
||||
<label for="password">パスワード</label>
|
||||
<div class="form-group">
|
||||
<label for="password"><span class="oi oi-key"></span> パスワード</label>
|
||||
<input id="password" name="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" type="password" required>
|
||||
|
||||
@if ($errors->has('password'))
|
||||
<span class="red-text"><strong>{{ $errors->first('password') }}</strong></span>
|
||||
<div class="invalid-feedback">{{ $errors->first('password') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="input-field col s12">
|
||||
<p>
|
||||
<input id="remember" name="remember" class="filled-in" type="checkbox" {{ old('remember') ? 'checked' : '' }}>
|
||||
<label for="remember">保存する</label>
|
||||
</p>
|
||||
<div class="form-check">
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input id="remember" name="rememver" class="custom-control-input" type="checkbox" {{ old('remember') ? 'checked' : '' }}>
|
||||
<span class="custom-control-indicator"></span>
|
||||
<span class="custom-control-description">保存する</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row center">
|
||||
<div class="input-field col s12">
|
||||
<button class="btn waves-effect waves-light teal lighten-2" type="submit">ログイン</button>
|
||||
</div>
|
||||
<div class="input-field col s12">
|
||||
<a href="{{ route('password.request') }}">パスワードを忘れた場合はこちら</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<button class="btn btn-primary" type="submit">ログイン</button>
|
||||
<a href="{{ route('password.request') }}" class="btn btn-link">パスワードを忘れた場合はこちら</a>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@@ -1,45 +1,28 @@
|
||||
@extends('layouts.app')
|
||||
@extends('layouts.base')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<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="panel-body">
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
<h2>パスワードの再発行</h2>
|
||||
<hr>
|
||||
<div class="row justify-content-center my-5">
|
||||
<div class="col-12 text-center">
|
||||
<p>本サイトでお使いのメールアドレスを入力して、<strong>パスワードを再発行</strong>ボタンを押してください。<br>入力されたメールアドレスに、手続きを行うためのリンクが書かれたメールが送信されます。</p>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<form method="post" action="{{ route('password.email') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="form-group">
|
||||
<label for="email"><span class="oi oi-envelope-closed"></span> メールアドレス</label>
|
||||
<input id="email" name="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" type="text" value="{{ old('email') }}" required autofocus>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<div class="invalid-feedback">{{ $errors->first('email') }}</div>
|
||||
@endif
|
||||
|
||||
<form class="form-horizontal" method="POST" action="{{ route('password.email') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('email') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</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>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button class="btn btn-primary" type="submit">パスワードを再発行</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,75 +1,46 @@
|
||||
@extends('layouts.app')
|
||||
@extends('layouts.base')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Reset Password</div>
|
||||
<h2>パスワードの再発行</h2>
|
||||
<hr>
|
||||
<div class="row justify-content-center my-5">
|
||||
<div class="col-12 text-center">
|
||||
<p>新しいパスワードを入力し、<strong>パスワードを変更</strong>ボタンを押してください。</p>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<form method="post" action="{{ route('password.request') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="panel-body">
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
<input type="hidden" name="token" value="{{ $token }}">
|
||||
|
||||
<div class="form-group">
|
||||
<label for="email"><span class="oi oi-envelope-closed"></span> メールアドレス</label>
|
||||
<input id="email" name="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" type="text" value="{{ old('email') }}" required>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<div class="invalid-feedback">{{ $errors->first('email') }}</div>
|
||||
@endif
|
||||
|
||||
<form class="form-horizontal" method="POST" action="{{ route('password.request') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<input type="hidden" name="token" value="{{ $token }}">
|
||||
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('email') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
|
||||
<label for="password" class="col-md-4 control-label">Password</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control" name="password" required>
|
||||
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('password') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
|
||||
<label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
|
||||
<div class="col-md-6">
|
||||
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
|
||||
|
||||
@if ($errors->has('password_confirmation'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('password_confirmation') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</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>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="password"><span class="oi oi-key"></span> パスワード</label>
|
||||
<input id="password" name="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" type="password" required>
|
||||
|
||||
@if ($errors->has('password'))
|
||||
<div class="invalid-feedback">{{ $errors->first('password') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="password-confirm">パスワードの再入力</label>
|
||||
<input id="password-confirm" name="password_confirmation" class="form-control" type="password" required>
|
||||
|
||||
@if ($errors->has('password_confirmation'))
|
||||
<div class="invalid-feedback">{{ $errors->first('password_confirmation') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<button class="btn btn-primary" type="submit">パスワードを変更</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,66 +1,68 @@
|
||||
@extends('layouts.base-old')
|
||||
@extends('layouts.base')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<h2 class="grey-text">新規登録</h2>
|
||||
<div class="row">
|
||||
<form method="post" action="{{ route('register') }}" class="col s12 push-m3 m6">
|
||||
{{ csrf_field() }}
|
||||
<h2>新規登録</h2>
|
||||
<hr>
|
||||
<div class="row justify-content-center my-5">
|
||||
<div class="col-lg-6">
|
||||
<form method="post" action="{{ route('register') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="row">
|
||||
<h6 class="grey-text col s12">ユーザー情報</h6>
|
||||
<div class="input-field col s12">
|
||||
<i class="material-icons prefix">person</i>
|
||||
<input id="name" name="name" class="validate{{ $errors->has('name') ? ' invalid' : '' }}" type="text" value="{{ old('name') }}" required>
|
||||
<label for="name">ユーザー名</label>
|
||||
<div class="form-group">
|
||||
<label for="name"><span class="oi oi-person"></span> ユーザー名</label>
|
||||
<input id="name" name="name" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" type="text" value="{{ old('name') }}" required>
|
||||
|
||||
@if ($errors->has('name'))
|
||||
<span class="red-text"><strong>{{ $errors->first('name') }}</strong></span>
|
||||
<div class="invalid-feedback">{{ $errors->first('name') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="input-field col s12">
|
||||
<i class="material-icons prefix">email</i>
|
||||
<input id="email" name="email" class="validate{{ $errors->has('email') ? ' invalid' : '' }}" type="text" value="{{ old('email') }}" required>
|
||||
<label for="email">メールアドレス</label>
|
||||
<div class="form-group">
|
||||
<label for="email"><span class="oi oi-envelope-closed"></span> メールアドレス</label>
|
||||
<input id="email" name="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" type="text" value="{{ old('email') }}" required>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<span class="red-text"><strong>{{ $errors->first('email') }}</strong></span>
|
||||
<div class="invalid-feedback">{{ $errors->first('email') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="input-field col s12">
|
||||
<i class="material-icons prefix">lock</i>
|
||||
<input id="password" name="password" class="validate{{ $errors->has('password') ? ' invalid' : '' }}" type="password" required>
|
||||
<label for="password">パスワード</label>
|
||||
<div class="form-group">
|
||||
<label for="password"><span class="oi oi-key"></span> パスワード</label>
|
||||
<input id="password" name="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" type="password" required>
|
||||
|
||||
@if ($errors->has('password'))
|
||||
<span class="red-text"><strong>{{ $errors->first('password') }}</strong></span>
|
||||
<div class="invalid-feedback">{{ $errors->first('password') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="input-field col s12">
|
||||
<i class="material-icons prefix"></i>
|
||||
<input id="password-confirm" name="password_confirmation" class="validate" type="password" required>
|
||||
<div class="form-group">
|
||||
<label for="password-confirm">パスワードの再入力</label>
|
||||
<input id="password-confirm" name="password_confirmation" class="form-control" type="password" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="input-field col s12">
|
||||
<h6 class="grey-text">プライバシーに関するオプション (全て任意です)</h6>
|
||||
<p>
|
||||
<input id="protected" name="is_protected" class="filled-in" type="checkbox" {{ old('is_protected') ? 'checked' : '' }}>
|
||||
<label for="protected">チェックイン履歴を非公開にする</label>
|
||||
</p>
|
||||
<p>
|
||||
<input id="accept-analytics" name="accept_analytics" class="filled-in" type="checkbox" {{ old('accept_analytics') ? 'checked' : '' }}>
|
||||
<label for="accept-analytics">匿名での統計にチェックインデータを利用することに同意します</label>
|
||||
</p>
|
||||
<div class="form-row ml-1 mt-4">
|
||||
<h6 class="mb-3">プライバシーに関するオプション (全て任意です)</h6>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="form-check">
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input id="protected" name="is_protected" class="custom-control-input" type="checkbox" {{ old('is_protected') ? 'checked' : '' }}>
|
||||
<span class="custom-control-indicator"></span>
|
||||
<span class="custom-control-description">全てのチェックイン履歴を非公開にする</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input id="accept-analytics" name="accept_analytics" class="custom-control-input" type="checkbox" {{ old('accept_analytics') ? 'checked' : '' }}>
|
||||
<span class="custom-control-indicator"></span>
|
||||
<span class="custom-control-description">匿名での統計にチェックインデータを利用することに同意します</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row center">
|
||||
<div class="input-field col s12">
|
||||
<button class="btn waves-effect waves-light teal lighten-2" type="submit">登録</button>
|
||||
|
||||
<div class="text-center">
|
||||
<button class="btn btn-primary btn-lg" type="submit">登録</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@@ -1,68 +0,0 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Login</div>
|
||||
<div class="panel-body">
|
||||
<form class="form-horizontal" method="POST" action="{{ route('login') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required autofocus>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('email') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
|
||||
<label for="password" class="col-md-4 control-label">Password</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control" name="password" required>
|
||||
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('password') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-6 col-md-offset-4">
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" name="remember" {{ old('remember') ? 'checked' : '' }}> Remember Me
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-8 col-md-offset-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Login
|
||||
</button>
|
||||
|
||||
<a class="btn btn-link" href="{{ route('password.request') }}">
|
||||
Forgot Your Password?
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@@ -1,76 +0,0 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Register</div>
|
||||
<div class="panel-body">
|
||||
<form class="form-horizontal" method="POST" action="{{ route('register') }}">
|
||||
{{ csrf_field() }}
|
||||
|
||||
<div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
|
||||
<label for="name" class="col-md-4 control-label">Name</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus>
|
||||
|
||||
@if ($errors->has('name'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('name') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
|
||||
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
|
||||
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('email') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
|
||||
<label for="password" class="col-md-4 control-label">Password</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control" name="password" required>
|
||||
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('password') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
|
||||
</div>
|
||||
</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>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
Reference in New Issue
Block a user