Skip to content

Commit

Permalink
Use the popover component for the avatar menu
Browse files Browse the repository at this point in the history
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
  • Loading branch information
marcoambrosini committed Sep 16, 2020
1 parent 469b2aa commit e37a861
Showing 1 changed file with 17 additions and 11 deletions.
28 changes: 17 additions & 11 deletions src/components/Avatar/Avatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
<template>
<div v-tooltip="tooltip"
v-click-outside="closeMenu"
@click="toggleMenu"
:class="{
'avatardiv--unknown': userDoesNotExist,
'avatardiv--with-menu': hasMenu
}"
:style="avatarStyle"
class="avatardiv popovermenu-wrapper"
@click="toggleMenu">
class="avatardiv popovermenu-wrapper">
<!-- avatar -->
<div v-if="iconClass" :class="iconClass" class="avatar-class-icon" />
<img v-else-if="isAvatarLoaded && !userDoesNotExist"
Expand Down Expand Up @@ -77,24 +77,29 @@
<div v-if="userDoesNotExist" class="unknown">
{{ initials }}
</div>
<div v-if="hasMenu"
v-show="contactsMenuOpenState"
class="popovermenu"
:class="`menu-${menuPosition}`">
<PopoverMenu :is-open="contactsMenuOpenState" :menu="menu" />
</div>
<Popover
placement="auto"
:open="contactsMenuOpenState">
<template>
<ul>
<PopoverMenuItem v-for="(item, key) in contactsMenuActions" :key="key" :item="item" />
</ul>
<p>Dummy content</p>
</template>
</Popover>
</div>
</template>

<script>
import { directive as ClickOutside } from 'v-click-outside'
import PopoverMenu from '../PopoverMenu'
import { getCurrentUser } from '@nextcloud/auth'
import axios from '@nextcloud/axios'
import { getCurrentUser } from '@nextcloud/auth'
import { generateUrl } from '@nextcloud/router'
import Tooltip from '../../directives/Tooltip'
import usernameToColor from '../../functions/usernameToColor'
import { userStatus } from '../../mixins'
import Popover from '../Popover/Popover'
import PopoverMenuItem from '../PopoverMenu/PopoverMenuItem'
export default {
name: 'Avatar',
Expand All @@ -103,7 +108,8 @@ export default {
ClickOutside,
},
components: {
PopoverMenu,
Popover,
PopoverMenuItem,
},
mixins: [userStatus],
props: {
Expand Down

0 comments on commit e37a861

Please sign in to comment.