diff --git a/packages/pl-fe/src/features/ui/util/async-components.ts b/packages/pl-fe/src/features/ui/util/async-components.ts index d39375fbf..5dbd24ced 100644 --- a/packages/pl-fe/src/features/ui/util/async-components.ts +++ b/packages/pl-fe/src/features/ui/util/async-components.ts @@ -8,7 +8,7 @@ export const AdminAccount = lazy(() => import('pl-fe/pages/dashboard/account')); export const Aliases = lazy(() => import('pl-fe/pages/settings/aliases')); export const Announcements = lazy(() => import('pl-fe/pages/dashboard/announcements')); export const AuthTokenList = lazy(() => import('pl-fe/pages/settings/auth-token-list')); -export const AwaitingApproval = lazy(() => import('pl-fe/features/admin/tabs/awaiting-approval')); +export const AwaitingApproval = lazy(() => import('pl-fe/pages/dashboard/awaiting-approval')); export const Backups = lazy(() => import('pl-fe/pages/settings/backups')); export const Blocks = lazy(() => import('pl-fe/pages/settings/blocks')); export const BookmarkFolders = lazy(() => import('pl-fe/pages/status-lists/bookmark-folders')); @@ -24,7 +24,7 @@ export const EditEvent = lazy(() => import('pl-fe/pages/statuses/compose-event') export const Conversations = lazy(() => import('pl-fe/pages/status-lists/conversations')); export const CreateApp = lazy(() => import('pl-fe/pages/developers/create-app')); export const CryptoDonate = lazy(() => import('pl-fe/pages/utils/crypto-donate')); -export const Dashboard = lazy(() => import('pl-fe/features/admin/tabs/dashboard')); +export const Dashboard = lazy(() => import('pl-fe/pages/dashboard/dashboard')); export const DeleteAccount = lazy(() => import('pl-fe/pages/settings/delete-account')); export const Developers = lazy(() => import('pl-fe/pages/developers/developers')); export const Directory = lazy(() => import('pl-fe/pages/account-lists/directory')); @@ -83,7 +83,7 @@ export const PlFeConfig = lazy(() => import('pl-fe/pages/dashboard/pl-fe-config' export const PublicTimeline = lazy(() => import('pl-fe/pages/timelines/public-timeline')); export const Quotes = lazy(() => import('pl-fe/pages/status-lists/quotes')); export const Report = lazy(() => import('pl-fe/pages/dashboard/report')); -export const Reports = lazy(() => import('pl-fe/features/admin/tabs/reports')); +export const Reports = lazy(() => import('pl-fe/pages/dashboard/reports')); export const RegisterInvite = lazy(() => import('pl-fe/pages/auth/register-with-invite')); export const RegistrationPage = lazy(() => import('pl-fe/pages/auth/registration')); export const Relays = lazy(() => import('pl-fe/pages/dashboard/relays')); diff --git a/packages/pl-fe/src/features/admin/tabs/awaiting-approval.tsx b/packages/pl-fe/src/pages/dashboard/awaiting-approval.tsx similarity index 94% rename from packages/pl-fe/src/features/admin/tabs/awaiting-approval.tsx rename to packages/pl-fe/src/pages/dashboard/awaiting-approval.tsx index 87f7461c6..743fbaa3c 100644 --- a/packages/pl-fe/src/features/admin/tabs/awaiting-approval.tsx +++ b/packages/pl-fe/src/pages/dashboard/awaiting-approval.tsx @@ -3,10 +3,9 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import ScrollableList from 'pl-fe/components/scrollable-list'; import Column from 'pl-fe/components/ui/column'; +import UnapprovedAccount from 'pl-fe/features/admin/components/unapproved-account'; import { useAdminAccounts } from 'pl-fe/queries/admin/use-accounts'; -import UnapprovedAccount from '../components/unapproved-account'; - const messages = defineMessages({ heading: { id: 'column.admin.awaiting_approval', defaultMessage: 'Awaiting approval' }, }); diff --git a/packages/pl-fe/src/features/admin/tabs/dashboard.tsx b/packages/pl-fe/src/pages/dashboard/dashboard.tsx similarity index 96% rename from packages/pl-fe/src/features/admin/tabs/dashboard.tsx rename to packages/pl-fe/src/pages/dashboard/dashboard.tsx index c625de278..9be025c7b 100644 --- a/packages/pl-fe/src/features/admin/tabs/dashboard.tsx +++ b/packages/pl-fe/src/pages/dashboard/dashboard.tsx @@ -6,6 +6,11 @@ import { CardTitle } from 'pl-fe/components/ui/card'; import Column from 'pl-fe/components/ui/column'; import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; +import { Counter } from 'pl-fe/features/admin/components/counter'; +import { DashCounter, DashCounters } from 'pl-fe/features/admin/components/dashcounter'; +import { Dimension } from 'pl-fe/features/admin/components/dimension'; +import RegistrationModePicker from 'pl-fe/features/admin/components/registration-mode-picker'; +import { Retention } from 'pl-fe/features/admin/components/retention'; import { useFeatures } from 'pl-fe/hooks/use-features'; import { useInstance } from 'pl-fe/hooks/use-instance'; import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; @@ -13,12 +18,6 @@ import { usePendingUsersCount } from 'pl-fe/queries/admin/use-accounts'; import { usePendingReportsCount } from 'pl-fe/queries/admin/use-reports'; import sourceCode from 'pl-fe/utils/code'; -import { Counter } from '../components/counter'; -import { DashCounter, DashCounters } from '../components/dashcounter'; -import { Dimension } from '../components/dimension'; -import RegistrationModePicker from '../components/registration-mode-picker'; -import { Retention } from '../components/retention'; - const messages = defineMessages({ heading: { id: 'column.admin.dashboard', defaultMessage: 'Dashboard' }, }); diff --git a/packages/pl-fe/src/features/admin/tabs/reports.tsx b/packages/pl-fe/src/pages/dashboard/reports.tsx similarity index 98% rename from packages/pl-fe/src/features/admin/tabs/reports.tsx rename to packages/pl-fe/src/pages/dashboard/reports.tsx index 3e032ea08..7bb674b83 100644 --- a/packages/pl-fe/src/features/admin/tabs/reports.tsx +++ b/packages/pl-fe/src/pages/dashboard/reports.tsx @@ -8,11 +8,10 @@ import Column from 'pl-fe/components/ui/column'; import HStack from 'pl-fe/components/ui/hstack'; import IconButton from 'pl-fe/components/ui/icon-button'; import Text from 'pl-fe/components/ui/text'; +import Report from 'pl-fe/features/admin/components/report'; import { adminReportsRoute } from 'pl-fe/features/ui/router'; import { useReports } from 'pl-fe/queries/admin/use-reports'; -import Report from '../components/report'; - const messages = defineMessages({ heading: { id: 'column.admin.reports', defaultMessage: 'Reports' }, });