usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2020-02-08 16:51:27 +09:00
parent 641dad586f
commit 9c06544c46
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/components/avatars.vue
View File

@ -1,6 +1,8 @@
<template> <template>
<div> <div>
<mk-avatar v-for="user in us" :user="user" :key="user.id" style="width:32px;height:32px;"/> <div v-for="user in us" :key="user.id" style="width:32px;height:32px;margin-right:8px;">
<mk-avatar :user="user" style="width:32px;height:32px;"/>
</div>
</div> </div>
</template> </template>

6
src/client/pages/my-groups/index.vue
View File

@ -10,6 +10,7 @@
<mk-pagination :pagination="ownedPagination" #default="{items}" ref="owned"> <mk-pagination :pagination="ownedPagination" #default="{items}" ref="owned">
<div class="_frame" v-for="group in items" :key="group.id"> <div class="_frame" v-for="group in items" :key="group.id">
<div class="_title"><router-link :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</router-link></div> <div class="_title"><router-link :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</router-link></div>
<div class="_content"><mk-avatars :user-ids="group.userIds"/></div>
</div> </div>
</mk-pagination> </mk-pagination>
</mk-container> </mk-container>
@ -19,7 +20,7 @@
<mk-pagination :pagination="invitePagination" #default="{items}"> <mk-pagination :pagination="invitePagination" #default="{items}">
<div class="_frame" v-for="invite in items" :key="invite.id"> <div class="_frame" v-for="invite in items" :key="invite.id">
<div class="_title">{{ invite.group.name }}</div> <div class="_title">{{ invite.group.name }}</div>
<div class="_content"><x-avatars :user-ids="invite.group.userIds"/></div> <div class="_content"><mk-avatars :user-ids="invite.group.userIds"/></div>
<div class="_footer"> <div class="_footer">
<mk-button @click="acceptInvite(invite)" primary inline><fa :icon="faCheck"/> {{ $t('accept') }}</mk-button> <mk-button @click="acceptInvite(invite)" primary inline><fa :icon="faCheck"/> {{ $t('accept') }}</mk-button>
<mk-button @click="rejectInvite(invite)" primary inline><fa :icon="faBan"/> {{ $t('reject') }}</mk-button> <mk-button @click="rejectInvite(invite)" primary inline><fa :icon="faBan"/> {{ $t('reject') }}</mk-button>
@ -33,6 +34,7 @@
<mk-pagination :pagination="joinedPagination" #default="{items}"> <mk-pagination :pagination="joinedPagination" #default="{items}">
<div class="_frame" v-for="group in items" :key="group.id"> <div class="_frame" v-for="group in items" :key="group.id">
<div class="_title">{{ group.name }}</div> <div class="_title">{{ group.name }}</div>
<div class="_content"><mk-avatars :user-ids="group.userIds"/></div>
</div> </div>
</mk-pagination> </mk-pagination>
</mk-container> </mk-container>
@ -45,6 +47,7 @@ import { faUsers, faPlus, faEnvelopeOpenText } from '@fortawesome/free-solid-svg
import MkPagination from '../../components/ui/pagination.vue'; import MkPagination from '../../components/ui/pagination.vue';
import MkButton from '../../components/ui/button.vue'; import MkButton from '../../components/ui/button.vue';
import MkContainer from '../../components/ui/container.vue'; import MkContainer from '../../components/ui/container.vue';
import MkAvatars from '../../components/avatars.vue';
export default Vue.extend({ export default Vue.extend({
metaInfo() { metaInfo() {
@ -57,6 +60,7 @@ export default Vue.extend({
MkPagination, MkPagination,
MkButton, MkButton,
MkContainer, MkContainer,
MkAvatars,
}, },
data() { data() {

2
src/client/style.scss
View File

@ -305,7 +305,7 @@ a {
position: relative; position: relative;
border: solid 1px var(--divider); border: solid 1px var(--divider);
border-radius: var(--radius); border-radius: var(--radius);
margin: var(--marginHalf); margin: var(--margin);
> ._title { > ._title {
margin: 0; margin: 0;