Merged in feature/user-widget-no-link (pull request #15)
Move profile link to parent elements Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
This commit is contained in:
commit
55364cb067
|
|
@ -3,7 +3,9 @@
|
|||
<top-navigation></top-navigation>
|
||||
<router-link to="/" class="header-bar__logo" data-cy="home-link"><logo></logo></router-link>
|
||||
<div class="user-header">
|
||||
<user-widget v-bind="me"></user-widget>
|
||||
<router-link to="/me/activity">
|
||||
<user-widget v-bind="me"></user-widget>
|
||||
</router-link>
|
||||
<logout-widget></logout-widget>
|
||||
</div>
|
||||
<book-navigation v-if="showSubnavigation">
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@
|
|||
</div>
|
||||
<div class="mobile-navigation__subnavigation"></div>
|
||||
<div class="mobile-navigation__secondary">
|
||||
<user-widget class="mobile-navigation__user-widget" v-bind="me"></user-widget>
|
||||
<router-link to="/me/activity">
|
||||
<user-widget class="mobile-navigation__user-widget" v-bind="me"></user-widget>
|
||||
</router-link>
|
||||
<logout-widget class="mobile-navigation__logout-widget"></logout-widget>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
<template>
|
||||
<router-link to="/me/activity">
|
||||
<div class="user-widget" :class="{'user-widget--is-profile': isProfile}">
|
||||
<user-icon class="user-widget__avatar" :src="avatar"></user-icon>
|
||||
<span class="user-widget__name">{{firstName}} {{lastName}}</span>
|
||||
<span class="user-widget__date" v-if="date">{{date}}</span>
|
||||
</div>
|
||||
</router-link>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue