Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivateProperties

src/components/user/registerAgencySection.vue

@@ -200,7 +200,11 @@
               <button @click="SubmitData()" class="btn btn-b-n" type="button">Submit</button>
             </div>
             <div class="col-md-2 offset-md-1">
-              <button @click="Cancel()" class="btn btn-b-n" type="button">Cancel</button>
+              <button
+                @click="Close(routerGoTo('/user/login'))"
+                class="btn btn-b-n"
+                type="button"
+              >Cancel</button>
             </div>
           </div>
         </div>
@@ -244,6 +248,10 @@ export default {
       'clearAgency',
     ]),
 
+    routerGoTo(goTo) {
+      this.$emit('routerGoTo', goTo);
+    },
+
     togglePassword() {
       this.showPassword = true;
       this.isPasswordShown = 'text';
@@ -257,7 +265,7 @@ export default {
       this.$router.push('/user/login');
     },
     Close() {
-      this.$router.push('/registerAgency/');
+      this.$router.push('/user/login');
     },
   },
 };

src/components/user/registerPage.vue

@@ -146,7 +146,11 @@
               <button @click="SubmitData()" class="btn btn-b-n" type="submit">Submit</button>
             </div>
             <div class="col-md-2 offset-md-1">
-              <button @click="Cancel()" class="btn btn-b-n" type="submit">Cancel</button>
+              <button
+                @click="Close(routerGoTo('/user/login'))"
+                class="btn btn-b-n"
+                type="submit"
+              >Cancel</button>
             </div>
           </div>
         </div>
@@ -192,6 +196,10 @@ export default {
       'clearIndividual',
     ]),
 
+    routerGoTo(goTo) {
+      this.$emit('routerGoTo', goTo);
+    },
+
     togglePassword() {
       this.showPassword = true;
       this.isPasswordShown = 'text';
@@ -206,7 +214,7 @@ export default {
       this.$router.push('/user/login');
     },
     Close() {
-      this.$router.push('/registerIndividual/');
+      this.$router.push('/user/login');
     },
   },
 };