Bladeren bron

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

master
Lene Scholtz 5 jaren geleden
bovenliggende
commit
b53e8619a0
1 gewijzigde bestanden met toevoegingen van 6 en 7 verwijderingen
  1. 6
    7
      src/components/shared/navBar.vue

+ 6
- 7
src/components/shared/navBar.vue Bestand weergeven

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

Laden…
Annuleren
Opslaan