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

src/components/misc/contactUs.vue

@@ -1,144 +1,175 @@
 <template>
+  <!-- eslint-disable max-len -->
   <div class="container">
-    <section class="intro-single">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 col-lg-8">
-            <div class="title-single-box">
-              <h1 class="title-single" style="text-align:left;">Contact Us</h1>
-            </div>
-          </div>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="faq-img-box">
+          <img
+            src="img/contact-us.jpg"
+            alt="Frequently Asked Questions"
+            class="img-fluid"
+            style="width:800px;height:400px;"
+          />
+        </div>
+        <div class="sinse-box">
+          <h3 class="sinse-title">
+            Contact Us
+            <span></span>
+          </h3>
         </div>
       </div>
-    </section>
-    <div class="map-wrapper">
-      <div class="map-canvas" id="map-canvas"></div>
-      <a
-        href="https://www.google.com/maps/dir/-25.8228224,28.3344896/vacation+recreational+services/@-25.8231034,28.3341882,16z/data=!3m1!4b1!4m9!4m8!1m1!4e1!1m5!1m1!1s0x1e955dadbb47bacd:0x3d299aff0be5b416!2m2!1d28.3426415!2d-25.8229739"
-        target="_blank"
-      ></a>
-      <iframe
-        src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1216.2235430439846!2d28.360457474768342!3d-25.79363191616322!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x0%3A0x445462e3d06f67fc!2sLombardy+Business+Park!5e0!3m2!1sen!2sza!4v1566222826763!5m2!1sen!2sza"
-        width="1100"
-        height="450"
-        frameborder="0"
-        style="border:0"
-        allowfullscreen
-      ></iframe>
-      <br />
-      <br />
-    </div>
+      <div class="container col-md-10">
+        <br />
+        <div class="map-wrapper">
+          <div class="map-canvas" id="map-canvas"></div>
+          <a
+            href="https://www.google.com/maps/dir/-25.8228224,28.3344896/vacation+recreational+services/@-25.8231034,28.3341882,16z/data=!3m1!4b1!4m9!4m8!1m1!4e1!1m5!1m1!1s0x1e955dadbb47bacd:0x3d299aff0be5b416!2m2!1d28.3426415!2d-25.8229739"
+            target="_blank"
+          ></a>
+          <iframe
+            src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1216.2235430439846!2d28.360457474768342!3d-25.79363191616322!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x0%3A0x445462e3d06f67fc!2sLombardy+Business+Park!5e0!3m2!1sen!2sza!4v1566222826763!5m2!1sen!2sza"
+            width="900"
+            height="450"
+            frameborder="0"
+            style="border:0"
+            allowfullscreen
+          ></iframe>
+          <br />
+          <br />
+        </div>
 
