cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-24 15:05:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: login and registration.

Browse Source
This commit is contained in:
weichien00
2021-07-26 12:50:16 +08:00
parent a55272f556
commit bcdcac2382
7 changed files with 243 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue
+6 -3
View File
@@ -4,13 +4,13 @@
<div class="col">
<div class="row m-b-20">
<div class="col">
<div class="fs-11 muted">Check if email exist</div>
<div class="fs-11 muted">{{status.message}}</div>
</div>
</div>
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.email">
<label class="text-primary">Email Address</label>
<div class="controls">
<input type="text" class="form-control fs-12" v-model="watchCheckEmail">
<input type="text" autocomplete="nope" class="form-control fs-12" v-model="watchCheckEmail">
</div>
</validation-wrapper-component>
</div>
@@ -37,7 +37,8 @@
</div>
</template>
<script>
import registrationCheckEmailValidation from '../../../general/mixins/accounts/validation/registrationCheckEmailValidation'
import registrationCheckEmailValidation from '../../../general/mixins/accounts/validation/registrationCheckEmailValidation';
import stepNavi from '../../../general/mixins/stepNavi';
export default {
data() {
return {
@@ -76,6 +77,8 @@
this.$store.dispatch('toggleSection', {name: 'registrationSection', status: false});
},
},
beforeDestroy: function(){
},
mixins: [registrationCheckEmailValidation]
}
</script>
resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+165 -107
View File
File diff suppressed because one or more lines are too long
resources/assets/vue/components/accounts/sections/RegistrationSectionComponent.vue
+2 -3
View File
@@ -5,12 +5,11 @@
<div class="row m-b-20">
<div class="col">
<div class="font-heading fs-18 text-primary all-caps">Create Account</div>
<!-- <div class="fs-11 muted">Create your account by filling in the form below.</div> -->
</div>
</div>
<error-message-component class="m-b-20" :error="error"></error-message-component>
<registration-check-email-form-component section="loginSection" v-show="step === 1" v-on:updateStatus="updateStatus($event)"></registration-check-email-form-component>
<registration-form-component section="loginSection" v-show="step === 2" v-on:updateStatus="updateStatus($event)" :email=parameters.email></registration-form-component>
<registration-check-email-form-component section="loginSection" :key="Math.round(+new Date()/1000)" v-if="step === 1" v-on:updateStatus="updateStatus($event)"></registration-check-email-form-component>
<registration-form-component section="loginSection" v-if="step === 2" :key="Math.round(+new Date()/1000)" v-on:updateStatus="updateStatus($event)" :email=parameters.email></registration-form-component>
</div>
</div>
</div>
resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
+21
View File
@@ -0,0 +1,21 @@
<template>
<div class="row">
<h1>Dashboard</h1>
</div>
</template>
<script>
export default {
data(){
return {
}
},
computed: {
},
watch: {
},
created(){
},
methods: {
}
}
</script>
resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js
Vendored
+11 -5
View File
@@ -4,10 +4,10 @@ export default {
validations: {
parameters: {
name: {
required
required,
},
email: {
required: requiredIf(function () { return this.step === 2 }),
required,
email
},
company_name: {
@@ -18,12 +18,18 @@ export default {
numeric
},
password: {
required: requiredIf(function () { return this.step === 2 }),
required
},
password_confirmation: {
required: requiredIf(function () { return this.step === 2 }),
required,
sameAs: sameAs('password')
}
},
identification_no:{
required
},
files:{
required
},
}
},
mixins: [authenticationHandler]
resources/assets/vue/general/mixins/stepNavi.js
Vendored
+22
View File
@@ -0,0 +1,22 @@
export default {
methods: {
changeStep(direction) {
this.status.direction = direction;
if (direction === 'next') {
if (this.validate()) {
//this.step += 1;
this.status.email = this.parameters.email;
this.$emit('updateStatus', this.status);
}
return;
}
this.$emit('updateStatus', this.status);
this.$v.$reset();
},
},
beforeDestroy: function (event) {
},
}
resources/views/pages/accounts/login.blade.php
+16 -2
View File
@@ -1,7 +1,7 @@
@extends('layouts.base_login')
@section('inner_content')
<div class="row h-100">
<div class="row h-100" v-show="!$store.getters.isShowing('registrationSection')">
<div class="col bg-white">
<div class="row h-100 no-margin align-items-center justify-content-center">
<div class="col-12 col-md-8" v-show="!$store.getters.isShowing('registrationForm')">
@@ -57,7 +57,7 @@
</div>
</div>
</div>
<div class="col h-100 bg-info-primary-gradient">
<div class="col h-100 bg-info-primary-gradient" >
<div class="row h-100 align-items-center justify-content-center">
<div class="absolute hint-text dotted-grid" style="width: 250px; height: 142px; bottom: 0; right: 0; "></div>
<div class="absolute hint-text dotted-grid" style="width: 200px; height: 135px; top: 140px; left: 100px;"></div>
@@ -123,7 +123,21 @@
</div>
</div>
</div>
</div>
</div>
<div class="row h-100" v-show="$store.getters.isShowing('registrationSection')">
<div class="col">
<div class="row h-100 no-margin align-items-center justify-content-center">
<div class="col-12 col-md-8">
<loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
<div class="row justify-content-center" v-show="!$store.getters.isLoading('loginSection')">
<div class="col-8">
<registration-section-component section="loginSection"></registration-section-component>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection