From bcdcac23826be7f482e0393bf31f99b2c5e2b127 Mon Sep 17 00:00:00 2001
From: weichien00 <weichien00@gmail.com>
Date: Mon, 26 Jul 2021 12:50:16 +0800
Subject: [PATCH] fix: login and registration.

---
 .../RegistrationCheckEmailFormComponent.vue   |   9 +-
 .../forms/RegistrationFormComponent.vue       | 272 +++++++++++-------
 .../sections/RegistrationSectionComponent.vue |   5 +-
 .../customerDashboardSectionComponent.vue     |  21 ++
 .../validation/registrationFormValidation.js  |  16 +-
 .../assets/vue/general/mixins/stepNavi.js     |  22 ++
 .../views/pages/accounts/login.blade.php      |  18 +-
 7 files changed, 243 insertions(+), 120 deletions(-)
 create mode 100644 resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
 create mode 100644 resources/assets/vue/general/mixins/stepNavi.js

diff --git a/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue
index 71d0bf98..e96c3f46 100644
--- a/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue
@@ -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>
diff --git a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
index e436960a..be33cc6e 100644
--- a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
@@ -6,14 +6,13 @@
                 <div class="col">
                     <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 class="fs-11 muted">Debug: RegisstrationFormComponent {{parameters}} </div> -->
                         </div>
                     </div>
                     <error-message-component class="m-b-20" :error="error"></error-message-component>
                     <div class="row">
                         <div class="col">
-                            <div class="row" v-show="step === 1">
+                            <div class="row">
                                 <div class="col">
                                     <div class="row m-b-15">
                                         <div class="col">
@@ -27,22 +26,11 @@
                                                     <div class="row">
                                                         <div class="col-auto p-r-0">
                                                             <div class="b-a b-grey bg-white p-t-20 p-b-20 p-l-45 p-r-45 pointer" :class="{ 'b-primary': parameters.type === 1, 'text-primary': parameters.type === 1, 'b-grey': parameters.type !== 1 }" @click="parameters.type = 1">