-    <div class="row mb-8">
-      <div class="col-md-6">
-        <form action="mailto:info@univateproperties.co.za" method="post" enctype="text/plain">
-          <div class="form-group row">
-            <div class="col-md-6">
-              <label for="yourname"></label>
-              <input
-                id="yourname"
-                name="yourname"
-                placeholder="Your Name"
-                type="text"
-                required="required"
-                class="form-control"
-              />
-            </div>
-            <div class="col-md-6">
-              <label for="youremail"></label>
-              <input
-                id="youremail"
-                name="youremail"
-                placeholder="Your Email"
-                type="text"
-                required="required"
-                class="form-control"
-              />
-            </div>
-          </div>
-          <div class="form-group row">
-            <div class="col-md-12">
-              <label for="subject"></label>
-              <input
-                id="subject"
-                name="subject"
-                placeholder="Subject"
-                type="text"
-                class="form-control"
-                required="required"
-              />
-            </div>
+        <div class="row mb-8">
+          <div class="col-md-6">
+            <form action="mailto:info@univateproperties.co.za" method="post" enctype="text/plain">
+              <div class="form-group row">
+                <div class="col-md-6">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text">
+                      <eva-icon name="person" fill="#60CBEB"></eva-icon>
+                    </span>
+                    <label for="yourname"></label>
+                    <input
+                      id="yourname"
+                      name="yourname"
+                      placeholder="Your Name"
+                      type="text"
+                      required="required"
+                      class="form-control"
+                    />
+                  </div>
+                </div>
+                <div class="col-md-6">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text">
+                      <eva-icon name="email" fill="#60CBEB"></eva-icon>
+                    </span>
+                    <label for="youremail"></label>
+                    <input
+                      id="youremail"
+                      name="youremail"
+                      placeholder="Your Email"
+                      type="text"
+                      required="required"
+                      class="form-control"
+                    />
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row">
+                <div class="col-md-12">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text">
+                      <eva-icon name="bookmark-outline" fill="#60CBEB"></eva-icon>
+                    </span>
+                    <label for="subject"></label>
+                    <input
+                      id="subject"
+                      name="subject"
+                      placeholder="Subject"
+                      type="text"
+                      class="form-control"
+                      required="required"
+                    />
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row">
+                <div class="col-md-12">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text">
+                      <eva-icon name="message-square-outline" fill="#60CBEB"></eva-icon>
+                    </span>
+                    <label for="message"></label>
+                    <textarea
+                      id="message"
+                      name="message"
+                      placeholder="Message"
+                      cols="40"
+                      rows="8"
+                      class="form-control"
+                      required="required"
+                    ></textarea>
+                  </div>
+                </div>
+              </div>
+              <div class="form-group row">
+                <div class="col-md-1">
+                  <button name="submit" type="submit" class="btn btn-b-n">Send Message</button>
+                </div>
+              </div>
+            </form>
           </div>
-          <div class="form-group row">
-            <div class="col-md-12">
-              <label for="message"></label>
-              <textarea
-                id="message"
-                name="message"
-                placeholder="Message"
-                cols="40"
-                rows="6"
-                class="form-control"
-                required="required"
-              ></textarea>
-            </div>
+          <div class="col-md-6">
+            <eva-icon name="pin-outline" fill="#60CBEB"></eva-icon>
+            <a style="font-size: 25px">Find us in</a>
+            <p></p>
+            <p>
+              105 Lombardy Business Park
+              <br />Cnr. Graham and Cole Rd.
+              <br />Shere, Pretoria, 0084
+            </p>
+            <br />
+            <eva-icon name="paper-plane-outline" fill="#60CBEB"></eva-icon>
+            <a style="font-size: 25px">Say Hello</a>
+            <p></p>
+            <p>
+              <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
+              <a href="mailto:info@univateproperties.co.za">info@univateproperties.co.za</a>
+              <br />
+              <eva-icon name="phone-call-outline" fill="#60CBEB"></eva-icon>
+              <a href="tel:+27124921238">+27 (0) 12 492 1238</a>
+            </p>
+            <br />
+            <eva-icon name="share-outline" fill="#60CBEB"></eva-icon>
+            <a style="font-size: 25px">Social Networks</a>
+            <p>
+              <a href="https://www.facebook.com/univateproperties/">
+                <eva-icon name="facebook-outline" fill="#60CBEB"></eva-icon>
+              </a>
+            </p>
           </div>
-          <div class="form-group row">
-            <div class="col-md-1">
-              <button name="submit" type="submit" class="btn btn-b-n">Send Message</button>
+        </div>
+        <div
+          class="modal fade"
+          id="thankYouModal"
+          tabindex="-1"
+          role="dialog"
+          aria-labelledby="contactModalLabel"
+          aria-hidden="true"
+        >
+          <div class="modal-dialog" role="document">
+            <div class="modal-content px-0 px-md-4">
+              <div class="modal-header">
+                <h5 class="modal-title" id="contactModalLabel">Thank you</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                  <span aria-hidden="true">&times;</span>
+                </button>
+              </div>
+              <div class="modal-body">
+                <p>Thank you for contacting us. We will contact you as soon as possible.</p>
+              </div>
             </div>
           </div>
