pl-fe: move around more files

Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>

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'));

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 = () => (

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<ILogItem> = ({ log }) => (
   </Stack>
 );
 
-export { ModerationLog as default };
+export { ModerationLogPage as default };

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' },

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 };

packages/pl-fe/src/pages/dashboard/rules.tsx

@@ -72,7 +72,7 @@ const Rule: React.FC<IRule> = ({ 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 };

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 };

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 };

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<IFilterField> = ({ value, onChange }) =>
   );
 };
 
-const EditFilter: React.FC<IEditFilter> = ({ params }) => {
+const EditFilterPage: React.FC<IEditFilter> = ({ params }) => {
   const intl = useIntl();
   const history = useHistory();
   const dispatch = useAppDispatch();
@@ -289,4 +288,4 @@ const EditFilter: React.FC<IEditFilter> = ({ params }) => {
   );
 };
 
-export { EditFilter as default };
+export { EditFilterPage as default };

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 };

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 = () => (
   <MissingIndicator />
 );
 
-export { GenericNotFound as default };
+export { GenericNotFoundPage as default };