From e41e664325ef5c6d07e750c203635a22082494cc Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Wed, 15 Aug 2018 09:32:42 +0800
Subject: [PATCH] paused the fixing progress

---
 resources/assets/js/pages/auth/register.vue | 20 +++++++++++---------
 resources/lang/en/validation.php            |  1 +
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue
index 1b13c2c0..6a91cd10 100644
--- a/resources/assets/js/pages/auth/register.vue
+++ b/resources/assets/js/pages/auth/register.vue
@@ -8,7 +8,7 @@
 						<div class="form-group row">
 							<label class="col-md-3 col-form-label text-md-right">{{ $t('Marking') }}</label>
 							<div class="col-md-7">
-								<input style="text-transform: uppercase;" v-model="form.marking" :class="{ 'is-invalid': form.errors.has('marking') }" class="form-control" @input="forceUppercase($event, form, 'marking')" type="text" name="marking">
+								<input style="text-transform: uppercase;" v-model="form.marking" :class="{ 'is-invalid': form.errors.has('marking') }" class="form-control" @input="forceUppercase($event, form, 'marking')" type="marking" name="marking">
 								<has-error :form="form" field="marking"/>
 							</div>
 						</div>
@@ -17,8 +17,7 @@
 						<div class="form-group row">
 							<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" type="email" name="email" placeholder="Email">
-								</el-input>
+								<input v-model="form.email"  :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email" placeholder="Email">
 								<has-error :form="form" field="email"/>
 							</div>
 						</div>
@@ -27,17 +26,19 @@
 						<div class="form-group row">
 							<label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
 							<div class="col-md-7">
-								<el-input v-if="password_visible" v-model="form.password"  type="text" name="password" placeholder="Password">
+								<el-input v-if="password_visible" v-model="form.password" :class="{ 'is-invalid': form.errors.has('password') }" type="text" name="password" placeholder="Password">
 									<template slot="append">
 										<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye"></i></el-button>
 									</template>
+									<has-error :form="form" field="password"/>
 								</el-input>
-								<el-input v-else v-model="form.password"  type="password" name="password" placeholder="Password">
+								<el-input v-else v-model="form.password" :class="{ 'is-invalid': form.errors.has('password') }" type="password" name="password" placeholder="Password">
 									<template slot="append">
 										<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye-slash"></i></el-button>
 									</template>
+									<has-error :form="form" field="password"/>
 								</el-input>
-								<has-error :form="form" field="password"/>
+								
 							</div>
 						</div>
 
@@ -45,17 +46,18 @@
 						<div class="form-group row">
 							<label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label>
 							<div class="col-md-7">
-								<el-input v-if="password_confirmation_visible" v-model="form.password_confirmation" type="text" name="password_confirmation" placeholder="Confirm Password">
+								<el-input v-if="password_confirmation_visible" v-model="form.password_confirmation" :class="{ 'is-invalid': form.errors.has('password_confirmation') }" type="text" name="password_confirmation" placeholder="Confirm Password">
 									<template slot="append">
 										<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye"></i></el-button>
 									</template>
+									<has-error :form="form" field="password_confirmation"/>
 								</el-input>
-								<el-input v-else v-model="form.password_confirmation" type="password" name="password_confirmation" placeholder="Confirm Password">
+								<el-input v-else v-model="form.password_confirmation" :class="{ 'is-invalid': form.errors.has('password_confirmation') }" type="password" name="password_confirmation" placeholder="Confirm Password">
 									<template slot="append">
 										<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye-slash"></i></el-button>
 									</template>
+									<has-error :form="form" field="password_confirmation"/>
 								</el-input>
-								 <has-error :form="form" field="password_confirmation"/>
 							</div>
 						</div>
 
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index edc036dd..d18b5690 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -50,6 +50,7 @@ return [
     'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
     'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
     'json'                 => 'The :attribute must be a valid JSON string.',
+    'marking'              => 'The :attribute must be a valid marking',
     'max'                  => [
         'numeric' => 'The :attribute may not be greater than :max.',
         'file'    => 'The :attribute may not be greater than :max kilobytes.',