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

public/css/style.css

@@ -527,7 +527,7 @@ a:hover {
 
 .navbar-default {
     transition: all .5s ease-in-out;
-    background-color: #ffffff;
+    background-color: #E5E7E9;
     padding-top: 28px;
     padding-bottom: 28px;
     -webkit-backface-visibility: hidden;
@@ -553,7 +553,7 @@ a:hover {
 .navbar-default.navbar-trans .nav-item,
 .navbar-default.navbar-reduce .nav-item {
     position: relative;
-    padding-right: 10px;
+    padding-right: 40px;
     padding-bottom: 8px;
     margin-left: 0;
 }
@@ -563,7 +563,7 @@ a:hover {
     font-size: 1.1rem;
     color: #000000;
     font-weight: 600;
-    letter-spacing: 0.030em;
+    letter-spacing: 0.050em;
     transition: all 0.1s ease-in-out;
     position: relative;
     padding-left: 0;
@@ -1538,7 +1538,7 @@ a:hover {
 .section-footer {
     padding-top: 60px;
     margin-top: 60px;
-    background: #f3f3f3;
+    background: #E5E7E9;
 }
 
 .section-footer ul {
@@ -1556,7 +1556,7 @@ a:hover {
 }
 
 footer {
-    background: #f3f3f3;
+    background: #E5E7E9;
     text-align: center;
     padding: 30px 0;
 }

public/js/main.js

@@ -1,6 +1,4 @@
 (function ($) {
-  
-
   // Preloader
   $(window).on('load', () => {
     if ($('#preloader')) {
@@ -54,8 +52,8 @@
     $('.intro-content .intro-title').removeClass('zoomIn animated').hide();
     $('.intro-content .intro-price').removeClass('fadeInUp animated').hide();
     $('.intro-content .intro-title-top, .intro-content .spacial').removeClass(
-      'fadeIn animated'
-)
+      'fadeIn animated',
+    )
       .hide();
   });
 
@@ -78,8 +76,8 @@
   /* --/ Navbar Menu Reduce /--*/
   $(window).trigger('scroll');
   $(window).bind('scroll', () => {
-    let pixels = 50;
-    let top = 1200;
+    const pixels = 50;
+    const top = 1200;
     if ($(window).scrollTop() > pixels) {
       $('.navbar-default').addClass('navbar-reduce');
       $('.navbar-default').removeClass('navbar-trans');

src/components/about/aboutUsPage.vue

@@ -25,7 +25,7 @@
             </div>
             <div class="col-md-6 col-lg-5 section-md-t3">
               <p class="color-text-a font-weight-bold" style="text-align:left;">
-                began in 2013 in Pretoria East with various properties in their portfolio.
+                Uni-Vate Properties began in 2013 in Pretoria East with various properties in their portfolio.
                 Led by our Director, Delia O' Conner, who has over 25 years of experience in the timeshare industry,
                 the move to conventional property sales and rentals was an easy transition for the Uni-Vate team.
               </p>
@@ -75,9 +75,29 @@
               </p>
             </div>
           </div>
+          <hr />
+          <img
+            src="img/logos/nama.png"
+            alt
+            class="img-fluid"
+            style="width:140px;height:150px; border-radius:10px"
+          />
+          <img
+            src="img/logos/IEASA-logo.png"
+            alt
+            class="img-fluid"
+            style="width:380px;height:140px; border-radius:10px"
+          />
+          <img
+            src="img/logos/eaab.png"
+            alt
+            class="img-fluid"
+            style="width:180px;height:140px; border-radius:10px"
+          />
         </div>
       </div>
     </div>
+    <br />
   </section>
   <!--/ About End /-->
 </template>

src/components/misc/contactUs.vue

@@ -5,7 +5,7 @@
       <div class="col-sm-12">
         <div class="faq-img-box">
           <img
-            src="img/contact-us.jpg"
+            src="img/Contact-us2.jpg"
             alt="Frequently Asked Questions"
             class="img-fluid"
             style="width:800px;height:400px; border-radius:10px"

src/components/misc/privacyPolicyPage.vue

@@ -12,37 +12,37 @@
           />
         </div>
         <div class="sinse-box" style="opacity:0.7; border: white solid 3px; border-radius: 15px">
-          <h3 class="sinse-title">Privacy Policy</h3>
+          <h5 class="sinse-title">Privacy Policy</h5>
         </div>
       </div>
       <div class="col-md-12 text-left">
         <br />
-        <h3>Privacy</h3>
+        <h5>Privacy</h5>
         <p>We respect your privacy. This Privacy Policy governs the manner in which we will treat your personal information collected when using our website.</p>
 
-        <h3>How do we collect your personal information?</h3>
+        <h5>How do we collect your personal information?</h5>
         <p>Your personal information may be collected while using this website: when you contact us, when you complete an application form, when you check-in at your destination or when you make use of the services of one of our affiliated business partners. Personal information includes any information by which you can be identified and which relates to you as an identifiable individual, such as: your name, physical and postal addresses, email address, sex, age and internet address from the domain from which you are visiting.</p>
 
-        <h3>User of your personal information</h3>
+        <h5>User of your personal information</h5>
         <p>We need to process your personal information when you make use of our service. We use your personal information in the ordinary course of our business and to send you marketing material relating to our service offering. You can unsubscribe at any time and we will thereafter no longer use your personal information. We will not disclose your personal information to third parties unless justifiable in terms of an agreement between us.</p>
 
-        <h3>Access to and correction of personal information</h3>
+        <h5>Access to and correction of personal information</h5>
         <p>You may access your personal information that we hold by sending an email to: info@univateproperties.co.za</p>
         <p>In the event that you want to update or correct your personal information held by us, you can send an email to: info@univateproperties.co.za</p>
 
-        <h3>Protection of your personal information</h3>
+        <h5>Protection of your personal information</h5>
         <p>We take reasonable steps and measures to keep your information secure from loss, misuse or unauthorised alteration. Our database has built-in safeguards to ensure the privacy and confidentiality of your information. We do not have control over the websites of affiliated parties or sites linked into from this site and you must therefore refer to the privacy policies of any such parties to see how they protect your personal information.</p>
 
-        <h3>Cookies</h3>
+        <h5>Cookies</h5>
         <p>We may use cookies. Cookies are programmes that we transfer to your computer's hard drive to personalise your experience on this website. In this way, the next time you visit, we will know who you are and that you have visited this website before. This will enable us to enhance your browsing experience. You can set your browser to notify you if cookies are to be transferred or to reject cookies but this may prevent your use of some of the web pages.</p>
 
-        <h3>Email Monitoring</h3>
+        <h5>Email Monitoring</h5>
         <p>We provide email addresses on the website which enable you to contact us. Forms that you complete via this website will also be transmitted via email. In order to check for viruses and to monitor service we reserve the right to monitor and inspect all material and information transmitted over our system.</p>
 
-        <h3>Changes to this privacy policy</h3>
+        <h5>Changes to this privacy policy</h5>
         <p>We reserve the right, in our sole discretion, to amend this Privacy Policy from time to time. You agree to review the Privacy Policy whenever you visit this website for any such amendments. The amended version of the Privacy Policy shall supersede and replace all previous versions thereof.</p>
 
-        <h3>Which laws apply to your dealings with us?</h3>
+        <h5>Which laws apply to your dealings with us?</h5>
         <p>This policy will be governed and interpreted in accordance with the laws of South Africa. To the extent that a court has jurisdiction over any dispute which may arise out of or in connection with this Privacy Policy, we both submit to the jurisdiction of the South African Courts.</p>
       </div>
     </div>

src/components/property/propertyeditPage.vue

@@ -5,7 +5,7 @@
       <div class="col-sm-12">
         <div class="tobuy-img-box">
           <img
-            src="img/Listings2.jpg"
+            src="img/Listing3.2.jpg"
             alt="Timeshare To Buy"
             class="img-fluid"
             style="width:800px;height:400px; border-radius:10px"

src/components/shared/footerSection.vue

@@ -4,36 +4,47 @@
       <div class="container">
         <div class="row">
           <div class="col-sm-12 col-md-4">
-            <div class="w-header-a">
-              <div class="navbar-brand text-brand">
-                Uni-Vate
-                <span class="color-b">Properties</span>
+            <div class="widget-a">
+              <div class="w-header-a">
+                <h4 class="w-title-a">
+                  <router-link to="/">
+                    <b>Uni-Vate</b>
+                    <span class="color-b">Properties</span>
+                  </router-link>
+                </h4>
+              </div>
+              <div class="w-body-a"></div>
+              <div class="w-footer-a">
+                <ul class="list-unstyled">
+                  <li class="color-a">
+                    <eva-icon name="phone-call-outline" fill="#60CBEB"></eva-icon>
+                    <span class="color-text-a"></span> +27 (0)12 492 1238
+                  </li>
+                  <li class="color-a">
+                    <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
+                    <span class="color-text-a"></span> info@univateproperties.co.za
+                  </li>
+                  <br />
+                  <li class="item-list-a">
+                    <eva-icon name="message-square-outline" fill="#60CBEB"></eva-icon>
+                    <router-link to="/contactUs">Contact Us</router-link>
+                  </li>
+                </ul>
               </div>
-            </div>
-            <div class="w-body-a"></div>
-            <div class="w-footer-a">
-              <ul class="list-unstyled">
-                <li class="color-a">
-                  <eva-icon name="phone-call-outline" fill="#60CBEB"></eva-icon>
-                  <span class="color-text-a"></span> +27 (0)12 492 1238
-                </li>
-                <li class="color-a">
-                  <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
-                  <span class="color-text-a"></span> info@univateproperties.co.za
-                </li>
-              </ul>
             </div>
           </div>
           <div class="col-sm-12 col-md-4 section-md-t3">
             <div class="widget-a">
               <div class="w-header-a">
-                <h4 class="w-title-a text-brand">Navigation</h4>
+                <h4 class="w-title-a">
+                  <b>Navigation</b>
+                </h4>
               </div>
               <div class="w-body-a">
                 <div class="w-body-a">
                   <ul class="list-unstyled">
                     <li class="item-list-a">
-                      <i class="ion-ios-arrow-forward" style="color:#60CBEB"></i>
+                      <eva-icon name="slash-outline" fill="#60CBEB"></eva-icon>
                       <router-link to="/privacypolicy">Privacy Policy</router-link>
                     </li>
                     <br />
@@ -49,7 +60,9 @@
           </div>
           <div class="col-sm-12 col-md-4 section-md-t3">
             <div class="w-header-a">
-              <h4 class="w-title-a text-brand">Our Partners</h4>
+              <h4 class="w-title-a">
+                <b>Our Partners</b>
+              </h4>
             </div>
             <div class="w-body-a">
               <ul class="list-unstyled">

src/components/shared/navBar.vue

@@ -2,223 +2,205 @@
   <!-- eslint-disable max-len -->
   <nav class="navbar navbar-default navbar-trans navbar-expand-lg fixed-top">
     <div class="container-fluid">
-      <button
-        class="navbar-toggler collapsed"
-        type="button"
-        data-toggle="collapse"
-        data-target="#navbarDefault"
-        aria-controls="navbarDefault"
-        aria-expanded="false"
-        aria-label="Toggle navigation"
-      >
-        <span></span>
-        <span></span>
-        <span></span>
-      </button>
-      <a class="navbar-brand text-brand" @click="routerGoTo('/')">
-        <img
-          class="img-fluid"
-          src="/img/logos/UVProp.png"
-          alt="UVProp logo"
-          style="width:110px;height:60px;"
-        />
-        Uni-Vate
-        <span class="color-b">Properties</span>
-      </a>
-      <button
-        type="button"
-        class="btn btn-link nav-search navbar-toggle-box-collapse d-md-none"
-        data-toggle="collapse"
-        data-target="#navbarTogglerDemo01"
-        aria-expanded="false"
-      >
-        <span class="fa fa-search" aria-hidden="true"></span>
-      </button>
-      <div class="navbar-collapse collapse justify-content-center" id="navbarDefault">
-        <ul class="navbar-nav">
-          <li class="nav-item">
+      <div class="col-md-2">
+        <button
+          class="navbar-toggler collapsed"
+          type="button"
+          data-toggle="collapse"
+          data-target="#navbarDefault"
+          aria-controls="navbarDefault"
+          aria-expanded="false"
+          aria-label="Toggle navigation"
+        >
+          <span></span>
+          <span></span>
+          <span></span>
+        </button>
+        <a class="navbar-brand text-brand" @click="routerGoTo('/')">
+          <img
+            class="img-fluid"
+            src="/img/logos/UVProp.png"
+            alt="UVProp logo"
+            style="width:110px;height:60px;"
+          />
+          Uni-Vate
+          <span class="color-b">Properties</span>
+        </a>
+        <button
+          type="button"
+          class="btn btn-link nav-search navbar-toggle-box-collapse d-md-none"
+          data-toggle="collapse"
+          data-target="#navbarTogglerDemo01"
+          aria-expanded="false"
+        >
+          <span class="fa fa-search" aria-hidden="true"></span>
+        </button>
+      </div>
+
+      <div class="col-md-8">
+        <div class="navbar-collapse collapse justify-content-center" id="navbarDefault">
+          <ul class="navbar-nav">
+            <!-- <li class="nav-item">
             <a class="nav-link active" @click="routerGoTo('/')">Home</a>
-          </li>
-          <li class="nav-item dropdown">
-            <a
-              class="nav-link dropdown-toggle"
-              href="#"
-              id="navbarDropdown"
-              role="button"
-              data-toggle="dropdown"
-              aria-haspopup="true"
-              aria-expanded="false"
-            >About</a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/about/us')">About Us</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/about/timeshare')"
-              >About Timeshare</a>
-            </div>
-          </li>
-          <li class="nav-item dropdown">
-            <a
-              class="nav-link dropdown-toggle"
-              href="#"
-              id="navbarDropdown"
-              role="button"
-              data-toggle="dropdown"
-              aria-haspopup="true"
-              aria-expanded="false"
-            >Timeshare</a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/timeshare/buy')">To Buy</a>
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/timeshare/sell')">To Sell</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/timeshare/sell')"
-              >My Timeshare Weeks</a>
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/timeshare/faq')">FAQ</a>
-            </div>
-          </li>
-          <li class="nav-item dropdown">
-            <a
-              class="nav-link dropdown-toggle"
-              href="#"
-              id="navbarDropdown"
-              role="button"
-              data-toggle="dropdown"
-              aria-haspopup="true"
-              aria-expanded="false"
-            >Residential</a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/Residential/Search')"
-              >Search</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/Residential/Rental')"
-              >To Rent</a>
-              <div
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/Residential/Sale')"
-              >To Sell</div>
-              <div
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/list/Residential/MyListings')"
-              >My Residential Properties</div>
-              <div
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/list/Residential/All')"
-              >Admin Residential Properties</div>
-            </div>
-          </li>
-          <li class="nav-item dropdown">
-            <a
-              class="nav-link dropdown-toggle"
-              href="#"
-              id="navbarDropdown"
-              role="button"
-              data-toggle="dropdown"
-              aria-haspopup="true"
-              aria-expanded="false"
-            >Commercial</a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/Commercial/Search')"
-              >Search</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/Commercial/Rental')"
-              >To Rent</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/Commercial/Sale')"
-              >To Sell</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/list/Commercial/MyListings')"
-              >My Commercial Properties</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/property/list/Commercial/All')"
-              >Admin Commercial Properties</a>
-            </div>
-          </li>
-          <li class="nav-item dropdown">
-            <a
-              class="nav-link dropdown-toggle"
-              href="#"
-              id="navbarDropdown"
-              role="button"
-              data-toggle="dropdown"
-              aria-haspopup="true"
-              aria-expanded="false"
-            >Admin</a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/status/list')">Status</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/status/timeshareAdmin')"
-              >Timeshare Week Admin</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/status/tenderWeekAdmin')"
-              >Tender Week Management</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/unitConfiguration/list')"
-              >Unit Configuration</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/status/userManagementPage')"
-              >User Management & Access</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/status/changeLogPage')"
-              >Changes Logs</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/userDefinedGroups/list')"
-              >Property User Defined Groups</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/propertyTypes/list')"
-              >Property Types</a>
-            </div>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" @click="routerGoTo('/contactus')">Contact</a>
-          </li>
-          <li class="nav-item dropdown">
-            <a
-              class="nav-link dropdown-toggle"
-              href="#"
-              id="navbarDropdown"
-              role="button"
-              data-toggle="dropdown"
-              aria-haspopup="true"
-              aria-expanded="false"
-            >Login</a>
-            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/login')">Login</a>
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/logout')">Logout</a>
-              <a class="dropdown-item cursor-pointer" @click="routerGoTo('/user/register')">Register</a>
-              <a
-                class="dropdown-item cursor-pointer"
-                @click="routerGoTo('/user/registeragency')"
-              >Agency</a>
-            </div>
-          </li>
-        </ul>
+            </li>-->
+            <li class="nav-item dropdown">
+              <a
+                class="nav-link dropdown-toggle"
+                href="#"
+                id="navbarDropdown"
+                role="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+              >Timeshare</a>
+              <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/timeshare/buy')">To Buy</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/timeshare/sell')"
+                >To Sell</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/timeshare/sell')"
+                >My Timeshare Weeks</a>
+                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/timeshare/faq')">FAQ</a>
+              </div>
+            </li>
+            <li class="nav-item dropdown">
+              <a
+                class="nav-link dropdown-toggle"
+                href="#"
+                id="navbarDropdown"
+                role="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+              >Properties</a>
+              <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/property/Commercial/Search')"
+                >Search Commercial Properties</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/property/Commercial/Sale')"
+                >To Sell Commercial Properties</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/property/Commercial/Rental')"
+                >To Rent Commercial Properties</a>
+                <hr />
+
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/property/Residential/Search')"
+                >Search Residential Properties</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/property/Residential/Sale')"
+                >To Sell Residential Properties</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/property/Residential/Rental')"
+                >To Rent Residential Properties</a>
+                <hr />
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/property/list/Commercial/MyListings')"
+                >My Commercial Properties</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/property/list/Residential/MyListings')"
+                >My Residential Properties</a>
+              </div>
+            </li>
+
+            <li class="nav-item dropdown">
+              <a
+                class="nav-link dropdown-toggle"
+                href="#"
+                id="navbarDropdown"
+                role="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+              >About</a>
+              <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/about/us')">About Us</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/about/timeshare')"
+                >About Timeshare</a>
+              </div>
+            </li>
+
+            <li class="nav-item dropdown">
+              <a
+                class="nav-link dropdown-toggle"
+                href="#"
+                id="navbarDropdown"
+                role="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+              >Admin</a>
+              <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                <a class="dropdown-item cursor-pointer" @click="routerGoTo('/status/list')">Status</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/status/timeshareAdmin')"
+                >Timeshare Week Admin</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/status/tenderWeekAdmin')"
+                >Tender Week Management</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/unitConfiguration/list')"
+                >Unit Configuration</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/status/userManagementPage')"
+                >User Management & Access</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/status/changeLogPage')"
+                >Changes Logs</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/userDefinedGroups/list')"
+                >Property User Defined Groups</a>
+                <a
+                  class="dropdown-item cursor-pointer"
+                  @click="routerGoTo('/propertyTypes/list')"
+                >Property Types</a>
+              </div>
+            </li>
+            <li class="nav-item dropdown">
+              <a
+                class="nav-link"
+                @click="routerGoTo('/user/login')"
+                id="navbarDropdown"
+                role="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+              >Login</a>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div class="col-md-2" align="right">
+        <button
+          type="button"
+          class="btn btn-b-n navbar-toggle-box-collapse d-none d-md-block"
+          data-toggle="collapse"
+          data-target="#navbarTogglerDemo01"
+          aria-expanded="false"
+        >
+          <span class="fa fa-search" aria-hidden="true"></span>
+        </button>
       </div>
-      <button
-        type="button"
-        class="btn btn-b-n navbar-toggle-box-collapse d-none d-md-block"
-        data-toggle="collapse"
-        data-target="#navbarTogglerDemo01"
-        aria-expanded="false"
-      >
-        <span class="fa fa-search" aria-hidden="true"></span>
-      </button>
     </div>
     <span v-if="showLogout">
       <a @click="logout()">Logout</a>

src/components/timeshare/buy/buyPage.vue

@@ -6,7 +6,7 @@
         <div class="col-sm-12">
           <div class="tobuy-img-box">
             <img
-              src="img/buy.jpg"
+              src="img/buy2.jpg"
               alt="Timeshare To Buy"
               class="img-fluid"
               style="width:800px;height:400px; border-radius:10px"

src/components/timeshare/sell/sellPage.vue

@@ -6,7 +6,7 @@
         <div class="col-sm-12">
           <div class="about-img-box">
             <img
-              src="img/sell2.jpg"
+              src="img/sell3.jpg"
               alt="Timeshare To Sell"
               class="img-fluid"
               style="width:800px;height:400px; border-radius:10px"
@@ -16,35 +16,14 @@
             <h3 class="sinse-title">Timeshare To Sell</h3>
           </div>
         </div>
-        <br />
         <div>
           <div class="container col-md-10">
-            <div class="myWell">
-              <h4>Week Information</h4>
-            </div>
-            <div style="float: right;" class="btn btn-link color-b">
-              <router-link to="LinkToBeSelected">
-                Bulk Weeks Upload
-                <span class="ion-ios-arrow-forward" style="color:#60CBEB"></span>
-              </router-link>
-            </div>
+            <div style="float: right;" class="btn btn-link color-b"></div>
           </div>
           <br />
           <br />
           <p>* You need to be logged in to submit your listing. Please register and log in if you have not done so already.</p>
           <hr />
-        </div>
-      </div>
-    </div>
-    <div class="row mb-4">
-      <div class="container col-md-10">
-        <form
-          id="mainForm"
-          method="POST"
-          action="/to-sell"
-          accept-charset="UTF-8"
-          enctype="multipart/form-data"
-        >
           <div class="form-group row">
             <div class="col-md-4">
               <label>Were you referred by an agent?</label>
@@ -87,11 +66,37 @@
               </select>
             </div>
           </div>
+          <hr />
+          <div class="container col-md-10">
+            <div class="myWell">
+              <h4>Week Information</h4>
+            </div>
+            <!-- <div style="float: right;" class="btn btn-link color-b">
+              <router-link to="LinkToBeSelected">
+                Bulk Weeks Upload
+                <span class="ion-ios-arrow-forward" style="color:#60CBEB"></span>
+              </router-link>
+            </div>-->
+          </div>
+          <br />
+          <br />
+        </div>
+      </div>
+    </div>
+    <div class="row mb-4">
+      <div class="container col-md-10">
+        <form
+          id="mainForm"
+          method="POST"
+          action="/to-sell"
+          accept-charset="UTF-8"
+          enctype="multipart/form-data"
+        >
           <div class="container">
             <div class="col-md-12" style="text-align:left">
               <div class="form-group row">
                 <div class="col-md-6">
-                  <label for="Resort Name">Resort Name</label>
+                  <label for="Resort Name">Resort Name *</label>
                   <div class="input-group mb-3">
                     <div class="input-group-prepend">
                       <span class="input-group-text" style="color: #60CBEB">
@@ -160,7 +165,7 @@
               </div>
               <div class="form-group row">
                 <div class="col-md-6">
-                  <label for="Unit number">Unit Number</label>
+                  <label for="Unit number">Unit Number *</label>
                   <div class="input-group mb-3">
                     <div class="input-group-prepend">
                       <span class="input-group-text" style="color: #60CBEB">
@@ -176,7 +181,7 @@
                   </div>
                 </div>
                 <div class="col-md-6">
-                  <label for="Module">Module / Week Number</label>
+                  <label for="Module">Module / Week Number *</label>
                   <div class="input-group mb-3">
                     <div class="input-group-prepend">
                       <span class="input-group-text" style="color: #60CBEB">
@@ -228,7 +233,7 @@
                   </div>
                 </div>
                 <div class="col-md-6">
-                  <label for="Levy">Levy Amount</label>
+                  <label for="Levy">Levy Amount *</label>
                   <div class="input-group mb-3">
                     <div class="input-group-prepend">
                       <span class="input-group-text" style="color: #60CBEB">
@@ -247,7 +252,7 @@
               </div>
               <div class="form-group row">
                 <div class="col-md-12">
-                  <label for="Owner">Owner</label>
+                  <label for="Owner">Owner *</label>
                   <div class="input-group mb-3">
                     <div class="input-group-prepend">
                       <span class="input-group-text" style="color: #60CBEB">

src/components/user/loginPage.vue

@@ -57,8 +57,21 @@
           <div class="form-group row"></div>
           <button @click="Login()" class="btn btn-b-n" type="submit">Sign In</button>
           <p v-if="user !== null">{{ user }}</p>
+          <hr />
+          <button
+            @click="routerGoTo('/user/register')"
+            class="btn"
+            style="margin:2px"
+            type="button"
+          >Registration</button>
+          <button
+            @click="routerGoTo('/user/registeragency')"
+            class="btn"
+            style="margin:2px"
+          >Agency Registration</button>
         </div>
       </form>
+
       <form id="forgot">
         <div class="form">
           <h5>Trouble signing in?</h5>
@@ -124,6 +137,10 @@ export default {
       this.isPasswordShown = 'password';
     },
     SendMail() {},
+    routerGoTo(goTo) {
+      console.log(goTo);
+      this.$router.push(goTo);
+    },
   },
 };
 </script>

src/components/user/registerAgencySection.vue

@@ -254,7 +254,7 @@ export default {
     },
     SubmitData() {
       this.saveAgency(this.registerAgency);
-      this.$router.push('/registerAgency/');
+      this.$router.push('/user/login');
     },
     Close() {
       this.$router.push('/registerAgency/');

src/router/index.js

@@ -45,6 +45,9 @@ import Offer from '../components/processFlow/offers.vue';
 Vue.use(Router);
 
 export default new Router({
+  scrollBehavior (to, from, savedPosition) {
+    return { x: 0, y: 0 }
+  },
   routes: [{
     path: '/',
     name: 'Home',