-        </form>
-      </div>
-      <div class="col-md-6">
-        <eva-icon name="pin-outline" fill="#60CBEB"></eva-icon>
-        <a style="font-size: 25px">Find us in</a>
-        <p></p>
-        <p>
-          105 Lombardy Business Park
-          <br />Cnr. Graham and Cole Rd.
-          <br />Shere, Pretoria, 0084
-        </p>
-        <br />
-        <eva-icon name="paper-plane-outline" fill="#60CBEB"></eva-icon>
-        <a style="font-size: 25px">Say Hello</a>
-        <p></p>
-        <p>
-          <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
-          <a href="mailto:info@univateproperties.co.za">info@univateproperties.co.za</a>
-          <br />
-          <eva-icon name="phone-call-outline" fill="#60CBEB"></eva-icon>
-          <a href="tel:+27124921238">+27 (0) 12 492 1238</a>
-        </p>
-        <br />
-        <eva-icon name="share-outline" fill="#60CBEB"></eva-icon>
-        <a style="font-size: 25px">Social Networks</a>
-        <p>
-          <a href="https://www.facebook.com/univateproperties/">
-            <eva-icon name="facebook-outline" fill="#60CBEB"></eva-icon>
-          </a>
-        </p>
-      </div>
-    </div>
-    <div
-      class="modal fade"
-      id="thankYouModal"
-      tabindex="-1"
-      role="dialog"
-      aria-labelledby="contactModalLabel"
-      aria-hidden="true"
-    >
-      <div class="modal-dialog" role="document">
-        <div class="modal-content px-0 px-md-4">
-          <div class="modal-header">
-            <h5 class="modal-title" id="contactModalLabel">Thank you</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
-          </div>
-          <div class="modal-body">
-            <p>Thank you for contacting us. We will contact you as soon as possible.</p>
-          </div>
         </div>
       </div>
     </div>

src/components/property/propertySearchPage.vue

@@ -1,24 +1,24 @@
 <template>
   <!-- eslint-disable max-len -->
   <div class="container">
-    <div class="col-sm-12">
-      <div class="about-img-box">
-        <img
-          src="img/Johannesburg-south-africa-1.jpg"
-          alt="Property Listing"
-          class="img-fluid"
-          style="width:800px;height:400px;"
-        />
-      </div>
-      <div class="sinse-box">
-        <h3 class="sinse-title">
-          Property Listing
-          <span></span>
-        </h3>
-      </div>
-    </div>
-    <br />
     <div class="container col-md-10" v-if="propertyType === 'Residential'">
+      <div class="col-sm-12">
+        <div class="about-img-box">
+          <img
+            src="img/Pretoria-South-Africa.jpg"
+            alt="Property Listing"
+            class="img-fluid"
+            style="width:800px;height:400px;"
+          />
+        </div>
+        <div class="sinse-box">
+          <h3 class="sinse-title">
+            Property Listing
+            <span></span>
+          </h3>
+        </div>
+      </div>
+      <br />
       <div class="row">
         <div class="col-md-12">
           <h1 class="my-4">About Residential Properties</h1>
@@ -70,7 +70,25 @@
       </div>
       <br />
     </div>
+
     <div class="container col-md-10" v-if="propertyType === 'Commercial'">
+      <div class="col-sm-12">
+        <div class="about-img-box">
+          <img
+            src="img/Johannesburg-south-africa-1.jpg"
+            alt="Property Listing"
+            class="img-fluid"
+            style="width:800px;height:400px;"
+          />
+        </div>
+        <div class="sinse-box">
+          <h3 class="sinse-title">
+            Property Listing
+            <span></span>
+          </h3>
+        </div>
+      </div>
+      <br />
       <div class="row">
         <div class="col-md-12">
           <h1 class="my-4">About Commercial Properties</h1>

src/components/user/loginPage.vue

@@ -8,38 +8,48 @@
             <h4>Login</h4>
           </div>
           <div class="row">
