From 81a0ee4b2d089b9266d79595707a28f655f5cb27 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 22 Oct 2021 17:37:51 +0900
Subject: [PATCH] client: change url /instance -> /admin

---
 .../pages/{instance => admin}/abuses.vue      |  0
 src/client/pages/{instance => admin}/ads.vue  |  0
 .../{instance => admin}/announcements.vue     |  0
 .../{instance => admin}/bot-protection.vue    |  0
 .../pages/{instance => admin}/database.vue    |  0
 .../{instance => admin}/email-settings.vue    |  0
 .../{instance => admin}/emoji-edit-dialog.vue |  0
 .../pages/{instance => admin}/emojis.vue      |  0
 .../pages/{instance => admin}/file-dialog.vue |  0
 .../{instance => admin}/files-settings.vue    |  0
 .../pages/{instance => admin}/files.vue       |  0
 .../pages/{instance => admin}/index.vue       | 48 +++++++++----------
 .../{instance => admin}/instance-block.vue    |  0
 .../pages/{instance => admin}/instance.vue    |  0
 .../integrations-discord.vue                  |  0
 .../integrations-github.vue                   |  0
 .../integrations-twitter.vue                  |  0
 .../{instance => admin}/integrations.vue      |  6 +--
 src/client/pages/{instance => admin}/logs.vue |  0
 .../pages/{instance => admin}/metrics.vue     |  0
 .../{instance => admin}/object-storage.vue    |  0
 .../{instance => admin}/other-settings.vue    |  0
 .../pages/{instance => admin}/overview.vue    |  0
 .../{instance => admin}/proxy-account.vue     |  0
 .../pages/{instance => admin}/queue.chart.vue |  0
 .../pages/{instance => admin}/queue.vue       |  0
 .../pages/{instance => admin}/relays.vue      |  0
 .../pages/{instance => admin}/security.vue    |  2 +-
 .../{instance => admin}/service-worker.vue    |  0
 .../pages/{instance => admin}/settings.vue    |  0
 .../pages/{instance => admin}/users.vue       |  0
 src/client/pages/instance-info.vue            |  2 +-
 src/client/router.ts                          |  4 +-
 src/client/ui/_common_/sidebar.vue            |  2 +-
 src/client/ui/default.header.vue              |  2 +-
 src/client/ui/default.sidebar.vue             |  2 +-
 36 files changed, 34 insertions(+), 34 deletions(-)
 rename src/client/pages/{instance => admin}/abuses.vue (100%)
 rename src/client/pages/{instance => admin}/ads.vue (100%)
 rename src/client/pages/{instance => admin}/announcements.vue (100%)
 rename src/client/pages/{instance => admin}/bot-protection.vue (100%)
 rename src/client/pages/{instance => admin}/database.vue (100%)
 rename src/client/pages/{instance => admin}/email-settings.vue (100%)
 rename src/client/pages/{instance => admin}/emoji-edit-dialog.vue (100%)
 rename src/client/pages/{instance => admin}/emojis.vue (100%)
 rename src/client/pages/{instance => admin}/file-dialog.vue (100%)
 rename src/client/pages/{instance => admin}/files-settings.vue (100%)
 rename src/client/pages/{instance => admin}/files.vue (100%)
 rename src/client/pages/{instance => admin}/index.vue (91%)
 rename src/client/pages/{instance => admin}/instance-block.vue (100%)
 rename src/client/pages/{instance => admin}/instance.vue (100%)
 rename src/client/pages/{instance => admin}/integrations-discord.vue (100%)
 rename src/client/pages/{instance => admin}/integrations-github.vue (100%)
 rename src/client/pages/{instance => admin}/integrations-twitter.vue (100%)
 rename src/client/pages/{instance => admin}/integrations.vue (93%)
 rename src/client/pages/{instance => admin}/logs.vue (100%)
 rename src/client/pages/{instance => admin}/metrics.vue (100%)
 rename src/client/pages/{instance => admin}/object-storage.vue (100%)
 rename src/client/pages/{instance => admin}/other-settings.vue (100%)
 rename src/client/pages/{instance => admin}/overview.vue (100%)
 rename src/client/pages/{instance => admin}/proxy-account.vue (100%)
 rename src/client/pages/{instance => admin}/queue.chart.vue (100%)
 rename src/client/pages/{instance => admin}/queue.vue (100%)
 rename src/client/pages/{instance => admin}/relays.vue (100%)
 rename src/client/pages/{instance => admin}/security.vue (98%)
 rename src/client/pages/{instance => admin}/service-worker.vue (100%)
 rename src/client/pages/{instance => admin}/settings.vue (100%)
 rename src/client/pages/{instance => admin}/users.vue (100%)

