Property Ref

src/App.vue

@@ -7,7 +7,7 @@
     <SearchTab v-if="!isLandingPage" />
     <NavBar v-if="!isLandingPage" @routerGoTo="routerGoTo" />
     <div v-if="!isLandingPage"></div>
-    <router-view @setLandingPage="setLandingPage" />
+    <router-view @setLandingPage="setLandingPage" style="margin-top:190px" />
     <FooterSection v-if="!isLandingPage" />
   </div>
 </template>

src/components/home/carouselSection.vue

@@ -267,32 +267,35 @@ export default {
 /* Extra small devices (phones, 600px and down) */
 @media only screen and (max-width: 600px) {
   .introContentAdjust {
-    margin-top: -35px !important;
+    margin-top: 140px !important;
   }
 }
 
 /* Small devices (portrait tablets and large phones, 600px and up) */
 @media only screen and (min-width: 600px) {
   .introContentAdjust {
-    margin-top: -15px !important;
+    margin-top: 150px !important;
   }
 }
 
 /* Medium devices (landscape tablets, 768px and up) */
 @media only screen and (min-width: 768px) {
+  .introContentAdjust {
+    margin-top: 160px !important;
+  }
 }
 
 /* Large devices (laptops/desktops, 992px and up) */
 @media only screen and (min-width: 992px) {
   .introContentAdjust {
-    margin-top: 25px !important;
+    margin-top: 160px !important;
   }
 }
 
 /* Extra large devices (large laptops and desktops, 1200px and up) */
 @media only screen and (min-width: 1200px) {
   .introContentAdjust {
-    margin-top: 0px !important;
+    margin-top: 120px !important;
   }
 }
 </style>

src/components/property/commercial/createProperty/commercialCreate.vue

@@ -1,11 +1,10 @@
 <template>
   <div>
     <carouselSection :salesType="salesType" />
-
     <main id="main" style="margin-top:-20px">
       <div class="container pt-5 pb-5">
         <div class="row">
-          <div class="col-md-5">
+          <div class="col-md-6">
             <div v-if="!property.propertyName">
               <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
             </div>
@@ -16,7 +15,20 @@
               v-model="property.propertyName"
             />
           </div>
-          <div class="col-md-5">
+          <div class="col-md-6">
+            <div v-if="!property.propertyRef">
+              <label for="propertyName" class="uniSelectLabel">PROPERTY REFERENCE</label>
+            </div>
+            <input
+              class="form-control uniInput"
+              type="text"
+              name="propertyRef"
+              v-model="property.propertyRef"
+            />
+          </div>
+        </div>
+        <div class="row my-5">
+          <div class="col-md-6">
             <select
               class="form-control uniSelect"
               name="propertyType"

src/components/property/residential/createProperty/residentialCreate.vue

@@ -5,7 +5,7 @@
     <main id="main" style="margin-top:-20px">
       <div class="container pt-5 pb-5">
         <div class="row">
-          <div class="col-md-5">
+          <div class="col-md-6">
             <div v-if="!property.propertyName">
               <label for="propertyName" class="uniSelectLabel">PROPERTY NAME</label>
             </div>
@@ -16,7 +16,20 @@
               v-model="property.propertyName"
             />
           </div>
-          <div class="col-md-5">
+          <div class="col-md-6">
+            <div v-if="!property.propertyRef">
+              <label for="propertyName" class="uniSelectLabel">PROPERTY REFERENCE</label>
+            </div>
+            <input
+              class="form-control uniInput"
+              type="text"
+              name="propertyRef"
+              v-model="property.propertyRef"
+            />
+          </div>
+        </div>
+        <div class="row my-5">
+          <div class="col-md-6">
             <select
               class="form-control uniSelect"
               name="propertyType"

src/components/propertyManagement/rentalManagement/contentSection.vue

@@ -19,7 +19,12 @@
       <div class="row">
         <div class="col-md-6"></div>
         <div class="col-md-6">
-          <h4>Contact us for a quote</h4>
+          <h4
+            style="cursor:pointer"
+            @click="$vuetify.goTo('#contactFoot', { duration: 2000, easing: 'easeInOutCubic' })"
+          >
+            Contact us for a quote
+          </h4>
         </div>
       </div>
 

src/components/propertyManagement/sectionalTitle/ourServicesSection.vue

@@ -18,7 +18,12 @@
       <div class="row mt-2">
         <div class="col-md-6"></div>
         <div class="col-md-6">
-          <h4>Contact us for a quote</h4>
+          <h4
+            style="cursor:pointer"
+            @click="$vuetify.goTo('#contactFoot', { duration: 2000, easing: 'easeInOutCubic' })"
+          >
+            Contact us for a quote
+          </h4>
         </div>
       </div>
       <div class="row">

src/components/shared/footerSection.vue

@@ -18,16 +18,18 @@
               <a href="commercial.php">Rent Commercial Property</a><br />
               <a href="residential.php">Buy Residential Property</a><br />
               <a href="residential.php">Rent Residential Property</a><br /> -->
-              <router-link class="footerText" v-if="isLoggedIn" to="/properties"
+              <router-link v-if="isLoggedIn" class="footerText" to="/properties"
                 >Property Management</router-link
-              ><br />
+              ><br v-if="isLoggedIn" />
+              <router-link to="/property/residential">Residential Property</router-link><br />
+              <router-link to="/property/commercial">Commercial Property</router-link><br />
               <router-link class="footerText" to="/privacyPolicy">Privacy Policy</router-link><br />
               <router-link class="footerText" to="/websiteDisclaimer"
                 >Website Disclaimer</router-link
               ><br />
             </p>
           </div>
-          <div class="col-lg-9 section-header">
+          <div class="col-lg-9 section-header" id="contactFoot">
             <h2 align="left">Contact Us</h2>
             <div class="row">
               <div class="col-md-4">
@@ -88,9 +90,9 @@
           <div class="col-md-12">
             <div class="copyright-footer">
               <p class="copyright color-text-a">
-                &copy; Copyright
+                Copyright © {{ currentYear }} Copyright
                 <span class="color-a">
-                  <b>Univate Properties</b>
+                  <b>Uni-Vate Properties.</b>
                 </span>
                 All Rights Reserved.
               </p>
@@ -138,6 +140,10 @@ export default {
     // eslint-disable-next-line vue/return-in-computed-property
     Logout() {
       return this.logout();
+    },
+    currentYear() {
+      var d = new Date();
+      return d.getFullYear();
     }
   }
 };