-            <div>
-              <eva-icon name="lock-outline" fill="#60CBEB"></eva-icon>
-            </div>
-            <div class="col-md-11">
-              <input
-                class="form-control"
-                v-model="username"
-                placeholder="Username"
-                type="text"
-                name="username"
-                value
-              />
-            </div>
-            <div>
-              <eva-icon
-                v-if="!showPassword"
-                name="eye-off"
-                fill="#60CBEB"
-                @click="togglePassword()"
-              ></eva-icon>
-              <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
-            </div>
-            <div class="col-md-11">
-              <input
-                class="form-control"
-                :type="isPasswordShown"
-                v-model="password"
-                id="password"
-                placeholder="Password"
-                name="password"
-                value
-              />
+            <div class="col-md-11" style="margin-bottom: 1em">
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="person" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="text"
+                    name="username"
+                    placeholder="Username"
+                    value
+                  />
+                </div>
+              </div>
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="lock" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    :type="isPasswordShown"
+                    v-model="password"
+                    id="password"
+                    placeholder="Password"
+                    name="password"
+                    value
+                  />
+                  <div class="input-group-append">
+                    <span class="input-group-text">
+                      <eva-icon
+                        v-if="!showPassword"
+                        name="eye-off"
+                        fill="#60CBEB"
+                        @click="togglePassword()"
+                      ></eva-icon>
+                      <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
+                    </span>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
           <div class="form-group row"></div>
@@ -53,9 +63,10 @@
           <h5>Trouble signing in?</h5>
           <div>
             <div class="row">
-              <eva-icon name="email" fill="#60CBEB"></eva-icon>
-
-              <div class="col-md-11">
+              <div class="input-group-prepend">
+                <span class="input-group-text">
+                  <eva-icon name="email" fill="#60CBEB"></eva-icon>
+                </span>
                 <input class="form-control" placeholder="Your Email" type="text" name="email" value />
               </div>
             </div>

src/components/user/registerAgencySection.vue

@@ -5,41 +5,55 @@
       <div class="reg-page">
         <div class="regform" style="text-align:left">
           <h4>Agency Details</h4>
-          <div class="col-md-8" style="margin-bottom: 1em">
-            <eva-icon name="people" fill="#60CBEB"></eva-icon>
-            <input
-              class="form-control"
-              type="text"
-              name="agencyname"
-              placeholder="Agency Name"
-              v-model="registerAgency.name"
-            />
-          </div>
-          <div class="col-md-8" style="margin-bottom: 1em">
-            <eva-icon name="book" fill="#60CBEB"></eva-icon>
-            <input
-              class="form-control"
-              type="text"
-              name="eaabffcnumber"
-              placeholder="EAAB FFC Number"
-              v-model="registerAgency.eaabeffcNumber"
-            />
-          </div>
-          <div class="col-md-8">
-            <eva-icon name="clipboard" fill="#60CBEB"></eva-icon>
-            <input
-              class="form-control"
-              type="text"
-              name="companyregnumber"
-              placeholder="Company Registration Number"
-              v-model="registerAgency.companyRegNumber"
-            />
+          <div class="row" style="text-align:left">
+            <div class="col-md-8" style="margin-bottom: 1em">
+              <div class="input-group-prepend">
+                <span class="input-group-text">
+                  <eva-icon name="people" fill="#60CBEB"></eva-icon>
+                </span>
+                <input
+                  class="form-control"
+                  type="text"
+                  name="agencyname"
+                  placeholder="Agency Name"
+                  v-model="registerAgency.name"
+                />
+              </div>
+            </div>
+            <div class="col-md-8" style="margin-bottom: 1em">
+              <div class="input-group-prepend">
+                <span class="input-group-text">
+                  <eva-icon name="book" fill="#60CBEB"></eva-icon>
+                </span>
+                <input
+                  class="form-control"
+                  type="text"
+                  name="eaabffcnumber"
+                  placeholder="EAAB FFC Number"
+                  v-model="registerAgency.eaabeffcNumber"
+                />
+              </div>
+            </div>
+            <div class="col-md-8">
+              <div class="input-group-prepend">
+                <span class="input-group-text">
+                  <eva-icon name="clipboard" fill="#60CBEB"></eva-icon>
+                </span>
+                <input
+                  class="form-control"
+                  type="text"
+                  name="companyregnumber"
+                  placeholder="Company Registration Number"
+                  v-model="registerAgency.companyRegNumber"
+                />
+              </div>
+            </div>
           </div>
           <hr />
           <div class="col-md-10" style="text-align:left">
             <h5 style="margin-bottom: 1em">Agency Administrator</h5>
             <div class="row" style="text-align:left">
