From dbe74ed098d06efb2e425d5d93d45798abdf350c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator <kainoa@t1c.dev> Date: Wed, 15 Feb 2023 10:37:39 -0800 Subject: [PATCH] refactor: use MkAvatars for mods --- .../src/pages/admin/overview.moderators.vue | 20 ++----------------- packages/client/src/widgets/user-list.vue | 6 +++--- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/client/src/pages/admin/overview.moderators.vue b/packages/client/src/pages/admin/overview.moderators.vue index 1a51601725..77251fe4b0 100644 --- a/packages/client/src/pages/admin/overview.moderators.vue +++ b/packages/client/src/pages/admin/overview.moderators.vue @@ -3,9 +3,7 @@ <Transition :name="$store.state.animation ? '_transition_zoom' : ''" mode="out-in"> <MkLoading v-if="fetching"/> <div v-else :class="$style.root" class="_panel"> - <MkA v-for="user in moderators" :key="user.id" class="user" :to="`/user-info/${user.id}`"> - <MkAvatar :user="user" class="avatar" indicator/> - </MkA> + <MkAvatars :user-ids="moderators.userIds" class="userAvatars"/> </div> </Transition> </div> @@ -14,8 +12,7 @@ <script lang="ts" setup> import { onMounted, onUnmounted, ref } from 'vue'; import * as os from '@/os'; -import number from '@/filters/number'; -import { i18n } from '@/i18n'; +import MkAvatars from '@/components/MkAvatars.vue'; let moderators: any = $ref(null); let fetching = $ref(true); @@ -38,18 +35,5 @@ onMounted(async () => { grid-gap: 12px; place-content: center; padding: 12px; - - &:global { - > .user { - width: 100%; - height: 100%; - aspect-ratio: 1; - - > .avatar { - width: 100%; - height: 100%; - } - } - } } </style> diff --git a/packages/client/src/widgets/user-list.vue b/packages/client/src/widgets/user-list.vue index 6ee6dc05a5..4173f5c364 100644 --- a/packages/client/src/widgets/user-list.vue +++ b/packages/client/src/widgets/user-list.vue @@ -2,7 +2,7 @@ <MkContainer :show-header="widgetProps.showHeader" class="mkw-userList"> <template #header><i class="ph-user-list-bold ph-lg"></i> {{ list ? list.name : i18n.ts._widgets.userList }}</template> <template #func="{ buttonStyleClass }"><button class="_button" :class="buttonStyleClass" @click="configure()"><i class="ph-gear-six-bold ph-lg"></i></button></template> - + <div class="wsdlkfj"> <div v-if="widgetProps.listId == null" class="init"> <MkButton primary @click="chooseList">{{ i18n.ts._widgets._userList.chooseList }}</MkButton> @@ -14,7 +14,7 @@ </div> </MkContainer> </template> - + <script lang="ts" setup> import { useWidgetPropsManager, Widget, WidgetComponentExpose } from './widget'; import { GetFormResultType } from '@/scripts/form'; @@ -92,7 +92,7 @@ defineExpose<WidgetComponentExpose>({ id: props.widget ? props.widget.id : null, }); </script> - + <style lang="scss" module> .wsdlkfj { > .init {