summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-10-03 15:57:19 +0000
committerdakkar <dakkar@thenautilus.net>2024-10-03 15:57:19 +0000
commitbc8c6592ea3eda0333dd75cde90e80d5da1e9c91 (patch)
tree5c1ea596526ac58a931f58c7d32bfe4054100bbb
parentmerge: Minor issue fixes on the frontend (!625) (diff)
parentfix: lint error in MkAbuseReport (diff)
downloadsharkey-bc8c6592ea3eda0333dd75cde90e80d5da1e9c91.tar.gz
sharkey-bc8c6592ea3eda0333dd75cde90e80d5da1e9c91.tar.bz2
sharkey-bc8c6592ea3eda0333dd75cde90e80d5da1e9c91.zip
merge: make MkAbuseReport more friendly for smaller screen sizes (!646)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/646 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: fEmber <acomputerdog@gmail.com>
-rw-r--r--packages/frontend/src/components/MkAbuseReport.vue99
1 files changed, 64 insertions, 35 deletions
diff --git a/packages/frontend/src/components/MkAbuseReport.vue b/packages/frontend/src/components/MkAbuseReport.vue
index 7c8c7dbd30..d13eedaade 100644
--- a/packages/frontend/src/components/MkAbuseReport.vue
+++ b/packages/frontend/src/components/MkAbuseReport.vue
@@ -4,40 +4,49 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
<template>
-<div class="bcekxzvu _margin _panel">
- <div class="target">
- <MkA v-user-preview="report.targetUserId" class="info" :to="`/admin/user/${report.targetUserId}`" :behavior="'window'">
- <MkAvatar class="avatar" :user="report.targetUser" indicator/>
- <div class="names">
- <MkUserName class="name" :user="report.targetUser"/>
- <MkAcct class="acct" :user="report.targetUser" style="display: block;"/>
+ <div class="bcekxzvu _margin _panel">
+ <div class="target">
+ <MkA v-user-preview="report.targetUserId" class="info" :to="`/admin/user/${report.targetUserId}`" :behavior="'window'">
+ <MkAvatar class="avatar" :user="report.targetUser" indicator/>
+ <div class="names">
+ <MkUserName class="name" :user="report.targetUser"/>
+ <MkAcct class="acct" :user="report.targetUser" style="display: block;"/>
+ </div>
+ </MkA>
+ <div class="keyvalCtn">
+ <MkKeyValue>
+ <template #key>{{ i18n.ts.registeredDate }}</template>
+ <template #value>{{ dateString(report.targetUser.createdAt) }} (<MkTime :time="report.targetUser.createdAt"/>)</template>
+ </MkKeyValue>
+ <MkKeyValue>
+ <template #key>{{ i18n.ts.reporter }}</template>
+ <template #value><MkA :to="`/admin/user/${report.reporter.id}`" class="_link" :behavior="'window'">@{{ report.reporter.username }}</MkA></template>
+ </MkKeyValue>
+ <MkKeyValue>
+ <template #key>{{ i18n.ts.createdAt }}</template>
+ <template #value><MkTime :time="report.createdAt" mode="absolute"/> (<MkTime :time="report.createdAt" mode="relative"/>)</template>
+ </MkKeyValue>
</div>
- </MkA>
- <MkKeyValue>
- <template #key>{{ i18n.ts.registeredDate }}</template>
- <template #value>{{ dateString(report.targetUser.createdAt) }} (<MkTime :time="report.targetUser.createdAt"/>)</template>
- </MkKeyValue>
- </div>
- <div class="detail">
- <div>
- <Mfm :text="report.comment" :isBlock="true" :linkNavigationBehavior="'window'"/>
- </div>
- <hr/>
- <div>{{ i18n.ts.reporter }}: <MkA :to="`/admin/user/${report.reporter.id}`" class="_link" :behavior="'window'">@{{ report.reporter.username }}</MkA></div>
- <div v-if="report.assignee">
- {{ i18n.ts.moderator }}:
- <MkAcct :user="report.assignee"/>
+ <hr>
</div>
- <div><MkTime :time="report.createdAt"/></div>
- <div class="action">
- <MkSwitch v-model="forward" :disabled="report.targetUser.host == null || report.resolved">
- {{ i18n.ts.forwardReport }}
- <template #caption>{{ i18n.ts.forwardReportIsAnonymous }}</template>
- </MkSwitch>
- <MkButton v-if="!report.resolved" primary @click="resolve">{{ i18n.ts.abuseMarkAsResolved }}</MkButton>
+ <div class="detail">
+ <div>
+ <Mfm :text="report.comment" :isBlock="true" :linkNavigationBehavior="'window'"/>
+ </div>
+ <hr/>
+ <div v-if="report.assignee" class="assignee">
+ {{ i18n.ts.moderator }}:
+ <MkA :to="`/admin/user/${report.assignee.id}`" class="_link" :behavior="'window'">@{{ report.assignee.username }}</MkA>
+ </div>
+ <div class="action">
+ <MkSwitch v-model="forward" c:disabled="report.targetUser.host == null || report.resolved">
+ {{ i18n.ts.forwardReport }}
+ <template #caption>{{ i18n.ts.forwardReportIsAnonymous }}</template>
+ </MkSwitch>
+ <MkButton v-if="!report.resolved" primary @click="resolve">{{ i18n.ts.abuseMarkAsResolved }}</MkButton>
+ </div>
</div>
</div>
-</div>
</template>
<script lang="ts" setup>
@@ -72,13 +81,13 @@ function resolve() {
<style lang="scss" scoped>
.bcekxzvu {
display: flex;
+ flex-direction: column;
+ transition: .1s;
> .target {
- width: 35%;
box-sizing: border-box;
text-align: left;
- padding: 24px;
- border-right: solid 1px var(--divider);
+ padding: 24px 24px 0px 24px;
> .info {
display: flex;
@@ -100,16 +109,36 @@ function resolve() {
padding: 0 8px;
flex: 1;
+ white-space: pre;
+ overflow: hidden;
+
> .name {
font-weight: bold;
}
}
}
+
+ > .keyvalCtn {
+ display: inline-flex;
+ gap: 15px;
+ margin-top: 15px;
+ }
}
> .detail {
- flex: 1;
- padding: 24px;
+ display: flex;
+ flex-direction: column;
+ padding: 0px 24px 24px 24px;
+
+ .assignee {
+ margin-bottom: 15px;
+ }
+
+ .action {
+ display: flex;
+ flex-direction: column;
+ gap: 15px;
+ }
}
}
</style>