nicolium: update dashboard paths

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>

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) && (
                 <DropdownNavigationLink
-                  to='/pl-fe/admin'
+                  to='/nicolium/admin'
                   icon={require('@phosphor-icons/core/regular/gauge.svg')}
                   text={<FormattedMessage id='column.admin.dashboard' defaultMessage='Dashboard' />}
                   onClick={closeSidebar}

packages/nicolium/src/components/navigation/sidebar-navigation.tsx

@@ -358,7 +358,7 @@ const SidebarNavigation: React.FC<ISidebarNavigation> = React.memo(({ shrink })
 
             {(account.is_admin ?? account.is_moderator) && (
               <SidebarNavigationLink
-                to='/pl-fe/admin'
+                to='/nicolium/admin'
                 icon={require('@phosphor-icons/core/regular/gauge.svg')}
                 activeIcon={require('@phosphor-icons/core/fill/gauge-fill.svg')}
                 count={dashboardCount}

packages/nicolium/src/components/statuses/status-action-bar.tsx

@@ -1258,7 +1258,7 @@ const MenuButton: React.FC<IMenuButton> = ({
 
       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'),
       });

packages/nicolium/src/features/account/components/account-menu.tsx

@@ -535,7 +535,7 @@ const AccountMenu: React.FC<IAccountMenu> = ({ 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'),
       });

packages/nicolium/src/features/admin/components/latest-accounts-panel.tsx

@@ -30,7 +30,7 @@ const LatestAccountsPanel: React.FC<ILatestAccountsPanel> = ({ limit = 5 }) => {
   const total = accountIds?.total;
 
   const handleAction = () => {
-    navigate({ to: '/pl-fe/admin/users' });
+    navigate({ to: '/nicolium/admin/users' });
   };
 
   return (

packages/nicolium/src/features/admin/components/report.tsx

@@ -26,7 +26,7 @@ const Report: React.FC<IReport> = ({ id }) => {
 
   return (
     <Link
-      to='/pl-fe/admin/reports/$reportId'
+      to='/nicolium/admin/reports/$reportId'
       params={{ reportId: id }}
       className='block rounded-lg bg-gray-100 p-4 dark:bg-primary-800'
     >
@@ -62,7 +62,7 @@ const Report: React.FC<IReport> = ({ id }) => {
               <FormattedMessage id='admin.reports.account' defaultMessage='Reported by:' />
             </Text>
             <HoverAccountWrapper accountId={account.id} element='span'>
-              <Link to='/pl-fe/admin/accounts/$accountId' params={{ accountId: account.id }}>
+              <Link to='/nicolium/admin/accounts/$accountId' params={{ accountId: account.id }}>
                 @{reporterAcct}
               </Link>
             </HoverAccountWrapper>

packages/nicolium/src/features/event/components/event-header.tsx

@@ -406,7 +406,7 @@ const EventHeader: React.FC<IEventHeader> = ({ 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'),
       });

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: () => <Navigate to='/pl-fe/admin' replace />,
+    component: () => <Navigate to='/nicolium/admin' replace />,
   }),
   createRoute({
     getParentRoute: () => rootRoute,

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={<FormattedMessage id='admin.counters.new_users' defaultMessage='new users' />}
             />
           ) : (
             <DashCounter
-              to='/pl-fe/admin/users'
+              to='/nicolium/admin/users'
               count={userCount}
               label={
                 <FormattedMessage
@@ -124,7 +124,7 @@ const Dashboard: React.FC = () => {
                 measure='opened_reports'
                 startAt={monthAgo}
                 endAt={today}
-                to='/pl-fe/admin/reports'
+                to='/nicolium/admin/reports'
                 label={
                   <FormattedMessage
                     id='admin.counters.opened_reports'
@@ -136,7 +136,7 @@ const Dashboard: React.FC = () => {
                 measure='resolved_reports'
                 startAt={monthAgo}
                 endAt={today}
-                to='/pl-fe/admin/reports'
+                to='/nicolium/admin/reports'
                 search={{ resolved: true }}
                 label={
                   <FormattedMessage
@@ -163,7 +163,7 @@ const Dashboard: React.FC = () => {
           <List>
             <ListItem
               size='sm'
-              to='/pl-fe/admin/reports'
+              to='/nicolium/admin/reports'
               search={{ resolved: false }}
               label={
                 <FormattedMessage
@@ -182,7 +182,7 @@ const Dashboard: React.FC = () => {
             />
             <ListItem
               size='sm'
-              to='/pl-fe/admin/approval'
+              to='/nicolium/admin/approval'
               label={
                 <FormattedMessage
                   id='admin.links.pending_users'
@@ -198,8 +198,8 @@ const Dashboard: React.FC = () => {
                 />
               }
             />
-            {/* <ListItem size='sm' to='/pl-fe/admin' label={<FormattedMessage id='admin.links.pending_tags' defaultMessage='{count} pending tags' values={{ count: <strong>0</strong> }} />} />
-            <ListItem size='sm' to='/pl-fe/admin' label={<FormattedMessage id='admin.links.pending_appeals' defaultMessage='{count} pending appeals' values={{ count: <strong>0</strong> }} />} /> */}
+            {/* <ListItem size='sm' to='/nicolium/admin' label={<FormattedMessage id='admin.links.pending_tags' defaultMessage='{count} pending tags' values={{ count: <strong>0</strong> }} />} />
+            <ListItem size='sm' to='/nicolium/admin' label={<FormattedMessage id='admin.links.pending_appeals' defaultMessage='{count} pending appeals' values={{ count: <strong>0</strong> }} />} /> */}
           </List>
           {features.mastodonAdminMetrics && (
             <>
@@ -268,7 +268,7 @@ const Dashboard: React.FC = () => {
         <List>
           {features.pleromaAdminAccounts && account.is_admin && (
             <ListItem
-              to='/pl-fe/config'
+              to='/nicolium/config'
               label={
                 <FormattedMessage
                   id='column.frontend_config'
@@ -280,7 +280,7 @@ const Dashboard: React.FC = () => {
 
           {features.pleromaAdminModerationLog && (
             <ListItem
-              to='/pl-fe/admin/log'
+              to='/nicolium/admin/log'
               label={
                 <FormattedMessage
                   id='column.admin.moderation_log'
@@ -292,7 +292,7 @@ const Dashboard: React.FC = () => {
 
           {features.pleromaAdminAnnouncements && (
             <ListItem
-              to='/pl-fe/admin/announcements'
+              to='/nicolium/admin/announcements'
               label={
                 <FormattedMessage id='column.admin.announcements' defaultMessage='Announcements' />
               }
@@ -301,14 +301,14 @@ const Dashboard: React.FC = () => {
 
           {features.adminRules && (
             <ListItem
-              to='/pl-fe/admin/rules'
+              to='/nicolium/admin/rules'
               label={<FormattedMessage id='column.admin.rules' defaultMessage='Instance rules' />}
             />
           )}
 
           {features.domains && (
             <ListItem
-              to='/pl-fe/admin/domains'
+              to='/nicolium/admin/domains'
               label={<FormattedMessage id='column.admin.domains' defaultMessage='Domains' />}
             />
           )}

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'
             />
           </List>
 

packages/nicolium/src/pages/dashboard/report.tsx

@@ -214,7 +214,7 @@ const ReportPage: React.FC = () => {
                 <td className='p-2.5 text-end'>
                   <Text size='sm' className='hover:underline'>
                     <Link
-                      to='/pl-fe/admin/accounts/$accountId'
+                      to='/nicolium/admin/accounts/$accountId'
                       params={{ accountId: report.account_id }}
                     >
                       @{report.account.acct}
@@ -262,7 +262,7 @@ const ReportPage: React.FC = () => {
                     <HStack space={2} alignItems='center' justifyContent='end'>
                       <Text size='sm' className='hover:underline'>
                         <Link
-                          to='/pl-fe/admin/accounts/$accountId'
+                          to='/nicolium/admin/accounts/$accountId'
                           params={{ accountId: report.assigned_account.id }}
                         >
                           @{report.assigned_account.acct}
@@ -320,7 +320,7 @@ const ReportPage: React.FC = () => {
         )}
         <ListItem
           label={<FormattedMessage id='admin.report.moderate' defaultMessage='Moderate account' />}
-          to='/pl-fe/admin/accounts/$accountId'
+          to='/nicolium/admin/accounts/$accountId'
           params={{ accountId: report.target_account_id }}
         />
       </List>