mirror of
https://gitlab.com/omair-personal/exchange.git
synced 2026-08-19 04:24:08 +00:00
half fix registration page
This commit is contained in:
@@ -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'];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<form @submit.prevent="register" @keydown="form.onKeydown($event)">
|
||||
<!-- Marking -->
|
||||
<div class="form-group row" :class="{'has-error': errors.has('marking') }">
|
||||
<label class="col-md-3 col-form-label text-md-right">{{ $t('marking') }}</label>
|
||||
<label class="col-md-3 col-form-label text-md-right">{{ $t('Marking') }}</label>
|
||||
<div class="col-md-7">
|
||||
<el-input v-model="form.marking" v-validate="'required|max:255'" type="text" name="marking" placeholder="Marking Number">
|
||||
</el-input>
|
||||
@@ -17,7 +17,7 @@
|
||||
<div class="form-group row" :class="{'has-error': errors.has('email') }">
|
||||
<label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
|
||||
<div class="col-md-7">
|
||||
<el-input v-model="form.email" v-validate="'required|email|max:255'" type="email" name="email" placeholder="Email">
|
||||
<el-input v-model="form.email" v-validate="'required|max:255'" type="email" name="email" placeholder="Email">
|
||||
</el-input>
|
||||
<span class="text-danger" v-if="errors.has('email')">{{ errors.first('email') }}</span>
|
||||
</div>
|
||||
@@ -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' })
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user