-                                                                <div class="m-b-15">
-                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                         width="45" height="45"
-                                                                         viewBox="0 0 172 172"
-                                                                         style=" fill:#000000;"><defs><linearGradient x1="107.5" y1="82.30469" x2="107.5" y2="101.12525" gradientUnits="userSpaceOnUse" id="color-1_114458_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="107.5" y1="56.10156" x2="107.5" y2="73.73962" gradientUnits="userSpaceOnUse" id="color-2_114458_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="123.625" y1="82.30469" x2="123.625" y2="101.12525" gradientUnits="userSpaceOnUse" id="color-3_114458_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="123.625" y1="56.10156" x2="123.625" y2="73.73962" gradientUnits="userSpaceOnUse" id="color-4_114458_gr4"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="25.98006" x2="86" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-5_114458_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="115.5625" y1="25.98006" x2="115.5625" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-6_114458_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="115.5625" y1="25.98006" x2="115.5625" y2="147.8125" gradientUnits="userSpaceOnUse" id="color-7_114458_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="53.75" y1="99.4375" x2="53.75" y2="106.82813" gradientUnits="userSpaceOnUse" id="color-8_114458_gr8"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="63.15625" y1="85.88713" x2="63.15625" y2="94.23719" gradientUnits="userSpaceOnUse" id="color-9_114458_gr9"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="44.34375" y1="85.94356" x2="44.34375" y2="94.00606" gradientUnits="userSpaceOnUse" id="color-10_114458_gr10"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M104.8125,83.3125h5.375v16.125h-5.375z" fill="url(#color-1_114458_gr1)"></path><path d="M104.8125,56.4375h5.375v16.125h-5.375z" fill="url(#color-2_114458_gr2)"></path><path d="M120.9375,83.3125h5.375v16.125h-5.375z" fill="url(#color-3_114458_gr3)"></path><path d="M120.9375,56.4375h5.375v16.125h-5.375z" fill="url(#color-4_114458_gr4)"></path><path d="M155.875,37.625v-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-102.125c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.375c0,2.96431 2.41069,5.375 5.375,5.375v16.7485c-10.01631,2.28438 -17.68644,10.78494 -18.69425,21.2205c-4.68431,1.15831 -8.18075,5.36694 -8.18075,10.406c0,5.47444 4.12531,9.9545 9.42506,10.61563c0.47569,1.36256 1.05888,2.67406 1.75763,3.91569c-10.38181,7.02512 -16.55769,18.57062 -16.55769,31.15619v8.0625h69.875h5.375h64.5v-5.375h-5.375v-96.75c2.96431,0 5.375,-2.41069 5.375,-5.375zM48.375,32.25h102.125l0.00538,5.375h-102.13038zM34.9375,83.3125c0,-10.37106 8.44144,-18.8125 18.8125,-18.8125c10.37106,0 18.8125,8.44144 18.8125,18.8125v10.75c0,10.37106 -8.44144,18.8125 -18.8125,18.8125c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125zM26.875,91.375c0,-1.98069 1.08844,-3.69531 2.6875,-4.62788v7.31538c0,0.67188 0.04838,1.33569 0.10213,1.99412c-1.6555,-0.91644 -2.78963,-2.66062 -2.78963,-4.68162zM53.75,118.25c7.095,0 13.46437,-3.08794 17.89338,-7.97113c1.51575,1.01319 2.90788,2.15 4.20862,3.37281c-5.58194,6.28069 -13.62831,9.97331 -22.102,9.97331c-8.47637,0 -16.52275,-3.68994 -22.102,-9.97062c1.30075,-1.22281 2.69288,-2.35963 4.20863,-3.37281c4.429,4.8805 10.79838,7.96844 17.89338,7.96844zM21.5,139.75v-2.6875c0,-7.14875 2.3435,-13.89169 6.49837,-19.393c6.57631,7.15681 15.9315,11.3305 25.75163,11.3305c9.81744,0 19.17531,-4.17369 25.75163,-11.33319c4.15487,5.504 6.49837,12.24962 6.49837,19.39569v2.6875zM115.5625,139.75v-5.375h29.5625v5.375zM145.125,118.25h-18.8125v5.375h18.8125v5.375h-29.5625v-13.4375c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-13.4375v5.375h13.4375c1.4835,0 2.6875,1.204 2.6875,2.6875v24.1875h-18.8125v-2.6875c0,-12.58556 -6.17588,-24.13106 -16.55769,-31.15619c0.70144,-1.24162 1.28463,-2.55044 1.75762,-3.91569c5.29975,-0.66112 9.42506,-5.14119 9.42506,-10.61562c0,-5.03906 -3.49644,-9.24769 -8.18075,-10.406c-1.1825,-12.24156 -11.52131,-21.844 -24.06925,-21.844v-16.125h91.375zM77.9375,94.0625v-7.31538c1.59906,0.93256 2.6875,2.64719 2.6875,4.62788c0,2.021 -1.13412,3.76519 -2.78963,4.68162c0.05375,-0.65844 0.10213,-1.32225 0.10213,-1.99412z" fill="url(#color-5_114458_gr5)"></path><path d="M99.4375,102.125h32.25c2.96431,0 5.375,-2.41069 5.375,-5.375v-10.75c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-32.25c-2.96431,0 -5.375,2.41069 -5.375,5.375v10.75c0,2.96431 2.41069,5.375 5.375,5.375zM99.4375,86h32.25l0.00538,10.75h-32.25538z" fill="url(#color-6_114458_gr6)"></path><path d="M99.4375,75.25h32.25c2.96431,0 5.375,-2.41069 5.375,-5.375v-10.75c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-32.25c-2.96431,0 -5.375,2.41069 -5.375,5.375v10.75c0,2.96431 2.41069,5.375 5.375,5.375zM99.4375,59.125h32.25l0.00538,10.75h-32.25538z" fill="url(#color-7_114458_gr7)"></path><path d="M53.75,107.5c4.45319,0 8.0625,-3.60931 8.0625,-8.0625h-16.125c0,4.45319 3.60931,8.0625 8.0625,8.0625z" fill="url(#color-8_114458_gr8)"></path><path d="M63.15625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-9_114458_gr9)"></path><path d="M44.34375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-10_114458_gr10)"></path></g></g></svg>
-                                                                </div>
                                                                 <p class="no-margin bold">Company</p>
                                                             </div>
                                                         </div>
                                                         <div class="col-auto">
                                                             <div class="b-a b-grey bg-white p-t-20 p-b-20 p-l-45 p-r-45 pointer" :class="{ 'b-primary': parameters.type === 0, 'text-primary': parameters.type === 0, 'b-grey': parameters.type !== 0 }"  @click="parameters.type = 0">
-                                                                <div class="m-b-15">
-                                                                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                                         width="45" height="45"
-                                                                         viewBox="0 0 172 172"
-                                                                         style=" fill:#000000;"><defs><linearGradient x1="99.4375" y1="82.64063" x2="99.4375" y2="95.42506" gradientUnits="userSpaceOnUse" id="color-1_43595_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="72.5625" y1="82.64063" x2="72.5625" y2="95.42506" gradientUnits="userSpaceOnUse" id="color-2_43595_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="99.21444" x2="86" y2="110.1875" gradientUnits="userSpaceOnUse" id="color-3_43595_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="16.57381" x2="86" y2="157.67563" gradientUnits="userSpaceOnUse" id="color-4_43595_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M99.4375,83.3125c-2.96853,0 -5.375,2.40647 -5.375,5.375c0,2.96853 2.40647,5.375 5.375,5.375c2.96853,0 5.375,-2.40647 5.375,-5.375c0,-2.96853 -2.40647,-5.375 -5.375,-5.375z" fill="url(#color-1_43595_gr1)"></path><path d="M72.5625,83.3125c-2.96853,0 -5.375,2.40647 -5.375,5.375c0,2.96853 2.40647,5.375 5.375,5.375c2.96853,0 5.375,-2.40647 5.375,-5.375c0,-2.96853 -2.40647,-5.375 -5.375,-5.375z" fill="url(#color-2_43595_gr2)"></path><path d="M91.375,99.4375h-10.75c-1.4835,0 -2.6875,1.204 -2.6875,2.6875c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625c0,-1.4835 -1.204,-2.6875 -2.6875,-2.6875z" fill="url(#color-3_43595_gr3)"></path><path d="M120.40538,103.85575c1.02662,-2.31931 1.83288,-4.75419 2.37575,-7.29119c6.53062,-0.91106 11.59387,-6.47419 11.59387,-13.25206c0,-4.37256 -2.13119,-8.22644 -5.375,-10.68281v-5.44219c0,-18.00625 -11.137,-33.43787 -26.875,-39.83412v-5.84263c0,-2.96969 -2.41606,-5.38575 -5.38575,-5.38575h-2.67675c-3.225,0 -6.08987,1.45662 -8.0625,3.71412c-1.97263,-2.2575 -4.8375,-3.71412 -8.0625,-3.71412h-2.6875c-2.96431,0 -5.375,2.41069 -5.375,5.375v5.85338c-15.738,6.39625 -26.875,21.82787 -26.875,39.83413v5.44219c-3.24381,2.45637 -5.375,6.31025 -5.375,10.68281c0,6.77787 5.06325,12.341 11.59387,13.25206c0.54288,2.537 1.34913,4.97187 2.37575,7.29119c-12.30875,10.25281 -19.34462,25.18456 -19.34462,41.26925v10.75h107.5v-10.75c0,-16.08469 -7.03588,-31.01644 -19.34463,-41.26925zM120.97781,111.72206l-19.64025,19.64025c-1.01856,1.01319 -2.78156,1.01319 -3.80013,0l-5.5685,-5.5685c10.87631,-1.74419 20.19119,-8.14581 25.84569,-17.11131c1.10994,0.9675 2.15538,1.98875 3.16319,3.03956zM53.75,88.6875v-13.4375h5.375c6.84775,0 12.83281,-3.68994 16.125,-9.17513c3.29219,5.48519 9.27725,9.17513 16.125,9.17513h26.875v13.4375c0,17.78319 -14.46681,32.25 -32.25,32.25c-17.78319,0 -32.25,-14.46681 -32.25,-32.25zM123.51213,90.91544c0.043,-0.74175 0.11288,-1.47544 0.11288,-2.22794v-12.943c3.12287,1.11531 5.375,4.06888 5.375,7.568c0,3.53944 -2.30856,6.52256 -5.48788,7.60294zM94.0625,21.5l2.6875,0.01075v4.09038c-2.39725,-0.62081 -4.86706,-1.04813 -7.40675,-1.24431c0.90838,-1.69044 2.67137,-2.85681 4.71925,-2.85681zM75.25,21.5h2.6875c2.04788,0 3.81087,1.16637 4.71925,2.85681c-2.53969,0.19619 -5.0095,0.6235 -7.40675,1.24431zM86,29.5625c17.97669,0 33.02938,12.67963 36.73275,29.5625h-31.35775c-1.4835,0 -2.6875,-1.204 -2.6875,-2.6875v-5.375h-5.375v5.375c0,4.44512 3.61738,8.0625 8.0625,8.0625h32.11294c0.0645,0.89225 0.13706,1.78181 0.13706,2.6875v2.6875h-2.6875h-2.6875h-26.875c-7.40944,0 -13.4375,-6.02806 -13.4375,-13.4375v-5.375h-5.375v5.375c0,7.40944 -6.02806,13.4375 -13.4375,13.4375h-5.375h-2.6875h-2.6875v-2.6875c0,-0.90569 0.07256,-1.79525 0.13706,-2.6875h10.61294c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-5.375h-5.375v5.375c0,1.4835 -1.204,2.6875 -2.6875,2.6875h-9.85775c3.70338,-16.88287 18.75606,-29.5625 36.73275,-29.5625zM43,83.3125c0,-3.49912 2.25212,-6.45269 5.375,-7.568v12.943c0,0.7525 0.06987,1.48619 0.11288,2.22794c-3.17931,-1.08038 -5.48788,-4.0635 -5.48788,-7.60294zM80.07406,125.79919l-5.6115,5.6115c-1.01856,1.01319 -2.78156,1.01319 -3.80013,0l-19.66175,-19.66175c1.01319,-1.05887 2.06669,-2.08819 3.18469,-3.06375c5.66256,8.97356 14.99356,15.37788 25.88869,17.114zM37.625,145.125c0,-10.7715 3.51525,-20.96519 9.8685,-29.283l19.36881,19.36881c1.57219,1.57219 3.63619,2.35694 5.70019,2.35694c2.064,0 4.128,-0.78475 5.70019,-2.35694l5.04981,-5.04981v20.339h-45.6875zM134.375,150.5h-5.375c0,-2.96431 -2.41069,-5.375 -5.375,-5.375h-10.75c-2.96431,0 -5.375,2.41069 -5.375,5.375h-18.8125v-20.38737l5.04981,5.04981c1.57219,1.57219 3.63619,2.35694 5.70019,2.35694c2.064,0 4.128,-0.78475 5.70019,-2.35694l19.34731,-19.34731c6.36669,8.32319 9.89,18.52494 9.89,29.30987z" fill="url(#color-4_43595_gr4)"></path></g></g></svg></div>
                                                                 <p class="no-margin bold">Personal</p>
                                                             </div>
                                                         </div>
@@ -80,81 +68,148 @@
                                                     </validation-wrapper-component>
                                                 </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row" v-show="step === 2">
-                                <div class="col">
-                                    <div class="row">
-                                        <div class="col">
-                                            <p class="bold fs-11 all-caps muted">Account Information</p>
-                                        </div>
-                                    </div>
-                                    <div class="row m-b-15">
-                                        <div class="col">
-                                            <validation-wrapper-component :validator="$v.parameters.email">
-                                                <label>Email</label>
-                                                <input class="form-control" v-model="parameters.email">
-                                            </validation-wrapper-component>
-                                        </div>
-                                    </div>
-                                    <div class="row m-b-15">
-                                        <div class="col p-r-5">
-                                            <validation-wrapper-component :validator="$v.parameters.password">
-                                                <label>Password</label>
-                                                <input class="form-control" type="password" v-model="parameters.password">
-                                            </validation-wrapper-component>
-                                        </div>
-                                        <div class="col p-l-5">
-                                            <validation-wrapper-component :validator="$v.parameters.password_confirmation">
-                                                <label>Password Confirmation</label>
-                                                <input class="form-control" type="password" v-model="parameters.password_confirmation">
-                                            </validation-wrapper-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row" v-show="step === 1">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col">
-                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="$v.$reset;$store.dispatch('toggleSection', {name: 'registrationForm', status: false})">
-                                        <div class="row align-items-center">
-                                            <div class="col-auto p-r-10">
-                                                <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <p class="bold fs-11 all-caps muted">Account Information</p>
+                                                </div>
                                             </div>
-                                            <div class="col p-l-5">
-                                                Back To Login
+
+                                            <div class="row m-b-15">
+                                                <div class="col">
+                                                    <validation-wrapper-component :validator="$v.parameters.email">
+                                                        <label>Email</label>
+                                                        <input class="form-control" v-model="checkedEmail" :disabled=true>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+
+                                            <div class="row m-b-15">
+                                                <div class="col p-r-5">
+                                                    <validation-wrapper-component :validator="$v.parameters.password">
+                                                        <label>Password</label>
+                                                        <input class="form-control" type="password" v-model="parameters.password">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                                <div class="col p-l-5">
+                                                    <validation-wrapper-component :validator="$v.parameters.password_confirmation">
+                                                        <label>Password Confirmation</label>
+                                                        <input class="form-control" type="password" v-model="parameters.password_confirmation">
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+
+                                            <div class="row m-b-15">
+                                                <div class="col">
+                                                    <validation-wrapper-component :validator="$v.parameters.identification_no">
+                                                        <label class="text-primary">{{ parameters.type === 0 ? 'IC/Passport' : 'SSM Registration' }} Number</label>
+                                                        <div class="controls">
+                                                            <input type="text" class="form-control fs-12" v-model="parameters.identification_no">
+                                                        </div>
+                                                    </validation-wrapper-component>
+                                                </div>
+                                            </div>
+
+                                            <div class="row m-b-15">
+                                                <div class="col">
+                                                    <file-input-component :validator="$v.parameters.files" v-model="parameters.files">
+                                                        <template slot="label">
+                                                            <div class="font-heading fs-11 text-primary all-caps">{{ parameters.type === 0 ? 'IC Photo' : 'SSM Registration Photo' }}</div>
+                                                        </template>
+                                                        <template slot="tips">
+                                                            <div class="row"  v-show="false">
+                                                                <div class="col">
+                                                                    <div class="row m-b-20">
+                                                                        <div class="col">
+                                                                            <div class="font-heading fs-11 text-warning m-b-10">{{ parameters.type === 0 ? 'IC': 'SSM registration'}} number shown in the photo should tally with {{ parameters.type === 0 ? 'IC': 'SSM registration'}} number provided above.</div>
+                                                                            <div class="font-heading fs-11 muted">Tips on how your photo should look</div>
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="row">
+                                                                        <div class="col">
+                                                                            <div class="row m-b-15">
+                                                                                <div class="col">
+                                                                                    <div class="row m-b-5">
+                                                                                        <div class="col">
+                                                                                            <div class="b-a b-danger b-thick">
+                                                                                                <div class="absolute" style="right: -10px; top: -10px;">
+                                                                                                    <div class="icon-thumbnail btn-rounded icon-25 bg-danger fs-12"><i class="fa fa-times text-white fs-12"></i></div>
+                                                                                                </div>
+                                                                                                <img v-if="parameters.type === 0" src="https://i.pinimg.com/originals/c2/18/96/c218966593d1baacae525934835d847d.jpg" class="w-100">
+                                                                                                <img v-if="parameters.type === 1" src="https://2.bp.blogspot.com/-uElNIO5qSEI/VE4I_f2Ai-I/AAAAAAAAJdA/zJbbBr7NRzI/s1600/ssm-notice-facebook-page.png" class="w-100">
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="row text-center">
+                                                                                        <div class="col">
+                                                                                            <div class="font-heading fs-11">Covered</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="col">
+                                                                                    <div class="row m-b-5">
+                                                                                        <div class="col">
+                                                                                            <div class="b-a b-danger b-thick">
+                                                                                                <div class="absolute" style="right: -10px; top: -10px;">
+                                                                                                    <div class="icon-thumbnail btn-rounded icon-25 bg-danger fs-12"><i class="fa fa-times text-white fs-12"></i></div>
+                                                                                                </div>
+                                                                                                <img v-if="parameters.type === 0" src="https://i.pinimg.com/originals/c2/18/96/c218966593d1baacae525934835d847d.jpg" class="w-100">
+                                                                                                <img v-if="parameters.type === 1" src="https://2.bp.blogspot.com/-uElNIO5qSEI/VE4I_f2Ai-I/AAAAAAAAJdA/zJbbBr7NRzI/s1600/ssm-notice-facebook-page.png" class="w-100">
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="row text-center">
+                                                                                        <div class="col">
+                                                                                            <div class="font-heading fs-11">Blurry</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="col">
+                                                                                    <div class="row m-b-5">
+                                                                                        <div class="col">
+                                                                                            <div class="b-a b-success b-thick">
+                                                                                                <div class="absolute" style="right: -10px; top: -10px;">
+                                                                                                    <div class="icon-thumbnail btn-rounded icon-25 bg-success fs-12"><i class="fa fa-check text-white fs-12"></i></div>
+                                                                                                </div>
+                                                                                                <img v-if="parameters.type === 0" src="https://i.pinimg.com/originals/c2/18/96/c218966593d1baacae525934835d847d.jpg" class="w-100">
+                                                                                                <img v-if="parameters.type === 1" src="https://2.bp.blogspot.com/-uElNIO5qSEI/VE4I_f2Ai-I/AAAAAAAAJdA/zJbbBr7NRzI/s1600/ssm-notice-facebook-page.png" class="w-100">
+                                                                                            </div>
+                                                                                        </div>
+                                                                                    </div>
+
+                                                                                    <div class="row text-center">
+                                                                                        <div class="col">
+                                                                                            <div class="font-heading fs-11">This is right!</div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </template>
+                                                    </file-input-component>
+                                                </div>
+                                            </div>
+
+                                            <div class="row">
+                                                <div class="col">
+                                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="changeStep('back')">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto p-r-10">
+                                                                <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
+                                                            </div>
+                                                            <div class="col p-l-5">Back</div>
+                                                        </div>
+                                                    </button>
+                                                </div>
+                                                <div class="col text-right">
+                                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none" @click="submitForm">Submit</button>
+                                                </div>
                                             </div>
                                         </div>
-                                    </button>
-                                </div>
-                                <div class="col text-right">
-                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="changeStep('next')">Next</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row" v-show="step === 2">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col">
-                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="changeStep('back')">
-                                        <div class="row align-items-center">
-                                            <div class="col-auto p-r-10">
-                                                <i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
-                                            </div>
-                                            <div class="col p-l-5">
-                                                Go Back
-                                            </div>
-                                        </div>
-                                    </button>
-                                </div>
-                                <div class="col text-right">
-                                    <button type="button" class="btn btn-sm p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Complete Registration</button>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -166,8 +221,14 @@
 
 </template>
 <script>
-    import registrationFormValidation from '../../../general/mixins/accounts/validation/registrationFormValidation'
+    import registrationFormValidation from '../../../general/mixins/accounts/validation/registrationFormValidation';
+    import stepNavi from '../../../general/mixins/stepNavi';
     export default {
+        props: {
+            email: {
+                required: true
+            },
+        },
         data() {
             return {
                 error: '',
@@ -180,31 +241,28 @@
                     phone: '',
                     password: '',
                     password_confirmation: '',
-                }
+                    identification_no:'',
+                    files: []
+                },
+                status:{
+                    direction:null,
+                },
+                watchCheckEmail:null
+
             }
         },
+        computed: {
+            checkedEmail(){
+                this.parameters.email = this.email;
+                return this.email;
+            }
+        },
+
         methods:{
-            changeStep(direction){
-
-                if(direction === 'next'){
-                    if(this.validate()){
-                        this.$v.$reset();
-                        this.step += 1;
-                    }
-                    return;
-                }
-
-                this.parameters.email = '';
-                this.parameters.password = '';
-                this.parameters.password_confirmation = '';
-
-                return this.step -= 1
-
-            },
             submitForm(){
-                this.step === 2 ? this.submit(this.route('api.account.registration.register'), 'post', 'registrationSection', false, false) : this.changeStep('next');
+                this.submit(this.route('api.account.registration.register'), 'post', 'registrationSection', false, false);
             }
         },
-        mixins: [registrationFormValidation]
+        mixins: [registrationFormValidation,stepNavi]
     }
 </script>
