Removed code that did not work in the login promise

src/components/shared/navBar.vue

@@ -119,7 +119,7 @@
               </div>
             </li>
 
-            <li v-if="isLoggedIn" class="nav-item dropdown">
+            <li class="nav-item dropdown">
               <a
                 class="nav-link dropdown-toggle"
                 href="#"
@@ -128,6 +128,7 @@
                 data-toggle="dropdown"
                 aria-haspopup="true"
                 aria-expanded="false"
+                v-if="isLoggedIn"
               >Admin</a>
               <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                 <a class="dropdown-item cursor-pointer" @click="routerGoTo('/status/list')">Status</a>

src/components/user/loginPage.vue

@@ -132,6 +132,8 @@ export default {
       this.login().then(() => {
         if (this.$store.state.authentication.status === 'error') {
           this.$router.push('/user/login');
+        } else {
+          this.$router.push('/about/us');
         }
       });
     },
@@ -145,7 +147,6 @@ export default {
     },
     SendMail() {},
     routerGoTo(goTo) {
-      console.log(goTo);
       this.$router.push(goTo);
     },
   },

src/store/modules/user/authentication.js

@@ -53,9 +53,7 @@ export default {
     authStatus: state => state.status,
   },
   actions: {
-    init({
-      commit,
-    }) {
+    init({ commit }) {
       if (!log.isLoggedIn() && log.tokenExpired) {
         log.clearValues();
       } else log.updateTokenExpiry();
@@ -66,37 +64,28 @@ export default {
         agency: log.getJSONObject('agency'),
       });
     },
-    login({
-      commit,
-      state,
-    }) {
-      return new Promise((reject) => {
-        commit('auth_request');
-        const user = {
+    login({ commit, state }) {
+      axios({
+        url: '/api/register/authenticate',
+        data: {
           username: state.username,
           password: state.password,
-        };
-        axios({
-          url: '/api/register/authenticate',
-          data: user,
-          method: 'POST',
+        },
+        method: 'POST',
+      })
+        .then((resp) => {
+          log.clearValues();
+          log.setValues(resp.data);
+
+          commit('auth_success', resp.data);
         })
-          .then((resp) => {
-            log.clearValues();
-            log.setValues(resp.data);
-            commit('auth_success', resp.data);
-          })
-          .catch((err) => {
-            commit('auth_error');
-            log.clearValues();
-            reject(err);
-            commit('auth_error', err.data);
-          });
-      });
+        .catch((err) => {
+          commit('auth_error');
+          log.clearValues();
+          commit('auth_error', err.data);
+        });
     },
-    logout({
-      commit,
-    }) {
+    logout({ commit }) {
       return new Promise(() => {
         commit('logout');
         log.clearValues();