diff --git a/src/client/pages/instance/abuses.vue b/src/client/pages/admin/abuses.vue
similarity index 100%
rename from src/client/pages/instance/abuses.vue
rename to src/client/pages/admin/abuses.vue
diff --git a/src/client/pages/instance/ads.vue b/src/client/pages/admin/ads.vue
similarity index 100%
rename from src/client/pages/instance/ads.vue
rename to src/client/pages/admin/ads.vue
diff --git a/src/client/pages/instance/announcements.vue b/src/client/pages/admin/announcements.vue
similarity index 100%
rename from src/client/pages/instance/announcements.vue
rename to src/client/pages/admin/announcements.vue
diff --git a/src/client/pages/instance/bot-protection.vue b/src/client/pages/admin/bot-protection.vue
similarity index 100%
rename from src/client/pages/instance/bot-protection.vue
rename to src/client/pages/admin/bot-protection.vue
diff --git a/src/client/pages/instance/database.vue b/src/client/pages/admin/database.vue
similarity index 100%
rename from src/client/pages/instance/database.vue
rename to src/client/pages/admin/database.vue
diff --git a/src/client/pages/instance/email-settings.vue b/src/client/pages/admin/email-settings.vue
similarity index 100%
rename from src/client/pages/instance/email-settings.vue
rename to src/client/pages/admin/email-settings.vue
diff --git a/src/client/pages/instance/emoji-edit-dialog.vue b/src/client/pages/admin/emoji-edit-dialog.vue
similarity index 100%
rename from src/client/pages/instance/emoji-edit-dialog.vue
rename to src/client/pages/admin/emoji-edit-dialog.vue
diff --git a/src/client/pages/instance/emojis.vue b/src/client/pages/admin/emojis.vue
similarity index 100%
rename from src/client/pages/instance/emojis.vue
rename to src/client/pages/admin/emojis.vue
diff --git a/src/client/pages/instance/file-dialog.vue b/src/client/pages/admin/file-dialog.vue
similarity index 100%
rename from src/client/pages/instance/file-dialog.vue
rename to src/client/pages/admin/file-dialog.vue
diff --git a/src/client/pages/instance/files-settings.vue b/src/client/pages/admin/files-settings.vue
similarity index 100%
rename from src/client/pages/instance/files-settings.vue
rename to src/client/pages/admin/files-settings.vue
diff --git a/src/client/pages/instance/files.vue b/src/client/pages/admin/files.vue
similarity index 100%
rename from src/client/pages/instance/files.vue
rename to src/client/pages/admin/files.vue
diff --git a/src/client/pages/instance/index.vue b/src/client/pages/admin/index.vue
similarity index 91%
rename from src/client/pages/instance/index.vue
rename to src/client/pages/admin/index.vue
index 7b07bf2dde..7094f2d4bf 100644
--- a/src/client/pages/instance/index.vue
+++ b/src/client/pages/admin/index.vue
@@ -7,8 +7,8 @@
 			<img :src="$instance.iconUrl || '/favicon.ico'" alt="" class="icon"/>
 		</div>
 