src/components/shared/navBar.vue

@@ -4,10 +4,7 @@
       <i class="fa fa-bars"></i>
     </button> -->
     <div>
-      <header
-        id="header"
-        style="width: 100%; position: fixed; top:0px; z-index: 50;min-height:120px"
-      >
+      <header id="header" style="width: 100%; position: fixed; top:0px; z-index: 50;">
         <div class="container">
           <div class="row">
             <div id="logo" class="col-md-3 col-xs-4 pull-left">
@@ -43,31 +40,7 @@
               </div>
               <nav id="nav-menu-container">
                 <ul class="nav-menu sf-js-enabled sf-arrows">
-                  <li class="menu-has-children">
-                    <div
-                      @mouseover="timeShareClass = 'ts-display'"
-                      @mouseleave="timeShareClass = 'no-display'"
-                    ></div>
-                    <a href="#" class="sf-with-ul">
-                      Timeshare
-                    </a>
-                    <ul style="margin-top:-10px;text-align:left" :class="timeShareClass">
-                      <li>
-                        <router-link to="/timeshare/buy">To Buy</router-link>
-                      </li>
-                      <li>
-                        <router-link to="/timeshare/sell">To Sell</router-link>
-                      </li>
-                      <li>
-                        <router-link to="/timeshare/faq">FAQ</router-link>
-                      </li>
-                      <li v-if="isLoggedIn">
-                        <hr />
-                        <router-link to="/timeshare/myWeeks">My Timeshare Weeks</router-link>
-                      </li>
-                    </ul>
-                  </li>
-                  <li class="menu-has-children">
+                  <li class="menu-has-children" style="margin-left:-20px">
                     <div
                       @mouseover="commercialClass = 'ts-display'"
                       @mouseleave="commercialClass = 'no-display'"
@@ -88,7 +61,7 @@
                       </li>
                     </ul>
                   </li>
-                  <li class="menu-has-children">
+                  <li class="menu-has-children mx-1">
                     <div
                       @mouseover="residentialClass = 'ts-display'"
                       @mouseleave="residentialClass = 'no-display'"
@@ -109,6 +82,30 @@
                       </li>
                     </ul>
                   </li>
+                  <li class="menu-has-children mx-1">
+                    <div
+                      @mouseover="timeShareClass = 'ts-display'"
+                      @mouseleave="timeShareClass = 'no-display'"
+                    ></div>
+                    <a href="#" class="sf-with-ul">
+                      Timeshare
+                    </a>
+                    <ul style="margin-top:-10px;text-align:left" :class="timeShareClass">
+                      <li>
+                        <router-link to="/timeshare/buy">To Buy</router-link>
+                      </li>
+                      <li>
+                        <router-link to="/timeshare/sell">To Sell</router-link>
+                      </li>
+                      <li>
+                        <router-link to="/timeshare/faq">FAQ</router-link>
+                      </li>
+                      <li v-if="isLoggedIn">
+                        <hr />
+                        <router-link to="/timeshare/myWeeks">My Timeshare Weeks</router-link>
+                      </li>
+                    </ul>
+                  </li>
                   <!-- <li class="menu-has-children">
                     <div
                       @mouseover="propertiesClass = 'ts-display'"
@@ -133,7 +130,7 @@
                       </li>
                     </ul>
                   </li> -->
-                  <li class="menu-has-children">
+                  <li class="menu-has-children mx-1">
                     <div
                       @mouseover="propManClass = 'ts-display'"
                       @mouseleave="propManClass = 'no-display'"
@@ -154,7 +151,7 @@
                       </li>
                     </ul>
                   </li>
