diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 8a89aa41..fa69c6f4 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -46,7 +46,8 @@ class RegisterController extends Controller protected function validator(array $data) { return Validator::make($data, [ - 'marking' => 'required|max:255|unique:markings' + 'name' => 'required|name|max:255', + 'marking' => 'required|max:255|unique:markings', 'email' => 'required|email|max:255|unique:users', 'password' => 'required|min:6|confirmed', ]); @@ -61,14 +62,16 @@ class RegisterController extends Controller protected function create(Request $data) { $marking = Marking::Where('email',$data['email'])->first(); + if(!$marking){ - return response()->json('Access Denied', 401); + return response()->json('Does not exist ', 400); } if($marking->marking != $data['marking']){ - return response()->json('Wrong Marking', 400); + return response()->json('Incorrect marking', 400); } + if(User::Where('email',$data['email'])->first()){ - return response()->json('Email already exist in the system', 401); + return response()->json('Email already exist in the system', 400); } $role = Role::where('name','=','member')->first(); diff --git a/package.json b/package.json index 3ce9f5a8..83a8edc9 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "vue-router": "^3.0.1", "vuex": "^3.0.1", "vuex-router-sync": "^5.0.0", - "webpack": "^4.14.0" + "webpack": "^3.11.0" }, "devDependencies": { "@vue/cli-plugin-eslint": "^3.0.0-beta.6", diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index 7bd93c94..b05e9dac 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -5,14 +5,11 @@