This commit is contained in:
pa
2026-01-19 11:04:36 +09:00
parent cacbf742d1
commit 7303cd0b33
22 changed files with 107 additions and 178 deletions

View File

@@ -61,14 +61,7 @@
<History class="h-4 w-4" />
</Button>
</TooltipWrapper>
<span v-if="showLastJoinIndicator" class="inline-block ml-2">
<TooltipWrapper side="top" class="ml-5">
<template #content>
<span>{{ t('dialog.user.info.last_join') }} <Timer :epoch="lastJoin" /></span>
</template>
<MapPin class="h-4 w-4 text-muted-foreground" />
</TooltipWrapper>
</span>
<div v-if="showInstanceInfo" class="flex items-center ml-2">
<TooltipWrapper v-if="instanceInfoState.isValidInstance" side="top">
<template #content>
@@ -79,7 +72,8 @@
<template v-if="instanceInfoState.canCloseInstance">
<Button
class="mt-1"
size="sm"
size="xs"
variant="outline"
:disabled="!!instance?.closedAt"
@click="closeInstance(resolvedInstanceLocation)">
{{ t('dialog.user.info.close_instance') }}
@@ -113,17 +107,29 @@
</template>
</div>
</template>
<div class="mr-2 text-muted-foreground">
<div class="mr-1 text-muted-foreground">
<span v-if="resolvedInstanceLocation === locationStore.lastLocation.location">
{{ locationStore.lastLocation.playerList.size }}/{{ instance?.capacity }}
</span>
<span v-else-if="instance?.userCount"> {{ instance.userCount }}/{{ instance?.capacity }} </span>
</div>
</TooltipWrapper>
<span v-if="friendcount" class="ml-1 flex items-center text-muted-foreground"
><UsersRound />{{ friendcount }}</span
>
<TooltipWrapper v-if="friendcount" side="top" :content="t('dialog.user.info.instance_friends_tooltip')">
<span class="ml-1 flex items-center text-muted-foreground"><UsersRound />{{ friendcount }}</span>
</TooltipWrapper>
<span v-if="showLastJoinIndicator" class="inline-block ml-1">
<TooltipWrapper side="top">
<template #content>
<span>{{ t('dialog.user.info.last_join') }} </span>
</template>
<span class="flex items-center ml-1">
<MapPin class="h-4 w-4 text-muted-foreground" />
<Timer class="text-muted-foreground" :epoch="lastJoin" />
</span>
</TooltipWrapper>
</span>
<span v-if="instanceInfoState.isValidInstance && !instance?.hasCapacityForYou" class="ml-1">
{{ t('dialog.user.info.instance_full') }}
</span>

View File

@@ -674,54 +674,29 @@
const groupInvitesModerationTable = reactive({
data: [],
tableProps: { stripe: true, size: 'small' },
pageSize: 15,
paginationProps: {
layout: 'sizes,prev,pager,next,total'
}
pageSize: 15
});
const groupJoinRequestsModerationTable = reactive({
data: [],
tableProps: { stripe: true, size: 'small' },
pageSize: 15,
paginationProps: {
layout: 'sizes,prev,pager,next,total'
}
pageSize: 15
});
const groupBlockedModerationTable = reactive({
data: [],
tableProps: { stripe: true, size: 'small' },
pageSize: 15,
paginationProps: {
small: true,
layout: 'sizes,prev,pager,next,total'
}
pageSize: 15
});
const groupLogsModerationTable = reactive({
data: [],
filters: [{ prop: ['description'], value: '' }],
tableProps: { stripe: true, size: 'small' },
pageSize: 15,
paginationProps: {
layout: 'sizes,prev,pager,next,total'
}
pageSize: 15
});
const groupBansModerationTable = reactive({
data: [],
filters: [{ prop: ['$displayName'], value: '' }],
tableProps: { stripe: true, size: 'small' },
pageSize: 15,
paginationProps: {
layout: 'sizes,prev,pager,next,total'
}
pageSize: 15
});
const groupMemberModerationTable = reactive({
data: [],
tableProps: { stripe: true, size: 'small' },
pageSize: 15,
paginationProps: {
layout: 'sizes,prev,pager,next,total'
}
pageSize: 15
});
const rolesText = (roleIds) => {

View File

@@ -67,8 +67,7 @@
previousInstances: [],
previousInstancesTable: {
data: [],
filters: [{ prop: 'displayName', value: '' }],
tableProps: { stripe: true, size: 'small', height: '400px' }
filters: [{ prop: 'displayName', value: '' }]
}
})
}

View File

@@ -65,7 +65,6 @@
<Pencil class="size-4" />
{{ t('dialog.user.actions.edit_pronouns') }}
</DropdownMenuItem>
<DropdownMenuSeparator />
</template>
<template v-else>
<template v-if="userDialog.isFriend">

View File

@@ -47,6 +47,7 @@
:on-refresh="() => refreshInstancePlayerCount(userDialog.$location.tag)" />
</template>
<Location
class="text-sm"
:location="userDialog.ref.location"
:traveling="userDialog.ref.travelingToLocation" />
</div>
@@ -212,7 +213,7 @@
<div class="detail">
<span class="name">{{ t('dialog.user.info.bio') }}</span>
<pre
class="extra"
class="extra truncate"
style="
font-family: inherit;
font-size: 12px;
@@ -1504,10 +1505,7 @@
});
const socialStatusHistoryTable = ref({
data: [],
tableProps: {
stripe: true,
size: 'small'
},
layout: 'table'
});