-                  <li class="menu-has-children">
+                  <li class="menu-has-children mx-1">
                     <div
                       @mouseover="aboutClass = 'ts-display'"
                       @mouseleave="aboutClass = 'no-display'"
@@ -171,10 +168,10 @@
                       </li>
                     </ul>
                   </li>
-                  <li>
+                  <li class="mx-1">
                     <router-link to="/share/contact">Contact Us</router-link>
                   </li>
-                  <li v-if="isLoggedIn" class="menu-has-children">
+                  <li v-if="isLoggedIn" class="menu-has-children mx-1">
                     <div
                       @mouseover="userClass = 'ts-display'"
                       @mouseleave="userClass = 'no-display'"
@@ -237,14 +234,17 @@
                         <router-link to="/landingPages">Landing Pages / Campaignes</router-link>
                       </li>
                       <li>
-                        <a class="btn-white-border p-2" @click="logout(routerGoTo('/user/login'))"
-                          >Logout</a
+                        <router-link class="btn-white-border p-2" to="/user/login"
+                          >Logout</router-link
                         >
                       </li>
                     </ul>
                   </li>
+
                   <li v-if="!isLoggedIn">
-                    <router-link class="btn-white-border p-2" to="/user/login">Login</router-link>
+                    <router-link class="btn-white-border p-2 ml-1 mr-1" to="/user/login"
+                      >Login</router-link
+                    >
                   </li>
 
                   <li v-if="!isLoggedIn" class="menu-has-children">
@@ -252,10 +252,10 @@
                       @mouseover="registerClass = 'ts-display'"
                       @mouseleave="registerClass = 'no-display'"
                     ></div>
-                    <a href="#" class="sf-with-ul btn-solid-blue pt-2 pb-1" style="height:39px">
+                    <a href="#" class="sf-with-ul btn-solid-blue pt-2 pb-1" style="height:39px;">
                       Register
                     </a>
-                    <ul style="margin-top:-10px;text-align:left" :class="registerClass">
+                    <ul style="margin-top:-10px;" :class="registerClass">
                       <li>
                         <router-link to="/user/register">Register</router-link>
                       </li>
@@ -345,7 +345,10 @@ export default {
     },
     // eslint-disable-next-line vue/return-in-computed-property
     Logout() {
-      return this.logout();
+      this.logout().then(res => {
+        console.log("something");
+      });
+      //return this.logout();
     }
   }
 };
@@ -393,15 +396,21 @@ export default {
 /* Medium devices (landscape tablets, 768px and up) */
 @media only screen and (min-width: 768px) {
   #header {
-    min-height: 120px;
+    height: 170px;
   }
 }
 
 /* Large devices (laptops/desktops, 992px and up) */
 @media only screen and (min-width: 992px) {
+  #header {
+    height: 165px;
+  }
 }
 
 /* Extra large devices (large laptops and desktops, 1200px and up) */
 @media only screen and (min-width: 1200px) {
+  #header {
+    height: 120px;
+  }
 }
 </style>

src/components/shared/navBarNew.vue

@@ -1,23 +0,0 @@
-<template>
-  <div id="header-sticky-wrapper" class="sticky-wrapper is-sticky" style="min-height: 120px;">
-    <div class="container">
-      <div class="row">
-        <div id="logo" class="col-md-3 col-xs-4 pull-left">
-          <a href="/">
-            <img
-              class="img-fluid"
-              src="/img/logos/UVProp.png"
-              alt="UVProp logo"
-              style="height:100px;"
-          /></a>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {};
-</script>
-
-<style lang="scss" scoped></style>

src/components/user/loginPage.vue

@@ -79,6 +79,7 @@
 /* eslint-disable */
 import { mapActions, mapState } from "vuex";
 import alert from "../shared/alert.vue";
+import Log from "../../assets/Log";
 import carousel from "vue-owl-carousel";
 export default {
   name: "Login",
@@ -105,8 +106,11 @@ export default {
   computed: {
     ...mapState("authentication", ["token", "status"])
   },
+  mounted() {
+    this.checkUserStatus();
+  },
   methods: {
-    ...mapActions("authentication", ["login", "init"]),
+    ...mapActions("authentication", ["login", "init", "logout"]),
     ToggleTrouble() {
       if (this.troubleToggle) {
         this.troubleToggle = false;
@@ -121,6 +125,12 @@ export default {
           this.error = true;
         });
     },
+    checkUserStatus() {
+      if (Log.isLoggedIn()) {
+        this.logout();
+        this.$router.go();
+      }
+    },
     togglePassword() {
       this.showPassword = true;
       this.isPasswordShown = "text";

src/main.js

@@ -7,8 +7,10 @@ import App from "./App.vue";
 import router from "./router";
 import store from "./store";
 import * as VueGoogleMaps from "vue2-google-maps";
+import Vuetify from "vuetify";
 
 Vue.use(EvaIcons);
+Vue.use(Vuetify);
 Vue.use(VueGoogleMaps, {
   load: {
     key: "AIzaSyD8k_Kwml_C8IDfs-gX8JFV8acli3L9cAE",