Login Fix

package-lock.json

@@ -12437,13 +12437,10 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.5.tgz",
       "integrity": "sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg=="
     },
-    "vue-share-social": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/vue-share-social/-/vue-share-social-0.3.2.tgz",
-      "integrity": "sha512-8YEm2Kkl756bhqSfXPtQqnOOItz7/DQWU6E4L+vC4dgT4rp0+XnqsgJAr4OXVQRRUNDO7TS8W0W79+zhfvh4pQ==",
-      "requires": {
-        "vue": "^2.5.16"
-      }
+    "vue-social-sharing": {
+      "version": "3.0.0-beta.11",
+      "resolved": "https://registry.npmjs.org/vue-social-sharing/-/vue-social-sharing-3.0.0-beta.11.tgz",
+      "integrity": "sha512-jIATgcKcBGQveAbU4sKjHcsGN7gI/bq/T9fm/5qowtBuZe0I+5CZRWcAGDd6G64HzQfFEyNBLC02GYjMtaovhA=="
     },
     "vue-style-loader": {
       "version": "4.1.2",

package.json

@@ -36,7 +36,7 @@
     "vue-json-excel": "^0.2.98",
     "vue-owl-carousel": "^2.0.3",
     "vue-router": "^3.1.5",
-    "vue-share-social": "^0.3.2",
+    "vue-social-sharing": "^3.0.0-beta.11",
     "vue-trix": "^1.1.7",
     "vue2-editor": "^2.10.2",
     "vue2-google-maps": "^0.10.7",

src/components/property/residential/singleView/contentSection.vue

@@ -49,9 +49,18 @@
           </div>
           <div class="panel-left px-5 pb-5 text-center">
             <h4 class="text-white">Share this Property</h4>
-            <a id="fb_share" href="#" target="_blank"
-              ><img src="img/icon-facebook.svg" alt="Share on Facebook" class="col-3 p-1 mx-1"
-            /></a>
+            <ShareNetwork
+              v-if="currentUrl !== ''"
+              network="facebook"
+              :url="currentUrl"
+              title="Uni-Vate Property Listing"
+              description="Check out this property on Uni-Vate Properties!"
+              quote="The hot reload is so fast it\'s near instant. - Evan You"
+              hashtags="vuejs,vite"
+            >
+              <img src="img/icon-facebook.svg" alt="Share on Facebook" class="col-3 p-1 mx-1" />
+            </ShareNetwork>
+
             <a
               href="mailto:?Subject=Simple Share Buttons&amp;Body=I%20saw%20this%20and%20thought%20of%20you!%20 https://www.univateproperties.co.za/"
               ><img src="/img/icon-email.svg" alt="Share on email" class="col-3 p-1 mx-1"
@@ -65,6 +74,7 @@
             /></a>
           </div>
         </div>
+        <div></div>
         <div class="col-md-8 p-5 resort-profile">
           <h2 v-if="property.showAddress">
             <div style="display:inline" v-if="property.propertyName !== null">
@@ -127,7 +137,7 @@
 /* eslint-disable */
 import { mapState, mapActions } from "vuex";
 import gallery from "../../../shared/gallerySlideShow";
-import { ShareFacebook } from "vue-share-social";
+import { ShareFacebook } from "vue-social-sharing";
 export default {
   components: {
     gallery,
@@ -139,16 +149,15 @@ export default {
   },
   created() {
     //this.getListsForPropertyEdit(this.property.id);
-    console.log(this.property.displayData);
   },
-  mounted() {
-    // var facebookShare = document.getElementById("fb_share");
-    // facebookShare.href = "http://www.facebook.com/share.php?u=" + encodeURIComponent(location.href);
+  async mounted() {
+    this.currentUrl = window.location.origin + this.$route.fullPath;
   },
   data() {
     return {
       index: null,
-      date: new Date()
+      date: new Date(),
+      currentUrl: ""
     };
   },
   methods: {

src/components/shared/navBar.vue

@@ -179,11 +179,12 @@
                   <li class="mx-1">
                     <router-link to="/share/contact">Contact Us</router-link>
                   </li>
-                  <li v-if="isLoggedIn" class="menu-has-children mx-1">
+                  <li v-if="USER" class="menu-has-children mx-1">
                     <div
                       @mouseover="userClass = 'ts-display'"
                       @mouseleave="userClass = 'no-display'"
                     ></div>
+
                     <a href="#" class="sf-with-ul">
                       {{ NAME }}
                     </a>
@@ -331,13 +332,13 @@
                     </ul>
                   </li>
 
-                  <li v-if="!isLoggedIn">
+                  <li v-if="!USER">
                     <router-link class="btn-white-border p-2 ml-1 mr-1" to="/user/login"
                       >Login</router-link
                     >
                   </li>
 
-                  <li v-if="!isLoggedIn">
+                  <li v-if="!USER">
                     <router-link class=" btn-solid-blue pt-2 pb-2" to="/user/register"
                       >Register</router-link
                     >
@@ -440,6 +441,16 @@ export default {
     NAME() {
       return Log.getPerson().name;
     },
+    USER() {
+      var userObj = {};
+      if (!this.user) {
+        userObj = JSON.parse(localStorage.getItem("user"));
+      } else {
+        userObj = this.user;
+      }
+
+      return userObj;
+    },
     ROLE() {
       var userObj = JSON.parse(localStorage.getItem("user"));
       return userObj.role;

src/components/user/loginPage.vue

@@ -118,7 +118,7 @@ export default {
     },
     Login() {
       this.login({ username: this.username, password: this.password })
-        .then(fufilled => {
+        .then(() => {
           this.$router.push("/");
         })
         .catch(err => {

src/main.js

@@ -8,11 +8,11 @@ import router from "./router";
 import store from "./store";
 import * as VueGoogleMaps from "vue2-google-maps";
 import Vuetify from "vuetify";
-import VueShareSocial from "vue-share-social";
+import VueSocialSharing from "vue-social-sharing";
 import VueCurrencyInput from "vue-currency-input";
 import VueFloatLabel from "vue-float-label";
 
-Vue.use(VueShareSocial);
+Vue.use(VueSocialSharing);
 Vue.use(EvaIcons);
 Vue.use(Vuetify);
 Vue.use(VueFloatLabel);

src/store/modules/user/authentication.js

@@ -76,6 +76,8 @@ export default {
         method: "POST"
       });
       if (response.status === 200) {
+        console.log(response);
+
         log.clearValues();
         log.setValues(response.data);
         commit("auth_success", response.data);