From f995172c5d3a4166ff3285b65cee66237d313393 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 20 Jun 2022 21:05:18 +0900
Subject: [PATCH] tweak client
---
packages/client/src/pages/admin-file.vue | 11 ++++-------
packages/client/src/pages/user-info.vue | 12 ++++--------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 67dcd88bc4..2cbe8890a1 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -14,9 +14,9 @@
<div class="_formBlock">
<MkSwitch v-model="isSensitive" @update:modelValue="toggleIsSensitive">NSFW</MkSwitch>
</div>
- <div class="_formBlock">
- <MkButton full @click="showUser"><i class="fas fa-external-link-square-alt"></i> {{ $ts.user }}</MkButton>
- </div>
+ <FormLink class="_formBlock" :to="file.url" :external="true">Open</FormLink>
+ <FormLink class="_formBlock" :to="`/user-info/${file.userId}`">{{ $ts.user }}</FormLink>
+
<div class="_formBlock">
<MkButton full danger @click="del"><i class="fas fa-trash-alt"></i> {{ $ts.delete }}</MkButton>
</div>
@@ -35,6 +35,7 @@ import { computed } from 'vue';
import MkButton from '@/components/ui/button.vue';
import MkSwitch from '@/components/form/switch.vue';
import MkDriveFileThumbnail from '@/components/drive-file-thumbnail.vue';
+import FormLink from '@/components/form/link.vue';
import bytes from '@/filters/bytes';
import * as os from '@/os';
import { i18n } from '@/i18n';
@@ -56,10 +57,6 @@ async function fetch() {
fetch();
-function showUser() {
- os.pageWindow(`/user-info/${file.userId}`);
-}
-
async function del() {
const { canceled } = await os.confirm({
type: 'warning',
diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index 6dc25e99d6..996c018dd9 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -8,7 +8,9 @@
<MkAvatar class="avatar" :user="user" :show-indicator="true"/>
</div>
- <FormLink :to="userPage(user)">Profile</FormLink>
+ <FormLink class="_formBlock" :to="userPage(user)">Profile</FormLink>
+
+ <FormLink v-if="user.url" class="_formBlock" :to="user.url" :external="true">Profile (remote)</FormLink>
<div class="_formBlock">
<MkKeyValue :copy="acct(user)" oneline style="margin: 1em 0;">
@@ -205,13 +207,7 @@ watch(() => user, () => {
});
});
-const headerActions = $computed(() => user && user.url ? [{
- text: user.url,
- icon: 'fas fa-external-link-alt',
- handler: () => {
- window.open(user.url, '_blank');
- },
-}] : []);
+const headerActions = $computed(() => []);
const headerTabs = $computed(() => []);