From 9593c92ad87b34247d391f964c2fc0770d60ff86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Mon, 2 Mar 2026 21:28:30 +0100 Subject: [PATCH] nicolium: update dashboard paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- .../navigation/dropdown-navigation.tsx | 2 +- .../navigation/sidebar-navigation.tsx | 2 +- .../components/statuses/status-action-bar.tsx | 2 +- .../account/components/account-menu.tsx | 2 +- .../components/latest-accounts-panel.tsx | 2 +- .../src/features/admin/components/report.tsx | 4 +- .../event/components/event-header.tsx | 2 +- .../nicolium/src/features/ui/router/index.tsx | 39 ++++++++++++------- ...-fe.example.json => nicolium.example.json} | 0 .../src/pages/dashboard/dashboard.tsx | 26 ++++++------- .../src/pages/dashboard/frontend-config.tsx | 2 +- .../nicolium/src/pages/dashboard/report.tsx | 6 +-- 12 files changed, 50 insertions(+), 39 deletions(-) rename packages/nicolium/src/instance/{pl-fe.example.json => nicolium.example.json} (100%) diff --git a/packages/nicolium/src/components/navigation/dropdown-navigation.tsx b/packages/nicolium/src/components/navigation/dropdown-navigation.tsx index c6b37132d..44fb4d977 100644 --- a/packages/nicolium/src/components/navigation/dropdown-navigation.tsx +++ b/packages/nicolium/src/components/navigation/dropdown-navigation.tsx @@ -468,7 +468,7 @@ const DropdownNavigation: React.FC = React.memo((): React.JSX.Element | null => {(account.is_admin ?? account.is_moderator) && ( } onClick={closeSidebar} diff --git a/packages/nicolium/src/components/navigation/sidebar-navigation.tsx b/packages/nicolium/src/components/navigation/sidebar-navigation.tsx index 0066b0a16..2344ea8c1 100644 --- a/packages/nicolium/src/components/navigation/sidebar-navigation.tsx +++ b/packages/nicolium/src/components/navigation/sidebar-navigation.tsx @@ -358,7 +358,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {(account.is_admin ?? account.is_moderator) && ( = ({ menu.push({ text: intl.formatMessage(messages.adminAccount, { name: username }), - to: '/pl-fe/admin/accounts/$accountId', + to: '/nicolium/admin/accounts/$accountId', params: { accountId: status.account_id }, icon: require('@phosphor-icons/core/regular/gavel.svg'), }); diff --git a/packages/nicolium/src/features/account/components/account-menu.tsx b/packages/nicolium/src/features/account/components/account-menu.tsx index f4d3c9883..a753eefef 100644 --- a/packages/nicolium/src/features/account/components/account-menu.tsx +++ b/packages/nicolium/src/features/account/components/account-menu.tsx @@ -535,7 +535,7 @@ const AccountMenu: React.FC = ({ account }) => { menu.push({ text: intl.formatMessage(messages.adminAccount, { name: account.username }), - to: '/pl-fe/admin/accounts/$accountId', + to: '/nicolium/admin/accounts/$accountId', params: { accountId: account.id }, icon: require('@phosphor-icons/core/regular/gavel.svg'), }); diff --git a/packages/nicolium/src/features/admin/components/latest-accounts-panel.tsx b/packages/nicolium/src/features/admin/components/latest-accounts-panel.tsx index 789e5b4e0..02d4e0f25 100644 --- a/packages/nicolium/src/features/admin/components/latest-accounts-panel.tsx +++ b/packages/nicolium/src/features/admin/components/latest-accounts-panel.tsx @@ -30,7 +30,7 @@ const LatestAccountsPanel: React.FC = ({ limit = 5 }) => { const total = accountIds?.total; const handleAction = () => { - navigate({ to: '/pl-fe/admin/users' }); + navigate({ to: '/nicolium/admin/users' }); }; return ( diff --git a/packages/nicolium/src/features/admin/components/report.tsx b/packages/nicolium/src/features/admin/components/report.tsx index b90090c90..35cf166a9 100644 --- a/packages/nicolium/src/features/admin/components/report.tsx +++ b/packages/nicolium/src/features/admin/components/report.tsx @@ -26,7 +26,7 @@ const Report: React.FC = ({ id }) => { return ( @@ -62,7 +62,7 @@ const Report: React.FC = ({ id }) => { - + @{reporterAcct} diff --git a/packages/nicolium/src/features/event/components/event-header.tsx b/packages/nicolium/src/features/event/components/event-header.tsx index b0c33e2ea..b52bdf397 100644 --- a/packages/nicolium/src/features/event/components/event-header.tsx +++ b/packages/nicolium/src/features/event/components/event-header.tsx @@ -406,7 +406,7 @@ const EventHeader: React.FC = ({ status }) => { menu.push({ text: intl.formatMessage(messages.adminAccount, { name: username }), - to: '/pl-fe/admin/accounts/$accountId', + to: '/nicolium/admin/accounts/$accountId', params: { accountId: account.id }, icon: require('@phosphor-icons/core/regular/gavel.svg'), }); diff --git a/packages/nicolium/src/features/ui/router/index.tsx b/packages/nicolium/src/features/ui/router/index.tsx index 3cf690b58..614b14901 100644 --- a/packages/nicolium/src/features/ui/router/index.tsx +++ b/packages/nicolium/src/features/ui/router/index.tsx @@ -1039,7 +1039,7 @@ export const settingsPrivacyRoute = createRoute({ // Frontend config export const frontendConfigRoute = createRoute({ getParentRoute: () => layouts.default, - path: '/pl-fe/config', + path: '/nicolium/config', component: FrontendConfig, beforeLoad: requireAuthMiddleware(({ context: { isAdmin } }) => { if (!isAdmin) throw notFound(); @@ -1049,7 +1049,7 @@ export const frontendConfigRoute = createRoute({ // Admin routes export const adminDashboardRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin', + path: '/nicolium/admin', component: Dashboard, beforeLoad: requireAuthMiddleware(({ context: { isAdmin } }) => { if (!isAdmin) throw notFound(); @@ -1058,7 +1058,7 @@ export const adminDashboardRoute = createRoute({ export const adminAccountRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/accounts/$accountId', + path: '/nicolium/admin/accounts/$accountId', component: AdminAccount, beforeLoad: requireAuthMiddleware(({ context: { isAdmin } }) => { if (!isAdmin) throw notFound(); @@ -1067,7 +1067,7 @@ export const adminAccountRoute = createRoute({ export const adminAwaitingApprovalRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/approval', + path: '/nicolium/admin/approval', component: AwaitingApproval, beforeLoad: requireAuthMiddleware(({ context: { isAdmin } }) => { if (!isAdmin) throw notFound(); @@ -1076,7 +1076,7 @@ export const adminAwaitingApprovalRoute = createRoute({ export const adminReportsRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/reports', + path: '/nicolium/admin/reports', component: Reports, validateSearch: v.object({ resolved: v.optional(v.boolean(), false), @@ -1090,7 +1090,7 @@ export const adminReportsRoute = createRoute({ export const adminReportRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/reports/$reportId', + path: '/nicolium/admin/reports/$reportId', component: Report, beforeLoad: requireAuthMiddleware(({ context: { isAdmin } }) => { if (!isAdmin) throw notFound(); @@ -1099,7 +1099,7 @@ export const adminReportRoute = createRoute({ export const adminLogRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/log', + path: '/nicolium/admin/log', component: ModerationLog, beforeLoad: requireAuthMiddleware(({ context: { isAdmin } }) => { if (!isAdmin) throw notFound(); @@ -1108,7 +1108,7 @@ export const adminLogRoute = createRoute({ export const adminUsersRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/users', + path: '/nicolium/admin/users', component: UserIndex, validateSearch: v.object({ q: v.optional(v.string()), @@ -1120,7 +1120,7 @@ export const adminUsersRoute = createRoute({ export const adminThemeRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/theme', + path: '/nicolium/admin/theme', component: ThemeEditor, beforeLoad: requireAuthMiddleware(({ context: { isAdmin } }) => { if (!isAdmin) throw notFound(); @@ -1129,7 +1129,7 @@ export const adminThemeRoute = createRoute({ export const adminRelaysRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/relays', + path: '/nicolium/admin/relays', component: Relays, beforeLoad: requireAuthMiddleware(({ context: { isAdmin } }) => { if (!isAdmin) throw notFound(); @@ -1138,7 +1138,7 @@ export const adminRelaysRoute = createRoute({ export const adminAnnouncementsRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/announcements', + path: '/nicolium/admin/announcements', component: Announcements, beforeLoad: requireAuthMiddleware(({ context: { features, isAdmin } }) => { if (!isAdmin || !features.announcements) throw notFound(); @@ -1147,7 +1147,7 @@ export const adminAnnouncementsRoute = createRoute({ export const adminDomainsRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/domains', + path: '/nicolium/admin/domains', component: Domains, beforeLoad: requireAuthMiddleware(({ context: { features, isAdmin } }) => { if (!isAdmin || !features.domains) throw notFound(); @@ -1156,7 +1156,7 @@ export const adminDomainsRoute = createRoute({ export const adminRulesRoute = createRoute({ getParentRoute: () => layouts.admin, - path: '/pl-fe/admin/rules', + path: '/nicolium/admin/rules', component: Rules, beforeLoad: requireAuthMiddleware(({ context: { features, isAdmin } }) => { if (!isAdmin || !features.adminRules) throw notFound(); @@ -1259,6 +1259,15 @@ export const federationRestrictionsRoute = createRoute({ }); // Redirect routes +const redirectPlFeRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/pl-fe/$', + beforeLoad: ({ params }) => { + throw redirect({ + to: ('/nicolium/' + ((params as any)._splat ?? '')) as '/', + }); + }, +}); const redirectTagRoute = createRoute({ getParentRoute: () => rootRoute, path: '/tag/$id', @@ -1329,7 +1338,9 @@ const redirectWithRepliesRoute = createRoute({ ); }, }); + const redirectRoutes = [ + redirectPlFeRoute, createRoute({ getParentRoute: () => rootRoute, path: '/timelines/home', @@ -1378,7 +1389,7 @@ const redirectRoutes = [ createRoute({ getParentRoute: () => rootRoute, path: '/admin', - component: () => , + component: () => , }), createRoute({ getParentRoute: () => rootRoute, diff --git a/packages/nicolium/src/instance/pl-fe.example.json b/packages/nicolium/src/instance/nicolium.example.json similarity index 100% rename from packages/nicolium/src/instance/pl-fe.example.json rename to packages/nicolium/src/instance/nicolium.example.json diff --git a/packages/nicolium/src/pages/dashboard/dashboard.tsx b/packages/nicolium/src/pages/dashboard/dashboard.tsx index 7d89e6414..e97d64bc5 100644 --- a/packages/nicolium/src/pages/dashboard/dashboard.tsx +++ b/packages/nicolium/src/pages/dashboard/dashboard.tsx @@ -60,12 +60,12 @@ const Dashboard: React.FC = () => { measure='new_users' startAt={monthAgo} endAt={today} - to='/pl-fe/admin/users' + to='/nicolium/admin/users' label={} /> ) : ( { measure='opened_reports' startAt={monthAgo} endAt={today} - to='/pl-fe/admin/reports' + to='/nicolium/admin/reports' label={ { measure='resolved_reports' startAt={monthAgo} endAt={today} - to='/pl-fe/admin/reports' + to='/nicolium/admin/reports' search={{ resolved: true }} label={ { { /> { /> } /> - {/* 0 }} />} /> - 0 }} />} /> */} + {/* 0 }} />} /> + 0 }} />} /> */} {features.mastodonAdminMetrics && ( <> @@ -268,7 +268,7 @@ const Dashboard: React.FC = () => { {features.pleromaAdminAccounts && account.is_admin && ( { {features.pleromaAdminModerationLog && ( { {features.pleromaAdminAnnouncements && ( } @@ -301,14 +301,14 @@ const Dashboard: React.FC = () => { {features.adminRules && ( } /> )} {features.domains && ( } /> )} diff --git a/packages/nicolium/src/pages/dashboard/frontend-config.tsx b/packages/nicolium/src/pages/dashboard/frontend-config.tsx index 3029b7fd3..a8cc97236 100644 --- a/packages/nicolium/src/pages/dashboard/frontend-config.tsx +++ b/packages/nicolium/src/pages/dashboard/frontend-config.tsx @@ -271,7 +271,7 @@ const FrontendConfigEditor: React.FC = () => { defaultMessage='Edit theme' /> } - to='/pl-fe/admin/theme' + to='/nicolium/admin/theme' /> diff --git a/packages/nicolium/src/pages/dashboard/report.tsx b/packages/nicolium/src/pages/dashboard/report.tsx index c4fe66734..eb26c7efc 100644 --- a/packages/nicolium/src/pages/dashboard/report.tsx +++ b/packages/nicolium/src/pages/dashboard/report.tsx @@ -214,7 +214,7 @@ const ReportPage: React.FC = () => { @{report.account.acct} @@ -262,7 +262,7 @@ const ReportPage: React.FC = () => { @{report.assigned_account.acct} @@ -320,7 +320,7 @@ const ReportPage: React.FC = () => { )} } - to='/pl-fe/admin/accounts/$accountId' + to='/nicolium/admin/accounts/$accountId' params={{ accountId: report.target_account_id }} />