From db734f9e553de4518d07ee6dea0a5a7122a9e356 Mon Sep 17 00:00:00 2001
From: taiy <53635909+taiyme@users.noreply.github.com>
Date: Tue, 2 Jul 2024 00:04:47 +0900
Subject: [PATCH 1/6] =?UTF-8?q?improve(frontend):=20=E3=82=B5=E3=83=BC?=
=?UTF-8?q?=E3=83=90=E3=83=BC=E6=83=85=E5=A0=B1=E3=83=BB=E3=81=8A=E5=95=8F?=
=?UTF-8?q?=E3=81=84=E5=90=88=E3=82=8F=E3=81=9B=E3=83=9A=E3=83=BC=E3=82=B8?=
=?UTF-8?q?=E3=82=92=E6=94=B9=E4=BF=AE=20(#238)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Revert "Revert "enhance(frontend): add contact page" (#208)" (This reverts commit 5a329a09c987b3249f97f9d53af67d1bffb09eea.)
* improve(frontend): サーバー情報・お問い合わせページを改修
(cherry picked from commit e72758d8cda3db009c5d1bf1f4141682931b91f8)
---
packages/frontend/src/components/MkMenu.vue | 1 +
.../src/components/MkVisitorDashboard.vue | 11 +-
.../frontend/src/pages/about.overview.vue | 169 +++++++++++++++
packages/frontend/src/pages/about.vue | 201 +-----------------
packages/frontend/src/pages/contact.vue | 26 ++-
packages/frontend/src/ui/_common_/common.ts | 24 +--
6 files changed, 212 insertions(+), 220 deletions(-)
create mode 100644 packages/frontend/src/pages/about.overview.vue
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 68479989b2a8..2276da1d21af 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -54,6 +54,7 @@ SPDX-License-Identifier: AGPL-3.0-only
:class="['_button', $style.item]"
:href="item.href"
:target="item.target"
+ :rel="item.target === '_blank' ? 'noopener noreferrer' : undefined"
:download="item.download"
@click.passive="close(true)"
@mouseenter.passive="onItemMouseEnter"
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
index 4d81bd02838f..445780eca73d 100644
--- a/packages/frontend/src/components/MkVisitorDashboard.vue
+++ b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.joinThisServer }}
- {{ i18n.ts.exploreOtherServers }}
+ {{ i18n.ts.exploreOtherServers }}
{{ i18n.ts.login }}
@@ -65,7 +65,8 @@ import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import MkNumber from '@/components/MkNumber.vue';
import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue';
-import { openInstanceMenu } from '@/ui/_common_/common';
+import { openInstanceMenu } from '@/ui/_common_/common.js';
+import type { MenuItem } from '@/types/menu.js';
const stats = ref(null);
@@ -89,13 +90,9 @@ function signup() {
});
}
-function showMenu(ev) {
+function showMenu(ev: MouseEvent) {
openInstanceMenu(ev);
}
-
-function exploreOtherServers() {
- window.open('https://misskey-hub.net/servers/', '_blank', 'noopener');
-}
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index 324d1c11defe..8dfeb6d2a73e 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -8,113 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
-
-
- {{ instance.name ?? host }}
-
-
-
-
-
- {{ i18n.ts.description }}
-
-
-
-
-
-
- Misskey
- {{ version }}
-
-
-
-
-
- {{ i18n.ts.aboutMisskey }}
-
-
-
- {{ i18n.ts.sourceCode }}
-
-
- {{ i18n.ts.sourceCodeIsNotYetProvided }}
-
-
-
-
-
-
-
-
- {{ i18n.ts.administrator }}
- {{ instance.maintainerName }}
-
-
- {{ i18n.ts.contact }}
- {{ instance.maintainerEmail }}
-
-
-
-
- {{ i18n.ts.impressum }}
-
-
-
-
-
- {{ i18n.ts.serverRules }}
-
-
-
-
-
-
-
-
- {{ i18n.ts.termsOfService }}
-
-
-
- {{ i18n.ts.privacyPolicy }}
-
-
-
- {{ i18n.ts.feedback }}
-
-
-
-
-
-
-
- {{ i18n.ts.statistics }}
-
-
- {{ i18n.ts.users }}
- {{ number(stats.originalUsersCount) }}
-
-
- {{ i18n.ts.notes }}
- {{ number(stats.originalNotesCount) }}
-
-
-
-
-
-
- Well-known resources
-
- host-meta
- host-meta.json
- nodeinfo
- robots.txt
- manifest.json
-
-
-
+
@@ -130,26 +24,16 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
diff --git a/packages/frontend/src/pages/contact.vue b/packages/frontend/src/pages/contact.vue
index bcdcf4327552..b78c239d3785 100644
--- a/packages/frontend/src/pages/contact.vue
+++ b/packages/frontend/src/pages/contact.vue
@@ -7,18 +7,26 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- {{ i18n.ts.inquiry }}
+
+
+ {{ i18n.ts.administrator }}
- {{ instance.inquiryUrl }}
+ {{ instance.maintainerName }}
+ ({{ i18n.ts._tms.notYetProvided }})
-
-
- {{ i18n.ts.email }}
+
+ {{ i18n.ts.contact }}
+
+ {{ instance.maintainerEmail }}
+ ({{ i18n.ts._tms.notYetProvided }})
+
+
+
+ {{ i18n.ts.inquiry }}
- {{ instance.maintainerEmail }}
+ {{ instance.inquiryUrl }}
+ ({{ i18n.ts._tms.notYetProvided }})
@@ -28,8 +36,8 @@ SPDX-License-Identifier: AGPL-3.0-only