Merge Conflicts on Individual and authenticate

src/components/timeshare/resort/resortImage.vue

 import { mapState } from 'vuex';
 
 export default {
-  props: {
-    images: [],
-  },
   data() {
     return {
       largeImg: 0,

src/components/timeshare/sell/sellPage.vue

     DetailIndividual,
     Alert,
   },
+  mounted() {
+    this.getIndividual(this.user.id);
+  },
   created() {
-    console.log(46);
     this.initTimeshare(this.weekId);
   },
   computed: {
       'agencies',
       'agents',
     ]),
+    ...mapState('individual', ['item']),
     ...mapState('authentication', ['isLoggedIn']),
     ...mapGetters({
       user: 'authentication/getUser',
     },
   },
   methods: {
+    ...mapActions('individual', ['getIndividual']),
     submitSale() {
       if (this.isLoggedIn) {
         this.saveWeek(this.sellItem);

src/components/user/loginPage.vue

   },
   data() {
     return {
+      username: '',
+      password: '',
       isPasswordShown: 'password',
       selectItems: [{ text: 'password', value: 0 }],
       selectErrors: 'Some error with the field',
     };
   },
   computed: {
-    ...mapState('authentication', ['token', 'status', 'username', 'password']),
+    ...mapState('authentication', ['token', 'status']),
   },
   methods: {
     ...mapActions('authentication', ['login', 'init']),
       } else this.troubleToggle = true;
     },
     Login() {
-      console.log(this.$store.state.authentication);
-
-      this.login().then(() => {
-        console.log('this');
-        console.log(this);
-        console.log(this.$store.state.authentication.status);
-
-        if (this.$store.state.authentication.status === 'error') {
-          this.$router.push('/user/login');
-        } else {
-          this.$router.push('/about/us');
-        }
-      });
+      this.login({ username: this.username, password: this.password }).then(
+        () => {
+          if (this.$store.state.authentication.status === 'error') {
+            this.$router.push('/user/login');
+          } else {
+            this.$router.push('/about/us');
+          }
+        },
+      );
     },
     togglePassword() {
       this.showPassword = true;

src/store/modules/user/authentication.js

 export default {
   namespaced: true,
   state: {
-    username: 'UniVate2018',
-    password: 'UniVate2018',
     isLoggedIn: log.isLoggedIn(),
     flag: false,
     status: undefined,
         agency: log.getJSONObject('agency'),
       });
     },
-    login({ commit, state }) {
+    login({ commit }, user) {
       axios({
         url: '/api/register/authenticate',
         data: {
-          username: state.username,
-          password: state.password,
+          username: user.username,
+          password: user.password,
         },
         method: 'POST',
       })

src/store/modules/user/individual.js

   namespaced: true,
   state: {
     items: [],
-    item: undefined,
+    indiv: undefined,
   },
   mutations: {
     addItem(state, item) {
   },
   getters: {},
   actions: {
-    getIndividual({ commit }, userId) {
+    getIndividual({ commit, rootGetters }, userId) {
+      let id = 0;
+      if (!userId || userId === 0) {
+        const rootItem = rootGetters['authentication/getUser'];
+        id = rootItem ? rootItem.id : 0;
+      } else id = userId;
       axios
-        .get(`/api/individual/getIndividual/${userId}`)
+        .get(`/api/individual/getIndividual/${id}`)
         .then(r => commit('setItem', {
             name: 'indiv',
             value: r.data,

vue.config.js

   devServer: {
     proxy: {
       '/api': {
-        target: 'http://192.168.6.188:5000',
+        target: 'http://localhost:57260',
         changeOrigin: true,
       },
       '/nph-srep': {