1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-27 21:14:41 +02:00

Merge branch 'develop' into mahjong

This commit is contained in:
syuilo
2026-01-22 11:47:13 +09:00
1550 changed files with 116596 additions and 65108 deletions

View File

@@ -9,6 +9,7 @@ import type { RouteDef } from '@/lib/nirax.js';
import { $i, iAmModerator } from '@/i.js';
import MkLoading from '@/pages/_loading_.vue';
import MkError from '@/pages/_error_.vue';
import PageTimeline from '@/pages/timeline.vue';
export const page = (loader: AsyncComponentLoader) => defineAsyncComponent({
loader: loader,
@@ -21,6 +22,13 @@ function chatPage(...args: Parameters<typeof page>) {
}
export const ROUTE_DEF = [{
name: 'index',
path: '/',
component: $i ? PageTimeline : page(() => import('@/pages/welcome.vue')),
}, {
path: '/timeline',
component: PageTimeline,
}, {
path: '/@:username/pages/:pageName(*)',
component: page(() => import('@/pages/page.vue')),
}, {
@@ -172,6 +180,10 @@ export const ROUTE_DEF = [{
path: '/custom-css',
name: 'preferences',
component: page(() => import('@/pages/settings/custom-css.vue')),
}, {
path: '/profiles',
name: 'profiles',
component: page(() => import('@/pages/settings/profiles.vue')),
}, {
path: '/accounts',
name: 'profile',
@@ -190,6 +202,9 @@ export const ROUTE_DEF = [{
}, {
path: '/signup-complete/:code',
component: page(() => import('@/pages/signup-complete.vue')),
}, {
path: '/verify-email/:code',
component: page(() => import('@/pages/verify-email.vue')),
}, {
path: '/announcements',
component: page(() => import('@/pages/announcements.vue')),
@@ -479,10 +494,6 @@ export const ROUTE_DEF = [{
path: '/performance',
name: 'performance',
component: page(() => import('@/pages/admin/performance.vue')),
}, {
path: '/server-rules',
name: 'server-rules',
component: page(() => import('@/pages/admin/server-rules.vue')),
}, {
path: '/invites',
name: 'invites',
@@ -588,12 +599,13 @@ export const ROUTE_DEF = [{
component: page(() => import('@/pages/mahjong/room.vue')),
loginRequired: true,
}, {
path: '/timeline',
component: page(() => import('@/pages/timeline.vue')),
path: '/qr',
component: page(() => import('@/pages/qr.vue')),
loginRequired: true,
}, {
name: 'index',
path: '/',
component: $i ? page(() => import('@/pages/timeline.vue')) : page(() => import('@/pages/welcome.vue')),
path: '/debug',
component: page(() => import('@/pages/debug.vue')),
loginRequired: false,
}, {
// テスト用リダイレクト設定。ログイン中ユーザのプロフィールにリダイレクトする
path: '/redirect-test',
@@ -602,4 +614,4 @@ export const ROUTE_DEF = [{
}, {
path: '/:(*)',
component: page(() => import('@/pages/not-found.vue')),
}] satisfies RouteDef[];
}] as const satisfies RouteDef[];