Browse Source

Removed Welcome! and user name and replaced Admin with person who is logged in

master
Lene Scholtz 5 years ago
parent
commit
b53e8619a0
1 changed files with 6 additions and 7 deletions
  1. 6
    7
      src/components/shared/navBar.vue

+ 6
- 7
src/components/shared/navBar.vue View File

@@ -129,7 +129,7 @@
129 129
                 aria-haspopup="true"
130 130
                 aria-expanded="false"
131 131
                 v-if="isLoggedIn"
132
-              >Admin</a>
132
+              >{{ NAME }}</a>
133 133
               <div class="dropdown-menu" aria-labelledby="navbarDropdown">
134 134
                 <a class="dropdown-item cursor-pointer" @click="routerGoTo('/status/list')">Status</a>
135 135
                 <a
@@ -166,6 +166,10 @@
166 166
                 >Search Logs</a>
167 167
                 <a class="dropdown-item cursor-pointer" @click="routerGoTo('/Offers')">Offers</a>
168 168
                 <a class="dropdown-item cursor-pointer" @click="routerGoTo('/Carousel')">Carousel</a>
169
+                <a
170
+                  class="dropdown-item cursor-pointer"
171
+                  @click="routerGoTo('/user/updateProfileInfo')"
172
+                >Update Info</a>
169 173
               </div>
170 174
             </li>
171 175
             <li class="nav-item dropdown" v-if="!isLoggedIn">
@@ -184,12 +188,6 @@
184 188
                 <a class="nav-link" @click="logout(routerGoTo('/user/login'))">Logout</a>
185 189
               </span>
186 190
             </li>
187
-            <li>
188
-              <span v-if="isLoggedIn">
189
-                <a @click="routerGoTo('/user/updateProfileInfo')">Hi! {{ NAME }}</a>
190
-              </span>
191
-              <span v-else></span>
192
-            </li>
193 191
           </ul>
194 192
         </div>
195 193
       </div>
@@ -222,6 +220,7 @@ export default {
222 220
     ]),
223 221
     NAME() {
224 222
       return this.person.name;
223
+      // return this.user.role;
225 224
     },
226 225
     isLoggedIn() {
227 226
       return this.token !== null && this.token !== undefined;

Loading…
Cancel
Save