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 @@
- {{ $ts.noMaintainerInformationWarning }} {{ $ts.configure }}
- {{ $ts.noBotProtectionWarning }} {{ $ts.configure }}
+ {{ $ts.noMaintainerInformationWarning }} {{ $ts.configure }}
+ {{ $ts.noBotProtectionWarning }} {{ $ts.configure }}
@@ -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 @@
-
+
Twitter
{{ enableTwitterIntegration ? $ts.enabled : $ts.disabled }}
-
+
GitHub
{{ enableGithubIntegration ? $ts.enabled : $ts.disabled }}
-
+
Discord
{{ enableDiscordIntegration ? $ts.enabled : $ts.disabled }}
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 @@
-
+
{{ $ts.botProtection }}
hCaptcha
reCAPTCHA
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 @@
-
+
{{ $ts.instance }}
-
+