From 38596766533c9e7b6f0f8a8c89d22121377d54e5 Mon Sep 17 00:00:00 2001
From: penginn-net <121443048+penginn-net@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:37:17 +0900
Subject: [PATCH 1/3] 317

---
 locales/index.d.ts                                  | 8 ++++++++
 locales/ja-JP.yml                                   | 2 ++
 packages/frontend/src/pages/about.vue               | 8 ++++++++
 packages/frontend/src/pages/admin/official-tags.vue | 2 +-
 packages/frontend/src/pages/official-tags.vue       | 8 +++++++-
 packages/frontend/src/ui/_common_/common.ts         | 5 +++++
 6 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 530215acac..51408f1cbb 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5588,6 +5588,14 @@ export interface Locale extends ILocale {
          * 優先度の値が小さいものが上に表示されます
          */
         "adminTopInfo": string;
+        /**
+         * タグ名
+         */
+        "adminTagName": string;
+        /**
+         * 公式タグはありません
+         */
+        "noTag": string;
     };
     /**
      * マスコット画像のリンク
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index cbe7ff4bfa..f9d4fc3b6b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1393,6 +1393,8 @@ _official_tag:
   title: "公式タグ"
   navbar: "公式タグ"
   adminTopInfo: "優先度の値が小さいものが上に表示されます"
+  adminTagName: "タグ名"
+  noTag: "公式タグはありません"
 mascotImageUrl: "マスコット画像のリンク"
 _checkR18:
   title: "成人指定のメディアです"
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index acf99b863f..d9caa06f76 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -19,6 +19,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkSpacer v-else-if="tab === 'charts'" :contentMax="1000" :marginMin="20">
 			<MkInstanceStats/>
 		</MkSpacer>
+		<MkSpacer v-else-if="tab === 'officialTags'" :contentMax="1000" :marginMin="20" :disableHeader="true">
+			<XOfficialTag/>
+		</MkSpacer>
 	</MkHorizontalSwipe>
 </MkStickyContainer>
 </template>
@@ -34,6 +37,7 @@ const XOverview = defineAsyncComponent(() => import('@/pages/about.overview.vue'
 const XEmojis = defineAsyncComponent(() => import('@/pages/about.emojis.vue'));
 const XFederation = defineAsyncComponent(() => import('@/pages/about.federation.vue'));
 const MkInstanceStats = defineAsyncComponent(() => import('@/components/MkInstanceStats.vue'));
+const XOfficialTag = defineAsyncComponent(() => import('@/pages/official-tags.vue'));
 
 const props = withDefaults(defineProps<{
 	initialTab?: string;
@@ -66,6 +70,10 @@ const headerTabs = computed(() => [{
 	key: 'charts',
 	title: i18n.ts.charts,
 	icon: 'ti ti-chart-line',
+}, {
+	key: 'officialTags',
+	title: i18n.ts._official_tag.title,
+	icon: 'ti ti-bookmarks',
 }]);
 
 definePageMetadata(() => ({
diff --git a/packages/frontend/src/pages/admin/official-tags.vue b/packages/frontend/src/pages/admin/official-tags.vue
index f55b62d3cd..6fe5d6b654 100644
--- a/packages/frontend/src/pages/admin/official-tags.vue
+++ b/packages/frontend/src/pages/admin/official-tags.vue
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkFolder>
 					<template #label>{{ tag.tag }}</template>
 					<MkInput v-model="tag.tag" class="input">
-						<template #label>タグ名</template>
+						<template #label>{{ i18n.ts._official_tag.adminTagName }}</template>
 					</MkInput>
 					<MkInput v-model="tag.bannerUrl" type="url" class="input">
 						<template #label>{{ i18n.ts.imageUrl }}</template>
diff --git a/packages/frontend/src/pages/official-tags.vue b/packages/frontend/src/pages/official-tags.vue
index d4cd7b8b6f..a811cfe984 100644
--- a/packages/frontend/src/pages/official-tags.vue
+++ b/packages/frontend/src/pages/official-tags.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader/></template>
+	<template v-if="disableHeader" #header><MkPageHeader/></template>
 
 	<MkSpacer :contentMax="500">
 		<div class="_gaps">
@@ -22,6 +22,12 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { i18n } from '@/i18n.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 
+const props = withDefaults(defineProps<{
+	disableHeader?: boolean;
+}>(), {
+	disableHeader: false,
+});
+
 const official_tags = ref<Misskey.entities.OfficialTagsShowResponse>([]);
 (async () => {
 	official_tags.value = await misskeyApi('official-tags/show', {});
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index 1766a5f7c4..bc8fb0451c 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -74,6 +74,11 @@ export function openInstanceMenu(ev: MouseEvent) {
 		text: i18n.ts.charts,
 		icon: 'ti ti-chart-line',
 		to: '/about#charts',
+	}, {
+		type: 'link',
+		text: i18n.ts._official_tag.title,
+		icon: 'ti ti-bookmarks',
+		to: '/about#officialTags',
 	}, { type: 'divider' }, {
 		type: 'link',
 		text: i18n.ts.ads,

From 871a3971b626b5ca344cdf598e563221da24a718 Mon Sep 17 00:00:00 2001
From: penginn-net <121443048+penginn-net@users.noreply.github.com>
Date: Tue, 20 Aug 2024 18:32:30 +0900
Subject: [PATCH 2/3] fix

---
 CHANGELOG_YOJO.md                             | 2 +-
 packages/frontend/src/pages/about.vue         | 4 ++--
 packages/frontend/src/pages/official-tags.vue | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md
index 4605ea580d..33626ebfdd 100644
--- a/CHANGELOG_YOJO.md
+++ b/CHANGELOG_YOJO.md
@@ -27,7 +27,7 @@
   - (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/696)
 
 ### Client
--
+- Enhance: `/about`で公式タグを表示できるように
 
 ### Server
 -
diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue
index d9caa06f76..8c9cd6d80c 100644
--- a/packages/frontend/src/pages/about.vue
+++ b/packages/frontend/src/pages/about.vue
@@ -19,8 +19,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkSpacer v-else-if="tab === 'charts'" :contentMax="1000" :marginMin="20">
 			<MkInstanceStats/>
 		</MkSpacer>
-		<MkSpacer v-else-if="tab === 'officialTags'" :contentMax="1000" :marginMin="20" :disableHeader="true">
-			<XOfficialTag/>
+		<MkSpacer v-else-if="tab === 'officialTags'" :contentMax="1000" :marginMin="20">
+			<XOfficialTag :showHeader="false"/>
 		</MkSpacer>
 	</MkHorizontalSwipe>
 </MkStickyContainer>
diff --git a/packages/frontend/src/pages/official-tags.vue b/packages/frontend/src/pages/official-tags.vue
index a811cfe984..3ce54434ac 100644
--- a/packages/frontend/src/pages/official-tags.vue
+++ b/packages/frontend/src/pages/official-tags.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <MkStickyContainer>
-	<template v-if="disableHeader" #header><MkPageHeader/></template>
+	<template v-if="showHeader" #header><MkPageHeader/></template>
 
 	<MkSpacer :contentMax="500">
 		<div class="_gaps">
@@ -23,9 +23,9 @@ import { i18n } from '@/i18n.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 
 const props = withDefaults(defineProps<{
-	disableHeader?: boolean;
+	showHeader?: boolean;
 }>(), {
-	disableHeader: false,
+	showHeader: true,
 });
 
 const official_tags = ref<Misskey.entities.OfficialTagsShowResponse>([]);

From f56fc0a0f8e01b8c65f56e71d2802f76862954fa Mon Sep 17 00:00:00 2001
From: penginn-net <121443048+penginn-net@users.noreply.github.com>
Date: Tue, 20 Aug 2024 18:37:21 +0900
Subject: [PATCH 3/3] clean

---
 locales/index.d.ts | 4 ----
 locales/ja-JP.yml  | 1 -
 2 files changed, 5 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 51408f1cbb..2ba8e2a7a4 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5592,10 +5592,6 @@ export interface Locale extends ILocale {
          * タグ名
          */
         "adminTagName": string;
-        /**
-         * 公式タグはありません
-         */
-        "noTag": string;
     };
     /**
      * マスコット画像のリンク
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index f9d4fc3b6b..60342edf9a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1394,7 +1394,6 @@ _official_tag:
   navbar: "公式タグ"
   adminTopInfo: "優先度の値が小さいものが上に表示されます"
   adminTagName: "タグ名"
-  noTag: "公式タグはありません"
 mascotImageUrl: "マスコット画像のリンク"
 _checkR18:
   title: "成人指定のメディアです"