-		<MkInfo v-if="noMaintainerInformation" warn class="info">{{ $ts.noMaintainerInformationWarning }} <MkA to="/instance/settings" class="_link">{{ $ts.configure }}</MkA></MkInfo>
-		<MkInfo v-if="noBotProtection" warn class="info">{{ $ts.noBotProtectionWarning }} <MkA to="/instance/bot-protection" class="_link">{{ $ts.configure }}</MkA></MkInfo>
+		<MkInfo v-if="noMaintainerInformation" warn class="info">{{ $ts.noMaintainerInformationWarning }} <MkA to="/admin/settings" class="_link">{{ $ts.configure }}</MkA></MkInfo>
+		<MkInfo v-if="noBotProtection" warn class="info">{{ $ts.noBotProtectionWarning }} <MkA to="/admin/bot-protection" class="_link">{{ $ts.configure }}</MkA></MkInfo>
 
 		<MkSuperMenu :def="menuDef" :grid="page == null"></MkSuperMenu>
 	</div>
@@ -93,47 +93,47 @@ export default defineComponent({
 			items: [{
 				icon: 'fas fa-tachometer-alt',
 				text: i18n.locale.dashboard,
-				to: '/instance/overview',
+				to: '/admin/overview',
 				active: page.value === 'overview',
 			}, {
 				icon: 'fas fa-users',
 				text: i18n.locale.users,
-				to: '/instance/users',
+				to: '/admin/users',
 				active: page.value === 'users',
 			}, {
 				icon: 'fas fa-laugh',
 				text: i18n.locale.customEmojis,
-				to: '/instance/emojis',
+				to: '/admin/emojis',
 				active: page.value === 'emojis',
 			}, {
 				icon: 'fas fa-globe',
 				text: i18n.locale.federation,
-				to: '/instance/federation',
+				to: '/admin/federation',
 				active: page.value === 'federation',
 			}, {
 				icon: 'fas fa-clipboard-list',
 				text: i18n.locale.jobQueue,
-				to: '/instance/queue',
+				to: '/admin/queue',
 				active: page.value === 'queue',
 			}, {
 				icon: 'fas fa-cloud',
 				text: i18n.locale.files,
-				to: '/instance/files',
+				to: '/admin/files',
 				active: page.value === 'files',
 			}, {
 				icon: 'fas fa-broadcast-tower',
 				text: i18n.locale.announcements,
-				to: '/instance/announcements',
+				to: '/admin/announcements',
 				active: page.value === 'announcements',
 			}, {
 				icon: 'fas fa-audio-description',
 				text: i18n.locale.ads,
-				to: '/instance/ads',
+				to: '/admin/ads',
 				active: page.value === 'ads',
 			}, {
 				icon: 'fas fa-exclamation-circle',
 				text: i18n.locale.abuseReports,
-				to: '/instance/abuses',
+				to: '/admin/abuses',
 				active: page.value === 'abuses',
 			}],
 		}, {
@@ -141,57 +141,57 @@ export default defineComponent({
 			items: [{
 				icon: 'fas fa-cog',
 				text: i18n.locale.general,
-				to: '/instance/settings',
+				to: '/admin/settings',
 				active: page.value === 'settings',
 			}, {
 				icon: 'fas fa-cloud',
 				text: i18n.locale.files,
-				to: '/instance/files-settings',
+				to: '/admin/files-settings',
 				active: page.value === 'files-settings',
 			}, {
 				icon: 'fas fa-envelope',
 				text: i18n.locale.emailServer,
-				to: '/instance/email-settings',
+				to: '/admin/email-settings',
 				active: page.value === 'email-settings',
 			}, {
 				icon: 'fas fa-cloud',
 				text: i18n.locale.objectStorage,
-				to: '/instance/object-storage',
+				to: '/admin/object-storage',
 				active: page.value === 'object-storage',
 			}, {
 				icon: 'fas fa-lock',
 				text: i18n.locale.security,
-				to: '/instance/security',
+				to: '/admin/security',
 				active: page.value === 'security',
 			}, {
 				icon: 'fas fa-bolt',
 				text: 'ServiceWorker',
-				to: '/instance/service-worker',
+				to: '/admin/service-worker',
 				active: page.value === 'service-worker',
 			}, {
 				icon: 'fas fa-globe',
 				text: i18n.locale.relays,
-				to: '/instance/relays',
+				to: '/admin/relays',
 				active: page.value === 'relays',
 			}, {
 				icon: 'fas fa-share-alt',
 				text: i18n.locale.integration,
-				to: '/instance/integrations',
+				to: '/admin/integrations',
 				active: page.value === 'integrations',
 			}, {
 				icon: 'fas fa-ban',
 				text: i18n.locale.instanceBlocking,
-				to: '/instance/instance-block',
+				to: '/admin/instance-block',
 				active: page.value === 'instance-block',
 			}, {
 				icon: 'fas fa-ghost',
 				text: i18n.locale.proxyAccount,
-				to: '/instance/proxy-account',
+				to: '/admin/proxy-account',
 				active: page.value === 'proxy-account',
 			}, {
 				icon: 'fas fa-cogs',
 				text: i18n.locale.other,
-				to: '/instance/other-settings',
+				to: '/admin/other-settings',
 				active: page.value === 'other-settings',
 			}],
 		}, {
@@ -199,12 +199,12 @@ export default defineComponent({
 			items: [{
 				icon: 'fas fa-database',
 				text: i18n.locale.database,
-				to: '/instance/database',
+				to: '/admin/database',
 				active: page.value === 'database',
 			}, {
 				icon: 'fas fa-stream',
 				text: i18n.locale.logs,
-				to: '/instance/logs',
+				to: '/admin/logs',
 				active: page.value === 'logs',
 			}],
 		}]);
diff --git a/src/client/pages/instance/instance-block.vue b/src/client/pages/admin/instance-block.vue
similarity index 100%
rename from src/client/pages/instance/instance-block.vue
rename to src/client/pages/admin/instance-block.vue
diff --git a/src/client/pages/instance/instance.vue b/src/client/pages/admin/instance.vue
similarity index 100%
rename from src/client/pages/instance/instance.vue
rename to src/client/pages/admin/instance.vue
diff --git a/src/client/pages/instance/integrations-discord.vue b/src/client/pages/admin/integrations-discord.vue
similarity index 100%
rename from src/client/pages/instance/integrations-discord.vue
rename to src/client/pages/admin/integrations-discord.vue
diff --git a/src/client/pages/instance/integrations-github.vue b/src/client/pages/admin/integrations-github.vue
similarity index 100%
rename from src/client/pages/instance/integrations-github.vue
rename to src/client/pages/admin/integrations-github.vue
diff --git a/src/client/pages/instance/integrations-twitter.vue b/src/client/pages/admin/integrations-twitter.vue
similarity index 100%
rename from src/client/pages/instance/integrations-twitter.vue
rename to src/client/pages/admin/integrations-twitter.vue
diff --git a/src/client/pages/instance/integrations.vue b/src/client/pages/admin/integrations.vue
similarity index 93%
rename from src/client/pages/instance/integrations.vue
rename to src/client/pages/admin/integrations.vue
index 6964ae5704..bdc2cec4d0 100644
--- a/src/client/pages/instance/integrations.vue
+++ b/src/client/pages/admin/integrations.vue
@@ -1,15 +1,15 @@
 <template>
 <FormBase>
 	<FormSuspense :p="init">
-		<FormLink to="/instance/integrations/twitter">
+		<FormLink to="/admin/integrations/twitter">
 			<i class="fab fa-twitter"></i> Twitter
 			<template #suffix>{{ enableTwitterIntegration ? $ts.enabled : $ts.disabled }}</template>
 		</FormLink>
-		<FormLink to="/instance/integrations/github">
+		<FormLink to="/admin/integrations/github">
 			<i class="fab fa-github"></i> GitHub
 			<template #suffix>{{ enableGithubIntegration ? $ts.enabled : $ts.disabled }}</template>
 		</FormLink>
-		<FormLink to="/instance/integrations/discord">
+		<FormLink to="/admin/integrations/discord">
 			<i class="fab fa-discord"></i> Discord
 			<template #suffix>{{ enableDiscordIntegration ? $ts.enabled : $ts.disabled }}</template>
 		</FormLink>
diff --git a/src/client/pages/instance/logs.vue b/src/client/pages/admin/logs.vue
similarity index 100%
rename from src/client/pages/instance/logs.vue
rename to src/client/pages/admin/logs.vue
diff --git a/src/client/pages/instance/metrics.vue b/src/client/pages/admin/metrics.vue
similarity index 100%
rename from src/client/pages/instance/metrics.vue
rename to src/client/pages/admin/metrics.vue
diff --git a/src/client/pages/instance/object-storage.vue b/src/client/pages/admin/object-storage.vue
similarity index 100%
rename from src/client/pages/instance/object-storage.vue
rename to src/client/pages/admin/object-storage.vue
diff --git a/src/client/pages/instance/other-settings.vue b/src/client/pages/admin/other-settings.vue
similarity index 100%
rename from src/client/pages/instance/other-settings.vue
rename to src/client/pages/admin/other-settings.vue
diff --git a/src/client/pages/instance/overview.vue b/src/client/pages/admin/overview.vue
similarity index 100%
rename from src/client/pages/instance/overview.vue
rename to src/client/pages/admin/overview.vue
diff --git a/src/client/pages/instance/proxy-account.vue b/src/client/pages/admin/proxy-account.vue
similarity index 100%
rename from src/client/pages/instance/proxy-account.vue
rename to src/client/pages/admin/proxy-account.vue
diff --git a/src/client/pages/instance/queue.chart.vue b/src/client/pages/admin/queue.chart.vue
similarity index 100%
rename from src/client/pages/instance/queue.chart.vue
rename to src/client/pages/admin/queue.chart.vue
diff --git a/src/client/pages/instance/queue.vue b/src/client/pages/admin/queue.vue
similarity index 100%
rename from src/client/pages/instance/queue.vue
rename to src/client/pages/admin/queue.vue
diff --git a/src/client/pages/instance/relays.vue b/src/client/pages/admin/relays.vue
similarity index 100%
rename from src/client/pages/instance/relays.vue
rename to src/client/pages/admin/relays.vue
diff --git a/src/client/pages/instance/security.vue b/src/client/pages/admin/security.vue
similarity index 98%
rename from src/client/pages/instance/security.vue
rename to src/client/pages/admin/security.vue
index a854b6dbd0..4365b6800c 100644
--- a/src/client/pages/instance/security.vue
+++ b/src/client/pages/admin/security.vue
@@ -1,7 +1,7 @@
 <template>
 <FormBase>
 	<FormSuspense :p="init">
-		<FormLink to="/instance/bot-protection">
+		<FormLink to="/admin/bot-protection">
 			<i class="fas fa-shield-alt"></i> {{ $ts.botProtection }}
 			<template #suffix v-if="enableHcaptcha">hCaptcha</template>
 			<template #suffix v-else-if="enableRecaptcha">reCAPTCHA</template>
diff --git a/src/client/pages/instance/service-worker.vue b/src/client/pages/admin/service-worker.vue
similarity index 100%
rename from src/client/pages/instance/service-worker.vue
rename to src/client/pages/admin/service-worker.vue
diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/admin/settings.vue
similarity index 100%
rename from src/client/pages/instance/settings.vue
rename to src/client/pages/admin/settings.vue
diff --git a/src/client/pages/instance/users.vue b/src/client/pages/admin/users.vue
similarity index 100%
rename from src/client/pages/instance/users.vue
rename to src/client/pages/admin/users.vue
diff --git a/src/client/pages/instance-info.vue b/src/client/pages/instance-info.vue
index 7a4cd5f016..291ceb5dfd 100644
--- a/src/client/pages/instance-info.vue
+++ b/src/client/pages/instance-info.vue
@@ -149,7 +149,7 @@ import * as os from '@client/os';
 import number from '@client/filters/number';
 import bytes from '@client/filters/bytes';
 import * as symbols from '@client/symbols';
-import MkInstanceInfo from '@client/pages/instance/instance.vue';
+import MkInstanceInfo from '@client/pages/admin/instance.vue';
 
 export default defineComponent({
 	components: {
diff --git a/src/client/router.ts b/src/client/router.ts
index 56dc948669..f588bb04fc 100644
--- a/src/client/router.ts
+++ b/src/client/router.ts
@@ -70,8 +70,8 @@ const defaultRoutes = [
 	{ path: '/my/antennas/:antennaId', component: page('my-antennas/edit'), props: true },
 	{ path: '/my/clips', component: page('my-clips/index') },
 	{ path: '/scratchpad', component: page('scratchpad') },
-	{ path: '/instance/:page(.*)?', component: page('instance/index'), props: route => ({ initialPage: route.params.page || null }) },
-	{ path: '/instance', component: page('instance/index') },
+	{ path: '/admin/:page(.*)?', component: page('admin/index'), props: route => ({ initialPage: route.params.page || null }) },
+	{ path: '/admin', component: page('admin/index') },
 	{ path: '/notes/:note', name: 'note', component: page('note'), props: route => ({ noteId: route.params.note }) },
 	{ path: '/tags/:tag', component: page('tag'), props: route => ({ tag: route.params.tag }) },
 	{ path: '/user-info/:user', component: page('user-info'), props: route => ({ userId: route.params.user }) },
diff --git a/src/client/ui/_common_/sidebar.vue b/src/client/ui/_common_/sidebar.vue
index d00327b096..ec2a17ab86 100644
--- a/src/client/ui/_common_/sidebar.vue
+++ b/src/client/ui/_common_/sidebar.vue
@@ -25,7 +25,7 @@
 					</component>
 				</template>
 				<div class="divider"></div>
-				<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/instance" v-click-anime>
+				<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" v-click-anime>
 					<i class="fas fa-server fa-fw"></i><span class="text">{{ $ts.instance }}</span>
 				</MkA>
 				<button class="item _button" @click="more" v-click-anime>
diff --git a/src/client/ui/default.header.vue b/src/client/ui/default.header.vue
index 4f6363e82d..908a4719a4 100644
--- a/src/client/ui/default.header.vue
+++ b/src/client/ui/default.header.vue
@@ -13,7 +13,7 @@
 				</component>
 			</template>
 			<div class="divider"></div>
-			<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/instance" :behavior="settingsWindowed ? 'modalWindow' : null" v-click-anime v-tooltip="$ts.instance">
+			<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null" v-click-anime v-tooltip="$ts.instance">
 				<i class="fas fa-server fa-fw"></i>
 			</MkA>
 			<button class="item _button" @click="more" v-click-anime>
diff --git a/src/client/ui/default.sidebar.vue b/src/client/ui/default.sidebar.vue
index e36febb7fa..cce74a53cd 100644
--- a/src/client/ui/default.sidebar.vue
+++ b/src/client/ui/default.sidebar.vue
@@ -20,7 +20,7 @@
 		</component>
 	</template>
 	<div class="divider"></div>
-	<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/instance" :behavior="settingsWindowed ? 'modalWindow' : null" v-click-anime>
+	<MkA v-if="$i.isAdmin || $i.isModerator" class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null" v-click-anime>
 		<i class="fas fa-server fa-fw"></i><span class="text">{{ $ts.instance }}</span>
 	</MkA>
 	<button class="item _button" @click="more" v-click-anime>