cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

paused the fixing progress

Browse Source
This commit is contained in:
Mohd Arief
2018-08-15 09:32:42 +08:00
parent 6442a58746
commit e41e664325
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/pages/auth/register.vue
+11 -9
View File
@@ -8,7 +8,7 @@
<div class="form-group row"> <div class="form-group row">
<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"> <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"/> <has-error :form="form" field="marking"/>
</div> </div>
</div> </div>
@@ -17,8 +17,7 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label> <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
<div class="col-md-7"> <div class="col-md-7">
<el-input v-model="form.email" type="email" name="email" placeholder="Email"> <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email" placeholder="Email">
</el-input>
<has-error :form="form" field="email"/> <has-error :form="form" field="email"/>
</div> </div>
</div> </div>
@@ -27,17 +26,19 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label> <label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
<div class="col-md-7"> <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"> <template slot="append">
<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye"></i></el-button> <el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye"></i></el-button>
</template> </template>
<has-error :form="form" field="password"/>
</el-input> </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"> <template slot="append">
<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye-slash"></i></el-button> <el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye-slash"></i></el-button>
</template> </template>
<has-error :form="form" field="password"/>
</el-input> </el-input>
<has-error :form="form" field="password"/>
</div> </div>
</div> </div>
@@ -45,17 +46,18 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label> <label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label>
<div class="col-md-7"> <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"> <template slot="append">
<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye"></i></el-button> <el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye"></i></el-button>
</template> </template>
<has-error :form="form" field="password_confirmation"/>
</el-input> </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"> <template slot="append">
<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye-slash"></i></el-button> <el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye-slash"></i></el-button>
</template> </template>
<has-error :form="form" field="password_confirmation"/>
</el-input> </el-input>
<has-error :form="form" field="password_confirmation"/>
</div> </div>
</div> </div>
resources/lang/en/validation.php
+1
View File
@@ -50,6 +50,7 @@ return [
'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.', 'json' => 'The :attribute must be a valid JSON string.',
'marking' => 'The :attribute must be a valid marking',
'max' => [ 'max' => [
'numeric' => 'The :attribute may not be greater than :max.', 'numeric' => 'The :attribute may not be greater than :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.', 'file' => 'The :attribute may not be greater than :max kilobytes.',