diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 7375739d..1a93d6dd 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -64,7 +64,7 @@ class RegisterController extends Controller $marking = Marking::Where('email',$data['email'])->first(); if(!$marking){ - return response()->json(["message"=>"Does not exist"], 400); + return response()->json(["message"=>"Marking does not exist, please contact sales team to get one"], 400); } if($marking->marking != $data['marking']){ return response()->json(["message"=>"Incorrect marking"], 400); @@ -74,8 +74,6 @@ class RegisterController extends Controller return response()->json(["message"=>"Email already exist in the system"], 400); } - - $role = Role::where('name','=','member')->first(); $user = new User(); $user->email = $data['email']; diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index 033a783f..51355f13 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -5,7 +5,7 @@
- +
@@ -17,7 +17,7 @@
- + {{ errors.first('email') }}
@@ -113,19 +113,48 @@ export default { methods: { async register () { + var token + var data this.$validator.validateAll(); if (this.errors.any()) { return; } - // Register the user. - const { data } = await this.form.post('/api/register') + await this.form.post('/api/register') + .then( (response) => { + data = response.data + this.$message({ + message: "Sucess. Logging in..", + type: 'success' + }) + }) + .catch( (error) => { + console.log(error) + this.$message({ + message: error.response.data.message, + type: 'error' + }) + } + ) - // Log in the user. - const { data: { token } } = await this.form.post('/api/login') + + await this.form.post('/api/login') + .then( (response) => { + console.log(response.data) + token = response.data.token + }) + .catch( (error) => { + console.log(error) + this.$message({ + message: error.response.data.message, + type: 'error' + }) + } + ) + console.log(token) // Save the token. - this.$store.dispatch('auth/saveToken', { token }) + this.$store.dispatch('auth/saveToken', { token } ) // Update the user. await this.$store.dispatch('auth/updateUser', { user: data }) @@ -136,6 +165,7 @@ export default { } else { this.$router.push({ name: 'home' }) } + } } }