登録機能性修正
このコミットが含まれているのは:
コミット
3992bedc67
|
@ -232,7 +232,7 @@ class AuthController extends Controller {
|
|||
if (preg_match("/^[a-zA-Z0-9]+$/", $r->username) == 0) return array('err' => '英文字ばかりご入力下さい。');
|
||||
if (empty($r->password)) return array('err' => 'パスワードは空です。');
|
||||
if (empty($r->password_check)) return array('err' => 'パスワード(確認)は空です。');
|
||||
if ($r->password < 8) return array('err' => 'パスワードは8文以上をご入力下さい。');
|
||||
if (strlen($r->password) < 8) return array('err' => 'パスワードは8文以上をご入力下さい。');
|
||||
if ($r->password != $r->password_check) return array('err' => 'パスワードとパスワード(確認)は違います。');
|
||||
$existEmail = DB::table('users')->select('id')->where('email', $r->email)->count();
|
||||
if ($existEmail != 0) return array('err' => 'メールアドレスは既に登録しています。');
|
||||
|
|
|
@ -20,13 +20,15 @@ class Register {
|
|||
public function index (Request $r) {
|
||||
if (isset($_COOKIE['kero_token'])) return redirect('');
|
||||
$err = '';
|
||||
$save = array('username' => '', 'email' => '', 'country' => '', 'gender' => 0);
|
||||
|
||||
if (isset($r->username) && isset($r->password) && isset($r->email) && isset($r->password_check)) {
|
||||
$save = array('username' => $r->username, 'email' => $r->email, 'country' => $r->country, 'gender' => $r->gender);
|
||||
$reg = $this->auth->register($r);
|
||||
if (isset($reg['kero_token'])) return redirect('');
|
||||
$err = $reg['err'];
|
||||
}
|
||||
|
||||
return view('pages.site.register', ['res' => $this->cntr, 'menu' => $this->menu, 'user' => $this->user, 'err' => $err]);
|
||||
return view('pages.site.register', ['res' => $this->cntr, 'menu' => $this->menu, 'user' => $this->user, 'sav' => $save, 'err' => $err]);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'driver' => env('SESSION_DRIVER', 'file'),
|
||||
'driver' => env('SESSION_DRIVER', 'cookie'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
@ -155,7 +155,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'domain' => env('SESSION_DOMAIN', null),
|
||||
'domain' => env('APP_URL', null),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
@ -168,7 +168,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'secure' => env('SESSION_SECURE_COOKIE'),
|
||||
'secure' => env('SESSION_SECURE_COOKIE', false),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
@ -181,7 +181,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'http_only' => true,
|
||||
'http_only' => env('SESSION_HTTP_ONLY', true),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
|
@ -24,6 +24,7 @@ Vue.component('delete-content', require('./components/deletecontent.vue').defaul
|
|||
Vue.component('delete-video', require('./components/deletevideo.vue').default);
|
||||
Vue.component('delete-game', require('./components/deletegame.vue').default);
|
||||
Vue.component('discord', require('./components/discord.vue').default);
|
||||
Vue.component('gender', require('./components/gender.vue').default);
|
||||
|
||||
const app = new Vue({ el: '#app' });
|
||||
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
<template>
|
||||
<fieldset class="form-group">
|
||||
<div tabindex="-1" role="group">
|
||||
<div id="gender" role="radiogroup" tabindex="-1" class="btn-group-toggle btn-group" variant="primary">
|
||||
<label :class="`btn btn-fumei${check == 0 ? '-check' : ''}`">
|
||||
<input id="gender0" name="gender" type="radio" autocomplete="off" class="" v-model="check" value="0" />
|
||||
<span>不明</span>
|
||||
</label>
|
||||
<label :class="`btn btn-danshi${check == 1 ? '-check' : ''}`">
|
||||
<input id="gender1" name="gender" type="radio" autocomplete="off" class="" v-model="check" value="1" />
|
||||
<span>男性</span>
|
||||
</label>
|
||||
<label :class="`btn btn-joshi${check == 2 ? '-check' : ''}`">
|
||||
<input id="gender2" name="gender" type="radio" autocomplete="off" class="" v-model="check" value="2" />
|
||||
<span>女性</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: { sel: 0 },
|
||||
data: function () { return { check: this.sel } }
|
||||
}
|
||||
</script>
|
|
@ -14,7 +14,7 @@
|
|||
@csrf
|
||||
<div class="row body">
|
||||
<div class="col-sm-4"><b>ユーザー名 <span class="badge badge-danger">必須</span></b></div>
|
||||
<div class="col"><input name="username" id="username-register" type="text" class="form-control" value="{{ old('username') }}" /></div>
|
||||
<div class="col"><input name="username" id="username-register" type="text" class="form-control" value="{{ $sav['username'] }}" /></div>
|
||||
</div>
|
||||
<div class="row body">
|
||||
<div class="col-sm-4"><b>パスワード <span class="badge badge-danger">必須</span></b></div>
|
||||
|
@ -26,14 +26,14 @@
|
|||
</div>
|
||||
<div class="row body">
|
||||
<div class="col-sm-4"><b>電子メール <span class="badge badge-danger">必須</span></b></div>
|
||||
<div class="col"><input name="email" id="email-register" type="text" class="form-control" value="{{ old('email') }}" /></div>
|
||||
<div class="col"><input name="email" id="email-register" type="text" class="form-control" value="{{ $sav['email'] }}" /></div>
|
||||
</div>
|
||||
<div class="row body">
|
||||
<div class="col-sm-4"><b>国</b></div>
|
||||
<div class="col">
|
||||
<select name="country" id="country-register" class="custom-select">
|
||||
@foreach ($res as $r)
|
||||
<option value="{{$r['value']}}">{{$r['label']}}</option>
|
||||
<option value="{{ ($sav['country'] ?: $r['value']) }}">{{ $r['label'] }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
|
@ -41,24 +41,9 @@
|
|||
<div class="row body">
|
||||
<div class="col-sm-4"><b>性別</b></div>
|
||||
<div class="col">
|
||||
<fieldset class="form-group">
|
||||
<div tabindex="-1" role="group">
|
||||
<div id="gender" role="radiogroup" tabindex="-1" class="btn-group-toggle btn-group" variant="primary">
|
||||
<label class="btn btn-fumei">
|
||||
<input id="gender0" name="gender" type="radio" autocomplete="off" class="" value="0" />
|
||||
<span>不明</span>
|
||||
</label>
|
||||
<label class="btn btn-danshi">
|
||||
<input id="gender1" name="gender" type="radio" autocomplete="off" class="" value="1" />
|
||||
<span>男性</span>
|
||||
</label>
|
||||
<label class="btn btn-joshi">
|
||||
<input id="gender2" name="gender" type="radio" autocomplete="off" class="" value="2" />
|
||||
<span>女性</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<div>
|
||||
<gender sel="{{ $sav['gender'] }}" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row body">
|
||||
|
|
新しいイシューから参照