ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Remove menu from user widget where not necessary

This commit is contained in:
Ramon Wenger 2019-09-06 15:42:13 +02:00
parent c38c8ce9eb
commit bddeeba74e
3 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/ContentBlock.vue
View File

@ -2,7 +2,7 @@
<div class="content-block__container hideable-element" :class="{'hideable-element--hidden': hidden}"> <div class="content-block__container hideable-element" :class="{'hideable-element--hidden': hidden}">
<div class="content-block" :class="specialClass"> <div class="content-block" :class="specialClass">
<div class="block-actions" v-if="canEditContentBlock && editModule"> <div class="block-actions" v-if="canEditContentBlock && editModule">
<user-widget v-bind="me" class="block-actions__user-widget content-block__user-widget"></user-widget> <user-widget :show-menu="false" v-bind="me" class="block-actions__user-widget content-block__user-widget"></user-widget>
<more-options-widget> <more-options-widget>
<li class="popover-links__link"><a @click="deleteContentBlock(contentBlock)">Löschen</a></li> <li class="popover-links__link"><a @click="deleteContentBlock(contentBlock)">Löschen</a></li>
<li class="popover-links__link"><a @click="editContentBlock(contentBlock)">Bearbeiten</a></li> <li class="popover-links__link"><a @click="editContentBlock(contentBlock)">Bearbeiten</a></li>

63
client/src/components/UserWidget.vue
View File

@ -1,27 +1,28 @@
<template> <template>
<div class="user-widget" :class="{'user-widget--is-profile': isProfile}"> <div class="user-widget" :class="{'user-widget--is-profile': isProfile}">
<div class="user-widget__avatar" @click="toggleShowPopover()"> <div class="user-widget__avatar" @click="toggleShowPopover()">
<avatar :avatar-url="avatarUrl" :icon-highlighted="isProfile"/> <avatar :avatar-url="avatarUrl" :icon-highlighted="isProfile"/>
</div>
<widget-popover v-if="showPopover"
@hide-me="showPopover = false"
:mobile="mobile"
class="user-widget__popover ">
<li class="popover-links__link popover-links__link--large popover-links__link--emph">{{firstName}} {{lastName}}</li>
<li class="popover-links__link popover-links__link--large">
<router-link to="/me/activity" @click="toggleShowPopover()">Aktivität</router-link>
</li>
<li class="popover-links__link popover-links__link--large" @click="toggleShowPopover()">
<router-link to="/me/profile">Profil</router-link>
</li>
<li class="popover-links__link popover-links__link--large" @click="toggleShowPopover()">
<router-link to="/me/myclasses">Klassenliste</router-link>
</li>
<li class="popover-links__link popover-links__link--large" data-cy="logout" @click="logout()">
<a>Logout</a>
</li>
</widget-popover>
</div> </div>
<widget-popover v-if="showPopover && showMenu"
@hide-me="showPopover = false"
:mobile="mobile"
class="user-widget__popover ">
<li class="popover-links__link popover-links__link--large popover-links__link--emph">{{firstName}} {{lastName}}
</li>
<li class="popover-links__link popover-links__link--large">
<router-link to="/me/activity" @click="toggleShowPopover()">Aktivität</router-link>
</li>
<li class="popover-links__link popover-links__link--large" @click="toggleShowPopover()">
<router-link to="/me/profile">Profil</router-link>
</li>
<li class="popover-links__link popover-links__link--large" @click="toggleShowPopover()">
<router-link to="/me/myclasses">Klassenliste</router-link>
</li>
<li class="popover-links__link popover-links__link--large" data-cy="logout" @click="logout()">
<a>Logout</a>
</li>
</widget-popover>
</div>
</template> </template>
<script> <script>
@ -34,15 +35,19 @@
firstName: { firstName: {
type: String type: String
}, },
lastName: { lastName: {
type: String type: String
}, },
avatarUrl: { avatarUrl: {
type: String type: String
}, },
mobile: { mobile: {
type: Boolean, type: Boolean,
default: false default: false
},
showMenu: {
type: Boolean,
default: true
} }
}, },
@ -54,13 +59,17 @@
methods: { methods: {
toggleShowPopover() { toggleShowPopover() {
this.showPopover = !this.showPopover; if (this.showMenu) {
this.showPopover = !this.showPopover;
}
}, },
logout() { logout() {
this.$apollo.mutate({ this.$apollo.mutate({
mutation: LOGOUT_MUTATION, mutation: LOGOUT_MUTATION,
}).then(({data}) => { }).then(({data}) => {
if (data.logout.success) { location.replace('/') } if (data.logout.success) {
location.replace('/')
}
}); });
} }
}, },

2
client/src/components/objective-groups/Objective.vue
View File

@ -4,7 +4,7 @@
v-if="editModule" v-if="editModule"
:block="objective"></visibility-action> :block="objective"></visibility-action>
<div class="block-actions" v-if="editModule && canEdit"> <div class="block-actions" v-if="editModule && canEdit">
<user-widget class="block-actions__user-widget objective__user-widget" v-bind="me"></user-widget> <user-widget class="block-actions__user-widget objective__user-widget" :show-menu="false" v-bind="me"></user-widget>
<more-options-widget> <more-options-widget>
<div class="popover-links__link"><a @click="deleteObjective(objective)">Löschen</a></div> <div class="popover-links__link"><a @click="deleteObjective(objective)">Löschen</a></div>
</more-options-widget> </more-options-widget>