Bugfix: VOAPP-89

src/App.vue

@@ -43,13 +43,11 @@ export default {
   },
   methods: {
 	},
-  mounted(){
-    
-    let userUUID = localStorage.getItem(CommonUtil.CONST_STORAGE_UUID);
-    this.$root.sharedState.uuid = userUUID;
-
+  beforeMount(){
+    /*let userUUID = localStorage.getItem(CommonUtil.CONST_STORAGE_UUID);
+	console.info("Checking UUID on start: " + userUUID);
+    this.$root.sharedState.uuid = userUUID;*/
   }
-
 }
 </script>
 

src/components/LoginSystem.vue

@@ -109,19 +109,19 @@ export default {
     /** Get  user details from local storage */
       getUserFromStorage() {
       
-      let strUser = localStorage.getItem(CommonUtil.CONST_STORAGE_USER_DETAIL);
-      if(strUser && strUser != 'undefined')
-      {
-	      let user    = JSON.parse(strUser);
-	      this.appUser  = user; //This user will require in Sync process
-	
-	      this.$root.sharedState.uuid = user.userUuid;
-	      this.$root.sharedState.user.firstName = user.firstName;
-	      this.$root.sharedState.user.lastName = user.lastName;
-	      this.userLoggedInName = this.$root.sharedState.user.firstName + " " + this.$root.sharedState.user.lastName;
-      }
-       /** Firing event to parent (main.js)  */
-      //this.$emit(CommonUtil.CONST_EVENT_LOGIN_USER_DETAIL,user.userUuid, user.firstName,user.lastName);
+	      let strUser = localStorage.getItem(CommonUtil.CONST_STORAGE_USER_DETAIL);
+	      if(strUser && strUser != 'undefined')
+	      {
+		      let user    = JSON.parse(strUser);
+		      this.appUser  = user; //This user will require in Sync process
+		
+		      this.$root.sharedState.uuid = user.userUuid;
+		      this.$root.sharedState.user.firstName = user.firstName;
+		      this.$root.sharedState.user.lastName = user.lastName;
+		      this.userLoggedInName = this.$root.sharedState.user.firstName + " " + this.$root.sharedState.user.lastName;
+	      }
+	       /** Firing event to parent (main.js)  */
+	      //this.$emit(CommonUtil.CONST_EVENT_LOGIN_USER_DETAIL,user.userUuid, user.firstName,user.lastName);
     },
 
     /** Check uuid first */
@@ -137,7 +137,7 @@ export default {
           headers: jsonHeader,
         }).then((response) => {
           
-          if (response.status != 200 || response.status != 201) {
+          if (response.status != 200 && response.status != 201) {
               this.$root.sharedState.uuid = '';
           } else {
             
@@ -218,6 +218,10 @@ export default {
 					// Setting the UUID causes the App.vue component to use observationlist as template
 					// So there's no need to navigate manually
 		           localStorage.setItem(CommonUtil.CONST_STORAGE_UUID,uuid); 
+					if(this.$router.currentRoute.path != "/")
+					{
+						this.$router.push('/')
+					}
 		        }
 		     }
 	        ); // END inner fetch

src/components/Welcome.vue

@@ -44,15 +44,14 @@ export default ({
    data()
    {
        return {
-           isMounted : false,
-           uuid : '',
+           
        }
    },
    methods: {
 
    },
    mounted() {
-       this.isMounted = true;
+       //this.isMounted = true;
        //this.uuid = localStorage.getItem(localStorage.removeItem(CommonUtil.CONST_STORAGE_UUID));
        //console.log('uuid : '+this.uuid);
 

src/main.js

@@ -37,16 +37,18 @@ const init = () => {
 	  },
 
       i18n,
-
+	  
       created() {
 		console.info("Vue is ready");
 		console.info("User's preferred language is " + navigator.language);
+		// Are we logged in already?
 	  }
+
     });
 };
 
 /**
- * Hope this works. It's for adding router functionality to the menu,
+ * Adding router functionality to the menu,
  * which is outside the main app
  */
 new Vue({