diff --git a/resources/assets/vue/components/accounts/sections/RegistrationSectionComponent.vue b/resources/assets/vue/components/accounts/sections/RegistrationSectionComponent.vue
index 85885bd9..e956e17c 100644
--- a/resources/assets/vue/components/accounts/sections/RegistrationSectionComponent.vue
+++ b/resources/assets/vue/components/accounts/sections/RegistrationSectionComponent.vue
@@ -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>
diff --git a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
new file mode 100644
index 00000000..6d8979aa
--- /dev/null
+++ b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
@@ -0,0 +1,21 @@
+<template>
+    <div class="row">
+        <h1>Dashboard</h1>
+    </div>
+</template>
+<script>
+    export default {
+        data(){
+            return {
+            }
+        },
+        computed: {
+        },
+        watch: {
+        },
+        created(){            
+        },
+        methods: {
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js b/resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js
index a280739d..69e6ead0 100644
--- a/resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js
+++ b/resources/assets/vue/general/mixins/accounts/validation/registrationFormValidation.js
@@ -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]
diff --git a/resources/assets/vue/general/mixins/stepNavi.js b/resources/assets/vue/general/mixins/stepNavi.js
new file mode 100644
index 00000000..a3c05a0d
--- /dev/null
+++ b/resources/assets/vue/general/mixins/stepNavi.js
@@ -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) {
+    },
+
+}
\ No newline at end of file
diff --git a/resources/views/pages/accounts/login.blade.php b/resources/views/pages/accounts/login.blade.php
index 4042bc05..9e7a5181 100644
--- a/resources/views/pages/accounts/login.blade.php
+++ b/resources/views/pages/accounts/login.blade.php
@@ -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
\ No newline at end of file