-              <div class="col-md-6" style="margin-bottom: 1em">
+              <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
                     <eva-icon name="person" fill="#60CBEB"></eva-icon>
@@ -54,7 +68,7 @@
                 </div>
               </div>
 
-              <div class="col-md-6" style="margin-bottom: 1em">
+              <div class="input-group mb-3">
                 <div class="input-group-prepend">
                   <span class="input-group-text">
                     <eva-icon name="person" fill="#60CBEB"></eva-icon>
@@ -93,15 +107,29 @@
                   </span>
                   <input
                     class="form-control"
-                    type="text"
+                    type="number"
                     name="cellnumber"
-                    placeholder="Contact Number"
+                    placeholder="Cellphone Number"
                     v-model="registerAgency.user.cellNumber"
                   />
                 </div>
               </div>
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="phone-outline" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="number"
+                    name="landlinenumber"
+                    placeholder="Landline Number"
+                    v-model="registerAgency.user.telephone"
+                  />
+                </div>
+              </div>
             </div>
-
+            <hr />
             <div class="row">
               <div class="input-group mb-3">
                 <div class="input-group-prepend">

src/components/user/registerPage.vue

@@ -1,111 +1,167 @@
 <template>
+  <!-- eslint-disable max-len -->
   <form>
-    <!-- eslint-disable max-len -->
     <div class="reg-page">
       <div class="regform">
         <div class="col-md-10" style="text-align:left">
-          <h5 style="margin-bottom: 1em">{{ Header }}</h5>
+          <h4>Private Individual</h4>
           <div class="row" style="text-align:left">
-            <div class="col-md-6" style="margin-bottom: 1em">
-              <eva-icon name="person" fill="#60CBEB"></eva-icon>
-              <input
-                class="form-control"
-                type="text"
-                name="name"
-                placeholder="Name"
-                v-model="registerIndividual.name"
-              />
+            <div class="col-md-8" style="margin-bottom: 1em">
+              <div class="input-group-prepend">
+                <span class="input-group-text">
+                  <eva-icon name="people" fill="#60CBEB"></eva-icon>
+                </span>
+                <input
+                  class="form-control"
+                  type="text"
+                  name="name"
+                  placeholder="Name"
+                  v-model="registerIndividual.name"
+                />
+              </div>
             </div>
-            <div class="col-md-6" style="margin-bottom: 1em">
-              <eva-icon name="person" fill="#60CBEB"></eva-icon>
-              <input
-                class="form-control"
-                type="text"
-                name="surname"
-                placeholder="Surname"
-                v-model="registerIndividual.surname"
-              />
+            <div class="col-md-8" style="margin-bottom: 1em">
+              <div class="input-group-prepend">
+                <span class="input-group-text">
+                  <eva-icon name="book" fill="#60CBEB"></eva-icon>
+                </span>
+                <input
+                  class="form-control"
+                  type="text"
+                  name="surname"
+                  placeholder="Surname"
+                  v-model="registerIndividual.surname"
+                />
+              </div>
             </div>
           </div>
 
           <div class="row" style="text-align:left">
-            <div class="col-md-8">
-              <eva-icon name="email" fill="#60CBEB"></eva-icon>
-              <input
-                class="form-control"
-                type="text"
-                name="email"
-                placeholder="Email Address"
-                v-model="registerIndividual.email"
-              />
-              <div class="form-group row"></div>
+            <div class="col-md-7" style="text-align:left">
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="email" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="text"
+                    name="email"
+                    placeholder="Email Address"
+                    v-model="registerIndividual.email"
+                  />
+                  <div class="form-group row"></div>
+                </div>
+              </div>
             </div>
 
