From 4f45c76ece17d4c55c804ab71659b36d42214a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicole=20Miko=C5=82ajczyk?= Date: Sat, 3 May 2025 12:21:45 +0200 Subject: [PATCH] pl-fe: move around more files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicole Mikołajczyk --- .../src/features/ui/util/async-components.ts | 20 +++++++++---------- .../auth/external-login.tsx} | 3 +-- .../dashboard}/moderation-log.tsx | 4 ++-- .../dashboard/pl-fe-config.tsx} | 6 +++--- .../admin => pages/dashboard}/relays.tsx | 4 ++-- .../admin => pages/dashboard}/rules.tsx | 4 ++-- .../settings/delete-account.tsx} | 4 ++-- .../settings/domain-blocks.tsx} | 4 ++-- .../settings}/edit-filter.tsx | 7 +++---- .../filters => pages/settings}/index.tsx | 4 ++-- .../utils/generic-not-found.tsx} | 4 ++-- 11 files changed, 31 insertions(+), 33 deletions(-) rename packages/pl-fe/src/{features/external-login/index.tsx => pages/auth/external-login.tsx} (80%) rename packages/pl-fe/src/{features/admin => pages/dashboard}/moderation-log.tsx (96%) rename packages/pl-fe/src/{features/pl-fe-config/index.tsx => pages/dashboard/pl-fe-config.tsx} (98%) rename packages/pl-fe/src/{features/admin => pages/dashboard}/relays.tsx (98%) rename packages/pl-fe/src/{features/admin => pages/dashboard}/rules.tsx (98%) rename packages/pl-fe/src/{features/delete-account/index.tsx => pages/settings/delete-account.tsx} (98%) rename packages/pl-fe/src/{features/domain-blocks/index.tsx => pages/settings/domain-blocks.tsx} (94%) rename packages/pl-fe/src/{features/filters => pages/settings}/edit-filter.tsx (98%) rename packages/pl-fe/src/{features/filters => pages/settings}/index.tsx (98%) rename packages/pl-fe/src/{features/generic-not-found/index.tsx => pages/utils/generic-not-found.tsx} (60%) 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 91f0d9c52..308ce5832 100644 --- a/packages/pl-fe/src/features/ui/util/async-components.ts +++ b/packages/pl-fe/src/features/ui/util/async-components.ts @@ -22,14 +22,14 @@ export const Conversations = lazy(() => import('pl-fe/pages/status-lists/convers export const CreateApp = lazy(() => import('pl-fe/pages/developers/create-app')); export const CryptoDonate = lazy(() => import('pl-fe/features/crypto-donate')); export const Dashboard = lazy(() => import('pl-fe/pages/dashboard/dashboard')); -export const DeleteAccount = lazy(() => import('pl-fe/features/delete-account')); +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/features/directory')); -export const DomainBlocks = lazy(() => import('pl-fe/features/domain-blocks')); +export const DomainBlocks = lazy(() => import('pl-fe/pages/settings/domain-blocks')); export const Domains = lazy(() => import('pl-fe/features/admin/domains')); export const DraftStatuses = lazy(() => import('pl-fe/features/draft-statuses')); export const EditEmail = lazy(() => import('pl-fe/pages/settings/edit-email')); -export const EditFilter = lazy(() => import('pl-fe/features/filters/edit-filter')); +export const EditFilter = lazy(() => import('pl-fe/pages/settings/edit-filter')); export const EditGroup = lazy(() => import('pl-fe/features/group/edit-group')); export const EditPassword = lazy(() => import('pl-fe/pages/settings/edit-password')); export const EditProfile = lazy(() => import('pl-fe/pages/settings/edit-profile')); @@ -37,16 +37,16 @@ export const EventDiscussion = lazy(() => import('pl-fe/features/event/event-dis export const EventInformation = lazy(() => import('pl-fe/features/event/event-information')); export const Events = lazy(() => import('pl-fe/features/events')); export const ExportData = lazy(() => import('pl-fe/pages/settings/export-data')); -export const ExternalLogin = lazy(() => import('pl-fe/features/external-login')); +export const ExternalLogin = lazy(() => import('pl-fe/pages/auth/external-login')); export const FavouritedStatuses = lazy(() => import('pl-fe/pages/status-lists/favourited-statuses')); export const FederationRestrictions = lazy(() => import('pl-fe/features/federation-restrictions')); -export const Filters = lazy(() => import('pl-fe/features/filters')); +export const Filters = lazy(() => import('pl-fe/pages/settings')); export const FollowedTags = lazy(() => import('pl-fe/features/followed-tags')); export const Followers = lazy(() => import('pl-fe/features/followers')); export const Following = lazy(() => import('pl-fe/features/following')); export const FollowRecommendations = lazy(() => import('pl-fe/features/follow-recommendations')); export const FollowRequests = lazy(() => import('pl-fe/features/follow-requests')); -export const GenericNotFound = lazy(() => import('pl-fe/features/generic-not-found')); +export const GenericNotFound = lazy(() => import('pl-fe/pages/utils/generic-not-found')); export const GroupBlockedMembers = lazy(() => import('pl-fe/features/group/group-blocked-members')); export const GroupGallery = lazy(() => import('pl-fe/features/group/group-gallery')); export const GroupMembers = lazy(() => import('pl-fe/features/group/group-members')); @@ -68,21 +68,21 @@ export const LogoutPage = lazy(() => import('pl-fe/pages/auth/logout')); export const ManageGroup = lazy(() => import('pl-fe/features/group/manage-group')); export const MediaGallery = lazy(() => import('pl-fe/components/media-gallery')); export const Migration = lazy(() => import('pl-fe/pages/settings/migration')); -export const ModerationLog = lazy(() => import('pl-fe/features/admin/moderation-log')); +export const ModerationLog = lazy(() => import('pl-fe/pages/dashboard/moderation-log')); export const Mutes = lazy(() => import('pl-fe/pages/settings/mutes')); export const NewStatus = lazy(() => import('pl-fe/pages/utils/new-status')); export const Notifications = lazy(() => import('pl-fe/features/notifications')); export const OutgoingFollowRequests = lazy(() => import('pl-fe/features/follow-requests/components/outgoing-follow-requests')); export const PasswordReset = lazy(() => import('pl-fe/pages/auth/password-reset')); export const PinnedStatuses = lazy(() => import('pl-fe/pages/status-lists/pinned-statuses')); -export const PlFeConfig = lazy(() => import('pl-fe/features/pl-fe-config')); +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 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/features/admin/relays')); +export const Relays = lazy(() => import('pl-fe/pages/dashboard/relays')); export const RemoteTimeline = lazy(() => import('pl-fe/pages/timelines/remote-timeline')); -export const Rules = lazy(() => import('pl-fe/features/admin/rules')); +export const Rules = lazy(() => import('pl-fe/pages/dashboard/rules')); export const ScheduledStatuses = lazy(() => import('pl-fe/features/scheduled-statuses')); export const Search = lazy(() => import('pl-fe/features/search')); export const ServerInfo = lazy(() => import('pl-fe/features/server-info')); diff --git a/packages/pl-fe/src/features/external-login/index.tsx b/packages/pl-fe/src/pages/auth/external-login.tsx similarity index 80% rename from packages/pl-fe/src/features/external-login/index.tsx rename to packages/pl-fe/src/pages/auth/external-login.tsx index 3d0a26eb9..deaa122a0 100644 --- a/packages/pl-fe/src/features/external-login/index.tsx +++ b/packages/pl-fe/src/pages/auth/external-login.tsx @@ -2,8 +2,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import { BigCard } from 'pl-fe/components/big-card'; - -import ExternalLoginForm from './components/external-login-form'; +import ExternalLoginForm from 'pl-fe/features/external-login/components/external-login-form'; /** Page for logging into a remote instance */ const ExternalLoginPage: React.FC = () => ( diff --git a/packages/pl-fe/src/features/admin/moderation-log.tsx b/packages/pl-fe/src/pages/dashboard/moderation-log.tsx similarity index 96% rename from packages/pl-fe/src/features/admin/moderation-log.tsx rename to packages/pl-fe/src/pages/dashboard/moderation-log.tsx index 77b10a631..ab244f4c2 100644 --- a/packages/pl-fe/src/features/admin/moderation-log.tsx +++ b/packages/pl-fe/src/pages/dashboard/moderation-log.tsx @@ -14,7 +14,7 @@ const messages = defineMessages({ emptyMessage: { id: 'admin.moderation_log.empty_message', defaultMessage: 'You have not performed any moderation actions yet. When you do, a history will be shown here.' }, }); -const ModerationLog = () => { +const ModerationLogPage = () => { const intl = useIntl(); const { @@ -71,4 +71,4 @@ const LogItem: React.FC = ({ log }) => ( ); -export { ModerationLog as default }; +export { ModerationLogPage as default }; diff --git a/packages/pl-fe/src/features/pl-fe-config/index.tsx b/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx similarity index 98% rename from packages/pl-fe/src/features/pl-fe-config/index.tsx rename to packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx index 7da9e4808..60a438369 100644 --- a/packages/pl-fe/src/features/pl-fe-config/index.tsx +++ b/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx @@ -19,6 +19,9 @@ import Select from 'pl-fe/components/ui/select'; import Streamfield from 'pl-fe/components/ui/streamfield'; import Textarea from 'pl-fe/components/ui/textarea'; import Toggle from 'pl-fe/components/ui/toggle'; +import CryptoAddressInput from 'pl-fe/features/pl-fe-config/components/crypto-address-input'; +import FooterLinkInput from 'pl-fe/features/pl-fe-config/components/footer-link-input'; +import PromoPanelInput from 'pl-fe/features/pl-fe-config/components/promo-panel-input'; import ThemeSelector from 'pl-fe/features/ui/components/theme-selector'; import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; @@ -26,9 +29,6 @@ import { useFeatures } from 'pl-fe/hooks/use-features'; import { cryptoAddressSchema, footerItemSchema, plFeConfigSchema, promoPanelItemSchema, type PlFeConfig } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; import toast from 'pl-fe/toast'; -import CryptoAddressInput from './components/crypto-address-input'; -import FooterLinkInput from './components/footer-link-input'; -import PromoPanelInput from './components/promo-panel-input'; const messages = defineMessages({ heading: { id: 'column.plfe_config', defaultMessage: 'Front-end configuration' }, diff --git a/packages/pl-fe/src/features/admin/relays.tsx b/packages/pl-fe/src/pages/dashboard/relays.tsx similarity index 98% rename from packages/pl-fe/src/features/admin/relays.tsx rename to packages/pl-fe/src/pages/dashboard/relays.tsx index f33fce36c..f4a3dcba2 100644 --- a/packages/pl-fe/src/features/admin/relays.tsx +++ b/packages/pl-fe/src/pages/dashboard/relays.tsx @@ -112,7 +112,7 @@ const NewRelayForm: React.FC = () => { ); }; -const Relays: React.FC = () => { +const RelaysPage: React.FC = () => { const intl = useIntl(); const { data: relays, isFetching } = useRelays(); @@ -142,4 +142,4 @@ const Relays: React.FC = () => { ); }; -export { Relays as default }; +export { RelaysPage as default }; diff --git a/packages/pl-fe/src/features/admin/rules.tsx b/packages/pl-fe/src/pages/dashboard/rules.tsx similarity index 98% rename from packages/pl-fe/src/features/admin/rules.tsx rename to packages/pl-fe/src/pages/dashboard/rules.tsx index 0554949a8..cc1f8da02 100644 --- a/packages/pl-fe/src/features/admin/rules.tsx +++ b/packages/pl-fe/src/pages/dashboard/rules.tsx @@ -72,7 +72,7 @@ const Rule: React.FC = ({ rule }) => { ); }; -const Rules: React.FC = () => { +const RulesPage: React.FC = () => { const intl = useIntl(); const { openModal } = useModalsStore(); @@ -112,4 +112,4 @@ const Rules: React.FC = () => { ); }; -export { Rules as default }; +export { RulesPage as default }; diff --git a/packages/pl-fe/src/features/delete-account/index.tsx b/packages/pl-fe/src/pages/settings/delete-account.tsx similarity index 98% rename from packages/pl-fe/src/features/delete-account/index.tsx rename to packages/pl-fe/src/pages/settings/delete-account.tsx index 236359f0d..ac6871804 100644 --- a/packages/pl-fe/src/features/delete-account/index.tsx +++ b/packages/pl-fe/src/pages/settings/delete-account.tsx @@ -22,7 +22,7 @@ const messages = defineMessages({ deleteAccountFail: { id: 'security.delete_account.fail', defaultMessage: 'Account deletion failed.' }, }); -const DeleteAccount = () => { +const DeleteAccountPage = () => { const intl = useIntl(); const dispatch = useAppDispatch(); const features = useFeatures(); @@ -92,4 +92,4 @@ const DeleteAccount = () => { ); }; -export { DeleteAccount as default }; +export { DeleteAccountPage as default }; diff --git a/packages/pl-fe/src/features/domain-blocks/index.tsx b/packages/pl-fe/src/pages/settings/domain-blocks.tsx similarity index 94% rename from packages/pl-fe/src/features/domain-blocks/index.tsx rename to packages/pl-fe/src/pages/settings/domain-blocks.tsx index b2d3ff4b6..a20560849 100644 --- a/packages/pl-fe/src/features/domain-blocks/index.tsx +++ b/packages/pl-fe/src/pages/settings/domain-blocks.tsx @@ -13,7 +13,7 @@ const messages = defineMessages({ unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' }, }); -const DomainBlocks: React.FC = () => { +const DomainBlocksPage: React.FC = () => { const intl = useIntl(); const { data: domains, hasNextPage, fetchNextPage } = useInfiniteQuery(domainBlocksQueryOptions); @@ -51,4 +51,4 @@ const DomainBlocks: React.FC = () => { ); }; -export { DomainBlocks as default }; +export { DomainBlocksPage as default }; diff --git a/packages/pl-fe/src/features/filters/edit-filter.tsx b/packages/pl-fe/src/pages/settings/edit-filter.tsx similarity index 98% rename from packages/pl-fe/src/features/filters/edit-filter.tsx rename to packages/pl-fe/src/pages/settings/edit-filter.tsx index 72c24c442..d590903f0 100644 --- a/packages/pl-fe/src/features/filters/edit-filter.tsx +++ b/packages/pl-fe/src/pages/settings/edit-filter.tsx @@ -16,12 +16,11 @@ import Stack from 'pl-fe/components/ui/stack'; import Streamfield from 'pl-fe/components/ui/streamfield'; import Text from 'pl-fe/components/ui/text'; import Toggle from 'pl-fe/components/ui/toggle'; +import { SelectDropdown } from 'pl-fe/features/forms'; import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; import { useFeatures } from 'pl-fe/hooks/use-features'; import toast from 'pl-fe/toast'; -import { SelectDropdown } from '../forms'; - import type { FilterContext } from 'pl-api'; import type { StreamfieldComponent } from 'pl-fe/components/ui/streamfield'; @@ -92,7 +91,7 @@ const FilterField: StreamfieldComponent = ({ value, onChange }) => ); }; -const EditFilter: React.FC = ({ params }) => { +const EditFilterPage: React.FC = ({ params }) => { const intl = useIntl(); const history = useHistory(); const dispatch = useAppDispatch(); @@ -289,4 +288,4 @@ const EditFilter: React.FC = ({ params }) => { ); }; -export { EditFilter as default }; +export { EditFilterPage as default }; diff --git a/packages/pl-fe/src/features/filters/index.tsx b/packages/pl-fe/src/pages/settings/index.tsx similarity index 98% rename from packages/pl-fe/src/features/filters/index.tsx rename to packages/pl-fe/src/pages/settings/index.tsx index df7bdd9aa..19616457d 100644 --- a/packages/pl-fe/src/features/filters/index.tsx +++ b/packages/pl-fe/src/pages/settings/index.tsx @@ -35,7 +35,7 @@ const contexts = { account: messages.accounts, }; -const Filters = () => { +const FiltersPage = () => { const intl = useIntl(); const dispatch = useAppDispatch(); const history = useHistory(); @@ -123,4 +123,4 @@ const Filters = () => { ); }; -export { Filters as default }; +export { FiltersPage as default }; diff --git a/packages/pl-fe/src/features/generic-not-found/index.tsx b/packages/pl-fe/src/pages/utils/generic-not-found.tsx similarity index 60% rename from packages/pl-fe/src/features/generic-not-found/index.tsx rename to packages/pl-fe/src/pages/utils/generic-not-found.tsx index 1536dab28..b63429672 100644 --- a/packages/pl-fe/src/features/generic-not-found/index.tsx +++ b/packages/pl-fe/src/pages/utils/generic-not-found.tsx @@ -2,8 +2,8 @@ import React from 'react'; import MissingIndicator from '../../components/missing-indicator'; -const GenericNotFound = () => ( +const GenericNotFoundPage = () => ( ); -export { GenericNotFound as default }; +export { GenericNotFoundPage as default };