summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-10-22 17:37:51 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-10-22 17:37:51 +0900
commit81a0ee4b2d089b9266d79595707a28f655f5cb27 (patch)
tree769ee1d2fe4ab72abe74008eafe49297ee152a5b /src
parenttweak ui (diff)
downloadsharkey-81a0ee4b2d089b9266d79595707a28f655f5cb27.tar.gz
sharkey-81a0ee4b2d089b9266d79595707a28f655f5cb27.tar.bz2
sharkey-81a0ee4b2d089b9266d79595707a28f655f5cb27.zip
client: change url /instance -> /admin
Diffstat (limited to 'src')
-rw-r--r--src/client/pages/admin/abuses.vue (renamed from src/client/pages/instance/abuses.vue)0
-rw-r--r--src/client/pages/admin/ads.vue (renamed from src/client/pages/instance/ads.vue)0
-rw-r--r--src/client/pages/admin/announcements.vue (renamed from src/client/pages/instance/announcements.vue)0
-rw-r--r--src/client/pages/admin/bot-protection.vue (renamed from src/client/pages/instance/bot-protection.vue)0
-rw-r--r--src/client/pages/admin/database.vue (renamed from src/client/pages/instance/database.vue)0
-rw-r--r--src/client/pages/admin/email-settings.vue (renamed from src/client/pages/instance/email-settings.vue)0
-rw-r--r--src/client/pages/admin/emoji-edit-dialog.vue (renamed from src/client/pages/instance/emoji-edit-dialog.vue)0
-rw-r--r--src/client/pages/admin/emojis.vue (renamed from src/client/pages/instance/emojis.vue)0
-rw-r--r--src/client/pages/admin/file-dialog.vue (renamed from src/client/pages/instance/file-dialog.vue)0
-rw-r--r--src/client/pages/admin/files-settings.vue (renamed from src/client/pages/instance/files-settings.vue)0
-rw-r--r--src/client/pages/admin/files.vue (renamed from src/client/pages/instance/files.vue)0
-rw-r--r--src/client/pages/admin/index.vue (renamed from src/client/pages/instance/index.vue)48
-rw-r--r--src/client/pages/admin/instance-block.vue (renamed from src/client/pages/instance/instance-block.vue)0
-rw-r--r--src/client/pages/admin/instance.vue (renamed from src/client/pages/instance/instance.vue)0
-rw-r--r--src/client/pages/admin/integrations-discord.vue (renamed from src/client/pages/instance/integrations-discord.vue)0
-rw-r--r--src/client/pages/admin/integrations-github.vue (renamed from src/client/pages/instance/integrations-github.vue)0
-rw-r--r--src/client/pages/admin/integrations-twitter.vue (renamed from src/client/pages/instance/integrations-twitter.vue)0
-rw-r--r--src/client/pages/admin/integrations.vue (renamed from src/client/pages/instance/integrations.vue)6
-rw-r--r--src/client/pages/admin/logs.vue (renamed from src/client/pages/instance/logs.vue)0
-rw-r--r--src/client/pages/admin/metrics.vue (renamed from src/client/pages/instance/metrics.vue)0
-rw-r--r--src/client/pages/admin/object-storage.vue (renamed from src/client/pages/instance/object-storage.vue)0
-rw-r--r--src/client/pages/admin/other-settings.vue (renamed from src/client/pages/instance/other-settings.vue)0
-rw-r--r--src/client/pages/admin/overview.vue (renamed from src/client/pages/instance/overview.vue)0
-rw-r--r--src/client/pages/admin/proxy-account.vue (renamed from src/client/pages/instance/proxy-account.vue)0
-rw-r--r--src/client/pages/admin/queue.chart.vue (renamed from src/client/pages/instance/queue.chart.vue)0
-rw-r--r--src/client/pages/admin/queue.vue (renamed from src/client/pages/instance/queue.vue)0
-rw-r--r--src/client/pages/admin/relays.vue (renamed from src/client/pages/instance/relays.vue)0
-rw-r--r--src/client/pages/admin/security.vue (renamed from src/client/pages/instance/security.vue)2
-rw-r--r--src/client/pages/admin/service-worker.vue (renamed from src/client/pages/instance/service-worker.vue)0
-rw-r--r--src/client/pages/admin/settings.vue (renamed from src/client/pages/instance/settings.vue)0
-rw-r--r--src/client/pages/admin/users.vue (renamed from src/client/pages/instance/users.vue)0
-rw-r--r--src/client/pages/instance-info.vue2
-rw-r--r--src/client/router.ts4
-rw-r--r--src/client/ui/_common_/sidebar.vue2
-rw-r--r--src/client/ui/default.header.vue2
-rw-r--r--src/client/ui/default.sidebar.vue2
36 files changed, 34 insertions, 34 deletions
diff --git a/src/client/pages/instance/abuses.vue b/src/client/pages/admin/abuses.vue
index 29da8cc2c5..29da8cc2c5 100644
--- a/src/client/pages/instance/abuses.vue
+++ b/src/client/pages/admin/abuses.vue
diff --git a/src/client/pages/instance/ads.vue b/src/client/pages/admin/ads.vue
index e776f99a4c..e776f99a4c 100644
--- a/src/client/pages/instance/ads.vue
+++ b/src/client/pages/admin/ads.vue
diff --git a/src/client/pages/instance/announcements.vue b/src/client/pages/admin/announcements.vue
index 78637c095a..78637c095a 100644
--- a/src/client/pages/instance/announcements.vue
+++ b/src/client/pages/admin/announcements.vue
diff --git a/src/client/pages/instance/bot-protection.vue b/src/client/pages/admin/bot-protection.vue
index 731f114cc2..731f114cc2 100644
--- a/src/client/pages/instance/bot-protection.vue
+++ b/src/client/pages/admin/bot-protection.vue
diff --git a/src/client/pages/instance/database.vue b/src/client/pages/admin/database.vue
index ffbeed8b30..ffbeed8b30 100644
--- a/src/client/pages/instance/database.vue
+++ b/src/client/pages/admin/database.vue
diff --git a/src/client/pages/instance/email-settings.vue b/src/client/pages/admin/email-settings.vue
index ebf724fcdd..ebf724fcdd 100644
--- a/src/client/pages/instance/email-settings.vue
+++ b/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
index 4854c69884..4854c69884 100644
--- a/src/client/pages/instance/emoji-edit-dialog.vue
+++ b/src/client/pages/admin/emoji-edit-dialog.vue
diff --git a/src/client/pages/instance/emojis.vue b/src/client/pages/admin/emojis.vue
index 4cd34b046d..4cd34b046d 100644
--- a/src/client/pages/instance/emojis.vue
+++ b/src/client/pages/admin/emojis.vue
diff --git a/src/client/pages/instance/file-dialog.vue b/src/client/pages/admin/file-dialog.vue
index 02d83e5022..02d83e5022 100644
--- a/src/client/pages/instance/file-dialog.vue
+++ b/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
index 8aefa9e90d..8aefa9e90d 100644
--- a/src/client/pages/instance/files-settings.vue
+++ b/src/client/pages/admin/files-settings.vue
diff --git a/src/client/pages/instance/files.vue b/src/client/pages/admin/files.vue
index 55189cfd84..55189cfd84 100644
--- a/src/client/pages/instance/files.vue
+++ b/src/client/pages/admin/files.vue
diff --git a/src/client/pages/instance/index.vue b/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
index 105cdb4941..105cdb4941 100644
--- a/src/client/pages/instance/instance-block.vue
+++ b/src/client/pages/admin/instance-block.vue
diff --git a/src/client/pages/instance/instance.vue b/src/client/pages/admin/instance.vue
index 5572fbbf75..5572fbbf75 100644
--- a/src/client/pages/instance/instance.vue
+++ b/src/client/pages/admin/instance.vue
diff --git a/src/client/pages/instance/integrations-discord.vue b/src/client/pages/admin/integrations-discord.vue
index c33b24f17f..c33b24f17f 100644
--- a/src/client/pages/instance/integrations-discord.vue
+++ b/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
index cdf85868ff..cdf85868ff 100644
--- a/src/client/pages/instance/integrations-github.vue
+++ b/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
index ed7d097d0a..ed7d097d0a 100644
--- a/src/client/pages/instance/integrations-twitter.vue
+++ b/src/client/pages/admin/integrations-twitter.vue
diff --git a/src/client/pages/instance/integrations.vue b/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
index 74aea0fc45..74aea0fc45 100644
--- a/src/client/pages/instance/logs.vue
+++ b/src/client/pages/admin/logs.vue
diff --git a/src/client/pages/instance/metrics.vue b/src/client/pages/admin/metrics.vue
index da36f6c688..da36f6c688 100644
--- a/src/client/pages/instance/metrics.vue
+++ b/src/client/pages/admin/metrics.vue
diff --git a/src/client/pages/instance/object-storage.vue b/src/client/pages/admin/object-storage.vue
index 2d765270e6..2d765270e6 100644
--- a/src/client/pages/instance/object-storage.vue
+++ b/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
index 4e55df41fb..4e55df41fb 100644
--- a/src/client/pages/instance/other-settings.vue
+++ b/src/client/pages/admin/other-settings.vue
diff --git a/src/client/pages/instance/overview.vue b/src/client/pages/admin/overview.vue
index 327a6492e6..327a6492e6 100644
--- a/src/client/pages/instance/overview.vue
+++ b/src/client/pages/admin/overview.vue
diff --git a/src/client/pages/instance/proxy-account.vue b/src/client/pages/admin/proxy-account.vue
index b1ece19710..b1ece19710 100644
--- a/src/client/pages/instance/proxy-account.vue
+++ b/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
index 4f8fd762bb..4f8fd762bb 100644
--- a/src/client/pages/instance/queue.chart.vue
+++ b/src/client/pages/admin/queue.chart.vue
diff --git a/src/client/pages/instance/queue.vue b/src/client/pages/admin/queue.vue
index f88825eb19..f88825eb19 100644
--- a/src/client/pages/instance/queue.vue
+++ b/src/client/pages/admin/queue.vue
diff --git a/src/client/pages/instance/relays.vue b/src/client/pages/admin/relays.vue
index 7d7888eaa8..7d7888eaa8 100644
--- a/src/client/pages/instance/relays.vue
+++ b/src/client/pages/admin/relays.vue
diff --git a/src/client/pages/instance/security.vue b/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
index 430e02ad2e..430e02ad2e 100644
--- a/src/client/pages/instance/service-worker.vue
+++ b/src/client/pages/admin/service-worker.vue
diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/admin/settings.vue
index 7bd363e5f3..7bd363e5f3 100644
--- a/src/client/pages/instance/settings.vue
+++ b/src/client/pages/admin/settings.vue
diff --git a/src/client/pages/instance/users.vue b/src/client/pages/admin/users.vue
index f7f9306b70..f7f9306b70 100644
--- a/src/client/pages/instance/users.vue
+++ b/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>