-            <div class="col-md-6" style="text-align:left">
-              <eva-icon name="smartphone" fill="#60CBEB"></eva-icon>
-              <input
-                class="form-control"
-                type="text"
-                name="cellnumber"
-                placeholder="Contact Number"
-                v-model="registerIndividual.cellNumber"
-              />
+            <div class="col-md-8" style="text-align:left">
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="smartphone" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="number"
+                    name="cellnumber"
+                    placeholder="Cellphone Number"
+                    v-model="registerIndividual.cellNumber"
+                  />
+                </div>
+              </div>
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="phone-outline" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="number"
+                    name="landline"
+                    placeholder="Landline Number"
+                    v-model="registerIndividual.telephone"
+                  />
+                </div>
+              </div>
             </div>
           </div>
           <hr />
           <div class="row">
-            <div class="col-md-7" style="margin-bottom: 1em">
-              <eva-icon name="person" fill="#60CBEB"></eva-icon>
-              <input
-                class="form-control"
-                type="text"
-                name="username"
-                placeholder="Username"
-                v-model="registerIndividual.username"
-              />
+            <div class="col-md-8" style="margin-bottom: 1em">
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="person" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    type="text"
+                    name="username"
+                    placeholder="Username"
+                    v-model="registerIndividual.username"
+                  />
+                </div>
+              </div>
             </div>
-            <div class="col-md-7" style="margin-bottom: 1em">
-              <eva-icon name="lock" fill="#60CBEB"></eva-icon>
-              <input
-                class="form-control"
-                :type="isPasswordShown"
-                v-model="registerIndividual.password"
-                id="password"
-                placeholder="Password"
-                name="password"
-                value
-              />
+            <div class="col-md-8" style="margin-bottom: 1em">
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="lock" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    :type="isPasswordShown"
+                    v-model="registerIndividual.password"
+                    id="password"
+                    placeholder="Password"
+                    name="password"
+                    value
+                  />
+                </div>
+              </div>
             </div>
-            <div class="col-md-7" style="margin-bottom: 1em">
-              <eva-icon name="lock" fill="#60CBEB"></eva-icon>
-              <input
-                class="form-control"
-                :type="isPasswordShown"
-                v-model="registerIndividual.password"
-                id="password"
-                placeholder="Confirm Password"
-                name="confirmpassword"
-                value
-              />
-              <div>
-                <eva-icon
-                  v-if="!showPassword"
-                  name="eye-off"
-                  fill="#60CBEB"
-                  @click="togglePassword()"
-                ></eva-icon>
-                <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
+            <div class="col-md-8" style="margin-bottom: 1em">
+              <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                  <span class="input-group-text">
+                    <eva-icon name="lock" fill="#60CBEB"></eva-icon>
+                  </span>
+                  <input
+                    class="form-control"
+                    :type="isPasswordShown"
+                    v-model="registerIndividual.password"
+                    id="password"
+                    placeholder="Confirm Password"
+                    name="confirmpassword"
+                    value
+                  />
+                  <div>
+                    <div class="input-group-append">
+                      <span class="input-group-text">
+                        <eva-icon
+                          v-if="!showPassword"
+                          name="eye-off"
+                          fill="#60CBEB"
+                          @click="togglePassword()"
+                        ></eva-icon>
+                        <eva-icon v-else name="eye" fill="#60CBEB" @click="passwordToggled()"></eva-icon>
+                      </span>
+                    </div>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-        <div class="form-group row"></div>
-        <div class="row offset-md-1">
-          <div class="col-md-2">
-            <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>
+          <div class="form-group row"></div>
+          <div class="row offset-md-1">
+            <div class="col-md-2">
+              <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>
+            </div>
           </div>
         </div>
       </div>

src/store/modules/timeshare/status.js

@@ -12,10 +12,9 @@ export default {
   },
   getters: {},
   actions: {
-    getStatusList({
-      commit,
-    }) {
-      axios.get('/api/status')
+    getStatusList({ commit }) {
+      axios
+        .get('/api/status')
         .then(result => commit('setStatusList', result.data))
         .catch(console.error);
     },

vue.config.js

@@ -2,7 +2,7 @@ module.exports = {
   devServer: {
     proxy: {
       '/api': {
-        target: 'http://localhost:57260',
+        target: 'http://192.168.6.188:5000',
         changeOrigin: true,
       },
     },