From 3992bedc671893a51546b5c3e9876d1263307aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Wed, 30 Dec 2020 00:30:06 +0900 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=8C=B2=E6=A9=9F=E8=83=BD=E6=80=A7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AuthController.php | 2 +- app/Http/Controllers/User/Register.php | 4 ++- config/session.php | 8 +++--- resources/js/bootstrap.js | 1 + resources/js/components/gender.vue | 27 +++++++++++++++++++ resources/views/pages/site/register.blade.php | 27 +++++-------------- 6 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 resources/js/components/gender.vue diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index c7c324a..c9d4531 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -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' => 'メールアドレスは既に登録しています。'); diff --git a/app/Http/Controllers/User/Register.php b/app/Http/Controllers/User/Register.php index 767099d..f730e22 100644 --- a/app/Http/Controllers/User/Register.php +++ b/app/Http/Controllers/User/Register.php @@ -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]); } } diff --git a/config/session.php b/config/session.php index 4e0f66c..cd6721b 100644 --- a/config/session.php +++ b/config/session.php @@ -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), /* |-------------------------------------------------------------------------- diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index c160141..0a75f17 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -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' }); diff --git a/resources/js/components/gender.vue b/resources/js/components/gender.vue new file mode 100644 index 0000000..f62759a --- /dev/null +++ b/resources/js/components/gender.vue @@ -0,0 +1,27 @@ + + + \ No newline at end of file diff --git a/resources/views/pages/site/register.blade.php b/resources/views/pages/site/register.blade.php index 589ee60..90cb64a 100644 --- a/resources/views/pages/site/register.blade.php +++ b/resources/views/pages/site/register.blade.php @@ -14,7 +14,7 @@ @csrf
ユーザー名 必須
-
+
パスワード 必須
@@ -26,14 +26,14 @@
電子メール 必須
-
+
国
@@ -41,24 +41,9 @@
性別
-
-
-
- - - -
-
-
+
+ +