From c2fa5b3de40dd8046dfedbdf85aed6d4882dd53e Mon Sep 17 00:00:00 2001
From: thareqmy <thareqmyha@gmail.com>
Date: Thu, 7 Feb 2019 12:49:43 +0700
Subject: [PATCH] fix register bug
---
app/Http/Controllers/Auth/RegisterController.php | 6 ++++++
package.json | 1 -
resources/views/auth/register.blade.php | 6 +-----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 593d1e1..18594ba 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -114,6 +114,12 @@ class RegisterController extends Controller
<strong>Username</strong> too long (maximum size: 18 characters).
</div>';
return view('auth.register');
+ } else if(($data['password']) != ($data['password-confirm'])){
+ echo '<div class="alert alert-warning alert-dismissible fade show text-center">
+ <button type="button" class="close" data-dismiss="alert">x</button>
+ <strong>Password</strong> did not match
+ </div>';
+ return view('auth.register');
} else if(strlen($data['phone']) > 18){
echo '<div class="alert alert-warning alert-dismissible fade show text-center">
<button type="button" class="close" data-dismiss="alert">×</button>
diff --git a/package.json b/package.json
index c615dae..e3d75ba 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
"bootstrap-material-datetimepicker": "^2.7.3",
"bootstrap-material-design": "^4.1.1",
"material-design-icons": "^3.0.1",
- "papaparse": "^4.6.3",
"node-sass": "^4.11.0"
}
}
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index d0522b4..546977b 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -111,11 +111,7 @@
Register
</button>
</div>
- <div class="col-md-6 offset-md-4">
- <a href="/register/upload_csv">
- or Upload CSV File
- </a>
- </div>
+
</div>
</form>
</div>
--
GitLab