diff --git a/.vscode/pl-fe.code-snippets b/.vscode/pl-fe.code-snippets index 6fa3f098f..9bc4b1bc2 100644 --- a/.vscode/pl-fe.code-snippets +++ b/.vscode/pl-fe.code-snippets @@ -41,7 +41,7 @@ "body": [ "import React from 'react';", "", - "import { render, screen } from 'pl-fe/jest/test-helpers';", + "import { render, screen } from '@/jest/test-helpers';", "", "import ${1:Component} from '${2:..}';", "", diff --git a/packages/pl-fe/src/actions/accounts.test.ts b/packages/pl-fe/src/actions/accounts.test.ts index 2128d76d9..56db8af9a 100644 --- a/packages/pl-fe/src/actions/accounts.test.ts +++ b/packages/pl-fe/src/actions/accounts.test.ts @@ -1,8 +1,8 @@ import { Map as ImmutableMap } from 'immutable'; -import { __stub } from 'pl-fe/api'; -import { buildInstance, buildRelationship } from 'pl-fe/jest/factory'; -import { mockStore, rootState } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { buildInstance, buildRelationship } from '@/jest/factory'; +import { mockStore, rootState } from '@/jest/test-helpers'; import { createAccount, @@ -85,7 +85,7 @@ describe('fetchAccount()', () => { }); describe('with a successful API request', async () => { - const account = await import('pl-fe/__fixtures__/pleroma-account.json'); + const account = await import('@/__fixtures__/pleroma-account.json'); beforeEach(() => { const state = rootState; diff --git a/packages/pl-fe/src/actions/accounts.ts b/packages/pl-fe/src/actions/accounts.ts index 99a67525e..e5d82eac2 100644 --- a/packages/pl-fe/src/actions/accounts.ts +++ b/packages/pl-fe/src/actions/accounts.ts @@ -1,16 +1,16 @@ import { type CreateAccountParams, type Relationship } from 'pl-api'; -import { batcher } from 'pl-fe/api/batcher'; -import { queryClient } from 'pl-fe/queries/client'; -import { selectAccount } from 'pl-fe/selectors'; -import { isLoggedIn } from 'pl-fe/utils/auth'; +import { batcher } from '@/api/batcher'; +import { queryClient } from '@/queries/client'; +import { selectAccount } from '@/selectors'; +import { isLoggedIn } from '@/utils/auth'; import { getClient } from '../api'; import { importEntities } from './importer'; -import type { MinifiedStatus } from 'pl-fe/reducers/statuses'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { MinifiedStatus } from '@/reducers/statuses'; +import type { AppDispatch, RootState } from '@/store'; const ACCOUNT_BLOCK_SUCCESS = 'ACCOUNT_BLOCK_SUCCESS' as const; const ACCOUNT_MUTE_SUCCESS = 'ACCOUNT_MUTE_SUCCESS' as const; diff --git a/packages/pl-fe/src/actions/admin.ts b/packages/pl-fe/src/actions/admin.ts index 39f0e0184..c25c856a1 100644 --- a/packages/pl-fe/src/actions/admin.ts +++ b/packages/pl-fe/src/actions/admin.ts @@ -1,7 +1,7 @@ -import { importEntities } from 'pl-fe/actions/importer'; -import { queryClient } from 'pl-fe/queries/client'; -import { useModalsStore } from 'pl-fe/stores/modals'; -import { filterBadges, getTagDiff } from 'pl-fe/utils/badges'; +import { importEntities } from '@/actions/importer'; +import { queryClient } from '@/queries/client'; +import { useModalsStore } from '@/stores/modals'; +import { filterBadges, getTagDiff } from '@/utils/badges'; import { getClient } from '../api'; @@ -9,8 +9,8 @@ import { setComposeToStatus } from './compose'; import { STATUS_FETCH_SOURCE_FAIL, type StatusesAction } from './statuses'; import { deleteFromTimelines } from './timelines'; +import type { AppDispatch, RootState } from '@/store'; import type { PleromaConfig, Poll } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const ADMIN_CONFIG_FETCH_SUCCESS = 'ADMIN_CONFIG_FETCH_SUCCESS' as const; diff --git a/packages/pl-fe/src/actions/apps.ts b/packages/pl-fe/src/actions/apps.ts index 25264b910..44402bf6e 100644 --- a/packages/pl-fe/src/actions/apps.ts +++ b/packages/pl-fe/src/actions/apps.ts @@ -8,7 +8,7 @@ import { PlApiClient, type CreateApplicationParams } from 'pl-api'; -import * as BuildConfig from 'pl-fe/build-config'; +import * as BuildConfig from '@/build-config'; const createApp = (params: CreateApplicationParams, baseURL?: string) => { const client = new PlApiClient(baseURL || BuildConfig.BACKEND_URL || ''); diff --git a/packages/pl-fe/src/actions/auth.ts b/packages/pl-fe/src/actions/auth.ts index f247fc097..8a3e4aa40 100644 --- a/packages/pl-fe/src/actions/auth.ts +++ b/packages/pl-fe/src/actions/auth.ts @@ -18,27 +18,27 @@ import { import { defineMessages } from 'react-intl'; import * as v from 'valibot'; -import { createAccount } from 'pl-fe/actions/accounts'; -import { createApp } from 'pl-fe/actions/apps'; -import { fetchMeSuccess, fetchMeFail } from 'pl-fe/actions/me'; -import { obtainOAuthToken, revokeOAuthToken } from 'pl-fe/actions/oauth'; -import * as BuildConfig from 'pl-fe/build-config'; -import { queryClient } from 'pl-fe/queries/client'; -import { selectAccount } from 'pl-fe/selectors'; -import { unsetSentryAccount } from 'pl-fe/sentry'; -import KVStore from 'pl-fe/storage/kv-store'; -import toast from 'pl-fe/toast'; -import { getLoggedInAccount, parseBaseURL } from 'pl-fe/utils/auth'; -import sourceCode from 'pl-fe/utils/code'; -import { normalizeUsername } from 'pl-fe/utils/input'; -import { getScopes } from 'pl-fe/utils/scopes'; -import { isStandalone } from 'pl-fe/utils/state'; +import { createAccount } from '@/actions/accounts'; +import { createApp } from '@/actions/apps'; +import { fetchMeSuccess, fetchMeFail } from '@/actions/me'; +import { obtainOAuthToken, revokeOAuthToken } from '@/actions/oauth'; +import * as BuildConfig from '@/build-config'; +import { queryClient } from '@/queries/client'; +import { selectAccount } from '@/selectors'; +import { unsetSentryAccount } from '@/sentry'; +import KVStore from '@/storage/kv-store'; +import toast from '@/toast'; +import { getLoggedInAccount, parseBaseURL } from '@/utils/auth'; +import sourceCode from '@/utils/code'; +import { normalizeUsername } from '@/utils/input'; +import { getScopes } from '@/utils/scopes'; +import { isStandalone } from '@/utils/state'; import { type PlfeResponse, getClient } from '../api'; import { importEntities } from './importer'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT' as const; diff --git a/packages/pl-fe/src/actions/chats.ts b/packages/pl-fe/src/actions/chats.ts index 364f65be7..c0aed4191 100644 --- a/packages/pl-fe/src/actions/chats.ts +++ b/packages/pl-fe/src/actions/chats.ts @@ -1,7 +1,7 @@ -import { changeSetting } from 'pl-fe/actions/settings'; -import { useSettingsStore } from 'pl-fe/stores/settings'; +import { changeSetting } from '@/actions/settings'; +import { useSettingsStore } from '@/stores/settings'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const toggleChatPane = () => (dispatch: AppDispatch, getState: () => RootState) => { diff --git a/packages/pl-fe/src/actions/circle.ts b/packages/pl-fe/src/actions/circle.ts index fdc999153..ae96a1b74 100644 --- a/packages/pl-fe/src/actions/circle.ts +++ b/packages/pl-fe/src/actions/circle.ts @@ -1,9 +1,9 @@ // Loosely adapted from twitter-interaction-circles, licensed under MIT License // https://github.com/duiker101/twitter-interaction-circles -import { getClient } from 'pl-fe/api'; +import { getClient } from '@/api'; +import type { AppDispatch, RootState } from '@/store'; import type { PaginatedResponse, Status } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; interface Interaction { acct: string; diff --git a/packages/pl-fe/src/actions/compose.test.ts b/packages/pl-fe/src/actions/compose.test.ts index cf9b58c59..b7d905fe3 100644 --- a/packages/pl-fe/src/actions/compose.test.ts +++ b/packages/pl-fe/src/actions/compose.test.ts @@ -1,8 +1,8 @@ import { OrderedSet as ImmutableOrderedSet } from 'immutable'; -import { buildInstance } from 'pl-fe/jest/factory'; -import { mockStore, rootState } from 'pl-fe/jest/test-helpers'; -import { ReducerCompose } from 'pl-fe/reducers/compose'; +import { buildInstance } from '@/jest/factory'; +import { mockStore, rootState } from '@/jest/test-helpers'; +import { ReducerCompose } from '@/reducers/compose'; import { uploadCompose, submitCompose } from './compose'; import { STATUS_CREATE_REQUEST } from './statuses'; diff --git a/packages/pl-fe/src/actions/compose.ts b/packages/pl-fe/src/actions/compose.ts index 1338b5edc..8bdabf44a 100644 --- a/packages/pl-fe/src/actions/compose.ts +++ b/packages/pl-fe/src/actions/compose.ts @@ -1,32 +1,32 @@ import throttle from 'lodash/throttle'; import { defineMessages, IntlShape } from 'react-intl'; -import { getClient } from 'pl-fe/api'; -import { isNativeEmoji } from 'pl-fe/features/emoji'; -import emojiSearch from 'pl-fe/features/emoji/search'; -import { Language } from 'pl-fe/features/preferences'; -import { queryClient } from 'pl-fe/queries/client'; -import { cancelDraftStatus } from 'pl-fe/queries/statuses/use-draft-statuses'; -import { selectAccount, selectOwnAccount } from 'pl-fe/selectors'; -import { useModalsStore } from 'pl-fe/stores/modals'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import toast from 'pl-fe/toast'; -import { isLoggedIn } from 'pl-fe/utils/auth'; +import { getClient } from '@/api'; +import { isNativeEmoji } from '@/features/emoji'; +import emojiSearch from '@/features/emoji/search'; +import { Language } from '@/features/preferences'; +import { queryClient } from '@/queries/client'; +import { cancelDraftStatus } from '@/queries/statuses/use-draft-statuses'; +import { selectAccount, selectOwnAccount } from '@/selectors'; +import { useModalsStore } from '@/stores/modals'; +import { useSettingsStore } from '@/stores/settings'; +import toast from '@/toast'; +import { isLoggedIn } from '@/utils/auth'; import { importEntities } from './importer'; import { uploadFile, updateMedia } from './media'; import { saveSettings } from './settings'; import { createStatus } from './statuses'; +import type { AutoSuggestion } from '@/components/autosuggest-input'; +import type { Emoji } from '@/features/emoji'; +import type { Status } from '@/normalizers/status'; +import type { Policy, Rule, Scope } from '@/pages/settings/interaction-policies'; +import type { ClearLinkSuggestion } from '@/reducers/compose'; +import type { AppDispatch, RootState } from '@/store'; import type { LinkOptions } from '@tanstack/react-router'; import type { EditorState } from 'lexical'; import type { Account, CreateStatusParams, CustomEmoji, Group, MediaAttachment, Status as BaseStatus, Tag, Poll, ScheduledStatus, InteractionPolicy, UpdateMediaParams, Location } from 'pl-api'; -import type { AutoSuggestion } from 'pl-fe/components/autosuggest-input'; -import type { Emoji } from 'pl-fe/features/emoji'; -import type { Status } from 'pl-fe/normalizers/status'; -import type { Policy, Rule, Scope } from 'pl-fe/pages/settings/interaction-policies'; -import type { ClearLinkSuggestion } from 'pl-fe/reducers/compose'; -import type { AppDispatch, RootState } from 'pl-fe/store'; let cancelFetchComposeSuggestions = new AbortController(); diff --git a/packages/pl-fe/src/actions/consumer-auth.ts b/packages/pl-fe/src/actions/consumer-auth.ts index f63d7121d..228a17326 100644 --- a/packages/pl-fe/src/actions/consumer-auth.ts +++ b/packages/pl-fe/src/actions/consumer-auth.ts @@ -1,13 +1,13 @@ import queryString from 'query-string'; -import * as BuildConfig from 'pl-fe/build-config'; -import { isURL } from 'pl-fe/utils/auth'; -import sourceCode from 'pl-fe/utils/code'; -import { getScopes } from 'pl-fe/utils/scopes'; +import * as BuildConfig from '@/build-config'; +import { isURL } from '@/utils/auth'; +import sourceCode from '@/utils/code'; +import { getScopes } from '@/utils/scopes'; import { createApp } from './apps'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const createProviderApp = () => async (dispatch: AppDispatch, getState: () => RootState) => { diff --git a/packages/pl-fe/src/actions/conversations.ts b/packages/pl-fe/src/actions/conversations.ts index d4e866a14..e0ba97a4c 100644 --- a/packages/pl-fe/src/actions/conversations.ts +++ b/packages/pl-fe/src/actions/conversations.ts @@ -1,11 +1,11 @@ -import { isLoggedIn } from 'pl-fe/utils/auth'; +import { isLoggedIn } from '@/utils/auth'; import { getClient } from '../api'; import { importEntities } from './importer'; +import type { AppDispatch, RootState } from '@/store'; import type { Account, Conversation, PaginatedResponse } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const CONVERSATIONS_MOUNT = 'CONVERSATIONS_MOUNT' as const; const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT' as const; diff --git a/packages/pl-fe/src/actions/emoji-reacts.ts b/packages/pl-fe/src/actions/emoji-reacts.ts index 97e70612c..075c20fac 100644 --- a/packages/pl-fe/src/actions/emoji-reacts.ts +++ b/packages/pl-fe/src/actions/emoji-reacts.ts @@ -1,15 +1,15 @@ import { defineMessages, IntlShape } from 'react-intl'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import toast from 'pl-fe/toast'; -import { isLoggedIn } from 'pl-fe/utils/auth'; -import { supportsEmojiReacts } from 'pl-fe/utils/check-instance-capability'; +import { useSettingsStore } from '@/stores/settings'; +import toast from '@/toast'; +import { isLoggedIn } from '@/utils/auth'; +import { supportsEmojiReacts } from '@/utils/check-instance-capability'; import { getClient } from '../api'; import { importEntities } from './importer'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const EMOJI_REACT_REQUEST = 'EMOJI_REACT_REQUEST' as const; const EMOJI_REACT_FAIL = 'EMOJI_REACT_FAIL' as const; diff --git a/packages/pl-fe/src/actions/events.ts b/packages/pl-fe/src/actions/events.ts index fe8c531fe..c19690245 100644 --- a/packages/pl-fe/src/actions/events.ts +++ b/packages/pl-fe/src/actions/events.ts @@ -1,13 +1,13 @@ import { defineMessages } from 'react-intl'; -import { getClient } from 'pl-fe/api'; -import toast from 'pl-fe/toast'; +import { getClient } from '@/api'; +import toast from '@/toast'; import { importEntities } from './importer'; import { STATUS_FETCH_SOURCE_FAIL, STATUS_FETCH_SOURCE_REQUEST, STATUS_FETCH_SOURCE_SUCCESS } from './statuses'; +import type { AppDispatch, RootState } from '@/store'; import type { CreateEventParams, Location, MediaAttachment, Status } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const EVENT_JOIN_REQUEST = 'EVENT_JOIN_REQUEST' as const; const EVENT_JOIN_FAIL = 'EVENT_JOIN_FAIL' as const; diff --git a/packages/pl-fe/src/actions/export-data.ts b/packages/pl-fe/src/actions/export-data.ts index 4a62dad52..a14e5778f 100644 --- a/packages/pl-fe/src/actions/export-data.ts +++ b/packages/pl-fe/src/actions/export-data.ts @@ -1,10 +1,10 @@ import { defineMessages } from 'react-intl'; -import { getClient } from 'pl-fe/api'; -import toast from 'pl-fe/toast'; +import { getClient } from '@/api'; +import toast from '@/toast'; +import type { AppDispatch, RootState } from '@/store'; import type { Account, PaginatedResponse } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const messages = defineMessages({ blocksSuccess: { id: 'export_data.success.blocks', defaultMessage: 'Blocks exported successfully' }, diff --git a/packages/pl-fe/src/actions/external-auth.ts b/packages/pl-fe/src/actions/external-auth.ts index e5b25130f..f800d388f 100644 --- a/packages/pl-fe/src/actions/external-auth.ts +++ b/packages/pl-fe/src/actions/external-auth.ts @@ -9,14 +9,14 @@ import { instanceSchema, PlApiClient, type Instance } from 'pl-api'; import * as v from 'valibot'; -import { createApp } from 'pl-fe/actions/apps'; -import { authLoggedIn, verifyCredentials, switchAccount } from 'pl-fe/actions/auth'; -import { obtainOAuthToken } from 'pl-fe/actions/oauth'; -import { parseBaseURL } from 'pl-fe/utils/auth'; -import sourceCode from 'pl-fe/utils/code'; -import { getInstanceScopes } from 'pl-fe/utils/scopes'; +import { createApp } from '@/actions/apps'; +import { authLoggedIn, verifyCredentials, switchAccount } from '@/actions/auth'; +import { obtainOAuthToken } from '@/actions/oauth'; +import { parseBaseURL } from '@/utils/auth'; +import sourceCode from '@/utils/code'; +import { getInstanceScopes } from '@/utils/scopes'; -import type { AppDispatch } from 'pl-fe/store'; +import type { AppDispatch } from '@/store'; const fetchExternalInstance = (baseURL: string) => (new PlApiClient(baseURL)).instance.getInstance() diff --git a/packages/pl-fe/src/actions/filters.ts b/packages/pl-fe/src/actions/filters.ts index 27b2bd11d..b6e666287 100644 --- a/packages/pl-fe/src/actions/filters.ts +++ b/packages/pl-fe/src/actions/filters.ts @@ -1,12 +1,12 @@ import { defineMessages } from 'react-intl'; -import toast from 'pl-fe/toast'; -import { isLoggedIn } from 'pl-fe/utils/auth'; +import toast from '@/toast'; +import { isLoggedIn } from '@/utils/auth'; import { getClient } from '../api'; +import type { AppDispatch, RootState } from '@/store'; import type { Filter, FilterContext } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS' as const; diff --git a/packages/pl-fe/src/actions/importer.ts b/packages/pl-fe/src/actions/importer.ts index 391c708b5..ae0274429 100644 --- a/packages/pl-fe/src/actions/importer.ts +++ b/packages/pl-fe/src/actions/importer.ts @@ -1,10 +1,10 @@ -import { importEntities as importEntityStoreEntities } from 'pl-fe/entity-store/actions'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { queryClient } from 'pl-fe/queries/client'; -import { selectAccount } from 'pl-fe/selectors'; +import { importEntities as importEntityStoreEntities } from '@/entity-store/actions'; +import { Entities } from '@/entity-store/entities'; +import { queryClient } from '@/queries/client'; +import { selectAccount } from '@/selectors'; +import type { AppDispatch, RootState } from '@/store'; import type { Account as BaseAccount, Group as BaseGroup, Poll as BasePoll, Relationship as BaseRelationship, Status as BaseStatus } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const STATUS_IMPORT = 'STATUS_IMPORT' as const; const STATUSES_IMPORT = 'STATUSES_IMPORT' as const; diff --git a/packages/pl-fe/src/actions/instance.ts b/packages/pl-fe/src/actions/instance.ts index 3570c1651..02719ce12 100644 --- a/packages/pl-fe/src/actions/instance.ts +++ b/packages/pl-fe/src/actions/instance.ts @@ -1,9 +1,9 @@ -import { getAuthUserUrl, getMeUrl } from 'pl-fe/utils/auth'; +import { getAuthUserUrl, getMeUrl } from '@/utils/auth'; import { getClient, staticFetch } from '../api'; +import type { AppDispatch, RootState } from '@/store'; import type { Instance } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const INSTANCE_FETCH_SUCCESS = 'INSTANCE_FETCH_SUCCESS' as const; const INSTANCE_FETCH_FAIL = 'INSTANCE_FETCH_FAIL' as const; diff --git a/packages/pl-fe/src/actions/markers.ts b/packages/pl-fe/src/actions/markers.ts index ce16d6a35..5f7488914 100644 --- a/packages/pl-fe/src/actions/markers.ts +++ b/packages/pl-fe/src/actions/markers.ts @@ -1,7 +1,7 @@ import { getClient } from '../api'; +import type { AppDispatch, RootState } from '@/store'; import type { Markers, SaveMarkersParams } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const MARKER_FETCH_SUCCESS = 'MARKER_FETCH_SUCCESS' as const; diff --git a/packages/pl-fe/src/actions/me.test.ts b/packages/pl-fe/src/actions/me.test.ts index ffaea1fef..3eff9cc46 100644 --- a/packages/pl-fe/src/actions/me.test.ts +++ b/packages/pl-fe/src/actions/me.test.ts @@ -1,9 +1,9 @@ import { Map as ImmutableMap } from 'immutable'; -import { __stub } from 'pl-fe/api'; -import { buildAccount } from 'pl-fe/jest/factory'; -import { mockStore, rootState } from 'pl-fe/jest/test-helpers'; -import { AuthUserRecord, ReducerRecord } from 'pl-fe/reducers/auth'; +import { __stub } from '@/api'; +import { buildAccount } from '@/jest/factory'; +import { mockStore, rootState } from '@/jest/test-helpers'; +import { AuthUserRecord, ReducerRecord } from '@/reducers/auth'; import { fetchMe, patchMe } from './me'; diff --git a/packages/pl-fe/src/actions/me.ts b/packages/pl-fe/src/actions/me.ts index b36a9548e..6a75c3947 100644 --- a/packages/pl-fe/src/actions/me.ts +++ b/packages/pl-fe/src/actions/me.ts @@ -1,8 +1,8 @@ -import { selectAccount } from 'pl-fe/selectors'; -import { setSentryAccount } from 'pl-fe/sentry'; -import KVStore from 'pl-fe/storage/kv-store'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import { getAuthUserId, getAuthUserUrl } from 'pl-fe/utils/auth'; +import { selectAccount } from '@/selectors'; +import { setSentryAccount } from '@/sentry'; +import KVStore from '@/storage/kv-store'; +import { useSettingsStore } from '@/stores/settings'; +import { getAuthUserId, getAuthUserUrl } from '@/utils/auth'; import { getClient } from '../api'; @@ -10,8 +10,8 @@ import { loadCredentials } from './auth'; import { importEntities } from './importer'; import { FE_NAME } from './settings'; +import type { AppDispatch, RootState } from '@/store'; import type { CredentialAccount, UpdateCredentialsParams } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const ME_FETCH_SUCCESS = 'ME_FETCH_SUCCESS' as const; const ME_FETCH_FAIL = 'ME_FETCH_FAIL' as const; diff --git a/packages/pl-fe/src/actions/media.ts b/packages/pl-fe/src/actions/media.ts index 7cc944848..cee85992d 100644 --- a/packages/pl-fe/src/actions/media.ts +++ b/packages/pl-fe/src/actions/media.ts @@ -1,15 +1,15 @@ import { defineMessages, type IntlShape } from 'react-intl'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import toast from 'pl-fe/toast'; -import { isLoggedIn } from 'pl-fe/utils/auth'; -import { formatBytes, getVideoDuration } from 'pl-fe/utils/media'; -import resizeImage from 'pl-fe/utils/resize-image'; +import { useSettingsStore } from '@/stores/settings'; +import toast from '@/toast'; +import { isLoggedIn } from '@/utils/auth'; +import { formatBytes, getVideoDuration } from '@/utils/media'; +import resizeImage from '@/utils/resize-image'; import { getClient } from '../api'; +import type { AppDispatch, RootState } from '@/store'; import type { MediaAttachment, UpdateMediaParams, UploadMediaParams } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const messages = defineMessages({ exceededImageSizeLimit: { id: 'upload_error.image_size_limit', defaultMessage: 'Image exceeds the current file size limit ({limit})' }, diff --git a/packages/pl-fe/src/actions/moderation.tsx b/packages/pl-fe/src/actions/moderation.tsx index a129fca31..97ffc8504 100644 --- a/packages/pl-fe/src/actions/moderation.tsx +++ b/packages/pl-fe/src/actions/moderation.tsx @@ -1,17 +1,17 @@ import React from 'react'; import { defineMessages, FormattedMessage, IntlShape } from 'react-intl'; -import { fetchAccountByUsername } from 'pl-fe/actions/accounts'; -import { deactivateUser, deleteUser, deleteStatus, toggleStatusSensitivity } from 'pl-fe/actions/admin'; -import OutlineBox from 'pl-fe/components/outline-box'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { selectAccount } from 'pl-fe/selectors'; -import { useModalsStore } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { fetchAccountByUsername } from '@/actions/accounts'; +import { deactivateUser, deleteUser, deleteStatus, toggleStatusSensitivity } from '@/actions/admin'; +import OutlineBox from '@/components/outline-box'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import AccountContainer from '@/containers/account-container'; +import { selectAccount } from '@/selectors'; +import { useModalsStore } from '@/stores/modals'; +import toast from '@/toast'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const messages = defineMessages({ deactivateUserHeading: { id: 'confirmations.admin.deactivate_user.heading', defaultMessage: 'Deactivate @{acct}' }, diff --git a/packages/pl-fe/src/actions/mrf.ts b/packages/pl-fe/src/actions/mrf.ts index 3a5fecb32..89be525a3 100644 --- a/packages/pl-fe/src/actions/mrf.ts +++ b/packages/pl-fe/src/actions/mrf.ts @@ -1,9 +1,9 @@ -import { mrfSimpleSchema, type MRFSimple } from 'pl-fe/schemas/pleroma'; -import ConfigDB from 'pl-fe/utils/config-db'; +import { mrfSimpleSchema, type MRFSimple } from '@/schemas/pleroma'; +import ConfigDB from '@/utils/config-db'; import { fetchConfig, updateConfig } from './admin'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const simplePolicyMerge = (simplePolicy: Partial, host: string, restrictions: Record): MRFSimple => { const entries = Object.entries(simplePolicy).map(([key, hosts]) => { diff --git a/packages/pl-fe/src/actions/notifications.test.ts b/packages/pl-fe/src/actions/notifications.test.ts index 2949fe46a..9bf12d9c4 100644 --- a/packages/pl-fe/src/actions/notifications.test.ts +++ b/packages/pl-fe/src/actions/notifications.test.ts @@ -1,8 +1,8 @@ import { OrderedMap as ImmutableOrderedMap } from 'immutable'; -import { __stub } from 'pl-fe/api'; -import { mockStore, rootState } from 'pl-fe/jest/test-helpers'; -import { normalizeNotification } from 'pl-fe/normalizers/notification'; +import { __stub } from '@/api'; +import { mockStore, rootState } from '@/jest/test-helpers'; +import { normalizeNotification } from '@/normalizers/notification'; import { markReadNotifications } from './notifications'; diff --git a/packages/pl-fe/src/actions/notifications.ts b/packages/pl-fe/src/actions/notifications.ts index c3a631672..d494c4de1 100644 --- a/packages/pl-fe/src/actions/notifications.ts +++ b/packages/pl-fe/src/actions/notifications.ts @@ -2,25 +2,25 @@ import IntlMessageFormat from 'intl-messageformat'; import 'intl-pluralrules'; import { defineMessages } from 'react-intl'; -import { getClient } from 'pl-fe/api'; -import { getNotificationStatus } from 'pl-fe/features/notifications/components/notification'; -import { normalizeNotification } from 'pl-fe/normalizers/notification'; -import { appendFollowRequest } from 'pl-fe/queries/accounts/use-follow-requests'; -import { getFilters, regexFromFilters } from 'pl-fe/selectors'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import { isLoggedIn } from 'pl-fe/utils/auth'; -import { compareId } from 'pl-fe/utils/comparators'; -import { unescapeHTML } from 'pl-fe/utils/html'; -import { EXCLUDE_TYPES, NOTIFICATION_TYPES } from 'pl-fe/utils/notification'; -import { joinPublicPath } from 'pl-fe/utils/static'; +import { getClient } from '@/api'; +import { getNotificationStatus } from '@/features/notifications/components/notification'; +import { normalizeNotification } from '@/normalizers/notification'; +import { appendFollowRequest } from '@/queries/accounts/use-follow-requests'; +import { getFilters, regexFromFilters } from '@/selectors'; +import { useSettingsStore } from '@/stores/settings'; +import { isLoggedIn } from '@/utils/auth'; +import { compareId } from '@/utils/comparators'; +import { unescapeHTML } from '@/utils/html'; +import { EXCLUDE_TYPES, NOTIFICATION_TYPES } from '@/utils/notification'; +import { joinPublicPath } from '@/utils/static'; import { fetchRelationships } from './accounts'; import { importEntities } from './importer'; import { saveMarker } from './markers'; import { saveSettings } from './settings'; +import type { AppDispatch, RootState } from '@/store'; import type { Notification as BaseNotification, GetGroupedNotificationsParams, GroupedNotificationsResults, NotificationGroup, PaginatedResponse } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE' as const; const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP' as const; diff --git a/packages/pl-fe/src/actions/oauth.ts b/packages/pl-fe/src/actions/oauth.ts index ab4249155..13e85d0a6 100644 --- a/packages/pl-fe/src/actions/oauth.ts +++ b/packages/pl-fe/src/actions/oauth.ts @@ -8,10 +8,10 @@ import { PlApiClient, type GetTokenParams, type RevokeTokenParams } from 'pl-api'; -import * as BuildConfig from 'pl-fe/build-config'; -import { getBaseURL } from 'pl-fe/utils/state'; +import * as BuildConfig from '@/build-config'; +import { getBaseURL } from '@/utils/state'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const obtainOAuthToken = async (params: GetTokenParams, baseURL?: string) =>{ const client = new PlApiClient(baseURL || BuildConfig.BACKEND_URL || ''); diff --git a/packages/pl-fe/src/actions/pl-fe.ts b/packages/pl-fe/src/actions/pl-fe.ts index 854ace364..a502854e3 100644 --- a/packages/pl-fe/src/actions/pl-fe.ts +++ b/packages/pl-fe/src/actions/pl-fe.ts @@ -1,15 +1,15 @@ import { createSelector } from 'reselect'; import * as v from 'valibot'; -import { getHost } from 'pl-fe/actions/instance'; -import { plFeConfigSchema } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; -import KVStore from 'pl-fe/storage/kv-store'; -import { useSettingsStore } from 'pl-fe/stores/settings'; +import { getHost } from '@/actions/instance'; +import { plFeConfigSchema } from '@/normalizers/pl-fe/pl-fe-config'; +import KVStore from '@/storage/kv-store'; +import { useSettingsStore } from '@/stores/settings'; import { getClient, staticFetch } from '../api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; -import type { APIEntity } from 'pl-fe/types/entities'; +import type { AppDispatch, RootState } from '@/store'; +import type { APIEntity } from '@/types/entities'; const PLFE_CONFIG_REQUEST_SUCCESS = 'PLFE_CONFIG_REQUEST_SUCCESS' as const; const PLFE_CONFIG_REQUEST_FAIL = 'PLFE_CONFIG_REQUEST_FAIL' as const; diff --git a/packages/pl-fe/src/actions/preload.test.ts b/packages/pl-fe/src/actions/preload.test.ts index 90bd7a131..4cf6d6496 100644 --- a/packages/pl-fe/src/actions/preload.test.ts +++ b/packages/pl-fe/src/actions/preload.test.ts @@ -1,7 +1,7 @@ import { Map as ImmutableMap } from 'immutable'; -import { __stub } from 'pl-fe/api'; -import { mockStore } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { mockStore } from '@/jest/test-helpers'; import { VERIFY_CREDENTIALS_REQUEST } from './auth'; import { ACCOUNTS_IMPORT } from './importer'; @@ -12,7 +12,7 @@ import { describe('preloadMastodon()', () => { it('creates the expected actions', async () => { - const data = await import('pl-fe/__fixtures__/mastodon_initial_state.json'); + const data = await import('@/__fixtures__/mastodon_initial_state.json'); __stub(mock => { mock.onGet('/api/v1/accounts/verify_credentials') diff --git a/packages/pl-fe/src/actions/preload.ts b/packages/pl-fe/src/actions/preload.ts index 7b4a970b7..83fcdba4e 100644 --- a/packages/pl-fe/src/actions/preload.ts +++ b/packages/pl-fe/src/actions/preload.ts @@ -3,7 +3,7 @@ import mapValues from 'lodash/mapValues'; import { verifyCredentials } from './auth'; import { importEntities } from './importer'; -import type { AppDispatch } from 'pl-fe/store'; +import type { AppDispatch } from '@/store'; const PLEROMA_PRELOAD_IMPORT = 'PLEROMA_PRELOAD_IMPORT' as const; const MASTODON_PRELOAD_IMPORT = 'MASTODON_PRELOAD_IMPORT' as const; diff --git a/packages/pl-fe/src/actions/push-notifications/registerer.ts b/packages/pl-fe/src/actions/push-notifications/registerer.ts index 3d9983dec..1b4016a75 100644 --- a/packages/pl-fe/src/actions/push-notifications/registerer.ts +++ b/packages/pl-fe/src/actions/push-notifications/registerer.ts @@ -1,12 +1,12 @@ -import { createPushSubscription } from 'pl-fe/actions/push-subscriptions'; -import { pushNotificationsSetting } from 'pl-fe/settings'; -import { getVapidKey } from 'pl-fe/utils/auth'; -import { decode as decodeBase64 } from 'pl-fe/utils/base64'; +import { createPushSubscription } from '@/actions/push-subscriptions'; +import { pushNotificationsSetting } from '@/settings'; +import { getVapidKey } from '@/utils/auth'; +import { decode as decodeBase64 } from '@/utils/base64'; import { setBrowserSupport, setSubscription, clearSubscription } from './setter'; -import type { AppDispatch, RootState } from 'pl-fe/store'; -import type { Me } from 'pl-fe/types/pl-fe'; +import type { AppDispatch, RootState } from '@/store'; +import type { Me } from '@/types/pl-fe'; // Taken from https://www.npmjs.com/package/web-push const urlBase64ToUint8Array = (base64String: string) => { diff --git a/packages/pl-fe/src/actions/push-subscriptions.ts b/packages/pl-fe/src/actions/push-subscriptions.ts index 90f0068df..346d68cdd 100644 --- a/packages/pl-fe/src/actions/push-subscriptions.ts +++ b/packages/pl-fe/src/actions/push-subscriptions.ts @@ -1,7 +1,7 @@ import { getClient } from '../api'; +import type { AppDispatch, RootState } from '@/store'; import type { CreatePushNotificationsSubscriptionParams } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const createPushSubscription = (params: CreatePushNotificationsSubscriptionParams) => (dispatch: AppDispatch, getState: () => RootState) => diff --git a/packages/pl-fe/src/actions/remote-timeline.ts b/packages/pl-fe/src/actions/remote-timeline.ts index 5d431f08b..86c968622 100644 --- a/packages/pl-fe/src/actions/remote-timeline.ts +++ b/packages/pl-fe/src/actions/remote-timeline.ts @@ -1,7 +1,7 @@ -import { changeSetting } from 'pl-fe/actions/settings'; -import { useSettingsStore } from 'pl-fe/stores/settings'; +import { changeSetting } from '@/actions/settings'; +import { useSettingsStore } from '@/stores/settings'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const getPinnedHosts = (state: RootState) => { const { settings } = useSettingsStore.getState(); diff --git a/packages/pl-fe/src/actions/reports.ts b/packages/pl-fe/src/actions/reports.ts index 3b605a65b..01e176ed1 100644 --- a/packages/pl-fe/src/actions/reports.ts +++ b/packages/pl-fe/src/actions/reports.ts @@ -1,10 +1,10 @@ -import { useModalsStore } from 'pl-fe/stores/modals'; +import { useModalsStore } from '@/stores/modals'; import { getClient } from '../api'; +import type { Status } from '@/normalizers/status'; +import type { AppDispatch, RootState } from '@/store'; import type { Account } from 'pl-api'; -import type { Status } from 'pl-fe/normalizers/status'; -import type { AppDispatch, RootState } from 'pl-fe/store'; enum ReportableEntities { ACCOUNT = 'ACCOUNT', diff --git a/packages/pl-fe/src/actions/security.ts b/packages/pl-fe/src/actions/security.ts index 8eb4c715b..bce339781 100644 --- a/packages/pl-fe/src/actions/security.ts +++ b/packages/pl-fe/src/actions/security.ts @@ -4,15 +4,15 @@ * @see module:pl-fe/actions/auth */ -import { getClient } from 'pl-fe/api'; -import toast from 'pl-fe/toast'; -import { getLoggedInAccount } from 'pl-fe/utils/auth'; -import { normalizeUsername } from 'pl-fe/utils/input'; +import { getClient } from '@/api'; +import toast from '@/toast'; +import { getLoggedInAccount } from '@/utils/auth'; +import { normalizeUsername } from '@/utils/input'; import { AUTH_LOGGED_OUT, messages } from './auth'; +import type { AppDispatch, RootState } from '@/store'; import type { Account } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const changePassword = (oldPassword: string, newPassword: string) => (dispatch: AppDispatch, getState: () => RootState) => diff --git a/packages/pl-fe/src/actions/settings.ts b/packages/pl-fe/src/actions/settings.ts index 3289b7a93..40fbfb579 100644 --- a/packages/pl-fe/src/actions/settings.ts +++ b/packages/pl-fe/src/actions/settings.ts @@ -1,16 +1,16 @@ import { defineMessage } from 'react-intl'; -import { patchMe } from 'pl-fe/actions/me'; -import { getClient } from 'pl-fe/api'; -import { NODE_ENV } from 'pl-fe/build-config'; -import messages from 'pl-fe/messages'; -import { selectOwnAccount } from 'pl-fe/selectors'; -import KVStore from 'pl-fe/storage/kv-store'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import toast from 'pl-fe/toast'; -import { isLoggedIn } from 'pl-fe/utils/auth'; +import { patchMe } from '@/actions/me'; +import { getClient } from '@/api'; +import { NODE_ENV } from '@/build-config'; +import messages from '@/messages'; +import { selectOwnAccount } from '@/selectors'; +import KVStore from '@/storage/kv-store'; +import { useSettingsStore } from '@/stores/settings'; +import toast from '@/toast'; +import { isLoggedIn } from '@/utils/auth'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; const FE_NAME = NODE_ENV === 'production' ? 'pl_fe' : 'pl_fe_dev'; diff --git a/packages/pl-fe/src/actions/statuses.test.ts b/packages/pl-fe/src/actions/statuses.test.ts index a9575d8a1..e7331a357 100644 --- a/packages/pl-fe/src/actions/statuses.test.ts +++ b/packages/pl-fe/src/actions/statuses.test.ts @@ -1,15 +1,15 @@ import { fromJS, Map as ImmutableMap } from 'immutable'; -import { STATUSES_IMPORT } from 'pl-fe/actions/importer'; -import { __stub } from 'pl-fe/api'; -import { mockStore, rootState } from 'pl-fe/jest/test-helpers'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; +import { STATUSES_IMPORT } from '@/actions/importer'; +import { __stub } from '@/api'; +import { mockStore, rootState } from '@/jest/test-helpers'; +import { normalizeStatus } from '@/normalizers/status'; import { deleteStatus, fetchContext } from './statuses'; describe('fetchContext()', () => { it('handles Mitra context', async () => { - const statuses = await import('pl-fe/__fixtures__/mitra-context.json'); + const statuses = await import('@/__fixtures__/mitra-context.json'); __stub(mock => { mock.onGet('/api/v1/statuses/017ed505-5926-392f-256a-f86d5075df70/context') @@ -64,7 +64,7 @@ describe('deleteStatus()', () => { let status: any; beforeEach(async () => { - status = await import('pl-fe/__fixtures__/pleroma-status-deleted.json'); + status = await import('@/__fixtures__/pleroma-status-deleted.json'); __stub((mock) => { mock.onDelete(`/api/v1/statuses/${statusId}`).reply(200, status); diff --git a/packages/pl-fe/src/actions/statuses.ts b/packages/pl-fe/src/actions/statuses.ts index 5ba098e7c..845bfccee 100644 --- a/packages/pl-fe/src/actions/statuses.ts +++ b/packages/pl-fe/src/actions/statuses.ts @@ -1,9 +1,9 @@ -import { queryClient } from 'pl-fe/queries/client'; -import { scheduledStatusesQueryOptions } from 'pl-fe/queries/statuses/scheduled-statuses'; -import { useModalsStore } from 'pl-fe/stores/modals'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import { isLoggedIn } from 'pl-fe/utils/auth'; -import { shouldHaveCard } from 'pl-fe/utils/status'; +import { queryClient } from '@/queries/client'; +import { scheduledStatusesQueryOptions } from '@/queries/statuses/scheduled-statuses'; +import { useModalsStore } from '@/stores/modals'; +import { useSettingsStore } from '@/stores/settings'; +import { isLoggedIn } from '@/utils/auth'; +import { shouldHaveCard } from '@/utils/status'; import { getClient } from '../api'; @@ -11,9 +11,9 @@ import { setComposeToStatus } from './compose'; import { importEntities } from './importer'; import { deleteFromTimelines } from './timelines'; +import type { Status } from '@/normalizers/status'; +import type { AppDispatch, RootState } from '@/store'; import type { CreateStatusParams, Status as BaseStatus, ScheduledStatus, StatusSource, Poll } from 'pl-api'; -import type { Status } from 'pl-fe/normalizers/status'; -import type { AppDispatch, RootState } from 'pl-fe/store'; import type { IntlShape } from 'react-intl'; const STATUS_CREATE_REQUEST = 'STATUS_CREATE_REQUEST' as const; diff --git a/packages/pl-fe/src/actions/timelines.ts b/packages/pl-fe/src/actions/timelines.ts index 89b1b6dc0..e30b03ec4 100644 --- a/packages/pl-fe/src/actions/timelines.ts +++ b/packages/pl-fe/src/actions/timelines.ts @@ -1,11 +1,12 @@ -import { getLocale } from 'pl-fe/actions/settings'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import { shouldFilter } from 'pl-fe/utils/timelines'; +import { getLocale } from '@/actions/settings'; +import { useSettingsStore } from '@/stores/settings'; +import { shouldFilter } from '@/utils/timelines'; import { getClient } from '../api'; import { importEntities } from './importer'; +import type { AppDispatch, RootState } from '@/store'; import type { Account as BaseAccount, AntennaTimelineParams, @@ -20,7 +21,6 @@ import type { Status as BaseStatus, LinkTimelineParams, } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const TIMELINE_UPDATE = 'TIMELINE_UPDATE' as const; const TIMELINE_DELETE = 'TIMELINE_DELETE' as const; diff --git a/packages/pl-fe/src/api/hooks/accounts/use-account-lookup.ts b/packages/pl-fe/src/api/hooks/accounts/use-account-lookup.ts index 23eee35fd..1c730cea5 100644 --- a/packages/pl-fe/src/api/hooks/accounts/use-account-lookup.ts +++ b/packages/pl-fe/src/api/hooks/accounts/use-account-lookup.ts @@ -1,11 +1,11 @@ import { useMemo } from 'react'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useEntityLookup } from 'pl-fe/entity-store/hooks/use-entity-lookup'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { useRelationshipQuery } from 'pl-fe/queries/accounts/use-relationship'; +import { Entities } from '@/entity-store/entities'; +import { useEntityLookup } from '@/entity-store/hooks/use-entity-lookup'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { useRelationshipQuery } from '@/queries/accounts/use-relationship'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/accounts/use-account.ts b/packages/pl-fe/src/api/hooks/accounts/use-account.ts index e4a13ae79..0368b64b8 100644 --- a/packages/pl-fe/src/api/hooks/accounts/use-account.ts +++ b/packages/pl-fe/src/api/hooks/accounts/use-account.ts @@ -1,12 +1,12 @@ import { useMemo } from 'react'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useEntity } from 'pl-fe/entity-store/hooks/use-entity'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { useRelationshipQuery } from 'pl-fe/queries/accounts/use-relationship'; +import { Entities } from '@/entity-store/entities'; +import { useEntity } from '@/entity-store/hooks/use-entity'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { useRelationshipQuery } from '@/queries/accounts/use-relationship'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/admin/use-suggest.ts b/packages/pl-fe/src/api/hooks/admin/use-suggest.ts index 32fd4de8d..d9f24324a 100644 --- a/packages/pl-fe/src/api/hooks/admin/use-suggest.ts +++ b/packages/pl-fe/src/api/hooks/admin/use-suggest.ts @@ -1,6 +1,6 @@ -import { EntityCallbacks } from 'pl-fe/entity-store/hooks/types'; -import { useTransaction } from 'pl-fe/entity-store/hooks/use-transaction'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { EntityCallbacks } from '@/entity-store/hooks/types'; +import { useTransaction } from '@/entity-store/hooks/use-transaction'; +import { useClient } from '@/hooks/use-client'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/admin/use-verify.ts b/packages/pl-fe/src/api/hooks/admin/use-verify.ts index 797d6b866..9afbe25d7 100644 --- a/packages/pl-fe/src/api/hooks/admin/use-verify.ts +++ b/packages/pl-fe/src/api/hooks/admin/use-verify.ts @@ -1,8 +1,8 @@ -import { useTransaction } from 'pl-fe/entity-store/hooks/use-transaction'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useTransaction } from '@/entity-store/hooks/use-transaction'; +import { useClient } from '@/hooks/use-client'; +import type { EntityCallbacks } from '@/entity-store/hooks/types'; import type { Account } from 'pl-api'; -import type { EntityCallbacks } from 'pl-fe/entity-store/hooks/types'; const useVerify = () => { const client = useClient(); diff --git a/packages/pl-fe/src/api/hooks/groups/use-create-group.ts b/packages/pl-fe/src/api/hooks/groups/use-create-group.ts index 75aa1fe0f..61d22d580 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-create-group.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-create-group.ts @@ -1,6 +1,6 @@ -import { Entities } from 'pl-fe/entity-store/entities'; -import { useCreateEntity } from 'pl-fe/entity-store/hooks/use-create-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useCreateEntity } from '@/entity-store/hooks/use-create-entity'; +import { useClient } from '@/hooks/use-client'; import type { Group, CreateGroupParams } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-delete-group.ts b/packages/pl-fe/src/api/hooks/groups/use-delete-group.ts index 3be1ce329..f68a67c9d 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-delete-group.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-delete-group.ts @@ -1,6 +1,6 @@ -import { Entities } from 'pl-fe/entity-store/entities'; -import { useDeleteEntity } from 'pl-fe/entity-store/hooks/use-delete-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useDeleteEntity } from '@/entity-store/hooks/use-delete-entity'; +import { useClient } from '@/hooks/use-client'; const useDeleteGroup = () => { const client = useClient(); diff --git a/packages/pl-fe/src/api/hooks/groups/use-demote-group-member.ts b/packages/pl-fe/src/api/hooks/groups/use-demote-group-member.ts index 98d46508b..bdfbbdad9 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-demote-group-member.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-demote-group-member.ts @@ -1,8 +1,8 @@ import * as v from 'valibot'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useCreateEntity } from 'pl-fe/entity-store/hooks/use-create-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useCreateEntity } from '@/entity-store/hooks/use-create-entity'; +import { useClient } from '@/hooks/use-client'; import type { Group, GroupMember, GroupRole } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-group-membership-requests.ts b/packages/pl-fe/src/api/hooks/groups/use-group-membership-requests.ts index ac231fe38..e8b084720 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-group-membership-requests.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-group-membership-requests.ts @@ -1,14 +1,14 @@ import { GroupRoles } from 'pl-api'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useDismissEntity } from 'pl-fe/entity-store/hooks/use-dismiss-entity'; -import { useEntities } from 'pl-fe/entity-store/hooks/use-entities'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useDismissEntity } from '@/entity-store/hooks/use-dismiss-entity'; +import { useEntities } from '@/entity-store/hooks/use-entities'; +import { useClient } from '@/hooks/use-client'; import { useGroupRelationship } from './use-group-relationship'; +import type { ExpandedEntitiesPath } from '@/entity-store/hooks/types'; import type { Account } from 'pl-api'; -import type { ExpandedEntitiesPath } from 'pl-fe/entity-store/hooks/types'; const useGroupMembershipRequests = (groupId: string) => { const client = useClient(); diff --git a/packages/pl-fe/src/api/hooks/groups/use-group-relationship.ts b/packages/pl-fe/src/api/hooks/groups/use-group-relationship.ts index dfa7f4e69..b747f8312 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-group-relationship.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-group-relationship.ts @@ -1,8 +1,8 @@ import * as v from 'valibot'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useEntity } from 'pl-fe/entity-store/hooks/use-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useEntity } from '@/entity-store/hooks/use-entity'; +import { useClient } from '@/hooks/use-client'; import type { GroupRelationship } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-group-relationships.ts b/packages/pl-fe/src/api/hooks/groups/use-group-relationships.ts index 1f3ce1d67..2d6375598 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-group-relationships.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-group-relationships.ts @@ -1,7 +1,7 @@ -import { Entities } from 'pl-fe/entity-store/entities'; -import { useBatchedEntities } from 'pl-fe/entity-store/hooks/use-batched-entities'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { Entities } from '@/entity-store/entities'; +import { useBatchedEntities } from '@/entity-store/hooks/use-batched-entities'; +import { useClient } from '@/hooks/use-client'; +import { useLoggedIn } from '@/hooks/use-logged-in'; import type { GroupRelationship } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-group.test.ts b/packages/pl-fe/src/api/hooks/groups/use-group.test.ts index 5bf5d0548..24d794977 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-group.test.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-group.test.ts @@ -1,6 +1,6 @@ -import { __stub } from 'pl-fe/api'; -import { buildGroup } from 'pl-fe/jest/factory'; -import { renderHook, waitFor } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { buildGroup } from '@/jest/factory'; +import { renderHook, waitFor } from '@/jest/test-helpers'; import { useGroup } from './use-group'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-group.ts b/packages/pl-fe/src/api/hooks/groups/use-group.ts index e3fb3a938..09514076e 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-group.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-group.ts @@ -1,9 +1,9 @@ import { useLocation, useNavigate } from '@tanstack/react-router'; import { useEffect } from 'react'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useEntity } from 'pl-fe/entity-store/hooks/use-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useEntity } from '@/entity-store/hooks/use-entity'; +import { useClient } from '@/hooks/use-client'; import { useGroupRelationship } from './use-group-relationship'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-groups.test.ts b/packages/pl-fe/src/api/hooks/groups/use-groups.test.ts index b7559a5c8..8ef89f79e 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-groups.test.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-groups.test.ts @@ -1,9 +1,9 @@ import { instanceSchema } from 'pl-api'; import * as v from 'valibot'; -import { __stub } from 'pl-fe/api'; -import { buildGroup } from 'pl-fe/jest/factory'; -import { renderHook, waitFor } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { buildGroup } from '@/jest/factory'; +import { renderHook, waitFor } from '@/jest/test-helpers'; import { useGroups } from './use-groups'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-groups.ts b/packages/pl-fe/src/api/hooks/groups/use-groups.ts index cda4b93b4..65a5c363f 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-groups.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-groups.ts @@ -1,7 +1,7 @@ -import { Entities } from 'pl-fe/entity-store/entities'; -import { useEntities } from 'pl-fe/entity-store/hooks/use-entities'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { Entities } from '@/entity-store/entities'; +import { useEntities } from '@/entity-store/hooks/use-entities'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import { useGroupRelationships } from './use-group-relationships'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-join-group.ts b/packages/pl-fe/src/api/hooks/groups/use-join-group.ts index b30912c33..7b51cb6f3 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-join-group.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-join-group.ts @@ -1,6 +1,6 @@ -import { Entities } from 'pl-fe/entity-store/entities'; -import { useCreateEntity } from 'pl-fe/entity-store/hooks/use-create-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useCreateEntity } from '@/entity-store/hooks/use-create-entity'; +import { useClient } from '@/hooks/use-client'; import { useGroups } from './use-groups'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-leave-group.ts b/packages/pl-fe/src/api/hooks/groups/use-leave-group.ts index d102e0e84..e60ab0bff 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-leave-group.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-leave-group.ts @@ -1,6 +1,6 @@ -import { Entities } from 'pl-fe/entity-store/entities'; -import { useCreateEntity } from 'pl-fe/entity-store/hooks/use-create-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useCreateEntity } from '@/entity-store/hooks/use-create-entity'; +import { useClient } from '@/hooks/use-client'; import { useGroups } from './use-groups'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-promote-group-member.ts b/packages/pl-fe/src/api/hooks/groups/use-promote-group-member.ts index 57f954a1e..7b5ea3ce9 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-promote-group-member.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-promote-group-member.ts @@ -1,8 +1,8 @@ import * as v from 'valibot'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useCreateEntity } from 'pl-fe/entity-store/hooks/use-create-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useCreateEntity } from '@/entity-store/hooks/use-create-entity'; +import { useClient } from '@/hooks/use-client'; import type { Group, GroupMember, GroupRole } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/groups/use-update-group.ts b/packages/pl-fe/src/api/hooks/groups/use-update-group.ts index 54eb9e185..dcf86e2e1 100644 --- a/packages/pl-fe/src/api/hooks/groups/use-update-group.ts +++ b/packages/pl-fe/src/api/hooks/groups/use-update-group.ts @@ -1,6 +1,6 @@ -import { Entities } from 'pl-fe/entity-store/entities'; -import { useCreateEntity } from 'pl-fe/entity-store/hooks/use-create-entity'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { Entities } from '@/entity-store/entities'; +import { useCreateEntity } from '@/entity-store/hooks/use-create-entity'; +import { useClient } from '@/hooks/use-client'; interface UpdateGroupParams { display_name?: string; diff --git a/packages/pl-fe/src/api/hooks/streaming/use-list-stream.ts b/packages/pl-fe/src/api/hooks/streaming/use-list-stream.ts index fde472b2a..59829a0bc 100644 --- a/packages/pl-fe/src/api/hooks/streaming/use-list-stream.ts +++ b/packages/pl-fe/src/api/hooks/streaming/use-list-stream.ts @@ -1,4 +1,4 @@ -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { useLoggedIn } from '@/hooks/use-logged-in'; import { useTimelineStream } from './use-timeline-stream'; diff --git a/packages/pl-fe/src/api/hooks/streaming/use-timeline-stream.ts b/packages/pl-fe/src/api/hooks/streaming/use-timeline-stream.ts index 07c2a140a..e8faf1ee1 100644 --- a/packages/pl-fe/src/api/hooks/streaming/use-timeline-stream.ts +++ b/packages/pl-fe/src/api/hooks/streaming/use-timeline-stream.ts @@ -1,9 +1,9 @@ import { useEffect, useRef } from 'react'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { getAccessToken } from 'pl-fe/utils/auth'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useClient } from '@/hooks/use-client'; +import { useInstance } from '@/hooks/use-instance'; +import { getAccessToken } from '@/utils/auth'; import type { StreamingEvent } from 'pl-api'; diff --git a/packages/pl-fe/src/api/hooks/streaming/use-user-stream.ts b/packages/pl-fe/src/api/hooks/streaming/use-user-stream.ts index 315ba9e60..82b637ed6 100644 --- a/packages/pl-fe/src/api/hooks/streaming/use-user-stream.ts +++ b/packages/pl-fe/src/api/hooks/streaming/use-user-stream.ts @@ -1,27 +1,27 @@ import { useCallback } from 'react'; -import { updateConversations } from 'pl-fe/actions/conversations'; -import { fetchFilters } from 'pl-fe/actions/filters'; -import { MARKER_FETCH_SUCCESS } from 'pl-fe/actions/markers'; -import { updateNotificationsQueue } from 'pl-fe/actions/notifications'; -import { getLocale } from 'pl-fe/actions/settings'; -import { updateStatus } from 'pl-fe/actions/statuses'; -import { deleteFromTimelines, processTimelineUpdate } from 'pl-fe/actions/timelines'; -import { useStatContext } from 'pl-fe/contexts/stat-context'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import messages from 'pl-fe/messages'; -import { queryClient } from 'pl-fe/queries/client'; -import { useSettings } from 'pl-fe/stores/settings'; -import { getUnreadChatsCount, updateChatListItem } from 'pl-fe/utils/chats'; -import { play, soundCache } from 'pl-fe/utils/sounds'; +import { updateConversations } from '@/actions/conversations'; +import { fetchFilters } from '@/actions/filters'; +import { MARKER_FETCH_SUCCESS } from '@/actions/markers'; +import { updateNotificationsQueue } from '@/actions/notifications'; +import { getLocale } from '@/actions/settings'; +import { updateStatus } from '@/actions/statuses'; +import { deleteFromTimelines, processTimelineUpdate } from '@/actions/timelines'; +import { useStatContext } from '@/contexts/stat-context'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import messages from '@/messages'; +import { queryClient } from '@/queries/client'; +import { useSettings } from '@/stores/settings'; +import { getUnreadChatsCount, updateChatListItem } from '@/utils/chats'; +import { play, soundCache } from '@/utils/sounds'; import { updateReactions } from '../../../queries/announcements/use-announcements'; import { useTimelineStream } from './use-timeline-stream'; +import type { AppDispatch, RootState } from '@/store'; import type { Announcement, AnnouncementReaction, FollowRelationshipUpdate, Relationship, StreamingEvent } from 'pl-api'; -import type { AppDispatch, RootState } from 'pl-fe/store'; const updateAnnouncementReactions = (reaction: AnnouncementReaction) => { queryClient.setQueryData(['announcements'], (prevResult: Announcement[]) => diff --git a/packages/pl-fe/src/api/index.ts b/packages/pl-fe/src/api/index.ts index b8fde7455..74fe258ca 100644 --- a/packages/pl-fe/src/api/index.ts +++ b/packages/pl-fe/src/api/index.ts @@ -2,13 +2,13 @@ * API: HTTP client and utilities. * @module pl-fe/api */ -import * as BuildConfig from 'pl-fe/build-config'; -import { buildFullPath } from 'pl-fe/utils/url'; +import * as BuildConfig from '@/build-config'; +import { buildFullPath } from '@/utils/url'; -import type { RootState, Store } from 'pl-fe/store'; +import type { RootState, Store } from '@/store'; let store: Store; -import('pl-fe/store').then((value) => store = value.store).catch(() => {}); +import('@/store').then((value) => store = value.store).catch(() => {}); type PlfeResponse = Response & { data: string; json: T }; diff --git a/packages/pl-fe/src/columns/notifications.tsx b/packages/pl-fe/src/columns/notifications.tsx index f2bfbc87c..a11ebe939 100644 --- a/packages/pl-fe/src/columns/notifications.tsx +++ b/packages/pl-fe/src/columns/notifications.tsx @@ -4,30 +4,30 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { createSelector } from 'reselect'; -import 'pl-fe/styles/new/notifications.scss'; +import '@/styles/new/notifications.scss'; import { type FilterType, expandNotifications, markReadNotifications, scrollTopNotifications, setFilter, -} from 'pl-fe/actions/notifications'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import ScrollTopButton from 'pl-fe/components/scroll-top-button'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Icon from 'pl-fe/components/ui/icon'; -import Portal from 'pl-fe/components/ui/portal'; -import Tabs from 'pl-fe/components/ui/tabs'; -import Notification from 'pl-fe/features/notifications/components/notification'; -import PlaceholderNotification from 'pl-fe/features/placeholder/components/placeholder-notification'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useSettings } from 'pl-fe/stores/settings'; -import { selectChild } from 'pl-fe/utils/scroll-utils'; +} from '@/actions/notifications'; +import PullToRefresh from '@/components/pull-to-refresh'; +import ScrollTopButton from '@/components/scroll-top-button'; +import ScrollableList from '@/components/scrollable-list'; +import Icon from '@/components/ui/icon'; +import Portal from '@/components/ui/portal'; +import Tabs from '@/components/ui/tabs'; +import Notification from '@/features/notifications/components/notification'; +import PlaceholderNotification from '@/features/placeholder/components/placeholder-notification'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useSettings } from '@/stores/settings'; +import { selectChild } from '@/utils/scroll-utils'; -import type { Item } from 'pl-fe/components/ui/tabs'; -import type { RootState } from 'pl-fe/store'; +import type { Item } from '@/components/ui/tabs'; +import type { RootState } from '@/store'; import type { VirtuosoHandle } from 'react-virtuoso'; const messages = defineMessages({ diff --git a/packages/pl-fe/src/columns/search.tsx b/packages/pl-fe/src/columns/search.tsx index 9b4f3f84b..589e717c4 100644 --- a/packages/pl-fe/src/columns/search.tsx +++ b/packages/pl-fe/src/columns/search.tsx @@ -2,15 +2,15 @@ import clsx from 'clsx'; import React, { useRef } from 'react'; import { FormattedMessage } from 'react-intl'; -import Hashtag from 'pl-fe/components/hashtag'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import AccountContainer from 'pl-fe/containers/account-container'; -import StatusContainer from 'pl-fe/containers/status-container'; -import PlaceholderAccount from 'pl-fe/features/placeholder/components/placeholder-account'; -import PlaceholderHashtag from 'pl-fe/features/placeholder/components/placeholder-hashtag'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import { useSearchAccounts, useSearchHashtags, useSearchStatuses } from 'pl-fe/queries/search/use-search'; -import { selectChild } from 'pl-fe/utils/scroll-utils'; +import Hashtag from '@/components/hashtag'; +import ScrollableList from '@/components/scrollable-list'; +import AccountContainer from '@/containers/account-container'; +import StatusContainer from '@/containers/status-container'; +import PlaceholderAccount from '@/features/placeholder/components/placeholder-account'; +import PlaceholderHashtag from '@/features/placeholder/components/placeholder-hashtag'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import { useSearchAccounts, useSearchHashtags, useSearchStatuses } from '@/queries/search/use-search'; +import { selectChild } from '@/utils/scroll-utils'; import TrendsColumn from './trends'; diff --git a/packages/pl-fe/src/columns/trends.tsx b/packages/pl-fe/src/columns/trends.tsx index b6cb1c79d..5d461d9ba 100644 --- a/packages/pl-fe/src/columns/trends.tsx +++ b/packages/pl-fe/src/columns/trends.tsx @@ -1,18 +1,18 @@ import clsx from 'clsx'; import React from 'react'; -import Hashtag from 'pl-fe/components/hashtag'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import TrendingLink from 'pl-fe/components/trending-link'; -import AccountContainer from 'pl-fe/containers/account-container'; -import StatusContainer from 'pl-fe/containers/status-container'; -import PlaceholderAccount from 'pl-fe/features/placeholder/components/placeholder-account'; -import PlaceholderHashtag from 'pl-fe/features/placeholder/components/placeholder-hashtag'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import useTrends from 'pl-fe/queries/trends'; -import { useSuggestedAccounts } from 'pl-fe/queries/trends/use-suggested-accounts'; -import { useTrendingLinks } from 'pl-fe/queries/trends/use-trending-links'; -import { useTrendingStatuses } from 'pl-fe/queries/trends/use-trending-statuses'; +import Hashtag from '@/components/hashtag'; +import ScrollableList from '@/components/scrollable-list'; +import TrendingLink from '@/components/trending-link'; +import AccountContainer from '@/containers/account-container'; +import StatusContainer from '@/containers/status-container'; +import PlaceholderAccount from '@/features/placeholder/components/placeholder-account'; +import PlaceholderHashtag from '@/features/placeholder/components/placeholder-hashtag'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import useTrends from '@/queries/trends'; +import { useSuggestedAccounts } from '@/queries/trends/use-suggested-accounts'; +import { useTrendingLinks } from '@/queries/trends/use-trending-links'; +import { useTrendingStatuses } from '@/queries/trends/use-trending-statuses'; interface ITrendsColumn { type: 'accounts' | 'hashtags' | 'statuses' | 'links'; diff --git a/packages/pl-fe/src/components/account-hover-card.tsx b/packages/pl-fe/src/components/account-hover-card.tsx index df43dbd56..43eb2442b 100644 --- a/packages/pl-fe/src/components/account-hover-card.tsx +++ b/packages/pl-fe/src/components/account-hover-card.tsx @@ -5,21 +5,21 @@ import clsx from 'clsx'; import React, { useEffect } from 'react'; import { useIntl, FormattedMessage } from 'react-intl'; -import { fetchRelationships } from 'pl-fe/actions/accounts'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import Badge from 'pl-fe/components/badge'; -import Card, { CardBody } from 'pl-fe/components/ui/card'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import ActionButton from 'pl-fe/features/ui/components/action-button'; -import { isTimezoneLabel } from 'pl-fe/features/ui/components/profile-field'; -import { UserPanel } from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { accountScrobbleQueryOptions } from 'pl-fe/queries/accounts/account-scrobble'; -import { useAccountHoverCardActions, useAccountHoverCardStore } from 'pl-fe/stores/account-hover-card'; +import { fetchRelationships } from '@/actions/accounts'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import Badge from '@/components/badge'; +import Card, { CardBody } from '@/components/ui/card'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import ActionButton from '@/features/ui/components/action-button'; +import { isTimezoneLabel } from '@/features/ui/components/profile-field'; +import { UserPanel } from '@/features/ui/util/async-components'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { accountScrobbleQueryOptions } from '@/queries/accounts/account-scrobble'; +import { useAccountHoverCardActions, useAccountHoverCardStore } from '@/stores/account-hover-card'; import AccountLocalTime from './account-local-time'; import { showAccountHoverCard } from './hover-account-wrapper'; diff --git a/packages/pl-fe/src/components/account-local-time.tsx b/packages/pl-fe/src/components/account-local-time.tsx index 2649e0ba9..6a1852b0e 100644 --- a/packages/pl-fe/src/components/account-local-time.tsx +++ b/packages/pl-fe/src/components/account-local-time.tsx @@ -2,7 +2,7 @@ import { Account } from 'pl-api'; import React, { useEffect, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { useLoggedIn } from '@/hooks/use-logged-in'; import HStack from './ui/hstack'; import Icon from './ui/icon'; diff --git a/packages/pl-fe/src/components/account.test.tsx b/packages/pl-fe/src/components/account.test.tsx index 7a3070030..3a428a810 100644 --- a/packages/pl-fe/src/components/account.test.tsx +++ b/packages/pl-fe/src/components/account.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { buildAccount } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildAccount } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import Account from './account'; diff --git a/packages/pl-fe/src/components/account.tsx b/packages/pl-fe/src/components/account.tsx index 7dfeb31de..7ad8c8b3d 100644 --- a/packages/pl-fe/src/components/account.tsx +++ b/packages/pl-fe/src/components/account.tsx @@ -3,27 +3,27 @@ import clsx from 'clsx'; import React, { useLayoutEffect, useRef, useState } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import HoverAccountWrapper from 'pl-fe/components/hover-account-wrapper'; -import Avatar from 'pl-fe/components/ui/avatar'; -import Emoji from 'pl-fe/components/ui/emoji'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import ActionButton from 'pl-fe/features/ui/components/action-button'; -import { useAcct } from 'pl-fe/hooks/use-acct'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useSettings } from 'pl-fe/stores/settings'; +import HoverAccountWrapper from '@/components/hover-account-wrapper'; +import Avatar from '@/components/ui/avatar'; +import Emoji from '@/components/ui/emoji'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import Emojify from '@/features/emoji/emojify'; +import ActionButton from '@/features/ui/components/action-button'; +import { useAcct } from '@/hooks/use-acct'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useSettings } from '@/stores/settings'; import Badge from './badge'; import { ParsedContent } from './parsed-content'; import RelativeTimestamp from './relative-timestamp'; +import type { StatusApprovalStatus } from '@/normalizers/status'; import type { Account as AccountSchema } from 'pl-api'; -import type { StatusApprovalStatus } from 'pl-fe/normalizers/status'; interface IInstanceFavicon { account: Pick; diff --git a/packages/pl-fe/src/components/alt-indicator.tsx b/packages/pl-fe/src/components/alt-indicator.tsx index 32a432f8e..fc0b8e07a 100644 --- a/packages/pl-fe/src/components/alt-indicator.tsx +++ b/packages/pl-fe/src/components/alt-indicator.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; +import Icon from '@/components/ui/icon'; interface IAltIndicator extends Pick, 'title' | 'className'> { warning?: boolean; diff --git a/packages/pl-fe/src/components/animated-number.tsx b/packages/pl-fe/src/components/animated-number.tsx index 712d064b4..804617e50 100644 --- a/packages/pl-fe/src/components/animated-number.tsx +++ b/packages/pl-fe/src/components/animated-number.tsx @@ -2,8 +2,8 @@ import { animated, config, useTransition } from '@react-spring/web'; import React, { useEffect, useState } from 'react'; import { useIntl, type IntlShape } from 'react-intl'; -import { useSettings } from 'pl-fe/stores/settings'; -import { isNumber, roundDown } from 'pl-fe/utils/numbers'; +import { useSettings } from '@/stores/settings'; +import { isNumber, roundDown } from '@/utils/numbers'; const obfuscatedCount = (count: number): string => { if (count < 0) { diff --git a/packages/pl-fe/src/components/announcements/announcement-content.tsx b/packages/pl-fe/src/components/announcements/announcement-content.tsx index 012a754f5..44fce56d1 100644 --- a/packages/pl-fe/src/components/announcements/announcement-content.tsx +++ b/packages/pl-fe/src/components/announcements/announcement-content.tsx @@ -1,7 +1,7 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useEffect, useRef } from 'react'; -import { getTextDirection } from 'pl-fe/utils/rtl'; +import { getTextDirection } from '@/utils/rtl'; import { ParsedContent } from '../parsed-content'; diff --git a/packages/pl-fe/src/components/announcements/announcement.tsx b/packages/pl-fe/src/components/announcements/announcement.tsx index 4f0d574bc..6b3492dbc 100644 --- a/packages/pl-fe/src/components/announcements/announcement.tsx +++ b/packages/pl-fe/src/components/announcements/announcement.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { FormattedDate } from 'react-intl'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { getTextDirection } from 'pl-fe/utils/rtl'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useFeatures } from '@/hooks/use-features'; +import { getTextDirection } from '@/utils/rtl'; import AnnouncementContent from './announcement-content'; import ReactionsBar from './reactions-bar'; diff --git a/packages/pl-fe/src/components/announcements/announcements-panel.tsx b/packages/pl-fe/src/components/announcements/announcements-panel.tsx index cb1d6c511..de1135468 100644 --- a/packages/pl-fe/src/components/announcements/announcements-panel.tsx +++ b/packages/pl-fe/src/components/announcements/announcements-panel.tsx @@ -3,11 +3,11 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; import ReactSwipeableViews from 'react-swipeable-views'; -import Card from 'pl-fe/components/ui/card'; -import HStack from 'pl-fe/components/ui/hstack'; -import Widget from 'pl-fe/components/ui/widget'; -import { useAnnouncements } from 'pl-fe/queries/announcements/use-announcements'; -import { useCustomEmojis } from 'pl-fe/queries/instance/use-custom-emojis'; +import Card from '@/components/ui/card'; +import HStack from '@/components/ui/hstack'; +import Widget from '@/components/ui/widget'; +import { useAnnouncements } from '@/queries/announcements/use-announcements'; +import { useCustomEmojis } from '@/queries/instance/use-custom-emojis'; import Announcement from './announcement'; diff --git a/packages/pl-fe/src/components/announcements/emoji.tsx b/packages/pl-fe/src/components/announcements/emoji.tsx index 22e3a00c0..35b5dab2d 100644 --- a/packages/pl-fe/src/components/announcements/emoji.tsx +++ b/packages/pl-fe/src/components/announcements/emoji.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import unicodeMapping from 'pl-fe/features/emoji/mapping'; -import { useSettings } from 'pl-fe/stores/settings'; -import { joinPublicPath } from 'pl-fe/utils/static'; +import unicodeMapping from '@/features/emoji/mapping'; +import { useSettings } from '@/stores/settings'; +import { joinPublicPath } from '@/utils/static'; import type { CustomEmoji } from 'pl-api'; diff --git a/packages/pl-fe/src/components/announcements/reaction.tsx b/packages/pl-fe/src/components/announcements/reaction.tsx index 3829128b6..2ac4faf5b 100644 --- a/packages/pl-fe/src/components/announcements/reaction.tsx +++ b/packages/pl-fe/src/components/announcements/reaction.tsx @@ -2,9 +2,9 @@ import { animated, type AnimatedProps } from '@react-spring/web'; import clsx from 'clsx'; import React, { useState } from 'react'; -import AnimatedNumber from 'pl-fe/components/animated-number'; -import unicodeMapping from 'pl-fe/features/emoji/mapping'; -import { useAnnouncements } from 'pl-fe/queries/announcements/use-announcements'; +import AnimatedNumber from '@/components/animated-number'; +import unicodeMapping from '@/features/emoji/mapping'; +import { useAnnouncements } from '@/queries/announcements/use-announcements'; import Emoji from './emoji'; diff --git a/packages/pl-fe/src/components/announcements/reactions-bar.tsx b/packages/pl-fe/src/components/announcements/reactions-bar.tsx index 6296cd7b1..4221a51fc 100644 --- a/packages/pl-fe/src/components/announcements/reactions-bar.tsx +++ b/packages/pl-fe/src/components/announcements/reactions-bar.tsx @@ -1,14 +1,14 @@ import { useTransition } from '@react-spring/web'; import React from 'react'; -import EmojiPickerDropdown from 'pl-fe/features/emoji/containers/emoji-picker-dropdown-container'; -import { useAnnouncements } from 'pl-fe/queries/announcements/use-announcements'; -import { useSettings } from 'pl-fe/stores/settings'; +import EmojiPickerDropdown from '@/features/emoji/containers/emoji-picker-dropdown-container'; +import { useAnnouncements } from '@/queries/announcements/use-announcements'; +import { useSettings } from '@/stores/settings'; import Reaction from './reaction'; +import type { Emoji, NativeEmoji } from '@/features/emoji'; import type { AnnouncementReaction, CustomEmoji } from 'pl-api'; -import type { Emoji, NativeEmoji } from 'pl-fe/features/emoji'; interface IReactionsBar { announcementId: string; diff --git a/packages/pl-fe/src/components/attachment-thumbs.tsx b/packages/pl-fe/src/components/attachment-thumbs.tsx index 9d7249074..e64412f25 100644 --- a/packages/pl-fe/src/components/attachment-thumbs.tsx +++ b/packages/pl-fe/src/components/attachment-thumbs.tsx @@ -1,13 +1,13 @@ import React, { Suspense } from 'react'; -import { MediaGallery } from 'pl-fe/features/ui/util/async-components'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import { MediaGallery } from '@/features/ui/util/async-components'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; import { useMediaVisible } from './statuses/sensitive-content-overlay'; +import type { Status } from '@/normalizers/status'; import type { MediaAttachment } from 'pl-api'; -import type { Status } from 'pl-fe/normalizers/status'; interface IAttachmentThumbs { status: Pick & Partial>; diff --git a/packages/pl-fe/src/components/authorize-reject-buttons.tsx b/packages/pl-fe/src/components/authorize-reject-buttons.tsx index a3058237c..f5c3b6a21 100644 --- a/packages/pl-fe/src/components/authorize-reject-buttons.tsx +++ b/packages/pl-fe/src/components/authorize-reject-buttons.tsx @@ -2,9 +2,9 @@ import clsx from 'clsx'; import React, { useEffect, useRef, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -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 HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Text from '@/components/ui/text'; interface IAuthorizeRejectButtons { onAuthorize(): Promise | unknown; diff --git a/packages/pl-fe/src/components/autosuggest-account-input.tsx b/packages/pl-fe/src/components/autosuggest-account-input.tsx index d6bf61388..c67619723 100644 --- a/packages/pl-fe/src/components/autosuggest-account-input.tsx +++ b/packages/pl-fe/src/components/autosuggest-account-input.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import AutosuggestInput, { AutoSuggestion } from 'pl-fe/components/autosuggest-input'; -import { useDebounce } from 'pl-fe/hooks/use-debounce'; -import { useAccountSearch } from 'pl-fe/queries/search/use-search-accounts'; +import AutosuggestInput, { AutoSuggestion } from '@/components/autosuggest-input'; +import { useDebounce } from '@/hooks/use-debounce'; +import { useAccountSearch } from '@/queries/search/use-search-accounts'; -import type { Menu } from 'pl-fe/components/dropdown-menu'; -import type { InputThemes } from 'pl-fe/components/ui/input'; +import type { Menu } from '@/components/dropdown-menu'; +import type { InputThemes } from '@/components/ui/input'; const SEARCH_PARAMS = { limit: 5, diff --git a/packages/pl-fe/src/components/autosuggest-emoji.test.tsx b/packages/pl-fe/src/components/autosuggest-emoji.test.tsx index c18c07c4d..3f9150460 100644 --- a/packages/pl-fe/src/components/autosuggest-emoji.test.tsx +++ b/packages/pl-fe/src/components/autosuggest-emoji.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import AutosuggestEmoji from './autosuggest-emoji'; diff --git a/packages/pl-fe/src/components/autosuggest-emoji.tsx b/packages/pl-fe/src/components/autosuggest-emoji.tsx index 36253fc4d..2961a5f3d 100644 --- a/packages/pl-fe/src/components/autosuggest-emoji.tsx +++ b/packages/pl-fe/src/components/autosuggest-emoji.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { isCustomEmoji } from 'pl-fe/features/emoji'; -import unicodeMapping from 'pl-fe/features/emoji/mapping'; -import { useSettings } from 'pl-fe/stores/settings'; -import { joinPublicPath } from 'pl-fe/utils/static'; +import { isCustomEmoji } from '@/features/emoji'; +import unicodeMapping from '@/features/emoji/mapping'; +import { useSettings } from '@/stores/settings'; +import { joinPublicPath } from '@/utils/static'; -import type { Emoji } from 'pl-fe/features/emoji'; +import type { Emoji } from '@/features/emoji'; interface IAutosuggestEmoji { emoji: Emoji; diff --git a/packages/pl-fe/src/components/autosuggest-input.tsx b/packages/pl-fe/src/components/autosuggest-input.tsx index d78542b8a..d9ee5fe9d 100644 --- a/packages/pl-fe/src/components/autosuggest-input.tsx +++ b/packages/pl-fe/src/components/autosuggest-input.tsx @@ -1,19 +1,19 @@ import clsx from 'clsx'; import React, { useEffect, useRef, useState } from 'react'; -import AutosuggestEmoji from 'pl-fe/components/autosuggest-emoji'; -import Icon from 'pl-fe/components/icon'; -import Input from 'pl-fe/components/ui/input'; -import Portal from 'pl-fe/components/ui/portal'; -import AutosuggestAccount from 'pl-fe/features/compose/components/autosuggest-account'; -import { textAtCursorMatchesToken } from 'pl-fe/utils/suggestions'; +import AutosuggestEmoji from '@/components/autosuggest-emoji'; +import Icon from '@/components/icon'; +import Input from '@/components/ui/input'; +import Portal from '@/components/ui/portal'; +import AutosuggestAccount from '@/features/compose/components/autosuggest-account'; +import { textAtCursorMatchesToken } from '@/utils/suggestions'; import AutosuggestLocation from './autosuggest-location'; +import type { Menu, MenuItem } from '@/components/dropdown-menu'; +import type { InputThemes } from '@/components/ui/input'; +import type { Emoji } from '@/features/emoji'; import type { Location } from 'pl-api'; -import type { Menu, MenuItem } from 'pl-fe/components/dropdown-menu'; -import type { InputThemes } from 'pl-fe/components/ui/input'; -import type { Emoji } from 'pl-fe/features/emoji'; type AutoSuggestion = string | Emoji | Location; diff --git a/packages/pl-fe/src/components/autosuggest-location.tsx b/packages/pl-fe/src/components/autosuggest-location.tsx index 7a7d1eede..caa10d750 100644 --- a/packages/pl-fe/src/components/autosuggest-location.tsx +++ b/packages/pl-fe/src/components/autosuggest-location.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; import type { Location } from 'pl-api'; diff --git a/packages/pl-fe/src/components/avatar-stack.tsx b/packages/pl-fe/src/components/avatar-stack.tsx index 737915af0..48f9fa57f 100644 --- a/packages/pl-fe/src/components/avatar-stack.tsx +++ b/packages/pl-fe/src/components/avatar-stack.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; import React from 'react'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { selectAccounts } from 'pl-fe/selectors'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { selectAccounts } from '@/selectors'; interface IAvatarStack { accountIds: Array; diff --git a/packages/pl-fe/src/components/badge.test.tsx b/packages/pl-fe/src/components/badge.test.tsx index 326619a18..57c851271 100644 --- a/packages/pl-fe/src/components/badge.test.tsx +++ b/packages/pl-fe/src/components/badge.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import Badge from './badge'; diff --git a/packages/pl-fe/src/components/badge.tsx b/packages/pl-fe/src/components/badge.tsx index 92ccf23b3..34c2d2956 100644 --- a/packages/pl-fe/src/components/badge.tsx +++ b/packages/pl-fe/src/components/badge.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import React, { useMemo } from 'react'; -import { hexToHsl } from 'pl-fe/utils/theme'; +import { hexToHsl } from '@/utils/theme'; interface IBadge { title: React.ReactNode | string; diff --git a/packages/pl-fe/src/components/big-card.tsx b/packages/pl-fe/src/components/big-card.tsx index 1efd4ca7f..75afde2f6 100644 --- a/packages/pl-fe/src/components/big-card.tsx +++ b/packages/pl-fe/src/components/big-card.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import Card, { CardBody } from 'pl-fe/components/ui/card'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import Card, { CardBody } from '@/components/ui/card'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; interface IBigCard { title: React.ReactNode; diff --git a/packages/pl-fe/src/components/birthday-input.tsx b/packages/pl-fe/src/components/birthday-input.tsx index da48cd5d5..57a0a5527 100644 --- a/packages/pl-fe/src/components/birthday-input.tsx +++ b/packages/pl-fe/src/components/birthday-input.tsx @@ -1,10 +1,10 @@ import React, { useMemo } from 'react'; import { defineMessages, FormattedDate, useIntl } from 'react-intl'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { DatePicker } from 'pl-fe/features/ui/util/async-components'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import IconButton from '@/components/ui/icon-button'; +import { DatePicker } from '@/features/ui/util/async-components'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; const messages = defineMessages({ birthdayPlaceholder: { id: 'edit_profile.fields.birthday_placeholder', defaultMessage: 'Your birthday' }, diff --git a/packages/pl-fe/src/components/copyable-input.tsx b/packages/pl-fe/src/components/copyable-input.tsx index f903d646e..d8a320446 100644 --- a/packages/pl-fe/src/components/copyable-input.tsx +++ b/packages/pl-fe/src/components/copyable-input.tsx @@ -1,9 +1,9 @@ import React, { useRef } from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; interface ICopyableInput { /** Text to be copied. */ diff --git a/packages/pl-fe/src/components/domain.tsx b/packages/pl-fe/src/components/domain.tsx index 2eb6bea09..5e1afbf0d 100644 --- a/packages/pl-fe/src/components/domain.tsx +++ b/packages/pl-fe/src/components/domain.tsx @@ -2,10 +2,10 @@ import { useMutation } from '@tanstack/react-query'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -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 { unblockDomainMutationOptions } from 'pl-fe/queries/settings/domain-blocks'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Text from '@/components/ui/text'; +import { unblockDomainMutationOptions } from '@/queries/settings/domain-blocks'; const messages = defineMessages({ blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' }, diff --git a/packages/pl-fe/src/components/dropdown-menu/dropdown-menu-item.tsx b/packages/pl-fe/src/components/dropdown-menu/dropdown-menu-item.tsx index 717a3f5d7..0f3b38461 100644 --- a/packages/pl-fe/src/components/dropdown-menu/dropdown-menu-item.tsx +++ b/packages/pl-fe/src/components/dropdown-menu/dropdown-menu-item.tsx @@ -2,10 +2,10 @@ import { useNavigate, type LinkOptions } from '@tanstack/react-router'; import clsx from 'clsx'; import React, { useEffect, useRef } from 'react'; -import Counter from 'pl-fe/components/ui/counter'; -import Icon from 'pl-fe/components/ui/icon'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { userTouching } from 'pl-fe/is-mobile'; +import Counter from '@/components/ui/counter'; +import Icon from '@/components/ui/icon'; +import Toggle from '@/components/ui/toggle'; +import { userTouching } from '@/is-mobile'; type Menu = Array; diff --git a/packages/pl-fe/src/components/dropdown-menu/dropdown-menu.tsx b/packages/pl-fe/src/components/dropdown-menu/dropdown-menu.tsx index 1a34bcf7d..5c7080a49 100644 --- a/packages/pl-fe/src/components/dropdown-menu/dropdown-menu.tsx +++ b/packages/pl-fe/src/components/dropdown-menu/dropdown-menu.tsx @@ -5,12 +5,12 @@ import React, { useEffect, useMemo, useRef, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import ReactSwipeableViews from 'react-swipeable-views'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Portal from 'pl-fe/components/ui/portal'; -import { userTouching } from 'pl-fe/is-mobile'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useUiStoreActions } from 'pl-fe/stores/ui'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Portal from '@/components/ui/portal'; +import { userTouching } from '@/is-mobile'; +import { useModalsActions } from '@/stores/modals'; +import { useUiStoreActions } from '@/stores/ui'; import DropdownMenuItem, { Menu } from './dropdown-menu-item'; diff --git a/packages/pl-fe/src/components/dropdown-navigation.tsx b/packages/pl-fe/src/components/dropdown-navigation.tsx index 2695ec56e..f91813b65 100644 --- a/packages/pl-fe/src/components/dropdown-navigation.tsx +++ b/packages/pl-fe/src/components/dropdown-navigation.tsx @@ -5,27 +5,27 @@ import clsx from 'clsx'; import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { fetchOwnAccounts, logOut, switchAccount } from 'pl-fe/actions/auth'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import Account from 'pl-fe/components/account'; -import Divider from 'pl-fe/components/ui/divider'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import ProfileStats from 'pl-fe/features/ui/components/profile-stats'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useRegistrationStatus } from 'pl-fe/hooks/use-registration-status'; -import { useFollowRequestsCount } from 'pl-fe/queries/accounts/use-follow-requests'; -import { scheduledStatusesCountQueryOptions } from 'pl-fe/queries/statuses/scheduled-statuses'; -import { useDraftStatusesCountQuery } from 'pl-fe/queries/statuses/use-draft-statuses'; -import { useInteractionRequestsCount } from 'pl-fe/queries/statuses/use-interaction-requests'; -import { makeGetOtherAccounts } from 'pl-fe/selectors'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useIsSidebarOpen, useUiStoreActions } from 'pl-fe/stores/ui'; -import sourceCode from 'pl-fe/utils/code'; +import { fetchOwnAccounts, logOut, switchAccount } from '@/actions/auth'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import Account from '@/components/account'; +import Divider from '@/components/ui/divider'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import ProfileStats from '@/features/ui/components/profile-stats'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useRegistrationStatus } from '@/hooks/use-registration-status'; +import { useFollowRequestsCount } from '@/queries/accounts/use-follow-requests'; +import { scheduledStatusesCountQueryOptions } from '@/queries/statuses/scheduled-statuses'; +import { useDraftStatusesCountQuery } from '@/queries/statuses/use-draft-statuses'; +import { useInteractionRequestsCount } from '@/queries/statuses/use-interaction-requests'; +import { makeGetOtherAccounts } from '@/selectors'; +import { useSettings } from '@/stores/settings'; +import { useIsSidebarOpen, useUiStoreActions } from '@/stores/ui'; +import sourceCode from '@/utils/code'; import type { Account as AccountEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/components/event-preview.tsx b/packages/pl-fe/src/components/event-preview.tsx index 2c7131ae6..2a25c526b 100644 --- a/packages/pl-fe/src/components/event-preview.tsx +++ b/packages/pl-fe/src/components/event-preview.tsx @@ -2,18 +2,18 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import EventActionButton from 'pl-fe/features/event/components/event-action-button'; -import EventDate from 'pl-fe/features/event/components/event-date'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import Icon from '@/components/icon'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import Emojify from '@/features/emoji/emojify'; +import EventActionButton from '@/features/event/components/event-action-button'; +import EventDate from '@/features/event/components/event-date'; +import { useAppSelector } from '@/hooks/use-app-selector'; -import type { Status as StatusEntity } from 'pl-fe/normalizers/status'; +import type { Status as StatusEntity } from '@/normalizers/status'; const messages = defineMessages({ eventBanner: { id: 'event.banner', defaultMessage: 'Event banner' }, diff --git a/packages/pl-fe/src/components/extended-video-player.tsx b/packages/pl-fe/src/components/extended-video-player.tsx index 4ec02815b..b6829f1fe 100644 --- a/packages/pl-fe/src/components/extended-video-player.tsx +++ b/packages/pl-fe/src/components/extended-video-player.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef } from 'react'; -import { isIOS } from 'pl-fe/is-mobile'; +import { isIOS } from '@/is-mobile'; interface IExtendedVideoPlayer { src: string; diff --git a/packages/pl-fe/src/components/group-card.tsx b/packages/pl-fe/src/components/group-card.tsx index 769d08cce..c21eea2c1 100644 --- a/packages/pl-fe/src/components/group-card.tsx +++ b/packages/pl-fe/src/components/group-card.tsx @@ -1,13 +1,13 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import GroupHeaderImage from 'pl-fe/features/group/components/group-header-image'; -import GroupMemberCount from 'pl-fe/features/group/components/group-member-count'; -import GroupPrivacy from 'pl-fe/features/group/components/group-privacy'; -import GroupRelationship from 'pl-fe/features/group/components/group-relationship'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import GroupHeaderImage from '@/features/group/components/group-header-image'; +import GroupMemberCount from '@/features/group/components/group-member-count'; +import GroupPrivacy from '@/features/group/components/group-privacy'; +import GroupRelationship from '@/features/group/components/group-relationship'; import GroupAvatar from './groups/group-avatar'; diff --git a/packages/pl-fe/src/components/groups/group-avatar.tsx b/packages/pl-fe/src/components/groups/group-avatar.tsx index 110d5c8a8..2dcdfb686 100644 --- a/packages/pl-fe/src/components/groups/group-avatar.tsx +++ b/packages/pl-fe/src/components/groups/group-avatar.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import { GroupRoles, type Group } from 'pl-api'; import React from 'react'; -import Avatar from 'pl-fe/components/ui/avatar'; +import Avatar from '@/components/ui/avatar'; interface IGroupAvatar { group: Pick; diff --git a/packages/pl-fe/src/components/groups/popover/group-popover.tsx b/packages/pl-fe/src/components/groups/popover/group-popover.tsx index dca545a9e..1c4005d83 100644 --- a/packages/pl-fe/src/components/groups/popover/group-popover.tsx +++ b/packages/pl-fe/src/components/groups/popover/group-popover.tsx @@ -2,16 +2,16 @@ import { Link, useMatch } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Divider from 'pl-fe/components/ui/divider'; -import HStack from 'pl-fe/components/ui/hstack'; -import Popover from 'pl-fe/components/ui/popover'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import GroupMemberCount from 'pl-fe/features/group/components/group-member-count'; -import GroupPrivacy from 'pl-fe/features/group/components/group-privacy'; -import { groupTimelineRoute } from 'pl-fe/features/ui/router'; +import Button from '@/components/ui/button'; +import Divider from '@/components/ui/divider'; +import HStack from '@/components/ui/hstack'; +import Popover from '@/components/ui/popover'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import GroupMemberCount from '@/features/group/components/group-member-count'; +import GroupPrivacy from '@/features/group/components/group-privacy'; +import { groupTimelineRoute } from '@/features/ui/router'; import GroupAvatar from '../group-avatar'; diff --git a/packages/pl-fe/src/components/hashtag.tsx b/packages/pl-fe/src/components/hashtag.tsx index abbf92718..a780854d5 100644 --- a/packages/pl-fe/src/components/hashtag.tsx +++ b/packages/pl-fe/src/components/hashtag.tsx @@ -3,9 +3,9 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import { Sparklines, SparklinesCurve } from 'react-sparklines'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; import { shortNumberFormat } from '../utils/numbers'; diff --git a/packages/pl-fe/src/components/helmet.tsx b/packages/pl-fe/src/components/helmet.tsx index 367b7761e..8e8139516 100644 --- a/packages/pl-fe/src/components/helmet.tsx +++ b/packages/pl-fe/src/components/helmet.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { Helmet as ReactHelmet } from 'react-helmet-async'; -import { useStatContext } from 'pl-fe/contexts/stat-context'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePendingUsersCount } from 'pl-fe/queries/admin/use-accounts'; -import { usePendingReportsCount } from 'pl-fe/queries/admin/use-reports'; -import { useSettings } from 'pl-fe/stores/settings'; -import FaviconService from 'pl-fe/utils/favicon-service'; +import { useStatContext } from '@/contexts/stat-context'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useInstance } from '@/hooks/use-instance'; +import { usePendingUsersCount } from '@/queries/admin/use-accounts'; +import { usePendingReportsCount } from '@/queries/admin/use-reports'; +import { useSettings } from '@/stores/settings'; +import FaviconService from '@/utils/favicon-service'; FaviconService.initFaviconService(); diff --git a/packages/pl-fe/src/components/hover-account-wrapper.tsx b/packages/pl-fe/src/components/hover-account-wrapper.tsx index 3781ef7d1..301edee45 100644 --- a/packages/pl-fe/src/components/hover-account-wrapper.tsx +++ b/packages/pl-fe/src/components/hover-account-wrapper.tsx @@ -2,10 +2,10 @@ import clsx from 'clsx'; import debounce from 'lodash/debounce'; import React, { useRef } from 'react'; -import { fetchAccount } from 'pl-fe/actions/accounts'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { isMobile } from 'pl-fe/is-mobile'; -import { useAccountHoverCardActions } from 'pl-fe/stores/account-hover-card'; +import { fetchAccount } from '@/actions/accounts'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { isMobile } from '@/is-mobile'; +import { useAccountHoverCardActions } from '@/stores/account-hover-card'; const showAccountHoverCard = debounce((openAccountHoverCard, ref, accountId) => { openAccountHoverCard(ref, accountId); diff --git a/packages/pl-fe/src/components/hover-status-wrapper.tsx b/packages/pl-fe/src/components/hover-status-wrapper.tsx index 4a0f016c0..69428d436 100644 --- a/packages/pl-fe/src/components/hover-status-wrapper.tsx +++ b/packages/pl-fe/src/components/hover-status-wrapper.tsx @@ -2,8 +2,8 @@ import clsx from 'clsx'; import debounce from 'lodash/debounce'; import React, { useRef } from 'react'; -import { isMobile } from 'pl-fe/is-mobile'; -import { useStatusHoverCardActions } from 'pl-fe/stores/status-hover-card'; +import { isMobile } from '@/is-mobile'; +import { useStatusHoverCardActions } from '@/stores/status-hover-card'; const showStatusHoverCard = debounce((openStatusHoverCard, ref, statusId) => { openStatusHoverCard(ref, statusId); diff --git a/packages/pl-fe/src/components/icon-with-counter.tsx b/packages/pl-fe/src/components/icon-with-counter.tsx index ec97b09d9..0ba099e38 100644 --- a/packages/pl-fe/src/components/icon-with-counter.tsx +++ b/packages/pl-fe/src/components/icon-with-counter.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import Icon, { IIcon } from 'pl-fe/components/icon'; -import Counter from 'pl-fe/components/ui/counter'; +import Icon, { IIcon } from '@/components/icon'; +import Counter from '@/components/ui/counter'; interface IIconWithCounter extends React.HTMLAttributes { count: number; diff --git a/packages/pl-fe/src/components/list.tsx b/packages/pl-fe/src/components/list.tsx index 70272007a..fdfbd9d6c 100644 --- a/packages/pl-fe/src/components/list.tsx +++ b/packages/pl-fe/src/components/list.tsx @@ -2,10 +2,10 @@ import { Link, type LinkOptions } from '@tanstack/react-router'; import clsx from 'clsx'; import React, { useState } from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Select from 'pl-fe/components/ui/select'; -import { SelectDropdown } from 'pl-fe/features/forms'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Select from '@/components/ui/select'; +import { SelectDropdown } from '@/features/forms'; interface IList { children: React.ReactNode; diff --git a/packages/pl-fe/src/components/load-gap.tsx b/packages/pl-fe/src/components/load-gap.tsx index 428c47583..842d2174f 100644 --- a/packages/pl-fe/src/components/load-gap.tsx +++ b/packages/pl-fe/src/components/load-gap.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; +import Icon from '@/components/icon'; const messages = defineMessages({ load_more: { id: 'status.load_more', defaultMessage: 'Load more' }, diff --git a/packages/pl-fe/src/components/location-search.tsx b/packages/pl-fe/src/components/location-search.tsx index dfc3893c0..f5c123249 100644 --- a/packages/pl-fe/src/components/location-search.tsx +++ b/packages/pl-fe/src/components/location-search.tsx @@ -3,9 +3,9 @@ import clsx from 'clsx'; import React, { useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import AutosuggestInput, { AutoSuggestion } from 'pl-fe/components/autosuggest-input'; -import Icon from 'pl-fe/components/icon'; -import { useSearchLocation } from 'pl-fe/queries/search/use-search-location'; +import AutosuggestInput, { AutoSuggestion } from '@/components/autosuggest-input'; +import Icon from '@/components/icon'; +import { useSearchLocation } from '@/queries/search/use-search-location'; import type { Location } from 'pl-api'; diff --git a/packages/pl-fe/src/components/media-gallery.tsx b/packages/pl-fe/src/components/media-gallery.tsx index d4d6c4bee..c29e85dce 100644 --- a/packages/pl-fe/src/components/media-gallery.tsx +++ b/packages/pl-fe/src/components/media-gallery.tsx @@ -2,17 +2,17 @@ import clsx from 'clsx'; import React, { useState, useRef, useLayoutEffect, CSSProperties } from 'react'; import { FormattedMessage } from 'react-intl'; -import AltIndicator from 'pl-fe/components/alt-indicator'; -import Blurhash from 'pl-fe/components/blurhash'; -import Icon from 'pl-fe/components/icon'; -import StillImage from 'pl-fe/components/still-image'; -import Popover from 'pl-fe/components/ui/popover'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { MIMETYPE_ICONS } from 'pl-fe/components/upload'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { useSettings } from 'pl-fe/stores/settings'; -import { truncateFilename } from 'pl-fe/utils/media'; +import AltIndicator from '@/components/alt-indicator'; +import Blurhash from '@/components/blurhash'; +import Icon from '@/components/icon'; +import StillImage from '@/components/still-image'; +import Popover from '@/components/ui/popover'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { MIMETYPE_ICONS } from '@/components/upload'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { useSettings } from '@/stores/settings'; +import { truncateFilename } from '@/utils/media'; import { isIOS } from '../is-mobile'; import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media-aspect-ratio'; diff --git a/packages/pl-fe/src/components/mention.tsx b/packages/pl-fe/src/components/mention.tsx index ce6d0e1f2..9d21d487d 100644 --- a/packages/pl-fe/src/components/mention.tsx +++ b/packages/pl-fe/src/components/mention.tsx @@ -1,7 +1,7 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; -import Tooltip from 'pl-fe/components/ui/tooltip'; +import Tooltip from '@/components/ui/tooltip'; import type { Mention as MentionEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/components/missing-indicator.tsx b/packages/pl-fe/src/components/missing-indicator.tsx index 397b55f14..c97b2b6c2 100644 --- a/packages/pl-fe/src/components/missing-indicator.tsx +++ b/packages/pl-fe/src/components/missing-indicator.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Card, { CardBody } from 'pl-fe/components/ui/card'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import Card, { CardBody } from '@/components/ui/card'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; interface MissingIndicatorProps { nested?: boolean; diff --git a/packages/pl-fe/src/components/modal-root.tsx b/packages/pl-fe/src/components/modal-root.tsx index 4798455f4..767821bb3 100644 --- a/packages/pl-fe/src/components/modal-root.tsx +++ b/packages/pl-fe/src/components/modal-root.tsx @@ -4,14 +4,14 @@ import range from 'lodash/range'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { cancelReplyCompose } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { usePrevious } from 'pl-fe/hooks/use-previous'; -import { usePersistDraftStatus } from 'pl-fe/queries/statuses/use-draft-statuses'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { cancelReplyCompose } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { usePrevious } from '@/hooks/use-previous'; +import { usePersistDraftStatus } from '@/queries/statuses/use-draft-statuses'; +import { useModalsActions } from '@/stores/modals'; -import type { ModalType } from 'pl-fe/features/ui/components/modal-root'; -import type { Compose } from 'pl-fe/reducers/compose'; +import type { ModalType } from '@/features/ui/components/modal-root'; +import type { Compose } from '@/reducers/compose'; const messages = defineMessages({ confirm: { id: 'confirmations.cancel.confirm', defaultMessage: 'Discard' }, diff --git a/packages/pl-fe/src/components/navlinks.tsx b/packages/pl-fe/src/components/navlinks.tsx index ab87c14c2..403c184ce 100644 --- a/packages/pl-fe/src/components/navlinks.tsx +++ b/packages/pl-fe/src/components/navlinks.tsx @@ -1,9 +1,9 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; -import Text from 'pl-fe/components/ui/text'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { useSettings } from 'pl-fe/stores/settings'; +import Text from '@/components/ui/text'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { useSettings } from '@/stores/settings'; interface INavlinks { type: string; diff --git a/packages/pl-fe/src/components/parsed-content.tsx b/packages/pl-fe/src/components/parsed-content.tsx index 3c71eee04..1b03dccda 100644 --- a/packages/pl-fe/src/components/parsed-content.tsx +++ b/packages/pl-fe/src/components/parsed-content.tsx @@ -7,11 +7,11 @@ import minBy from 'lodash/minBy'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useSettings } from 'pl-fe/stores/settings'; -import { makeEmojiMap } from 'pl-fe/utils/normalizers'; -import nyaize from 'pl-fe/utils/nyaize'; -import Purify from 'pl-fe/utils/url-purify'; +import Emojify from '@/features/emoji/emojify'; +import { useSettings } from '@/stores/settings'; +import { makeEmojiMap } from '@/utils/normalizers'; +import nyaize from '@/utils/nyaize'; +import Purify from '@/utils/url-purify'; import HashtagLink from './hashtag-link'; import HoverAccountWrapper from './hover-account-wrapper'; diff --git a/packages/pl-fe/src/components/parsed-mfm.tsx b/packages/pl-fe/src/components/parsed-mfm.tsx index 3af088996..38fb83ed8 100644 --- a/packages/pl-fe/src/components/parsed-mfm.tsx +++ b/packages/pl-fe/src/components/parsed-mfm.tsx @@ -5,9 +5,9 @@ import * as mfm from '@transfem-org/sfm-js'; import clamp from 'lodash/clamp'; import React, { CSSProperties } from 'react'; -import { useSettings } from 'pl-fe/stores/settings'; -import { makeEmojiMap } from 'pl-fe/utils/normalizers'; -import nyaize from 'pl-fe/utils/nyaize'; +import { useSettings } from '@/stores/settings'; +import { makeEmojiMap } from '@/utils/normalizers'; +import nyaize from '@/utils/nyaize'; import HashtagLink from './hashtag-link'; import HoverAccountWrapper from './hover-account-wrapper'; diff --git a/packages/pl-fe/src/components/pending-items-row.tsx b/packages/pl-fe/src/components/pending-items-row.tsx index d179a3255..05d6028ff 100644 --- a/packages/pl-fe/src/components/pending-items-row.tsx +++ b/packages/pl-fe/src/components/pending-items-row.tsx @@ -3,9 +3,9 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; interface IPendingItemsRow extends LinkOptions { /** Number of pending items. */ diff --git a/packages/pl-fe/src/components/polls/poll-footer.test.tsx b/packages/pl-fe/src/components/polls/poll-footer.test.tsx index 600cc8682..4e06e91e2 100644 --- a/packages/pl-fe/src/components/polls/poll-footer.test.tsx +++ b/packages/pl-fe/src/components/polls/poll-footer.test.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { IntlProvider } from 'react-intl'; import { Provider } from 'react-redux'; -import { __stub } from 'pl-fe/api'; -import { mockStore, render, screen, rootState } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { mockStore, render, screen, rootState } from '@/jest/test-helpers'; import PollFooter from './poll-footer'; diff --git a/packages/pl-fe/src/components/polls/poll-footer.tsx b/packages/pl-fe/src/components/polls/poll-footer.tsx index 93db9dc7e..e90c99c6e 100644 --- a/packages/pl-fe/src/components/polls/poll-footer.tsx +++ b/packages/pl-fe/src/components/polls/poll-footer.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Tooltip from 'pl-fe/components/ui/tooltip'; -import { usePollQuery, usePollVoteMutation } from 'pl-fe/queries/statuses/use-poll'; -import { useStatusMetaActions } from 'pl-fe/stores/status-meta'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Tooltip from '@/components/ui/tooltip'; +import { usePollQuery, usePollVoteMutation } from '@/queries/statuses/use-poll'; +import { useStatusMetaActions } from '@/stores/status-meta'; import RelativeTimestamp from '../relative-timestamp'; diff --git a/packages/pl-fe/src/components/polls/poll-option.tsx b/packages/pl-fe/src/components/polls/poll-option.tsx index 48a941176..87dc1ad0a 100644 --- a/packages/pl-fe/src/components/polls/poll-option.tsx +++ b/packages/pl-fe/src/components/polls/poll-option.tsx @@ -3,9 +3,9 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; import { ParsedContent } from '../parsed-content'; diff --git a/packages/pl-fe/src/components/polls/poll.tsx b/packages/pl-fe/src/components/polls/poll.tsx index 2cd6fda57..f7357e276 100644 --- a/packages/pl-fe/src/components/polls/poll.tsx +++ b/packages/pl-fe/src/components/polls/poll.tsx @@ -1,17 +1,17 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { usePollQuery, usePollVoteMutation } from 'pl-fe/queries/statuses/use-poll'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useStatusMeta } from 'pl-fe/stores/status-meta'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { usePollQuery, usePollVoteMutation } from '@/queries/statuses/use-poll'; +import { useModalsActions } from '@/stores/modals'; +import { useStatusMeta } from '@/stores/status-meta'; import PollFooter from './poll-footer'; import PollOption from './poll-option'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; type Selected = Record; diff --git a/packages/pl-fe/src/components/preview-card.tsx b/packages/pl-fe/src/components/preview-card.tsx index 9de11473a..f43198bea 100644 --- a/packages/pl-fe/src/components/preview-card.tsx +++ b/packages/pl-fe/src/components/preview-card.tsx @@ -5,14 +5,14 @@ import React, { useState, useEffect } from 'react'; import { FormattedMessage } from 'react-intl'; import * as v from 'valibot'; -import Blurhash from 'pl-fe/components/blurhash'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { addAutoPlay } from 'pl-fe/utils/media'; -import { getTextDirection } from 'pl-fe/utils/rtl'; +import Blurhash from '@/components/blurhash'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import { addAutoPlay } from '@/utils/media'; +import { getTextDirection } from '@/utils/rtl'; import HoverAccountWrapper from './hover-account-wrapper'; import Avatar from './ui/avatar'; diff --git a/packages/pl-fe/src/components/quoted-status-indicator.tsx b/packages/pl-fe/src/components/quoted-status-indicator.tsx index 7f054f5a5..04fe07848 100644 --- a/packages/pl-fe/src/components/quoted-status-indicator.tsx +++ b/packages/pl-fe/src/components/quoted-status-indicator.tsx @@ -1,10 +1,10 @@ import React, { useCallback } from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; interface IQuotedStatusIndicator { /** The quoted status id. */ diff --git a/packages/pl-fe/src/components/quoted-status.test.tsx b/packages/pl-fe/src/components/quoted-status.test.tsx index 47773018f..e394a1147 100644 --- a/packages/pl-fe/src/components/quoted-status.test.tsx +++ b/packages/pl-fe/src/components/quoted-status.test.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import { render, screen, rootState } from 'pl-fe/jest/test-helpers'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; +import { render, screen, rootState } from '@/jest/test-helpers'; +import { normalizeStatus } from '@/normalizers/status'; import QuotedStatus from './quoted-status'; -import type { ReducerStatus } from 'pl-fe/reducers/statuses'; +import type { ReducerStatus } from '@/reducers/statuses'; describe('', () => { it('renders content', () => { diff --git a/packages/pl-fe/src/components/quoted-status.tsx b/packages/pl-fe/src/components/quoted-status.tsx index 157cd67fa..ce7365377 100644 --- a/packages/pl-fe/src/components/quoted-status.tsx +++ b/packages/pl-fe/src/components/quoted-status.tsx @@ -3,9 +3,9 @@ import clsx from 'clsx'; import React, { MouseEventHandler } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import StatusMedia from 'pl-fe/components/status-media'; -import Stack from 'pl-fe/components/ui/stack'; -import AccountContainer from 'pl-fe/containers/account-container'; +import StatusMedia from '@/components/status-media'; +import Stack from '@/components/ui/stack'; +import AccountContainer from '@/containers/account-container'; import EventPreview from './event-preview'; import OutlineBox from './outline-box'; @@ -14,7 +14,7 @@ import StatusContent from './status-content'; import StatusReplyMentions from './status-reply-mentions'; import SensitiveContentOverlay from './statuses/sensitive-content-overlay'; -import type { SelectedStatus } from 'pl-fe/selectors'; +import type { SelectedStatus } from '@/selectors'; const messages = defineMessages({ cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' }, diff --git a/packages/pl-fe/src/components/scrobble.tsx b/packages/pl-fe/src/components/scrobble.tsx index ee10d3d5b..8685c2d62 100644 --- a/packages/pl-fe/src/components/scrobble.tsx +++ b/packages/pl-fe/src/components/scrobble.tsx @@ -2,9 +2,9 @@ import clsx from 'clsx'; import React, { useMemo, useRef } from 'react'; import { FormattedMessage } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; import type { Scrobble as ScrobbleEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/components/scroll-top-button.test.tsx b/packages/pl-fe/src/components/scroll-top-button.test.tsx index c2214d74c..286d0a848 100644 --- a/packages/pl-fe/src/components/scroll-top-button.test.tsx +++ b/packages/pl-fe/src/components/scroll-top-button.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { defineMessages } from 'react-intl'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import ScrollTopButton from './scroll-top-button'; diff --git a/packages/pl-fe/src/components/scroll-top-button.tsx b/packages/pl-fe/src/components/scroll-top-button.tsx index 2128736a9..18cbe529f 100644 --- a/packages/pl-fe/src/components/scroll-top-button.tsx +++ b/packages/pl-fe/src/components/scroll-top-button.tsx @@ -3,8 +3,8 @@ import throttle from 'lodash/throttle'; import React, { useState, useEffect, useCallback } from 'react'; import { useIntl, MessageDescriptor } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; -import { useSettings } from 'pl-fe/stores/settings'; +import Icon from '@/components/ui/icon'; +import { useSettings } from '@/stores/settings'; interface IScrollTopButton { /** Callback when clicked, and also when scrolled to the top. */ diff --git a/packages/pl-fe/src/components/scrollable-list.tsx b/packages/pl-fe/src/components/scrollable-list.tsx index 0bec32c4c..aca638312 100644 --- a/packages/pl-fe/src/components/scrollable-list.tsx +++ b/packages/pl-fe/src/components/scrollable-list.tsx @@ -3,9 +3,9 @@ import debounce from 'lodash/debounce'; import React, { useEffect, useRef, useMemo, useCallback } from 'react'; import { Virtuoso, Components, VirtuosoProps, VirtuosoHandle, ListRange, IndexLocationWithAlign } from 'react-virtuoso'; -import LoadMore from 'pl-fe/components/load-more'; -import Spinner from 'pl-fe/components/ui/spinner'; -import { useSettings } from 'pl-fe/stores/settings'; +import LoadMore from '@/components/load-more'; +import Spinner from '@/components/ui/spinner'; +import { useSettings } from '@/stores/settings'; import { EmptyMessage } from './empty-message'; diff --git a/packages/pl-fe/src/components/search-input.tsx b/packages/pl-fe/src/components/search-input.tsx index 5f425297b..7d0d35d1b 100644 --- a/packages/pl-fe/src/components/search-input.tsx +++ b/packages/pl-fe/src/components/search-input.tsx @@ -3,10 +3,10 @@ import clsx from 'clsx'; import React, { useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import AutosuggestAccountInput from 'pl-fe/components/autosuggest-account-input'; -import SvgIcon from 'pl-fe/components/ui/svg-icon'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { selectAccount } from 'pl-fe/selectors'; +import AutosuggestAccountInput from '@/components/autosuggest-account-input'; +import SvgIcon from '@/components/ui/svg-icon'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { selectAccount } from '@/selectors'; const messages = defineMessages({ placeholder: { id: 'search.placeholder', defaultMessage: 'Search' }, diff --git a/packages/pl-fe/src/components/sentry-feedback-form.tsx b/packages/pl-fe/src/components/sentry-feedback-form.tsx index 6e9756630..1e0f105ca 100644 --- a/packages/pl-fe/src/components/sentry-feedback-form.tsx +++ b/packages/pl-fe/src/components/sentry-feedback-form.tsx @@ -1,14 +1,14 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Text from 'pl-fe/components/ui/text'; -import Textarea from 'pl-fe/components/ui/textarea'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { captureSentryFeedback } from 'pl-fe/sentry'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Text from '@/components/ui/text'; +import Textarea from '@/components/ui/textarea'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { captureSentryFeedback } from '@/sentry'; interface ISentryFeedbackForm { eventId: string; diff --git a/packages/pl-fe/src/components/sidebar-navigation-link.tsx b/packages/pl-fe/src/components/sidebar-navigation-link.tsx index 1ead6775e..912bd8f95 100644 --- a/packages/pl-fe/src/components/sidebar-navigation-link.tsx +++ b/packages/pl-fe/src/components/sidebar-navigation-link.tsx @@ -1,7 +1,7 @@ import { Link, useMatchRoute, type LinkOptions } from '@tanstack/react-router'; import React from 'react'; -import { useSettings } from 'pl-fe/stores/settings'; +import { useSettings } from '@/stores/settings'; import Icon from './ui/icon'; diff --git a/packages/pl-fe/src/components/sidebar-navigation.tsx b/packages/pl-fe/src/components/sidebar-navigation.tsx index a4eed97fb..63771153e 100644 --- a/packages/pl-fe/src/components/sidebar-navigation.tsx +++ b/packages/pl-fe/src/components/sidebar-navigation.tsx @@ -3,24 +3,24 @@ import clsx from 'clsx'; import React, { useMemo } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import { useStatContext } from 'pl-fe/contexts/stat-context'; -import ComposeButton from 'pl-fe/features/ui/components/compose-button'; -import ProfileDropdown from 'pl-fe/features/ui/components/profile-dropdown'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -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'; -import { useRegistrationStatus } from 'pl-fe/hooks/use-registration-status'; -import { useFollowRequestsCount } from 'pl-fe/queries/accounts/use-follow-requests'; -import { usePendingUsersCount } from 'pl-fe/queries/admin/use-accounts'; -import { usePendingReportsCount } from 'pl-fe/queries/admin/use-reports'; -import { scheduledStatusesCountQueryOptions } from 'pl-fe/queries/statuses/scheduled-statuses'; -import { useDraftStatusesCountQuery } from 'pl-fe/queries/statuses/use-draft-statuses'; -import { useInteractionRequestsCount } from 'pl-fe/queries/statuses/use-interaction-requests'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import sourceCode from 'pl-fe/utils/code'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import { useStatContext } from '@/contexts/stat-context'; +import ComposeButton from '@/features/ui/components/compose-button'; +import ProfileDropdown from '@/features/ui/components/profile-dropdown'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useRegistrationStatus } from '@/hooks/use-registration-status'; +import { useFollowRequestsCount } from '@/queries/accounts/use-follow-requests'; +import { usePendingUsersCount } from '@/queries/admin/use-accounts'; +import { usePendingReportsCount } from '@/queries/admin/use-reports'; +import { scheduledStatusesCountQueryOptions } from '@/queries/statuses/scheduled-statuses'; +import { useDraftStatusesCountQuery } from '@/queries/statuses/use-draft-statuses'; +import { useInteractionRequestsCount } from '@/queries/statuses/use-interaction-requests'; +import { useModalsActions } from '@/stores/modals'; +import sourceCode from '@/utils/code'; import Account from './account'; import DropdownMenu, { Menu } from './dropdown-menu'; diff --git a/packages/pl-fe/src/components/site-error.tsx b/packages/pl-fe/src/components/site-error.tsx index 3dbd01226..d4528ca02 100644 --- a/packages/pl-fe/src/components/site-error.tsx +++ b/packages/pl-fe/src/components/site-error.tsx @@ -1,18 +1,18 @@ import React, { useEffect, useRef, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { NODE_ENV } from 'pl-fe/build-config'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Textarea from 'pl-fe/components/ui/textarea'; -import { useLogo } from 'pl-fe/hooks/use-logo'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { captureSentryException } from 'pl-fe/sentry'; -import KVStore from 'pl-fe/storage/kv-store'; -import sourceCode from 'pl-fe/utils/code'; -import { isNetworkError } from 'pl-fe/utils/errors'; -import { unregisterSW } from 'pl-fe/utils/sw'; +import { NODE_ENV } from '@/build-config'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Textarea from '@/components/ui/textarea'; +import { useLogo } from '@/hooks/use-logo'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { captureSentryException } from '@/sentry'; +import KVStore from '@/storage/kv-store'; +import sourceCode from '@/utils/code'; +import { isNetworkError } from '@/utils/errors'; +import { unregisterSW } from '@/utils/sw'; import SentryFeedbackForm from './sentry-feedback-form'; import SiteLogo from './site-logo'; diff --git a/packages/pl-fe/src/components/site-logo.tsx b/packages/pl-fe/src/components/site-logo.tsx index 38eb5630a..57d25eade 100644 --- a/packages/pl-fe/src/components/site-logo.tsx +++ b/packages/pl-fe/src/components/site-logo.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useLogo } from 'pl-fe/hooks/use-logo'; +import { useLogo } from '@/hooks/use-logo'; const messages = defineMessages({ logo: { id: 'generic.logo', defaultMessage: 'Logo' }, diff --git a/packages/pl-fe/src/components/status-action-bar.tsx b/packages/pl-fe/src/components/status-action-bar.tsx index c0b2fa7f3..b0ed7c976 100644 --- a/packages/pl-fe/src/components/status-action-bar.tsx +++ b/packages/pl-fe/src/components/status-action-bar.tsx @@ -3,47 +3,47 @@ import { type Account, type CustomEmoji, type Group, GroupRoles } from 'pl-api'; import React, { useCallback, useMemo } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { redactStatus } from 'pl-fe/actions/admin'; -import { directCompose, mentionCompose, quoteCompose, replyCompose } from 'pl-fe/actions/compose'; -import { emojiReact, unEmojiReact } from 'pl-fe/actions/emoji-reacts'; -import { deleteStatusModal, toggleStatusSensitivityModal } from 'pl-fe/actions/moderation'; -import { initReport, ReportableEntities } from 'pl-fe/actions/reports'; -import { changeSetting } from 'pl-fe/actions/settings'; -import { deleteStatus, editStatus, toggleMuteStatus } from 'pl-fe/actions/statuses'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import { useGroupRelationship } from 'pl-fe/api/hooks/groups/use-group-relationship'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import StatusActionButton from 'pl-fe/components/status-action-button'; -import EmojiPickerDropdown from 'pl-fe/features/emoji/containers/emoji-picker-dropdown-container'; -import { languages } from 'pl-fe/features/preferences'; -import { layouts } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useCanInteract } from 'pl-fe/hooks/use-can-interact'; -import { useClient } from 'pl-fe/hooks/use-client'; -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'; -import { useUnblockAccountMutation } from 'pl-fe/queries/accounts/use-relationship'; -import { useChats } from 'pl-fe/queries/chats'; -import { useBlockGroupUserMutation } from 'pl-fe/queries/groups/use-group-blocks'; -import { useCustomEmojis } from 'pl-fe/queries/instance/use-custom-emojis'; -import { useTranslationLanguages } from 'pl-fe/queries/instance/use-translation-languages'; -import { useBookmarkStatus, useDislikeStatus, useFavouriteStatus, usePinStatus, useReblogStatus, useUnbookmarkStatus, useUndislikeStatus, useUnfavouriteStatus, useUnpinStatus, useUnreblogStatus } from 'pl-fe/queries/statuses/use-status-interactions'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useStatusMeta, useStatusMetaActions } from 'pl-fe/stores/status-meta'; -import toast from 'pl-fe/toast'; -import copy from 'pl-fe/utils/copy'; +import { redactStatus } from '@/actions/admin'; +import { directCompose, mentionCompose, quoteCompose, replyCompose } from '@/actions/compose'; +import { emojiReact, unEmojiReact } from '@/actions/emoji-reacts'; +import { deleteStatusModal, toggleStatusSensitivityModal } from '@/actions/moderation'; +import { initReport, ReportableEntities } from '@/actions/reports'; +import { changeSetting } from '@/actions/settings'; +import { deleteStatus, editStatus, toggleMuteStatus } from '@/actions/statuses'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import { useGroupRelationship } from '@/api/hooks/groups/use-group-relationship'; +import DropdownMenu from '@/components/dropdown-menu'; +import StatusActionButton from '@/components/status-action-button'; +import EmojiPickerDropdown from '@/features/emoji/containers/emoji-picker-dropdown-container'; +import { languages } from '@/features/preferences'; +import { layouts } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useCanInteract } from '@/hooks/use-can-interact'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useUnblockAccountMutation } from '@/queries/accounts/use-relationship'; +import { useChats } from '@/queries/chats'; +import { useBlockGroupUserMutation } from '@/queries/groups/use-group-blocks'; +import { useCustomEmojis } from '@/queries/instance/use-custom-emojis'; +import { useTranslationLanguages } from '@/queries/instance/use-translation-languages'; +import { useBookmarkStatus, useDislikeStatus, useFavouriteStatus, usePinStatus, useReblogStatus, useUnbookmarkStatus, useUndislikeStatus, useUnfavouriteStatus, useUnpinStatus, useUnreblogStatus } from '@/queries/statuses/use-status-interactions'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; +import { useStatusMeta, useStatusMetaActions } from '@/stores/status-meta'; +import toast from '@/toast'; +import copy from '@/utils/copy'; import GroupPopover from './groups/popover/group-popover'; import Popover from './ui/popover'; -import type { Menu } from 'pl-fe/components/dropdown-menu'; -import type { Emoji as EmojiType } from 'pl-fe/features/emoji'; -import type { UnauthorizedModalAction } from 'pl-fe/modals/unauthorized-modal'; -import type { SelectedStatus } from 'pl-fe/selectors'; -import type { Me } from 'pl-fe/types/pl-fe'; +import type { Menu } from '@/components/dropdown-menu'; +import type { Emoji as EmojiType } from '@/features/emoji'; +import type { UnauthorizedModalAction } from '@/modals/unauthorized-modal'; +import type { SelectedStatus } from '@/selectors'; +import type { Me } from '@/types/pl-fe'; const messages = defineMessages({ adminAccount: { id: 'status.admin_account', defaultMessage: 'Moderate @{name}' }, diff --git a/packages/pl-fe/src/components/status-action-button.tsx b/packages/pl-fe/src/components/status-action-button.tsx index 54b8489aa..769de4fe9 100644 --- a/packages/pl-fe/src/components/status-action-button.tsx +++ b/packages/pl-fe/src/components/status-action-button.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; import React from 'react'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; -import { useLongPress } from 'pl-fe/hooks/use-long-press'; -import { useSettings } from 'pl-fe/stores/settings'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; +import { useLongPress } from '@/hooks/use-long-press'; +import { useSettings } from '@/stores/settings'; import AnimatedNumber from './animated-number'; diff --git a/packages/pl-fe/src/components/status-content.tsx b/packages/pl-fe/src/components/status-content.tsx index e95344621..270657b60 100644 --- a/packages/pl-fe/src/components/status-content.tsx +++ b/packages/pl-fe/src/components/status-content.tsx @@ -2,18 +2,18 @@ import clsx from 'clsx'; import React, { useState, useRef, useLayoutEffect, useMemo, useEffect } from 'react'; import { FormattedMessage } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import Button from 'pl-fe/components/ui/button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import QuotedStatus from 'pl-fe/features/status/containers/quoted-status-container'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { useLocalStatusTranslation } from 'pl-fe/queries/statuses/use-local-status-translation'; -import { useStatusTranslation } from 'pl-fe/queries/statuses/use-status-translation'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useStatusMeta, useStatusMetaActions } from 'pl-fe/stores/status-meta'; -import { onlyEmoji as isOnlyEmoji } from 'pl-fe/utils/rich-content'; +import Icon from '@/components/icon'; +import Button from '@/components/ui/button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import QuotedStatus from '@/features/status/containers/quoted-status-container'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { useLocalStatusTranslation } from '@/queries/statuses/use-local-status-translation'; +import { useStatusTranslation } from '@/queries/statuses/use-status-translation'; +import { useSettings } from '@/stores/settings'; +import { useStatusMeta, useStatusMetaActions } from '@/stores/status-meta'; +import { onlyEmoji as isOnlyEmoji } from '@/utils/rich-content'; import { getTextDirection } from '../utils/rtl'; @@ -27,8 +27,8 @@ import StatusMedia from './status-media'; import SensitiveContentOverlay from './statuses/sensitive-content-overlay'; import TranslateButton from './translate-button'; -import type { Sizes } from 'pl-fe/components/ui/text'; -import type { MinifiedStatus } from 'pl-fe/reducers/statuses'; +import type { Sizes } from '@/components/ui/text'; +import type { MinifiedStatus } from '@/reducers/statuses'; const BIG_EMOJI_LIMIT = 10; diff --git a/packages/pl-fe/src/components/status-hover-card.tsx b/packages/pl-fe/src/components/status-hover-card.tsx index eb60e9248..b0ede9db4 100644 --- a/packages/pl-fe/src/components/status-hover-card.tsx +++ b/packages/pl-fe/src/components/status-hover-card.tsx @@ -4,12 +4,12 @@ import clsx from 'clsx'; import React, { useEffect } from 'react'; import { useIntl } from 'react-intl'; -import { fetchStatus } from 'pl-fe/actions/statuses'; -import { showStatusHoverCard } from 'pl-fe/components/hover-status-wrapper'; -import StatusContainer from 'pl-fe/containers/status-container'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useStatusHoverCardActions, useStatusHoverCardStore } from 'pl-fe/stores/status-hover-card'; +import { fetchStatus } from '@/actions/statuses'; +import { showStatusHoverCard } from '@/components/hover-status-wrapper'; +import StatusContainer from '@/containers/status-container'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useStatusHoverCardActions, useStatusHoverCardStore } from '@/stores/status-hover-card'; interface IStatusHoverCard { visible?: boolean; diff --git a/packages/pl-fe/src/components/status-language-picker.tsx b/packages/pl-fe/src/components/status-language-picker.tsx index b6bbcde48..0ddbc3607 100644 --- a/packages/pl-fe/src/components/status-language-picker.tsx +++ b/packages/pl-fe/src/components/status-language-picker.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; -import { type Language, languages } from 'pl-fe/features/preferences'; -import { useStatusMeta, useStatusMetaActions } from 'pl-fe/stores/status-meta'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; +import { type Language, languages } from '@/features/preferences'; +import { useStatusMeta, useStatusMetaActions } from '@/stores/status-meta'; import DropdownMenu from './dropdown-menu'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; const messages = defineMessages({ languageVersions: { id: 'status.language_versions', defaultMessage: 'The post has multiple language versions.' }, diff --git a/packages/pl-fe/src/components/status-list.tsx b/packages/pl-fe/src/components/status-list.tsx index bc2735048..efeb3daa4 100644 --- a/packages/pl-fe/src/components/status-list.tsx +++ b/packages/pl-fe/src/components/status-list.tsx @@ -3,14 +3,14 @@ import debounce from 'lodash/debounce'; import React, { useRef, useCallback, useMemo } from 'react'; import { FormattedMessage } from 'react-intl'; -import LoadGap from 'pl-fe/components/load-gap'; -import ScrollableList, { type IScrollableList } from 'pl-fe/components/scrollable-list'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import StatusContainer from 'pl-fe/containers/status-container'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import PendingStatus from 'pl-fe/features/ui/components/pending-status'; -import { selectChild } from 'pl-fe/utils/scroll-utils'; +import LoadGap from '@/components/load-gap'; +import ScrollableList, { type IScrollableList } from '@/components/scrollable-list'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import StatusContainer from '@/containers/status-container'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import PendingStatus from '@/features/ui/components/pending-status'; +import { selectChild } from '@/utils/scroll-utils'; import Icon from './ui/icon'; diff --git a/packages/pl-fe/src/components/status-media.tsx b/packages/pl-fe/src/components/status-media.tsx index 80ae56cc9..693651a80 100644 --- a/packages/pl-fe/src/components/status-media.tsx +++ b/packages/pl-fe/src/components/status-media.tsx @@ -1,16 +1,16 @@ import React, { Suspense } from 'react'; -import AttachmentThumbs from 'pl-fe/components/attachment-thumbs'; -import PreviewCard from 'pl-fe/components/preview-card'; -import PlaceholderCard from 'pl-fe/features/placeholder/components/placeholder-card'; -import { MediaGallery, Video, Audio } from 'pl-fe/features/ui/util/async-components'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import AttachmentThumbs from '@/components/attachment-thumbs'; +import PreviewCard from '@/components/preview-card'; +import PlaceholderCard from '@/features/placeholder/components/placeholder-card'; +import { MediaGallery, Video, Audio } from '@/features/ui/util/async-components'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; import { useMediaVisible } from './statuses/sensitive-content-overlay'; +import type { Status } from '@/normalizers/status'; import type { MediaAttachment } from 'pl-api'; -import type { Status } from 'pl-fe/normalizers/status'; interface IStatusMedia { /** Status entity to render media for. */ diff --git a/packages/pl-fe/src/components/status-mention.tsx b/packages/pl-fe/src/components/status-mention.tsx index fdcc2caef..fe1331401 100644 --- a/packages/pl-fe/src/components/status-mention.tsx +++ b/packages/pl-fe/src/components/status-mention.tsx @@ -1,7 +1,7 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; +import { useAccount } from '@/api/hooks/accounts/use-account'; import HoverAccountWrapper from './hover-account-wrapper'; diff --git a/packages/pl-fe/src/components/status-reactions-bar.tsx b/packages/pl-fe/src/components/status-reactions-bar.tsx index 3d48fa1a3..b74a091bb 100644 --- a/packages/pl-fe/src/components/status-reactions-bar.tsx +++ b/packages/pl-fe/src/components/status-reactions-bar.tsx @@ -2,23 +2,23 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { emojiReact, unEmojiReact } from 'pl-fe/actions/emoji-reacts'; -import Emoji from 'pl-fe/components/ui/emoji'; -import Icon from 'pl-fe/components/ui/icon'; -import EmojiPickerDropdown from 'pl-fe/features/emoji/containers/emoji-picker-dropdown-container'; -import unicodeMapping from 'pl-fe/features/emoji/mapping'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { useLongPress } from 'pl-fe/hooks/use-long-press'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import { emojiReact, unEmojiReact } from '@/actions/emoji-reacts'; +import Emoji from '@/components/ui/emoji'; +import Icon from '@/components/ui/icon'; +import EmojiPickerDropdown from '@/features/emoji/containers/emoji-picker-dropdown-container'; +import unicodeMapping from '@/features/emoji/mapping'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { useLongPress } from '@/hooks/use-long-press'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; import AnimatedNumber from './animated-number'; +import type { Emoji as EmojiType } from '@/features/emoji'; +import type { SelectedStatus } from '@/selectors'; import type { EmojiReaction } from 'pl-api'; -import type { Emoji as EmojiType } from 'pl-fe/features/emoji'; -import type { SelectedStatus } from 'pl-fe/selectors'; const messages = defineMessages({ emojiCount: { id: 'status.reactions.label', defaultMessage: '{count} {count, plural, one {person} other {people}} reacted with {emoji}' }, diff --git a/packages/pl-fe/src/components/status-reply-mentions.tsx b/packages/pl-fe/src/components/status-reply-mentions.tsx index 8ea6531ef..941e69ef4 100644 --- a/packages/pl-fe/src/components/status-reply-mentions.tsx +++ b/packages/pl-fe/src/components/status-reply-mentions.tsx @@ -2,11 +2,11 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedList, FormattedMessage } from 'react-intl'; -import HoverAccountWrapper from 'pl-fe/components/hover-account-wrapper'; -import HoverStatusWrapper from 'pl-fe/components/hover-status-wrapper'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import HoverAccountWrapper from '@/components/hover-account-wrapper'; +import HoverStatusWrapper from '@/components/hover-status-wrapper'; +import { useModalsActions } from '@/stores/modals'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; interface IStatusReplyMentions { status: Pick; diff --git a/packages/pl-fe/src/components/status.test.tsx b/packages/pl-fe/src/components/status.test.tsx index 4872720f1..9c2bf40dc 100644 --- a/packages/pl-fe/src/components/status.test.tsx +++ b/packages/pl-fe/src/components/status.test.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import { buildAccount } from 'pl-fe/jest/factory'; -import { render, screen, rootState } from 'pl-fe/jest/test-helpers'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; +import { buildAccount } from '@/jest/factory'; +import { render, screen, rootState } from '@/jest/test-helpers'; +import { normalizeStatus } from '@/normalizers/status'; import Status from './status'; -import type { ReducerStatus } from 'pl-fe/reducers/statuses'; +import type { ReducerStatus } from '@/reducers/statuses'; const account = buildAccount({ id: '1', diff --git a/packages/pl-fe/src/components/status.tsx b/packages/pl-fe/src/components/status.tsx index 9769f4db3..d09890bf7 100644 --- a/packages/pl-fe/src/components/status.tsx +++ b/packages/pl-fe/src/components/status.tsx @@ -3,24 +3,24 @@ import clsx from 'clsx'; import React, { useEffect, useMemo, useRef } from 'react'; import { defineMessages, useIntl, FormattedList, FormattedMessage } from 'react-intl'; -import { mentionCompose, replyCompose } from 'pl-fe/actions/compose'; -import { unfilterStatus } from 'pl-fe/actions/statuses'; -import Card from 'pl-fe/components/ui/card'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; -import AccountContainer from 'pl-fe/containers/account-container'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import StatusTypeIcon from 'pl-fe/features/status/components/status-type-icon'; -import { Hotkeys } from 'pl-fe/features/ui/components/hotkeys'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFollowedTags } from 'pl-fe/queries/hashtags/use-followed-tags'; -import { useFavouriteStatus, useReblogStatus, useUnfavouriteStatus, useUnreblogStatus } from 'pl-fe/queries/statuses/use-status-interactions'; -import { makeGetStatus, type SelectedStatus } from 'pl-fe/selectors'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useStatusMetaActions } from 'pl-fe/stores/status-meta'; -import { textForScreenReader } from 'pl-fe/utils/status'; +import { mentionCompose, replyCompose } from '@/actions/compose'; +import { unfilterStatus } from '@/actions/statuses'; +import Card from '@/components/ui/card'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; +import AccountContainer from '@/containers/account-container'; +import Emojify from '@/features/emoji/emojify'; +import StatusTypeIcon from '@/features/status/components/status-type-icon'; +import { Hotkeys } from '@/features/ui/components/hotkeys'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFollowedTags } from '@/queries/hashtags/use-followed-tags'; +import { useFavouriteStatus, useReblogStatus, useUnfavouriteStatus, useUnreblogStatus } from '@/queries/statuses/use-status-interactions'; +import { makeGetStatus, type SelectedStatus } from '@/selectors'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; +import { useStatusMetaActions } from '@/stores/status-meta'; +import { textForScreenReader } from '@/utils/status'; import EventPreview from './event-preview'; import HashtagLink from './hashtag-link'; diff --git a/packages/pl-fe/src/components/statuses/sensitive-content-overlay.test.tsx b/packages/pl-fe/src/components/statuses/sensitive-content-overlay.test.tsx index 9d1542459..4c0c7d667 100644 --- a/packages/pl-fe/src/components/statuses/sensitive-content-overlay.test.tsx +++ b/packages/pl-fe/src/components/statuses/sensitive-content-overlay.test.tsx @@ -1,9 +1,9 @@ import { Map as ImmutableMap } from 'immutable'; import React from 'react'; -import { fireEvent, render, rootState, screen } from 'pl-fe/jest/test-helpers'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; -import { ReducerStatus } from 'pl-fe/reducers/statuses'; +import { fireEvent, render, rootState, screen } from '@/jest/test-helpers'; +import { normalizeStatus } from '@/normalizers/status'; +import { ReducerStatus } from '@/reducers/statuses'; import SensitiveContentOverlay from './sensitive-content-overlay'; diff --git a/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx b/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx index 898a7cd40..17625bdd3 100644 --- a/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx +++ b/packages/pl-fe/src/components/statuses/sensitive-content-overlay.tsx @@ -2,14 +2,14 @@ import clsx from 'clsx'; import React, { useMemo } from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import Text from 'pl-fe/components/ui/text'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useStatusMeta, useStatusMetaActions } from 'pl-fe/stores/status-meta'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import Text from '@/components/ui/text'; +import { useSettings } from '@/stores/settings'; +import { useStatusMeta, useStatusMetaActions } from '@/stores/status-meta'; +import type { Status } from '@/normalizers/status'; import type { FilterResult } from 'pl-api'; -import type { Status } from 'pl-fe/normalizers/status'; const useMediaVisible = (status: Pick & Partial>, displayMedia: 'default' | 'show_all' | 'hide_all'): [boolean, Array] => { const { mediaVisible } = useStatusMeta(status.id as string); diff --git a/packages/pl-fe/src/components/statuses/status-info.tsx b/packages/pl-fe/src/components/statuses/status-info.tsx index ba5ee1ba7..fecf36b52 100644 --- a/packages/pl-fe/src/components/statuses/status-info.tsx +++ b/packages/pl-fe/src/components/statuses/status-info.tsx @@ -1,8 +1,8 @@ import clsx from 'clsx'; import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Text from '@/components/ui/text'; interface IStatusInfo { avatarSize: number; diff --git a/packages/pl-fe/src/components/still-image.tsx b/packages/pl-fe/src/components/still-image.tsx index 7b18fef3a..16bc55395 100644 --- a/packages/pl-fe/src/components/still-image.tsx +++ b/packages/pl-fe/src/components/still-image.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import React, { useRef } from 'react'; -import { useSettings } from 'pl-fe/stores/settings'; +import { useSettings } from '@/stores/settings'; interface IStillImage { /** Image alt text. */ diff --git a/packages/pl-fe/src/components/thumb-navigation-link.tsx b/packages/pl-fe/src/components/thumb-navigation-link.tsx index 74998fef4..77805f850 100644 --- a/packages/pl-fe/src/components/thumb-navigation-link.tsx +++ b/packages/pl-fe/src/components/thumb-navigation-link.tsx @@ -1,9 +1,9 @@ import { Link, useMatchRoute, type LinkOptions } from '@tanstack/react-router'; import React from 'react'; -import IconWithCounter from 'pl-fe/components/icon-with-counter'; -import Icon from 'pl-fe/components/ui/icon'; -import { useSettings } from 'pl-fe/stores/settings'; +import IconWithCounter from '@/components/icon-with-counter'; +import Icon from '@/components/ui/icon'; +import { useSettings } from '@/stores/settings'; interface IThumbNavigationLink extends LinkOptions { count?: number; diff --git a/packages/pl-fe/src/components/thumb-navigation.tsx b/packages/pl-fe/src/components/thumb-navigation.tsx index 4808abd0b..ed0d45591 100644 --- a/packages/pl-fe/src/components/thumb-navigation.tsx +++ b/packages/pl-fe/src/components/thumb-navigation.tsx @@ -2,19 +2,19 @@ import { useMatch } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { groupComposeModal } from 'pl-fe/actions/compose'; -import ThumbNavigationLink from 'pl-fe/components/thumb-navigation-link'; -import Icon from 'pl-fe/components/ui/icon'; -import { useStatContext } from 'pl-fe/contexts/stat-context'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { layouts } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useIsSidebarOpen, useUiStoreActions } from 'pl-fe/stores/ui'; -import { isStandalone } from 'pl-fe/utils/state'; +import { groupComposeModal } from '@/actions/compose'; +import ThumbNavigationLink from '@/components/thumb-navigation-link'; +import Icon from '@/components/ui/icon'; +import { useStatContext } from '@/contexts/stat-context'; +import { Entities } from '@/entity-store/entities'; +import { layouts } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useModalsActions } from '@/stores/modals'; +import { useIsSidebarOpen, useUiStoreActions } from '@/stores/ui'; +import { isStandalone } from '@/utils/state'; const messages = defineMessages({ home: { id: 'column.home', defaultMessage: 'Home' }, diff --git a/packages/pl-fe/src/components/tombstone.tsx b/packages/pl-fe/src/components/tombstone.tsx index 9fd123e8e..c8877c349 100644 --- a/packages/pl-fe/src/components/tombstone.tsx +++ b/packages/pl-fe/src/components/tombstone.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Text from 'pl-fe/components/ui/text'; -import { Hotkeys } from 'pl-fe/features/ui/components/hotkeys'; +import Text from '@/components/ui/text'; +import { Hotkeys } from '@/features/ui/components/hotkeys'; interface ITombstone { id: string; diff --git a/packages/pl-fe/src/components/translate-button.tsx b/packages/pl-fe/src/components/translate-button.tsx index 4249b6c8e..27ab29d05 100644 --- a/packages/pl-fe/src/components/translate-button.tsx +++ b/packages/pl-fe/src/components/translate-button.tsx @@ -1,21 +1,21 @@ import React, { useEffect } from 'react'; import { FormattedMessage, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useTranslationLanguages } from 'pl-fe/queries/instance/use-translation-languages'; -import { useLocalStatusTranslation } from 'pl-fe/queries/statuses/use-local-status-translation'; -import { useStatusTranslation } from 'pl-fe/queries/statuses/use-status-translation'; -import { useLanguageModelAvailability, useLanguageModelAvailabilityActions } from 'pl-fe/stores/language-model-availability'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useStatusMeta, useStatusMetaActions } from 'pl-fe/stores/status-meta'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useTranslationLanguages } from '@/queries/instance/use-translation-languages'; +import { useLocalStatusTranslation } from '@/queries/statuses/use-local-status-translation'; +import { useStatusTranslation } from '@/queries/statuses/use-status-translation'; +import { useLanguageModelAvailability, useLanguageModelAvailabilityActions } from '@/stores/language-model-availability'; +import { useSettings } from '@/stores/settings'; +import { useStatusMeta, useStatusMetaActions } from '@/stores/status-meta'; +import type { Status } from '@/normalizers/status'; import type { Instance } from 'pl-api'; -import type { Status } from 'pl-fe/normalizers/status'; const canRemoteTranslate = (status: ITranslateButton['status'], instance: Instance, supportedLanguages: Record>, locale: string, isLoggedIn?: boolean) => { const { diff --git a/packages/pl-fe/src/components/trending-link.tsx b/packages/pl-fe/src/components/trending-link.tsx index 4d538f692..9dfba592b 100644 --- a/packages/pl-fe/src/components/trending-link.tsx +++ b/packages/pl-fe/src/components/trending-link.tsx @@ -2,7 +2,7 @@ import { Link } from '@tanstack/react-router'; import { TrendsLink } from 'pl-api'; import React from 'react'; -import { getTextDirection } from 'pl-fe/utils/rtl'; +import { getTextDirection } from '@/utils/rtl'; import Blurhash from './blurhash'; import { accountsCountRenderer } from './hashtag'; diff --git a/packages/pl-fe/src/components/ui/accordion.tsx b/packages/pl-fe/src/components/ui/accordion.tsx index 7e9f092b6..de75a487a 100644 --- a/packages/pl-fe/src/components/ui/accordion.tsx +++ b/packages/pl-fe/src/components/ui/accordion.tsx @@ -2,11 +2,11 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; +import DropdownMenu from '@/components/dropdown-menu'; import Icon from './icon'; -import type { Menu } from 'pl-fe/components/dropdown-menu'; +import type { Menu } from '@/components/dropdown-menu'; const messages = defineMessages({ collapse: { id: 'accordion.collapse', defaultMessage: 'Collapse' }, diff --git a/packages/pl-fe/src/components/ui/avatar.test.tsx b/packages/pl-fe/src/components/ui/avatar.test.tsx index bee883599..c8a073d13 100644 --- a/packages/pl-fe/src/components/ui/avatar.test.tsx +++ b/packages/pl-fe/src/components/ui/avatar.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import Avatar from './avatar'; diff --git a/packages/pl-fe/src/components/ui/avatar.tsx b/packages/pl-fe/src/components/ui/avatar.tsx index ffa95991b..5e3319416 100644 --- a/packages/pl-fe/src/components/ui/avatar.tsx +++ b/packages/pl-fe/src/components/ui/avatar.tsx @@ -3,8 +3,8 @@ import { FastAverageColor } from 'fast-average-color'; import React, { useEffect, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import StillImage, { IStillImage } from 'pl-fe/components/still-image'; -import { useSettings } from 'pl-fe/stores/settings'; +import StillImage, { IStillImage } from '@/components/still-image'; +import { useSettings } from '@/stores/settings'; import AltIndicator from '../alt-indicator'; @@ -122,7 +122,7 @@ const Avatar = (props: IAvatar) => { diff --git a/packages/pl-fe/src/components/ui/button/index.test.tsx b/packages/pl-fe/src/components/ui/button/index.test.tsx index 6e74963ce..d454814ac 100644 --- a/packages/pl-fe/src/components/ui/button/index.test.tsx +++ b/packages/pl-fe/src/components/ui/button/index.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { fireEvent, render, screen } from 'pl-fe/jest/test-helpers'; +import { fireEvent, render, screen } from '@/jest/test-helpers'; import Button from '.'; diff --git a/packages/pl-fe/src/components/ui/card.test.tsx b/packages/pl-fe/src/components/ui/card.test.tsx index a73ca23a1..56d06bae4 100644 --- a/packages/pl-fe/src/components/ui/card.test.tsx +++ b/packages/pl-fe/src/components/ui/card.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import { Card, CardBody, CardHeader, CardTitle } from './card'; diff --git a/packages/pl-fe/src/components/ui/card.tsx b/packages/pl-fe/src/components/ui/card.tsx index 87cf799cb..8b61e30c9 100644 --- a/packages/pl-fe/src/components/ui/card.tsx +++ b/packages/pl-fe/src/components/ui/card.tsx @@ -3,7 +3,7 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import SvgIcon from 'pl-fe/components/ui/svg-icon'; +import SvgIcon from '@/components/ui/svg-icon'; const sizes = { md: 'p-4 sm:rounded-xl', diff --git a/packages/pl-fe/src/components/ui/column.test.tsx b/packages/pl-fe/src/components/ui/column.test.tsx index 7829ec666..4fd9ddd48 100644 --- a/packages/pl-fe/src/components/ui/column.test.tsx +++ b/packages/pl-fe/src/components/ui/column.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import { Column } from './column'; diff --git a/packages/pl-fe/src/components/ui/column.tsx b/packages/pl-fe/src/components/ui/column.tsx index b202b7b06..ad78f42d8 100644 --- a/packages/pl-fe/src/components/ui/column.tsx +++ b/packages/pl-fe/src/components/ui/column.tsx @@ -3,8 +3,8 @@ import clsx from 'clsx'; import throttle from 'lodash/throttle'; import React, { useCallback, useEffect, useState } from 'react'; -import Helmet from 'pl-fe/components/helmet'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; +import Helmet from '@/components/helmet'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; import { Card, CardBody, CardHeader, CardTitle, type CardSizes } from './card'; diff --git a/packages/pl-fe/src/components/ui/counter.tsx b/packages/pl-fe/src/components/ui/counter.tsx index 2770ae328..b7fda1092 100644 --- a/packages/pl-fe/src/components/ui/counter.tsx +++ b/packages/pl-fe/src/components/ui/counter.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import AnimatedNumber from 'pl-fe/components/animated-number'; +import AnimatedNumber from '@/components/animated-number'; interface ICounter { /** Number this counter should display. */ diff --git a/packages/pl-fe/src/components/ui/divider.test.tsx b/packages/pl-fe/src/components/ui/divider.test.tsx index 9a462f4df..426ee6be4 100644 --- a/packages/pl-fe/src/components/ui/divider.test.tsx +++ b/packages/pl-fe/src/components/ui/divider.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import Divider from './divider'; diff --git a/packages/pl-fe/src/components/ui/emoji.test.tsx b/packages/pl-fe/src/components/ui/emoji.test.tsx index a2413d6ef..215d91c0f 100644 --- a/packages/pl-fe/src/components/ui/emoji.test.tsx +++ b/packages/pl-fe/src/components/ui/emoji.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import Emoji from './emoji'; diff --git a/packages/pl-fe/src/components/ui/emoji.tsx b/packages/pl-fe/src/components/ui/emoji.tsx index 1a79e2626..d3283e0bd 100644 --- a/packages/pl-fe/src/components/ui/emoji.tsx +++ b/packages/pl-fe/src/components/ui/emoji.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import StillImage from 'pl-fe/components/still-image'; -import { useSettings } from 'pl-fe/stores/settings'; -import { removeVS16s, toCodePoints } from 'pl-fe/utils/emoji'; -import { joinPublicPath } from 'pl-fe/utils/static'; +import StillImage from '@/components/still-image'; +import { useSettings } from '@/stores/settings'; +import { removeVS16s, toCodePoints } from '@/utils/emoji'; +import { joinPublicPath } from '@/utils/static'; interface IEmoji extends Pick, 'alt' | 'className' | 'src' | 'title'> { /** Unicode emoji character. */ diff --git a/packages/pl-fe/src/components/ui/form-actions.test.tsx b/packages/pl-fe/src/components/ui/form-actions.test.tsx index 0ca3bd50f..082fccbc6 100644 --- a/packages/pl-fe/src/components/ui/form-actions.test.tsx +++ b/packages/pl-fe/src/components/ui/form-actions.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import FormActions from './form-actions'; diff --git a/packages/pl-fe/src/components/ui/form-group.test.tsx b/packages/pl-fe/src/components/ui/form-group.test.tsx index 1a7d84f2a..ede420ffb 100644 --- a/packages/pl-fe/src/components/ui/form-group.test.tsx +++ b/packages/pl-fe/src/components/ui/form-group.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import FormGroup from './form-group'; diff --git a/packages/pl-fe/src/components/ui/form.test.tsx b/packages/pl-fe/src/components/ui/form.test.tsx index a91b05643..c2ebb0205 100644 --- a/packages/pl-fe/src/components/ui/form.test.tsx +++ b/packages/pl-fe/src/components/ui/form.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { fireEvent, render, screen } from 'pl-fe/jest/test-helpers'; +import { fireEvent, render, screen } from '@/jest/test-helpers'; import Form from './form'; diff --git a/packages/pl-fe/src/components/ui/input.tsx b/packages/pl-fe/src/components/ui/input.tsx index 28a47f70f..936660542 100644 --- a/packages/pl-fe/src/components/ui/input.tsx +++ b/packages/pl-fe/src/components/ui/input.tsx @@ -2,8 +2,8 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useLocale, useLocaleDirection } from 'pl-fe/hooks/use-locale'; -import { getTextDirection } from 'pl-fe/utils/rtl'; +import { useLocale, useLocaleDirection } from '@/hooks/use-locale'; +import { getTextDirection } from '@/utils/rtl'; import Icon from './icon'; import SvgIcon from './svg-icon'; diff --git a/packages/pl-fe/src/components/ui/layout.tsx b/packages/pl-fe/src/components/ui/layout.tsx index 1f5c622e0..51c3a3e69 100644 --- a/packages/pl-fe/src/components/ui/layout.tsx +++ b/packages/pl-fe/src/components/ui/layout.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import React, { Suspense } from 'react'; import StickyBox from 'react-sticky-box'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useFeatures } from '@/hooks/use-features'; interface ISidebar { children: React.ReactNode; diff --git a/packages/pl-fe/src/components/ui/modal.test.tsx b/packages/pl-fe/src/components/ui/modal.test.tsx index 648a5bf06..10ae8a271 100644 --- a/packages/pl-fe/src/components/ui/modal.test.tsx +++ b/packages/pl-fe/src/components/ui/modal.test.tsx @@ -1,7 +1,7 @@ import userEvent from '@testing-library/user-event'; import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import Modal from './modal'; diff --git a/packages/pl-fe/src/components/ui/modal.tsx b/packages/pl-fe/src/components/ui/modal.tsx index fabe650c0..b5dd0ba88 100644 --- a/packages/pl-fe/src/components/ui/modal.tsx +++ b/packages/pl-fe/src/components/ui/modal.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; +import { useOwnAccount } from '@/hooks/use-own-account'; import Button from './button'; import { ButtonThemes } from './button/useButtonStyles'; diff --git a/packages/pl-fe/src/components/ui/progress-bar.tsx b/packages/pl-fe/src/components/ui/progress-bar.tsx index c09b562e2..4ccd3cbff 100644 --- a/packages/pl-fe/src/components/ui/progress-bar.tsx +++ b/packages/pl-fe/src/components/ui/progress-bar.tsx @@ -2,7 +2,7 @@ import { animated, useSpring } from '@react-spring/web'; import clsx from 'clsx'; import React from 'react'; -import { useSettings } from 'pl-fe/stores/settings'; +import { useSettings } from '@/stores/settings'; interface IProgressBar { /** Number between 0 and 1 to represent the percentage complete. */ diff --git a/packages/pl-fe/src/components/ui/slider.tsx b/packages/pl-fe/src/components/ui/slider.tsx index 6cff974ea..ceee3aee7 100644 --- a/packages/pl-fe/src/components/ui/slider.tsx +++ b/packages/pl-fe/src/components/ui/slider.tsx @@ -1,7 +1,7 @@ import throttle from 'lodash/throttle'; import React, { useCallback, useRef } from 'react'; -import { getPointerPosition } from 'pl-fe/features/video'; +import { getPointerPosition } from '@/features/video'; interface ISlider { /** Value between 0 and 1. */ diff --git a/packages/pl-fe/src/components/ui/step-slider.tsx b/packages/pl-fe/src/components/ui/step-slider.tsx index 3dfcfe427..cc561dc8f 100644 --- a/packages/pl-fe/src/components/ui/step-slider.tsx +++ b/packages/pl-fe/src/components/ui/step-slider.tsx @@ -1,7 +1,7 @@ import throttle from 'lodash/throttle'; import React, { useCallback, useRef } from 'react'; -import { getPointerPosition } from 'pl-fe/features/video'; +import { getPointerPosition } from '@/features/video'; interface IStepSlider { /** Value between 0 and the amount of steps minus one. */ diff --git a/packages/pl-fe/src/components/ui/svg-icon.test.tsx b/packages/pl-fe/src/components/ui/svg-icon.test.tsx index 380b8a28f..07bfcaa6c 100644 --- a/packages/pl-fe/src/components/ui/svg-icon.test.tsx +++ b/packages/pl-fe/src/components/ui/svg-icon.test.tsx @@ -1,7 +1,7 @@ import IconCode from '@phosphor-icons/core/regular/code.svg'; import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import SvgIcon from './svg-icon'; diff --git a/packages/pl-fe/src/components/ui/textarea.tsx b/packages/pl-fe/src/components/ui/textarea.tsx index c279f0f44..64fb83742 100644 --- a/packages/pl-fe/src/components/ui/textarea.tsx +++ b/packages/pl-fe/src/components/ui/textarea.tsx @@ -2,8 +2,8 @@ import clsx from 'clsx'; import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { useLocale, useLocaleDirection } from 'pl-fe/hooks/use-locale'; -import { getTextDirection } from 'pl-fe/utils/rtl'; +import { useLocale, useLocaleDirection } from '@/hooks/use-locale'; +import { getTextDirection } from '@/utils/rtl'; import Stack from './stack'; import Text from './text'; diff --git a/packages/pl-fe/src/components/ui/toast.tsx b/packages/pl-fe/src/components/ui/toast.tsx index 630c440ae..7a6195fd0 100644 --- a/packages/pl-fe/src/components/ui/toast.tsx +++ b/packages/pl-fe/src/components/ui/toast.tsx @@ -4,7 +4,7 @@ import React from 'react'; import toast, { Toast as RHToast } from 'react-hot-toast'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import { ToastText, ToastType } from 'pl-fe/toast'; +import { ToastText, ToastType } from '@/toast'; import HStack from './hstack'; import Icon from './icon'; diff --git a/packages/pl-fe/src/components/ui/widget.tsx b/packages/pl-fe/src/components/ui/widget.tsx index 0f31739b2..df134b3b9 100644 --- a/packages/pl-fe/src/components/ui/widget.tsx +++ b/packages/pl-fe/src/components/ui/widget.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import React from 'react'; -import IconButton from 'pl-fe/components/ui/icon-button'; +import IconButton from '@/components/ui/icon-button'; interface IWidget { /** Widget title text. */ diff --git a/packages/pl-fe/src/components/upload-progress.tsx b/packages/pl-fe/src/components/upload-progress.tsx index 7d5dd79d6..f24630801 100644 --- a/packages/pl-fe/src/components/upload-progress.tsx +++ b/packages/pl-fe/src/components/upload-progress.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import ProgressBar from 'pl-fe/components/ui/progress-bar'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import ProgressBar from '@/components/ui/progress-bar'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; interface IUploadProgress { /** Number between 0 and 100 to represent the percentage complete. */ diff --git a/packages/pl-fe/src/components/upload.tsx b/packages/pl-fe/src/components/upload.tsx index 5d7325248..514bdc6f7 100644 --- a/packages/pl-fe/src/components/upload.tsx +++ b/packages/pl-fe/src/components/upload.tsx @@ -25,13 +25,13 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import AltIndicator from 'pl-fe/components/alt-indicator'; -import Blurhash from 'pl-fe/components/blurhash'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import AltIndicator from '@/components/alt-indicator'; +import Blurhash from '@/components/blurhash'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; import type { MediaAttachment } from 'pl-api'; diff --git a/packages/pl-fe/src/components/verification-badge.tsx b/packages/pl-fe/src/components/verification-badge.tsx index a6026a25e..b1b072596 100644 --- a/packages/pl-fe/src/components/verification-badge.tsx +++ b/packages/pl-fe/src/components/verification-badge.tsx @@ -2,8 +2,8 @@ import clsx from 'clsx'; import React from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; +import Icon from '@/components/ui/icon'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; const messages = defineMessages({ verified: { id: 'account.verified', defaultMessage: 'Verified Account' }, diff --git a/packages/pl-fe/src/containers/account-container.tsx b/packages/pl-fe/src/containers/account-container.tsx index 0fb237734..44457820b 100644 --- a/packages/pl-fe/src/containers/account-container.tsx +++ b/packages/pl-fe/src/containers/account-container.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import Account, { IAccount } from 'pl-fe/components/account'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import Account, { IAccount } from '@/components/account'; interface IAccountContainer extends Omit { id: string; diff --git a/packages/pl-fe/src/containers/status-container.tsx b/packages/pl-fe/src/containers/status-container.tsx index 17416aa13..f1d7b3928 100644 --- a/packages/pl-fe/src/containers/status-container.tsx +++ b/packages/pl-fe/src/containers/status-container.tsx @@ -1,8 +1,8 @@ import React, { useMemo } from 'react'; -import Status, { IStatus } from 'pl-fe/components/status'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; +import Status, { IStatus } from '@/components/status'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; interface IStatusContainer extends Omit { id: string; diff --git a/packages/pl-fe/src/contexts/chat-context.tsx b/packages/pl-fe/src/contexts/chat-context.tsx index c6f2d1257..adf92d5ec 100644 --- a/packages/pl-fe/src/contexts/chat-context.tsx +++ b/packages/pl-fe/src/contexts/chat-context.tsx @@ -1,11 +1,11 @@ import { useMatch } from '@tanstack/react-router'; import React, { createContext, useContext, useEffect, useMemo, useState } from 'react'; -import { toggleChatPane } from 'pl-fe/actions/chats'; -import { chatRoute, layouts } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useChat } from 'pl-fe/queries/chats'; -import { useSettings } from 'pl-fe/stores/settings'; +import { toggleChatPane } from '@/actions/chats'; +import { chatRoute, layouts } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useChat } from '@/queries/chats'; +import { useSettings } from '@/stores/settings'; import type { Chat } from 'pl-api'; diff --git a/packages/pl-fe/src/entity-store/hooks/use-batched-entities.ts b/packages/pl-fe/src/entity-store/hooks/use-batched-entities.ts index cdb87f016..0415cf7db 100644 --- a/packages/pl-fe/src/entity-store/hooks/use-batched-entities.ts +++ b/packages/pl-fe/src/entity-store/hooks/use-batched-entities.ts @@ -1,10 +1,10 @@ import { useEffect } from 'react'; import * as v from 'valibot'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useGetState } from 'pl-fe/hooks/use-get-state'; -import { filteredArray } from 'pl-fe/schemas/utils'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useGetState } from '@/hooks/use-get-state'; +import { filteredArray } from '@/schemas/utils'; import { entitiesFetchFail, entitiesFetchRequest, entitiesFetchSuccess } from '../actions'; import { selectCache, selectListState, useListState } from '../selectors'; @@ -13,7 +13,7 @@ import { parseEntitiesPath } from './utils'; import type { EntitiesPath, EntityFn, EntitySchema, ExpandedEntitiesPath } from './types'; import type { Entity } from '../types'; -import type { RootState } from 'pl-fe/store'; +import type { RootState } from '@/store'; interface UseBatchedEntitiesOpts { schema?: EntitySchema; diff --git a/packages/pl-fe/src/entity-store/hooks/use-create-entity.ts b/packages/pl-fe/src/entity-store/hooks/use-create-entity.ts index 81edb991a..9574c9f08 100644 --- a/packages/pl-fe/src/entity-store/hooks/use-create-entity.ts +++ b/packages/pl-fe/src/entity-store/hooks/use-create-entity.ts @@ -1,7 +1,7 @@ import * as v from 'valibot'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useLoading } from 'pl-fe/hooks/use-loading'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useLoading } from '@/hooks/use-loading'; import { importEntities } from '../actions'; @@ -9,7 +9,7 @@ import { parseEntitiesPath } from './utils'; import type { EntityCallbacks, EntityFn, EntitySchema, ExpandedEntitiesPath } from './types'; import type { Entity } from '../types'; -import type { PlfeResponse } from 'pl-fe/api'; +import type { PlfeResponse } from '@/api'; interface UseCreateEntityOpts { schema?: EntitySchema; diff --git a/packages/pl-fe/src/entity-store/hooks/use-delete-entity.ts b/packages/pl-fe/src/entity-store/hooks/use-delete-entity.ts index 60568d510..751be22c7 100644 --- a/packages/pl-fe/src/entity-store/hooks/use-delete-entity.ts +++ b/packages/pl-fe/src/entity-store/hooks/use-delete-entity.ts @@ -1,6 +1,6 @@ -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useGetState } from 'pl-fe/hooks/use-get-state'; -import { useLoading } from 'pl-fe/hooks/use-loading'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useGetState } from '@/hooks/use-get-state'; +import { useLoading } from '@/hooks/use-loading'; import { deleteEntities, importEntities } from '../actions'; diff --git a/packages/pl-fe/src/entity-store/hooks/use-dismiss-entity.ts b/packages/pl-fe/src/entity-store/hooks/use-dismiss-entity.ts index cd54fd2d3..e542da873 100644 --- a/packages/pl-fe/src/entity-store/hooks/use-dismiss-entity.ts +++ b/packages/pl-fe/src/entity-store/hooks/use-dismiss-entity.ts @@ -1,5 +1,5 @@ -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useLoading } from 'pl-fe/hooks/use-loading'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useLoading } from '@/hooks/use-loading'; import { dismissEntities } from '../actions'; diff --git a/packages/pl-fe/src/entity-store/hooks/use-entities.ts b/packages/pl-fe/src/entity-store/hooks/use-entities.ts index a33ddcfdf..a4c3c4e4b 100644 --- a/packages/pl-fe/src/entity-store/hooks/use-entities.ts +++ b/packages/pl-fe/src/entity-store/hooks/use-entities.ts @@ -1,10 +1,10 @@ import { useEffect } from 'react'; import * as v from 'valibot'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useGetState } from 'pl-fe/hooks/use-get-state'; -import { filteredArray } from 'pl-fe/schemas/utils'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useGetState } from '@/hooks/use-get-state'; +import { filteredArray } from '@/schemas/utils'; import { entitiesFetchFail, entitiesFetchRequest, entitiesFetchSuccess, invalidateEntityList } from '../actions'; import { selectEntities, selectListState, useListState } from '../selectors'; diff --git a/packages/pl-fe/src/entity-store/hooks/use-entity-lookup.ts b/packages/pl-fe/src/entity-store/hooks/use-entity-lookup.ts index ce3859ce6..e5af8d77f 100644 --- a/packages/pl-fe/src/entity-store/hooks/use-entity-lookup.ts +++ b/packages/pl-fe/src/entity-store/hooks/use-entity-lookup.ts @@ -1,9 +1,9 @@ import { useEffect, useState } from 'react'; import * as v from 'valibot'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useLoading } from 'pl-fe/hooks/use-loading'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useLoading } from '@/hooks/use-loading'; import { importEntities } from '../actions'; import { findEntity } from '../selectors'; @@ -11,7 +11,7 @@ import { findEntity } from '../selectors'; import type { EntityFn } from './types'; import type { UseEntityOpts } from './use-entity'; import type { Entity } from '../types'; -import type { PlfeResponse } from 'pl-fe/api'; +import type { PlfeResponse } from '@/api'; /** Entities will be filtered through this function until it returns true. */ type LookupFn = (entity: TEntity) => boolean diff --git a/packages/pl-fe/src/entity-store/hooks/use-entity.ts b/packages/pl-fe/src/entity-store/hooks/use-entity.ts index d65b8c469..9a52ce2ea 100644 --- a/packages/pl-fe/src/entity-store/hooks/use-entity.ts +++ b/packages/pl-fe/src/entity-store/hooks/use-entity.ts @@ -1,16 +1,16 @@ import { useEffect, useState } from 'react'; import * as v from 'valibot'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useLoading } from 'pl-fe/hooks/use-loading'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useLoading } from '@/hooks/use-loading'; import { importEntities } from '../actions'; import { selectEntity } from '../selectors'; import type { EntitySchema, EntityPath, EntityFn } from './types'; import type { Entity } from '../types'; -import type { PlfeResponse } from 'pl-fe/api'; +import type { PlfeResponse } from '@/api'; /** Additional options for the hook. */ interface UseEntityOpts { diff --git a/packages/pl-fe/src/entity-store/hooks/use-transaction.ts b/packages/pl-fe/src/entity-store/hooks/use-transaction.ts index 8900f5f1d..260817db5 100644 --- a/packages/pl-fe/src/entity-store/hooks/use-transaction.ts +++ b/packages/pl-fe/src/entity-store/hooks/use-transaction.ts @@ -1,8 +1,8 @@ -import { entitiesTransaction } from 'pl-fe/entity-store/actions'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +import { entitiesTransaction } from '@/entity-store/actions'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; -import type { EntityTypes } from 'pl-fe/entity-store/entities'; -import type { EntitiesTransaction, Entity } from 'pl-fe/entity-store/types'; +import type { EntityTypes } from '@/entity-store/entities'; +import type { EntitiesTransaction, Entity } from '@/entity-store/types'; type Updater = Record TEntity> diff --git a/packages/pl-fe/src/entity-store/selectors.ts b/packages/pl-fe/src/entity-store/selectors.ts index c6472f7f1..6551bba14 100644 --- a/packages/pl-fe/src/entity-store/selectors.ts +++ b/packages/pl-fe/src/entity-store/selectors.ts @@ -1,8 +1,8 @@ -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import { useAppSelector } from '@/hooks/use-app-selector'; import type { EntitiesPath } from './hooks/types'; import type { Entity, EntityListState } from './types'; -import type { RootState } from 'pl-fe/store'; +import type { RootState } from '@/store'; /** Get cache at path from Redux. */ const selectCache = (state: RootState, path: EntitiesPath) => state.entities[path[0]]; diff --git a/packages/pl-fe/src/features/account/components/header.tsx b/packages/pl-fe/src/features/account/components/header.tsx index fc3658500..d047cde2c 100644 --- a/packages/pl-fe/src/features/account/components/header.tsx +++ b/packages/pl-fe/src/features/account/components/header.tsx @@ -6,28 +6,28 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import * as v from 'valibot'; -import { mentionCompose, directCompose } from 'pl-fe/actions/compose'; -import { initReport, ReportableEntities } from 'pl-fe/actions/reports'; -import Account from 'pl-fe/components/account'; -import AltIndicator from 'pl-fe/components/alt-indicator'; -import Badge from 'pl-fe/components/badge'; -import DropdownMenu, { Menu } from 'pl-fe/components/dropdown-menu'; -import Icon from 'pl-fe/components/icon'; -import StillImage from 'pl-fe/components/still-image'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Popover from 'pl-fe/components/ui/popover'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import ActionButton from 'pl-fe/features/ui/components/action-button'; -import SubscriptionButton from 'pl-fe/features/ui/components/subscription-button'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; +import { mentionCompose, directCompose } from '@/actions/compose'; +import { initReport, ReportableEntities } from '@/actions/reports'; +import Account from '@/components/account'; +import AltIndicator from '@/components/alt-indicator'; +import Badge from '@/components/badge'; +import DropdownMenu, { Menu } from '@/components/dropdown-menu'; +import Icon from '@/components/icon'; +import StillImage from '@/components/still-image'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Popover from '@/components/ui/popover'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import Emojify from '@/features/emoji/emojify'; +import ActionButton from '@/features/ui/components/action-button'; +import SubscriptionButton from '@/features/ui/components/subscription-button'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useOwnAccount } from '@/hooks/use-own-account'; import { useFollowAccountMutation, usePinAccountMutation, @@ -36,17 +36,17 @@ import { useUnmuteAccountMutation, useUnpinAccountMutation, useUpdateAccountNoteMutation, -} from 'pl-fe/queries/accounts/use-relationship'; -import { useChats } from 'pl-fe/queries/chats'; -import { queryClient } from 'pl-fe/queries/client'; -import { blockDomainMutationOptions, unblockDomainMutationOptions } from 'pl-fe/queries/settings/domain-blocks'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; -import toast from 'pl-fe/toast'; -import copy from 'pl-fe/utils/copy'; +} from '@/queries/accounts/use-relationship'; +import { useChats } from '@/queries/chats'; +import { queryClient } from '@/queries/client'; +import { blockDomainMutationOptions, unblockDomainMutationOptions } from '@/queries/settings/domain-blocks'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; +import toast from '@/toast'; +import copy from '@/utils/copy'; +import type { PlfeResponse } from '@/api'; import type { Account as AccountEntity } from 'pl-api'; -import type { PlfeResponse } from 'pl-fe/api'; const messages = defineMessages({ edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' }, diff --git a/packages/pl-fe/src/features/admin/components/counter.tsx b/packages/pl-fe/src/features/admin/components/counter.tsx index 4f585c292..79dbeb38e 100644 --- a/packages/pl-fe/src/features/admin/components/counter.tsx +++ b/packages/pl-fe/src/features/admin/components/counter.tsx @@ -4,8 +4,8 @@ import React from 'react'; import { FormattedNumber } from 'react-intl'; import { Sparklines, SparklinesCurve } from 'react-sparklines'; -import Text from 'pl-fe/components/ui/text'; -import { useMeasures } from 'pl-fe/queries/admin/use-metrics'; +import Text from '@/components/ui/text'; +import { useMeasures } from '@/queries/admin/use-metrics'; import type { AdminGetMeasuresParams, AdminMeasureKey } from 'pl-api'; diff --git a/packages/pl-fe/src/features/admin/components/dashcounter.tsx b/packages/pl-fe/src/features/admin/components/dashcounter.tsx index 0296b9f76..63acc2855 100644 --- a/packages/pl-fe/src/features/admin/components/dashcounter.tsx +++ b/packages/pl-fe/src/features/admin/components/dashcounter.tsx @@ -2,8 +2,8 @@ import { Link, type LinkOptions } from '@tanstack/react-router'; import React from 'react'; import { FormattedNumber } from 'react-intl'; -import Text from 'pl-fe/components/ui/text'; -import { isNumber } from 'pl-fe/utils/numbers'; +import Text from '@/components/ui/text'; +import { isNumber } from '@/utils/numbers'; type IDashCounter = { count: number | undefined; diff --git a/packages/pl-fe/src/features/admin/components/dimension.tsx b/packages/pl-fe/src/features/admin/components/dimension.tsx index c2f9c5936..f532ef918 100644 --- a/packages/pl-fe/src/features/admin/components/dimension.tsx +++ b/packages/pl-fe/src/features/admin/components/dimension.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { FormattedNumber } from 'react-intl'; -import Text from 'pl-fe/components/ui/text'; -import { useDimensions } from 'pl-fe/queries/admin/use-metrics'; +import Text from '@/components/ui/text'; +import { useDimensions } from '@/queries/admin/use-metrics'; import type { AdminDimensionKey, AdminGetDimensionsParams } from 'pl-api'; diff --git a/packages/pl-fe/src/features/admin/components/latest-accounts-panel.tsx b/packages/pl-fe/src/features/admin/components/latest-accounts-panel.tsx index 45da2c41f..dc9aaef55 100644 --- a/packages/pl-fe/src/features/admin/components/latest-accounts-panel.tsx +++ b/packages/pl-fe/src/features/admin/components/latest-accounts-panel.tsx @@ -2,9 +2,9 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Widget from 'pl-fe/components/ui/widget'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useAdminAccounts } from 'pl-fe/queries/admin/use-accounts'; +import Widget from '@/components/ui/widget'; +import AccountContainer from '@/containers/account-container'; +import { useAdminAccounts } from '@/queries/admin/use-accounts'; const messages = defineMessages({ expand: { id: 'admin.latest_accounts_panel.more', defaultMessage: 'Click to see {count, plural, one {# account} other {# accounts}}' }, diff --git a/packages/pl-fe/src/features/admin/components/registration-mode-picker.tsx b/packages/pl-fe/src/features/admin/components/registration-mode-picker.tsx index 416aaee10..8d8c745ab 100644 --- a/packages/pl-fe/src/features/admin/components/registration-mode-picker.tsx +++ b/packages/pl-fe/src/features/admin/components/registration-mode-picker.tsx @@ -2,11 +2,11 @@ import { Instance } from 'pl-api'; import React from 'react'; import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; -import { updateConfig } from 'pl-fe/actions/admin'; -import { RadioGroup, RadioItem } from 'pl-fe/components/radio'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import toast from 'pl-fe/toast'; +import { updateConfig } from '@/actions/admin'; +import { RadioGroup, RadioItem } from '@/components/radio'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useInstance } from '@/hooks/use-instance'; +import toast from '@/toast'; type RegistrationMode = 'open' | 'approval' | 'closed'; diff --git a/packages/pl-fe/src/features/admin/components/report.tsx b/packages/pl-fe/src/features/admin/components/report.tsx index 48cd3f6c1..37e2a1408 100644 --- a/packages/pl-fe/src/features/admin/components/report.tsx +++ b/packages/pl-fe/src/features/admin/components/report.tsx @@ -2,16 +2,16 @@ import { Link } from '@tanstack/react-router'; import React, { useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import HoverAccountWrapper from 'pl-fe/components/hover-account-wrapper'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useReport } from 'pl-fe/queries/admin/use-reports'; -import { makeGetReport } from 'pl-fe/selectors'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import HoverAccountWrapper from '@/components/hover-account-wrapper'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useReport } from '@/queries/admin/use-reports'; +import { makeGetReport } from '@/selectors'; interface IReport { id: string; diff --git a/packages/pl-fe/src/features/admin/components/retention.tsx b/packages/pl-fe/src/features/admin/components/retention.tsx index fbb485f0c..5b2b74d0c 100644 --- a/packages/pl-fe/src/features/admin/components/retention.tsx +++ b/packages/pl-fe/src/features/admin/components/retention.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { FormattedDate, FormattedMessage, FormattedNumber } from 'react-intl'; -import Text from 'pl-fe/components/ui/text'; -import { useRetention } from 'pl-fe/queries/admin/use-metrics'; +import Text from '@/components/ui/text'; +import { useRetention } from '@/queries/admin/use-metrics'; import type { AdminCohort } from 'pl-api'; diff --git a/packages/pl-fe/src/features/admin/components/unapproved-account.tsx b/packages/pl-fe/src/features/admin/components/unapproved-account.tsx index 99b8b9c26..2ab5981b3 100644 --- a/packages/pl-fe/src/features/admin/components/unapproved-account.tsx +++ b/packages/pl-fe/src/features/admin/components/unapproved-account.tsx @@ -1,10 +1,10 @@ import React from 'react'; -import { AuthorizeRejectButtons } from 'pl-fe/components/authorize-reject-buttons'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAdminAccount, useAdminApproveAccountMutation, useAdminRejectAccountMutation } from 'pl-fe/queries/admin/use-accounts'; +import { AuthorizeRejectButtons } from '@/components/authorize-reject-buttons'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAdminAccount, useAdminApproveAccountMutation, useAdminRejectAccountMutation } from '@/queries/admin/use-accounts'; interface IUnapprovedAccount { accountId: string; diff --git a/packages/pl-fe/src/features/audio/index.tsx b/packages/pl-fe/src/features/audio/index.tsx index 08aca6f63..d652483bf 100644 --- a/packages/pl-fe/src/features/audio/index.tsx +++ b/packages/pl-fe/src/features/audio/index.tsx @@ -4,8 +4,8 @@ import throttle from 'lodash/throttle'; import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import { formatTime, getPointerPosition } from 'pl-fe/features/video'; +import Icon from '@/components/icon'; +import { formatTime, getPointerPosition } from '@/features/video'; import Visualizer from './visualizer'; diff --git a/packages/pl-fe/src/features/auth-login/components/captcha.test.tsx b/packages/pl-fe/src/features/auth-login/components/captcha.test.tsx index d590c592b..4c2c8dcd1 100644 --- a/packages/pl-fe/src/features/auth-login/components/captcha.test.tsx +++ b/packages/pl-fe/src/features/auth-login/components/captcha.test.tsx @@ -1,7 +1,7 @@ import { Map as ImmutableMap } from 'immutable'; import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import CaptchaField, { NativeCaptchaField } from './captcha'; diff --git a/packages/pl-fe/src/features/auth-login/components/captcha.tsx b/packages/pl-fe/src/features/auth-login/components/captcha.tsx index 11c3ff775..f9047227b 100644 --- a/packages/pl-fe/src/features/auth-login/components/captcha.tsx +++ b/packages/pl-fe/src/features/auth-login/components/captcha.tsx @@ -1,11 +1,11 @@ import React, { useState, useEffect } from 'react'; import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; -import { fetchCaptcha } from 'pl-fe/actions/auth'; -import Input from 'pl-fe/components/ui/input'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +import { fetchCaptcha } from '@/actions/auth'; +import Input from '@/components/ui/input'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; const noOp = () => {}; diff --git a/packages/pl-fe/src/features/auth-login/components/consumer-button.tsx b/packages/pl-fe/src/features/auth-login/components/consumer-button.tsx index 6a4dc3685..0026c8a8c 100644 --- a/packages/pl-fe/src/features/auth-login/components/consumer-button.tsx +++ b/packages/pl-fe/src/features/auth-login/components/consumer-button.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import { prepareRequest } from 'pl-fe/actions/consumer-auth'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Tooltip from 'pl-fe/components/ui/tooltip'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { capitalize } from 'pl-fe/utils/strings'; +import { prepareRequest } from '@/actions/consumer-auth'; +import IconButton from '@/components/ui/icon-button'; +import Tooltip from '@/components/ui/tooltip'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { capitalize } from '@/utils/strings'; const messages = defineMessages({ tooltip: { id: 'oauth_consumer.tooltip', defaultMessage: 'Sign in with {provider}' }, diff --git a/packages/pl-fe/src/features/auth-login/components/consumers-list.tsx b/packages/pl-fe/src/features/auth-login/components/consumers-list.tsx index cacdf1afe..942a0b147 100644 --- a/packages/pl-fe/src/features/auth-login/components/consumers-list.tsx +++ b/packages/pl-fe/src/features/auth-login/components/consumers-list.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Card from 'pl-fe/components/ui/card'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import Card from '@/components/ui/card'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useInstance } from '@/hooks/use-instance'; import ConsumerButton from './consumer-button'; diff --git a/packages/pl-fe/src/features/auth-login/components/login-form.test.tsx b/packages/pl-fe/src/features/auth-login/components/login-form.test.tsx index 6ed9a7f23..54cde5bad 100644 --- a/packages/pl-fe/src/features/auth-login/components/login-form.test.tsx +++ b/packages/pl-fe/src/features/auth-login/components/login-form.test.tsx @@ -2,7 +2,7 @@ import { instanceSchema } from 'pl-api'; import React from 'react'; import * as v from 'valibot'; -import { fireEvent, render, screen } from 'pl-fe/jest/test-helpers'; +import { fireEvent, render, screen } from '@/jest/test-helpers'; import LoginForm from './login-form'; diff --git a/packages/pl-fe/src/features/auth-login/components/login-form.tsx b/packages/pl-fe/src/features/auth-login/components/login-form.tsx index e108be0e5..0192e839e 100644 --- a/packages/pl-fe/src/features/auth-login/components/login-form.tsx +++ b/packages/pl-fe/src/features/auth-login/components/login-form.tsx @@ -2,12 +2,12 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import { useFeatures } from '@/hooks/use-features'; const messages = defineMessages({ username: { diff --git a/packages/pl-fe/src/features/auth-login/components/otp-auth-form.test.tsx b/packages/pl-fe/src/features/auth-login/components/otp-auth-form.test.tsx index f5e85a42f..b46120ef8 100644 --- a/packages/pl-fe/src/features/auth-login/components/otp-auth-form.test.tsx +++ b/packages/pl-fe/src/features/auth-login/components/otp-auth-form.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import OtpAuthForm from './otp-auth-form'; diff --git a/packages/pl-fe/src/features/auth-login/components/otp-auth-form.tsx b/packages/pl-fe/src/features/auth-login/components/otp-auth-form.tsx index d33d64f09..9092dbb25 100644 --- a/packages/pl-fe/src/features/auth-login/components/otp-auth-form.tsx +++ b/packages/pl-fe/src/features/auth-login/components/otp-auth-form.tsx @@ -2,15 +2,15 @@ import { Navigate } from '@tanstack/react-router'; import React, { useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { otpVerify, verifyCredentials, switchAccount } from 'pl-fe/actions/auth'; -import { BigCard } from 'pl-fe/components/big-card'; -import Button from 'pl-fe/components/ui/button'; -import Card, { CardBody, CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +import { otpVerify, verifyCredentials, switchAccount } from '@/actions/auth'; +import { BigCard } from '@/components/big-card'; +import Button from '@/components/ui/button'; +import Card, { CardBody, CardHeader, CardTitle } from '@/components/ui/card'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; const messages = defineMessages({ otpCodeHint: { id: 'login.fields.otp_code_hint', defaultMessage: 'Enter the two-factor code generated by your phone app or use one of your recovery codes' }, diff --git a/packages/pl-fe/src/features/auth-login/components/registration-form.tsx b/packages/pl-fe/src/features/auth-login/components/registration-form.tsx index 3e24d1b21..9bd6e6139 100644 --- a/packages/pl-fe/src/features/auth-login/components/registration-form.tsx +++ b/packages/pl-fe/src/features/auth-login/components/registration-form.tsx @@ -3,23 +3,23 @@ import debounce from 'lodash/debounce'; import React, { useState, useRef, useCallback } from 'react'; import { useIntl, FormattedMessage, defineMessages } from 'react-intl'; -import { accountLookup } from 'pl-fe/actions/accounts'; -import { register, verifyCredentials } from 'pl-fe/actions/auth'; -import BirthdayInput from 'pl-fe/components/birthday-input'; -import Button from 'pl-fe/components/ui/button'; -import Checkbox from 'pl-fe/components/ui/checkbox'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Select from 'pl-fe/components/ui/select'; -import Textarea from 'pl-fe/components/ui/textarea'; -import CaptchaField from 'pl-fe/features/auth-login/components/captcha'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import { accountLookup } from '@/actions/accounts'; +import { register, verifyCredentials } from '@/actions/auth'; +import BirthdayInput from '@/components/birthday-input'; +import Button from '@/components/ui/button'; +import Checkbox from '@/components/ui/checkbox'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Select from '@/components/ui/select'; +import Textarea from '@/components/ui/textarea'; +import CaptchaField from '@/features/auth-login/components/captcha'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; import type { CreateAccountParams } from 'pl-api'; diff --git a/packages/pl-fe/src/features/birthdays/account.tsx b/packages/pl-fe/src/features/birthdays/account.tsx index 651fa9c35..051367d15 100644 --- a/packages/pl-fe/src/features/birthdays/account.tsx +++ b/packages/pl-fe/src/features/birthdays/account.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import AccountComponent from 'pl-fe/components/account'; -import Icon from 'pl-fe/components/icon'; -import HStack from 'pl-fe/components/ui/hstack'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import AccountComponent from '@/components/account'; +import Icon from '@/components/icon'; +import HStack from '@/components/ui/hstack'; const messages = defineMessages({ birthday: { id: 'account.birthday', defaultMessage: 'Born {date}' }, diff --git a/packages/pl-fe/src/features/chats/components/chat-composer.tsx b/packages/pl-fe/src/features/chats/components/chat-composer.tsx index af054bcb6..3c4447af6 100644 --- a/packages/pl-fe/src/features/chats/components/chat-composer.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-composer.tsx @@ -1,24 +1,24 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, IntlShape, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Combobox, { ComboboxInput, ComboboxList, ComboboxOption, ComboboxPopover } from 'pl-fe/components/ui/combobox'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useChatContext } from 'pl-fe/contexts/chat-context'; -import UploadButton from 'pl-fe/features/compose/components/upload-button'; -import emojiSearch from 'pl-fe/features/emoji/search'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useRelationshipQuery, useUnblockAccountMutation } from 'pl-fe/queries/accounts/use-relationship'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { textAtCursorMatchesToken } from 'pl-fe/utils/suggestions'; +import Button from '@/components/ui/button'; +import Combobox, { ComboboxInput, ComboboxList, ComboboxOption, ComboboxPopover } from '@/components/ui/combobox'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useChatContext } from '@/contexts/chat-context'; +import UploadButton from '@/features/compose/components/upload-button'; +import emojiSearch from '@/features/emoji/search'; +import { useInstance } from '@/hooks/use-instance'; +import { useRelationshipQuery, useUnblockAccountMutation } from '@/queries/accounts/use-relationship'; +import { useModalsActions } from '@/stores/modals'; +import { textAtCursorMatchesToken } from '@/utils/suggestions'; import ChatTextarea from './chat-textarea'; +import type { Emoji, NativeEmoji } from '@/features/emoji'; import type { MediaAttachment } from 'pl-api'; -import type { Emoji, NativeEmoji } from 'pl-fe/features/emoji'; const messages = defineMessages({ placeholder: { id: 'chat.input.placeholder', defaultMessage: 'Type a message' }, diff --git a/packages/pl-fe/src/features/chats/components/chat-list-item.test.tsx b/packages/pl-fe/src/features/chats/components/chat-list-item.test.tsx index aa8bc4b49..3d9b33583 100644 --- a/packages/pl-fe/src/features/chats/components/chat-list-item.test.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-list-item.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; -import { IChat } from 'pl-fe/queries/chats'; +import { render, screen } from '@/jest/test-helpers'; +import { IChat } from '@/queries/chats'; import ChatListItem from './chat-list-item'; diff --git a/packages/pl-fe/src/features/chats/components/chat-list-item.tsx b/packages/pl-fe/src/features/chats/components/chat-list-item.tsx index 74c324e0b..b19d1a6ee 100644 --- a/packages/pl-fe/src/features/chats/components/chat-list-item.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-list-item.tsx @@ -2,23 +2,23 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useMemo } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import RelativeTimestamp from 'pl-fe/components/relative-timestamp'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import { useChatContext } from 'pl-fe/contexts/chat-context'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useRelationshipQuery } from 'pl-fe/queries/accounts/use-relationship'; -import { useChatActions } from 'pl-fe/queries/chats'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import DropdownMenu from '@/components/dropdown-menu'; +import { ParsedContent } from '@/components/parsed-content'; +import RelativeTimestamp from '@/components/relative-timestamp'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import { useChatContext } from '@/contexts/chat-context'; +import { useFeatures } from '@/hooks/use-features'; +import { useRelationshipQuery } from '@/queries/accounts/use-relationship'; +import { useChatActions } from '@/queries/chats'; +import { useModalsActions } from '@/stores/modals'; +import type { Menu } from '@/components/dropdown-menu'; import type { Chat } from 'pl-api'; -import type { Menu } from 'pl-fe/components/dropdown-menu'; const messages = defineMessages({ leaveMessage: { id: 'chat_settings.leave.message', defaultMessage: 'Are you sure you want to leave this chat? Messages will be deleted for you and this chat will be removed from your inbox.' }, diff --git a/packages/pl-fe/src/features/chats/components/chat-list-shoutbox.tsx b/packages/pl-fe/src/features/chats/components/chat-list-shoutbox.tsx index 1fd6f8e84..08358b0d1 100644 --- a/packages/pl-fe/src/features/chats/components/chat-list-shoutbox.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-list-shoutbox.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { useShoutboxMessages } from 'pl-fe/stores/shoutbox'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import { ParsedContent } from '@/components/parsed-content'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useInstance } from '@/hooks/use-instance'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { useShoutboxMessages } from '@/stores/shoutbox'; import type { Chat } from 'pl-api'; diff --git a/packages/pl-fe/src/features/chats/components/chat-list.tsx b/packages/pl-fe/src/features/chats/components/chat-list.tsx index 83d2d0f80..25e5de860 100644 --- a/packages/pl-fe/src/features/chats/components/chat-list.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-list.tsx @@ -2,12 +2,12 @@ import clsx from 'clsx'; import React, { useState } from 'react'; import { Virtuoso } from 'react-virtuoso'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import PlaceholderChat from 'pl-fe/features/placeholder/components/placeholder-chat'; -import { useChats } from 'pl-fe/queries/chats'; -import { useShoutboxIsLoading } from 'pl-fe/stores/shoutbox'; +import PullToRefresh from '@/components/pull-to-refresh'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import PlaceholderChat from '@/features/placeholder/components/placeholder-chat'; +import { useChats } from '@/queries/chats'; +import { useShoutboxIsLoading } from '@/stores/shoutbox'; import ChatListItem from './chat-list-item'; import ChatListShoutbox from './chat-list-shoutbox'; diff --git a/packages/pl-fe/src/features/chats/components/chat-message-list.test.tsx b/packages/pl-fe/src/features/chats/components/chat-message-list.test.tsx index caf0df94d..6d33c25e0 100644 --- a/packages/pl-fe/src/features/chats/components/chat-message-list.test.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-message-list.test.tsx @@ -2,13 +2,13 @@ import userEvent from '@testing-library/user-event'; import React from 'react'; import { VirtuosoMockContext } from 'react-virtuoso'; -import { __stub } from 'pl-fe/api'; -import { ChatContext } from 'pl-fe/contexts/chat-context'; -import { buildAccount, buildInstance } from 'pl-fe/jest/factory'; -import { queryClient, render, rootState, screen, waitFor } from 'pl-fe/jest/test-helpers'; -import { normalizeChatMessage } from 'pl-fe/normalizers/chat-message'; -import { IChat } from 'pl-fe/queries/chats'; -import { ChatMessage } from 'pl-fe/types/entities'; +import { __stub } from '@/api'; +import { ChatContext } from '@/contexts/chat-context'; +import { buildAccount, buildInstance } from '@/jest/factory'; +import { queryClient, render, rootState, screen, waitFor } from '@/jest/test-helpers'; +import { normalizeChatMessage } from '@/normalizers/chat-message'; +import { IChat } from '@/queries/chats'; +import { ChatMessage } from '@/types/entities'; import ChatMessageList from './chat-message-list'; diff --git a/packages/pl-fe/src/features/chats/components/chat-message-list.tsx b/packages/pl-fe/src/features/chats/components/chat-message-list.tsx index 4fe53aedf..cb18e3c7b 100644 --- a/packages/pl-fe/src/features/chats/components/chat-message-list.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-message-list.tsx @@ -2,20 +2,20 @@ import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react' import { useIntl, defineMessages } from 'react-intl'; import { Components, Virtuoso, VirtuosoHandle } from 'react-virtuoso'; -import Avatar from 'pl-fe/components/ui/avatar'; -import Button from 'pl-fe/components/ui/button'; -import Divider from 'pl-fe/components/ui/divider'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import PlaceholderChatMessage from 'pl-fe/features/placeholder/components/placeholder-chat-message'; -import { useRelationshipQuery } from 'pl-fe/queries/accounts/use-relationship'; -import { useChatActions, useChatMessages } from 'pl-fe/queries/chats'; +import Avatar from '@/components/ui/avatar'; +import Button from '@/components/ui/button'; +import Divider from '@/components/ui/divider'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import PlaceholderChatMessage from '@/features/placeholder/components/placeholder-chat-message'; +import { useRelationshipQuery } from '@/queries/accounts/use-relationship'; +import { useChatActions, useChatMessages } from '@/queries/chats'; import ChatMessage from './chat-message'; +import type { ChatMessage as ChatMessageEntity } from '@/normalizers/chat-message'; import type { Chat } from 'pl-api'; -import type { ChatMessage as ChatMessageEntity } from 'pl-fe/normalizers/chat-message'; const messages = defineMessages({ today: { id: 'chats.dividers.today', defaultMessage: 'Today' }, diff --git a/packages/pl-fe/src/features/chats/components/chat-message.tsx b/packages/pl-fe/src/features/chats/components/chat-message.tsx index 7b290e02a..d058a61ba 100644 --- a/packages/pl-fe/src/features/chats/components/chat-message.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-message.tsx @@ -4,23 +4,23 @@ import escape from 'lodash/escape'; import React, { useMemo, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { MediaGallery } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { ChatKeys, useChatActions } from 'pl-fe/queries/chats'; -import { queryClient } from 'pl-fe/queries/client'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { stripHTML } from 'pl-fe/utils/html'; -import { onlyEmoji } from 'pl-fe/utils/rich-content'; +import DropdownMenu from '@/components/dropdown-menu'; +import { ParsedContent } from '@/components/parsed-content'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { MediaGallery } from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { ChatKeys, useChatActions } from '@/queries/chats'; +import { queryClient } from '@/queries/client'; +import { useModalsActions } from '@/stores/modals'; +import { stripHTML } from '@/utils/html'; +import { onlyEmoji } from '@/utils/rich-content'; +import type { Menu as IMenu } from '@/components/dropdown-menu'; +import type { ChatMessage as ChatMessageEntity } from '@/normalizers/chat-message'; import type { Chat } from 'pl-api'; -import type { Menu as IMenu } from 'pl-fe/components/dropdown-menu'; -import type { ChatMessage as ChatMessageEntity } from 'pl-fe/normalizers/chat-message'; const messages = defineMessages({ copy: { id: 'chats.actions.copy', defaultMessage: 'Copy' }, diff --git a/packages/pl-fe/src/features/chats/components/chat-pane-header.test.tsx b/packages/pl-fe/src/features/chats/components/chat-pane-header.test.tsx index b21dce3f7..94dc1c046 100644 --- a/packages/pl-fe/src/features/chats/components/chat-pane-header.test.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-pane-header.test.tsx @@ -1,7 +1,7 @@ import userEvent from '@testing-library/user-event'; import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import ChatPaneHeader from './chat-widget/chat-pane-header'; diff --git a/packages/pl-fe/src/features/chats/components/chat-pane/chat-pane.test.tsx b/packages/pl-fe/src/features/chats/components/chat-pane/chat-pane.test.tsx index 6be62485b..430b24ffd 100644 --- a/packages/pl-fe/src/features/chats/components/chat-pane/chat-pane.test.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-pane/chat-pane.test.tsx @@ -1,10 +1,10 @@ import React from 'react'; -import { __stub } from 'pl-fe/api'; -import { ChatContext } from 'pl-fe/contexts/chat-context'; -import { StatProvider } from 'pl-fe/contexts/stat-context'; -import chats from 'pl-fe/jest/fixtures/chats.json'; -import { render, screen, waitFor } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { ChatContext } from '@/contexts/chat-context'; +import { StatProvider } from '@/contexts/stat-context'; +import chats from '@/jest/fixtures/chats.json'; +import { render, screen, waitFor } from '@/jest/test-helpers'; import ChatPane from './chat-pane'; diff --git a/packages/pl-fe/src/features/chats/components/chat-pane/chat-pane.tsx b/packages/pl-fe/src/features/chats/components/chat-pane/chat-pane.tsx index 12c9dfab5..42c3c79b9 100644 --- a/packages/pl-fe/src/features/chats/components/chat-pane/chat-pane.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-pane/chat-pane.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ChatWidgetScreens, useChatContext } from 'pl-fe/contexts/chat-context'; -import { useStatContext } from 'pl-fe/contexts/stat-context'; -import { useChats } from 'pl-fe/queries/chats'; -import { useShoutboxIsLoading } from 'pl-fe/stores/shoutbox'; +import { ChatWidgetScreens, useChatContext } from '@/contexts/chat-context'; +import { useStatContext } from '@/contexts/stat-context'; +import { useChats } from '@/queries/chats'; +import { useShoutboxIsLoading } from '@/stores/shoutbox'; import ChatList from '../chat-list'; import ChatSearch from '../chat-search/chat-search'; diff --git a/packages/pl-fe/src/features/chats/components/chat-pending-upload.tsx b/packages/pl-fe/src/features/chats/components/chat-pending-upload.tsx index 5125397d1..26cda354c 100644 --- a/packages/pl-fe/src/features/chats/components/chat-pending-upload.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-pending-upload.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import ProgressBar from 'pl-fe/components/ui/progress-bar'; +import ProgressBar from '@/components/ui/progress-bar'; interface IChatPendingUpload { progress: number; diff --git a/packages/pl-fe/src/features/chats/components/chat-search/blankslate.tsx b/packages/pl-fe/src/features/chats/components/chat-search/blankslate.tsx index fa3291c38..c715ec8a6 100644 --- a/packages/pl-fe/src/features/chats/components/chat-search/blankslate.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-search/blankslate.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; const messages = defineMessages({ title: { id: 'chat_search.blankslate.title', defaultMessage: 'Start a chat' }, diff --git a/packages/pl-fe/src/features/chats/components/chat-search/chat-search.test.tsx b/packages/pl-fe/src/features/chats/components/chat-search/chat-search.test.tsx index 8c4cacabc..f217398f2 100644 --- a/packages/pl-fe/src/features/chats/components/chat-search/chat-search.test.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-search/chat-search.test.tsx @@ -1,9 +1,9 @@ import userEvent from '@testing-library/user-event'; import React from 'react'; -import { __stub } from 'pl-fe/api'; -import { ChatProvider } from 'pl-fe/contexts/chat-context'; -import { render, screen, waitFor } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { ChatProvider } from '@/contexts/chat-context'; +import { render, screen, waitFor } from '@/jest/test-helpers'; import ChatSearch from './chat-search'; diff --git a/packages/pl-fe/src/features/chats/components/chat-search/chat-search.tsx b/packages/pl-fe/src/features/chats/components/chat-search/chat-search.tsx index a8a004db8..d069afa54 100644 --- a/packages/pl-fe/src/features/chats/components/chat-search/chat-search.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-search/chat-search.tsx @@ -3,21 +3,21 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useRef, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; -import Input from 'pl-fe/components/ui/input'; -import Stack from 'pl-fe/components/ui/stack'; -import { ChatWidgetScreens, useChatContext } from 'pl-fe/contexts/chat-context'; -import { useDebounce } from 'pl-fe/hooks/use-debounce'; -import { useChats } from 'pl-fe/queries/chats'; -import { queryClient } from 'pl-fe/queries/client'; -import { useAccountSearch } from 'pl-fe/queries/search/use-search-accounts'; -import toast from 'pl-fe/toast'; +import Icon from '@/components/ui/icon'; +import Input from '@/components/ui/input'; +import Stack from '@/components/ui/stack'; +import { ChatWidgetScreens, useChatContext } from '@/contexts/chat-context'; +import { useDebounce } from '@/hooks/use-debounce'; +import { useChats } from '@/queries/chats'; +import { queryClient } from '@/queries/client'; +import { useAccountSearch } from '@/queries/search/use-search-accounts'; +import toast from '@/toast'; import Blankslate from './blankslate'; import EmptyResultsBlankslate from './empty-results-blankslate'; import Results from './results'; -import type { PlfeResponse } from 'pl-fe/api'; +import type { PlfeResponse } from '@/api'; const messages = defineMessages({ placeholder: { id: 'chat_search.placeholder', defaultMessage: 'Type a name' }, diff --git a/packages/pl-fe/src/features/chats/components/chat-search/empty-results-blankslate.tsx b/packages/pl-fe/src/features/chats/components/chat-search/empty-results-blankslate.tsx index 1d8fe6e4d..7e9f68545 100644 --- a/packages/pl-fe/src/features/chats/components/chat-search/empty-results-blankslate.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-search/empty-results-blankslate.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; const messages = defineMessages({ title: { id: 'chat_search.empty_results_blankslate.title', defaultMessage: 'No matches found' }, diff --git a/packages/pl-fe/src/features/chats/components/chat-search/results.tsx b/packages/pl-fe/src/features/chats/components/chat-search/results.tsx index b4f0fddcb..1b6610797 100644 --- a/packages/pl-fe/src/features/chats/components/chat-search/results.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-search/results.tsx @@ -2,14 +2,14 @@ import clsx from 'clsx'; import React, { useCallback, useState } from 'react'; import { Virtuoso } from 'react-virtuoso'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useAccountSearch } from 'pl-fe/queries/search/use-search-accounts'; -import { selectAccounts } from 'pl-fe/selectors'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useAccountSearch } from '@/queries/search/use-search-accounts'; +import { selectAccounts } from '@/selectors'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/features/chats/components/chat-textarea.tsx b/packages/pl-fe/src/features/chats/components/chat-textarea.tsx index c31c0cecf..29569aeb5 100644 --- a/packages/pl-fe/src/features/chats/components/chat-textarea.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-textarea.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Textarea from 'pl-fe/components/ui/textarea'; +import HStack from '@/components/ui/hstack'; +import Textarea from '@/components/ui/textarea'; import ChatPendingUpload from './chat-pending-upload'; import ChatUpload from './chat-upload'; diff --git a/packages/pl-fe/src/features/chats/components/chat-upload-preview.tsx b/packages/pl-fe/src/features/chats/components/chat-upload-preview.tsx index 016d29b4f..18a916011 100644 --- a/packages/pl-fe/src/features/chats/components/chat-upload-preview.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-upload-preview.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import Icon from 'pl-fe/components/ui/icon'; -import { MIMETYPE_ICONS } from 'pl-fe/components/upload'; +import Icon from '@/components/ui/icon'; +import { MIMETYPE_ICONS } from '@/components/upload'; import type { MediaAttachment } from 'pl-api'; diff --git a/packages/pl-fe/src/features/chats/components/chat-upload.tsx b/packages/pl-fe/src/features/chats/components/chat-upload.tsx index 959661af5..e7044c3a0 100644 --- a/packages/pl-fe/src/features/chats/components/chat-upload.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-upload.tsx @@ -1,9 +1,9 @@ import clsx from 'clsx'; import React from 'react'; -import Blurhash from 'pl-fe/components/blurhash'; -import Icon from 'pl-fe/components/ui/icon'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import Blurhash from '@/components/blurhash'; +import Icon from '@/components/ui/icon'; +import { useModalsActions } from '@/stores/modals'; import ChatUploadPreview from './chat-upload-preview'; diff --git a/packages/pl-fe/src/features/chats/components/chat-widget.test.tsx b/packages/pl-fe/src/features/chats/components/chat-widget.test.tsx index 79fc3f9fb..f7bfb8477 100644 --- a/packages/pl-fe/src/features/chats/components/chat-widget.test.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-widget.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { Route, Switch } from 'react-router-dom'; -import { buildAccount } from 'pl-fe/jest/factory'; -import { render, rootState } from 'pl-fe/jest/test-helpers'; +import { buildAccount } from '@/jest/factory'; +import { render, rootState } from '@/jest/test-helpers'; import ChatWidget from './chat-widget/chat-widget'; diff --git a/packages/pl-fe/src/features/chats/components/chat-widget/chat-pane-header.tsx b/packages/pl-fe/src/features/chats/components/chat-widget/chat-pane-header.tsx index 5a37dd7f8..6bd1788ae 100644 --- a/packages/pl-fe/src/features/chats/components/chat-widget/chat-pane-header.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-widget/chat-pane-header.tsx @@ -1,7 +1,7 @@ import React, { HTMLAttributes } from 'react'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { useSettings } from 'pl-fe/stores/settings'; +import IconButton from '@/components/ui/icon-button'; +import { useSettings } from '@/stores/settings'; interface IChatPaneHeader { isOpen: boolean; diff --git a/packages/pl-fe/src/features/chats/components/chat-widget/chat-settings.tsx b/packages/pl-fe/src/features/chats/components/chat-widget/chat-settings.tsx index c4085f406..817b7938f 100644 --- a/packages/pl-fe/src/features/chats/components/chat-widget/chat-settings.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-widget/chat-settings.tsx @@ -1,16 +1,16 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { ChatWidgetScreens, useChatContext } from 'pl-fe/contexts/chat-context'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useUnblockAccountMutation, useRelationshipQuery } from 'pl-fe/queries/accounts/use-relationship'; -import { useChatActions } from 'pl-fe/queries/chats'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { ChatWidgetScreens, useChatContext } from '@/contexts/chat-context'; +import { useFeatures } from '@/hooks/use-features'; +import { useUnblockAccountMutation, useRelationshipQuery } from '@/queries/accounts/use-relationship'; +import { useChatActions } from '@/queries/chats'; +import { useModalsActions } from '@/stores/modals'; import ChatPaneHeader from './chat-pane-header'; diff --git a/packages/pl-fe/src/features/chats/components/chat-widget/chat-widget.tsx b/packages/pl-fe/src/features/chats/components/chat-widget/chat-widget.tsx index a44c0a3d3..77baabc13 100644 --- a/packages/pl-fe/src/features/chats/components/chat-widget/chat-widget.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-widget/chat-widget.tsx @@ -1,8 +1,8 @@ import { useMatch } from '@tanstack/react-router'; import React from 'react'; -import { ChatProvider } from 'pl-fe/contexts/chat-context'; -import { layouts } from 'pl-fe/features/ui/router'; +import { ChatProvider } from '@/contexts/chat-context'; +import { layouts } from '@/features/ui/router'; import ChatPane from '../chat-pane/chat-pane'; diff --git a/packages/pl-fe/src/features/chats/components/chat-widget/chat-window.tsx b/packages/pl-fe/src/features/chats/components/chat-widget/chat-window.tsx index 7bd5b981d..38d571ca8 100644 --- a/packages/pl-fe/src/features/chats/components/chat-widget/chat-window.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-widget/chat-window.tsx @@ -1,13 +1,13 @@ import { Link, type LinkProps } from '@tanstack/react-router'; import React, { useRef } from 'react'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import { ChatWidgetScreens, useChatContext } from 'pl-fe/contexts/chat-context'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import { ChatWidgetScreens, useChatContext } from '@/contexts/chat-context'; import Chat from '../chat'; diff --git a/packages/pl-fe/src/features/chats/components/chat-widget/headers/chat-search-header.tsx b/packages/pl-fe/src/features/chats/components/chat-widget/headers/chat-search-header.tsx index 7951f1e67..1f7690ddf 100644 --- a/packages/pl-fe/src/features/chats/components/chat-widget/headers/chat-search-header.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-widget/headers/chat-search-header.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; -import { ChatWidgetScreens, useChatContext } from 'pl-fe/contexts/chat-context'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; +import { ChatWidgetScreens, useChatContext } from '@/contexts/chat-context'; import ChatPaneHeader from '../chat-pane-header'; diff --git a/packages/pl-fe/src/features/chats/components/chat-widget/shoutbox-window.tsx b/packages/pl-fe/src/features/chats/components/chat-widget/shoutbox-window.tsx index 2a9668e9e..aee467ab6 100644 --- a/packages/pl-fe/src/features/chats/components/chat-widget/shoutbox-window.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-widget/shoutbox-window.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { ChatWidgetScreens, useChatContext } from 'pl-fe/contexts/chat-context'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { ChatWidgetScreens, useChatContext } from '@/contexts/chat-context'; +import { useInstance } from '@/hooks/use-instance'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; import Shoutbox from '../shoutbox'; diff --git a/packages/pl-fe/src/features/chats/components/chat.tsx b/packages/pl-fe/src/features/chats/components/chat.tsx index 84c9b8c31..cf197c720 100644 --- a/packages/pl-fe/src/features/chats/components/chat.tsx +++ b/packages/pl-fe/src/features/chats/components/chat.tsx @@ -2,17 +2,17 @@ import clsx from 'clsx'; import React, { MutableRefObject, useEffect, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { uploadMedia } from 'pl-fe/actions/media'; -import Stack from 'pl-fe/components/ui/stack'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useChatActions } from 'pl-fe/queries/chats'; -import toast from 'pl-fe/toast'; +import { uploadMedia } from '@/actions/media'; +import Stack from '@/components/ui/stack'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useChatActions } from '@/queries/chats'; +import toast from '@/toast'; import ChatComposer from './chat-composer'; import ChatMessageList from './chat-message-list'; +import type { PlfeResponse } from '@/api'; import type { Chat as ChatEntity, MediaAttachment } from 'pl-api'; -import type { PlfeResponse } from 'pl-fe/api'; const fileKeyGen = (): number => Math.floor((Math.random() * 0x10000)); diff --git a/packages/pl-fe/src/features/chats/components/chats-page/chats-page.tsx b/packages/pl-fe/src/features/chats/components/chats-page/chats-page.tsx index a352d78fe..4455a9691 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/chats-page.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/chats-page.tsx @@ -2,9 +2,9 @@ import { Outlet, useMatch } from '@tanstack/react-router'; import clsx from 'clsx'; import React, { useEffect, useLayoutEffect, useRef, useState } from 'react'; -import Stack from 'pl-fe/components/ui/stack'; -import { chatsEmptyRoute } from 'pl-fe/features/ui/router'; -import { useChats } from 'pl-fe/queries/chats'; +import Stack from '@/components/ui/stack'; +import { chatsEmptyRoute } from '@/features/ui/router'; +import { useChats } from '@/queries/chats'; import ChatsPageSidebar from './components/chats-page-sidebar'; diff --git a/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-empty.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-empty.tsx index 7355472d1..d6b438cfb 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-empty.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-empty.tsx @@ -2,9 +2,9 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import Button from '@/components/ui/button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; interface IBlankslate { } diff --git a/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-with-chats.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-with-chats.tsx index aa6a478a5..010c79d2b 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-with-chats.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-with-chats.tsx @@ -2,9 +2,9 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import Button from '@/components/ui/button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; /** To display on the chats main page when no message is selected, but chats are present. */ const BlankslateWithChats = () => { diff --git a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-chat.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-chat.tsx index cb0d5983f..77798b072 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-chat.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-chat.tsx @@ -2,18 +2,18 @@ import { Link, useNavigate } from '@tanstack/react-router'; import React, { useRef } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import DropdownMenu, { type Menu } from 'pl-fe/components/dropdown-menu'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import { chatRoute } from 'pl-fe/features/ui/router'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useUnblockAccountMutation, useRelationshipQuery } from 'pl-fe/queries/accounts/use-relationship'; -import { useChat, useChatActions } from 'pl-fe/queries/chats'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import DropdownMenu, { type Menu } from '@/components/dropdown-menu'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import { chatRoute } from '@/features/ui/router'; +import { useFeatures } from '@/hooks/use-features'; +import { useUnblockAccountMutation, useRelationshipQuery } from '@/queries/accounts/use-relationship'; +import { useChat, useChatActions } from '@/queries/chats'; +import { useModalsActions } from '@/stores/modals'; import Chat from '../../chat'; diff --git a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-empty.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-empty.tsx index d0188cf4a..0e4d36e1f 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-empty.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-empty.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { useChats } from 'pl-fe/queries/chats'; +import { useChats } from '@/queries/chats'; import BlankslateEmpty from './blankslate-empty'; import BlankslateWithChats from './blankslate-with-chats'; diff --git a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-new.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-new.tsx index 049fadd06..a868d37a4 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-new.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-new.tsx @@ -2,10 +2,10 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { CardTitle } from 'pl-fe/components/ui/card'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; +import { CardTitle } from '@/components/ui/card'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; import ChatSearch from '../../chat-search/chat-search'; diff --git a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-settings.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-settings.tsx index b09dbb50a..9c2d8c5da 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-settings.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-settings.tsx @@ -2,20 +2,20 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { changeSetting } from 'pl-fe/actions/settings'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import { CardBody, CardTitle } from 'pl-fe/components/ui/card'; -import Form from 'pl-fe/components/ui/form'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Toggle from 'pl-fe/components/ui/toggle'; -import SettingToggle from 'pl-fe/features/settings/components/setting-toggle'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { useUpdateCredentials } from 'pl-fe/queries/accounts'; -import { useSettings } from 'pl-fe/stores/settings'; +import { changeSetting } from '@/actions/settings'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import { CardBody, CardTitle } from '@/components/ui/card'; +import Form from '@/components/ui/form'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Toggle from '@/components/ui/toggle'; +import SettingToggle from '@/features/settings/components/setting-toggle'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useUpdateCredentials } from '@/queries/accounts'; +import { useSettings } from '@/stores/settings'; type FormData = { accepts_chat_messages?: boolean; diff --git a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-shoutbox.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-shoutbox.tsx index 6c4c659ef..20abb01e6 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-shoutbox.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-shoutbox.tsx @@ -2,13 +2,13 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useInstance } from '@/hooks/use-instance'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; import Shoutbox from '../../shoutbox'; diff --git a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-sidebar.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-sidebar.tsx index 651496224..71d92f57c 100644 --- a/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-sidebar.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-sidebar.tsx @@ -2,10 +2,10 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { CardTitle } from 'pl-fe/components/ui/card'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; +import { CardTitle } from '@/components/ui/card'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; import ChatList from '../../chat-list'; diff --git a/packages/pl-fe/src/features/chats/components/shoutbox-composer.tsx b/packages/pl-fe/src/features/chats/components/shoutbox-composer.tsx index 443d2028f..448a41f09 100644 --- a/packages/pl-fe/src/features/chats/components/shoutbox-composer.tsx +++ b/packages/pl-fe/src/features/chats/components/shoutbox-composer.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Combobox, { ComboboxInput } from 'pl-fe/components/ui/combobox'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import Combobox, { ComboboxInput } from '@/components/ui/combobox'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useInstance } from '@/hooks/use-instance'; import ChatTextarea from './chat-textarea'; diff --git a/packages/pl-fe/src/features/chats/components/shoutbox-message-list.tsx b/packages/pl-fe/src/features/chats/components/shoutbox-message-list.tsx index 3cdfb09b1..70b27beeb 100644 --- a/packages/pl-fe/src/features/chats/components/shoutbox-message-list.tsx +++ b/packages/pl-fe/src/features/chats/components/shoutbox-message-list.tsx @@ -3,17 +3,17 @@ import clsx from 'clsx'; import React, { useState, useEffect, useRef, useMemo } from 'react'; import { Virtuoso, VirtuosoHandle } from 'react-virtuoso'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import HoverAccountWrapper from 'pl-fe/components/hover-account-wrapper'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import PlaceholderChatMessage from 'pl-fe/features/placeholder/components/placeholder-chat-message'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useShoutboxIsLoading, useShoutboxMessages, type ShoutMessage } from 'pl-fe/stores/shoutbox'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import HoverAccountWrapper from '@/components/hover-account-wrapper'; +import { ParsedContent } from '@/components/parsed-content'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import PlaceholderChatMessage from '@/features/placeholder/components/placeholder-chat-message'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useShoutboxIsLoading, useShoutboxMessages, type ShoutMessage } from '@/stores/shoutbox'; import { ChatMessageListList, ChatMessageListScroller } from './chat-message-list'; diff --git a/packages/pl-fe/src/features/chats/components/shoutbox.tsx b/packages/pl-fe/src/features/chats/components/shoutbox.tsx index 3d9962409..bf8d300dd 100644 --- a/packages/pl-fe/src/features/chats/components/shoutbox.tsx +++ b/packages/pl-fe/src/features/chats/components/shoutbox.tsx @@ -1,8 +1,8 @@ import clsx from 'clsx'; import React, { MutableRefObject, useEffect, useState } from 'react'; -import Stack from 'pl-fe/components/ui/stack'; -import { useCreateShoutboxMessage } from 'pl-fe/stores/shoutbox'; +import Stack from '@/components/ui/stack'; +import { useCreateShoutboxMessage } from '@/stores/shoutbox'; import { clearNativeInputValue } from './chat'; import ShoutboxComposer from './shoutbox-composer'; diff --git a/packages/pl-fe/src/features/compose-event/components/upload-button.tsx b/packages/pl-fe/src/features/compose-event/components/upload-button.tsx index d3be7e340..ecda3f4c6 100644 --- a/packages/pl-fe/src/features/compose-event/components/upload-button.tsx +++ b/packages/pl-fe/src/features/compose-event/components/upload-button.tsx @@ -1,10 +1,10 @@ import React, { useRef } from 'react'; import { FormattedMessage } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import HStack from 'pl-fe/components/ui/hstack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import Icon from '@/components/icon'; +import HStack from '@/components/ui/hstack'; +import Text from '@/components/ui/text'; +import { useAppSelector } from '@/hooks/use-app-selector'; interface IUploadButton { disabled?: boolean; diff --git a/packages/pl-fe/src/features/compose-event/tabs/edit-event.tsx b/packages/pl-fe/src/features/compose-event/tabs/edit-event.tsx index 8adc571fc..480d91f3a 100644 --- a/packages/pl-fe/src/features/compose-event/tabs/edit-event.tsx +++ b/packages/pl-fe/src/features/compose-event/tabs/edit-event.tsx @@ -2,34 +2,34 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useCallback, useEffect, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { resetCompose } from 'pl-fe/actions/compose'; +import { resetCompose } from '@/actions/compose'; import { cancelEventCompose, initEventEdit, submitEvent, -} from 'pl-fe/actions/events'; -import { uploadFile } from 'pl-fe/actions/media'; -import { fetchStatus } from 'pl-fe/actions/statuses'; -import { ADDRESS_ICONS } from 'pl-fe/components/autosuggest-location'; -import LocationSearch from 'pl-fe/components/location-search'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Input from 'pl-fe/components/ui/input'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Toggle from 'pl-fe/components/ui/toggle'; -import ContentTypeButton from 'pl-fe/features/compose/components/content-type-button'; -import { isCurrentOrFutureDate } from 'pl-fe/features/compose/components/schedule-form'; -import { ComposeEditor, DatePicker } from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; -import toast from 'pl-fe/toast'; +} from '@/actions/events'; +import { uploadFile } from '@/actions/media'; +import { fetchStatus } from '@/actions/statuses'; +import { ADDRESS_ICONS } from '@/components/autosuggest-location'; +import LocationSearch from '@/components/location-search'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import Input from '@/components/ui/input'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Toggle from '@/components/ui/toggle'; +import ContentTypeButton from '@/features/compose/components/content-type-button'; +import { isCurrentOrFutureDate } from '@/features/compose/components/schedule-form'; +import { ComposeEditor, DatePicker } from '@/features/ui/util/async-components'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; +import toast from '@/toast'; import UploadButton from '../components/upload-button'; diff --git a/packages/pl-fe/src/features/compose-event/tabs/manage-pending-participants.tsx b/packages/pl-fe/src/features/compose-event/tabs/manage-pending-participants.tsx index 1f246e4ac..282c084eb 100644 --- a/packages/pl-fe/src/features/compose-event/tabs/manage-pending-participants.tsx +++ b/packages/pl-fe/src/features/compose-event/tabs/manage-pending-participants.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useAcceptEventParticipationRequestMutation, useEventParticipationRequests, useRejectEventParticipationRequestMutation } from 'pl-fe/queries/events/use-event-participation-requests'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import AccountContainer from '@/containers/account-container'; +import { useAcceptEventParticipationRequestMutation, useEventParticipationRequests, useRejectEventParticipationRequestMutation } from '@/queries/events/use-event-participation-requests'; const messages = defineMessages({ authorize: { id: 'compose_event.participation_requests.authorize', defaultMessage: 'Authorize' }, diff --git a/packages/pl-fe/src/features/compose/components/autosuggest-account.tsx b/packages/pl-fe/src/features/compose/components/autosuggest-account.tsx index 96c5e0afc..bdf17e418 100644 --- a/packages/pl-fe/src/features/compose/components/autosuggest-account.tsx +++ b/packages/pl-fe/src/features/compose/components/autosuggest-account.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import Account from 'pl-fe/components/account'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import Account from '@/components/account'; interface IAutosuggestAccount { id: string; diff --git a/packages/pl-fe/src/features/compose/components/clear-link-suggestion.tsx b/packages/pl-fe/src/features/compose/components/clear-link-suggestion.tsx index 1766d96af..f32f8f857 100644 --- a/packages/pl-fe/src/features/compose/components/clear-link-suggestion.tsx +++ b/packages/pl-fe/src/features/compose/components/clear-link-suggestion.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import { useCompose } from '@/hooks/use-compose'; import Warning from './warning'; diff --git a/packages/pl-fe/src/features/compose/components/compose-form-button.tsx b/packages/pl-fe/src/features/compose/components/compose-form-button.tsx index 28736aef1..652a52199 100644 --- a/packages/pl-fe/src/features/compose/components/compose-form-button.tsx +++ b/packages/pl-fe/src/features/compose/components/compose-form-button.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import React from 'react'; -import IconButton from 'pl-fe/components/ui/icon-button'; +import IconButton from '@/components/ui/icon-button'; interface IComposeFormButton { icon: string; diff --git a/packages/pl-fe/src/features/compose/components/compose-form.tsx b/packages/pl-fe/src/features/compose/components/compose-form.tsx index df37cb3fc..efe4b53bf 100644 --- a/packages/pl-fe/src/features/compose/components/compose-form.tsx +++ b/packages/pl-fe/src/features/compose/components/compose-form.tsx @@ -14,22 +14,22 @@ import { suggestClearLink, resetCompose, changeComposeRedactingOverwrite, -} from 'pl-fe/actions/compose'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import List, { ListItem } from 'pl-fe/components/list'; -import Icon from 'pl-fe/components/ui/icon'; -import SvgIcon from 'pl-fe/components/ui/svg-icon'; -import Toggle from 'pl-fe/components/ui/toggle'; -import EmojiPickerDropdown from 'pl-fe/features/emoji/containers/emoji-picker-dropdown-container'; -import { ComposeEditor } from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useDraggedFiles } from 'pl-fe/hooks/use-dragged-files'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePersistDraftStatus } from 'pl-fe/queries/statuses/use-draft-statuses'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +} from '@/actions/compose'; +import DropdownMenu from '@/components/dropdown-menu'; +import List, { ListItem } from '@/components/list'; +import Icon from '@/components/ui/icon'; +import SvgIcon from '@/components/ui/svg-icon'; +import Toggle from '@/components/ui/toggle'; +import EmojiPickerDropdown from '@/features/emoji/containers/emoji-picker-dropdown-container'; +import { ComposeEditor } from '@/features/ui/util/async-components'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useDraggedFiles } from '@/hooks/use-dragged-files'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { usePersistDraftStatus } from '@/queries/statuses/use-draft-statuses'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; import PreviewComposeContainer from '../containers/preview-compose-container'; import QuotedStatusContainer from '../containers/quoted-status-container'; @@ -61,10 +61,10 @@ import UploadForm from './upload-form'; import VisualCharacterCounter from './visual-character-counter'; import Warning from './warning'; +import type { AutoSuggestion } from '@/components/autosuggest-input'; +import type { Menu } from '@/components/dropdown-menu'; +import type { Emoji } from '@/features/emoji'; import type { LinkNode } from '@lexical/link'; -import type { AutoSuggestion } from 'pl-fe/components/autosuggest-input'; -import type { Menu } from 'pl-fe/components/dropdown-menu'; -import type { Emoji } from 'pl-fe/features/emoji'; const messages = defineMessages({ placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What\'s on your mind?' }, diff --git a/packages/pl-fe/src/features/compose/components/content-type-button.tsx b/packages/pl-fe/src/features/compose/components/content-type-button.tsx index 83851a784..6d035eaea 100644 --- a/packages/pl-fe/src/features/compose/components/content-type-button.tsx +++ b/packages/pl-fe/src/features/compose/components/content-type-button.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { changeComposeContentType } from 'pl-fe/actions/compose'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import Icon from 'pl-fe/components/ui/icon'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import { changeComposeContentType } from '@/actions/compose'; +import DropdownMenu from '@/components/dropdown-menu'; +import Icon from '@/components/ui/icon'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useInstance } from '@/hooks/use-instance'; const messages = defineMessages({ content_type_plaintext: { id: 'preferences.options.content_type_plaintext', defaultMessage: 'Plain text' }, diff --git a/packages/pl-fe/src/features/compose/components/drive-button.tsx b/packages/pl-fe/src/features/compose/components/drive-button.tsx index 7a1e37e7a..ac2eaf2b7 100644 --- a/packages/pl-fe/src/features/compose/components/drive-button.tsx +++ b/packages/pl-fe/src/features/compose/components/drive-button.tsx @@ -3,10 +3,10 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import * as v from 'valibot'; -import { uploadComposeSuccess } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { uploadComposeSuccess } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useInstance } from '@/hooks/use-instance'; +import { useModalsActions } from '@/stores/modals'; import ComposeFormButton from './compose-form-button'; diff --git a/packages/pl-fe/src/features/compose/components/hashtag-casing-suggestion.tsx b/packages/pl-fe/src/features/compose/components/hashtag-casing-suggestion.tsx index 11ff271e1..5d8480c53 100644 --- a/packages/pl-fe/src/features/compose/components/hashtag-casing-suggestion.tsx +++ b/packages/pl-fe/src/features/compose/components/hashtag-casing-suggestion.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { defineMessages, FormattedMessage } from 'react-intl'; -import { ignoreHashtagCasingSuggestion } from 'pl-fe/actions/compose'; -import { changeSetting } from 'pl-fe/actions/settings'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import toast from 'pl-fe/toast'; +import { ignoreHashtagCasingSuggestion } from '@/actions/compose'; +import { changeSetting } from '@/actions/settings'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import toast from '@/toast'; import Warning from './warning'; diff --git a/packages/pl-fe/src/features/compose/components/interaction-policy-button.tsx b/packages/pl-fe/src/features/compose/components/interaction-policy-button.tsx index 0efd3fa6b..80031adc4 100644 --- a/packages/pl-fe/src/features/compose/components/interaction-policy-button.tsx +++ b/packages/pl-fe/src/features/compose/components/interaction-policy-button.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { useCompose } from '@/hooks/use-compose'; +import { useModalsActions } from '@/stores/modals'; import ComposeFormButton from './compose-form-button'; diff --git a/packages/pl-fe/src/features/compose/components/language-dropdown.tsx b/packages/pl-fe/src/features/compose/components/language-dropdown.tsx index 6cbf3efbe..e9c29ed71 100644 --- a/packages/pl-fe/src/features/compose/components/language-dropdown.tsx +++ b/packages/pl-fe/src/features/compose/components/language-dropdown.tsx @@ -3,15 +3,15 @@ import fuzzysort from 'fuzzysort'; import React, { useDeferredValue, useEffect, useMemo, useRef, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { addComposeLanguage, changeComposeLanguage, changeComposeModifiedLanguage, deleteComposeLanguage } from 'pl-fe/actions/compose'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import Icon from 'pl-fe/components/ui/icon'; -import Input from 'pl-fe/components/ui/input'; -import { type Language, languages as languagesObject } from 'pl-fe/features/preferences'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useSettings } from 'pl-fe/stores/settings'; +import { addComposeLanguage, changeComposeLanguage, changeComposeModifiedLanguage, deleteComposeLanguage } from '@/actions/compose'; +import DropdownMenu from '@/components/dropdown-menu'; +import Icon from '@/components/ui/icon'; +import Input from '@/components/ui/input'; +import { type Language, languages as languagesObject } from '@/features/preferences'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useFeatures } from '@/hooks/use-features'; +import { useSettings } from '@/stores/settings'; const getFrequentlyUsedLanguages = (languageCounters: Record) => ( Object.keys(languageCounters) diff --git a/packages/pl-fe/src/features/compose/components/location-button.tsx b/packages/pl-fe/src/features/compose/components/location-button.tsx index 2fc573fc1..9bea1f7fb 100644 --- a/packages/pl-fe/src/features/compose/components/location-button.tsx +++ b/packages/pl-fe/src/features/compose/components/location-button.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { setComposeShowLocationPicker } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { setComposeShowLocationPicker } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; import ComposeFormButton from './compose-form-button'; diff --git a/packages/pl-fe/src/features/compose/components/location-form.tsx b/packages/pl-fe/src/features/compose/components/location-form.tsx index 97ee0f79d..07c0af98f 100644 --- a/packages/pl-fe/src/features/compose/components/location-form.tsx +++ b/packages/pl-fe/src/features/compose/components/location-form.tsx @@ -2,16 +2,16 @@ import { Location } from 'pl-api'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { setComposeLocation } from 'pl-fe/actions/compose'; -import { ADDRESS_ICONS } from 'pl-fe/components/autosuggest-location'; -import LocationSearch from 'pl-fe/components/location-search'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { setComposeLocation } from '@/actions/compose'; +import { ADDRESS_ICONS } from '@/components/autosuggest-location'; +import LocationSearch from '@/components/location-search'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; const messages = defineMessages({ resetLocation: { id: 'compose_event.reset_location', defaultMessage: 'Reset location' }, diff --git a/packages/pl-fe/src/features/compose/components/poll-button.tsx b/packages/pl-fe/src/features/compose/components/poll-button.tsx index 610d18e33..5355deb7d 100644 --- a/packages/pl-fe/src/features/compose/components/poll-button.tsx +++ b/packages/pl-fe/src/features/compose/components/poll-button.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { addPoll, removePoll } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { addPoll, removePoll } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; import ComposeFormButton from './compose-form-button'; diff --git a/packages/pl-fe/src/features/compose/components/polls/duration-selector.test.tsx b/packages/pl-fe/src/features/compose/components/polls/duration-selector.test.tsx index 565a5f9b4..37c4b8a94 100644 --- a/packages/pl-fe/src/features/compose/components/polls/duration-selector.test.tsx +++ b/packages/pl-fe/src/features/compose/components/polls/duration-selector.test.tsx @@ -1,7 +1,7 @@ import userEvent from '@testing-library/user-event'; import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import DurationSelector from './duration-selector'; diff --git a/packages/pl-fe/src/features/compose/components/polls/duration-selector.tsx b/packages/pl-fe/src/features/compose/components/polls/duration-selector.tsx index 38b0601b0..d323dfd5b 100644 --- a/packages/pl-fe/src/features/compose/components/polls/duration-selector.tsx +++ b/packages/pl-fe/src/features/compose/components/polls/duration-selector.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Select from 'pl-fe/components/ui/select'; +import Select from '@/components/ui/select'; const messages = defineMessages({ minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' }, diff --git a/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx b/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx index 5bc80f19b..335475682 100644 --- a/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx +++ b/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx @@ -1,21 +1,21 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { addPollOption, changePollOption, changePollSettings, clearComposeSuggestions, fetchComposeSuggestions, removePoll, removePollOption, selectComposeSuggestion } from 'pl-fe/actions/compose'; -import AutosuggestInput from 'pl-fe/components/autosuggest-input'; -import Button from 'pl-fe/components/ui/button'; -import Divider from 'pl-fe/components/ui/divider'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import { addPollOption, changePollOption, changePollSettings, clearComposeSuggestions, fetchComposeSuggestions, removePoll, removePollOption, selectComposeSuggestion } from '@/actions/compose'; +import AutosuggestInput from '@/components/autosuggest-input'; +import Button from '@/components/ui/button'; +import Divider from '@/components/ui/divider'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Toggle from '@/components/ui/toggle'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useInstance } from '@/hooks/use-instance'; import DurationSelector from './duration-selector'; -import type { AutoSuggestion } from 'pl-fe/components/autosuggest-input'; +import type { AutoSuggestion } from '@/components/autosuggest-input'; const messages = defineMessages({ option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Answer #{number}' }, diff --git a/packages/pl-fe/src/features/compose/components/privacy-dropdown.tsx b/packages/pl-fe/src/features/compose/components/privacy-dropdown.tsx index c08655113..3378ad1b4 100644 --- a/packages/pl-fe/src/features/compose/components/privacy-dropdown.tsx +++ b/packages/pl-fe/src/features/compose/components/privacy-dropdown.tsx @@ -1,15 +1,15 @@ import React, { useMemo } from 'react'; import { useIntl, defineMessages, IntlShape } from 'react-intl'; -import { changeComposeFederated, changeComposeVisibility } from 'pl-fe/actions/compose'; -import DropdownMenu, { MenuItem } from 'pl-fe/components/dropdown-menu'; -import Icon from 'pl-fe/components/ui/icon'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { getOrderedLists } from 'pl-fe/pages/account-lists/lists'; -import { useCircles } from 'pl-fe/queries/accounts/use-circles'; -import { useLists } from 'pl-fe/queries/accounts/use-lists'; +import { changeComposeFederated, changeComposeVisibility } from '@/actions/compose'; +import DropdownMenu, { MenuItem } from '@/components/dropdown-menu'; +import Icon from '@/components/ui/icon'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useFeatures } from '@/hooks/use-features'; +import { getOrderedLists } from '@/pages/account-lists/lists'; +import { useCircles } from '@/queries/accounts/use-circles'; +import { useLists } from '@/queries/accounts/use-lists'; import type { Circle, Features } from 'pl-api'; diff --git a/packages/pl-fe/src/features/compose/components/reply-group-indicator.tsx b/packages/pl-fe/src/features/compose/components/reply-group-indicator.tsx index d0b8f7c43..1722eebe0 100644 --- a/packages/pl-fe/src/features/compose/components/reply-group-indicator.tsx +++ b/packages/pl-fe/src/features/compose/components/reply-group-indicator.tsx @@ -1,11 +1,11 @@ import React, { useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; -import Link from 'pl-fe/components/link'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; +import Link from '@/components/link'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; interface IReplyGroupIndicator { composeId: string; diff --git a/packages/pl-fe/src/features/compose/components/reply-indicator.tsx b/packages/pl-fe/src/features/compose/components/reply-indicator.tsx index 6ccb8b761..11b5645d3 100644 --- a/packages/pl-fe/src/features/compose/components/reply-indicator.tsx +++ b/packages/pl-fe/src/features/compose/components/reply-indicator.tsx @@ -1,14 +1,14 @@ import clsx from 'clsx'; import React from 'react'; -import AttachmentThumbs from 'pl-fe/components/attachment-thumbs'; -import Markup from 'pl-fe/components/markup'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import Stack from 'pl-fe/components/ui/stack'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { getTextDirection } from 'pl-fe/utils/rtl'; +import AttachmentThumbs from '@/components/attachment-thumbs'; +import Markup from '@/components/markup'; +import { ParsedContent } from '@/components/parsed-content'; +import Stack from '@/components/ui/stack'; +import AccountContainer from '@/containers/account-container'; +import { getTextDirection } from '@/utils/rtl'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; interface IReplyIndicator { className?: string; diff --git a/packages/pl-fe/src/features/compose/components/reply-mentions.tsx b/packages/pl-fe/src/features/compose/components/reply-mentions.tsx index 01dd60c99..9b7ae1184 100644 --- a/packages/pl-fe/src/features/compose/components/reply-mentions.tsx +++ b/packages/pl-fe/src/features/compose/components/reply-mentions.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { FormattedList, FormattedMessage } from 'react-intl'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import { useCompose } from '@/hooks/use-compose'; +import { useFeatures } from '@/hooks/use-features'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; interface IReplyMentions { composeId: string; diff --git a/packages/pl-fe/src/features/compose/components/schedule-button.tsx b/packages/pl-fe/src/features/compose/components/schedule-button.tsx index 67f94970a..6fa40a0c1 100644 --- a/packages/pl-fe/src/features/compose/components/schedule-button.tsx +++ b/packages/pl-fe/src/features/compose/components/schedule-button.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { addSchedule, removeSchedule } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { addSchedule, removeSchedule } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; import ComposeFormButton from './compose-form-button'; diff --git a/packages/pl-fe/src/features/compose/components/schedule-form.tsx b/packages/pl-fe/src/features/compose/components/schedule-form.tsx index 63b3cf3a5..e85e95f68 100644 --- a/packages/pl-fe/src/features/compose/components/schedule-form.tsx +++ b/packages/pl-fe/src/features/compose/components/schedule-form.tsx @@ -2,13 +2,13 @@ import clsx from 'clsx'; import React, { Suspense, useCallback } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { setSchedule, removeSchedule } from 'pl-fe/actions/compose'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Input from 'pl-fe/components/ui/input'; -import { DatePicker } from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { setSchedule, removeSchedule } from '@/actions/compose'; +import IconButton from '@/components/ui/icon-button'; +import Input from '@/components/ui/input'; +import { DatePicker } from '@/features/ui/util/async-components'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useFeatures } from '@/hooks/use-features'; const isCurrentOrFutureDate = (date: Date) => (date && new Date().setHours(0, 0, 0, 0) <= new Date(date).setHours(0, 0, 0, 0)); diff --git a/packages/pl-fe/src/features/compose/components/sensitive-media-button.tsx b/packages/pl-fe/src/features/compose/components/sensitive-media-button.tsx index 9a440d932..378493d24 100644 --- a/packages/pl-fe/src/features/compose/components/sensitive-media-button.tsx +++ b/packages/pl-fe/src/features/compose/components/sensitive-media-button.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { changeComposeSpoilerness } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { changeComposeSpoilerness } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; import ComposeFormButton from './compose-form-button'; diff --git a/packages/pl-fe/src/features/compose/components/spoiler-input.tsx b/packages/pl-fe/src/features/compose/components/spoiler-input.tsx index 5ead678bb..b40049727 100644 --- a/packages/pl-fe/src/features/compose/components/spoiler-input.tsx +++ b/packages/pl-fe/src/features/compose/components/spoiler-input.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { changeComposeSpoilerText } from 'pl-fe/actions/compose'; -import AutosuggestInput, { IAutosuggestInput } from 'pl-fe/components/autosuggest-input'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { changeComposeSpoilerText } from '@/actions/compose'; +import AutosuggestInput, { IAutosuggestInput } from '@/components/autosuggest-input'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; const messages = defineMessages({ placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Subject (optional)' }, diff --git a/packages/pl-fe/src/features/compose/components/upload-button.tsx b/packages/pl-fe/src/features/compose/components/upload-button.tsx index 65a155f0e..502581f43 100644 --- a/packages/pl-fe/src/features/compose/components/upload-button.tsx +++ b/packages/pl-fe/src/features/compose/components/upload-button.tsx @@ -1,8 +1,8 @@ import React, { useRef } from 'react'; import { defineMessages, IntlShape, useIntl } from 'react-intl'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import IconButton from '@/components/ui/icon-button'; +import { useInstance } from '@/hooks/use-instance'; const messages = defineMessages({ upload: { id: 'upload_button.label', defaultMessage: 'Add media attachment' }, diff --git a/packages/pl-fe/src/features/compose/components/upload-form.tsx b/packages/pl-fe/src/features/compose/components/upload-form.tsx index 806a6ef74..34431024a 100644 --- a/packages/pl-fe/src/features/compose/components/upload-form.tsx +++ b/packages/pl-fe/src/features/compose/components/upload-form.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; import React, { useCallback, useRef } from 'react'; -import { changeMediaOrder } from 'pl-fe/actions/compose'; -import HStack from 'pl-fe/components/ui/hstack'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { changeMediaOrder } from '@/actions/compose'; +import HStack from '@/components/ui/hstack'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; import Upload from './upload'; import UploadProgress from './upload-progress'; diff --git a/packages/pl-fe/src/features/compose/components/upload-progress.tsx b/packages/pl-fe/src/features/compose/components/upload-progress.tsx index fa2d7d6a6..ccc655df0 100644 --- a/packages/pl-fe/src/features/compose/components/upload-progress.tsx +++ b/packages/pl-fe/src/features/compose/components/upload-progress.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import UploadProgress from 'pl-fe/components/upload-progress'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import UploadProgress from '@/components/upload-progress'; +import { useCompose } from '@/hooks/use-compose'; interface IComposeUploadProgress { composeId: string; diff --git a/packages/pl-fe/src/features/compose/components/upload.tsx b/packages/pl-fe/src/features/compose/components/upload.tsx index 5e1413b1b..d8db1717d 100644 --- a/packages/pl-fe/src/features/compose/components/upload.tsx +++ b/packages/pl-fe/src/features/compose/components/upload.tsx @@ -1,10 +1,10 @@ import React, { useCallback } from 'react'; -import { undoUploadCompose, changeUploadCompose } from 'pl-fe/actions/compose'; -import Upload from 'pl-fe/components/upload'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import { undoUploadCompose, changeUploadCompose } from '@/actions/compose'; +import Upload from '@/components/upload'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useInstance } from '@/hooks/use-instance'; interface IUploadCompose { id: string; diff --git a/packages/pl-fe/src/features/compose/components/visual-character-counter.tsx b/packages/pl-fe/src/features/compose/components/visual-character-counter.tsx index 8e0288d00..bbfaa6c3c 100644 --- a/packages/pl-fe/src/features/compose/components/visual-character-counter.tsx +++ b/packages/pl-fe/src/features/compose/components/visual-character-counter.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { length } from 'stringz'; -import ProgressCircle from 'pl-fe/components/progress-circle'; +import ProgressCircle from '@/components/progress-circle'; const messages = defineMessages({ title: { id: 'compose.character_counter.title', defaultMessage: 'Used {chars} out of {maxChars} {maxChars, plural, one {character} other {characters}}' }, diff --git a/packages/pl-fe/src/features/compose/components/warning.tsx b/packages/pl-fe/src/features/compose/components/warning.tsx index 6315524dd..0d2c32b07 100644 --- a/packages/pl-fe/src/features/compose/components/warning.tsx +++ b/packages/pl-fe/src/features/compose/components/warning.tsx @@ -1,7 +1,7 @@ import { animated, useSpring } from '@react-spring/web'; import React from 'react'; -import { useSettings } from 'pl-fe/stores/settings'; +import { useSettings } from '@/stores/settings'; interface IWarning { message: React.ReactNode; diff --git a/packages/pl-fe/src/features/compose/containers/preview-compose-container.tsx b/packages/pl-fe/src/features/compose/containers/preview-compose-container.tsx index 8658eb82e..70a24172b 100644 --- a/packages/pl-fe/src/features/compose/containers/preview-compose-container.tsx +++ b/packages/pl-fe/src/features/compose/containers/preview-compose-container.tsx @@ -1,25 +1,25 @@ import React, { useMemo } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { cancelPreviewCompose } from 'pl-fe/actions/compose'; -import EventPreview from 'pl-fe/components/event-preview'; -import OutlineBox from 'pl-fe/components/outline-box'; -import QuotedStatusIndicator from 'pl-fe/components/quoted-status-indicator'; -import StatusContent from 'pl-fe/components/status-content'; -import StatusMedia from 'pl-fe/components/status-media'; -import StatusReplyMentions from 'pl-fe/components/status-reply-mentions'; -import SensitiveContentOverlay from 'pl-fe/components/statuses/sensitive-content-overlay'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; +import { cancelPreviewCompose } from '@/actions/compose'; +import EventPreview from '@/components/event-preview'; +import OutlineBox from '@/components/outline-box'; +import QuotedStatusIndicator from '@/components/quoted-status-indicator'; +import StatusContent from '@/components/status-content'; +import StatusMedia from '@/components/status-media'; +import StatusReplyMentions from '@/components/status-reply-mentions'; +import SensitiveContentOverlay from '@/components/statuses/sensitive-content-overlay'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import AccountContainer from '@/containers/account-container'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useOwnAccount } from '@/hooks/use-own-account'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; const messages = defineMessages({ close: { diff --git a/packages/pl-fe/src/features/compose/containers/quoted-status-container.tsx b/packages/pl-fe/src/features/compose/containers/quoted-status-container.tsx index 361f58d16..76f455038 100644 --- a/packages/pl-fe/src/features/compose/containers/quoted-status-container.tsx +++ b/packages/pl-fe/src/features/compose/containers/quoted-status-container.tsx @@ -1,10 +1,10 @@ import React, { useCallback } from 'react'; -import { cancelQuoteCompose } from 'pl-fe/actions/compose'; -import QuotedStatus from 'pl-fe/components/quoted-status'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; +import { cancelQuoteCompose } from '@/actions/compose'; +import QuotedStatus from '@/components/quoted-status'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; interface IQuotedStatusContainer { composeId: string; diff --git a/packages/pl-fe/src/features/compose/containers/reply-indicator-container.tsx b/packages/pl-fe/src/features/compose/containers/reply-indicator-container.tsx index 2a2778fca..8853de5a9 100644 --- a/packages/pl-fe/src/features/compose/containers/reply-indicator-container.tsx +++ b/packages/pl-fe/src/features/compose/containers/reply-indicator-container.tsx @@ -1,10 +1,10 @@ import React, { useCallback } from 'react'; -import { cancelReplyCompose } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { makeGetStatus } from 'pl-fe/selectors'; +import { cancelReplyCompose } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useCompose } from '@/hooks/use-compose'; +import { makeGetStatus } from '@/selectors'; import ReplyIndicator from '../components/reply-indicator'; diff --git a/packages/pl-fe/src/features/compose/containers/upload-button-container.tsx b/packages/pl-fe/src/features/compose/containers/upload-button-container.tsx index e19928048..a7a2bc8f9 100644 --- a/packages/pl-fe/src/features/compose/containers/upload-button-container.tsx +++ b/packages/pl-fe/src/features/compose/containers/upload-button-container.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { uploadCompose } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { uploadCompose } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; import UploadButton from '../components/upload-button'; diff --git a/packages/pl-fe/src/features/compose/containers/warning-container.tsx b/packages/pl-fe/src/features/compose/containers/warning-container.tsx index 62260ba40..1fd5450ae 100644 --- a/packages/pl-fe/src/features/compose/containers/warning-container.tsx +++ b/packages/pl-fe/src/features/compose/containers/warning-container.tsx @@ -2,9 +2,9 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { selectOwnAccount } from 'pl-fe/selectors'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useCompose } from '@/hooks/use-compose'; +import { selectOwnAccount } from '@/selectors'; import Warning from '../components/warning'; diff --git a/packages/pl-fe/src/features/compose/editor/index.tsx b/packages/pl-fe/src/features/compose/editor/index.tsx index f26192c28..c749a6eec 100644 --- a/packages/pl-fe/src/features/compose/editor/index.tsx +++ b/packages/pl-fe/src/features/compose/editor/index.tsx @@ -21,9 +21,9 @@ import { $createParagraphNode, $createTextNode, $getRoot, type EditorState, type import React, { useMemo, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { usePrevious } from 'pl-fe/hooks/use-previous'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { usePrevious } from '@/hooks/use-previous'; import { useNodes } from './nodes'; import AutosuggestPlugin from './plugins/autosuggest-plugin'; diff --git a/packages/pl-fe/src/features/compose/editor/nodes/emoji-node.tsx b/packages/pl-fe/src/features/compose/editor/nodes/emoji-node.tsx index 6e26ab1dd..bf91e5d09 100644 --- a/packages/pl-fe/src/features/compose/editor/nodes/emoji-node.tsx +++ b/packages/pl-fe/src/features/compose/editor/nodes/emoji-node.tsx @@ -1,8 +1,8 @@ import { $applyNodeReplacement, DecoratorNode } from 'lexical'; import React from 'react'; -import Component from 'pl-fe/components/ui/emoji'; -import { isNativeEmoji, type Emoji } from 'pl-fe/features/emoji'; +import Component from '@/components/ui/emoji'; +import { isNativeEmoji, type Emoji } from '@/features/emoji'; import type { EditorConfig, diff --git a/packages/pl-fe/src/features/compose/editor/nodes/image-component.tsx b/packages/pl-fe/src/features/compose/editor/nodes/image-component.tsx index e5a4b4b77..0930a36e0 100644 --- a/packages/pl-fe/src/features/compose/editor/nodes/image-component.tsx +++ b/packages/pl-fe/src/features/compose/editor/nodes/image-component.tsx @@ -28,11 +28,11 @@ import { Suspense, useCallback, useEffect, useRef, useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; import * as v from 'valibot'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; import { $isImageNode } from './image-node'; diff --git a/packages/pl-fe/src/features/compose/editor/nodes/index.ts b/packages/pl-fe/src/features/compose/editor/nodes/index.ts index 2dc899238..a6c7772a8 100644 --- a/packages/pl-fe/src/features/compose/editor/nodes/index.ts +++ b/packages/pl-fe/src/features/compose/editor/nodes/index.ts @@ -11,7 +11,7 @@ import { ListItemNode, ListNode } from '@lexical/list'; import { HorizontalRuleNode } from '@lexical/react/LexicalHorizontalRuleNode'; import { HeadingNode, QuoteNode } from '@lexical/rich-text'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useFeatures } from '@/hooks/use-features'; import { EmojiNode } from './emoji-node'; import { ImageNode } from './image-node'; diff --git a/packages/pl-fe/src/features/compose/editor/nodes/mention-node.tsx b/packages/pl-fe/src/features/compose/editor/nodes/mention-node.tsx index 28c948f49..b0d640217 100644 --- a/packages/pl-fe/src/features/compose/editor/nodes/mention-node.tsx +++ b/packages/pl-fe/src/features/compose/editor/nodes/mention-node.tsx @@ -7,7 +7,7 @@ import { $applyNodeReplacement, DecoratorNode } from 'lexical'; import React from 'react'; -import Mention from 'pl-fe/components/mention'; +import Mention from '@/components/mention'; import type { EditorConfig, diff --git a/packages/pl-fe/src/features/compose/editor/plugins/autosuggest-plugin.tsx b/packages/pl-fe/src/features/compose/editor/plugins/autosuggest-plugin.tsx index f290cdd89..571738a81 100644 --- a/packages/pl-fe/src/features/compose/editor/plugins/autosuggest-plugin.tsx +++ b/packages/pl-fe/src/features/compose/editor/plugins/autosuggest-plugin.tsx @@ -32,20 +32,20 @@ import React, { } from 'react'; import ReactDOM from 'react-dom'; -import { clearComposeSuggestions, fetchComposeSuggestions } from 'pl-fe/actions/compose'; -import { saveSettings } from 'pl-fe/actions/settings'; -import AutosuggestEmoji from 'pl-fe/components/autosuggest-emoji'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { selectAccount } from 'pl-fe/selectors'; -import { useSettingsStoreActions } from 'pl-fe/stores/settings'; -import { textAtCursorMatchesToken } from 'pl-fe/utils/suggestions'; +import { clearComposeSuggestions, fetchComposeSuggestions } from '@/actions/compose'; +import { saveSettings } from '@/actions/settings'; +import AutosuggestEmoji from '@/components/autosuggest-emoji'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { selectAccount } from '@/selectors'; +import { useSettingsStoreActions } from '@/stores/settings'; +import { textAtCursorMatchesToken } from '@/utils/suggestions'; import AutosuggestAccount from '../../components/autosuggest-account'; import { $createEmojiNode } from '../nodes/emoji-node'; import { $createMentionNode } from '../nodes/mention-node'; -import type { Emoji } from 'pl-fe/features/emoji'; +import type { Emoji } from '@/features/emoji'; type AutoSuggestion = string | Emoji; diff --git a/packages/pl-fe/src/features/compose/editor/plugins/floating-block-type-toolbar-plugin.tsx b/packages/pl-fe/src/features/compose/editor/plugins/floating-block-type-toolbar-plugin.tsx index 2daf1b4b0..db5b2d026 100644 --- a/packages/pl-fe/src/features/compose/editor/plugins/floating-block-type-toolbar-plugin.tsx +++ b/packages/pl-fe/src/features/compose/editor/plugins/floating-block-type-toolbar-plugin.tsx @@ -22,10 +22,10 @@ import * as React from 'react'; import { createPortal } from 'react-dom'; import { defineMessages, useIntl } from 'react-intl'; -import { uploadFile } from 'pl-fe/actions/compose'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import { uploadFile } from '@/actions/compose'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; import { $createImageNode } from '../nodes/image-node'; import { setFloatingElemPosition } from '../utils/set-floating-elem-position'; diff --git a/packages/pl-fe/src/features/compose/editor/plugins/floating-link-editor-plugin.tsx b/packages/pl-fe/src/features/compose/editor/plugins/floating-link-editor-plugin.tsx index 05d135539..38ccbb6b7 100644 --- a/packages/pl-fe/src/features/compose/editor/plugins/floating-link-editor-plugin.tsx +++ b/packages/pl-fe/src/features/compose/editor/plugins/floating-link-editor-plugin.tsx @@ -20,7 +20,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'; import * as React from 'react'; import { createPortal } from 'react-dom'; -import Icon from 'pl-fe/components/ui/icon'; +import Icon from '@/components/ui/icon'; import { getSelectedNode } from '../utils/get-selected-node'; import { setFloatingElemPosition } from '../utils/set-floating-elem-position'; diff --git a/packages/pl-fe/src/features/compose/editor/plugins/floating-text-format-toolbar-plugin.tsx b/packages/pl-fe/src/features/compose/editor/plugins/floating-text-format-toolbar-plugin.tsx index 7e6cbb4d5..f13099859 100644 --- a/packages/pl-fe/src/features/compose/editor/plugins/floating-text-format-toolbar-plugin.tsx +++ b/packages/pl-fe/src/features/compose/editor/plugins/floating-text-format-toolbar-plugin.tsx @@ -39,8 +39,8 @@ import * as React from 'react'; import { createPortal } from 'react-dom'; import { defineMessages, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import Icon from '@/components/ui/icon'; +import { useFeatures } from '@/hooks/use-features'; import { getDOMRangeRect } from '../utils/get-dom-range-rect'; import { getSelectedNode } from '../utils/get-selected-node'; diff --git a/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx b/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx index d4254c3c3..76659c5d5 100644 --- a/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx +++ b/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx @@ -7,13 +7,13 @@ import debounce from 'lodash/debounce'; import { useCallback, useEffect } from 'react'; import { useIntl } from 'react-intl'; -import { addSuggestedLanguage, addSuggestedQuote, setEditorState, suggestClearLink, suggestHashtagCasing } from 'pl-fe/actions/compose'; -import { fetchStatus } from 'pl-fe/actions/statuses'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useSettings } from 'pl-fe/stores/settings'; -import { getStatusIdsFromLinksInContent } from 'pl-fe/utils/status'; -import Purify from 'pl-fe/utils/url-purify'; +import { addSuggestedLanguage, addSuggestedQuote, setEditorState, suggestClearLink, suggestHashtagCasing } from '@/actions/compose'; +import { fetchStatus } from '@/actions/statuses'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useSettings } from '@/stores/settings'; +import { getStatusIdsFromLinksInContent } from '@/utils/status'; +import Purify from '@/utils/url-purify'; import { TRANSFORMERS } from '../transformers'; diff --git a/packages/pl-fe/src/features/conversations/components/conversation.tsx b/packages/pl-fe/src/features/conversations/components/conversation.tsx index 2baa0b19f..ec85fc158 100644 --- a/packages/pl-fe/src/features/conversations/components/conversation.tsx +++ b/packages/pl-fe/src/features/conversations/components/conversation.tsx @@ -1,11 +1,11 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; -import { markConversationRead } from 'pl-fe/actions/conversations'; -import StatusContainer from 'pl-fe/containers/status-container'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { selectAccount } from 'pl-fe/selectors'; +import { markConversationRead } from '@/actions/conversations'; +import StatusContainer from '@/containers/status-container'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { selectAccount } from '@/selectors'; interface IConversation { conversationId: string; diff --git a/packages/pl-fe/src/features/conversations/components/conversations-list.tsx b/packages/pl-fe/src/features/conversations/components/conversations-list.tsx index 13a115896..c9a9ed5d5 100644 --- a/packages/pl-fe/src/features/conversations/components/conversations-list.tsx +++ b/packages/pl-fe/src/features/conversations/components/conversations-list.tsx @@ -2,11 +2,11 @@ import { debounce } from '@tanstack/react-pacer/debouncer'; import React, { useCallback, useRef } from 'react'; import { FormattedMessage } from 'react-intl'; -import { expandConversations } from 'pl-fe/actions/conversations'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { selectChild } from 'pl-fe/utils/scroll-utils'; +import { expandConversations } from '@/actions/conversations'; +import ScrollableList from '@/components/scrollable-list'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { selectChild } from '@/utils/scroll-utils'; import Conversation from './conversation'; diff --git a/packages/pl-fe/src/features/crypto-donate/components/crypto-address.tsx b/packages/pl-fe/src/features/crypto-donate/components/crypto-address.tsx index c0774611d..20662a6f5 100644 --- a/packages/pl-fe/src/features/crypto-donate/components/crypto-address.tsx +++ b/packages/pl-fe/src/features/crypto-donate/components/crypto-address.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import CopyableInput from 'pl-fe/components/copyable-input'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import CopyableInput from '@/components/copyable-input'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useModalsActions } from '@/stores/modals'; import { getTitle } from '../utils/coin-db'; diff --git a/packages/pl-fe/src/features/crypto-donate/components/crypto-donate-panel.tsx b/packages/pl-fe/src/features/crypto-donate/components/crypto-donate-panel.tsx index 7044c7091..438d7904d 100644 --- a/packages/pl-fe/src/features/crypto-donate/components/crypto-donate-panel.tsx +++ b/packages/pl-fe/src/features/crypto-donate/components/crypto-donate-panel.tsx @@ -2,10 +2,10 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Text from 'pl-fe/components/ui/text'; -import Widget from 'pl-fe/components/ui/widget'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; +import Text from '@/components/ui/text'; +import Widget from '@/components/ui/widget'; +import { useInstance } from '@/hooks/use-instance'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; import SiteWallet from './site-wallet'; diff --git a/packages/pl-fe/src/features/crypto-donate/components/detailed-crypto-address.tsx b/packages/pl-fe/src/features/crypto-donate/components/detailed-crypto-address.tsx index 7efcce64a..b433bcf8b 100644 --- a/packages/pl-fe/src/features/crypto-donate/components/detailed-crypto-address.tsx +++ b/packages/pl-fe/src/features/crypto-donate/components/detailed-crypto-address.tsx @@ -1,7 +1,7 @@ import { QRCodeCanvas as QRCode } from 'qrcode.react'; import React from 'react'; -import CopyableInput from 'pl-fe/components/copyable-input'; +import CopyableInput from '@/components/copyable-input'; import { getTitle } from '../utils/coin-db'; diff --git a/packages/pl-fe/src/features/crypto-donate/components/lightning-address.tsx b/packages/pl-fe/src/features/crypto-donate/components/lightning-address.tsx index 6e785b055..36a7d46d2 100644 --- a/packages/pl-fe/src/features/crypto-donate/components/lightning-address.tsx +++ b/packages/pl-fe/src/features/crypto-donate/components/lightning-address.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import CopyableInput from 'pl-fe/components/copyable-input'; -import Emoji from 'pl-fe/components/ui/emoji'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import CopyableInput from '@/components/copyable-input'; +import Emoji from '@/components/ui/emoji'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; interface ILightningAddress { address: string; diff --git a/packages/pl-fe/src/features/crypto-donate/components/site-wallet.tsx b/packages/pl-fe/src/features/crypto-donate/components/site-wallet.tsx index 880f8e6dd..86899b2a4 100644 --- a/packages/pl-fe/src/features/crypto-donate/components/site-wallet.tsx +++ b/packages/pl-fe/src/features/crypto-donate/components/site-wallet.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import Stack from 'pl-fe/components/ui/stack'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; +import Stack from '@/components/ui/stack'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; import CryptoAddress from './crypto-address'; diff --git a/packages/pl-fe/src/features/draft-statuses/builder.tsx b/packages/pl-fe/src/features/draft-statuses/builder.tsx index 9e87a5a01..e942188ed 100644 --- a/packages/pl-fe/src/features/draft-statuses/builder.tsx +++ b/packages/pl-fe/src/features/draft-statuses/builder.tsx @@ -1,11 +1,11 @@ import { statusSchema } from 'pl-api'; import * as v from 'valibot'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; -import { selectOwnAccount } from 'pl-fe/selectors'; +import { normalizeStatus } from '@/normalizers/status'; +import { selectOwnAccount } from '@/selectors'; -import type { DraftStatus } from 'pl-fe/queries/statuses/use-draft-statuses'; -import type { RootState } from 'pl-fe/store'; +import type { DraftStatus } from '@/queries/statuses/use-draft-statuses'; +import type { RootState } from '@/store'; const buildPoll = (draftStatus: DraftStatus) => { if (draftStatus.poll?.options) { diff --git a/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx b/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx index ea3ae3afd..95db3e5e5 100644 --- a/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx +++ b/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx @@ -1,17 +1,17 @@ import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { setComposeToStatus } from 'pl-fe/actions/compose'; -import { fetchStatus } from 'pl-fe/actions/statuses'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCancelDraftStatus } from 'pl-fe/queries/statuses/use-draft-statuses'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import { setComposeToStatus } from '@/actions/compose'; +import { fetchStatus } from '@/actions/statuses'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCancelDraftStatus } from '@/queries/statuses/use-draft-statuses'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; -import type { Status as StatusEntity } from 'pl-fe/normalizers/status'; -import type { DraftStatus } from 'pl-fe/queries/statuses/use-draft-statuses'; +import type { Status as StatusEntity } from '@/normalizers/status'; +import type { DraftStatus } from '@/queries/statuses/use-draft-statuses'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.draft_status_delete.confirm', defaultMessage: 'Discard' }, diff --git a/packages/pl-fe/src/features/draft-statuses/components/draft-status.tsx b/packages/pl-fe/src/features/draft-statuses/components/draft-status.tsx index 10f4785fe..18264368a 100644 --- a/packages/pl-fe/src/features/draft-statuses/components/draft-status.tsx +++ b/packages/pl-fe/src/features/draft-statuses/components/draft-status.tsx @@ -2,23 +2,23 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Account from 'pl-fe/components/account'; -import AttachmentThumbs from 'pl-fe/components/attachment-thumbs'; -import OutlineBox from 'pl-fe/components/outline-box'; -import StatusContent from 'pl-fe/components/status-content'; -import StatusReplyMentions from 'pl-fe/components/status-reply-mentions'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import QuotedStatus from 'pl-fe/features/status/containers/quoted-status-container'; -import PollPreview from 'pl-fe/features/ui/components/poll-preview'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import Account from '@/components/account'; +import AttachmentThumbs from '@/components/attachment-thumbs'; +import OutlineBox from '@/components/outline-box'; +import StatusContent from '@/components/status-content'; +import StatusReplyMentions from '@/components/status-reply-mentions'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import QuotedStatus from '@/features/status/containers/quoted-status-container'; +import PollPreview from '@/features/ui/components/poll-preview'; +import { useAppSelector } from '@/hooks/use-app-selector'; import { buildStatus } from '../builder'; import DraftStatusActionBar from './draft-status-action-bar'; -import type { Status as StatusEntity } from 'pl-fe/normalizers/status'; -import type { DraftStatus as DraftStatusType } from 'pl-fe/queries/statuses/use-draft-statuses'; +import type { Status as StatusEntity } from '@/normalizers/status'; +import type { DraftStatus as DraftStatusType } from '@/queries/statuses/use-draft-statuses'; interface IDraftStatus { draftStatus: DraftStatusType; diff --git a/packages/pl-fe/src/features/edit-profile/components/avatar-picker.tsx b/packages/pl-fe/src/features/edit-profile/components/avatar-picker.tsx index e204897d7..1ecd0801a 100644 --- a/packages/pl-fe/src/features/edit-profile/components/avatar-picker.tsx +++ b/packages/pl-fe/src/features/edit-profile/components/avatar-picker.tsx @@ -2,12 +2,12 @@ import clsx from 'clsx'; import React, { useRef } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import AltIndicator from 'pl-fe/components/alt-indicator'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import { useDraggedFiles } from 'pl-fe/hooks/use-dragged-files'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import AltIndicator from '@/components/alt-indicator'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import { useDraggedFiles } from '@/hooks/use-dragged-files'; +import { useModalsActions } from '@/stores/modals'; const messages = defineMessages({ changeDescriptionHeading: { id: 'group.upload_avatar.alt.heading', defaultMessage: 'Change avatar description' }, diff --git a/packages/pl-fe/src/features/edit-profile/components/header-picker.tsx b/packages/pl-fe/src/features/edit-profile/components/header-picker.tsx index 68bbcddfa..6fd2726b0 100644 --- a/packages/pl-fe/src/features/edit-profile/components/header-picker.tsx +++ b/packages/pl-fe/src/features/edit-profile/components/header-picker.tsx @@ -2,13 +2,13 @@ import clsx from 'clsx'; import React, { useRef } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import AltIndicator from 'pl-fe/components/alt-indicator'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Text from 'pl-fe/components/ui/text'; -import { useDraggedFiles } from 'pl-fe/hooks/use-dragged-files'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import AltIndicator from '@/components/alt-indicator'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import Text from '@/components/ui/text'; +import { useDraggedFiles } from '@/hooks/use-dragged-files'; +import { useModalsActions } from '@/stores/modals'; const messages = defineMessages({ title: { id: 'group.upload_banner.title', defaultMessage: 'Upload background picture' }, diff --git a/packages/pl-fe/src/features/emoji/components/emoji-picker-dropdown.tsx b/packages/pl-fe/src/features/emoji/components/emoji-picker-dropdown.tsx index f7ec9868e..8cabe6e24 100644 --- a/packages/pl-fe/src/features/emoji/components/emoji-picker-dropdown.tsx +++ b/packages/pl-fe/src/features/emoji/components/emoji-picker-dropdown.tsx @@ -1,17 +1,17 @@ import React, { useEffect, useLayoutEffect, useMemo, useState, Suspense } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { changeSetting, saveSettings } from 'pl-fe/actions/settings'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useTheme } from 'pl-fe/hooks/use-theme'; -import { useCustomEmojis } from 'pl-fe/queries/instance/use-custom-emojis'; -import { useSettings, useSettingsStoreActions } from 'pl-fe/stores/settings'; +import { changeSetting, saveSettings } from '@/actions/settings'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useTheme } from '@/hooks/use-theme'; +import { useCustomEmojis } from '@/queries/instance/use-custom-emojis'; +import { useSettings, useSettingsStoreActions } from '@/stores/settings'; import { buildCustomEmojiCategories } from '../../emoji'; import { EmojiPicker } from '../../ui/util/async-components'; +import type { Emoji, CustomEmoji, NativeEmoji } from '@/features/emoji'; import type { CustomEmoji as BaseCustomEmoji } from 'pl-api'; -import type { Emoji, CustomEmoji, NativeEmoji } from 'pl-fe/features/emoji'; const messages = defineMessages({ emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' }, diff --git a/packages/pl-fe/src/features/emoji/components/emoji-picker.tsx b/packages/pl-fe/src/features/emoji/components/emoji-picker.tsx index e36381226..4689ff22f 100644 --- a/packages/pl-fe/src/features/emoji/components/emoji-picker.tsx +++ b/packages/pl-fe/src/features/emoji/components/emoji-picker.tsx @@ -1,7 +1,7 @@ import { Picker as EmojiPicker } from 'emoji-mart'; import React, { useRef, useEffect } from 'react'; -import { joinPublicPath } from 'pl-fe/utils/static'; +import { joinPublicPath } from '@/utils/static'; import data from '../data'; diff --git a/packages/pl-fe/src/features/emoji/containers/emoji-picker-dropdown-container.tsx b/packages/pl-fe/src/features/emoji/containers/emoji-picker-dropdown-container.tsx index 069611882..560005a92 100644 --- a/packages/pl-fe/src/features/emoji/containers/emoji-picker-dropdown-container.tsx +++ b/packages/pl-fe/src/features/emoji/containers/emoji-picker-dropdown-container.tsx @@ -3,9 +3,9 @@ import clsx from 'clsx'; import React, { KeyboardEvent, useMemo, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Portal from 'pl-fe/components/ui/portal'; -import { useClickOutside } from 'pl-fe/hooks/use-click-outside'; +import IconButton from '@/components/ui/icon-button'; +import Portal from '@/components/ui/portal'; +import { useClickOutside } from '@/hooks/use-click-outside'; import EmojiPickerDropdown, { IEmojiPickerDropdown } from '../components/emoji-picker-dropdown'; diff --git a/packages/pl-fe/src/features/emoji/emojify.tsx b/packages/pl-fe/src/features/emoji/emojify.tsx index e857582ab..90f1a8fa9 100644 --- a/packages/pl-fe/src/features/emoji/emojify.tsx +++ b/packages/pl-fe/src/features/emoji/emojify.tsx @@ -1,10 +1,10 @@ import split from 'graphemesplit'; import React from 'react'; -import Emoji from 'pl-fe/components/ui/emoji'; -import { useSettings } from 'pl-fe/stores/settings'; -import { makeEmojiMap } from 'pl-fe/utils/normalizers'; -import { joinPublicPath } from 'pl-fe/utils/static'; +import Emoji from '@/components/ui/emoji'; +import { useSettings } from '@/stores/settings'; +import { makeEmojiMap } from '@/utils/normalizers'; +import { joinPublicPath } from '@/utils/static'; import unicodeMapping from './mapping'; diff --git a/packages/pl-fe/src/features/event/components/event-action-button.tsx b/packages/pl-fe/src/features/event/components/event-action-button.tsx index 70e8da89e..02cdc3db8 100644 --- a/packages/pl-fe/src/features/event/components/event-action-button.tsx +++ b/packages/pl-fe/src/features/event/components/event-action-button.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useJoinEventMutation, useLeaveEventMutation } from 'pl-fe/queries/statuses/use-event-interactions'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import Button from '@/components/ui/button'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useJoinEventMutation, useLeaveEventMutation } from '@/queries/statuses/use-event-interactions'; +import { useModalsActions } from '@/stores/modals'; -import type { ButtonThemes } from 'pl-fe/components/ui/button/useButtonStyles'; -import type { Status as StatusEntity } from 'pl-fe/normalizers/status'; +import type { ButtonThemes } from '@/components/ui/button/useButtonStyles'; +import type { Status as StatusEntity } from '@/normalizers/status'; const messages = defineMessages({ leaveHeading: { id: 'confirmations.leave_event.heading', defaultMessage: 'Leave event' }, diff --git a/packages/pl-fe/src/features/event/components/event-date.tsx b/packages/pl-fe/src/features/event/components/event-date.tsx index f621fc0e2..550f09001 100644 --- a/packages/pl-fe/src/features/event/components/event-date.tsx +++ b/packages/pl-fe/src/features/event/components/event-date.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { FormattedDate } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import HStack from 'pl-fe/components/ui/hstack'; +import Icon from '@/components/icon'; +import HStack from '@/components/ui/hstack'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; interface IEventDate { status: Pick; diff --git a/packages/pl-fe/src/features/event/components/event-header.tsx b/packages/pl-fe/src/features/event/components/event-header.tsx index 915a29bea..aedc66eae 100644 --- a/packages/pl-fe/src/features/event/components/event-header.tsx +++ b/packages/pl-fe/src/features/event/components/event-header.tsx @@ -2,37 +2,37 @@ import { Link, useNavigate } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { directCompose, mentionCompose, quoteCompose } from 'pl-fe/actions/compose'; -import { fetchEventIcs } from 'pl-fe/actions/events'; -import { deleteStatusModal, toggleStatusSensitivityModal } from 'pl-fe/actions/moderation'; -import { initReport, ReportableEntities } from 'pl-fe/actions/reports'; -import { deleteStatus } from 'pl-fe/actions/statuses'; -import DropdownMenu, { type Menu as MenuType } from 'pl-fe/components/dropdown-menu'; -import Icon from 'pl-fe/components/icon'; -import StillImage from 'pl-fe/components/still-image'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { useChats } from 'pl-fe/queries/chats'; -import { useBookmarkStatus, usePinStatus, useReblogStatus, useUnbookmarkStatus, useUnpinStatus, useUnreblogStatus } from 'pl-fe/queries/statuses/use-status-interactions'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; -import copy from 'pl-fe/utils/copy'; -import { download } from 'pl-fe/utils/download'; -import { shortNumberFormat } from 'pl-fe/utils/numbers'; +import { directCompose, mentionCompose, quoteCompose } from '@/actions/compose'; +import { fetchEventIcs } from '@/actions/events'; +import { deleteStatusModal, toggleStatusSensitivityModal } from '@/actions/moderation'; +import { initReport, ReportableEntities } from '@/actions/reports'; +import { deleteStatus } from '@/actions/statuses'; +import DropdownMenu, { type Menu as MenuType } from '@/components/dropdown-menu'; +import Icon from '@/components/icon'; +import StillImage from '@/components/still-image'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import Emojify from '@/features/emoji/emojify'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useChats } from '@/queries/chats'; +import { useBookmarkStatus, usePinStatus, useReblogStatus, useUnbookmarkStatus, useUnpinStatus, useUnreblogStatus } from '@/queries/statuses/use-status-interactions'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; +import copy from '@/utils/copy'; +import { download } from '@/utils/download'; +import { shortNumberFormat } from '@/utils/numbers'; import PlaceholderEventHeader from '../../placeholder/components/placeholder-event-header'; import EventActionButton from '../components/event-action-button'; import EventDate from '../components/event-date'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; const messages = defineMessages({ bannerHeader: { id: 'event.banner', defaultMessage: 'Event banner' }, diff --git a/packages/pl-fe/src/features/external-login/components/external-login-form.tsx b/packages/pl-fe/src/features/external-login/components/external-login-form.tsx index c90411a2c..8794bf70b 100644 --- a/packages/pl-fe/src/features/external-login/components/external-login-form.tsx +++ b/packages/pl-fe/src/features/external-login/components/external-login-form.tsx @@ -1,15 +1,15 @@ import React, { useState, useEffect } from 'react'; import { useIntl, FormattedMessage, defineMessages } from 'react-intl'; -import { externalLogin, loginWithCode } from 'pl-fe/actions/external-auth'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Spinner from 'pl-fe/components/ui/spinner'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import toast from 'pl-fe/toast'; +import { externalLogin, loginWithCode } from '@/actions/external-auth'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Spinner from '@/components/ui/spinner'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import toast from '@/toast'; const messages = defineMessages({ instanceLabel: { id: 'login.fields.instance_label', defaultMessage: 'Instance' }, diff --git a/packages/pl-fe/src/features/federation-restrictions/components/instance-restrictions.tsx b/packages/pl-fe/src/features/federation-restrictions/components/instance-restrictions.tsx index 897902ab6..c935431ca 100644 --- a/packages/pl-fe/src/features/federation-restrictions/components/instance-restrictions.tsx +++ b/packages/pl-fe/src/features/federation-restrictions/components/instance-restrictions.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import Icon from '@/components/icon'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useInstance } from '@/hooks/use-instance'; -import type { RemoteInstance } from 'pl-fe/selectors'; +import type { RemoteInstance } from '@/selectors'; const hasRestrictions = (remoteInstance: RemoteInstance): boolean => { const { accept, reject_deletes, report_removal, ...federation } = remoteInstance.federation; diff --git a/packages/pl-fe/src/features/federation-restrictions/components/restricted-instance.tsx b/packages/pl-fe/src/features/federation-restrictions/components/restricted-instance.tsx index 8b10dfedd..82c106b43 100644 --- a/packages/pl-fe/src/features/federation-restrictions/components/restricted-instance.tsx +++ b/packages/pl-fe/src/features/federation-restrictions/components/restricted-instance.tsx @@ -1,9 +1,9 @@ import clsx from 'clsx'; import React, { useState } from 'react'; -import Icon from 'pl-fe/components/icon'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetRemoteInstance } from 'pl-fe/selectors'; +import Icon from '@/components/icon'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetRemoteInstance } from '@/selectors'; import InstanceRestrictions from './instance-restrictions'; diff --git a/packages/pl-fe/src/features/forms/index.tsx b/packages/pl-fe/src/features/forms/index.tsx index 5b06d8d72..eee41a09a 100644 --- a/packages/pl-fe/src/features/forms/index.tsx +++ b/packages/pl-fe/src/features/forms/index.tsx @@ -1,8 +1,8 @@ import React, { useMemo } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { Multiselect as Ms } from 'pl-fe/components/ui/multiselect'; -import Select from 'pl-fe/components/ui/select'; +import { Multiselect as Ms } from '@/components/ui/multiselect'; +import Select from '@/components/ui/select'; const messages = defineMessages({ selectPlaceholder: { id: 'select.placeholder', defaultMessage: 'Select' }, diff --git a/packages/pl-fe/src/features/group/components/group-action-button.test.tsx b/packages/pl-fe/src/features/group/components/group-action-button.test.tsx index 358195a75..a3ad268ae 100644 --- a/packages/pl-fe/src/features/group/components/group-action-button.test.tsx +++ b/packages/pl-fe/src/features/group/components/group-action-button.test.tsx @@ -1,8 +1,8 @@ import { GroupRoles } from 'pl-api'; import React from 'react'; -import { buildGroup, buildGroupRelationship } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildGroup, buildGroupRelationship } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import GroupActionButton from './group-action-button'; diff --git a/packages/pl-fe/src/features/group/components/group-action-button.tsx b/packages/pl-fe/src/features/group/components/group-action-button.tsx index bb53394ad..9828092ee 100644 --- a/packages/pl-fe/src/features/group/components/group-action-button.tsx +++ b/packages/pl-fe/src/features/group/components/group-action-button.tsx @@ -2,14 +2,14 @@ import { GroupRoles } from 'pl-api'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useJoinGroup } from 'pl-fe/api/hooks/groups/use-join-group'; -import { useLeaveGroup } from 'pl-fe/api/hooks/groups/use-leave-group'; -import Button from 'pl-fe/components/ui/button'; -import { importEntities } from 'pl-fe/entity-store/actions'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { useJoinGroup } from '@/api/hooks/groups/use-join-group'; +import { useLeaveGroup } from '@/api/hooks/groups/use-leave-group'; +import Button from '@/components/ui/button'; +import { importEntities } from '@/entity-store/actions'; +import { Entities } from '@/entity-store/entities'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; import type { Group, GroupRelationship } from 'pl-api'; diff --git a/packages/pl-fe/src/features/group/components/group-header-image.tsx b/packages/pl-fe/src/features/group/components/group-header-image.tsx index dda445004..1df986993 100644 --- a/packages/pl-fe/src/features/group/components/group-header-image.tsx +++ b/packages/pl-fe/src/features/group/components/group-header-image.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import React, { useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; +import Icon from '@/components/ui/icon'; import type { Group } from 'pl-api'; diff --git a/packages/pl-fe/src/features/group/components/group-header.test.tsx b/packages/pl-fe/src/features/group/components/group-header.test.tsx index 9c1efe2f6..5251c0a7e 100644 --- a/packages/pl-fe/src/features/group/components/group-header.test.tsx +++ b/packages/pl-fe/src/features/group/components/group-header.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { buildGroup } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildGroup } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import GroupHeader from './group-header'; diff --git a/packages/pl-fe/src/features/group/components/group-header.tsx b/packages/pl-fe/src/features/group/components/group-header.tsx index 1ea0f0fd7..1658267db 100644 --- a/packages/pl-fe/src/features/group/components/group-header.tsx +++ b/packages/pl-fe/src/features/group/components/group-header.tsx @@ -3,15 +3,15 @@ import React, { useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import * as v from 'valibot'; -import GroupAvatar from 'pl-fe/components/groups/group-avatar'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import StillImage from 'pl-fe/components/still-image'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import GroupAvatar from '@/components/groups/group-avatar'; +import { ParsedContent } from '@/components/parsed-content'; +import StillImage from '@/components/still-image'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import { useModalsActions } from '@/stores/modals'; import GroupActionButton from './group-action-button'; import GroupMemberCount from './group-member-count'; diff --git a/packages/pl-fe/src/features/group/components/group-member-count.test.tsx b/packages/pl-fe/src/features/group/components/group-member-count.test.tsx index 6bb2c292e..0158256a8 100644 --- a/packages/pl-fe/src/features/group/components/group-member-count.test.tsx +++ b/packages/pl-fe/src/features/group/components/group-member-count.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { buildGroup } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildGroup } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import GroupMemberCount from './group-member-count'; diff --git a/packages/pl-fe/src/features/group/components/group-member-count.tsx b/packages/pl-fe/src/features/group/components/group-member-count.tsx index 67e8ba58f..613a480be 100644 --- a/packages/pl-fe/src/features/group/components/group-member-count.tsx +++ b/packages/pl-fe/src/features/group/components/group-member-count.tsx @@ -2,8 +2,8 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Text from 'pl-fe/components/ui/text'; -import { shortNumberFormat } from 'pl-fe/utils/numbers'; +import Text from '@/components/ui/text'; +import { shortNumberFormat } from '@/utils/numbers'; import type { Group } from 'pl-api'; diff --git a/packages/pl-fe/src/features/group/components/group-member-list-item.test.tsx b/packages/pl-fe/src/features/group/components/group-member-list-item.test.tsx index 764f4c118..dd1f9423b 100644 --- a/packages/pl-fe/src/features/group/components/group-member-list-item.test.tsx +++ b/packages/pl-fe/src/features/group/components/group-member-list-item.test.tsx @@ -2,9 +2,9 @@ import userEvent from '@testing-library/user-event'; import { GroupRoles } from 'pl-api'; import React from 'react'; -import { __stub } from 'pl-fe/api'; -import { buildGroup, buildGroupMember, buildGroupRelationship } from 'pl-fe/jest/factory'; -import { render, screen, waitFor } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { buildGroup, buildGroupMember, buildGroupRelationship } from '@/jest/factory'; +import { render, screen, waitFor } from '@/jest/test-helpers'; import GroupMemberListItem from './group-member-list-item'; diff --git a/packages/pl-fe/src/features/group/components/group-member-list-item.tsx b/packages/pl-fe/src/features/group/components/group-member-list-item.tsx index 5c554b4c5..798399cce 100644 --- a/packages/pl-fe/src/features/group/components/group-member-list-item.tsx +++ b/packages/pl-fe/src/features/group/components/group-member-list-item.tsx @@ -3,23 +3,23 @@ import { GroupRoles } from 'pl-api'; import React, { useMemo } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import { useDemoteGroupMember } from 'pl-fe/api/hooks/groups/use-demote-group-member'; -import { usePromoteGroupMember } from 'pl-fe/api/hooks/groups/use-promote-group-member'; -import Account from 'pl-fe/components/account'; -import DropdownMenu from 'pl-fe/components/dropdown-menu/dropdown-menu'; -import HStack from 'pl-fe/components/ui/hstack'; -import { deleteEntities } from 'pl-fe/entity-store/actions'; -import { Entities } from 'pl-fe/entity-store/entities'; -import PlaceholderAccount from 'pl-fe/features/placeholder/components/placeholder-account'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useBlockGroupUserMutation } from 'pl-fe/queries/groups/use-group-blocks'; -import { useKickGroupMemberMutation, type MinifiedGroupMember } from 'pl-fe/queries/groups/use-group-members'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import { useDemoteGroupMember } from '@/api/hooks/groups/use-demote-group-member'; +import { usePromoteGroupMember } from '@/api/hooks/groups/use-promote-group-member'; +import Account from '@/components/account'; +import DropdownMenu from '@/components/dropdown-menu/dropdown-menu'; +import HStack from '@/components/ui/hstack'; +import { deleteEntities } from '@/entity-store/actions'; +import { Entities } from '@/entity-store/entities'; +import PlaceholderAccount from '@/features/placeholder/components/placeholder-account'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useBlockGroupUserMutation } from '@/queries/groups/use-group-blocks'; +import { useKickGroupMemberMutation, type MinifiedGroupMember } from '@/queries/groups/use-group-members'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; +import type { Menu as IMenu } from '@/components/dropdown-menu'; import type { Group } from 'pl-api'; -import type { Menu as IMenu } from 'pl-fe/components/dropdown-menu'; const messages = defineMessages({ adminLimitTitle: { id: 'group.member.admin.limit.title', defaultMessage: 'Admin limit reached' }, diff --git a/packages/pl-fe/src/features/group/components/group-options-button.test.tsx b/packages/pl-fe/src/features/group/components/group-options-button.test.tsx index 60e6c2318..715ff823e 100644 --- a/packages/pl-fe/src/features/group/components/group-options-button.test.tsx +++ b/packages/pl-fe/src/features/group/components/group-options-button.test.tsx @@ -1,8 +1,8 @@ import { GroupRoles } from 'pl-api'; import React from 'react'; -import { buildGroup, buildGroupRelationship } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildGroup, buildGroupRelationship } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import GroupOptionsButton from './group-options-button'; diff --git a/packages/pl-fe/src/features/group/components/group-options-button.tsx b/packages/pl-fe/src/features/group/components/group-options-button.tsx index a47a3d551..6d6ee3e56 100644 --- a/packages/pl-fe/src/features/group/components/group-options-button.tsx +++ b/packages/pl-fe/src/features/group/components/group-options-button.tsx @@ -2,11 +2,11 @@ import { GroupRoles, type Group } from 'pl-api'; import React, { useMemo } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useLeaveGroup } from 'pl-fe/api/hooks/groups/use-leave-group'; -import DropdownMenu, { Menu } from 'pl-fe/components/dropdown-menu'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { useLeaveGroup } from '@/api/hooks/groups/use-leave-group'; +import DropdownMenu, { Menu } from '@/components/dropdown-menu'; +import IconButton from '@/components/ui/icon-button'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; const messages = defineMessages({ confirmationConfirm: { id: 'confirmations.leave_group.confirm', defaultMessage: 'Leave' }, diff --git a/packages/pl-fe/src/features/group/components/group-privacy.test.tsx b/packages/pl-fe/src/features/group/components/group-privacy.test.tsx index 0ee729c1a..ca9a99513 100644 --- a/packages/pl-fe/src/features/group/components/group-privacy.test.tsx +++ b/packages/pl-fe/src/features/group/components/group-privacy.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { buildGroup } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildGroup } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import GroupPrivacy from './group-privacy'; diff --git a/packages/pl-fe/src/features/group/components/group-privacy.tsx b/packages/pl-fe/src/features/group/components/group-privacy.tsx index 47e00f475..db142aa43 100644 --- a/packages/pl-fe/src/features/group/components/group-privacy.tsx +++ b/packages/pl-fe/src/features/group/components/group-privacy.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Popover from 'pl-fe/components/ui/popover'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Popover from '@/components/ui/popover'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; import type { Group } from 'pl-api'; diff --git a/packages/pl-fe/src/features/group/components/group-relationship.test.tsx b/packages/pl-fe/src/features/group/components/group-relationship.test.tsx index fcf4c6ec5..9c40c5eea 100644 --- a/packages/pl-fe/src/features/group/components/group-relationship.test.tsx +++ b/packages/pl-fe/src/features/group/components/group-relationship.test.tsx @@ -1,8 +1,8 @@ import { GroupRoles } from 'pl-api'; import React from 'react'; -import { buildGroup, buildGroupRelationship } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildGroup, buildGroupRelationship } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import GroupRelationship from './group-relationship'; diff --git a/packages/pl-fe/src/features/group/components/group-relationship.tsx b/packages/pl-fe/src/features/group/components/group-relationship.tsx index eb7753633..3d115faf6 100644 --- a/packages/pl-fe/src/features/group/components/group-relationship.tsx +++ b/packages/pl-fe/src/features/group/components/group-relationship.tsx @@ -2,9 +2,9 @@ import { GroupRoles, type Group } from 'pl-api'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Text from '@/components/ui/text'; interface IGroupRelationship { group: Pick; diff --git a/packages/pl-fe/src/features/groups/components/discover/group-list-item.test.tsx b/packages/pl-fe/src/features/groups/components/discover/group-list-item.test.tsx index ab24dd3d5..e2cff5ba4 100644 --- a/packages/pl-fe/src/features/groups/components/discover/group-list-item.test.tsx +++ b/packages/pl-fe/src/features/groups/components/discover/group-list-item.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { buildGroup } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildGroup } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import GroupListItem from './group-list-item'; diff --git a/packages/pl-fe/src/features/groups/components/discover/group-list-item.tsx b/packages/pl-fe/src/features/groups/components/discover/group-list-item.tsx index 43aba4bac..873357ba9 100644 --- a/packages/pl-fe/src/features/groups/components/discover/group-list-item.tsx +++ b/packages/pl-fe/src/features/groups/components/discover/group-list-item.tsx @@ -2,14 +2,14 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import GroupAvatar from 'pl-fe/components/groups/group-avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import GroupActionButton from 'pl-fe/features/group/components/group-action-button'; -import { shortNumberFormat } from 'pl-fe/utils/numbers'; +import GroupAvatar from '@/components/groups/group-avatar'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import GroupActionButton from '@/features/group/components/group-action-button'; +import { shortNumberFormat } from '@/utils/numbers'; import type { Group } from 'pl-api'; diff --git a/packages/pl-fe/src/features/notifications/components/notification.tsx b/packages/pl-fe/src/features/notifications/components/notification.tsx index 038c125e7..2d59c004c 100644 --- a/packages/pl-fe/src/features/notifications/components/notification.tsx +++ b/packages/pl-fe/src/features/notifications/components/notification.tsx @@ -2,32 +2,32 @@ import { Link, useNavigate } from '@tanstack/react-router'; import React, { useCallback, useRef } from 'react'; import { defineMessages, useIntl, FormattedList, FormattedMessage, IntlShape, MessageDescriptor } from 'react-intl'; -import { mentionCompose, replyCompose } from 'pl-fe/actions/compose'; -import AttachmentThumbs from 'pl-fe/components/attachment-thumbs'; -import HoverAccountWrapper from 'pl-fe/components/hover-account-wrapper'; -import Icon from 'pl-fe/components/icon'; -import Markup from 'pl-fe/components/markup'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import RelativeTimestamp from 'pl-fe/components/relative-timestamp'; -import StatusInfo from 'pl-fe/components/statuses/status-info'; -import Emoji from 'pl-fe/components/ui/emoji'; -import AccountContainer from 'pl-fe/containers/account-container'; -import StatusContainer from 'pl-fe/containers/status-container'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { Hotkeys } from 'pl-fe/features/ui/components/hotkeys'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { useFavouriteStatus, useUnfavouriteStatus, useReblogStatus, useUnreblogStatus } from 'pl-fe/queries/statuses/use-status-interactions'; -import { makeGetNotification } from 'pl-fe/selectors'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useStatusMetaActions } from 'pl-fe/stores/status-meta'; -import { NotificationType } from 'pl-fe/utils/notification'; +import { mentionCompose, replyCompose } from '@/actions/compose'; +import AttachmentThumbs from '@/components/attachment-thumbs'; +import HoverAccountWrapper from '@/components/hover-account-wrapper'; +import Icon from '@/components/icon'; +import Markup from '@/components/markup'; +import { ParsedContent } from '@/components/parsed-content'; +import RelativeTimestamp from '@/components/relative-timestamp'; +import StatusInfo from '@/components/statuses/status-info'; +import Emoji from '@/components/ui/emoji'; +import AccountContainer from '@/containers/account-container'; +import StatusContainer from '@/containers/status-container'; +import Emojify from '@/features/emoji/emojify'; +import { Hotkeys } from '@/features/ui/components/hotkeys'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useInstance } from '@/hooks/use-instance'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { useFavouriteStatus, useUnfavouriteStatus, useReblogStatus, useUnreblogStatus } from '@/queries/statuses/use-status-interactions'; +import { makeGetNotification } from '@/selectors'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; +import { useStatusMetaActions } from '@/stores/status-meta'; +import { NotificationType } from '@/utils/notification'; +import type { Status as StatusEntity } from '@/normalizers/status'; import type { Account, NotificationGroup } from 'pl-api'; -import type { Status as StatusEntity } from 'pl-fe/normalizers/status'; const notificationForScreenReader = (intl: IntlShape, message: string, timestamp: string) => { const output = [message]; diff --git a/packages/pl-fe/src/features/notifications/components/notifications.test.tsx b/packages/pl-fe/src/features/notifications/components/notifications.test.tsx index 5d5a10f5c..edb2b7cc0 100644 --- a/packages/pl-fe/src/features/notifications/components/notifications.test.tsx +++ b/packages/pl-fe/src/features/notifications/components/notifications.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { updateNotifications } from 'pl-fe/actions/notifications'; -import { render, screen, rootState, createTestStore } from 'pl-fe/jest/test-helpers'; +import { updateNotifications } from '@/actions/notifications'; +import { render, screen, rootState, createTestStore } from '@/jest/test-helpers'; import Notification from './notification'; @@ -20,7 +20,7 @@ const normalize = (notification: any) => { describe('', () => { it('renders a follow notification', async () => { - const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-follow.json')); + const { notification, state } = normalize(await import('@/__fixtures__/notification-follow.json')); render(, undefined, state); @@ -32,7 +32,7 @@ describe('', () => { describe('grouped notifications', () => { it('renders a grouped follow notification for more than 2', async () => { const { notification, state } = normalize({ - ...await import('pl-fe/__fixtures__/notification-follow.json'), + ...await import('@/__fixtures__/notification-follow.json'), total_count: 5, }); @@ -45,7 +45,7 @@ describe('', () => { it('renders a grouped follow notification for 1', async () => { const { notification, state } = normalize({ - ...await import('pl-fe/__fixtures__/notification-follow.json'), + ...await import('@/__fixtures__/notification-follow.json'), total_count: 2, }); @@ -58,7 +58,7 @@ describe('', () => { }); it('renders a favourite notification', async () => { - const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-favourite.json')); + const { notification, state } = normalize(await import('@/__fixtures__/notification-favourite.json')); render(, undefined, state); @@ -67,7 +67,7 @@ describe('', () => { }); // it('renders a follow_request notification', async () => { - // const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-follow_request.json')); + // const { notification, state } = normalize(await import('@/__fixtures__/notification-follow_request.json')); // render(, undefined, state); @@ -76,7 +76,7 @@ describe('', () => { // }); it('renders a mention notification', async () => { - const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-mention.json')); + const { notification, state } = normalize(await import('@/__fixtures__/notification-mention.json')); render(, undefined, state); @@ -85,7 +85,7 @@ describe('', () => { }); it('renders a move notification', async () => { - const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-move.json')); + const { notification, state } = normalize(await import('@/__fixtures__/notification-move.json')); render(, undefined, state); @@ -94,7 +94,7 @@ describe('', () => { }); it('renders a pleroma:emoji_reaction notification', async () => { - const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-pleroma-emoji_reaction.json')); + const { notification, state } = normalize(await import('@/__fixtures__/notification-pleroma-emoji_reaction.json')); render(, undefined, state); @@ -103,7 +103,7 @@ describe('', () => { }); it('renders a pleroma:chat_mention notification', async () => { - const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-pleroma-chat_mention.json')); + const { notification, state } = normalize(await import('@/__fixtures__/notification-pleroma-chat_mention.json')); render(, undefined, state); @@ -111,7 +111,7 @@ describe('', () => { }); it('renders a poll notification', async () => { - const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-poll.json')); + const { notification, state } = normalize(await import('@/__fixtures__/notification-poll.json')); render(, undefined, state); @@ -120,7 +120,7 @@ describe('', () => { }); it('renders a reblog notification', async () => { - const { notification, state } = normalize(await import('pl-fe/__fixtures__/notification-reblog.json')); + const { notification, state } = normalize(await import('@/__fixtures__/notification-reblog.json')); render(, undefined, state); diff --git a/packages/pl-fe/src/features/pl-fe-config/components/color-picker.tsx b/packages/pl-fe/src/features/pl-fe-config/components/color-picker.tsx index ab9173612..f4b0f0341 100644 --- a/packages/pl-fe/src/features/pl-fe-config/components/color-picker.tsx +++ b/packages/pl-fe/src/features/pl-fe-config/components/color-picker.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { SketchPicker, type ColorChangeHandler } from 'react-color'; -import Popover from 'pl-fe/components/ui/popover'; +import Popover from '@/components/ui/popover'; interface IColorPicker { value: string; diff --git a/packages/pl-fe/src/features/pl-fe-config/components/crypto-address-input.tsx b/packages/pl-fe/src/features/pl-fe-config/components/crypto-address-input.tsx index 1e89bdf9d..b20ef7a8b 100644 --- a/packages/pl-fe/src/features/pl-fe-config/components/crypto-address-input.tsx +++ b/packages/pl-fe/src/features/pl-fe-config/components/crypto-address-input.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; -import type { StreamfieldComponent } from 'pl-fe/components/ui/streamfield'; -import type { CryptoAddress } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; +import type { StreamfieldComponent } from '@/components/ui/streamfield'; +import type { CryptoAddress } from '@/normalizers/pl-fe/pl-fe-config'; const messages = defineMessages({ ticker: { id: 'plfe_config.crypto_address.meta_fields.ticker_placeholder', defaultMessage: 'Ticker' }, diff --git a/packages/pl-fe/src/features/pl-fe-config/components/footer-link-input.tsx b/packages/pl-fe/src/features/pl-fe-config/components/footer-link-input.tsx index b5684fc69..4fafc2e60 100644 --- a/packages/pl-fe/src/features/pl-fe-config/components/footer-link-input.tsx +++ b/packages/pl-fe/src/features/pl-fe-config/components/footer-link-input.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; -import type { StreamfieldComponent } from 'pl-fe/components/ui/streamfield'; -import type { FooterItem } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; +import type { StreamfieldComponent } from '@/components/ui/streamfield'; +import type { FooterItem } from '@/normalizers/pl-fe/pl-fe-config'; const messages = defineMessages({ label: { id: 'plfe_config.home_footer.meta_fields.label_placeholder', defaultMessage: 'Label' }, diff --git a/packages/pl-fe/src/features/pl-fe-config/components/icon-picker-dropdown.tsx b/packages/pl-fe/src/features/pl-fe-config/components/icon-picker-dropdown.tsx index d2b5d3505..014264a89 100644 --- a/packages/pl-fe/src/features/pl-fe-config/components/icon-picker-dropdown.tsx +++ b/packages/pl-fe/src/features/pl-fe-config/components/icon-picker-dropdown.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import ForkAwesomeIcon from 'pl-fe/components/fork-awesome-icon'; -import Popover from 'pl-fe/components/ui/popover'; +import ForkAwesomeIcon from '@/components/fork-awesome-icon'; +import Popover from '@/components/ui/popover'; import IconPickerMenu from './icon-picker-menu'; diff --git a/packages/pl-fe/src/features/pl-fe-config/components/icon-picker-menu.tsx b/packages/pl-fe/src/features/pl-fe-config/components/icon-picker-menu.tsx index 4ffd90b6a..3ff22849c 100644 --- a/packages/pl-fe/src/features/pl-fe-config/components/icon-picker-menu.tsx +++ b/packages/pl-fe/src/features/pl-fe-config/components/icon-picker-menu.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Text from 'pl-fe/components/ui/text'; +import Text from '@/components/ui/text'; const messages = defineMessages({ emoji: { id: 'icon_button.label', defaultMessage: 'Select icon' }, diff --git a/packages/pl-fe/src/features/pl-fe-config/components/promo-panel-input.tsx b/packages/pl-fe/src/features/pl-fe-config/components/promo-panel-input.tsx index a6db0ee5e..32aced67c 100644 --- a/packages/pl-fe/src/features/pl-fe-config/components/promo-panel-input.tsx +++ b/packages/pl-fe/src/features/pl-fe-config/components/promo-panel-input.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; import IconPicker from './icon-picker'; -import type { StreamfieldComponent } from 'pl-fe/components/ui/streamfield'; -import type { PromoPanelItem } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; +import type { StreamfieldComponent } from '@/components/ui/streamfield'; +import type { PromoPanelItem } from '@/normalizers/pl-fe/pl-fe-config'; const messages = defineMessages({ icon: { id: 'plfe_config.promo_panel.meta_fields.icon_placeholder', defaultMessage: 'Icon' }, diff --git a/packages/pl-fe/src/features/pl-fe-config/components/site-preview.tsx b/packages/pl-fe/src/features/pl-fe-config/components/site-preview.tsx index b3310081c..5ba4d8598 100644 --- a/packages/pl-fe/src/features/pl-fe-config/components/site-preview.tsx +++ b/packages/pl-fe/src/features/pl-fe-config/components/site-preview.tsx @@ -2,12 +2,12 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import InlineStyle from 'pl-fe/components/inline-style'; -import BackgroundShapes from 'pl-fe/features/ui/components/background-shapes'; -import { useSystemTheme } from 'pl-fe/hooks/use-system-theme'; -import { useThemeCss } from 'pl-fe/hooks/use-theme-css'; +import InlineStyle from '@/components/inline-style'; +import BackgroundShapes from '@/features/ui/components/background-shapes'; +import { useSystemTheme } from '@/hooks/use-system-theme'; +import { useThemeCss } from '@/hooks/use-theme-css'; -import type { PlFeConfig } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; +import type { PlFeConfig } from '@/normalizers/pl-fe/pl-fe-config'; interface ISitePreview { /** Raw pl-fe configuration. */ diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-account.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-account.tsx index eecff1681..23f683c34 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-account.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-account.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; +import HStack from '@/components/ui/hstack'; import PlaceholderAvatar from './placeholder-avatar'; import PlaceholderDisplayName from './placeholder-display-name'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-avatar.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-avatar.tsx index ede9fa296..5b5b218d2 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-avatar.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-avatar.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import React from 'react'; -import Stack from 'pl-fe/components/ui/stack'; +import Stack from '@/components/ui/stack'; interface IPlaceholderAvatar { size: number; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-chat-message.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-chat-message.tsx index 8d4e1b5e9..14d5f3358 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-chat-message.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-chat-message.tsx @@ -1,9 +1,9 @@ import clsx from 'clsx'; import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; import { randomIntFromInterval } from '../utils'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-chat.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-chat.tsx index d879c6fd8..29fa3d815 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-chat.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-chat.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; import PlaceholderAvatar from './placeholder-avatar'; import PlaceholderDisplayName from './placeholder-display-name'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-event-header.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-event-header.tsx index 9176c9531..e7ff4bf63 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-event-header.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-event-header.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import Stack from 'pl-fe/components/ui/stack'; +import Stack from '@/components/ui/stack'; import { generateText, randomIntFromInterval } from '../utils'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-event-preview.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-event-preview.tsx index 25ab30ed2..22af4f092 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-event-preview.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-event-preview.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; import { generateText, randomIntFromInterval } from '../utils'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-group-card.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-group-card.tsx index 46cad7d0e..b291b97e5 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-group-card.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-group-card.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; import { generateText, randomIntFromInterval } from '../utils'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-group-search.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-group-search.tsx index b674e3462..78a360b5a 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-group-search.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-group-search.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; import { generateText, randomIntFromInterval } from '../utils'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-notification.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-notification.tsx index 448cf3eb6..1bda8e2dd 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-notification.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-notification.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; +import HStack from '@/components/ui/hstack'; import PlaceholderAvatar from './placeholder-avatar'; import PlaceholderDisplayName from './placeholder-display-name'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-sidebar-suggestions.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-sidebar-suggestions.tsx index b80556549..7d0718eac 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-sidebar-suggestions.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-sidebar-suggestions.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; import { randomIntFromInterval, generateText } from '../utils'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-sidebar-trends.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-sidebar-trends.tsx index d0a5f2ee5..8c47439e2 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-sidebar-trends.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-sidebar-trends.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import Stack from 'pl-fe/components/ui/stack'; +import Stack from '@/components/ui/stack'; import { randomIntFromInterval, generateText } from '../utils'; diff --git a/packages/pl-fe/src/features/placeholder/components/placeholder-status.tsx b/packages/pl-fe/src/features/placeholder/components/placeholder-status.tsx index 964bca581..b7f61f957 100644 --- a/packages/pl-fe/src/features/placeholder/components/placeholder-status.tsx +++ b/packages/pl-fe/src/features/placeholder/components/placeholder-status.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import React from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; +import HStack from '@/components/ui/hstack'; import PlaceholderAvatar from './placeholder-avatar'; import PlaceholderDisplayName from './placeholder-display-name'; diff --git a/packages/pl-fe/src/features/preferences/index.tsx b/packages/pl-fe/src/features/preferences/index.tsx index 44a745f93..c884efcc8 100644 --- a/packages/pl-fe/src/features/preferences/index.tsx +++ b/packages/pl-fe/src/features/preferences/index.tsx @@ -2,28 +2,28 @@ import debounce from 'lodash/debounce'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { changeSetting, saveSettings } from 'pl-fe/actions/settings'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import HStack from 'pl-fe/components/ui/hstack'; -import StepSlider from 'pl-fe/components/ui/step-slider'; -import { Multiselect, SelectDropdown } from 'pl-fe/features/forms'; -import SettingToggle from 'pl-fe/features/settings/components/setting-toggle'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { PaletteListItem } from 'pl-fe/pages/dashboard/theme-editor'; -import { useSettings } from 'pl-fe/stores/settings'; -import sourceCode from 'pl-fe/utils/code'; -import colors from 'pl-fe/utils/colors'; -import { isStandalone } from 'pl-fe/utils/state'; +import { changeSetting, saveSettings } from '@/actions/settings'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import HStack from '@/components/ui/hstack'; +import StepSlider from '@/components/ui/step-slider'; +import { Multiselect, SelectDropdown } from '@/features/forms'; +import SettingToggle from '@/features/settings/components/setting-toggle'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { PaletteListItem } from '@/pages/dashboard/theme-editor'; +import { useSettings } from '@/stores/settings'; +import sourceCode from '@/utils/code'; +import colors from '@/utils/colors'; +import { isStandalone } from '@/utils/state'; import ThemeToggle from '../ui/components/theme-toggle'; -import type { AppDispatch } from 'pl-fe/store'; +import type { AppDispatch } from '@/store'; const languages = { en: 'English', diff --git a/packages/pl-fe/src/features/remote-timeline/components/pinned-hosts-picker.tsx b/packages/pl-fe/src/features/remote-timeline/components/pinned-hosts-picker.tsx index 45900b8bb..f45ea7a33 100644 --- a/packages/pl-fe/src/features/remote-timeline/components/pinned-hosts-picker.tsx +++ b/packages/pl-fe/src/features/remote-timeline/components/pinned-hosts-picker.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import { useSettings } from 'pl-fe/stores/settings'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import { useSettings } from '@/stores/settings'; interface IPinnedHostsPicker { /** The active host among pinned hosts. */ diff --git a/packages/pl-fe/src/features/reply-mentions/account.tsx b/packages/pl-fe/src/features/reply-mentions/account.tsx index ca0dea50e..21989662b 100644 --- a/packages/pl-fe/src/features/reply-mentions/account.tsx +++ b/packages/pl-fe/src/features/reply-mentions/account.tsx @@ -1,13 +1,13 @@ import React, { useEffect } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { fetchAccount } from 'pl-fe/actions/accounts'; -import { addToMentions, removeFromMentions } from 'pl-fe/actions/compose'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import AccountComponent from 'pl-fe/components/account'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; +import { fetchAccount } from '@/actions/accounts'; +import { addToMentions, removeFromMentions } from '@/actions/compose'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import AccountComponent from '@/components/account'; +import IconButton from '@/components/ui/icon-button'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; const messages = defineMessages({ remove: { id: 'reply_mentions.account.remove', defaultMessage: 'Remove from mentions' }, diff --git a/packages/pl-fe/src/features/scheduled-statuses/builder.tsx b/packages/pl-fe/src/features/scheduled-statuses/builder.tsx index 6dd59acb9..b49923b0b 100644 --- a/packages/pl-fe/src/features/scheduled-statuses/builder.tsx +++ b/packages/pl-fe/src/features/scheduled-statuses/builder.tsx @@ -1,10 +1,10 @@ import { statusSchema, type ScheduledStatus } from 'pl-api'; import * as v from 'valibot'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; -import { selectOwnAccount } from 'pl-fe/selectors'; +import { normalizeStatus } from '@/normalizers/status'; +import { selectOwnAccount } from '@/selectors'; -import type { RootState } from 'pl-fe/store'; +import type { RootState } from '@/store'; const buildStatus = (state: RootState, scheduledStatus: ScheduledStatus) => { const account = selectOwnAccount(state); diff --git a/packages/pl-fe/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx b/packages/pl-fe/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx index 3533b17ad..a740ad92f 100644 --- a/packages/pl-fe/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx +++ b/packages/pl-fe/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx @@ -2,13 +2,13 @@ import { useMutation } from '@tanstack/react-query'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import { cancelScheduledStatusMutationOptions } from 'pl-fe/queries/statuses/scheduled-statuses'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import { cancelScheduledStatusMutationOptions } from '@/queries/statuses/scheduled-statuses'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; -import type { Status as StatusEntity } from 'pl-fe/normalizers/status'; +import type { Status as StatusEntity } from '@/normalizers/status'; const messages = defineMessages({ cancel: { id: 'scheduled_status.cancel', defaultMessage: 'Cancel' }, diff --git a/packages/pl-fe/src/features/scheduled-statuses/components/scheduled-status.tsx b/packages/pl-fe/src/features/scheduled-statuses/components/scheduled-status.tsx index a1c778286..092afd1df 100644 --- a/packages/pl-fe/src/features/scheduled-statuses/components/scheduled-status.tsx +++ b/packages/pl-fe/src/features/scheduled-statuses/components/scheduled-status.tsx @@ -1,14 +1,14 @@ import clsx from 'clsx'; import React from 'react'; -import Account from 'pl-fe/components/account'; -import AttachmentThumbs from 'pl-fe/components/attachment-thumbs'; -import StatusContent from 'pl-fe/components/status-content'; -import StatusReplyMentions from 'pl-fe/components/status-reply-mentions'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import PollPreview from 'pl-fe/features/ui/components/poll-preview'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import Account from '@/components/account'; +import AttachmentThumbs from '@/components/attachment-thumbs'; +import StatusContent from '@/components/status-content'; +import StatusReplyMentions from '@/components/status-reply-mentions'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import PollPreview from '@/features/ui/components/poll-preview'; +import { useAppSelector } from '@/hooks/use-app-selector'; import { buildStatus } from '../builder'; diff --git a/packages/pl-fe/src/features/security/mfa-form.tsx b/packages/pl-fe/src/features/security/mfa-form.tsx index 73eb2d904..8b226b361 100644 --- a/packages/pl-fe/src/features/security/mfa-form.tsx +++ b/packages/pl-fe/src/features/security/mfa-form.tsx @@ -1,10 +1,10 @@ import React, { useState } from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useMfaConfig } from 'pl-fe/queries/security/use-mfa'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import { useFeatures } from '@/hooks/use-features'; +import { useMfaConfig } from '@/queries/security/use-mfa'; import DisableOtpForm from './mfa/disable-otp-form'; import EnableOtpForm from './mfa/enable-otp-form'; diff --git a/packages/pl-fe/src/features/security/mfa/disable-otp-form.tsx b/packages/pl-fe/src/features/security/mfa/disable-otp-form.tsx index d683341c5..1bf2ae59e 100644 --- a/packages/pl-fe/src/features/security/mfa/disable-otp-form.tsx +++ b/packages/pl-fe/src/features/security/mfa/disable-otp-form.tsx @@ -2,16 +2,16 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useState, useCallback } from 'react'; import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useDisableMfa } from 'pl-fe/queries/security/use-mfa'; -import toast from 'pl-fe/toast'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useDisableMfa } from '@/queries/security/use-mfa'; +import toast from '@/toast'; const messages = defineMessages({ mfa_setup_disable_button: { id: 'column.mfa_disable_button', defaultMessage: 'Disable' }, diff --git a/packages/pl-fe/src/features/security/mfa/enable-otp-form.tsx b/packages/pl-fe/src/features/security/mfa/enable-otp-form.tsx index 9a1f315d4..f51fe172c 100644 --- a/packages/pl-fe/src/features/security/mfa/enable-otp-form.tsx +++ b/packages/pl-fe/src/features/security/mfa/enable-otp-form.tsx @@ -2,13 +2,13 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useState, useEffect } from 'react'; import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useClient } from 'pl-fe/hooks/use-client'; -import toast from 'pl-fe/toast'; +import Button from '@/components/ui/button'; +import FormActions from '@/components/ui/form-actions'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useClient } from '@/hooks/use-client'; +import toast from '@/toast'; const messages = defineMessages({ mfaCancelButton: { id: 'column.mfa_cancel', defaultMessage: 'Cancel' }, diff --git a/packages/pl-fe/src/features/security/mfa/otp-confirm-form.tsx b/packages/pl-fe/src/features/security/mfa/otp-confirm-form.tsx index e1b89f019..4722d38a9 100644 --- a/packages/pl-fe/src/features/security/mfa/otp-confirm-form.tsx +++ b/packages/pl-fe/src/features/security/mfa/otp-confirm-form.tsx @@ -3,17 +3,17 @@ import { QRCodeCanvas as QRCode } from 'qrcode.react'; import React, { useCallback, useEffect, useState } from 'react'; import { useIntl, FormattedMessage, defineMessages } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useConfirmMfa } from 'pl-fe/queries/security/use-mfa'; -import toast from 'pl-fe/toast'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useConfirmMfa } from '@/queries/security/use-mfa'; +import toast from '@/toast'; const messages = defineMessages({ mfaCancelButton: { id: 'column.mfa_cancel', defaultMessage: 'Cancel' }, diff --git a/packages/pl-fe/src/features/settings/components/messages-settings.tsx b/packages/pl-fe/src/features/settings/components/messages-settings.tsx index b57591b7f..28ad2aec0 100644 --- a/packages/pl-fe/src/features/settings/components/messages-settings.tsx +++ b/packages/pl-fe/src/features/settings/components/messages-settings.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { useUpdateCredentials } from 'pl-fe/queries/accounts'; +import List, { ListItem } from '@/components/list'; +import Toggle from '@/components/ui/toggle'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useUpdateCredentials } from '@/queries/accounts'; const messages = defineMessages({ label: { id: 'settings.messages.label', defaultMessage: 'Allow users to start a new chat with you' }, diff --git a/packages/pl-fe/src/features/settings/components/setting-toggle.tsx b/packages/pl-fe/src/features/settings/components/setting-toggle.tsx index 3c0183071..0a8888922 100644 --- a/packages/pl-fe/src/features/settings/components/setting-toggle.tsx +++ b/packages/pl-fe/src/features/settings/components/setting-toggle.tsx @@ -1,8 +1,8 @@ import get from 'lodash/get'; import React from 'react'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { Settings } from 'pl-fe/schemas/pl-fe/settings'; +import Toggle from '@/components/ui/toggle'; +import { Settings } from '@/schemas/pl-fe/settings'; interface ISettingToggle { /** Unique identifier for the Toggle. */ diff --git a/packages/pl-fe/src/features/status/components/detailed-status.tsx b/packages/pl-fe/src/features/status/components/detailed-status.tsx index 417b23b60..5229bbdb3 100644 --- a/packages/pl-fe/src/features/status/components/detailed-status.tsx +++ b/packages/pl-fe/src/features/status/components/detailed-status.tsx @@ -2,22 +2,22 @@ import { Link } from '@tanstack/react-router'; import React, { useRef } from 'react'; import { defineMessages, FormattedDate, FormattedMessage, useIntl } from 'react-intl'; -import Account from 'pl-fe/components/account'; -import StatusContent from 'pl-fe/components/status-content'; -import StatusLanguagePicker from 'pl-fe/components/status-language-picker'; -import StatusReactionsBar from 'pl-fe/components/status-reactions-bar'; -import StatusReplyMentions from 'pl-fe/components/status-reply-mentions'; -import StatusInfo from 'pl-fe/components/statuses/status-info'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; +import Account from '@/components/account'; +import StatusContent from '@/components/status-content'; +import StatusLanguagePicker from '@/components/status-language-picker'; +import StatusReactionsBar from '@/components/status-reactions-bar'; +import StatusReplyMentions from '@/components/status-reply-mentions'; +import StatusInfo from '@/components/statuses/status-info'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; import StatusInteractionBar from './status-interaction-bar'; import StatusTypeIcon from './status-type-icon'; -import type { SelectedStatus } from 'pl-fe/selectors'; +import type { SelectedStatus } from '@/selectors'; const messages = defineMessages({ applicationName: { id: 'status.application_name', defaultMessage: 'Sent from {name}' }, diff --git a/packages/pl-fe/src/features/status/components/status-interaction-bar.tsx b/packages/pl-fe/src/features/status/components/status-interaction-bar.tsx index eb5322976..0495f0b1b 100644 --- a/packages/pl-fe/src/features/status/components/status-interaction-bar.tsx +++ b/packages/pl-fe/src/features/status/components/status-interaction-bar.tsx @@ -3,13 +3,13 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import AnimatedNumber from 'pl-fe/components/animated-number'; -import HStack from 'pl-fe/components/ui/hstack'; -import Text from 'pl-fe/components/ui/text'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import AnimatedNumber from '@/components/animated-number'; +import HStack from '@/components/ui/hstack'; +import Text from '@/components/ui/text'; +import { useFeatures } from '@/hooks/use-features'; +import { useModalsActions } from '@/stores/modals'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; interface IStatusInteractionBar { status: Pick; diff --git a/packages/pl-fe/src/features/status/components/status-type-icon.tsx b/packages/pl-fe/src/features/status/components/status-type-icon.tsx index b71340a99..9475fe91f 100644 --- a/packages/pl-fe/src/features/status/components/status-type-icon.tsx +++ b/packages/pl-fe/src/features/status/components/status-type-icon.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, MessageDescriptor, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; +import Icon from '@/components/ui/icon'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; interface IStatusTypeIcon { visibility: Status['visibility']; diff --git a/packages/pl-fe/src/features/status/components/thread-status.tsx b/packages/pl-fe/src/features/status/components/thread-status.tsx index 2db0c49b7..3080777b7 100644 --- a/packages/pl-fe/src/features/status/components/thread-status.tsx +++ b/packages/pl-fe/src/features/status/components/thread-status.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; import React from 'react'; -import Tombstone from 'pl-fe/components/tombstone'; -import StatusContainer from 'pl-fe/containers/status-container'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import Tombstone from '@/components/tombstone'; +import StatusContainer from '@/containers/status-container'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import { useAppSelector } from '@/hooks/use-app-selector'; interface IThreadStatus { id: string; diff --git a/packages/pl-fe/src/features/status/components/thread.tsx b/packages/pl-fe/src/features/status/components/thread.tsx index 68eb74811..7c8b21ad3 100644 --- a/packages/pl-fe/src/features/status/components/thread.tsx +++ b/packages/pl-fe/src/features/status/components/thread.tsx @@ -5,30 +5,30 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react'; import { Helmet } from 'react-helmet-async'; import { useIntl } from 'react-intl'; -import { type ComposeReplyAction, mentionCompose, replyCompose } from 'pl-fe/actions/compose'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import StatusActionBar from 'pl-fe/components/status-action-bar'; -import Tombstone from 'pl-fe/components/tombstone'; -import Stack from 'pl-fe/components/ui/stack'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import { Hotkeys } from 'pl-fe/features/ui/components/hotkeys'; -import PendingStatus from 'pl-fe/features/ui/components/pending-status'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFavouriteStatus, useReblogStatus, useUnfavouriteStatus, useUnreblogStatus } from 'pl-fe/queries/statuses/use-status-interactions'; -import { RootState } from 'pl-fe/store'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useStatusMetaActions } from 'pl-fe/stores/status-meta'; -import { selectChild } from 'pl-fe/utils/scroll-utils'; -import { textForScreenReader } from 'pl-fe/utils/status'; +import { type ComposeReplyAction, mentionCompose, replyCompose } from '@/actions/compose'; +import ScrollableList from '@/components/scrollable-list'; +import StatusActionBar from '@/components/status-action-bar'; +import Tombstone from '@/components/tombstone'; +import Stack from '@/components/ui/stack'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import { Hotkeys } from '@/features/ui/components/hotkeys'; +import PendingStatus from '@/features/ui/components/pending-status'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFavouriteStatus, useReblogStatus, useUnfavouriteStatus, useUnreblogStatus } from '@/queries/statuses/use-status-interactions'; +import { RootState } from '@/store'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; +import { useStatusMetaActions } from '@/stores/status-meta'; +import { selectChild } from '@/utils/scroll-utils'; +import { textForScreenReader } from '@/utils/status'; import DetailedStatus from './detailed-status'; import ThreadStatus from './thread-status'; +import type { Status } from '@/normalizers/status'; +import type { SelectedStatus } from '@/selectors'; import type { Account } from 'pl-api'; -import type { Status } from 'pl-fe/normalizers/status'; -import type { SelectedStatus } from 'pl-fe/selectors'; import type { VirtuosoHandle } from 'react-virtuoso'; const makeGetAncestorsIds = () => createSelector([ diff --git a/packages/pl-fe/src/features/status/containers/quoted-status-container.tsx b/packages/pl-fe/src/features/status/containers/quoted-status-container.tsx index 48e0fb491..192988bf8 100644 --- a/packages/pl-fe/src/features/status/containers/quoted-status-container.tsx +++ b/packages/pl-fe/src/features/status/containers/quoted-status-container.tsx @@ -1,8 +1,8 @@ import React, { useCallback } from 'react'; -import QuotedStatus from 'pl-fe/components/quoted-status'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; +import QuotedStatus from '@/components/quoted-status'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; interface IQuotedStatusContainer { /** Status ID to the quoted status. */ diff --git a/packages/pl-fe/src/features/theme-editor/components/color.tsx b/packages/pl-fe/src/features/theme-editor/components/color.tsx index b92b0d48e..1e81d8922 100644 --- a/packages/pl-fe/src/features/theme-editor/components/color.tsx +++ b/packages/pl-fe/src/features/theme-editor/components/color.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import ColorPicker from 'pl-fe/features/pl-fe-config/components/color-picker'; +import ColorPicker from '@/features/pl-fe-config/components/color-picker'; import type { ColorChangeHandler } from 'react-color'; diff --git a/packages/pl-fe/src/features/theme-editor/components/palette.tsx b/packages/pl-fe/src/features/theme-editor/components/palette.tsx index e80cffe73..a3e8a198e 100644 --- a/packages/pl-fe/src/features/theme-editor/components/palette.tsx +++ b/packages/pl-fe/src/features/theme-editor/components/palette.tsx @@ -1,11 +1,11 @@ import React, { useEffect, useState } from 'react'; -import HStack from 'pl-fe/components/ui/hstack'; -import Slider from 'pl-fe/components/ui/slider'; -import Stack from 'pl-fe/components/ui/stack'; -import { usePrevious } from 'pl-fe/hooks/use-previous'; -import { compareId } from 'pl-fe/utils/comparators'; -import { hueShift } from 'pl-fe/utils/theme'; +import HStack from '@/components/ui/hstack'; +import Slider from '@/components/ui/slider'; +import Stack from '@/components/ui/stack'; +import { usePrevious } from '@/hooks/use-previous'; +import { compareId } from '@/utils/comparators'; +import { hueShift } from '@/utils/theme'; import Color from './color'; diff --git a/packages/pl-fe/src/features/ui/components/action-button.tsx b/packages/pl-fe/src/features/ui/components/action-button.tsx index 18a6e7810..2597e6769 100644 --- a/packages/pl-fe/src/features/ui/components/action-button.tsx +++ b/packages/pl-fe/src/features/ui/components/action-button.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import HStack from 'pl-fe/components/ui/hstack'; -import Spinner from 'pl-fe/components/ui/spinner'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { useAcceptFollowRequestMutation, useRejectFollowRequestMutation } from 'pl-fe/queries/accounts/use-follow-requests'; +import Button from '@/components/ui/button'; +import HStack from '@/components/ui/hstack'; +import Spinner from '@/components/ui/spinner'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { useAcceptFollowRequestMutation, useRejectFollowRequestMutation } from '@/queries/accounts/use-follow-requests'; import { useRelationshipQuery, useUnblockAccountMutation, @@ -15,9 +15,9 @@ import { useUnmuteAccountMutation, useFollowAccountMutation, useUnfollowAccountMutation, -} from 'pl-fe/queries/accounts/use-relationship'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +} from '@/queries/accounts/use-relationship'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/column-forbidden.tsx b/packages/pl-fe/src/features/ui/components/column-forbidden.tsx index 06ebadbfc..e21d614a0 100644 --- a/packages/pl-fe/src/features/ui/components/column-forbidden.tsx +++ b/packages/pl-fe/src/features/ui/components/column-forbidden.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Column from 'pl-fe/components/ui/column'; +import Column from '@/components/ui/column'; const messages = defineMessages({ title: { id: 'column_forbidden.title', defaultMessage: 'Forbidden' }, diff --git a/packages/pl-fe/src/features/ui/components/column-loading.tsx b/packages/pl-fe/src/features/ui/components/column-loading.tsx index 7c260700c..6f826a112 100644 --- a/packages/pl-fe/src/features/ui/components/column-loading.tsx +++ b/packages/pl-fe/src/features/ui/components/column-loading.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import Card, { CardBody } from 'pl-fe/components/ui/card'; -import Spinner from 'pl-fe/components/ui/spinner'; +import Card, { CardBody } from '@/components/ui/card'; +import Spinner from '@/components/ui/spinner'; const ColumnLoading = () => ( diff --git a/packages/pl-fe/src/features/ui/components/compose-button.test.tsx b/packages/pl-fe/src/features/ui/components/compose-button.test.tsx index 13cc3de54..c601f1ef3 100644 --- a/packages/pl-fe/src/features/ui/components/compose-button.test.tsx +++ b/packages/pl-fe/src/features/ui/components/compose-button.test.tsx @@ -4,7 +4,7 @@ import { IntlProvider } from 'react-intl'; import { Provider } from 'react-redux'; import { MemoryRouter } from 'react-router-dom'; -import { mockStore, rootState } from 'pl-fe/jest/test-helpers'; +import { mockStore, rootState } from '@/jest/test-helpers'; import ComposeButton from './compose-button'; diff --git a/packages/pl-fe/src/features/ui/components/compose-button.tsx b/packages/pl-fe/src/features/ui/components/compose-button.tsx index d0119ff2e..1368e9237 100644 --- a/packages/pl-fe/src/features/ui/components/compose-button.tsx +++ b/packages/pl-fe/src/features/ui/components/compose-button.tsx @@ -2,13 +2,13 @@ import { useMatch } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { groupComposeModal } from 'pl-fe/actions/compose'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { groupComposeModal } from '@/actions/compose'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useModalsActions } from '@/stores/modals'; import { layouts } from '../router'; diff --git a/packages/pl-fe/src/features/ui/components/link-footer.tsx b/packages/pl-fe/src/features/ui/components/link-footer.tsx index b1e26eca7..4d3269d30 100644 --- a/packages/pl-fe/src/features/ui/components/link-footer.tsx +++ b/packages/pl-fe/src/features/ui/components/link-footer.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import sourceCode from 'pl-fe/utils/code'; +import Emojify from '@/features/emoji/emojify'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import sourceCode from '@/utils/code'; const messages = defineMessages({ meow: { id: 'footer.meow', defaultMessage: 'meow :3 {emoji}' }, diff --git a/packages/pl-fe/src/features/ui/components/modal-loading.tsx b/packages/pl-fe/src/features/ui/components/modal-loading.tsx index 93a2dd2fd..1e78bddf4 100644 --- a/packages/pl-fe/src/features/ui/components/modal-loading.tsx +++ b/packages/pl-fe/src/features/ui/components/modal-loading.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; const ModalLoading = () => ( diff --git a/packages/pl-fe/src/features/ui/components/modal-root.tsx b/packages/pl-fe/src/features/ui/components/modal-root.tsx index 96189e95d..e702b04db 100644 --- a/packages/pl-fe/src/features/ui/components/modal-root.tsx +++ b/packages/pl-fe/src/features/ui/components/modal-root.tsx @@ -1,54 +1,54 @@ import React, { Suspense, lazy } from 'react'; -import { cancelReplyCompose } from 'pl-fe/actions/compose'; -import Base from 'pl-fe/components/modal-root'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useModals, useModalsActions } from 'pl-fe/stores/modals'; +import { cancelReplyCompose } from '@/actions/compose'; +import Base from '@/components/modal-root'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useModals, useModalsActions } from '@/stores/modals'; import ModalLoading from './modal-loading'; /* eslint sort-keys: "error" */ const MODAL_COMPONENTS = { - ALT_TEXT: lazy(() => import('pl-fe/modals/alt-text-modal')), - ANTENNA_EDITOR: lazy(() => import('pl-fe/modals/antenna-editor-modal')), - BIRTHDAYS: lazy(() => import('pl-fe/modals/birthdays-modal')), - BLOCK_MUTE: lazy(() => import('pl-fe/modals/block-mute-modal')), - BOOST: lazy(() => import('pl-fe/modals/boost-modal')), - CIRCLE_EDITOR: lazy(() => import('pl-fe/modals/circle-editor-modal')), - COMPARE_HISTORY: lazy(() => import('pl-fe/modals/compare-history-modal')), - COMPONENT: lazy(() => import('pl-fe/modals/component-modal')), - COMPOSE: lazy(() => import('pl-fe/modals/compose-modal')), - COMPOSE_INTERACTION_POLICY: lazy(() => import('pl-fe/modals/compose-interaction-policy-modal')), - CONFIRM: lazy(() => import('pl-fe/modals/confirmation-modal')), - CREATE_GROUP: lazy(() => import('pl-fe/modals/manage-group-modal')), - CRYPTO_DONATE: lazy(() => import('pl-fe/modals/crypto-donate-modal')), - DISLIKES: lazy(() => import('pl-fe/modals/dislikes-modal')), - DROPDOWN_MENU: lazy(() => import('pl-fe/modals/dropdown-menu-modal')), - EDIT_ANNOUNCEMENT: lazy(() => import('pl-fe/modals/edit-announcement-modal')), - EDIT_BOOKMARK_FOLDER: lazy(() => import('pl-fe/modals/edit-bookmark-folder-modal')), - EDIT_DOMAIN: lazy(() => import('pl-fe/modals/edit-domain-modal')), - EDIT_FEDERATION: lazy(() => import('pl-fe/modals/edit-federation-modal')), - EDIT_RULE: lazy(() => import('pl-fe/modals/edit-rule-modal')), - EMBED: lazy(() => import('pl-fe/modals/embed-modal')), - EVENT_MAP: lazy(() => import('pl-fe/modals/event-map-modal')), - EVENT_PARTICIPANTS: lazy(() => import('pl-fe/modals/event-participants-modal')), - FAMILIAR_FOLLOWERS: lazy(() => import('pl-fe/modals/familiar-followers-modal')), - FAVOURITES: lazy(() => import('pl-fe/modals/favourites-modal')), - HOTKEYS: lazy(() => import('pl-fe/modals/hotkeys-modal')), - JOIN_EVENT: lazy(() => import('pl-fe/modals/join-event-modal')), - LIST_ADDER: lazy(() => import('pl-fe/modals/list-adder-modal')), - LIST_EDITOR: lazy(() => import('pl-fe/modals/list-editor-modal')), - MEDIA: lazy(() => import('pl-fe/modals/media-modal')), - MENTIONS: lazy(() => import('pl-fe/modals/mentions-modal')), - MISSING_DESCRIPTION: lazy(() => import('pl-fe/modals/missing-description-modal')), - REACTIONS: lazy(() => import('pl-fe/modals/reactions-modal')), - REBLOGS: lazy(() => import('pl-fe/modals/reblogs-modal')), - REPLY_MENTIONS: lazy(() => import('pl-fe/modals/reply-mentions-modal')), - REPORT: lazy(() => import('pl-fe/modals/report-modal')), - SELECT_BOOKMARK_FOLDER: lazy(() => import('pl-fe/modals/select-bookmark-folder-modal')), - SELECT_DRIVE_FILE: lazy(() => import('pl-fe/modals/select-drive-file-modal')), - TEXT_FIELD: lazy(() => import('pl-fe/modals/text-field-modal')), - UNAUTHORIZED: lazy(() => import('pl-fe/modals/unauthorized-modal')), + ALT_TEXT: lazy(() => import('@/modals/alt-text-modal')), + ANTENNA_EDITOR: lazy(() => import('@/modals/antenna-editor-modal')), + BIRTHDAYS: lazy(() => import('@/modals/birthdays-modal')), + BLOCK_MUTE: lazy(() => import('@/modals/block-mute-modal')), + BOOST: lazy(() => import('@/modals/boost-modal')), + CIRCLE_EDITOR: lazy(() => import('@/modals/circle-editor-modal')), + COMPARE_HISTORY: lazy(() => import('@/modals/compare-history-modal')), + COMPONENT: lazy(() => import('@/modals/component-modal')), + COMPOSE: lazy(() => import('@/modals/compose-modal')), + COMPOSE_INTERACTION_POLICY: lazy(() => import('@/modals/compose-interaction-policy-modal')), + CONFIRM: lazy(() => import('@/modals/confirmation-modal')), + CREATE_GROUP: lazy(() => import('@/modals/manage-group-modal')), + CRYPTO_DONATE: lazy(() => import('@/modals/crypto-donate-modal')), + DISLIKES: lazy(() => import('@/modals/dislikes-modal')), + DROPDOWN_MENU: lazy(() => import('@/modals/dropdown-menu-modal')), + EDIT_ANNOUNCEMENT: lazy(() => import('@/modals/edit-announcement-modal')), + EDIT_BOOKMARK_FOLDER: lazy(() => import('@/modals/edit-bookmark-folder-modal')), + EDIT_DOMAIN: lazy(() => import('@/modals/edit-domain-modal')), + EDIT_FEDERATION: lazy(() => import('@/modals/edit-federation-modal')), + EDIT_RULE: lazy(() => import('@/modals/edit-rule-modal')), + EMBED: lazy(() => import('@/modals/embed-modal')), + EVENT_MAP: lazy(() => import('@/modals/event-map-modal')), + EVENT_PARTICIPANTS: lazy(() => import('@/modals/event-participants-modal')), + FAMILIAR_FOLLOWERS: lazy(() => import('@/modals/familiar-followers-modal')), + FAVOURITES: lazy(() => import('@/modals/favourites-modal')), + HOTKEYS: lazy(() => import('@/modals/hotkeys-modal')), + JOIN_EVENT: lazy(() => import('@/modals/join-event-modal')), + LIST_ADDER: lazy(() => import('@/modals/list-adder-modal')), + LIST_EDITOR: lazy(() => import('@/modals/list-editor-modal')), + MEDIA: lazy(() => import('@/modals/media-modal')), + MENTIONS: lazy(() => import('@/modals/mentions-modal')), + MISSING_DESCRIPTION: lazy(() => import('@/modals/missing-description-modal')), + REACTIONS: lazy(() => import('@/modals/reactions-modal')), + REBLOGS: lazy(() => import('@/modals/reblogs-modal')), + REPLY_MENTIONS: lazy(() => import('@/modals/reply-mentions-modal')), + REPORT: lazy(() => import('@/modals/report-modal')), + SELECT_BOOKMARK_FOLDER: lazy(() => import('@/modals/select-bookmark-folder-modal')), + SELECT_DRIVE_FILE: lazy(() => import('@/modals/select-drive-file-modal')), + TEXT_FIELD: lazy(() => import('@/modals/text-field-modal')), + UNAUTHORIZED: lazy(() => import('@/modals/unauthorized-modal')), }; type ModalType = keyof typeof MODAL_COMPONENTS | null; diff --git a/packages/pl-fe/src/features/ui/components/panels/account-note-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/account-note-panel.tsx index de982ea18..3a801bd9b 100644 --- a/packages/pl-fe/src/features/ui/components/panels/account-note-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/account-note-panel.tsx @@ -2,12 +2,12 @@ import { debounce } from '@tanstack/react-pacer/debouncer'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Text from 'pl-fe/components/ui/text'; -import Textarea from 'pl-fe/components/ui/textarea'; -import Widget from 'pl-fe/components/ui/widget'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useUpdateAccountNoteMutation } from 'pl-fe/queries/accounts/use-relationship'; +import HStack from '@/components/ui/hstack'; +import Text from '@/components/ui/text'; +import Textarea from '@/components/ui/textarea'; +import Widget from '@/components/ui/widget'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useUpdateAccountNoteMutation } from '@/queries/accounts/use-relationship'; import type { Account as AccountEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/panels/birthday-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/birthday-panel.tsx index f7199d6c5..892ea169e 100644 --- a/packages/pl-fe/src/features/ui/components/panels/birthday-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/birthday-panel.tsx @@ -1,9 +1,9 @@ import React, { useRef, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import Widget from 'pl-fe/components/ui/widget'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useBirthdayReminders } from 'pl-fe/queries/accounts/use-birthday-reminders'; +import Widget from '@/components/ui/widget'; +import AccountContainer from '@/containers/account-container'; +import { useBirthdayReminders } from '@/queries/accounts/use-birthday-reminders'; const timeToMidnight = () => { const now = new Date(); diff --git a/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx index 7c32d67ab..b49a7b984 100644 --- a/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Widget from 'pl-fe/components/ui/widget'; -import { type AccountGalleryAttachment, useGroupGallery } from 'pl-fe/hooks/use-account-gallery'; -import { MediaItem } from 'pl-fe/pages/accounts/account-gallery'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import Spinner from '@/components/ui/spinner'; +import Widget from '@/components/ui/widget'; +import { type AccountGalleryAttachment, useGroupGallery } from '@/hooks/use-account-gallery'; +import { MediaItem } from '@/pages/accounts/account-gallery'; +import { useModalsActions } from '@/stores/modals'; import type { Group } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx index fbda2eea8..1fb3a9830 100644 --- a/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import { pinHost, unpinHost } from 'pl-fe/actions/remote-timeline'; -import Widget from 'pl-fe/components/ui/widget'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetRemoteInstance } from 'pl-fe/selectors'; -import { useSettings } from 'pl-fe/stores/settings'; +import { pinHost, unpinHost } from '@/actions/remote-timeline'; +import Widget from '@/components/ui/widget'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetRemoteInstance } from '@/selectors'; +import { useSettings } from '@/stores/settings'; const getRemoteInstance = makeGetRemoteInstance(); diff --git a/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx index 76177b811..f90bcf63a 100644 --- a/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import Widget from 'pl-fe/components/ui/widget'; -import InstanceRestrictions from 'pl-fe/features/federation-restrictions/components/instance-restrictions'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { makeGetRemoteInstance } from 'pl-fe/selectors'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import DropdownMenu from '@/components/dropdown-menu'; +import Widget from '@/components/ui/widget'; +import InstanceRestrictions from '@/features/federation-restrictions/components/instance-restrictions'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { makeGetRemoteInstance } from '@/selectors'; +import { useModalsActions } from '@/stores/modals'; const getRemoteInstance = makeGetRemoteInstance(); diff --git a/packages/pl-fe/src/features/ui/components/panels/my-groups-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/my-groups-panel.tsx index 5c9ba487b..dddaf27ca 100644 --- a/packages/pl-fe/src/features/ui/components/panels/my-groups-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/my-groups-panel.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { useGroups } from 'pl-fe/api/hooks/groups/use-groups'; -import Widget from 'pl-fe/components/ui/widget'; -import GroupListItem from 'pl-fe/features/groups/components/discover/group-list-item'; -import PlaceholderGroupSearch from 'pl-fe/features/placeholder/components/placeholder-group-search'; +import { useGroups } from '@/api/hooks/groups/use-groups'; +import Widget from '@/components/ui/widget'; +import GroupListItem from '@/features/groups/components/discover/group-list-item'; +import PlaceholderGroupSearch from '@/features/placeholder/components/placeholder-group-search'; const MyGroupsPanel = () => { const { groups, isFetching, isFetched, isError } = useGroups(); diff --git a/packages/pl-fe/src/features/ui/components/panels/new-event-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/new-event-panel.tsx index 53474df31..4453ad4a9 100644 --- a/packages/pl-fe/src/features/ui/components/panels/new-event-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/new-event-panel.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; +import Button from '@/components/ui/button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; const NewEventPanel = () => ( diff --git a/packages/pl-fe/src/features/ui/components/panels/new-group-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/new-group-panel.tsx index 6c6671a40..2fb2b783f 100644 --- a/packages/pl-fe/src/features/ui/components/panels/new-group-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/new-group-panel.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import Button from '@/components/ui/button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useModalsActions } from '@/stores/modals'; const NewGroupPanel = () => { const { openModal } = useModalsActions(); diff --git a/packages/pl-fe/src/features/ui/components/panels/pinned-accounts-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/pinned-accounts-panel.tsx index fcac227e5..4ea1655e0 100644 --- a/packages/pl-fe/src/features/ui/components/panels/pinned-accounts-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/pinned-accounts-panel.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Widget from 'pl-fe/components/ui/widget'; -import AccountContainer from 'pl-fe/containers/account-container'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { WhoToFollowPanel } from 'pl-fe/features/ui/util/async-components'; -import { useEndorsedAccounts } from 'pl-fe/queries/accounts/use-endorsed-accounts'; +import Widget from '@/components/ui/widget'; +import AccountContainer from '@/containers/account-container'; +import Emojify from '@/features/emoji/emojify'; +import { WhoToFollowPanel } from '@/features/ui/util/async-components'; +import { useEndorsedAccounts } from '@/queries/accounts/use-endorsed-accounts'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/panels/profile-fields-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-fields-panel.tsx index 4f465938f..aa6857423 100644 --- a/packages/pl-fe/src/features/ui/components/panels/profile-fields-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/profile-fields-panel.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import Widget from 'pl-fe/components/ui/widget'; +import Widget from '@/components/ui/widget'; import { ProfileField } from '../../util/async-components'; diff --git a/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx index e11e97e23..7c0e2b6b4 100644 --- a/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx @@ -2,20 +2,20 @@ import { useQuery } from '@tanstack/react-query'; import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import Badge from 'pl-fe/components/badge'; -import Markup from 'pl-fe/components/markup'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import { dateFormatOptions } from 'pl-fe/components/relative-timestamp'; -import Scrobble from 'pl-fe/components/scrobble'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useAcct } from 'pl-fe/hooks/use-acct'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { accountScrobbleQueryOptions } from 'pl-fe/queries/accounts/account-scrobble'; -import { capitalize } from 'pl-fe/utils/strings'; +import Badge from '@/components/badge'; +import Markup from '@/components/markup'; +import { ParsedContent } from '@/components/parsed-content'; +import { dateFormatOptions } from '@/components/relative-timestamp'; +import Scrobble from '@/components/scrobble'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import { useAcct } from '@/hooks/use-acct'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { accountScrobbleQueryOptions } from '@/queries/accounts/account-scrobble'; +import { capitalize } from '@/utils/strings'; import { ProfileField } from '../../util/async-components'; import ProfileFamiliarFollowers from '../profile-familiar-followers'; diff --git a/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx index b0214a427..2f893427e 100644 --- a/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx @@ -1,11 +1,11 @@ import React, { useMemo } from 'react'; import { FormattedMessage } from 'react-intl'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Widget from 'pl-fe/components/ui/widget'; -import { type AccountGalleryAttachment, useAccountGallery } from 'pl-fe/hooks/use-account-gallery'; -import { MediaItem } from 'pl-fe/pages/accounts/account-gallery'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import Spinner from '@/components/ui/spinner'; +import Widget from '@/components/ui/widget'; +import { type AccountGalleryAttachment, useAccountGallery } from '@/hooks/use-account-gallery'; +import { MediaItem } from '@/pages/accounts/account-gallery'; +import { useModalsActions } from '@/stores/modals'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx index 808a5bc32..fda3ec368 100644 --- a/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import ForkAwesomeIcon from 'pl-fe/components/fork-awesome-icon'; -import List, { ListItem } from 'pl-fe/components/list'; -import HStack from 'pl-fe/components/ui/hstack'; -import Widget from 'pl-fe/components/ui/widget'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { useSettings } from 'pl-fe/stores/settings'; +import ForkAwesomeIcon from '@/components/fork-awesome-icon'; +import List, { ListItem } from '@/components/list'; +import HStack from '@/components/ui/hstack'; +import Widget from '@/components/ui/widget'; +import { useInstance } from '@/hooks/use-instance'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { useSettings } from '@/stores/settings'; const PromoPanel: React.FC = () => { const instance = useInstance(); diff --git a/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.test.tsx b/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.test.tsx index f96ba6f44..275eaab45 100644 --- a/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.test.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { storeOpen } from 'pl-fe/jest/mock-stores'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { storeOpen } from '@/jest/mock-stores'; +import { render, screen } from '@/jest/test-helpers'; import SignUpPanel from './sign-up-panel'; diff --git a/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.tsx index b9a0949d3..77971a990 100644 --- a/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.tsx @@ -2,22 +2,22 @@ import { Navigate } from '@tanstack/react-router'; import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { logIn, switchAccount, verifyCredentials } from 'pl-fe/actions/auth'; -import { fetchInstance } from 'pl-fe/actions/instance'; -import Button from 'pl-fe/components/ui/button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import LoginForm from 'pl-fe/features/auth-login/components/login-form'; -import OtpAuthForm from 'pl-fe/features/auth-login/components/otp-auth-form'; -import ExternalLoginForm from 'pl-fe/features/external-login/components/external-login-form'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useRegistrationStatus } from 'pl-fe/hooks/use-registration-status'; -import { getRedirectUrl } from 'pl-fe/utils/redirect'; -import { isStandalone } from 'pl-fe/utils/state'; +import { logIn, switchAccount, verifyCredentials } from '@/actions/auth'; +import { fetchInstance } from '@/actions/instance'; +import Button from '@/components/ui/button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import LoginForm from '@/features/auth-login/components/login-form'; +import OtpAuthForm from '@/features/auth-login/components/otp-auth-form'; +import ExternalLoginForm from '@/features/external-login/components/external-login-form'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useInstance } from '@/hooks/use-instance'; +import { useRegistrationStatus } from '@/hooks/use-registration-status'; +import { getRedirectUrl } from '@/utils/redirect'; +import { isStandalone } from '@/utils/state'; -import type { PlfeResponse } from 'pl-fe/api'; +import type { PlfeResponse } from '@/api'; const SignUpPanel = () => { const dispatch = useAppDispatch(); diff --git a/packages/pl-fe/src/features/ui/components/panels/trends-panel.test.tsx b/packages/pl-fe/src/features/ui/components/panels/trends-panel.test.tsx index 9eef29c4b..5ca17311d 100644 --- a/packages/pl-fe/src/features/ui/components/panels/trends-panel.test.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/trends-panel.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { __stub } from 'pl-fe/api'; -import { queryClient, render, screen, waitFor } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { queryClient, render, screen, waitFor } from '@/jest/test-helpers'; import TrendsPanel from './trends-panel'; diff --git a/packages/pl-fe/src/features/ui/components/panels/trends-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/trends-panel.tsx index c29e316c0..cc788f9a5 100644 --- a/packages/pl-fe/src/features/ui/components/panels/trends-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/trends-panel.tsx @@ -2,11 +2,11 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Hashtag from 'pl-fe/components/hashtag'; -import Text from 'pl-fe/components/ui/text'; -import Widget from 'pl-fe/components/ui/widget'; -import PlaceholderSidebarTrends from 'pl-fe/features/placeholder/components/placeholder-sidebar-trends'; -import useTrends from 'pl-fe/queries/trends'; +import Hashtag from '@/components/hashtag'; +import Text from '@/components/ui/text'; +import Widget from '@/components/ui/widget'; +import PlaceholderSidebarTrends from '@/features/placeholder/components/placeholder-sidebar-trends'; +import useTrends from '@/queries/trends'; interface ITrendsPanel { limit: number; diff --git a/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx index aaced57a1..8c4fe5786 100644 --- a/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx @@ -2,18 +2,18 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import StillImage from 'pl-fe/components/still-image'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useAcct } from 'pl-fe/hooks/use-acct'; -import { useSettings } from 'pl-fe/stores/settings'; -import { shortNumberFormat } from 'pl-fe/utils/numbers'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import StillImage from '@/components/still-image'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import Emojify from '@/features/emoji/emojify'; +import { useAcct } from '@/hooks/use-acct'; +import { useSettings } from '@/stores/settings'; +import { shortNumberFormat } from '@/utils/numbers'; const messages = defineMessages({ account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' }, diff --git a/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx index 1cac9b956..e3ad9f6ce 100644 --- a/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx @@ -2,12 +2,12 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Text from 'pl-fe/components/ui/text'; -import Widget from 'pl-fe/components/ui/widget'; -import AccountContainer from 'pl-fe/containers/account-container'; -import PlaceholderSidebarSuggestions from 'pl-fe/features/placeholder/components/placeholder-sidebar-suggestions'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useDismissSuggestion, useSuggestions } from 'pl-fe/queries/suggestions'; +import Text from '@/components/ui/text'; +import Widget from '@/components/ui/widget'; +import AccountContainer from '@/containers/account-container'; +import PlaceholderSidebarSuggestions from '@/features/placeholder/components/placeholder-sidebar-suggestions'; +import { useFeatures } from '@/hooks/use-features'; +import { useDismissSuggestion, useSuggestions } from '@/queries/suggestions'; import type { Account as AccountEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/pending-status.tsx b/packages/pl-fe/src/features/ui/components/pending-status.tsx index ee0a05e79..17be6eaf5 100644 --- a/packages/pl-fe/src/features/ui/components/pending-status.tsx +++ b/packages/pl-fe/src/features/ui/components/pending-status.tsx @@ -1,22 +1,22 @@ import clsx from 'clsx'; import React from 'react'; -import Account from 'pl-fe/components/account'; -import StatusContent from 'pl-fe/components/status-content'; -import StatusReplyMentions from 'pl-fe/components/status-reply-mentions'; -import Card from 'pl-fe/components/ui/card'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import PlaceholderCard from 'pl-fe/features/placeholder/components/placeholder-card'; -import PlaceholderMediaGallery from 'pl-fe/features/placeholder/components/placeholder-media-gallery'; -import QuotedStatus from 'pl-fe/features/status/containers/quoted-status-container'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import Account from '@/components/account'; +import StatusContent from '@/components/status-content'; +import StatusReplyMentions from '@/components/status-reply-mentions'; +import Card from '@/components/ui/card'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import PlaceholderCard from '@/features/placeholder/components/placeholder-card'; +import PlaceholderMediaGallery from '@/features/placeholder/components/placeholder-media-gallery'; +import QuotedStatus from '@/features/status/containers/quoted-status-container'; +import { useAppSelector } from '@/hooks/use-app-selector'; import { buildStatus } from '../util/pending-status-builder'; import PollPreview from './poll-preview'; -import type { Status as StatusEntity } from 'pl-fe/normalizers/status'; +import type { Status as StatusEntity } from '@/normalizers/status'; const shouldHaveCard = (pendingStatus: StatusEntity) => Boolean(pendingStatus.content.match(/https?:\/\/\S*/)); diff --git a/packages/pl-fe/src/features/ui/components/poll-preview.tsx b/packages/pl-fe/src/features/ui/components/poll-preview.tsx index 0cf89614d..c3df963c5 100644 --- a/packages/pl-fe/src/features/ui/components/poll-preview.tsx +++ b/packages/pl-fe/src/features/ui/components/poll-preview.tsx @@ -1,8 +1,8 @@ import noop from 'lodash/noop'; import React from 'react'; -import PollOption from 'pl-fe/components/polls/poll-option'; -import Stack from 'pl-fe/components/ui/stack'; +import PollOption from '@/components/polls/poll-option'; +import Stack from '@/components/ui/stack'; import type { Poll } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/profile-dropdown.tsx b/packages/pl-fe/src/features/ui/components/profile-dropdown.tsx index 50ca68ba5..b69ea0ded 100644 --- a/packages/pl-fe/src/features/ui/components/profile-dropdown.tsx +++ b/packages/pl-fe/src/features/ui/components/profile-dropdown.tsx @@ -4,14 +4,14 @@ import React, { useMemo } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { createSelector } from 'reselect'; -import { logOut, switchAccount } from 'pl-fe/actions/auth'; -import Account from 'pl-fe/components/account'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { RootState } from 'pl-fe/store'; +import { logOut, switchAccount } from '@/actions/auth'; +import Account from '@/components/account'; +import DropdownMenu from '@/components/dropdown-menu'; +import { Entities } from '@/entity-store/entities'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { RootState } from '@/store'; import ThemeToggle from './theme-toggle'; diff --git a/packages/pl-fe/src/features/ui/components/profile-familiar-followers.tsx b/packages/pl-fe/src/features/ui/components/profile-familiar-followers.tsx index de2426706..4147d6f21 100644 --- a/packages/pl-fe/src/features/ui/components/profile-familiar-followers.tsx +++ b/packages/pl-fe/src/features/ui/components/profile-familiar-followers.tsx @@ -2,15 +2,15 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedList, FormattedMessage } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import AvatarStack from 'pl-fe/components/avatar-stack'; -import HoverAccountWrapper from 'pl-fe/components/hover-account-wrapper'; -import HStack from 'pl-fe/components/ui/hstack'; -import Text from 'pl-fe/components/ui/text'; -import VerificationBadge from 'pl-fe/components/verification-badge'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useFamiliarFollowers } from 'pl-fe/queries/accounts/use-familiar-followers'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import AvatarStack from '@/components/avatar-stack'; +import HoverAccountWrapper from '@/components/hover-account-wrapper'; +import HStack from '@/components/ui/hstack'; +import Text from '@/components/ui/text'; +import VerificationBadge from '@/components/verification-badge'; +import Emojify from '@/features/emoji/emojify'; +import { useFamiliarFollowers } from '@/queries/accounts/use-familiar-followers'; +import { useModalsActions } from '@/stores/modals'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/profile-field.tsx b/packages/pl-fe/src/features/ui/components/profile-field.tsx index 30a099a94..289ce8b1d 100644 --- a/packages/pl-fe/src/features/ui/components/profile-field.tsx +++ b/packages/pl-fe/src/features/ui/components/profile-field.tsx @@ -2,14 +2,14 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl, type FormatDateOptions } from 'react-intl'; -import AccountLocalTime from 'pl-fe/components/account-local-time'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import Icon from 'pl-fe/components/ui/icon'; -import CryptoAddress from 'pl-fe/features/crypto-donate/components/crypto-address'; -import LightningAddress from 'pl-fe/features/crypto-donate/components/lightning-address'; -import coinDB from 'pl-fe/features/crypto-donate/utils/manifest-map'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { unescapeHTML } from 'pl-fe/utils/html'; +import AccountLocalTime from '@/components/account-local-time'; +import { ParsedContent } from '@/components/parsed-content'; +import Icon from '@/components/ui/icon'; +import CryptoAddress from '@/features/crypto-donate/components/crypto-address'; +import LightningAddress from '@/features/crypto-donate/components/lightning-address'; +import coinDB from '@/features/crypto-donate/utils/manifest-map'; +import Emojify from '@/features/emoji/emojify'; +import { unescapeHTML } from '@/utils/html'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/profile-stats.tsx b/packages/pl-fe/src/features/ui/components/profile-stats.tsx index 05d8b24a2..3baf7fa6b 100644 --- a/packages/pl-fe/src/features/ui/components/profile-stats.tsx +++ b/packages/pl-fe/src/features/ui/components/profile-stats.tsx @@ -2,10 +2,10 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage, useIntl } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import Text from 'pl-fe/components/ui/text'; -import { useSettings } from 'pl-fe/stores/settings'; -import { shortNumberFormat } from 'pl-fe/utils/numbers'; +import HStack from '@/components/ui/hstack'; +import Text from '@/components/ui/text'; +import { useSettings } from '@/stores/settings'; +import { shortNumberFormat } from '@/utils/numbers'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/subscribe-button.test.tsx b/packages/pl-fe/src/features/ui/components/subscribe-button.test.tsx index 215e441ef..624f0b636 100644 --- a/packages/pl-fe/src/features/ui/components/subscribe-button.test.tsx +++ b/packages/pl-fe/src/features/ui/components/subscribe-button.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { buildAccount, buildRelationship } from 'pl-fe/jest/factory'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { buildAccount, buildRelationship } from '@/jest/factory'; +import { render, screen } from '@/jest/test-helpers'; import SubscribeButton from './subscription-button'; diff --git a/packages/pl-fe/src/features/ui/components/subscription-button.tsx b/packages/pl-fe/src/features/ui/components/subscription-button.tsx index a97d7e82a..56fd0139b 100644 --- a/packages/pl-fe/src/features/ui/components/subscription-button.tsx +++ b/packages/pl-fe/src/features/ui/components/subscription-button.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useFollowAccountMutation } from 'pl-fe/queries/accounts/use-relationship'; -import toast from 'pl-fe/toast'; +import IconButton from '@/components/ui/icon-button'; +import { useFeatures } from '@/hooks/use-features'; +import { useFollowAccountMutation } from '@/queries/accounts/use-relationship'; +import toast from '@/toast'; import type { Account as AccountEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/features/ui/components/theme-selector.tsx b/packages/pl-fe/src/features/ui/components/theme-selector.tsx index 1a0f97e94..3a9551d81 100644 --- a/packages/pl-fe/src/features/ui/components/theme-selector.tsx +++ b/packages/pl-fe/src/features/ui/components/theme-selector.tsx @@ -1,8 +1,8 @@ import React, { useMemo } from 'react'; import { FormattedMessage } from 'react-intl'; -import Icon from 'pl-fe/components/ui/icon'; -import Select from 'pl-fe/components/ui/select'; +import Icon from '@/components/ui/icon'; +import Select from '@/components/ui/select'; interface IThemeSelector { value: string; diff --git a/packages/pl-fe/src/features/ui/components/theme-toggle.tsx b/packages/pl-fe/src/features/ui/components/theme-toggle.tsx index 5c3443d97..bd2a9349e 100644 --- a/packages/pl-fe/src/features/ui/components/theme-toggle.tsx +++ b/packages/pl-fe/src/features/ui/components/theme-toggle.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { changeSetting } from 'pl-fe/actions/settings'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useSettings } from 'pl-fe/stores/settings'; +import { changeSetting } from '@/actions/settings'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useSettings } from '@/stores/settings'; import ThemeSelector from './theme-selector'; diff --git a/packages/pl-fe/src/features/ui/components/timeline.tsx b/packages/pl-fe/src/features/ui/components/timeline.tsx index 52cff6092..53f3e333c 100644 --- a/packages/pl-fe/src/features/ui/components/timeline.tsx +++ b/packages/pl-fe/src/features/ui/components/timeline.tsx @@ -2,13 +2,13 @@ import debounce from 'lodash/debounce'; import React, { useCallback, useMemo } from 'react'; import { defineMessages } from 'react-intl'; -import { dequeueTimeline, scrollTopTimeline } from 'pl-fe/actions/timelines'; -import ScrollTopButton from 'pl-fe/components/scroll-top-button'; -import StatusList, { IStatusList } from 'pl-fe/components/status-list'; -import Portal from 'pl-fe/components/ui/portal'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatusIds } from 'pl-fe/selectors'; +import { dequeueTimeline, scrollTopTimeline } from '@/actions/timelines'; +import ScrollTopButton from '@/components/scroll-top-button'; +import StatusList, { IStatusList } from '@/components/status-list'; +import Portal from '@/components/ui/portal'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatusIds } from '@/selectors'; const messages = defineMessages({ queue: { id: 'status_list.queue_label', defaultMessage: 'Click to see {count} new {count, plural, one {post} other {posts}}' }, diff --git a/packages/pl-fe/src/features/ui/components/zoomable-image.tsx b/packages/pl-fe/src/features/ui/components/zoomable-image.tsx index b3ad4b55e..dc2bd4433 100644 --- a/packages/pl-fe/src/features/ui/components/zoomable-image.tsx +++ b/packages/pl-fe/src/features/ui/components/zoomable-image.tsx @@ -3,8 +3,8 @@ import { createUseGesture, dragAction, pinchAction } from '@use-gesture/react'; import clsx from 'clsx'; import React, { useState, useCallback, useRef, useEffect } from 'react'; -import Blurhash from 'pl-fe/components/blurhash'; -import Spinner from 'pl-fe/components/ui/spinner'; +import Blurhash from '@/components/blurhash'; +import Spinner from '@/components/ui/spinner'; const MIN_SCALE = 1; const MAX_SCALE = 4; diff --git a/packages/pl-fe/src/features/ui/index.tsx b/packages/pl-fe/src/features/ui/index.tsx index bd2907f7b..e04af6e10 100644 --- a/packages/pl-fe/src/features/ui/index.tsx +++ b/packages/pl-fe/src/features/ui/index.tsx @@ -3,32 +3,32 @@ import clsx from 'clsx'; import React, { Suspense, useEffect, useRef } from 'react'; import { Toaster } from 'react-hot-toast'; -import { fetchConfig } from 'pl-fe/actions/admin'; -import { fetchFilters } from 'pl-fe/actions/filters'; -import { fetchMarker } from 'pl-fe/actions/markers'; -import { expandNotifications } from 'pl-fe/actions/notifications'; -import { register as registerPushNotifications } from 'pl-fe/actions/push-notifications/registerer'; -import { fetchHomeTimeline } from 'pl-fe/actions/timelines'; -import { useUserStream } from 'pl-fe/api/hooks/streaming/use-user-stream'; -import SidebarNavigation from 'pl-fe/components/sidebar-navigation'; -import ThumbNavigation from 'pl-fe/components/thumb-navigation'; -import Layout from 'pl-fe/components/ui/layout'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useDraggedFiles } from 'pl-fe/hooks/use-dragged-files'; -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'; -import { prefetchFollowRequests } from 'pl-fe/queries/accounts/use-follow-requests'; -import { queryClient } from 'pl-fe/queries/client'; -import { prefetchCustomEmojis } from 'pl-fe/queries/instance/use-custom-emojis'; -import { scheduledStatusesQueryOptions } from 'pl-fe/queries/statuses/scheduled-statuses'; -import { useSettings } from 'pl-fe/stores/settings'; -import { useShoutboxSubscription } from 'pl-fe/stores/shoutbox'; -import { useIsDropdownMenuOpen } from 'pl-fe/stores/ui'; -import { getVapidKey } from 'pl-fe/utils/auth'; -import { isStandalone } from 'pl-fe/utils/state'; +import { fetchConfig } from '@/actions/admin'; +import { fetchFilters } from '@/actions/filters'; +import { fetchMarker } from '@/actions/markers'; +import { expandNotifications } from '@/actions/notifications'; +import { register as registerPushNotifications } from '@/actions/push-notifications/registerer'; +import { fetchHomeTimeline } from '@/actions/timelines'; +import { useUserStream } from '@/api/hooks/streaming/use-user-stream'; +import SidebarNavigation from '@/components/sidebar-navigation'; +import ThumbNavigation from '@/components/thumb-navigation'; +import Layout from '@/components/ui/layout'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useClient } from '@/hooks/use-client'; +import { useDraggedFiles } from '@/hooks/use-dragged-files'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { prefetchFollowRequests } from '@/queries/accounts/use-follow-requests'; +import { queryClient } from '@/queries/client'; +import { prefetchCustomEmojis } from '@/queries/instance/use-custom-emojis'; +import { scheduledStatusesQueryOptions } from '@/queries/statuses/scheduled-statuses'; +import { useSettings } from '@/stores/settings'; +import { useShoutboxSubscription } from '@/stores/shoutbox'; +import { useIsDropdownMenuOpen } from '@/stores/ui'; +import { getVapidKey } from '@/utils/auth'; +import { isStandalone } from '@/utils/state'; import BackgroundShapes from './components/background-shapes'; import { @@ -42,7 +42,7 @@ import GlobalHotkeys from './util/global-hotkeys'; // Dummy import, to make sure that ends up in the application bundle. // Without this it ends up in ~8 very commonly used bundles. -import 'pl-fe/components/status'; +import '@/components/status'; const UI: React.FC = React.memo(() => { const navigate = useNavigate(); diff --git a/packages/pl-fe/src/features/ui/router/index.tsx b/packages/pl-fe/src/features/ui/router/index.tsx index 12087a923..ba469830c 100644 --- a/packages/pl-fe/src/features/ui/router/index.tsx +++ b/packages/pl-fe/src/features/ui/router/index.tsx @@ -11,33 +11,33 @@ import { import React, { useMemo } from 'react'; import * as v from 'valibot'; -import { FE_SUBDIRECTORY, WITH_LANDING_PAGE } from 'pl-fe/build-config'; -import SiteError from 'pl-fe/components/site-error'; -import Layout from 'pl-fe/components/ui/layout'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import AdminLayout from 'pl-fe/layouts/admin-layout'; -import ChatsLayout from 'pl-fe/layouts/chats-layout'; -import DefaultLayout from 'pl-fe/layouts/default-layout'; -import EmptyLayout from 'pl-fe/layouts/empty-layout'; -import EventLayout from 'pl-fe/layouts/event-layout'; -import EventsLayout from 'pl-fe/layouts/events-layout'; -import ExternalLoginLayout from 'pl-fe/layouts/external-login-layout'; -import GroupLayout from 'pl-fe/layouts/group-layout'; -import GroupsLayout from 'pl-fe/layouts/groups-layout'; -import HomeLayout from 'pl-fe/layouts/home-layout'; -import LandingLayout from 'pl-fe/layouts/landing-layout'; -import ManageGroupsLayout from 'pl-fe/layouts/manage-groups-layout'; -import ProfileLayout from 'pl-fe/layouts/profile-layout'; -import RemoteInstanceLayout from 'pl-fe/layouts/remote-instance-layout'; -import SearchLayout from 'pl-fe/layouts/search-layout'; -import StatusLayout from 'pl-fe/layouts/status-layout'; -import { instanceInitialState } from 'pl-fe/reducers/instance'; -import { isStandalone } from 'pl-fe/utils/state'; +import { FE_SUBDIRECTORY, WITH_LANDING_PAGE } from '@/build-config'; +import SiteError from '@/components/site-error'; +import Layout from '@/components/ui/layout'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import AdminLayout from '@/layouts/admin-layout'; +import ChatsLayout from '@/layouts/chats-layout'; +import DefaultLayout from '@/layouts/default-layout'; +import EmptyLayout from '@/layouts/empty-layout'; +import EventLayout from '@/layouts/event-layout'; +import EventsLayout from '@/layouts/events-layout'; +import ExternalLoginLayout from '@/layouts/external-login-layout'; +import GroupLayout from '@/layouts/group-layout'; +import GroupsLayout from '@/layouts/groups-layout'; +import HomeLayout from '@/layouts/home-layout'; +import LandingLayout from '@/layouts/landing-layout'; +import ManageGroupsLayout from '@/layouts/manage-groups-layout'; +import ProfileLayout from '@/layouts/profile-layout'; +import RemoteInstanceLayout from '@/layouts/remote-instance-layout'; +import SearchLayout from '@/layouts/search-layout'; +import StatusLayout from '@/layouts/status-layout'; +import { instanceInitialState } from '@/reducers/instance'; +import { isStandalone } from '@/utils/state'; import ChatsPageChat from '../../chats/components/chats-page/components/chats-page-chat'; import ChatsPageEmpty from '../../chats/components/chats-page/components/chats-page-empty'; @@ -162,7 +162,7 @@ interface RouterContext { } const rootRoute = createRootRouteWithContext()({ - component: React.lazy(() => import('pl-fe/features/ui')), + component: React.lazy(() => import('@/features/ui')), }); const requireAuth = ({ context: { isLoggedIn }, location }: { context: RouterContext; location: ParsedLocation }) => { 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 1ebe8a8a0..8a9a3bd9a 100644 --- a/packages/pl-fe/src/features/ui/util/async-components.ts +++ b/packages/pl-fe/src/features/ui/util/async-components.ts @@ -1,143 +1,143 @@ import { lazy } from 'react'; // Pages -export const AboutPage = lazy(() => import('pl-fe/pages/utils/about')); -export const AccountGallery = lazy(() => import('pl-fe/pages/accounts/account-gallery')); -export const AccountTimeline = lazy(() => import('pl-fe/pages/accounts/account-timeline')); -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 Antennas = lazy(() => import('pl-fe/pages/account-lists/antennas')); -export const AntennaTimeline = lazy(() => import('pl-fe/pages/timelines/antenna-timeline')); -export const AuthTokenList = lazy(() => import('pl-fe/pages/settings/auth-token-list')); -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')); -export const Bookmarks = lazy(() => import('pl-fe/pages/status-lists/bookmarks')); -export const BubbleTimeline = lazy(() => import('pl-fe/pages/timelines/bubble-timeline')); -export const ChatIndex = lazy(() => import('pl-fe/pages/chats/chats')); -export const Circle = lazy(() => import('pl-fe/pages/fun/circle')); -export const Circles = lazy(() => import('pl-fe/pages/account-lists/circles')); -export const CircleTimeline = lazy(() => import('pl-fe/pages/timelines/circle-timeline')); -export const CommunityTimeline = lazy(() => import('pl-fe/pages/timelines/community-timeline')); -export const ComposeEvent = lazy(() => import('pl-fe/pages/statuses/compose-event')); -export const EditEvent = lazy(() => import('pl-fe/pages/statuses/compose-event').then(m => ({ default: m.EditEventPage }))); -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/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')); -export const DomainBlocks = lazy(() => import('pl-fe/pages/settings/domain-blocks')); -export const Domains = lazy(() => import('pl-fe/pages/dashboard/domains')); -export const DraftStatuses = lazy(() => import('pl-fe/pages/status-lists/draft-statuses')); -export const Drive = lazy(() => import('pl-fe/pages/drive/drive')); -export const EditEmail = lazy(() => import('pl-fe/pages/settings/edit-email')); -export const EditFilter = lazy(() => import('pl-fe/pages/settings/edit-filter')); -export const EditGroup = lazy(() => import('pl-fe/pages/groups/edit-group')); -export const EditPassword = lazy(() => import('pl-fe/pages/settings/edit-password')); -export const EditProfile = lazy(() => import('pl-fe/pages/settings/edit-profile')); -export const EventDiscussion = lazy(() => import('pl-fe/pages/statuses/event-discussion')); -export const EventInformation = lazy(() => import('pl-fe/pages/statuses/event-information')); -export const Events = lazy(() => import('pl-fe/pages/status-lists/events')); -export const ExportData = lazy(() => import('pl-fe/pages/settings/export-data')); -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/pages/utils/federation-restrictions')); -export const Filters = lazy(() => import('pl-fe/pages/settings/filters')); -export const FollowedTags = lazy(() => import('pl-fe/pages/settings')); -export const Followers = lazy(() => import('pl-fe/pages/account-lists/followers')); -export const Following = lazy(() => import('pl-fe/pages/account-lists/following')); -export const FollowRequests = lazy(() => import('pl-fe/pages/account-lists/follow-requests')); -export const GenericNotFound = lazy(() => import('pl-fe/pages/utils/generic-not-found')); -export const GroupBlockedMembers = lazy(() => import('pl-fe/pages/groups/group-blocked-members')); -export const GroupGallery = lazy(() => import('pl-fe/pages/groups/group-gallery')); -export const GroupMembers = lazy(() => import('pl-fe/pages/groups/group-members')); -export const GroupMembershipRequests = lazy(() => import('pl-fe/pages/groups/group-membership-requests')); -export const GroupTimeline = lazy(() => import('pl-fe/pages/timelines/group-timeline')); -export const Groups = lazy(() => import('pl-fe/pages/groups/groups')); -export const HashtagTimeline = lazy(() => import('pl-fe/pages/timelines/hashtag-timeline')); -export const HomeTimeline = lazy(() => import('pl-fe/pages/timelines/home-timeline')); -export const ImportData = lazy(() => import('pl-fe/pages/settings/import-data')); -export const IntentionalError = lazy(() => import('pl-fe/pages/utils/intentional-error')); -export const InteractionPolicies = lazy(() => import('pl-fe/pages/settings/interaction-policies')); -export const InteractionRequests = lazy(() => import('pl-fe/pages/status-lists/interaction-requests')); -export const LandingPage = lazy(() => import('pl-fe/pages/utils/landing')); -export const LandingTimeline = lazy(() => import('pl-fe/pages/timelines/landing-timeline')); -export const LinkTimeline = lazy(() => import('pl-fe/pages/timelines/link-timeline')); -export const Lists = lazy(() => import('pl-fe/pages/account-lists/lists')); -export const ListTimeline = lazy(() => import('pl-fe/pages/timelines/list-timeline')); -export const LoginPage = lazy(() => import('pl-fe/pages/auth/login')); -export const LogoutPage = lazy(() => import('pl-fe/pages/auth/logout')); -export const ManageGroup = lazy(() => import('pl-fe/pages/groups/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/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/pages/notifications/notifications')); -export const OutgoingFollowRequests = lazy(() => import('pl-fe/pages/account-lists/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/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/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')); -export const RemoteTimeline = lazy(() => import('pl-fe/pages/timelines/remote-timeline')); -export const Rules = lazy(() => import('pl-fe/pages/dashboard/rules')); -export const ScheduledStatuses = lazy(() => import('pl-fe/pages/status-lists/scheduled-statuses')); -export const Search = lazy(() => import('pl-fe/pages/search/search')); -export const ServiceWorkerInfo = lazy(() => import('pl-fe/pages/developers/service-worker-info')); -export const ServerInfo = lazy(() => import('pl-fe/pages/utils/server-info')); -export const Settings = lazy(() => import('pl-fe/pages/settings/settings')); -export const SettingsStore = lazy(() => import('pl-fe/pages/developers/settings-store')); -export const Share = lazy(() => import('pl-fe/pages/utils/share')); -export const Status = lazy(() => import('pl-fe/pages/statuses/status')); -export const TestTimeline = lazy(() => import('pl-fe/pages/timelines/test-timeline')); -export const ThemeEditor = lazy(() => import('pl-fe/pages/dashboard/theme-editor')); -export const Privacy = lazy(() => import('pl-fe/pages/settings/privacy')); -export const UserIndex = lazy(() => import('pl-fe/pages/dashboard/user-index')); -export const WrenchedTimeline = lazy(() => import('pl-fe/pages/timelines/wrenched-timeline')); +export const AboutPage = lazy(() => import('@/pages/utils/about')); +export const AccountGallery = lazy(() => import('@/pages/accounts/account-gallery')); +export const AccountTimeline = lazy(() => import('@/pages/accounts/account-timeline')); +export const AdminAccount = lazy(() => import('@/pages/dashboard/account')); +export const Aliases = lazy(() => import('@/pages/settings/aliases')); +export const Announcements = lazy(() => import('@/pages/dashboard/announcements')); +export const Antennas = lazy(() => import('@/pages/account-lists/antennas')); +export const AntennaTimeline = lazy(() => import('@/pages/timelines/antenna-timeline')); +export const AuthTokenList = lazy(() => import('@/pages/settings/auth-token-list')); +export const AwaitingApproval = lazy(() => import('@/pages/dashboard/awaiting-approval')); +export const Backups = lazy(() => import('@/pages/settings/backups')); +export const Blocks = lazy(() => import('@/pages/settings/blocks')); +export const BookmarkFolders = lazy(() => import('@/pages/status-lists/bookmark-folders')); +export const Bookmarks = lazy(() => import('@/pages/status-lists/bookmarks')); +export const BubbleTimeline = lazy(() => import('@/pages/timelines/bubble-timeline')); +export const ChatIndex = lazy(() => import('@/pages/chats/chats')); +export const Circle = lazy(() => import('@/pages/fun/circle')); +export const Circles = lazy(() => import('@/pages/account-lists/circles')); +export const CircleTimeline = lazy(() => import('@/pages/timelines/circle-timeline')); +export const CommunityTimeline = lazy(() => import('@/pages/timelines/community-timeline')); +export const ComposeEvent = lazy(() => import('@/pages/statuses/compose-event')); +export const EditEvent = lazy(() => import('@/pages/statuses/compose-event').then(m => ({ default: m.EditEventPage }))); +export const Conversations = lazy(() => import('@/pages/status-lists/conversations')); +export const CreateApp = lazy(() => import('@/pages/developers/create-app')); +export const CryptoDonate = lazy(() => import('@/pages/utils/crypto-donate')); +export const Dashboard = lazy(() => import('@/pages/dashboard/dashboard')); +export const DeleteAccount = lazy(() => import('@/pages/settings/delete-account')); +export const Developers = lazy(() => import('@/pages/developers/developers')); +export const Directory = lazy(() => import('@/pages/account-lists/directory')); +export const DomainBlocks = lazy(() => import('@/pages/settings/domain-blocks')); +export const Domains = lazy(() => import('@/pages/dashboard/domains')); +export const DraftStatuses = lazy(() => import('@/pages/status-lists/draft-statuses')); +export const Drive = lazy(() => import('@/pages/drive/drive')); +export const EditEmail = lazy(() => import('@/pages/settings/edit-email')); +export const EditFilter = lazy(() => import('@/pages/settings/edit-filter')); +export const EditGroup = lazy(() => import('@/pages/groups/edit-group')); +export const EditPassword = lazy(() => import('@/pages/settings/edit-password')); +export const EditProfile = lazy(() => import('@/pages/settings/edit-profile')); +export const EventDiscussion = lazy(() => import('@/pages/statuses/event-discussion')); +export const EventInformation = lazy(() => import('@/pages/statuses/event-information')); +export const Events = lazy(() => import('@/pages/status-lists/events')); +export const ExportData = lazy(() => import('@/pages/settings/export-data')); +export const ExternalLogin = lazy(() => import('@/pages/auth/external-login')); +export const FavouritedStatuses = lazy(() => import('@/pages/status-lists/favourited-statuses')); +export const FederationRestrictions = lazy(() => import('@/pages/utils/federation-restrictions')); +export const Filters = lazy(() => import('@/pages/settings/filters')); +export const FollowedTags = lazy(() => import('@/pages/settings')); +export const Followers = lazy(() => import('@/pages/account-lists/followers')); +export const Following = lazy(() => import('@/pages/account-lists/following')); +export const FollowRequests = lazy(() => import('@/pages/account-lists/follow-requests')); +export const GenericNotFound = lazy(() => import('@/pages/utils/generic-not-found')); +export const GroupBlockedMembers = lazy(() => import('@/pages/groups/group-blocked-members')); +export const GroupGallery = lazy(() => import('@/pages/groups/group-gallery')); +export const GroupMembers = lazy(() => import('@/pages/groups/group-members')); +export const GroupMembershipRequests = lazy(() => import('@/pages/groups/group-membership-requests')); +export const GroupTimeline = lazy(() => import('@/pages/timelines/group-timeline')); +export const Groups = lazy(() => import('@/pages/groups/groups')); +export const HashtagTimeline = lazy(() => import('@/pages/timelines/hashtag-timeline')); +export const HomeTimeline = lazy(() => import('@/pages/timelines/home-timeline')); +export const ImportData = lazy(() => import('@/pages/settings/import-data')); +export const IntentionalError = lazy(() => import('@/pages/utils/intentional-error')); +export const InteractionPolicies = lazy(() => import('@/pages/settings/interaction-policies')); +export const InteractionRequests = lazy(() => import('@/pages/status-lists/interaction-requests')); +export const LandingPage = lazy(() => import('@/pages/utils/landing')); +export const LandingTimeline = lazy(() => import('@/pages/timelines/landing-timeline')); +export const LinkTimeline = lazy(() => import('@/pages/timelines/link-timeline')); +export const Lists = lazy(() => import('@/pages/account-lists/lists')); +export const ListTimeline = lazy(() => import('@/pages/timelines/list-timeline')); +export const LoginPage = lazy(() => import('@/pages/auth/login')); +export const LogoutPage = lazy(() => import('@/pages/auth/logout')); +export const ManageGroup = lazy(() => import('@/pages/groups/manage-group')); +export const MediaGallery = lazy(() => import('@/components/media-gallery')); +export const Migration = lazy(() => import('@/pages/settings/migration')); +export const ModerationLog = lazy(() => import('@/pages/dashboard/moderation-log')); +export const Mutes = lazy(() => import('@/pages/settings/mutes')); +export const NewStatus = lazy(() => import('@/pages/utils/new-status')); +export const Notifications = lazy(() => import('@/pages/notifications/notifications')); +export const OutgoingFollowRequests = lazy(() => import('@/pages/account-lists/outgoing-follow-requests')); +export const PasswordReset = lazy(() => import('@/pages/auth/password-reset')); +export const PinnedStatuses = lazy(() => import('@/pages/status-lists/pinned-statuses')); +export const PlFeConfig = lazy(() => import('@/pages/dashboard/pl-fe-config')); +export const PublicTimeline = lazy(() => import('@/pages/timelines/public-timeline')); +export const Quotes = lazy(() => import('@/pages/status-lists/quotes')); +export const Report = lazy(() => import('@/pages/dashboard/report')); +export const Reports = lazy(() => import('@/pages/dashboard/reports')); +export const RegisterInvite = lazy(() => import('@/pages/auth/register-with-invite')); +export const RegistrationPage = lazy(() => import('@/pages/auth/registration')); +export const Relays = lazy(() => import('@/pages/dashboard/relays')); +export const RemoteTimeline = lazy(() => import('@/pages/timelines/remote-timeline')); +export const Rules = lazy(() => import('@/pages/dashboard/rules')); +export const ScheduledStatuses = lazy(() => import('@/pages/status-lists/scheduled-statuses')); +export const Search = lazy(() => import('@/pages/search/search')); +export const ServiceWorkerInfo = lazy(() => import('@/pages/developers/service-worker-info')); +export const ServerInfo = lazy(() => import('@/pages/utils/server-info')); +export const Settings = lazy(() => import('@/pages/settings/settings')); +export const SettingsStore = lazy(() => import('@/pages/developers/settings-store')); +export const Share = lazy(() => import('@/pages/utils/share')); +export const Status = lazy(() => import('@/pages/statuses/status')); +export const TestTimeline = lazy(() => import('@/pages/timelines/test-timeline')); +export const ThemeEditor = lazy(() => import('@/pages/dashboard/theme-editor')); +export const Privacy = lazy(() => import('@/pages/settings/privacy')); +export const UserIndex = lazy(() => import('@/pages/dashboard/user-index')); +export const WrenchedTimeline = lazy(() => import('@/pages/timelines/wrenched-timeline')); // Panels -export const AccountNotePanel = lazy(() => import('pl-fe/features/ui/components/panels/account-note-panel')); -export const AnnouncementsPanel = lazy(() => import('pl-fe/components/announcements/announcements-panel')); -export const BirthdayPanel = lazy(() => import('pl-fe/features/ui/components/panels/birthday-panel')); -export const CryptoDonatePanel = lazy(() => import('pl-fe/features/crypto-donate/components/crypto-donate-panel')); -export const GroupMediaPanel = lazy(() => import('pl-fe/features/ui/components/panels/group-media-panel')); -export const InstanceInfoPanel = lazy(() => import('pl-fe/features/ui/components/panels/instance-info-panel')); -export const InstanceModerationPanel = lazy(() => import('pl-fe/features/ui/components/panels/instance-moderation-panel')); -export const LatestAccountsPanel = lazy(() => import('pl-fe/features/admin/components/latest-accounts-panel')); -export const MyGroupsPanel = lazy(() => import('pl-fe/features/ui/components/panels/my-groups-panel')); -export const NewEventPanel = lazy(() => import('pl-fe/features/ui/components/panels/new-event-panel')); -export const NewGroupPanel = lazy(() => import('pl-fe/features/ui/components/panels/new-group-panel')); -export const PinnedAccountsPanel = lazy(() => import('pl-fe/features/ui/components/panels/pinned-accounts-panel')); -export const ProfileFieldsPanel = lazy(() => import('pl-fe/features/ui/components/panels/profile-fields-panel')); -export const ProfileInfoPanel = lazy(() => import('pl-fe/features/ui/components/panels/profile-info-panel')); -export const ProfileMediaPanel = lazy(() => import('pl-fe/features/ui/components/panels/profile-media-panel')); -export const PromoPanel = lazy(() => import('pl-fe/features/ui/components/panels/promo-panel')); -export const SignUpPanel = lazy(() => import('pl-fe/features/ui/components/panels/sign-up-panel')); -export const TrendsPanel = lazy(() => import('pl-fe/features/ui/components/panels/trends-panel')); -export const UserPanel = lazy(() => import('pl-fe/features/ui/components/panels/user-panel')); -export const WhoToFollowPanel = lazy(() => import('pl-fe/features/ui/components/panels/who-to-follow-panel')); +export const AccountNotePanel = lazy(() => import('@/features/ui/components/panels/account-note-panel')); +export const AnnouncementsPanel = lazy(() => import('@/components/announcements/announcements-panel')); +export const BirthdayPanel = lazy(() => import('@/features/ui/components/panels/birthday-panel')); +export const CryptoDonatePanel = lazy(() => import('@/features/crypto-donate/components/crypto-donate-panel')); +export const GroupMediaPanel = lazy(() => import('@/features/ui/components/panels/group-media-panel')); +export const InstanceInfoPanel = lazy(() => import('@/features/ui/components/panels/instance-info-panel')); +export const InstanceModerationPanel = lazy(() => import('@/features/ui/components/panels/instance-moderation-panel')); +export const LatestAccountsPanel = lazy(() => import('@/features/admin/components/latest-accounts-panel')); +export const MyGroupsPanel = lazy(() => import('@/features/ui/components/panels/my-groups-panel')); +export const NewEventPanel = lazy(() => import('@/features/ui/components/panels/new-event-panel')); +export const NewGroupPanel = lazy(() => import('@/features/ui/components/panels/new-group-panel')); +export const PinnedAccountsPanel = lazy(() => import('@/features/ui/components/panels/pinned-accounts-panel')); +export const ProfileFieldsPanel = lazy(() => import('@/features/ui/components/panels/profile-fields-panel')); +export const ProfileInfoPanel = lazy(() => import('@/features/ui/components/panels/profile-info-panel')); +export const ProfileMediaPanel = lazy(() => import('@/features/ui/components/panels/profile-media-panel')); +export const PromoPanel = lazy(() => import('@/features/ui/components/panels/promo-panel')); +export const SignUpPanel = lazy(() => import('@/features/ui/components/panels/sign-up-panel')); +export const TrendsPanel = lazy(() => import('@/features/ui/components/panels/trends-panel')); +export const UserPanel = lazy(() => import('@/features/ui/components/panels/user-panel')); +export const WhoToFollowPanel = lazy(() => import('@/features/ui/components/panels/who-to-follow-panel')); -export const Audio = lazy(() => import('pl-fe/features/audio')); -export const ChatWidget = lazy(() => import('pl-fe/features/chats/components/chat-widget/chat-widget')); -export const ComposeEditor = lazy(() => import('pl-fe/features/compose/editor')); -export const ComposeForm = lazy(() => import('pl-fe/features/compose/components/compose-form')); -export const DatePicker = lazy(() => import('pl-fe/features/birthdays/date-picker')); -export const DropdownNavigation = lazy(() => import('pl-fe/components/dropdown-navigation')); -export const EmojiPicker = lazy(() => import('pl-fe/features/emoji/components/emoji-picker')); -export const EventHeader = lazy(() => import('pl-fe/features/event/components/event-header')); -export const MfaForm = lazy(() => import('pl-fe/features/security/mfa-form')); -export const ModalRoot = lazy(() => import('pl-fe/features/ui/components/modal-root')); -export const ProfileField = lazy(() => import('pl-fe/features/ui/components/profile-field')); -export const AccountHoverCard = lazy(() => import('pl-fe/components/account-hover-card')); -export const StatusHoverCard = lazy(() => import('pl-fe/components/status-hover-card')); -export const Video = lazy(() => import('pl-fe/features/video')); +export const Audio = lazy(() => import('@/features/audio')); +export const ChatWidget = lazy(() => import('@/features/chats/components/chat-widget/chat-widget')); +export const ComposeEditor = lazy(() => import('@/features/compose/editor')); +export const ComposeForm = lazy(() => import('@/features/compose/components/compose-form')); +export const DatePicker = lazy(() => import('@/features/birthdays/date-picker')); +export const DropdownNavigation = lazy(() => import('@/components/dropdown-navigation')); +export const EmojiPicker = lazy(() => import('@/features/emoji/components/emoji-picker')); +export const EventHeader = lazy(() => import('@/features/event/components/event-header')); +export const MfaForm = lazy(() => import('@/features/security/mfa-form')); +export const ModalRoot = lazy(() => import('@/features/ui/components/modal-root')); +export const ProfileField = lazy(() => import('@/features/ui/components/profile-field')); +export const AccountHoverCard = lazy(() => import('@/components/account-hover-card')); +export const StatusHoverCard = lazy(() => import('@/components/status-hover-card')); +export const Video = lazy(() => import('@/features/video')); diff --git a/packages/pl-fe/src/features/ui/util/global-hotkeys.tsx b/packages/pl-fe/src/features/ui/util/global-hotkeys.tsx index 1eb12a3c9..1e2228657 100644 --- a/packages/pl-fe/src/features/ui/util/global-hotkeys.tsx +++ b/packages/pl-fe/src/features/ui/util/global-hotkeys.tsx @@ -1,11 +1,11 @@ import { useNavigate, useRouter } from '@tanstack/react-router'; import React, { useMemo } from 'react'; -import { resetCompose } from 'pl-fe/actions/compose'; -import { FOCUS_EDITOR_COMMAND } from 'pl-fe/features/compose/editor/plugins/focus-plugin'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { resetCompose } from '@/actions/compose'; +import { FOCUS_EDITOR_COMMAND } from '@/features/compose/editor/plugins/focus-plugin'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useModalsActions } from '@/stores/modals'; import { Hotkeys } from '../components/hotkeys'; diff --git a/packages/pl-fe/src/features/ui/util/pending-status-builder.ts b/packages/pl-fe/src/features/ui/util/pending-status-builder.ts index 3cde3dffd..ad2c939b4 100644 --- a/packages/pl-fe/src/features/ui/util/pending-status-builder.ts +++ b/packages/pl-fe/src/features/ui/util/pending-status-builder.ts @@ -2,11 +2,11 @@ import { create } from 'mutative'; import { statusSchema } from 'pl-api'; import * as v from 'valibot'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; -import { selectOwnAccount } from 'pl-fe/selectors'; +import { normalizeStatus } from '@/normalizers/status'; +import { selectOwnAccount } from '@/selectors'; -import type { PendingStatus } from 'pl-fe/reducers/pending-statuses'; -import type { RootState } from 'pl-fe/store'; +import type { PendingStatus } from '@/reducers/pending-statuses'; +import type { RootState } from '@/store'; const buildMentions = (pendingStatus: PendingStatus) => { if (pendingStatus.in_reply_to_id) { diff --git a/packages/pl-fe/src/features/video/index.tsx b/packages/pl-fe/src/features/video/index.tsx index d4193f2a8..fc1a53b3b 100644 --- a/packages/pl-fe/src/features/video/index.tsx +++ b/packages/pl-fe/src/features/video/index.tsx @@ -4,9 +4,9 @@ import throttle from 'lodash/throttle'; import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Blurhash from 'pl-fe/components/blurhash'; -import Icon from 'pl-fe/components/icon'; -import { isPanoramic, isPortrait, minimumAspectRatio, maximumAspectRatio } from 'pl-fe/utils/media-aspect-ratio'; +import Blurhash from '@/components/blurhash'; +import Icon from '@/components/icon'; +import { isPanoramic, isPortrait, minimumAspectRatio, maximumAspectRatio } from '@/utils/media-aspect-ratio'; import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen'; diff --git a/packages/pl-fe/src/hooks/forms/use-image-field.ts b/packages/pl-fe/src/hooks/forms/use-image-field.ts index f8d353504..86345ccd6 100644 --- a/packages/pl-fe/src/hooks/forms/use-image-field.ts +++ b/packages/pl-fe/src/hooks/forms/use-image-field.ts @@ -1,7 +1,7 @@ import { useState } from 'react'; -import { useSettings } from 'pl-fe/stores/settings'; -import resizeImage from 'pl-fe/utils/resize-image'; +import { useSettings } from '@/stores/settings'; +import resizeImage from '@/utils/resize-image'; import { usePreview } from './use-preview'; diff --git a/packages/pl-fe/src/hooks/use-account-gallery.ts b/packages/pl-fe/src/hooks/use-account-gallery.ts index 7252f63cf..6d703a762 100644 --- a/packages/pl-fe/src/hooks/use-account-gallery.ts +++ b/packages/pl-fe/src/hooks/use-account-gallery.ts @@ -1,11 +1,11 @@ import { createSelector } from 'reselect'; -import { useAccountMediaTimeline, useGroupMediaTimeline } from 'pl-fe/queries/timelines/use-account-media-timeline'; +import { useAccountMediaTimeline, useGroupMediaTimeline } from '@/queries/timelines/use-account-media-timeline'; import { useAppSelector } from './use-app-selector'; +import type { RootState } from '@/store'; import type { MediaAttachment } from 'pl-api'; -import type { RootState } from 'pl-fe/store'; type AccountGalleryAttachment = MediaAttachment & { index: number; diff --git a/packages/pl-fe/src/hooks/use-acct.ts b/packages/pl-fe/src/hooks/use-acct.ts index 521d81cf0..b7a094b9d 100644 --- a/packages/pl-fe/src/hooks/use-acct.ts +++ b/packages/pl-fe/src/hooks/use-acct.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react'; -import { displayFqn } from 'pl-fe/utils/state'; +import { displayFqn } from '@/utils/state'; import { useAppSelector } from './use-app-selector'; import { useInstance } from './use-instance'; diff --git a/packages/pl-fe/src/hooks/use-app-dispatch.ts b/packages/pl-fe/src/hooks/use-app-dispatch.ts index f2533681a..1040bf482 100644 --- a/packages/pl-fe/src/hooks/use-app-dispatch.ts +++ b/packages/pl-fe/src/hooks/use-app-dispatch.ts @@ -1,6 +1,6 @@ import { useDispatch } from 'react-redux'; -import type { AppDispatch } from 'pl-fe/store'; +import type { AppDispatch } from '@/store'; const useAppDispatch = () => useDispatch(); diff --git a/packages/pl-fe/src/hooks/use-app-selector.ts b/packages/pl-fe/src/hooks/use-app-selector.ts index e33de1406..d22ef2bd6 100644 --- a/packages/pl-fe/src/hooks/use-app-selector.ts +++ b/packages/pl-fe/src/hooks/use-app-selector.ts @@ -1,6 +1,6 @@ import { TypedUseSelectorHook, useSelector } from 'react-redux'; -import type { RootState } from 'pl-fe/store'; +import type { RootState } from '@/store'; const useAppSelector: TypedUseSelectorHook = useSelector; diff --git a/packages/pl-fe/src/hooks/use-can-interact.ts b/packages/pl-fe/src/hooks/use-can-interact.ts index 915c0e47c..d6f0ccd42 100644 --- a/packages/pl-fe/src/hooks/use-can-interact.ts +++ b/packages/pl-fe/src/hooks/use-can-interact.ts @@ -2,8 +2,8 @@ import { useMemo } from 'react'; import { useAppSelector } from './use-app-selector'; +import type { MinifiedStatus } from '@/reducers/statuses'; import type { InteractionPolicy, InteractionPolicyEntry } from 'pl-api'; -import type { MinifiedStatus } from 'pl-fe/reducers/statuses'; const useCanInteract = (status: Pick, type: keyof InteractionPolicy): { canInteract: boolean; diff --git a/packages/pl-fe/src/hooks/use-client.ts b/packages/pl-fe/src/hooks/use-client.ts index 9b7600378..038465b35 100644 --- a/packages/pl-fe/src/hooks/use-client.ts +++ b/packages/pl-fe/src/hooks/use-client.ts @@ -1,4 +1,4 @@ -import { getClient } from 'pl-fe/api'; +import { getClient } from '@/api'; import { useAppSelector } from './use-app-selector'; diff --git a/packages/pl-fe/src/hooks/use-compose.ts b/packages/pl-fe/src/hooks/use-compose.ts index b20b738e5..d291fe05a 100644 --- a/packages/pl-fe/src/hooks/use-compose.ts +++ b/packages/pl-fe/src/hooks/use-compose.ts @@ -1,6 +1,6 @@ import { useAppSelector } from './use-app-selector'; -import type { Compose } from 'pl-fe/reducers/compose'; +import type { Compose } from '@/reducers/compose'; /** Get compose for given key with fallback to 'default' */ const useCompose = (composeId: ID extends 'default' ? never : ID): Compose => diff --git a/packages/pl-fe/src/hooks/use-get-state.ts b/packages/pl-fe/src/hooks/use-get-state.ts index ceb568fc2..38b8f88cb 100644 --- a/packages/pl-fe/src/hooks/use-get-state.ts +++ b/packages/pl-fe/src/hooks/use-get-state.ts @@ -1,6 +1,6 @@ import { useAppDispatch } from './use-app-dispatch'; -import type { RootState } from 'pl-fe/store'; +import type { RootState } from '@/store'; /** * Provides a `getState()` function to hooks. diff --git a/packages/pl-fe/src/hooks/use-locale.ts b/packages/pl-fe/src/hooks/use-locale.ts index 01b4eede1..8273e32bd 100644 --- a/packages/pl-fe/src/hooks/use-locale.ts +++ b/packages/pl-fe/src/hooks/use-locale.ts @@ -1,5 +1,5 @@ -import messages from 'pl-fe/messages'; -import { useSettings } from 'pl-fe/stores/settings'; +import messages from '@/messages'; +import { useSettings } from '@/stores/settings'; /** Locales which should be presented in right-to-left. */ const RTL_LOCALES = ['ar', 'ckb', 'fa', 'he']; diff --git a/packages/pl-fe/src/hooks/use-logo.ts b/packages/pl-fe/src/hooks/use-logo.ts index d0a657ab4..c2c2bfce0 100644 --- a/packages/pl-fe/src/hooks/use-logo.ts +++ b/packages/pl-fe/src/hooks/use-logo.ts @@ -1,4 +1,4 @@ -import { useSettings } from 'pl-fe/stores/settings'; +import { useSettings } from '@/stores/settings'; import { usePlFeConfig } from './use-pl-fe-config'; import { useTheme } from './use-theme'; diff --git a/packages/pl-fe/src/hooks/use-own-account.ts b/packages/pl-fe/src/hooks/use-own-account.ts index 623955757..d6588005a 100644 --- a/packages/pl-fe/src/hooks/use-own-account.ts +++ b/packages/pl-fe/src/hooks/use-own-account.ts @@ -1,4 +1,4 @@ -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; +import { useAccount } from '@/api/hooks/accounts/use-account'; import { useLoggedIn } from './use-logged-in'; diff --git a/packages/pl-fe/src/hooks/use-pl-fe-config.ts b/packages/pl-fe/src/hooks/use-pl-fe-config.ts index 0f468343d..037c4e007 100644 --- a/packages/pl-fe/src/hooks/use-pl-fe-config.ts +++ b/packages/pl-fe/src/hooks/use-pl-fe-config.ts @@ -1,4 +1,4 @@ -import { getPlFeConfig } from 'pl-fe/actions/pl-fe'; +import { getPlFeConfig } from '@/actions/pl-fe'; import { useAppSelector } from './use-app-selector'; diff --git a/packages/pl-fe/src/hooks/use-system-theme.ts b/packages/pl-fe/src/hooks/use-system-theme.ts index cf1220666..35da5d8fd 100644 --- a/packages/pl-fe/src/hooks/use-system-theme.ts +++ b/packages/pl-fe/src/hooks/use-system-theme.ts @@ -1,6 +1,6 @@ import { useState, useEffect } from 'react'; -import { useSettings } from 'pl-fe/stores/settings'; +import { useSettings } from '@/stores/settings'; import type { Theme } from './use-theme'; diff --git a/packages/pl-fe/src/hooks/use-theme-css.ts b/packages/pl-fe/src/hooks/use-theme-css.ts index d8888221d..f1a7323c3 100644 --- a/packages/pl-fe/src/hooks/use-theme-css.ts +++ b/packages/pl-fe/src/hooks/use-theme-css.ts @@ -1,12 +1,12 @@ import { useMemo } from 'react'; -import { useSettings } from 'pl-fe/stores/settings'; -import { toTailwind } from 'pl-fe/utils/tailwind'; -import { generateAccent, generateThemeCss } from 'pl-fe/utils/theme'; +import { useSettings } from '@/stores/settings'; +import { toTailwind } from '@/utils/tailwind'; +import { generateAccent, generateThemeCss } from '@/utils/theme'; import { usePlFeConfig } from './use-pl-fe-config'; -import type { PlFeConfig } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; +import type { PlFeConfig } from '@/normalizers/pl-fe/pl-fe-config'; const DEFAULT_COLORS = { success: { diff --git a/packages/pl-fe/src/hooks/use-theme.ts b/packages/pl-fe/src/hooks/use-theme.ts index b24545a68..1186df579 100644 --- a/packages/pl-fe/src/hooks/use-theme.ts +++ b/packages/pl-fe/src/hooks/use-theme.ts @@ -1,4 +1,4 @@ -import { useSettings } from 'pl-fe/stores/settings'; +import { useSettings } from '@/stores/settings'; import { useSystemTheme } from './use-system-theme'; diff --git a/packages/pl-fe/src/init/pl-fe-head.tsx b/packages/pl-fe/src/init/pl-fe-head.tsx index 7a2507361..e9d600f55 100644 --- a/packages/pl-fe/src/init/pl-fe-head.tsx +++ b/packages/pl-fe/src/init/pl-fe-head.tsx @@ -1,16 +1,16 @@ import clsx from 'clsx'; import React, { useEffect } from 'react'; -import InlineStyle from 'pl-fe/components/inline-style'; -import { useLocale, useLocaleDirection } from 'pl-fe/hooks/use-locale'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { useTheme } from 'pl-fe/hooks/use-theme'; -import { useThemeCss } from 'pl-fe/hooks/use-theme-css'; -import { startSentry } from 'pl-fe/sentry'; -import { useHasModals } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import InlineStyle from '@/components/inline-style'; +import { useLocale, useLocaleDirection } from '@/hooks/use-locale'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { useTheme } from '@/hooks/use-theme'; +import { useThemeCss } from '@/hooks/use-theme-css'; +import { startSentry } from '@/sentry'; +import { useHasModals } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; -const Helmet = React.lazy(() => import('pl-fe/components/helmet')); +const Helmet = React.lazy(() => import('@/components/helmet')); /** Injects metadata into site head with Helmet. */ const PlFeHead = () => { diff --git a/packages/pl-fe/src/init/pl-fe-load.tsx b/packages/pl-fe/src/init/pl-fe-load.tsx index cb1d54aec..7659de54a 100644 --- a/packages/pl-fe/src/init/pl-fe-load.tsx +++ b/packages/pl-fe/src/init/pl-fe-load.tsx @@ -1,17 +1,17 @@ import React, { useState, useEffect } from 'react'; import { IntlProvider } from 'react-intl'; -import { checkIfStandalone, fetchInstance } from 'pl-fe/actions/instance'; -import { fetchMe } from 'pl-fe/actions/me'; -import { loadPlFeConfig } from 'pl-fe/actions/pl-fe'; -import LoadingScreen from 'pl-fe/components/loading-screen'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useLocale } from 'pl-fe/hooks/use-locale'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import MESSAGES from 'pl-fe/messages'; +import { checkIfStandalone, fetchInstance } from '@/actions/instance'; +import { fetchMe } from '@/actions/me'; +import { loadPlFeConfig } from '@/actions/pl-fe'; +import LoadingScreen from '@/components/loading-screen'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useLocale } from '@/hooks/use-locale'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import MESSAGES from '@/messages'; -import type { AppDispatch } from 'pl-fe/store'; +import type { AppDispatch } from '@/store'; /** Load initial data from the backend */ const loadInitial = () => async(dispatch: AppDispatch) => { diff --git a/packages/pl-fe/src/init/pl-fe-mount.tsx b/packages/pl-fe/src/init/pl-fe-mount.tsx index 371e006bf..267284521 100644 --- a/packages/pl-fe/src/init/pl-fe-mount.tsx +++ b/packages/pl-fe/src/init/pl-fe-mount.tsx @@ -1,7 +1,7 @@ import React, { Suspense } from 'react'; -import LoadingScreen from 'pl-fe/components/loading-screen'; -import { RouterWithContext } from 'pl-fe/features/ui/router'; +import LoadingScreen from '@/components/loading-screen'; +import { RouterWithContext } from '@/features/ui/router'; /** Highest level node with the Redux store. */ const PlFeMount = () => { diff --git a/packages/pl-fe/src/init/pl-fe.tsx b/packages/pl-fe/src/init/pl-fe.tsx index 099ecc30b..8eec13b80 100644 --- a/packages/pl-fe/src/init/pl-fe.tsx +++ b/packages/pl-fe/src/init/pl-fe.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { HelmetProvider } from 'react-helmet-async'; import { Provider } from 'react-redux'; -import { StatProvider } from 'pl-fe/contexts/stat-context'; -import { queryClient } from 'pl-fe/queries/client'; +import { StatProvider } from '@/contexts/stat-context'; +import { queryClient } from '@/queries/client'; import { preload } from '../actions/preload'; import { store } from '../store'; diff --git a/packages/pl-fe/src/jest/test-helpers.tsx b/packages/pl-fe/src/jest/test-helpers.tsx index 8c7e52a9b..1c4dcd756 100644 --- a/packages/pl-fe/src/jest/test-helpers.tsx +++ b/packages/pl-fe/src/jest/test-helpers.tsx @@ -10,13 +10,13 @@ import { MemoryRouter } from 'react-router-dom'; import { applyMiddleware, createStore } from 'redux'; import { thunk } from 'redux-thunk'; -import { ChatProvider } from 'pl-fe/contexts/chat-context'; -import { StatProvider } from 'pl-fe/contexts/stat-context'; -import { queryClient } from 'pl-fe/queries/client'; +import { ChatProvider } from '@/contexts/chat-context'; +import { StatProvider } from '@/contexts/stat-context'; +import { queryClient } from '@/queries/client'; import { default as rootReducer } from '../reducers'; -import type { AppDispatch } from 'pl-fe/store'; +import type { AppDispatch } from '@/store'; import type { Action, AnyAction } from 'redux'; // Mock Redux diff --git a/packages/pl-fe/src/jest/test-setup.ts b/packages/pl-fe/src/jest/test-setup.ts index b8d8504f9..42e2b7ca1 100644 --- a/packages/pl-fe/src/jest/test-setup.ts +++ b/packages/pl-fe/src/jest/test-setup.ts @@ -9,13 +9,13 @@ import 'fake-indexeddb/auto'; import { __clear as clearApiMocks } from '../api/__mocks__'; // API mocking -vi.mock('pl-fe/api'); +vi.mock('@/api'); afterEach(() => { clearApiMocks(); }); // Query mocking -vi.mock('pl-fe/queries/client'); +vi.mock('@/queries/client'); // Clear toasts after each test. afterEach(() => { diff --git a/packages/pl-fe/src/layouts/admin-layout.tsx b/packages/pl-fe/src/layouts/admin-layout.tsx index 50771ba12..f40b57290 100644 --- a/packages/pl-fe/src/layouts/admin-layout.tsx +++ b/packages/pl-fe/src/layouts/admin-layout.tsx @@ -1,8 +1,8 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import { LatestAccountsPanel } from 'pl-fe/features/ui/util/async-components'; +import Layout from '@/components/ui/layout'; +import { LatestAccountsPanel } from '@/features/ui/util/async-components'; import LinkFooter from '../features/ui/components/link-footer'; diff --git a/packages/pl-fe/src/layouts/default-layout.tsx b/packages/pl-fe/src/layouts/default-layout.tsx index 3e7e1c11d..1549c788f 100644 --- a/packages/pl-fe/src/layouts/default-layout.tsx +++ b/packages/pl-fe/src/layouts/default-layout.tsx @@ -1,15 +1,15 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; import { WhoToFollowPanel, TrendsPanel, SignUpPanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +} from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; const DefaultLayout: React.FC = () => { const me = useAppSelector(state => state.me); diff --git a/packages/pl-fe/src/layouts/empty-layout.tsx b/packages/pl-fe/src/layouts/empty-layout.tsx index 62402b2fe..6760886fb 100644 --- a/packages/pl-fe/src/layouts/empty-layout.tsx +++ b/packages/pl-fe/src/layouts/empty-layout.tsx @@ -1,7 +1,7 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; +import Layout from '@/components/ui/layout'; const EmptyLayout = () => ( <> diff --git a/packages/pl-fe/src/layouts/event-layout.tsx b/packages/pl-fe/src/layouts/event-layout.tsx index 5e3e5315e..e903bc8b0 100644 --- a/packages/pl-fe/src/layouts/event-layout.tsx +++ b/packages/pl-fe/src/layouts/event-layout.tsx @@ -3,21 +3,21 @@ import React from 'react'; import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; -import Column from 'pl-fe/components/ui/column'; -import Layout from 'pl-fe/components/ui/layout'; -import Tabs, { type Item } from 'pl-fe/components/ui/tabs'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import { layouts } from 'pl-fe/features/ui/router'; +import Column from '@/components/ui/column'; +import Layout from '@/components/ui/layout'; +import Tabs, { type Item } from '@/components/ui/tabs'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import LinkFooter from '@/features/ui/components/link-footer'; +import { layouts } from '@/features/ui/router'; import { EventHeader, SignUpPanel, TrendsPanel, WhoToFollowPanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { makeGetStatus } from 'pl-fe/selectors'; +} from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { makeGetStatus } from '@/selectors'; const getStatus = makeGetStatus(); diff --git a/packages/pl-fe/src/layouts/events-layout.tsx b/packages/pl-fe/src/layouts/events-layout.tsx index 1f79ab9bc..e15f31b7b 100644 --- a/packages/pl-fe/src/layouts/events-layout.tsx +++ b/packages/pl-fe/src/layouts/events-layout.tsx @@ -1,14 +1,14 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; import { WhoToFollowPanel, TrendsPanel, NewEventPanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +} from '@/features/ui/util/async-components'; +import { useFeatures } from '@/hooks/use-features'; /** Layout to display events list. */ const EventsLayout = () => { diff --git a/packages/pl-fe/src/layouts/external-login-layout.tsx b/packages/pl-fe/src/layouts/external-login-layout.tsx index da3d628bf..0a02e4b61 100644 --- a/packages/pl-fe/src/layouts/external-login-layout.tsx +++ b/packages/pl-fe/src/layouts/external-login-layout.tsx @@ -1,16 +1,16 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; import { WhoToFollowPanel, TrendsPanel, SignUpPanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { isStandalone } from 'pl-fe/utils/state'; +} from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { isStandalone } from '@/utils/state'; const ExternalLoginLayout = () => { const me = useAppSelector(state => state.me); diff --git a/packages/pl-fe/src/layouts/group-layout.tsx b/packages/pl-fe/src/layouts/group-layout.tsx index 79cd02e1c..e27e261ad 100644 --- a/packages/pl-fe/src/layouts/group-layout.tsx +++ b/packages/pl-fe/src/layouts/group-layout.tsx @@ -2,22 +2,22 @@ import { Outlet, useLocation } from '@tanstack/react-router'; import React, { useMemo } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import { useGroupMembershipRequests } from 'pl-fe/api/hooks/groups/use-group-membership-requests'; -import Column from 'pl-fe/components/ui/column'; -import Icon from 'pl-fe/components/ui/icon'; -import Layout from 'pl-fe/components/ui/layout'; -import Stack from 'pl-fe/components/ui/stack'; -import Tabs, { type Item } from 'pl-fe/components/ui/tabs'; -import Text from 'pl-fe/components/ui/text'; -import GroupHeader from 'pl-fe/features/group/components/group-header'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import { layouts } from 'pl-fe/features/ui/router'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import { useGroupMembershipRequests } from '@/api/hooks/groups/use-group-membership-requests'; +import Column from '@/components/ui/column'; +import Icon from '@/components/ui/icon'; +import Layout from '@/components/ui/layout'; +import Stack from '@/components/ui/stack'; +import Tabs, { type Item } from '@/components/ui/tabs'; +import Text from '@/components/ui/text'; +import GroupHeader from '@/features/group/components/group-header'; +import LinkFooter from '@/features/ui/components/link-footer'; +import { layouts } from '@/features/ui/router'; import { GroupMediaPanel, SignUpPanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; +} from '@/features/ui/util/async-components'; +import { useOwnAccount } from '@/hooks/use-own-account'; const messages = defineMessages({ all: { id: 'group.tabs.all', defaultMessage: 'All' }, diff --git a/packages/pl-fe/src/layouts/groups-layout.tsx b/packages/pl-fe/src/layouts/groups-layout.tsx index e56e54348..ac1b95139 100644 --- a/packages/pl-fe/src/layouts/groups-layout.tsx +++ b/packages/pl-fe/src/layouts/groups-layout.tsx @@ -1,10 +1,10 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Column from 'pl-fe/components/ui/column'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import { MyGroupsPanel, NewGroupPanel } from 'pl-fe/features/ui/util/async-components'; +import Column from '@/components/ui/column'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; +import { MyGroupsPanel, NewGroupPanel } from '@/features/ui/util/async-components'; /** Layout to display groups. */ const GroupsLayout = () => ( diff --git a/packages/pl-fe/src/layouts/home-layout.tsx b/packages/pl-fe/src/layouts/home-layout.tsx index 32f80df5e..52c5dea91 100644 --- a/packages/pl-fe/src/layouts/home-layout.tsx +++ b/packages/pl-fe/src/layouts/home-layout.tsx @@ -3,10 +3,10 @@ import clsx from 'clsx'; import React, { useRef } from 'react'; import { useIntl } from 'react-intl'; -import { uploadCompose } from 'pl-fe/actions/compose'; -import Avatar from 'pl-fe/components/ui/avatar'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; +import { uploadCompose } from '@/actions/compose'; +import Avatar from '@/components/ui/avatar'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; import { WhoToFollowPanel, TrendsPanel, @@ -16,14 +16,14 @@ import { BirthdayPanel, AnnouncementsPanel, ComposeForm, -} from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useDraggedFiles } from 'pl-fe/hooks/use-dragged-files'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { useSettings } from 'pl-fe/stores/settings'; +} from '@/features/ui/util/async-components'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useDraggedFiles } from '@/hooks/use-dragged-files'; +import { useFeatures } from '@/hooks/use-features'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { useSettings } from '@/stores/settings'; const HomeLayout = () => { const intl = useIntl(); diff --git a/packages/pl-fe/src/layouts/landing-layout.tsx b/packages/pl-fe/src/layouts/landing-layout.tsx index 585f1118e..f3d6acd5e 100644 --- a/packages/pl-fe/src/layouts/landing-layout.tsx +++ b/packages/pl-fe/src/layouts/landing-layout.tsx @@ -1,14 +1,14 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; import { TrendsPanel, SignUpPanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +} from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; const LandingLayout = () => { const me = useAppSelector(state => state.me); diff --git a/packages/pl-fe/src/layouts/manage-groups-layout.tsx b/packages/pl-fe/src/layouts/manage-groups-layout.tsx index 827e54930..5434dbdcd 100644 --- a/packages/pl-fe/src/layouts/manage-groups-layout.tsx +++ b/packages/pl-fe/src/layouts/manage-groups-layout.tsx @@ -1,9 +1,9 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import { MyGroupsPanel, NewGroupPanel } from 'pl-fe/features/ui/util/async-components'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; +import { MyGroupsPanel, NewGroupPanel } from '@/features/ui/util/async-components'; /** Layout to display groups. */ const ManageGroupsLayout = () => ( diff --git a/packages/pl-fe/src/layouts/profile-layout.tsx b/packages/pl-fe/src/layouts/profile-layout.tsx index 1694b1d2b..5f2a5bd9d 100644 --- a/packages/pl-fe/src/layouts/profile-layout.tsx +++ b/packages/pl-fe/src/layouts/profile-layout.tsx @@ -3,13 +3,13 @@ import React from 'react'; import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; -import { useAccountLookup } from 'pl-fe/api/hooks/accounts/use-account-lookup'; -import Column from 'pl-fe/components/ui/column'; -import Layout from 'pl-fe/components/ui/layout'; -import Tabs, { type Item } from 'pl-fe/components/ui/tabs'; -import Header from 'pl-fe/features/account/components/header'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import { layouts } from 'pl-fe/features/ui/router'; +import { useAccountLookup } from '@/api/hooks/accounts/use-account-lookup'; +import Column from '@/components/ui/column'; +import Layout from '@/components/ui/layout'; +import Tabs, { type Item } from '@/components/ui/tabs'; +import Header from '@/features/account/components/header'; +import LinkFooter from '@/features/ui/components/link-footer'; +import { layouts } from '@/features/ui/router'; import { WhoToFollowPanel, ProfileInfoPanel, @@ -18,10 +18,10 @@ import { SignUpPanel, PinnedAccountsPanel, AccountNotePanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useAcct } from 'pl-fe/hooks/use-acct'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +} from '@/features/ui/util/async-components'; +import { useAcct } from '@/hooks/use-acct'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; /** Layout to display a user's profile. */ const ProfileLayout: React.FC = () => { diff --git a/packages/pl-fe/src/layouts/remote-instance-layout.tsx b/packages/pl-fe/src/layouts/remote-instance-layout.tsx index d8f656b7c..a730d7a71 100644 --- a/packages/pl-fe/src/layouts/remote-instance-layout.tsx +++ b/packages/pl-fe/src/layouts/remote-instance-layout.tsx @@ -1,17 +1,17 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import { layouts } from 'pl-fe/features/ui/router'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; +import { layouts } from '@/features/ui/router'; import { PromoPanel, InstanceInfoPanel, InstanceModerationPanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { federationRestrictionsDisclosed } from 'pl-fe/utils/state'; +} from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { federationRestrictionsDisclosed } from '@/utils/state'; /** Layout for viewing a remote instance timeline. */ const RemoteInstanceLayout = () => { diff --git a/packages/pl-fe/src/layouts/search-layout.tsx b/packages/pl-fe/src/layouts/search-layout.tsx index 7b12f0568..90e4eb962 100644 --- a/packages/pl-fe/src/layouts/search-layout.tsx +++ b/packages/pl-fe/src/layouts/search-layout.tsx @@ -1,15 +1,15 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; import { WhoToFollowPanel, TrendsPanel, SignUpPanel, -} from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +} from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; const SearchLayout = () => { const me = useAppSelector(state => state.me); diff --git a/packages/pl-fe/src/layouts/status-layout.tsx b/packages/pl-fe/src/layouts/status-layout.tsx index 6b3fdbda9..8401ae2e1 100644 --- a/packages/pl-fe/src/layouts/status-layout.tsx +++ b/packages/pl-fe/src/layouts/status-layout.tsx @@ -1,11 +1,11 @@ import { Outlet } from '@tanstack/react-router'; import React from 'react'; -import Layout from 'pl-fe/components/ui/layout'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import { WhoToFollowPanel, TrendsPanel, SignUpPanel } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import Layout from '@/components/ui/layout'; +import LinkFooter from '@/features/ui/components/link-footer'; +import { WhoToFollowPanel, TrendsPanel, SignUpPanel } from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; const StatusLayout = () => { const me = useAppSelector(state => state.me); diff --git a/packages/pl-fe/src/main.tsx b/packages/pl-fe/src/main.tsx index 709e45090..fc9463d09 100644 --- a/packages/pl-fe/src/main.tsx +++ b/packages/pl-fe/src/main.tsx @@ -6,9 +6,9 @@ import './polyfills'; import React from 'react'; import { createRoot } from 'react-dom/client'; -import * as BuildConfig from 'pl-fe/build-config'; -import PlFe from 'pl-fe/init/pl-fe'; -import { printConsoleWarning } from 'pl-fe/utils/console'; +import * as BuildConfig from '@/build-config'; +import PlFe from '@/init/pl-fe'; +import { printConsoleWarning } from '@/utils/console'; import '@fontsource/inter/200.css'; import '@fontsource/inter/300.css'; diff --git a/packages/pl-fe/src/middleware/errors.ts b/packages/pl-fe/src/middleware/errors.ts index 0180cd931..13a54cd74 100644 --- a/packages/pl-fe/src/middleware/errors.ts +++ b/packages/pl-fe/src/middleware/errors.ts @@ -1,4 +1,4 @@ -import toast from 'pl-fe/toast'; +import toast from '@/toast'; import type { AnyAction, Middleware } from 'redux'; diff --git a/packages/pl-fe/src/middleware/sounds.ts b/packages/pl-fe/src/middleware/sounds.ts index 61eca76d6..b46069e86 100644 --- a/packages/pl-fe/src/middleware/sounds.ts +++ b/packages/pl-fe/src/middleware/sounds.ts @@ -1,6 +1,6 @@ -import { play, soundCache } from 'pl-fe/utils/sounds'; +import { play, soundCache } from '@/utils/sounds'; -import type { Sounds } from 'pl-fe/utils/sounds'; +import type { Sounds } from '@/utils/sounds'; import type { AnyAction, Middleware } from 'redux'; interface Action extends AnyAction { diff --git a/packages/pl-fe/src/modals/alt-text-modal.tsx b/packages/pl-fe/src/modals/alt-text-modal.tsx index 5398ef1f8..9ccec89f5 100644 --- a/packages/pl-fe/src/modals/alt-text-modal.tsx +++ b/packages/pl-fe/src/modals/alt-text-modal.tsx @@ -3,21 +3,21 @@ import clsx from 'clsx'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Blurhash from 'pl-fe/components/blurhash'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Icon from 'pl-fe/components/ui/icon'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Textarea from 'pl-fe/components/ui/textarea'; -import { MIMETYPE_ICONS } from 'pl-fe/components/upload'; -import { getPointerPosition } from 'pl-fe/features/video'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import toast from 'pl-fe/toast'; +import Blurhash from '@/components/blurhash'; +import FormGroup from '@/components/ui/form-group'; +import Icon from '@/components/ui/icon'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Textarea from '@/components/ui/textarea'; +import { MIMETYPE_ICONS } from '@/components/upload'; +import { getPointerPosition } from '@/features/video'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useFeatures } from '@/hooks/use-features'; +import toast from '@/toast'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { MediaAttachment } from 'pl-api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; type FocalPoint = [number, number]; diff --git a/packages/pl-fe/src/modals/antenna-editor-modal.tsx b/packages/pl-fe/src/modals/antenna-editor-modal.tsx index 3d5bb8eae..8dda2d41c 100644 --- a/packages/pl-fe/src/modals/antenna-editor-modal.tsx +++ b/packages/pl-fe/src/modals/antenna-editor-modal.tsx @@ -1,17 +1,17 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import { useAntenna, useCreateAntenna, useUpdateAntenna } from 'pl-fe/queries/accounts/use-antennas'; -import toast from 'pl-fe/toast'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import { useAntenna, useCreateAntenna, useUpdateAntenna } from '@/queries/accounts/use-antennas'; +import toast from '@/toast'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; type Tab = 'info' | 'accounts' | 'excludedAccounts'; diff --git a/packages/pl-fe/src/modals/birthdays-modal.tsx b/packages/pl-fe/src/modals/birthdays-modal.tsx index 949d043ea..eee9eb4e4 100644 --- a/packages/pl-fe/src/modals/birthdays-modal.tsx +++ b/packages/pl-fe/src/modals/birthdays-modal.tsx @@ -1,14 +1,14 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Account from 'pl-fe/features/birthdays/account'; -import { getCurrentDate } from 'pl-fe/features/ui/components/panels/birthday-panel'; -import { useBirthdayReminders } from 'pl-fe/queries/accounts/use-birthday-reminders'; +import ScrollableList from '@/components/scrollable-list'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import Account from '@/features/birthdays/account'; +import { getCurrentDate } from '@/features/ui/components/panels/birthday-panel'; +import { useBirthdayReminders } from '@/queries/accounts/use-birthday-reminders'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const BirthdaysModal = ({ onClose }: BaseModalProps) => { const [[day, month]] = useState(getCurrentDate); diff --git a/packages/pl-fe/src/modals/block-mute-modal.tsx b/packages/pl-fe/src/modals/block-mute-modal.tsx index dde1b4023..84dea3889 100644 --- a/packages/pl-fe/src/modals/block-mute-modal.tsx +++ b/packages/pl-fe/src/modals/block-mute-modal.tsx @@ -1,23 +1,23 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { initReport, ReportableEntities } from 'pl-fe/actions/reports'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import HStack from 'pl-fe/components/ui/hstack'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Textarea from 'pl-fe/components/ui/textarea'; -import Toggle from 'pl-fe/components/ui/toggle'; -import DurationSelector from 'pl-fe/features/compose/components/polls/duration-selector'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useBlockAccountMutation, useMuteAccountMutation, useUpdateAccountNoteMutation } from 'pl-fe/queries/accounts/use-relationship'; -import toast from 'pl-fe/toast'; +import { initReport, ReportableEntities } from '@/actions/reports'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import FormGroup from '@/components/ui/form-group'; +import HStack from '@/components/ui/hstack'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Textarea from '@/components/ui/textarea'; +import Toggle from '@/components/ui/toggle'; +import DurationSelector from '@/features/compose/components/polls/duration-selector'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useBlockAccountMutation, useMuteAccountMutation, useUpdateAccountNoteMutation } from '@/queries/accounts/use-relationship'; +import toast from '@/toast'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { BlockAccountParams, MuteAccountParams } from 'pl-api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; const messages = defineMessages({ notePlaceholder: { id: 'account_note.placeholder', defaultMessage: 'Add a note' }, diff --git a/packages/pl-fe/src/modals/boost-modal.tsx b/packages/pl-fe/src/modals/boost-modal.tsx index cc3345dd9..7d01dce75 100644 --- a/packages/pl-fe/src/modals/boost-modal.tsx +++ b/packages/pl-fe/src/modals/boost-modal.tsx @@ -1,15 +1,15 @@ import React, { useCallback } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import ReplyIndicator from 'pl-fe/features/compose/components/reply-indicator'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; +import Icon from '@/components/icon'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import ReplyIndicator from '@/features/compose/components/reply-indicator'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Un-repost' }, diff --git a/packages/pl-fe/src/modals/circle-editor-modal.tsx b/packages/pl-fe/src/modals/circle-editor-modal.tsx index b4d3f06d6..0e062ad35 100644 --- a/packages/pl-fe/src/modals/circle-editor-modal.tsx +++ b/packages/pl-fe/src/modals/circle-editor-modal.tsx @@ -1,18 +1,18 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAddAccountsToCircle, useCircle, useCircleAccounts, useRemoveAccountsFromCircle } from 'pl-fe/queries/accounts/use-circles'; -import { useAccountSearch } from 'pl-fe/queries/search/use-search-accounts'; +import { CardHeader, CardTitle } from '@/components/ui/card'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAddAccountsToCircle, useCircle, useCircleAccounts, useRemoveAccountsFromCircle } from '@/queries/accounts/use-circles'; +import { useAccountSearch } from '@/queries/search/use-search-accounts'; import Account from './list-editor-modal/components/account'; import Search from './list-editor-modal/components/search'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface CircleEditorModalProps { circleId: string; diff --git a/packages/pl-fe/src/modals/compare-history-modal.tsx b/packages/pl-fe/src/modals/compare-history-modal.tsx index 96b21bfbf..a06f6aa3b 100644 --- a/packages/pl-fe/src/modals/compare-history-modal.tsx +++ b/packages/pl-fe/src/modals/compare-history-modal.tsx @@ -1,18 +1,18 @@ import React from 'react'; import { FormattedDate, FormattedMessage } from 'react-intl'; -import AttachmentThumbs from 'pl-fe/components/attachment-thumbs'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import HStack from 'pl-fe/components/ui/hstack'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useStatusHistory } from 'pl-fe/queries/statuses/use-status-history'; +import AttachmentThumbs from '@/components/attachment-thumbs'; +import { ParsedContent } from '@/components/parsed-content'; +import HStack from '@/components/ui/hstack'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useStatusHistory } from '@/queries/statuses/use-status-history'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface CompareHistoryModalProps { statusId: string; diff --git a/packages/pl-fe/src/modals/component-modal.tsx b/packages/pl-fe/src/modals/component-modal.tsx index dcc5c1782..423b6f0dd 100644 --- a/packages/pl-fe/src/modals/component-modal.tsx +++ b/packages/pl-fe/src/modals/component-modal.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import Modal from 'pl-fe/components/ui/modal'; +import Modal from '@/components/ui/modal'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface ComponentModalProps { component: React.ComponentType; diff --git a/packages/pl-fe/src/modals/compose-interaction-policy-modal.tsx b/packages/pl-fe/src/modals/compose-interaction-policy-modal.tsx index 608b0410c..519b6283b 100644 --- a/packages/pl-fe/src/modals/compose-interaction-policy-modal.tsx +++ b/packages/pl-fe/src/modals/compose-interaction-policy-modal.tsx @@ -2,18 +2,18 @@ import { Link } from '@tanstack/react-router'; import React, { useEffect, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { changeComposeInteractionPolicyOption, changeComposeQuotePolicyOption } from 'pl-fe/actions/compose'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Warning from 'pl-fe/features/compose/components/warning'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { InteractionPolicyConfig, type Policy, type Rule, type Scope } from 'pl-fe/pages/settings/interaction-policies'; -import { useInteractionPolicies } from 'pl-fe/queries/settings/use-interaction-policies'; +import { changeComposeInteractionPolicyOption, changeComposeQuotePolicyOption } from '@/actions/compose'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Warning from '@/features/compose/components/warning'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useCompose } from '@/hooks/use-compose'; +import { InteractionPolicyConfig, type Policy, type Rule, type Scope } from '@/pages/settings/interaction-policies'; +import { useInteractionPolicies } from '@/queries/settings/use-interaction-policies'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { CreateStatusParams } from 'pl-api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; const MANAGABLE_VISIBILITIES = ['public', 'unlisted', 'private']; diff --git a/packages/pl-fe/src/modals/compose-modal.tsx b/packages/pl-fe/src/modals/compose-modal.tsx index 94502d059..d16eac574 100644 --- a/packages/pl-fe/src/modals/compose-modal.tsx +++ b/packages/pl-fe/src/modals/compose-modal.tsx @@ -2,17 +2,17 @@ import clsx from 'clsx'; import React, { useRef } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { cancelReplyCompose, uploadCompose } from 'pl-fe/actions/compose'; -import { checkComposeContent } from 'pl-fe/components/modal-root'; -import Modal from 'pl-fe/components/ui/modal'; -import { ComposeForm } from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useDraggedFiles } from 'pl-fe/hooks/use-dragged-files'; -import { usePersistDraftStatus } from 'pl-fe/queries/statuses/use-draft-statuses'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { cancelReplyCompose, uploadCompose } from '@/actions/compose'; +import { checkComposeContent } from '@/components/modal-root'; +import Modal from '@/components/ui/modal'; +import { ComposeForm } from '@/features/ui/util/async-components'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCompose } from '@/hooks/use-compose'; +import { useDraggedFiles } from '@/hooks/use-dragged-files'; +import { usePersistDraftStatus } from '@/queries/statuses/use-draft-statuses'; +import { useModalsActions } from '@/stores/modals'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ confirm: { id: 'confirmations.cancel.confirm', defaultMessage: 'Discard' }, diff --git a/packages/pl-fe/src/modals/confirmation-modal.tsx b/packages/pl-fe/src/modals/confirmation-modal.tsx index e633cf1e3..ea25f86e2 100644 --- a/packages/pl-fe/src/modals/confirmation-modal.tsx +++ b/packages/pl-fe/src/modals/confirmation-modal.tsx @@ -1,14 +1,14 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Toggle from 'pl-fe/components/ui/toggle'; +import List, { ListItem } from '@/components/list'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Toggle from '@/components/ui/toggle'; -import type { ButtonThemes } from 'pl-fe/components/ui/button/useButtonStyles'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { ButtonThemes } from '@/components/ui/button/useButtonStyles'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface ConfirmationModalProps { heading?: React.ReactNode; diff --git a/packages/pl-fe/src/modals/crypto-donate-modal.tsx b/packages/pl-fe/src/modals/crypto-donate-modal.tsx index 21a8f6682..b3af7b241 100644 --- a/packages/pl-fe/src/modals/crypto-donate-modal.tsx +++ b/packages/pl-fe/src/modals/crypto-donate-modal.tsx @@ -1,10 +1,10 @@ import React from 'react'; -import Modal from 'pl-fe/components/ui/modal'; -import DetailedCryptoAddress from 'pl-fe/features/crypto-donate/components/detailed-crypto-address'; +import Modal from '@/components/ui/modal'; +import DetailedCryptoAddress from '@/features/crypto-donate/components/detailed-crypto-address'; -import type { ICryptoAddress } from 'pl-fe/features/crypto-donate/components/crypto-address'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { ICryptoAddress } from '@/features/crypto-donate/components/crypto-address'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const CryptoDonateModal: React.FC = ({ onClose, ...props }) => { diff --git a/packages/pl-fe/src/modals/dislikes-modal.tsx b/packages/pl-fe/src/modals/dislikes-modal.tsx index c81098753..68de9091f 100644 --- a/packages/pl-fe/src/modals/dislikes-modal.tsx +++ b/packages/pl-fe/src/modals/dislikes-modal.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useStatusDislikes } from 'pl-fe/queries/statuses/use-status-interactions'; +import PullToRefresh from '@/components/pull-to-refresh'; +import ScrollableList from '@/components/scrollable-list'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import { useStatusDislikes } from '@/queries/statuses/use-status-interactions'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface DislikesModalProps { statusId: string; diff --git a/packages/pl-fe/src/modals/dropdown-menu-modal.tsx b/packages/pl-fe/src/modals/dropdown-menu-modal.tsx index b90b86081..0322bb4fa 100644 --- a/packages/pl-fe/src/modals/dropdown-menu-modal.tsx +++ b/packages/pl-fe/src/modals/dropdown-menu-modal.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface DropdownMenuModalProps { /** The element initiating opening the modal. */ diff --git a/packages/pl-fe/src/modals/edit-announcement-modal.tsx b/packages/pl-fe/src/modals/edit-announcement-modal.tsx index a752ea089..0d1067a55 100644 --- a/packages/pl-fe/src/modals/edit-announcement-modal.tsx +++ b/packages/pl-fe/src/modals/edit-announcement-modal.tsx @@ -1,20 +1,20 @@ import React, { useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Form from 'pl-fe/components/ui/form'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import HStack from 'pl-fe/components/ui/hstack'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Textarea from 'pl-fe/components/ui/textarea'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { DatePicker } from 'pl-fe/features/ui/util/async-components'; -import { useCreateAnnouncementMutation, useUpdateAnnouncementMutation } from 'pl-fe/queries/admin/use-announcements'; -import toast from 'pl-fe/toast'; +import Form from '@/components/ui/form'; +import FormGroup from '@/components/ui/form-group'; +import HStack from '@/components/ui/hstack'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Textarea from '@/components/ui/textarea'; +import Toggle from '@/components/ui/toggle'; +import { DatePicker } from '@/features/ui/util/async-components'; +import { useCreateAnnouncementMutation, useUpdateAnnouncementMutation } from '@/queries/admin/use-announcements'; +import toast from '@/toast'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { AdminAnnouncement } from 'pl-api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; const messages = defineMessages({ save: { id: 'admin.edit_announcement.save', defaultMessage: 'Save' }, diff --git a/packages/pl-fe/src/modals/edit-bookmark-folder-modal.tsx b/packages/pl-fe/src/modals/edit-bookmark-folder-modal.tsx index d4d3c932d..70ff8b78c 100644 --- a/packages/pl-fe/src/modals/edit-bookmark-folder-modal.tsx +++ b/packages/pl-fe/src/modals/edit-bookmark-folder-modal.tsx @@ -3,21 +3,21 @@ import React, { useState } from 'react'; import { createPortal } from 'react-dom'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Emoji from 'pl-fe/components/ui/emoji'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Input from 'pl-fe/components/ui/input'; -import Modal from 'pl-fe/components/ui/modal'; -import EmojiPickerDropdown from 'pl-fe/features/emoji/components/emoji-picker-dropdown'; -import { messages as emojiMessages } from 'pl-fe/features/emoji/containers/emoji-picker-dropdown-container'; -import { useTextField } from 'pl-fe/hooks/forms/use-text-field'; -import { useClickOutside } from 'pl-fe/hooks/use-click-outside'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useBookmarkFolder, useUpdateBookmarkFolder } from 'pl-fe/queries/statuses/use-bookmark-folders'; -import toast from 'pl-fe/toast'; +import Emoji from '@/components/ui/emoji'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Input from '@/components/ui/input'; +import Modal from '@/components/ui/modal'; +import EmojiPickerDropdown from '@/features/emoji/components/emoji-picker-dropdown'; +import { messages as emojiMessages } from '@/features/emoji/containers/emoji-picker-dropdown-container'; +import { useTextField } from '@/hooks/forms/use-text-field'; +import { useClickOutside } from '@/hooks/use-click-outside'; +import { useFeatures } from '@/hooks/use-features'; +import { useBookmarkFolder, useUpdateBookmarkFolder } from '@/queries/statuses/use-bookmark-folders'; +import toast from '@/toast'; -import type { Emoji as EmojiType } from 'pl-fe/features/emoji'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { Emoji as EmojiType } from '@/features/emoji'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ label: { id: 'bookmark_folders.new.title_placeholder', defaultMessage: 'New folder title' }, diff --git a/packages/pl-fe/src/modals/edit-domain-modal.tsx b/packages/pl-fe/src/modals/edit-domain-modal.tsx index 4c64d775c..f7575d89f 100644 --- a/packages/pl-fe/src/modals/edit-domain-modal.tsx +++ b/packages/pl-fe/src/modals/edit-domain-modal.tsx @@ -1,19 +1,19 @@ import React, { useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Form from 'pl-fe/components/ui/form'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { useDomains } from 'pl-fe/queries/admin/use-domains'; -import toast from 'pl-fe/toast'; +import Form from '@/components/ui/form'; +import FormGroup from '@/components/ui/form-group'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Toggle from '@/components/ui/toggle'; +import { useDomains } from '@/queries/admin/use-domains'; +import toast from '@/toast'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { AdminDomain } from 'pl-api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; const messages = defineMessages({ save: { id: 'admin.edit_domain.save', defaultMessage: 'Save' }, diff --git a/packages/pl-fe/src/modals/edit-federation-modal.tsx b/packages/pl-fe/src/modals/edit-federation-modal.tsx index c6bbff571..e09d52d40 100644 --- a/packages/pl-fe/src/modals/edit-federation-modal.tsx +++ b/packages/pl-fe/src/modals/edit-federation-modal.tsx @@ -1,16 +1,16 @@ import React, { useState, useEffect, useCallback } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { updateMrf } from 'pl-fe/actions/mrf'; -import List, { ListItem } from 'pl-fe/components/list'; -import Modal from 'pl-fe/components/ui/modal'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetRemoteInstance } from 'pl-fe/selectors'; -import toast from 'pl-fe/toast'; +import { updateMrf } from '@/actions/mrf'; +import List, { ListItem } from '@/components/list'; +import Modal from '@/components/ui/modal'; +import Toggle from '@/components/ui/toggle'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetRemoteInstance } from '@/selectors'; +import toast from '@/toast'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ mediaRemoval: { id: 'edit_federation.media_removal', defaultMessage: 'Strip media' }, diff --git a/packages/pl-fe/src/modals/edit-rule-modal.tsx b/packages/pl-fe/src/modals/edit-rule-modal.tsx index febf85ad1..a0c9d9c14 100644 --- a/packages/pl-fe/src/modals/edit-rule-modal.tsx +++ b/packages/pl-fe/src/modals/edit-rule-modal.tsx @@ -1,17 +1,17 @@ import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Form from 'pl-fe/components/ui/form'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Modal from 'pl-fe/components/ui/modal'; -import { useTextField } from 'pl-fe/hooks/forms/use-text-field'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useRules } from 'pl-fe/queries/admin/use-rules'; -import toast from 'pl-fe/toast'; +import Form from '@/components/ui/form'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Modal from '@/components/ui/modal'; +import { useTextField } from '@/hooks/forms/use-text-field'; +import { useFeatures } from '@/hooks/use-features'; +import { useRules } from '@/queries/admin/use-rules'; +import toast from '@/toast'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { AdminRule } from 'pl-api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; const messages = defineMessages({ save: { id: 'admin.edit_rule.save', defaultMessage: 'Save' }, diff --git a/packages/pl-fe/src/modals/embed-modal.tsx b/packages/pl-fe/src/modals/embed-modal.tsx index c35beb4aa..28906053d 100644 --- a/packages/pl-fe/src/modals/embed-modal.tsx +++ b/packages/pl-fe/src/modals/embed-modal.tsx @@ -1,15 +1,15 @@ import React, { useEffect } from 'react'; import { FormattedMessage } from 'react-intl'; -import CopyableInput from 'pl-fe/components/copyable-input'; -import SafeEmbed from 'pl-fe/components/safe-embed'; -import Divider from 'pl-fe/components/ui/divider'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import useEmbed from 'pl-fe/queries/embed'; +import CopyableInput from '@/components/copyable-input'; +import SafeEmbed from '@/components/safe-embed'; +import Divider from '@/components/ui/divider'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import useEmbed from '@/queries/embed'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface EmbedModalProps { url: string; diff --git a/packages/pl-fe/src/modals/event-map-modal.tsx b/packages/pl-fe/src/modals/event-map-modal.tsx index 39417de07..f05dfad5d 100644 --- a/packages/pl-fe/src/modals/event-map-modal.tsx +++ b/packages/pl-fe/src/modals/event-map-modal.tsx @@ -2,16 +2,16 @@ import L from 'leaflet'; import React, { useCallback, useEffect, useRef } from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { makeGetStatus } from 'pl-fe/selectors'; +import Button from '@/components/ui/button'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { makeGetStatus } from '@/selectors'; import 'leaflet/dist/leaflet.css'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; L.Icon.Default.mergeOptions({ iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'), diff --git a/packages/pl-fe/src/modals/event-participants-modal.tsx b/packages/pl-fe/src/modals/event-participants-modal.tsx index 8b69e7c7b..623aedbd6 100644 --- a/packages/pl-fe/src/modals/event-participants-modal.tsx +++ b/packages/pl-fe/src/modals/event-participants-modal.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useEventParticipations } from 'pl-fe/queries/events/use-event-participations'; +import PullToRefresh from '@/components/pull-to-refresh'; +import ScrollableList from '@/components/scrollable-list'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import { useEventParticipations } from '@/queries/events/use-event-participations'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface EventParticipantsModalProps { statusId: string; diff --git a/packages/pl-fe/src/modals/familiar-followers-modal.tsx b/packages/pl-fe/src/modals/familiar-followers-modal.tsx index 59335b2d1..b927ee885 100644 --- a/packages/pl-fe/src/modals/familiar-followers-modal.tsx +++ b/packages/pl-fe/src/modals/familiar-followers-modal.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import { useFamiliarFollowers } from 'pl-fe/queries/accounts/use-familiar-followers'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import ScrollableList from '@/components/scrollable-list'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import Emojify from '@/features/emoji/emojify'; +import { useFamiliarFollowers } from '@/queries/accounts/use-familiar-followers'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface FamiliarFollowersModalProps { accountId: string; diff --git a/packages/pl-fe/src/modals/favourites-modal.tsx b/packages/pl-fe/src/modals/favourites-modal.tsx index 7e345f845..d1fad9490 100644 --- a/packages/pl-fe/src/modals/favourites-modal.tsx +++ b/packages/pl-fe/src/modals/favourites-modal.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useStatusFavourites } from 'pl-fe/queries/statuses/use-status-interactions'; +import PullToRefresh from '@/components/pull-to-refresh'; +import ScrollableList from '@/components/scrollable-list'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import { useStatusFavourites } from '@/queries/statuses/use-status-interactions'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface FavouritesModalProps { statusId: string; diff --git a/packages/pl-fe/src/modals/hotkeys-modal.tsx b/packages/pl-fe/src/modals/hotkeys-modal.tsx index 303342166..77e68b3a0 100644 --- a/packages/pl-fe/src/modals/hotkeys-modal.tsx +++ b/packages/pl-fe/src/modals/hotkeys-modal.tsx @@ -2,11 +2,11 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Modal from 'pl-fe/components/ui/modal'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import Modal from '@/components/ui/modal'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const Hotkey: React.FC<{ children: React.ReactNode }> = ({ children }) => ( diff --git a/packages/pl-fe/src/modals/join-event-modal.tsx b/packages/pl-fe/src/modals/join-event-modal.tsx index 84b9037c3..99f4fa66d 100644 --- a/packages/pl-fe/src/modals/join-event-modal.tsx +++ b/packages/pl-fe/src/modals/join-event-modal.tsx @@ -1,12 +1,12 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Modal from 'pl-fe/components/ui/modal'; -import Textarea from 'pl-fe/components/ui/textarea'; -import { useJoinEventMutation } from 'pl-fe/queries/statuses/use-event-interactions'; +import FormGroup from '@/components/ui/form-group'; +import Modal from '@/components/ui/modal'; +import Textarea from '@/components/ui/textarea'; +import { useJoinEventMutation } from '@/queries/statuses/use-event-interactions'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ hint: { id: 'join_event.hint', defaultMessage: 'You can tell the organizer why do you want to participate in this event:' }, diff --git a/packages/pl-fe/src/modals/list-adder-modal/components/list.tsx b/packages/pl-fe/src/modals/list-adder-modal/components/list.tsx index fe9cb4f4c..c8d5f9ad0 100644 --- a/packages/pl-fe/src/modals/list-adder-modal/components/list.tsx +++ b/packages/pl-fe/src/modals/list-adder-modal/components/list.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { useAddAccountsToList, useList, useRemoveAccountsFromList } from 'pl-fe/queries/accounts/use-lists'; +import Icon from '@/components/icon'; +import IconButton from '@/components/ui/icon-button'; +import { useAddAccountsToList, useList, useRemoveAccountsFromList } from '@/queries/accounts/use-lists'; const messages = defineMessages({ remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' }, diff --git a/packages/pl-fe/src/modals/list-adder-modal/index.tsx b/packages/pl-fe/src/modals/list-adder-modal/index.tsx index 95163aee4..ae57be348 100644 --- a/packages/pl-fe/src/modals/list-adder-modal/index.tsx +++ b/packages/pl-fe/src/modals/list-adder-modal/index.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Modal from 'pl-fe/components/ui/modal'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { NewListForm, getOrderedLists } from 'pl-fe/pages/account-lists/lists'; -import { useLists, useListsForAccount } from 'pl-fe/queries/accounts/use-lists'; +import { CardHeader, CardTitle } from '@/components/ui/card'; +import Modal from '@/components/ui/modal'; +import AccountContainer from '@/containers/account-container'; +import { NewListForm, getOrderedLists } from '@/pages/account-lists/lists'; +import { useLists, useListsForAccount } from '@/queries/accounts/use-lists'; import List from './components/list'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ subheading: { id: 'lists.subheading', defaultMessage: 'Your lists' }, diff --git a/packages/pl-fe/src/modals/list-editor-modal/components/account.tsx b/packages/pl-fe/src/modals/list-editor-modal/components/account.tsx index 755cab0e0..7f030dd26 100644 --- a/packages/pl-fe/src/modals/list-editor-modal/components/account.tsx +++ b/packages/pl-fe/src/modals/list-editor-modal/components/account.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import HStack from 'pl-fe/components/ui/hstack'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import AccountContainer from 'pl-fe/containers/account-container'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import AccountContainer from '@/containers/account-container'; const messages = defineMessages({ remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' }, diff --git a/packages/pl-fe/src/modals/list-editor-modal/components/edit-list-form.tsx b/packages/pl-fe/src/modals/list-editor-modal/components/edit-list-form.tsx index 63eb26b6c..6eade537e 100644 --- a/packages/pl-fe/src/modals/list-editor-modal/components/edit-list-form.tsx +++ b/packages/pl-fe/src/modals/list-editor-modal/components/edit-list-form.tsx @@ -1,17 +1,17 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { SelectDropdown } from 'pl-fe/features/forms'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useList, useUpdateList } from 'pl-fe/queries/accounts/use-lists'; -import toast from 'pl-fe/toast'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Toggle from '@/components/ui/toggle'; +import { SelectDropdown } from '@/features/forms'; +import { useFeatures } from '@/hooks/use-features'; +import { useList, useUpdateList } from '@/queries/accounts/use-lists'; +import toast from '@/toast'; const messages = defineMessages({ repliesPolicyNone: { id: 'lists.replies_policy.none', defaultMessage: 'No one' }, diff --git a/packages/pl-fe/src/modals/list-editor-modal/components/list-members-form.tsx b/packages/pl-fe/src/modals/list-editor-modal/components/list-members-form.tsx index 82c6048ac..ff155ebc9 100644 --- a/packages/pl-fe/src/modals/list-editor-modal/components/list-members-form.tsx +++ b/packages/pl-fe/src/modals/list-editor-modal/components/list-members-form.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAddAccountsToList, useListAccounts, useRemoveAccountsFromList } from 'pl-fe/queries/accounts/use-lists'; -import { useAccountSearch } from 'pl-fe/queries/search/use-search-accounts'; +import { CardHeader, CardTitle } from '@/components/ui/card'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAddAccountsToList, useListAccounts, useRemoveAccountsFromList } from '@/queries/accounts/use-lists'; +import { useAccountSearch } from '@/queries/search/use-search-accounts'; import Account from './account'; import Search from './search'; diff --git a/packages/pl-fe/src/modals/list-editor-modal/components/search.tsx b/packages/pl-fe/src/modals/list-editor-modal/components/search.tsx index 6dc77268f..3ede4e6be 100644 --- a/packages/pl-fe/src/modals/list-editor-modal/components/search.tsx +++ b/packages/pl-fe/src/modals/list-editor-modal/components/search.tsx @@ -2,11 +2,11 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Icon from 'pl-fe/components/icon'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; +import Icon from '@/components/icon'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; const messages = defineMessages({ search: { id: 'lists.search', defaultMessage: 'Search among people you follow' }, diff --git a/packages/pl-fe/src/modals/list-editor-modal/index.tsx b/packages/pl-fe/src/modals/list-editor-modal/index.tsx index c01e1d242..655f8bf46 100644 --- a/packages/pl-fe/src/modals/list-editor-modal/index.tsx +++ b/packages/pl-fe/src/modals/list-editor-modal/index.tsx @@ -1,14 +1,14 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import { useList } from 'pl-fe/queries/accounts/use-lists'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import { useList } from '@/queries/accounts/use-lists'; import EditListForm from './components/edit-list-form'; import ListMembersForm from './components/list-members-form'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface ListEditorModalProps { listId: string; diff --git a/packages/pl-fe/src/modals/manage-group-modal/index.tsx b/packages/pl-fe/src/modals/manage-group-modal/index.tsx index bbc9e9c57..3ab3a95f7 100644 --- a/packages/pl-fe/src/modals/manage-group-modal/index.tsx +++ b/packages/pl-fe/src/modals/manage-group-modal/index.tsx @@ -2,17 +2,17 @@ import React, { useMemo, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import * as v from 'valibot'; -import { useCreateGroup } from 'pl-fe/api/hooks/groups/use-create-group'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import toast from 'pl-fe/toast'; +import { useCreateGroup } from '@/api/hooks/groups/use-create-group'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import toast from '@/toast'; import ConfirmationStep from './steps/confirmation-step'; import DetailsStep from './steps/details-step'; +import type { PlfeResponse } from '@/api'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { CreateGroupParams, Group } from 'pl-api'; -import type { PlfeResponse } from 'pl-fe/api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; const messages = defineMessages({ create: { id: 'manage_group.create', defaultMessage: 'Create group' }, diff --git a/packages/pl-fe/src/modals/manage-group-modal/steps/confirmation-step.tsx b/packages/pl-fe/src/modals/manage-group-modal/steps/confirmation-step.tsx index 82e7afc6d..05352b271 100644 --- a/packages/pl-fe/src/modals/manage-group-modal/steps/confirmation-step.tsx +++ b/packages/pl-fe/src/modals/manage-group-modal/steps/confirmation-step.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import Avatar from 'pl-fe/components/ui/avatar'; -import Button from 'pl-fe/components/ui/button'; -import Divider from 'pl-fe/components/ui/divider'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import toast from 'pl-fe/toast'; -import copy from 'pl-fe/utils/copy'; +import { ParsedContent } from '@/components/parsed-content'; +import Avatar from '@/components/ui/avatar'; +import Button from '@/components/ui/button'; +import Divider from '@/components/ui/divider'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import toast from '@/toast'; +import copy from '@/utils/copy'; import type { Group } from 'pl-api'; diff --git a/packages/pl-fe/src/modals/manage-group-modal/steps/details-step.tsx b/packages/pl-fe/src/modals/manage-group-modal/steps/details-step.tsx index 456f1c59f..e67fa228f 100644 --- a/packages/pl-fe/src/modals/manage-group-modal/steps/details-step.tsx +++ b/packages/pl-fe/src/modals/manage-group-modal/steps/details-step.tsx @@ -1,17 +1,17 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Form from 'pl-fe/components/ui/form'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Textarea from 'pl-fe/components/ui/textarea'; -import AvatarPicker from 'pl-fe/features/edit-profile/components/avatar-picker'; -import HeaderPicker from 'pl-fe/features/edit-profile/components/header-picker'; -import { usePreview } from 'pl-fe/hooks/forms/use-preview'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useSettings } from 'pl-fe/stores/settings'; -import resizeImage from 'pl-fe/utils/resize-image'; +import Form from '@/components/ui/form'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Textarea from '@/components/ui/textarea'; +import AvatarPicker from '@/features/edit-profile/components/avatar-picker'; +import HeaderPicker from '@/features/edit-profile/components/header-picker'; +import { usePreview } from '@/hooks/forms/use-preview'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useInstance } from '@/hooks/use-instance'; +import { useSettings } from '@/stores/settings'; +import resizeImage from '@/utils/resize-image'; import type { CreateGroupParams } from 'pl-api'; diff --git a/packages/pl-fe/src/modals/media-modal.tsx b/packages/pl-fe/src/modals/media-modal.tsx index 8c71b1ff5..985987332 100644 --- a/packages/pl-fe/src/modals/media-modal.tsx +++ b/packages/pl-fe/src/modals/media-modal.tsx @@ -5,26 +5,26 @@ import clsx from 'clsx'; import React, { type RefCallback, useCallback, useEffect, useMemo, useState } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import { fetchStatusWithContext } from 'pl-fe/actions/statuses'; -import ExtendedVideoPlayer from 'pl-fe/components/extended-video-player'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import StatusActionBar from 'pl-fe/components/status-action-bar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Audio from 'pl-fe/features/audio'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import Thread from 'pl-fe/features/status/components/thread'; -import ZoomableImage from 'pl-fe/features/ui/components/zoomable-image'; -import Video from 'pl-fe/features/video'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { userTouching } from 'pl-fe/is-mobile'; -import { makeGetStatus } from 'pl-fe/selectors'; +import { fetchStatusWithContext } from '@/actions/statuses'; +import ExtendedVideoPlayer from '@/components/extended-video-player'; +import MissingIndicator from '@/components/missing-indicator'; +import StatusActionBar from '@/components/status-action-bar'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Audio from '@/features/audio'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import Thread from '@/features/status/components/thread'; +import ZoomableImage from '@/features/ui/components/zoomable-image'; +import Video from '@/features/video'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { userTouching } from '@/is-mobile'; +import { makeGetStatus } from '@/selectors'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { MediaAttachment } from 'pl-api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; const MIN_SWIPE_DISTANCE = 400; diff --git a/packages/pl-fe/src/modals/mentions-modal.tsx b/packages/pl-fe/src/modals/mentions-modal.tsx index 83a707a74..bb41f1874 100644 --- a/packages/pl-fe/src/modals/mentions-modal.tsx +++ b/packages/pl-fe/src/modals/mentions-modal.tsx @@ -1,15 +1,15 @@ import React, { useCallback, useEffect } from 'react'; import { FormattedMessage, useIntl } from 'react-intl'; -import { fetchStatusWithContext } from 'pl-fe/actions/statuses'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Modal from 'pl-fe/components/ui/modal'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; +import { fetchStatusWithContext } from '@/actions/statuses'; +import ScrollableList from '@/components/scrollable-list'; +import Modal from '@/components/ui/modal'; +import AccountContainer from '@/containers/account-container'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface MentionsModalProps { statusId: string; diff --git a/packages/pl-fe/src/modals/missing-description-modal.tsx b/packages/pl-fe/src/modals/missing-description-modal.tsx index 5716d90a2..c28e3809f 100644 --- a/packages/pl-fe/src/modals/missing-description-modal.tsx +++ b/packages/pl-fe/src/modals/missing-description-modal.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Modal from 'pl-fe/components/ui/modal'; +import Modal from '@/components/ui/modal'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ modalTitle: { id: 'missing_description_modal.text', defaultMessage: 'You have not entered a description for all attachments. Continue anyway?' }, diff --git a/packages/pl-fe/src/modals/reactions-modal.tsx b/packages/pl-fe/src/modals/reactions-modal.tsx index 6b06b55ee..4c8312776 100644 --- a/packages/pl-fe/src/modals/reactions-modal.tsx +++ b/packages/pl-fe/src/modals/reactions-modal.tsx @@ -2,17 +2,17 @@ import clsx from 'clsx'; import React, { useMemo, useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Emoji from 'pl-fe/components/ui/emoji'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Tabs from 'pl-fe/components/ui/tabs'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useStatusReactions } from 'pl-fe/queries/statuses/use-status-interactions'; +import PullToRefresh from '@/components/pull-to-refresh'; +import ScrollableList from '@/components/scrollable-list'; +import Emoji from '@/components/ui/emoji'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import Tabs from '@/components/ui/tabs'; +import AccountContainer from '@/containers/account-container'; +import { useStatusReactions } from '@/queries/statuses/use-status-interactions'; -import type { Item } from 'pl-fe/components/ui/tabs'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { Item } from '@/components/ui/tabs'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ all: { id: 'reactions.all', defaultMessage: 'All' }, diff --git a/packages/pl-fe/src/modals/reblogs-modal.tsx b/packages/pl-fe/src/modals/reblogs-modal.tsx index fbbfb0514..e55b0ae93 100644 --- a/packages/pl-fe/src/modals/reblogs-modal.tsx +++ b/packages/pl-fe/src/modals/reblogs-modal.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useStatusReblogs } from 'pl-fe/queries/statuses/use-status-interactions'; +import PullToRefresh from '@/components/pull-to-refresh'; +import ScrollableList from '@/components/scrollable-list'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import { useStatusReblogs } from '@/queries/statuses/use-status-interactions'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface ReblogsModalProps { statusId: string; diff --git a/packages/pl-fe/src/modals/reply-mentions-modal.tsx b/packages/pl-fe/src/modals/reply-mentions-modal.tsx index cc4457747..721e20915 100644 --- a/packages/pl-fe/src/modals/reply-mentions-modal.tsx +++ b/packages/pl-fe/src/modals/reply-mentions-modal.tsx @@ -1,15 +1,15 @@ import React, { useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; -import Modal from 'pl-fe/components/ui/modal'; -import Account from 'pl-fe/features/reply-mentions/account'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useCompose } from 'pl-fe/hooks/use-compose'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { statusToMentionsAccountIdsArray } from 'pl-fe/reducers/compose'; -import { makeGetStatus } from 'pl-fe/selectors'; +import Modal from '@/components/ui/modal'; +import Account from '@/features/reply-mentions/account'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useCompose } from '@/hooks/use-compose'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { statusToMentionsAccountIdsArray } from '@/reducers/compose'; +import { makeGetStatus } from '@/selectors'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface ReplyMentionsModalProps { composeId: string; diff --git a/packages/pl-fe/src/modals/report-modal/components/status-check-box.tsx b/packages/pl-fe/src/modals/report-modal/components/status-check-box.tsx index cd8a9231f..bf7bf44d9 100644 --- a/packages/pl-fe/src/modals/report-modal/components/status-check-box.tsx +++ b/packages/pl-fe/src/modals/report-modal/components/status-check-box.tsx @@ -1,11 +1,11 @@ import noop from 'lodash/noop'; import React, { Suspense } from 'react'; -import StatusContent from 'pl-fe/components/status-content'; -import Stack from 'pl-fe/components/ui/stack'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { MediaGallery, Video, Audio } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import StatusContent from '@/components/status-content'; +import Stack from '@/components/ui/stack'; +import Toggle from '@/components/ui/toggle'; +import { MediaGallery, Video, Audio } from '@/features/ui/util/async-components'; +import { useAppSelector } from '@/hooks/use-app-selector'; interface IStatusCheckBox { id: string; diff --git a/packages/pl-fe/src/modals/report-modal/index.tsx b/packages/pl-fe/src/modals/report-modal/index.tsx index 4f02a5118..707815cce 100644 --- a/packages/pl-fe/src/modals/report-modal/index.tsx +++ b/packages/pl-fe/src/modals/report-modal/index.tsx @@ -1,26 +1,26 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { submitReport, ReportableEntities } from 'pl-fe/actions/reports'; -import { fetchAccountTimeline } from 'pl-fe/actions/timelines'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import AttachmentThumbs from 'pl-fe/components/attachment-thumbs'; -import StatusContent from 'pl-fe/components/status-content'; -import Modal from 'pl-fe/components/ui/modal'; -import ProgressBar from 'pl-fe/components/ui/progress-bar'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useBlockAccountMutation } from 'pl-fe/queries/accounts/use-relationship'; +import { submitReport, ReportableEntities } from '@/actions/reports'; +import { fetchAccountTimeline } from '@/actions/timelines'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import AttachmentThumbs from '@/components/attachment-thumbs'; +import StatusContent from '@/components/status-content'; +import Modal from '@/components/ui/modal'; +import ProgressBar from '@/components/ui/progress-bar'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import AccountContainer from '@/containers/account-container'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useInstance } from '@/hooks/use-instance'; +import { useBlockAccountMutation } from '@/queries/accounts/use-relationship'; import ConfirmationStep from './steps/confirmation-step'; import OtherActionsStep from './steps/other-actions-step'; import ReasonStep from './steps/reason-step'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ blankslate: { id: 'report.reason.blankslate', defaultMessage: 'You have removed all statuses from being selected.' }, diff --git a/packages/pl-fe/src/modals/report-modal/steps/confirmation-step.tsx b/packages/pl-fe/src/modals/report-modal/steps/confirmation-step.tsx index b5f02efd9..259f948ce 100644 --- a/packages/pl-fe/src/modals/report-modal/steps/confirmation-step.tsx +++ b/packages/pl-fe/src/modals/report-modal/steps/confirmation-step.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { getPlFeConfig } from 'pl-fe/actions/pl-fe'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; +import { getPlFeConfig } from '@/actions/pl-fe'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppSelector } from '@/hooks/use-app-selector'; const messages = defineMessages({ accountEntity: { id: 'report.confirmation.entity.account', defaultMessage: 'account' }, diff --git a/packages/pl-fe/src/modals/report-modal/steps/other-actions-step.tsx b/packages/pl-fe/src/modals/report-modal/steps/other-actions-step.tsx index 9174c9ff1..fdc491810 100644 --- a/packages/pl-fe/src/modals/report-modal/steps/other-actions-step.tsx +++ b/packages/pl-fe/src/modals/report-modal/steps/other-actions-step.tsx @@ -1,16 +1,16 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import StatusCheckBox from 'pl-fe/modals/report-modal/components/status-check-box'; -import { getDomain } from 'pl-fe/utils/accounts'; +import Button from '@/components/ui/button'; +import FormGroup from '@/components/ui/form-group'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Toggle from '@/components/ui/toggle'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import StatusCheckBox from '@/modals/report-modal/components/status-check-box'; +import { getDomain } from '@/utils/accounts'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/modals/report-modal/steps/reason-step.tsx b/packages/pl-fe/src/modals/report-modal/steps/reason-step.tsx index 694b204e4..6e1df3e77 100644 --- a/packages/pl-fe/src/modals/report-modal/steps/reason-step.tsx +++ b/packages/pl-fe/src/modals/report-modal/steps/reason-step.tsx @@ -2,11 +2,11 @@ import clsx from 'clsx'; import React, { useEffect, useRef, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Textarea from 'pl-fe/components/ui/textarea'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import FormGroup from '@/components/ui/form-group'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Textarea from '@/components/ui/textarea'; +import { useInstance } from '@/hooks/use-instance'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/modals/select-bookmark-folder-modal.tsx b/packages/pl-fe/src/modals/select-bookmark-folder-modal.tsx index 55f2e9822..59c7de1a7 100644 --- a/packages/pl-fe/src/modals/select-bookmark-folder-modal.tsx +++ b/packages/pl-fe/src/modals/select-bookmark-folder-modal.tsx @@ -3,23 +3,23 @@ import { BookmarkFolder } from 'pl-api'; import React, { useCallback, useDeferredValue, useMemo, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { ListItem } from 'pl-fe/components/list'; -import { RadioGroup, RadioItem } from 'pl-fe/components/radio'; -import Emoji from 'pl-fe/components/ui/emoji'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Modal from 'pl-fe/components/ui/modal'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { NewFolderForm } from 'pl-fe/pages/status-lists/bookmark-folders'; -import { useAddBookmarkToFolder, useBookmarkFolders, useRemoveBookmarkFromFolder, useStatusBookmarkFolders } from 'pl-fe/queries/statuses/use-bookmark-folders'; -import { useBookmarkStatus } from 'pl-fe/queries/statuses/use-status-interactions'; -import { makeGetStatus } from 'pl-fe/selectors'; +import { ListItem } from '@/components/list'; +import { RadioGroup, RadioItem } from '@/components/radio'; +import Emoji from '@/components/ui/emoji'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Modal from '@/components/ui/modal'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import Toggle from '@/components/ui/toggle'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { NewFolderForm } from '@/pages/status-lists/bookmark-folders'; +import { useAddBookmarkToFolder, useBookmarkFolders, useRemoveBookmarkFromFolder, useStatusBookmarkFolders } from '@/queries/statuses/use-bookmark-folders'; +import { useBookmarkStatus } from '@/queries/statuses/use-status-interactions'; +import { makeGetStatus } from '@/selectors'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface SelectBookmarkFolderModalProps { statusId: string; diff --git a/packages/pl-fe/src/modals/select-drive-file-modal.tsx b/packages/pl-fe/src/modals/select-drive-file-modal.tsx index eedbaaf79..d862fdc83 100644 --- a/packages/pl-fe/src/modals/select-drive-file-modal.tsx +++ b/packages/pl-fe/src/modals/select-drive-file-modal.tsx @@ -3,15 +3,15 @@ import clsx from 'clsx'; import React, { useMemo } from 'react'; import { FormattedMessage } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Icon from 'pl-fe/components/ui/icon'; -import Modal from 'pl-fe/components/ui/modal'; -import { MIMETYPE_ICONS } from 'pl-fe/components/upload'; -import { Breadcrumbs } from 'pl-fe/pages/drive/drive'; -import { useDriveFolderQuery } from 'pl-fe/queries/drive/use-drive-folder'; +import ScrollableList from '@/components/scrollable-list'; +import Icon from '@/components/ui/icon'; +import Modal from '@/components/ui/modal'; +import { MIMETYPE_ICONS } from '@/components/upload'; +import { Breadcrumbs } from '@/pages/drive/drive'; +import { useDriveFolderQuery } from '@/queries/drive/use-drive-folder'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; import type { DriveFile, DriveFolder } from 'pl-api'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; type SelectDriveFileModalProps = { disabled?: Array; diff --git a/packages/pl-fe/src/modals/text-field-modal.tsx b/packages/pl-fe/src/modals/text-field-modal.tsx index 8aa71cb2f..d22a8e50f 100644 --- a/packages/pl-fe/src/modals/text-field-modal.tsx +++ b/packages/pl-fe/src/modals/text-field-modal.tsx @@ -1,13 +1,13 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import Input from 'pl-fe/components/ui/input'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Textarea from 'pl-fe/components/ui/textarea'; +import Input from '@/components/ui/input'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Textarea from '@/components/ui/textarea'; -import type { ButtonThemes } from 'pl-fe/components/ui/button/useButtonStyles'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { ButtonThemes } from '@/components/ui/button/useButtonStyles'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; interface TextFieldModalProps { heading: React.ReactNode; diff --git a/packages/pl-fe/src/modals/unauthorized-modal.test.tsx b/packages/pl-fe/src/modals/unauthorized-modal.test.tsx index 4281d76cf..6a4377d9a 100644 --- a/packages/pl-fe/src/modals/unauthorized-modal.test.tsx +++ b/packages/pl-fe/src/modals/unauthorized-modal.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { storeOpen } from 'pl-fe/jest/mock-stores'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { storeOpen } from '@/jest/mock-stores'; +import { render, screen } from '@/jest/test-helpers'; import UnauthorizedModal from './unauthorized-modal'; diff --git a/packages/pl-fe/src/modals/unauthorized-modal.tsx b/packages/pl-fe/src/modals/unauthorized-modal.tsx index 7c9ea526d..cdb5134d3 100644 --- a/packages/pl-fe/src/modals/unauthorized-modal.tsx +++ b/packages/pl-fe/src/modals/unauthorized-modal.tsx @@ -2,21 +2,21 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useState } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import Input from 'pl-fe/components/ui/input'; -import Modal from 'pl-fe/components/ui/modal'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useRegistrationStatus } from 'pl-fe/hooks/use-registration-status'; -import { selectAccount } from 'pl-fe/selectors'; -import toast from 'pl-fe/toast'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import Input from '@/components/ui/input'; +import Modal from '@/components/ui/modal'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useRegistrationStatus } from '@/hooks/use-registration-status'; +import { selectAccount } from '@/selectors'; +import toast from '@/toast'; -import type { BaseModalProps } from 'pl-fe/features/ui/components/modal-root'; +import type { BaseModalProps } from '@/features/ui/components/modal-root'; const messages = defineMessages({ accountPlaceholder: { id: 'remote_interaction.account_placeholder', defaultMessage: 'Enter your username@domain you want to act from' }, diff --git a/packages/pl-fe/src/normalizers/pl-fe/pl-fe-config.ts b/packages/pl-fe/src/normalizers/pl-fe/pl-fe-config.ts index 43d85b589..98f10e6e9 100644 --- a/packages/pl-fe/src/normalizers/pl-fe/pl-fe-config.ts +++ b/packages/pl-fe/src/normalizers/pl-fe/pl-fe-config.ts @@ -1,8 +1,8 @@ import trimStart from 'lodash/trimStart'; import * as v from 'valibot'; -import { settingsSchema } from 'pl-fe/schemas/pl-fe/settings'; -import { coerceObject, filteredArray } from 'pl-fe/schemas/utils'; +import { settingsSchema } from '@/schemas/pl-fe/settings'; +import { coerceObject, filteredArray } from '@/schemas/utils'; const promoPanelItemSchema = coerceObject({ icon: v.fallback(v.string(), ''), diff --git a/packages/pl-fe/src/normalizers/status.ts b/packages/pl-fe/src/normalizers/status.ts index d0a4b5e02..e6abd08ea 100644 --- a/packages/pl-fe/src/normalizers/status.ts +++ b/packages/pl-fe/src/normalizers/status.ts @@ -6,7 +6,7 @@ import { type Account as BaseAccount, type Status as BaseStatus, type MediaAttachment, mentionSchema } from 'pl-api'; import * as v from 'valibot'; -import { unescapeHTML } from 'pl-fe/utils/html'; +import { unescapeHTML } from '@/utils/html'; const domParser = new DOMParser(); diff --git a/packages/pl-fe/src/pages/account-lists/antennas.tsx b/packages/pl-fe/src/pages/account-lists/antennas.tsx index 4fcea74e1..40f39c3fe 100644 --- a/packages/pl-fe/src/pages/account-lists/antennas.tsx +++ b/packages/pl-fe/src/pages/account-lists/antennas.tsx @@ -1,16 +1,16 @@ import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import List, { ListItem } from 'pl-fe/components/list'; -import Card from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import { useAntennas } from 'pl-fe/queries/accounts/use-antennas'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import DropdownMenu from '@/components/dropdown-menu'; +import List, { ListItem } from '@/components/list'; +import Card from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import { useAntennas } from '@/queries/accounts/use-antennas'; +import { useModalsActions } from '@/stores/modals'; import { getOrderedLists } from './lists'; diff --git a/packages/pl-fe/src/pages/account-lists/circles.tsx b/packages/pl-fe/src/pages/account-lists/circles.tsx index 6ecf637bd..c44973d5d 100644 --- a/packages/pl-fe/src/pages/account-lists/circles.tsx +++ b/packages/pl-fe/src/pages/account-lists/circles.tsx @@ -1,18 +1,18 @@ import React, { useState } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Card from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Input from 'pl-fe/components/ui/input'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import { getOrderedLists } from 'pl-fe/pages/account-lists/lists'; -import { useCircles, useCreateCircle } from 'pl-fe/queries/accounts/use-circles'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Card from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Input from '@/components/ui/input'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import { getOrderedLists } from '@/pages/account-lists/lists'; +import { useCircles, useCreateCircle } from '@/queries/accounts/use-circles'; const messages = defineMessages({ heading: { id: 'column.circles', defaultMessage: 'Circles' }, diff --git a/packages/pl-fe/src/pages/account-lists/directory.tsx b/packages/pl-fe/src/pages/account-lists/directory.tsx index 62162eba0..eb070a868 100644 --- a/packages/pl-fe/src/pages/account-lists/directory.tsx +++ b/packages/pl-fe/src/pages/account-lists/directory.tsx @@ -3,27 +3,27 @@ import clsx from 'clsx'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import Account from 'pl-fe/components/account'; -import Badge from 'pl-fe/components/badge'; -import HoverAccountWrapper from 'pl-fe/components/hover-account-wrapper'; -import LoadMore from 'pl-fe/components/load-more'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import { RadioGroup, RadioItem } from 'pl-fe/components/radio'; -import RelativeTimestamp from 'pl-fe/components/relative-timestamp'; -import StillImage from 'pl-fe/components/still-image'; -import Avatar from 'pl-fe/components/ui/avatar'; -import { CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import ActionButton from 'pl-fe/features/ui/components/action-button'; -import { directoryRoute } from 'pl-fe/features/ui/router'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useDirectory } from 'pl-fe/queries/accounts/use-directory'; -import { shortNumberFormat } from 'pl-fe/utils/numbers'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import Account from '@/components/account'; +import Badge from '@/components/badge'; +import HoverAccountWrapper from '@/components/hover-account-wrapper'; +import LoadMore from '@/components/load-more'; +import { ParsedContent } from '@/components/parsed-content'; +import { RadioGroup, RadioItem } from '@/components/radio'; +import RelativeTimestamp from '@/components/relative-timestamp'; +import StillImage from '@/components/still-image'; +import Avatar from '@/components/ui/avatar'; +import { CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import ActionButton from '@/features/ui/components/action-button'; +import { directoryRoute } from '@/features/ui/router'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useDirectory } from '@/queries/accounts/use-directory'; +import { shortNumberFormat } from '@/utils/numbers'; const messages = defineMessages({ title: { id: 'column.directory', defaultMessage: 'Profile directory' }, diff --git a/packages/pl-fe/src/pages/account-lists/follow-requests.tsx b/packages/pl-fe/src/pages/account-lists/follow-requests.tsx index 6ace7adb8..5270380fc 100644 --- a/packages/pl-fe/src/pages/account-lists/follow-requests.tsx +++ b/packages/pl-fe/src/pages/account-lists/follow-requests.tsx @@ -2,16 +2,16 @@ import { useMatch } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import Account from 'pl-fe/components/account'; -import { AuthorizeRejectButtons } from 'pl-fe/components/authorize-reject-buttons'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Tabs, { type Item } from 'pl-fe/components/ui/tabs'; -import { followRequestsRoute } from 'pl-fe/features/ui/router'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useAcceptFollowRequestMutation, useFollowRequests, useRejectFollowRequestMutation } from 'pl-fe/queries/accounts/use-follow-requests'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import Account from '@/components/account'; +import { AuthorizeRejectButtons } from '@/components/authorize-reject-buttons'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import Tabs, { type Item } from '@/components/ui/tabs'; +import { followRequestsRoute } from '@/features/ui/router'; +import { useFeatures } from '@/hooks/use-features'; +import { useAcceptFollowRequestMutation, useFollowRequests, useRejectFollowRequestMutation } from '@/queries/accounts/use-follow-requests'; const messages = defineMessages({ heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' }, diff --git a/packages/pl-fe/src/pages/account-lists/followers.tsx b/packages/pl-fe/src/pages/account-lists/followers.tsx index 5e1fac0ec..8a04eab65 100644 --- a/packages/pl-fe/src/pages/account-lists/followers.tsx +++ b/packages/pl-fe/src/pages/account-lists/followers.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useAccountLookup } from 'pl-fe/api/hooks/accounts/use-account-lookup'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { profileFollowersRoute } from 'pl-fe/features/ui/router'; -import { useFollowers } from 'pl-fe/queries/account-lists/use-follows'; +import { useAccountLookup } from '@/api/hooks/accounts/use-account-lookup'; +import MissingIndicator from '@/components/missing-indicator'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import { profileFollowersRoute } from '@/features/ui/router'; +import { useFollowers } from '@/queries/account-lists/use-follows'; const messages = defineMessages({ heading: { id: 'column.followers', defaultMessage: 'Followers' }, diff --git a/packages/pl-fe/src/pages/account-lists/following.tsx b/packages/pl-fe/src/pages/account-lists/following.tsx index d609acac3..ab6ea87b7 100644 --- a/packages/pl-fe/src/pages/account-lists/following.tsx +++ b/packages/pl-fe/src/pages/account-lists/following.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useAccountLookup } from 'pl-fe/api/hooks/accounts/use-account-lookup'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { profileFollowingRoute } from 'pl-fe/features/ui/router'; -import { useFollowing } from 'pl-fe/queries/account-lists/use-follows'; +import { useAccountLookup } from '@/api/hooks/accounts/use-account-lookup'; +import MissingIndicator from '@/components/missing-indicator'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import { profileFollowingRoute } from '@/features/ui/router'; +import { useFollowing } from '@/queries/account-lists/use-follows'; const messages = defineMessages({ heading: { id: 'column.following', defaultMessage: 'Following' }, diff --git a/packages/pl-fe/src/pages/account-lists/lists.tsx b/packages/pl-fe/src/pages/account-lists/lists.tsx index 19023b261..da6cc5cd9 100644 --- a/packages/pl-fe/src/pages/account-lists/lists.tsx +++ b/packages/pl-fe/src/pages/account-lists/lists.tsx @@ -1,17 +1,17 @@ import React, { useState } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Card from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Input from 'pl-fe/components/ui/input'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import { useCreateList, useLists } from 'pl-fe/queries/accounts/use-lists'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Card from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Input from '@/components/ui/input'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import { useCreateList, useLists } from '@/queries/accounts/use-lists'; import type { List as ListEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/account-lists/outgoing-follow-requests.tsx b/packages/pl-fe/src/pages/account-lists/outgoing-follow-requests.tsx index 9448f0f75..6584f4c0e 100644 --- a/packages/pl-fe/src/pages/account-lists/outgoing-follow-requests.tsx +++ b/packages/pl-fe/src/pages/account-lists/outgoing-follow-requests.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useOutgoingFollowRequests } from 'pl-fe/queries/accounts/use-follow-requests'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import { useOutgoingFollowRequests } from '@/queries/accounts/use-follow-requests'; import { FollowRequestsTabs } from './follow-requests'; diff --git a/packages/pl-fe/src/pages/accounts/account-gallery.tsx b/packages/pl-fe/src/pages/accounts/account-gallery.tsx index 1076f4c31..ae05e07d3 100644 --- a/packages/pl-fe/src/pages/accounts/account-gallery.tsx +++ b/packages/pl-fe/src/pages/accounts/account-gallery.tsx @@ -3,20 +3,20 @@ import clsx from 'clsx'; import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import { useAccountLookup } from 'pl-fe/api/hooks/accounts/use-account-lookup'; -import Blurhash from 'pl-fe/components/blurhash'; -import Icon from 'pl-fe/components/icon'; -import LoadMore from 'pl-fe/components/load-more'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import StillImage from 'pl-fe/components/still-image'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import { profileMediaRoute } from 'pl-fe/features/ui/router'; -import { type AccountGalleryAttachment, useAccountGallery } from 'pl-fe/hooks/use-account-gallery'; -import { isIOS } from 'pl-fe/is-mobile'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { useSettings } from 'pl-fe/stores/settings'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import { useAccountLookup } from '@/api/hooks/accounts/use-account-lookup'; +import Blurhash from '@/components/blurhash'; +import Icon from '@/components/icon'; +import LoadMore from '@/components/load-more'; +import MissingIndicator from '@/components/missing-indicator'; +import StillImage from '@/components/still-image'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import { profileMediaRoute } from '@/features/ui/router'; +import { type AccountGalleryAttachment, useAccountGallery } from '@/hooks/use-account-gallery'; +import { isIOS } from '@/is-mobile'; +import { useModalsActions } from '@/stores/modals'; +import { useSettings } from '@/stores/settings'; interface IMediaItem { attachment: AccountGalleryAttachment; diff --git a/packages/pl-fe/src/pages/accounts/account-timeline.tsx b/packages/pl-fe/src/pages/accounts/account-timeline.tsx index 03c10d0e4..ce639a256 100644 --- a/packages/pl-fe/src/pages/accounts/account-timeline.tsx +++ b/packages/pl-fe/src/pages/accounts/account-timeline.tsx @@ -1,20 +1,20 @@ import React, { useEffect, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { fetchAccountByUsername } from 'pl-fe/actions/accounts'; -import { fetchAccountTimeline } from 'pl-fe/actions/timelines'; -import { useAccountLookup } from 'pl-fe/api/hooks/accounts/use-account-lookup'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import StatusList from 'pl-fe/components/status-list'; -import Card, { CardBody } from 'pl-fe/components/ui/card'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Text from 'pl-fe/components/ui/text'; -import { profileRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { makeGetStatusIds } from 'pl-fe/selectors'; -import { useSettings } from 'pl-fe/stores/settings'; +import { fetchAccountByUsername } from '@/actions/accounts'; +import { fetchAccountTimeline } from '@/actions/timelines'; +import { useAccountLookup } from '@/api/hooks/accounts/use-account-lookup'; +import MissingIndicator from '@/components/missing-indicator'; +import StatusList from '@/components/status-list'; +import Card, { CardBody } from '@/components/ui/card'; +import Spinner from '@/components/ui/spinner'; +import Text from '@/components/ui/text'; +import { profileRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { makeGetStatusIds } from '@/selectors'; +import { useSettings } from '@/stores/settings'; const getStatusIds = makeGetStatusIds(); diff --git a/packages/pl-fe/src/pages/auth/external-login.tsx b/packages/pl-fe/src/pages/auth/external-login.tsx index deaa122a0..864245830 100644 --- a/packages/pl-fe/src/pages/auth/external-login.tsx +++ b/packages/pl-fe/src/pages/auth/external-login.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { BigCard } from 'pl-fe/components/big-card'; -import ExternalLoginForm from 'pl-fe/features/external-login/components/external-login-form'; +import { BigCard } from '@/components/big-card'; +import ExternalLoginForm from '@/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/pages/auth/login.test.tsx b/packages/pl-fe/src/pages/auth/login.test.tsx index 882edb12f..e9306f70c 100644 --- a/packages/pl-fe/src/pages/auth/login.test.tsx +++ b/packages/pl-fe/src/pages/auth/login.test.tsx @@ -2,7 +2,7 @@ import { instanceSchema } from 'pl-api'; import React from 'react'; import * as v from 'valibot'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import LoginPage from './login'; diff --git a/packages/pl-fe/src/pages/auth/login.tsx b/packages/pl-fe/src/pages/auth/login.tsx index 93ba8396d..7dc58596b 100644 --- a/packages/pl-fe/src/pages/auth/login.tsx +++ b/packages/pl-fe/src/pages/auth/login.tsx @@ -2,22 +2,22 @@ import { Navigate } from '@tanstack/react-router'; import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { logIn, verifyCredentials, switchAccount } from 'pl-fe/actions/auth'; -import { fetchInstance } from 'pl-fe/actions/instance'; -import { BigCard } from 'pl-fe/components/big-card'; -import Button from 'pl-fe/components/ui/button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import ConsumersList from 'pl-fe/features/auth-login/components/consumers-list'; -import LoginForm from 'pl-fe/features/auth-login/components/login-form'; -import OtpAuthForm from 'pl-fe/features/auth-login/components/otp-auth-form'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import { getRedirectUrl } from 'pl-fe/utils/redirect'; -import { isStandalone } from 'pl-fe/utils/state'; +import { logIn, verifyCredentials, switchAccount } from '@/actions/auth'; +import { fetchInstance } from '@/actions/instance'; +import { BigCard } from '@/components/big-card'; +import Button from '@/components/ui/button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import ConsumersList from '@/features/auth-login/components/consumers-list'; +import LoginForm from '@/features/auth-login/components/login-form'; +import OtpAuthForm from '@/features/auth-login/components/otp-auth-form'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useModalsActions } from '@/stores/modals'; +import { getRedirectUrl } from '@/utils/redirect'; +import { isStandalone } from '@/utils/state'; -import type { PlfeResponse } from 'pl-fe/api'; +import type { PlfeResponse } from '@/api'; const LoginPage = () => { const dispatch = useAppDispatch(); diff --git a/packages/pl-fe/src/pages/auth/logout.tsx b/packages/pl-fe/src/pages/auth/logout.tsx index 2f2ac5d3b..2a50111f6 100644 --- a/packages/pl-fe/src/pages/auth/logout.tsx +++ b/packages/pl-fe/src/pages/auth/logout.tsx @@ -2,8 +2,8 @@ import { Navigate } from '@tanstack/react-router'; import React, { useEffect, useState } from 'react'; import { useDispatch } from 'react-redux'; -import { logOut } from 'pl-fe/actions/auth'; -import Spinner from 'pl-fe/components/ui/spinner'; +import { logOut } from '@/actions/auth'; +import Spinner from '@/components/ui/spinner'; /** Component that logs the user out when rendered */ const LogoutPage: React.FC = () => { diff --git a/packages/pl-fe/src/pages/auth/password-reset.tsx b/packages/pl-fe/src/pages/auth/password-reset.tsx index ba2ffe0e0..e71a263d9 100644 --- a/packages/pl-fe/src/pages/auth/password-reset.tsx +++ b/packages/pl-fe/src/pages/auth/password-reset.tsx @@ -2,16 +2,16 @@ import { Navigate } from '@tanstack/react-router'; import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { resetPassword } from 'pl-fe/actions/security'; -import { BigCard } from 'pl-fe/components/big-card'; -import Button from 'pl-fe/components/ui/button'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import toast from 'pl-fe/toast'; +import { resetPassword } from '@/actions/security'; +import { BigCard } from '@/components/big-card'; +import Button from '@/components/ui/button'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import toast from '@/toast'; const messages = defineMessages({ nicknameOrEmail: { id: 'password_reset.fields.username_placeholder', defaultMessage: 'Email or username' }, diff --git a/packages/pl-fe/src/pages/auth/register-with-invite.tsx b/packages/pl-fe/src/pages/auth/register-with-invite.tsx index 64978c277..5e8eccead 100644 --- a/packages/pl-fe/src/pages/auth/register-with-invite.tsx +++ b/packages/pl-fe/src/pages/auth/register-with-invite.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { BigCard } from 'pl-fe/components/big-card'; -import RegistrationForm from 'pl-fe/features/auth-login/components/registration-form'; -import { inviteRoute } from 'pl-fe/features/ui/router'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import { BigCard } from '@/components/big-card'; +import RegistrationForm from '@/features/auth-login/components/registration-form'; +import { inviteRoute } from '@/features/ui/router'; +import { useInstance } from '@/hooks/use-instance'; /** Page to register with an invitation. */ const RegisterWithInvitePage: React.FC = () => { diff --git a/packages/pl-fe/src/pages/auth/registration.tsx b/packages/pl-fe/src/pages/auth/registration.tsx index 21c7d0840..05de07689 100644 --- a/packages/pl-fe/src/pages/auth/registration.tsx +++ b/packages/pl-fe/src/pages/auth/registration.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { BigCard } from 'pl-fe/components/big-card'; -import Text from 'pl-fe/components/ui/text'; -import RegistrationForm from 'pl-fe/features/auth-login/components/registration-form'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useRegistrationStatus } from 'pl-fe/hooks/use-registration-status'; +import { BigCard } from '@/components/big-card'; +import Text from '@/components/ui/text'; +import RegistrationForm from '@/features/auth-login/components/registration-form'; +import { useInstance } from '@/hooks/use-instance'; +import { useRegistrationStatus } from '@/hooks/use-registration-status'; const RegistrationPage: React.FC = () => { const instance = useInstance(); diff --git a/packages/pl-fe/src/pages/chats/chats.tsx b/packages/pl-fe/src/pages/chats/chats.tsx index 8f3064635..4c5e6af9b 100644 --- a/packages/pl-fe/src/pages/chats/chats.tsx +++ b/packages/pl-fe/src/pages/chats/chats.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { ChatProvider } from 'pl-fe/contexts/chat-context'; -import ChatsPage from 'pl-fe/features/chats/components/chats-page/chats-page'; +import { ChatProvider } from '@/contexts/chat-context'; +import ChatsPage from '@/features/chats/components/chats-page/chats-page'; const ChatIndex: React.FC = () => ( diff --git a/packages/pl-fe/src/pages/dashboard/account.tsx b/packages/pl-fe/src/pages/dashboard/account.tsx index a68854f70..8ac127e5d 100644 --- a/packages/pl-fe/src/pages/dashboard/account.tsx +++ b/packages/pl-fe/src/pages/dashboard/account.tsx @@ -2,30 +2,30 @@ import { PLEROMA } from 'pl-api'; import React, { ChangeEventHandler, useMemo, useState } from 'react'; import { defineMessages, FormattedMessage, type MessageDescriptor, useIntl } from 'react-intl'; -import { setBadges as saveBadges, setRole } from 'pl-fe/actions/admin'; -import { deactivateUserModal, deleteUserModal } from 'pl-fe/actions/moderation'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import { useSuggest } from 'pl-fe/api/hooks/admin/use-suggest'; -import { useVerify } from 'pl-fe/api/hooks/admin/use-verify'; -import Account from 'pl-fe/components/account'; -import List, { ListItem } from 'pl-fe/components/list'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import OutlineBox from 'pl-fe/components/outline-box'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import TagInput from 'pl-fe/components/ui/tag-input'; -import Text from 'pl-fe/components/ui/text'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { SelectDropdown } from 'pl-fe/features/forms'; -import ColumnLoading from 'pl-fe/features/ui/components/column-loading'; -import { adminAccountRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import toast from 'pl-fe/toast'; -import { badgeToTag, tagToBadge, getBadges } from 'pl-fe/utils/badges'; +import { setBadges as saveBadges, setRole } from '@/actions/admin'; +import { deactivateUserModal, deleteUserModal } from '@/actions/moderation'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import { useSuggest } from '@/api/hooks/admin/use-suggest'; +import { useVerify } from '@/api/hooks/admin/use-verify'; +import Account from '@/components/account'; +import List, { ListItem } from '@/components/list'; +import MissingIndicator from '@/components/missing-indicator'; +import OutlineBox from '@/components/outline-box'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import TagInput from '@/components/ui/tag-input'; +import Text from '@/components/ui/text'; +import Toggle from '@/components/ui/toggle'; +import { SelectDropdown } from '@/features/forms'; +import ColumnLoading from '@/features/ui/components/column-loading'; +import { adminAccountRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import toast from '@/toast'; +import { badgeToTag, tagToBadge, getBadges } from '@/utils/badges'; import type { Account as AccountEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/dashboard/announcements.tsx b/packages/pl-fe/src/pages/dashboard/announcements.tsx index cdf61b66b..4a619a6d8 100644 --- a/packages/pl-fe/src/pages/dashboard/announcements.tsx +++ b/packages/pl-fe/src/pages/dashboard/announcements.tsx @@ -1,16 +1,16 @@ import React from 'react'; import { FormattedDate, FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAnnouncements, useDeleteAnnouncementMutation } from 'pl-fe/queries/admin/use-announcements'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { ParsedContent } from '@/components/parsed-content'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAnnouncements, useDeleteAnnouncementMutation } from '@/queries/admin/use-announcements'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; import type { AdminAnnouncement } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/dashboard/awaiting-approval.tsx b/packages/pl-fe/src/pages/dashboard/awaiting-approval.tsx index 743fbaa3c..c8ff0e4ff 100644 --- a/packages/pl-fe/src/pages/dashboard/awaiting-approval.tsx +++ b/packages/pl-fe/src/pages/dashboard/awaiting-approval.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react'; 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 ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import UnapprovedAccount from '@/features/admin/components/unapproved-account'; +import { useAdminAccounts } from '@/queries/admin/use-accounts'; const messages = defineMessages({ heading: { id: 'column.admin.awaiting_approval', defaultMessage: 'Awaiting approval' }, diff --git a/packages/pl-fe/src/pages/dashboard/dashboard.tsx b/packages/pl-fe/src/pages/dashboard/dashboard.tsx index 8a9220fb2..e785d4de3 100644 --- a/packages/pl-fe/src/pages/dashboard/dashboard.tsx +++ b/packages/pl-fe/src/pages/dashboard/dashboard.tsx @@ -1,22 +1,22 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, FormattedNumber, useIntl } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -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'; -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 List, { ListItem } from '@/components/list'; +import { CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import { Counter } from '@/features/admin/components/counter'; +import { DashCounter, DashCounters } from '@/features/admin/components/dashcounter'; +import { Dimension } from '@/features/admin/components/dimension'; +import RegistrationModePicker from '@/features/admin/components/registration-mode-picker'; +import { Retention } from '@/features/admin/components/retention'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { usePendingUsersCount } from '@/queries/admin/use-accounts'; +import { usePendingReportsCount } from '@/queries/admin/use-reports'; +import sourceCode from '@/utils/code'; const messages = defineMessages({ heading: { id: 'column.admin.dashboard', defaultMessage: 'Dashboard' }, diff --git a/packages/pl-fe/src/pages/dashboard/domains.tsx b/packages/pl-fe/src/pages/dashboard/domains.tsx index cab7ac381..dc42aa608 100644 --- a/packages/pl-fe/src/pages/dashboard/domains.tsx +++ b/packages/pl-fe/src/pages/dashboard/domains.tsx @@ -1,17 +1,17 @@ import React, { useEffect } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { dateFormatOptions } from 'pl-fe/components/relative-timestamp'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Indicator from 'pl-fe/features/developers/components/indicator'; -import { useDomains } from 'pl-fe/queries/admin/use-domains'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { dateFormatOptions } from '@/components/relative-timestamp'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Indicator from '@/features/developers/components/indicator'; +import { useDomains } from '@/queries/admin/use-domains'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; import type { AdminDomain as DomainEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/dashboard/moderation-log.tsx b/packages/pl-fe/src/pages/dashboard/moderation-log.tsx index e78a3e243..fb5f14b92 100644 --- a/packages/pl-fe/src/pages/dashboard/moderation-log.tsx +++ b/packages/pl-fe/src/pages/dashboard/moderation-log.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { defineMessages, FormattedDate, FormattedMessage, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useModerationLog } from 'pl-fe/queries/admin/use-moderation-log'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useModerationLog } from '@/queries/admin/use-moderation-log'; import type { AdminModerationLogEntry } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx b/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx index bf7ddbd25..7d885b1b5 100644 --- a/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx +++ b/packages/pl-fe/src/pages/dashboard/pl-fe-config.tsx @@ -3,32 +3,32 @@ import React, { useState, useEffect, useMemo } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import * as v from 'valibot'; -import { updatePlFeConfig } from 'pl-fe/actions/admin'; -import { uploadMedia } from 'pl-fe/actions/media'; -import List, { ListItem } from 'pl-fe/components/list'; -import Accordion from 'pl-fe/components/ui/accordion'; -import Button from 'pl-fe/components/ui/button'; -import { CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import FileInput from 'pl-fe/components/ui/file-input'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -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 SitePreview from 'pl-fe/features/pl-fe-config/components/site-preview'; -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'; -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 { updatePlFeConfig } from '@/actions/admin'; +import { uploadMedia } from '@/actions/media'; +import List, { ListItem } from '@/components/list'; +import Accordion from '@/components/ui/accordion'; +import Button from '@/components/ui/button'; +import { CardHeader, CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import FileInput from '@/components/ui/file-input'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Select from '@/components/ui/select'; +import Streamfield from '@/components/ui/streamfield'; +import Textarea from '@/components/ui/textarea'; +import Toggle from '@/components/ui/toggle'; +import CryptoAddressInput from '@/features/pl-fe-config/components/crypto-address-input'; +import FooterLinkInput from '@/features/pl-fe-config/components/footer-link-input'; +import PromoPanelInput from '@/features/pl-fe-config/components/promo-panel-input'; +import SitePreview from '@/features/pl-fe-config/components/site-preview'; +import ThemeSelector from '@/features/ui/components/theme-selector'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { cryptoAddressSchema, footerItemSchema, plFeConfigSchema, promoPanelItemSchema, type PlFeConfig } from '@/normalizers/pl-fe/pl-fe-config'; +import toast from '@/toast'; const messages = defineMessages({ heading: { id: 'column.plfe_config', defaultMessage: 'Front-end configuration' }, diff --git a/packages/pl-fe/src/pages/dashboard/relays.tsx b/packages/pl-fe/src/pages/dashboard/relays.tsx index 5751f8866..72713a176 100644 --- a/packages/pl-fe/src/pages/dashboard/relays.tsx +++ b/packages/pl-fe/src/pages/dashboard/relays.tsx @@ -1,17 +1,17 @@ import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useTextField } from 'pl-fe/hooks/forms/use-text-field'; -import { useRelays } from 'pl-fe/queries/admin/use-relays'; -import toast from 'pl-fe/toast'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useTextField } from '@/hooks/forms/use-text-field'; +import { useRelays } from '@/queries/admin/use-relays'; +import toast from '@/toast'; import type { AdminRelay as RelayEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/dashboard/report.tsx b/packages/pl-fe/src/pages/dashboard/report.tsx index b0797b944..8a5236288 100644 --- a/packages/pl-fe/src/pages/dashboard/report.tsx +++ b/packages/pl-fe/src/pages/dashboard/report.tsx @@ -3,25 +3,25 @@ import React, { useCallback, useState } from 'react'; import { defineMessages, FormattedDate, FormattedMessage, useIntl } from 'react-intl'; import ReactSwipeableViews from 'react-swipeable-views'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import Account from 'pl-fe/components/account'; -import List, { ListItem } from 'pl-fe/components/list'; -import Card from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import StatusContainer from 'pl-fe/containers/status-container'; -import ColumnLoading from 'pl-fe/features/ui/components/column-loading'; -import { adminReportRoute } from 'pl-fe/features/ui/router'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useReopenReport, useReport, useResolveReport, useSelfAssignReport, useUnassignReport } from 'pl-fe/queries/admin/use-reports'; -import { makeGetReport } from 'pl-fe/selectors'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import Account from '@/components/account'; +import List, { ListItem } from '@/components/list'; +import Card from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import StatusContainer from '@/containers/status-container'; +import ColumnLoading from '@/features/ui/components/column-loading'; +import { adminReportRoute } from '@/features/ui/router'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useReopenReport, useReport, useResolveReport, useSelfAssignReport, useUnassignReport } from '@/queries/admin/use-reports'; +import { makeGetReport } from '@/selectors'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; const messages = defineMessages({ columnHeading: { id: 'column.report', defaultMessage: 'Report #{id}' }, diff --git a/packages/pl-fe/src/pages/dashboard/reports.tsx b/packages/pl-fe/src/pages/dashboard/reports.tsx index 7bb674b83..2378ea22f 100644 --- a/packages/pl-fe/src/pages/dashboard/reports.tsx +++ b/packages/pl-fe/src/pages/dashboard/reports.tsx @@ -2,15 +2,15 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, FormattedList, FormattedMessage, useIntl } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -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 { useAccount } from '@/api/hooks/accounts/use-account'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Text from '@/components/ui/text'; +import Report from '@/features/admin/components/report'; +import { adminReportsRoute } from '@/features/ui/router'; +import { useReports } from '@/queries/admin/use-reports'; const messages = defineMessages({ heading: { id: 'column.admin.reports', defaultMessage: 'Reports' }, diff --git a/packages/pl-fe/src/pages/dashboard/rules.tsx b/packages/pl-fe/src/pages/dashboard/rules.tsx index e5ad93189..504a97312 100644 --- a/packages/pl-fe/src/pages/dashboard/rules.tsx +++ b/packages/pl-fe/src/pages/dashboard/rules.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useRules } from 'pl-fe/queries/admin/use-rules'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useRules } from '@/queries/admin/use-rules'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; import type { AdminRule } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/dashboard/theme-editor.tsx b/packages/pl-fe/src/pages/dashboard/theme-editor.tsx index 9c46917f1..78969ef6e 100644 --- a/packages/pl-fe/src/pages/dashboard/theme-editor.tsx +++ b/packages/pl-fe/src/pages/dashboard/theme-editor.tsx @@ -2,24 +2,24 @@ import React, { useRef, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import * as v from 'valibot'; -import { updatePlFeConfig } from 'pl-fe/actions/admin'; -import { getHost } from 'pl-fe/actions/instance'; -import { fetchPlFeConfig } from 'pl-fe/actions/pl-fe'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import ColorPicker from 'pl-fe/features/pl-fe-config/components/color-picker'; -import Palette, { ColorGroup } from 'pl-fe/features/theme-editor/components/palette'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { normalizeColors } from 'pl-fe/hooks/use-theme-css'; -import { plFeConfigSchema } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; -import toast from 'pl-fe/toast'; -import { download } from 'pl-fe/utils/download'; +import { updatePlFeConfig } from '@/actions/admin'; +import { getHost } from '@/actions/instance'; +import { fetchPlFeConfig } from '@/actions/pl-fe'; +import DropdownMenu from '@/components/dropdown-menu'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import ColorPicker from '@/features/pl-fe-config/components/color-picker'; +import Palette, { ColorGroup } from '@/features/theme-editor/components/palette'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { normalizeColors } from '@/hooks/use-theme-css'; +import { plFeConfigSchema } from '@/normalizers/pl-fe/pl-fe-config'; +import toast from '@/toast'; +import { download } from '@/utils/download'; import type { ColorChangeHandler } from 'react-color'; diff --git a/packages/pl-fe/src/pages/dashboard/user-index.tsx b/packages/pl-fe/src/pages/dashboard/user-index.tsx index 070b4409b..61c2cafc3 100644 --- a/packages/pl-fe/src/pages/dashboard/user-index.tsx +++ b/packages/pl-fe/src/pages/dashboard/user-index.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { adminUsersRoute } from 'pl-fe/features/ui/router'; -import { useAdminAccounts } from 'pl-fe/queries/admin/use-accounts'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import AccountContainer from '@/containers/account-container'; +import { adminUsersRoute } from '@/features/ui/router'; +import { useAdminAccounts } from '@/queries/admin/use-accounts'; import { SearchInput } from '../search/search'; diff --git a/packages/pl-fe/src/pages/developers/create-app.tsx b/packages/pl-fe/src/pages/developers/create-app.tsx index a2cef1a2a..4e2803eb4 100644 --- a/packages/pl-fe/src/pages/developers/create-app.tsx +++ b/packages/pl-fe/src/pages/developers/create-app.tsx @@ -1,19 +1,19 @@ import React, { useState } from 'react'; import { useIntl, FormattedMessage, defineMessages } from 'react-intl'; -import { createApp } from 'pl-fe/actions/apps'; -import { obtainOAuthToken } from 'pl-fe/actions/oauth'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Textarea from 'pl-fe/components/ui/textarea'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { getBaseURL } from 'pl-fe/utils/accounts'; +import { createApp } from '@/actions/apps'; +import { obtainOAuthToken } from '@/actions/oauth'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Textarea from '@/components/ui/textarea'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { getBaseURL } from '@/utils/accounts'; import type { CredentialApplication, Token } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/developers/developers.tsx b/packages/pl-fe/src/pages/developers/developers.tsx index 9583cb5ab..484aedc9f 100644 --- a/packages/pl-fe/src/pages/developers/developers.tsx +++ b/packages/pl-fe/src/pages/developers/developers.tsx @@ -2,11 +2,11 @@ import { Link, type LinkOptions } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import Column from 'pl-fe/components/ui/column'; -import SvgIcon from 'pl-fe/components/ui/svg-icon'; -import Text from 'pl-fe/components/ui/text'; -import toast from 'pl-fe/toast'; -import sourceCode from 'pl-fe/utils/code'; +import Column from '@/components/ui/column'; +import SvgIcon from '@/components/ui/svg-icon'; +import Text from '@/components/ui/text'; +import toast from '@/toast'; +import sourceCode from '@/utils/code'; const messages = defineMessages({ heading: { id: 'column.developers', defaultMessage: 'Developers' }, diff --git a/packages/pl-fe/src/pages/developers/service-worker-info.tsx b/packages/pl-fe/src/pages/developers/service-worker-info.tsx index 77eb5c17e..0d2f7bcf8 100644 --- a/packages/pl-fe/src/pages/developers/service-worker-info.tsx +++ b/packages/pl-fe/src/pages/developers/service-worker-info.tsx @@ -1,16 +1,16 @@ import React, { useEffect, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Indicator from 'pl-fe/features/developers/components/indicator'; -import { unregisterSW } from 'pl-fe/utils/sw'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import FormActions from '@/components/ui/form-actions'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Indicator from '@/features/developers/components/indicator'; +import { unregisterSW } from '@/utils/sw'; const messages = defineMessages({ heading: { id: 'column.developers.service_worker', defaultMessage: 'Service Worker' }, diff --git a/packages/pl-fe/src/pages/developers/settings-store.tsx b/packages/pl-fe/src/pages/developers/settings-store.tsx index cf6023674..de128dea6 100644 --- a/packages/pl-fe/src/pages/developers/settings-store.tsx +++ b/packages/pl-fe/src/pages/developers/settings-store.tsx @@ -1,19 +1,19 @@ import React, { useState, useEffect } from 'react'; import { useIntl, FormattedMessage, defineMessages } from 'react-intl'; -import { changeSetting, updateSettingsStore } from 'pl-fe/actions/settings'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import { CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Textarea from 'pl-fe/components/ui/textarea'; -import SettingToggle from 'pl-fe/features/settings/components/setting-toggle'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useSettingsStore, useSettingsStoreActions } from 'pl-fe/stores/settings'; -import toast from 'pl-fe/toast'; +import { changeSetting, updateSettingsStore } from '@/actions/settings'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import { CardHeader, CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Textarea from '@/components/ui/textarea'; +import SettingToggle from '@/features/settings/components/setting-toggle'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useSettingsStore, useSettingsStoreActions } from '@/stores/settings'; +import toast from '@/toast'; const isJSONValid = (text: any): boolean => { try { diff --git a/packages/pl-fe/src/pages/drive/drive.tsx b/packages/pl-fe/src/pages/drive/drive.tsx index cb7f7abc3..d77e7d79e 100644 --- a/packages/pl-fe/src/pages/drive/drive.tsx +++ b/packages/pl-fe/src/pages/drive/drive.tsx @@ -6,19 +6,19 @@ import React, { useMemo } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import * as v from 'valibot'; -import DropdownMenu, { Menu } from 'pl-fe/components/dropdown-menu'; -import { EmptyMessage } from 'pl-fe/components/empty-message'; -import Column from 'pl-fe/components/ui/column'; -import Icon from 'pl-fe/components/ui/icon'; -import IconButton from 'pl-fe/components/ui/icon-button'; -import { MIMETYPE_ICONS } from 'pl-fe/components/upload'; -import ColumnLoading from 'pl-fe/features/ui/components/column-loading'; -import { driveRoute } from 'pl-fe/features/ui/router'; -import { useCreateDriveFileMutation, useDeleteDriveFileMutation, useMoveDriveFileMutation, useUpdateDriveFileMutation } from 'pl-fe/queries/drive/use-drive-file'; -import { useCreateDriveFolderMutation, useDeleteDriveFolderMutation, useDriveFolderQuery, useMoveDriveFolderMutation, useUpdateDriveFolderMutation } from 'pl-fe/queries/drive/use-drive-folder'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; -import { download } from 'pl-fe/utils/download'; +import DropdownMenu, { Menu } from '@/components/dropdown-menu'; +import { EmptyMessage } from '@/components/empty-message'; +import Column from '@/components/ui/column'; +import Icon from '@/components/ui/icon'; +import IconButton from '@/components/ui/icon-button'; +import { MIMETYPE_ICONS } from '@/components/upload'; +import ColumnLoading from '@/features/ui/components/column-loading'; +import { driveRoute } from '@/features/ui/router'; +import { useCreateDriveFileMutation, useDeleteDriveFileMutation, useMoveDriveFileMutation, useUpdateDriveFileMutation } from '@/queries/drive/use-drive-file'; +import { useCreateDriveFolderMutation, useDeleteDriveFolderMutation, useDriveFolderQuery, useMoveDriveFolderMutation, useUpdateDriveFolderMutation } from '@/queries/drive/use-drive-folder'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; +import { download } from '@/utils/download'; const messages = defineMessages({ heading: { id: 'column.drive', defaultMessage: 'Drive' }, diff --git a/packages/pl-fe/src/pages/fun/circle.tsx b/packages/pl-fe/src/pages/fun/circle.tsx index c88cd2d8e..a4519f3dc 100644 --- a/packages/pl-fe/src/pages/fun/circle.tsx +++ b/packages/pl-fe/src/pages/fun/circle.tsx @@ -2,27 +2,27 @@ import { Link } from '@tanstack/react-router'; import React, { useEffect, useRef, useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { processCircle } from 'pl-fe/actions/circle'; -import { resetCompose, uploadComposeSuccess, uploadFile } from 'pl-fe/actions/compose'; -import Account from 'pl-fe/components/account'; -import Accordion from 'pl-fe/components/ui/accordion'; -import Avatar from 'pl-fe/components/ui/avatar'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import HStack from 'pl-fe/components/ui/hstack'; -import ProgressBar from 'pl-fe/components/ui/progress-bar'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { processCircle } from '@/actions/circle'; +import { resetCompose, uploadComposeSuccess, uploadFile } from '@/actions/compose'; +import Account from '@/components/account'; +import Accordion from '@/components/ui/accordion'; +import Avatar from '@/components/ui/avatar'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import HStack from '@/components/ui/hstack'; +import ProgressBar from '@/components/ui/progress-bar'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; const toRad = (x: number) => x * (Math.PI / 180); -const avatarMissing: string = require('pl-fe/assets/images/avatar-missing.png'); +const avatarMissing: string = require('@/assets/images/avatar-missing.png'); const HEIGHT = 1000; const WIDTH = 1000; diff --git a/packages/pl-fe/src/pages/groups/edit-group.tsx b/packages/pl-fe/src/pages/groups/edit-group.tsx index e729804e3..f618522e1 100644 --- a/packages/pl-fe/src/pages/groups/edit-group.tsx +++ b/packages/pl-fe/src/pages/groups/edit-group.tsx @@ -1,26 +1,26 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import { useUpdateGroup } from 'pl-fe/api/hooks/groups/use-update-group'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Icon from 'pl-fe/components/ui/icon'; -import Input from 'pl-fe/components/ui/input'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Textarea from 'pl-fe/components/ui/textarea'; -import AvatarPicker from 'pl-fe/features/edit-profile/components/avatar-picker'; -import HeaderPicker from 'pl-fe/features/edit-profile/components/header-picker'; -import { editGroupRoute } from 'pl-fe/features/ui/router'; -import { useImageField } from 'pl-fe/hooks/forms/use-image-field'; -import { useTextField } from 'pl-fe/hooks/forms/use-text-field'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import toast from 'pl-fe/toast'; -import { unescapeHTML } from 'pl-fe/utils/html'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import { useUpdateGroup } from '@/api/hooks/groups/use-update-group'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Icon from '@/components/ui/icon'; +import Input from '@/components/ui/input'; +import Spinner from '@/components/ui/spinner'; +import Textarea from '@/components/ui/textarea'; +import AvatarPicker from '@/features/edit-profile/components/avatar-picker'; +import HeaderPicker from '@/features/edit-profile/components/header-picker'; +import { editGroupRoute } from '@/features/ui/router'; +import { useImageField } from '@/hooks/forms/use-image-field'; +import { useTextField } from '@/hooks/forms/use-text-field'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useInstance } from '@/hooks/use-instance'; +import toast from '@/toast'; +import { unescapeHTML } from '@/utils/html'; const messages = defineMessages({ heading: { id: 'navigation_bar.edit_group', defaultMessage: 'Edit Group' }, diff --git a/packages/pl-fe/src/pages/groups/group-blocked-members.tsx b/packages/pl-fe/src/pages/groups/group-blocked-members.tsx index 9e91218f2..03caed719 100644 --- a/packages/pl-fe/src/pages/groups/group-blocked-members.tsx +++ b/packages/pl-fe/src/pages/groups/group-blocked-members.tsx @@ -1,18 +1,18 @@ import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import Account from 'pl-fe/components/account'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Spinner from 'pl-fe/components/ui/spinner'; -import ColumnForbidden from 'pl-fe/features/ui/components/column-forbidden'; -import { groupBlocksRoute } from 'pl-fe/features/ui/router'; -import { useGroupBlocks, useUnblockGroupUserMutation } from 'pl-fe/queries/groups/use-group-blocks'; -import toast from 'pl-fe/toast'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import Account from '@/components/account'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Spinner from '@/components/ui/spinner'; +import ColumnForbidden from '@/features/ui/components/column-forbidden'; +import { groupBlocksRoute } from '@/features/ui/router'; +import { useGroupBlocks, useUnblockGroupUserMutation } from '@/queries/groups/use-group-blocks'; +import toast from '@/toast'; const messages = defineMessages({ heading: { id: 'column.group_blocked_members', defaultMessage: 'Banned members' }, diff --git a/packages/pl-fe/src/pages/groups/group-gallery.tsx b/packages/pl-fe/src/pages/groups/group-gallery.tsx index 6dcf91f2f..6054e397b 100644 --- a/packages/pl-fe/src/pages/groups/group-gallery.tsx +++ b/packages/pl-fe/src/pages/groups/group-gallery.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import LoadMore from 'pl-fe/components/load-more'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import { groupGalleryRoute } from 'pl-fe/features/ui/router'; -import { type AccountGalleryAttachment, useGroupGallery } from 'pl-fe/hooks/use-account-gallery'; -import { MediaItem } from 'pl-fe/pages/accounts/account-gallery'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import LoadMore from '@/components/load-more'; +import MissingIndicator from '@/components/missing-indicator'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import { groupGalleryRoute } from '@/features/ui/router'; +import { type AccountGalleryAttachment, useGroupGallery } from '@/hooks/use-account-gallery'; +import { MediaItem } from '@/pages/accounts/account-gallery'; +import { useModalsActions } from '@/stores/modals'; const GroupGallery: React.FC = () => { const { groupId } = groupGalleryRoute.useParams(); diff --git a/packages/pl-fe/src/pages/groups/group-members.tsx b/packages/pl-fe/src/pages/groups/group-members.tsx index ba0fc1f10..ccd684d0e 100644 --- a/packages/pl-fe/src/pages/groups/group-members.tsx +++ b/packages/pl-fe/src/pages/groups/group-members.tsx @@ -2,14 +2,14 @@ import clsx from 'clsx'; import { GroupRoles } from 'pl-api'; import React, { useMemo } from 'react'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import { useGroupMembershipRequests } from 'pl-fe/api/hooks/groups/use-group-membership-requests'; -import { PendingItemsRow } from 'pl-fe/components/pending-items-row'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import GroupMemberListItem from 'pl-fe/features/group/components/group-member-list-item'; -import PlaceholderAccount from 'pl-fe/features/placeholder/components/placeholder-account'; -import { groupMembersRoute } from 'pl-fe/features/ui/router'; -import { useGroupMembers } from 'pl-fe/queries/groups/use-group-members'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import { useGroupMembershipRequests } from '@/api/hooks/groups/use-group-membership-requests'; +import { PendingItemsRow } from '@/components/pending-items-row'; +import ScrollableList from '@/components/scrollable-list'; +import GroupMemberListItem from '@/features/group/components/group-member-list-item'; +import PlaceholderAccount from '@/features/placeholder/components/placeholder-account'; +import { groupMembersRoute } from '@/features/ui/router'; +import { useGroupMembers } from '@/queries/groups/use-group-members'; const GroupMembers: React.FC = () => { const { groupId } = groupMembersRoute.useParams(); diff --git a/packages/pl-fe/src/pages/groups/group-membership-requests.tsx b/packages/pl-fe/src/pages/groups/group-membership-requests.tsx index 5c82579b8..515e03d63 100644 --- a/packages/pl-fe/src/pages/groups/group-membership-requests.tsx +++ b/packages/pl-fe/src/pages/groups/group-membership-requests.tsx @@ -1,20 +1,20 @@ import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import { useGroupMembershipRequests } from 'pl-fe/api/hooks/groups/use-group-membership-requests'; -import Account from 'pl-fe/components/account'; -import { AuthorizeRejectButtons } from 'pl-fe/components/authorize-reject-buttons'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Spinner from 'pl-fe/components/ui/spinner'; -import ColumnForbidden from 'pl-fe/features/ui/components/column-forbidden'; -import { groupMembershipRequestsRoute } from 'pl-fe/features/ui/router'; -import toast from 'pl-fe/toast'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import { useGroupMembershipRequests } from '@/api/hooks/groups/use-group-membership-requests'; +import Account from '@/components/account'; +import { AuthorizeRejectButtons } from '@/components/authorize-reject-buttons'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Spinner from '@/components/ui/spinner'; +import ColumnForbidden from '@/features/ui/components/column-forbidden'; +import { groupMembershipRequestsRoute } from '@/features/ui/router'; +import toast from '@/toast'; +import type { PlfeResponse } from '@/api'; import type { Account as AccountEntity } from 'pl-api'; -import type { PlfeResponse } from 'pl-fe/api'; const messages = defineMessages({ heading: { id: 'column.group_pending_requests', defaultMessage: 'Pending requests' }, diff --git a/packages/pl-fe/src/pages/groups/groups.tsx b/packages/pl-fe/src/pages/groups/groups.tsx index 3e13d7fe7..92fbe4be0 100644 --- a/packages/pl-fe/src/pages/groups/groups.tsx +++ b/packages/pl-fe/src/pages/groups/groups.tsx @@ -2,14 +2,14 @@ import { Link } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { useGroups } from 'pl-fe/api/hooks/groups/use-groups'; -import GroupCard from 'pl-fe/components/group-card'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import PlaceholderGroupCard from 'pl-fe/features/placeholder/components/placeholder-group-card'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { useGroups } from '@/api/hooks/groups/use-groups'; +import GroupCard from '@/components/group-card'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import PlaceholderGroupCard from '@/features/placeholder/components/placeholder-group-card'; +import { useModalsActions } from '@/stores/modals'; const Groups: React.FC = () => { const { openModal } = useModalsActions(); diff --git a/packages/pl-fe/src/pages/groups/manage-group.tsx b/packages/pl-fe/src/pages/groups/manage-group.tsx index f4fb6916e..3f74e3853 100644 --- a/packages/pl-fe/src/pages/groups/manage-group.tsx +++ b/packages/pl-fe/src/pages/groups/manage-group.tsx @@ -3,18 +3,18 @@ import { GroupRoles } from 'pl-api'; import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useDeleteGroup } from 'pl-fe/api/hooks/groups/use-delete-group'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import List, { ListItem } from 'pl-fe/components/list'; -import { CardBody, CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Text from 'pl-fe/components/ui/text'; -import Emojify from 'pl-fe/features/emoji/emojify'; -import ColumnForbidden from 'pl-fe/features/ui/components/column-forbidden'; -import { manageGroupRoute } from 'pl-fe/features/ui/router'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import { useDeleteGroup } from '@/api/hooks/groups/use-delete-group'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import List, { ListItem } from '@/components/list'; +import { CardBody, CardHeader, CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import Text from '@/components/ui/text'; +import Emojify from '@/features/emoji/emojify'; +import ColumnForbidden from '@/features/ui/components/column-forbidden'; +import { manageGroupRoute } from '@/features/ui/router'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; const messages = defineMessages({ heading: { id: 'column.manage_group', defaultMessage: 'Manage group' }, diff --git a/packages/pl-fe/src/pages/notifications/notifications.tsx b/packages/pl-fe/src/pages/notifications/notifications.tsx index 7dcbde413..a09ef5b70 100644 --- a/packages/pl-fe/src/pages/notifications/notifications.tsx +++ b/packages/pl-fe/src/pages/notifications/notifications.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import NotificationsColumn from 'pl-fe/columns/notifications'; -import Column from 'pl-fe/components/ui/column'; +import NotificationsColumn from '@/columns/notifications'; +import Column from '@/components/ui/column'; const messages = defineMessages({ title: { id: 'column.notifications', defaultMessage: 'Notifications' }, diff --git a/packages/pl-fe/src/pages/search/search.tsx b/packages/pl-fe/src/pages/search/search.tsx index d28dcdba1..52a165f9e 100644 --- a/packages/pl-fe/src/pages/search/search.tsx +++ b/packages/pl-fe/src/pages/search/search.tsx @@ -4,17 +4,17 @@ import clsx from 'clsx'; import React, { useState } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import SearchColumn from 'pl-fe/columns/search'; -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 Input from 'pl-fe/components/ui/input'; -import SvgIcon from 'pl-fe/components/ui/svg-icon'; -import Tabs from 'pl-fe/components/ui/tabs'; -import Text from 'pl-fe/components/ui/text'; -import { searchRoute } from 'pl-fe/features/ui/router'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import SearchColumn from '@/columns/search'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Input from '@/components/ui/input'; +import SvgIcon from '@/components/ui/svg-icon'; +import Tabs from '@/components/ui/tabs'; +import Text from '@/components/ui/text'; +import { searchRoute } from '@/features/ui/router'; +import { useFeatures } from '@/hooks/use-features'; type SearchFilter = 'accounts' | 'hashtags' | 'statuses' | 'links'; diff --git a/packages/pl-fe/src/pages/settings/aliases.tsx b/packages/pl-fe/src/pages/settings/aliases.tsx index 5bb5c5f8b..ccf7fad96 100644 --- a/packages/pl-fe/src/pages/settings/aliases.tsx +++ b/packages/pl-fe/src/pages/settings/aliases.tsx @@ -2,20 +2,20 @@ import clsx from 'clsx'; import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import AccountComponent from 'pl-fe/components/account'; -import Icon from 'pl-fe/components/icon'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import { CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -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 { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useSearchAccounts } from 'pl-fe/queries/search/use-search'; -import { useAccountAliases, useAddAccountAlias, useDeleteAccountAlias } from 'pl-fe/queries/settings/use-account-aliases'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import AccountComponent from '@/components/account'; +import Icon from '@/components/icon'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import { CardHeader, CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Text from '@/components/ui/text'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useSearchAccounts } from '@/queries/search/use-search'; +import { useAccountAliases, useAddAccountAlias, useDeleteAccountAlias } from '@/queries/settings/use-account-aliases'; const messages = defineMessages({ heading: { id: 'column.aliases', defaultMessage: 'Account aliases' }, diff --git a/packages/pl-fe/src/pages/settings/auth-token-list.tsx b/packages/pl-fe/src/pages/settings/auth-token-list.tsx index 08e2b9203..3cae5ade3 100644 --- a/packages/pl-fe/src/pages/settings/auth-token-list.tsx +++ b/packages/pl-fe/src/pages/settings/auth-token-list.tsx @@ -2,18 +2,18 @@ import { useInfiniteQuery, useMutation } from '@tanstack/react-query'; import React from 'react'; import { defineMessages, FormattedDate, FormattedMessage, useIntl } from 'react-intl'; -import Badge from 'pl-fe/components/badge'; -import Button from 'pl-fe/components/ui/button'; -import Card, { CardBody, CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { oauthTokensQueryOptions, revokeOauthTokenMutationOptions } from 'pl-fe/queries/security/oauth-tokens'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import Badge from '@/components/badge'; +import Button from '@/components/ui/button'; +import Card, { CardBody, CardHeader, CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { oauthTokensQueryOptions, revokeOauthTokenMutationOptions } from '@/queries/security/oauth-tokens'; +import { useModalsActions } from '@/stores/modals'; import type { OauthToken } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/settings/backups.tsx b/packages/pl-fe/src/pages/settings/backups.tsx index db17b8816..8156895c1 100644 --- a/packages/pl-fe/src/pages/settings/backups.tsx +++ b/packages/pl-fe/src/pages/settings/backups.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { FormattedDate, defineMessages, useIntl } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Card from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import HStack from 'pl-fe/components/ui/hstack'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useBackups, useCreateBackupMutation } from 'pl-fe/queries/settings/use-backups'; +import Button from '@/components/ui/button'; +import Card from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import FormActions from '@/components/ui/form-actions'; +import HStack from '@/components/ui/hstack'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useBackups, useCreateBackupMutation } from '@/queries/settings/use-backups'; import type { Backup as BackupEntity } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/settings/blocks.tsx b/packages/pl-fe/src/pages/settings/blocks.tsx index 06f24dd79..d2debf2a2 100644 --- a/packages/pl-fe/src/pages/settings/blocks.tsx +++ b/packages/pl-fe/src/pages/settings/blocks.tsx @@ -2,11 +2,11 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useBlocks } from 'pl-fe/queries/account-lists/use-blocks'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import AccountContainer from '@/containers/account-container'; +import { useBlocks } from '@/queries/account-lists/use-blocks'; const messages = defineMessages({ heading: { id: 'column.blocks', defaultMessage: 'Blocks' }, diff --git a/packages/pl-fe/src/pages/settings/delete-account.tsx b/packages/pl-fe/src/pages/settings/delete-account.tsx index 3ecf482c6..494638735 100644 --- a/packages/pl-fe/src/pages/settings/delete-account.tsx +++ b/packages/pl-fe/src/pages/settings/delete-account.tsx @@ -1,18 +1,18 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { deleteAccount } from 'pl-fe/actions/security'; -import Button from 'pl-fe/components/ui/button'; -import Card, { CardBody, CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import toast from 'pl-fe/toast'; +import { deleteAccount } from '@/actions/security'; +import Button from '@/components/ui/button'; +import Card, { CardBody, CardHeader, CardTitle } from '@/components/ui/card'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import toast from '@/toast'; const messages = defineMessages({ passwordFieldLabel: { id: 'security.fields.password.label', defaultMessage: 'Password' }, diff --git a/packages/pl-fe/src/pages/settings/domain-blocks.tsx b/packages/pl-fe/src/pages/settings/domain-blocks.tsx index 8e8f2f464..268ab2ea9 100644 --- a/packages/pl-fe/src/pages/settings/domain-blocks.tsx +++ b/packages/pl-fe/src/pages/settings/domain-blocks.tsx @@ -2,11 +2,11 @@ import { useInfiniteQuery } from '@tanstack/react-query'; import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import Domain from 'pl-fe/components/domain'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import { domainBlocksQueryOptions } from 'pl-fe/queries/settings/domain-blocks'; +import Domain from '@/components/domain'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import { domainBlocksQueryOptions } from '@/queries/settings/domain-blocks'; const messages = defineMessages({ heading: { id: 'column.domain_blocks', defaultMessage: 'Domain blocks' }, diff --git a/packages/pl-fe/src/pages/settings/edit-email.tsx b/packages/pl-fe/src/pages/settings/edit-email.tsx index f217d30bc..dc3e01245 100644 --- a/packages/pl-fe/src/pages/settings/edit-email.tsx +++ b/packages/pl-fe/src/pages/settings/edit-email.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { changeEmail } from 'pl-fe/actions/security'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import toast from 'pl-fe/toast'; +import { changeEmail } from '@/actions/security'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import toast from '@/toast'; const messages = defineMessages({ header: { id: 'column.change_email', defaultMessage: 'Change email' }, diff --git a/packages/pl-fe/src/pages/settings/edit-filter.tsx b/packages/pl-fe/src/pages/settings/edit-filter.tsx index b180dd226..d33eae1f9 100644 --- a/packages/pl-fe/src/pages/settings/edit-filter.tsx +++ b/packages/pl-fe/src/pages/settings/edit-filter.tsx @@ -3,28 +3,28 @@ import { Filter, type FilterContext } from 'pl-api'; import React, { useEffect, useMemo, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { createFilter, fetchFilter, updateFilter } from 'pl-fe/actions/filters'; -import List, { ListItem } from 'pl-fe/components/list'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; -import Select from 'pl-fe/components/ui/select'; -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 { editFilterRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import toast from 'pl-fe/toast'; +import { createFilter, fetchFilter, updateFilter } from '@/actions/filters'; +import List, { ListItem } from '@/components/list'; +import MissingIndicator from '@/components/missing-indicator'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; +import Select from '@/components/ui/select'; +import Stack from '@/components/ui/stack'; +import Streamfield from '@/components/ui/streamfield'; +import Text from '@/components/ui/text'; +import Toggle from '@/components/ui/toggle'; +import { SelectDropdown } from '@/features/forms'; +import { editFilterRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import toast from '@/toast'; -import type { StreamfieldComponent } from 'pl-fe/components/ui/streamfield'; +import type { StreamfieldComponent } from '@/components/ui/streamfield'; interface IFilterField { id?: string; diff --git a/packages/pl-fe/src/pages/settings/edit-password.tsx b/packages/pl-fe/src/pages/settings/edit-password.tsx index 9bb191961..9660ca1d0 100644 --- a/packages/pl-fe/src/pages/settings/edit-password.tsx +++ b/packages/pl-fe/src/pages/settings/edit-password.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { changePassword } from 'pl-fe/actions/security'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import toast from 'pl-fe/toast'; +import { changePassword } from '@/actions/security'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import toast from '@/toast'; const messages = defineMessages({ updatePasswordSuccess: { id: 'security.update_password.success', defaultMessage: 'Password successfully updated.' }, diff --git a/packages/pl-fe/src/pages/settings/edit-profile.tsx b/packages/pl-fe/src/pages/settings/edit-profile.tsx index f106c31d7..bd8b33888 100644 --- a/packages/pl-fe/src/pages/settings/edit-profile.tsx +++ b/packages/pl-fe/src/pages/settings/edit-profile.tsx @@ -3,33 +3,33 @@ import { type CredentialAccount, GOTOSOCIAL, type UpdateCredentialsParams } from import React, { useState, useEffect } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import { patchMe } from 'pl-fe/actions/me'; -import BirthdayInput from 'pl-fe/components/birthday-input'; -import List, { ListItem } from 'pl-fe/components/list'; -import Accordion from 'pl-fe/components/ui/accordion'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import HStack from 'pl-fe/components/ui/hstack'; -import Input from 'pl-fe/components/ui/input'; -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 AvatarPicker from 'pl-fe/features/edit-profile/components/avatar-picker'; -import HeaderPicker from 'pl-fe/features/edit-profile/components/header-picker'; -import { SelectDropdown } from 'pl-fe/features/forms'; -import { useImageField } from 'pl-fe/hooks/forms/use-image-field'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useClient } from 'pl-fe/hooks/use-client'; -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'; -import toast from 'pl-fe/toast'; +import { patchMe } from '@/actions/me'; +import BirthdayInput from '@/components/birthday-input'; +import List, { ListItem } from '@/components/list'; +import Accordion from '@/components/ui/accordion'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import HStack from '@/components/ui/hstack'; +import Input from '@/components/ui/input'; +import Streamfield from '@/components/ui/streamfield'; +import Textarea from '@/components/ui/textarea'; +import Toggle from '@/components/ui/toggle'; +import AvatarPicker from '@/features/edit-profile/components/avatar-picker'; +import HeaderPicker from '@/features/edit-profile/components/header-picker'; +import { SelectDropdown } from '@/features/forms'; +import { useImageField } from '@/hooks/forms/use-image-field'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import toast from '@/toast'; -import type { StreamfieldComponent } from 'pl-fe/components/ui/streamfield'; +import type { StreamfieldComponent } from '@/components/ui/streamfield'; /** * Whether the user is hiding their follows and/or followers. diff --git a/packages/pl-fe/src/pages/settings/export-data.tsx b/packages/pl-fe/src/pages/settings/export-data.tsx index d111a95b5..c80ad5b70 100644 --- a/packages/pl-fe/src/pages/settings/export-data.tsx +++ b/packages/pl-fe/src/pages/settings/export-data.tsx @@ -5,15 +5,15 @@ import { exportFollows, exportBlocks, exportMutes, -} from 'pl-fe/actions/export-data'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +} from '@/actions/export-data'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import Text from '@/components/ui/text'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; -import type { AppDispatch, RootState } from 'pl-fe/store'; +import type { AppDispatch, RootState } from '@/store'; interface ICSVExporter { messages: { diff --git a/packages/pl-fe/src/pages/settings/filters.tsx b/packages/pl-fe/src/pages/settings/filters.tsx index fa278fb84..fe8cce62f 100644 --- a/packages/pl-fe/src/pages/settings/filters.tsx +++ b/packages/pl-fe/src/pages/settings/filters.tsx @@ -1,18 +1,18 @@ import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { fetchFilters, deleteFilter } from 'pl-fe/actions/filters'; -import RelativeTimestamp from 'pl-fe/components/relative-timestamp'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import toast from 'pl-fe/toast'; +import { fetchFilters, deleteFilter } from '@/actions/filters'; +import RelativeTimestamp from '@/components/relative-timestamp'; +import ScrollableList from '@/components/scrollable-list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import toast from '@/toast'; const messages = defineMessages({ heading: { id: 'column.filters', defaultMessage: 'Muted words' }, diff --git a/packages/pl-fe/src/pages/settings/import-data.tsx b/packages/pl-fe/src/pages/settings/import-data.tsx index b11bee5f8..02f4771ea 100644 --- a/packages/pl-fe/src/pages/settings/import-data.tsx +++ b/packages/pl-fe/src/pages/settings/import-data.tsx @@ -1,18 +1,18 @@ import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl, type MessageDescriptor } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import FileInput from 'pl-fe/components/ui/file-input'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Text from 'pl-fe/components/ui/text'; -import Toggle from 'pl-fe/components/ui/toggle'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import toast from 'pl-fe/toast'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import FileInput from '@/components/ui/file-input'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Text from '@/components/ui/text'; +import Toggle from '@/components/ui/toggle'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import toast from '@/toast'; const messages = defineMessages({ heading: { id: 'column.import_data', defaultMessage: 'Import data' }, diff --git a/packages/pl-fe/src/pages/settings/index.tsx b/packages/pl-fe/src/pages/settings/index.tsx index c07854117..600d17ddc 100644 --- a/packages/pl-fe/src/pages/settings/index.tsx +++ b/packages/pl-fe/src/pages/settings/index.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import Hashtag from 'pl-fe/components/hashtag'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import PlaceholderHashtag from 'pl-fe/features/placeholder/components/placeholder-hashtag'; -import { useFollowedTags } from 'pl-fe/queries/hashtags/use-followed-tags'; +import Hashtag from '@/components/hashtag'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import PlaceholderHashtag from '@/features/placeholder/components/placeholder-hashtag'; +import { useFollowedTags } from '@/queries/hashtags/use-followed-tags'; const messages = defineMessages({ heading: { id: 'column.followed_tags', defaultMessage: 'Followed hashtags' }, diff --git a/packages/pl-fe/src/pages/settings/interaction-policies.tsx b/packages/pl-fe/src/pages/settings/interaction-policies.tsx index ea843bd59..8ac87382c 100644 --- a/packages/pl-fe/src/pages/settings/interaction-policies.tsx +++ b/packages/pl-fe/src/pages/settings/interaction-policies.tsx @@ -2,22 +2,22 @@ import { create } from 'mutative'; import React, { useEffect, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { patchMe } from 'pl-fe/actions/me'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import { InlineMultiselect } from 'pl-fe/components/ui/inline-multiselect'; -import Tabs from 'pl-fe/components/ui/tabs'; -import Text from 'pl-fe/components/ui/text'; -import Warning from 'pl-fe/features/compose/components/warning'; -import { SelectDropdown } from 'pl-fe/features/forms'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInteractionPolicies } from 'pl-fe/queries/settings/use-interaction-policies'; -import toast from 'pl-fe/toast'; +import { patchMe } from '@/actions/me'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import { InlineMultiselect } from '@/components/ui/inline-multiselect'; +import Tabs from '@/components/ui/tabs'; +import Text from '@/components/ui/text'; +import Warning from '@/features/compose/components/warning'; +import { SelectDropdown } from '@/features/forms'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useInteractionPolicies } from '@/queries/settings/use-interaction-policies'; +import toast from '@/toast'; import type { CreateStatusParams, InteractionPolicy } from 'pl-api'; diff --git a/packages/pl-fe/src/pages/settings/migration.tsx b/packages/pl-fe/src/pages/settings/migration.tsx index 6136a78ca..3e764e720 100644 --- a/packages/pl-fe/src/pages/settings/migration.tsx +++ b/packages/pl-fe/src/pages/settings/migration.tsx @@ -2,17 +2,17 @@ import { Link } from '@tanstack/react-router'; import React, { useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { moveAccount } from 'pl-fe/actions/security'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import toast from 'pl-fe/toast'; +import { moveAccount } from '@/actions/security'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Text from '@/components/ui/text'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useInstance } from '@/hooks/use-instance'; +import toast from '@/toast'; const messages = defineMessages({ heading: { id: 'column.migration', defaultMessage: 'Move account' }, diff --git a/packages/pl-fe/src/pages/settings/mutes.tsx b/packages/pl-fe/src/pages/settings/mutes.tsx index c051ba801..ac4afe620 100644 --- a/packages/pl-fe/src/pages/settings/mutes.tsx +++ b/packages/pl-fe/src/pages/settings/mutes.tsx @@ -2,11 +2,11 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { useMutes } from 'pl-fe/queries/account-lists/use-blocks'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import AccountContainer from '@/containers/account-container'; +import { useMutes } from '@/queries/account-lists/use-blocks'; const messages = defineMessages({ heading: { id: 'column.mutes', defaultMessage: 'Mutes' }, diff --git a/packages/pl-fe/src/pages/settings/privacy.tsx b/packages/pl-fe/src/pages/settings/privacy.tsx index 535ded6d1..bf027a77e 100644 --- a/packages/pl-fe/src/pages/settings/privacy.tsx +++ b/packages/pl-fe/src/pages/settings/privacy.tsx @@ -3,23 +3,23 @@ import React, { useEffect, useState } from 'react'; import { defineMessages, FormattedList, FormattedMessage, useIntl } from 'react-intl'; import { useMutative } from 'use-mutative'; -import { changeSetting, saveSettings } from 'pl-fe/actions/settings'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Card, { CardBody, CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import Form from 'pl-fe/components/ui/form'; -import FormActions from 'pl-fe/components/ui/form-actions'; -import FormGroup from 'pl-fe/components/ui/form-group'; -import Input from 'pl-fe/components/ui/input'; -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 { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import KVStore from 'pl-fe/storage/kv-store'; -import { useSettings } from 'pl-fe/stores/settings'; -import { hasCanvasExtractPermission } from 'pl-fe/utils/favicon-service'; -import { KVStoreRedirectServicesItem } from 'pl-fe/utils/url-purify'; +import { changeSetting, saveSettings } from '@/actions/settings'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Card, { CardBody, CardHeader, CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import Form from '@/components/ui/form'; +import FormActions from '@/components/ui/form-actions'; +import FormGroup from '@/components/ui/form-group'; +import Input from '@/components/ui/input'; +import Toggle from '@/components/ui/toggle'; +import { SelectDropdown } from '@/features/forms'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import KVStore from '@/storage/kv-store'; +import { useSettings } from '@/stores/settings'; +import { hasCanvasExtractPermission } from '@/utils/favicon-service'; +import { KVStoreRedirectServicesItem } from '@/utils/url-purify'; const messages = defineMessages({ heading: { id: 'column.privacy', defaultMessage: 'Privacy' }, diff --git a/packages/pl-fe/src/pages/settings/settings.tsx b/packages/pl-fe/src/pages/settings/settings.tsx index 1b145c1fd..0c4ede128 100644 --- a/packages/pl-fe/src/pages/settings/settings.tsx +++ b/packages/pl-fe/src/pages/settings/settings.tsx @@ -1,15 +1,15 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Card, { CardBody, CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import Text from 'pl-fe/components/ui/text'; -import Preferences from 'pl-fe/features/preferences'; -import MessagesSettings from 'pl-fe/features/settings/components/messages-settings'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { useMfaConfig } from 'pl-fe/queries/security/use-mfa'; +import List, { ListItem } from '@/components/list'; +import Card, { CardBody, CardHeader, CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import Text from '@/components/ui/text'; +import Preferences from '@/features/preferences'; +import MessagesSettings from '@/features/settings/components/messages-settings'; +import { useFeatures } from '@/hooks/use-features'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useMfaConfig } from '@/queries/security/use-mfa'; const messages = defineMessages({ accountAliases: { id: 'column.aliases', defaultMessage: 'Account aliases' }, diff --git a/packages/pl-fe/src/pages/status-lists/bookmark-folders.tsx b/packages/pl-fe/src/pages/status-lists/bookmark-folders.tsx index 19e7336e6..581499608 100644 --- a/packages/pl-fe/src/pages/status-lists/bookmark-folders.tsx +++ b/packages/pl-fe/src/pages/status-lists/bookmark-folders.tsx @@ -2,20 +2,20 @@ import { Navigate } from '@tanstack/react-router'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import List, { ListItem } from 'pl-fe/components/list'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Emoji from 'pl-fe/components/ui/emoji'; -import Form from 'pl-fe/components/ui/form'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Input from 'pl-fe/components/ui/input'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Stack from 'pl-fe/components/ui/stack'; -import { useTextField } from 'pl-fe/hooks/forms/use-text-field'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useBookmarkFolders, useCreateBookmarkFolder } from 'pl-fe/queries/statuses/use-bookmark-folders'; -import toast from 'pl-fe/toast'; +import List, { ListItem } from '@/components/list'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Emoji from '@/components/ui/emoji'; +import Form from '@/components/ui/form'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Input from '@/components/ui/input'; +import Spinner from '@/components/ui/spinner'; +import Stack from '@/components/ui/stack'; +import { useTextField } from '@/hooks/forms/use-text-field'; +import { useFeatures } from '@/hooks/use-features'; +import { useBookmarkFolders, useCreateBookmarkFolder } from '@/queries/statuses/use-bookmark-folders'; +import toast from '@/toast'; const messages = defineMessages({ heading: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' }, diff --git a/packages/pl-fe/src/pages/status-lists/bookmarks.tsx b/packages/pl-fe/src/pages/status-lists/bookmarks.tsx index 2bfc50ddc..83f4fdf89 100644 --- a/packages/pl-fe/src/pages/status-lists/bookmarks.tsx +++ b/packages/pl-fe/src/pages/status-lists/bookmarks.tsx @@ -2,15 +2,15 @@ import { useNavigate } from '@tanstack/react-router'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import StatusList from 'pl-fe/components/status-list'; -import Column from 'pl-fe/components/ui/column'; -import { bookmarksRoute } from 'pl-fe/features/ui/router'; -import { useBookmarks } from 'pl-fe/queries/status-lists/use-bookmarks'; -import { useBookmarkFolder, useDeleteBookmarkFolder } from 'pl-fe/queries/statuses/use-bookmark-folders'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast from 'pl-fe/toast'; +import DropdownMenu from '@/components/dropdown-menu'; +import PullToRefresh from '@/components/pull-to-refresh'; +import StatusList from '@/components/status-list'; +import Column from '@/components/ui/column'; +import { bookmarksRoute } from '@/features/ui/router'; +import { useBookmarks } from '@/queries/status-lists/use-bookmarks'; +import { useBookmarkFolder, useDeleteBookmarkFolder } from '@/queries/statuses/use-bookmark-folders'; +import { useModalsActions } from '@/stores/modals'; +import toast from '@/toast'; const messages = defineMessages({ heading: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' }, diff --git a/packages/pl-fe/src/pages/status-lists/conversations.tsx b/packages/pl-fe/src/pages/status-lists/conversations.tsx index b52b47ca9..a58469865 100644 --- a/packages/pl-fe/src/pages/status-lists/conversations.tsx +++ b/packages/pl-fe/src/pages/status-lists/conversations.tsx @@ -1,11 +1,11 @@ import React, { useEffect } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { mountConversations, unmountConversations, expandConversations } from 'pl-fe/actions/conversations'; -import { useDirectStream } from 'pl-fe/api/hooks/streaming/use-direct-stream'; -import Column from 'pl-fe/components/ui/column'; -import ConversationsList from 'pl-fe/features/conversations/components/conversations-list'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +import { mountConversations, unmountConversations, expandConversations } from '@/actions/conversations'; +import { useDirectStream } from '@/api/hooks/streaming/use-direct-stream'; +import Column from '@/components/ui/column'; +import ConversationsList from '@/features/conversations/components/conversations-list'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; const messages = defineMessages({ title: { id: 'column.direct', defaultMessage: 'Direct messages' }, diff --git a/packages/pl-fe/src/pages/status-lists/draft-statuses.tsx b/packages/pl-fe/src/pages/status-lists/draft-statuses.tsx index 1b91b96a7..231de659e 100644 --- a/packages/pl-fe/src/pages/status-lists/draft-statuses.tsx +++ b/packages/pl-fe/src/pages/status-lists/draft-statuses.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import DraftStatus from 'pl-fe/features/draft-statuses/components/draft-status'; -import { useDraftStatusesQuery } from 'pl-fe/queries/statuses/use-draft-statuses'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import DraftStatus from '@/features/draft-statuses/components/draft-status'; +import { useDraftStatusesQuery } from '@/queries/statuses/use-draft-statuses'; const messages = defineMessages({ heading: { id: 'column.draft_statuses', defaultMessage: 'Drafts' }, diff --git a/packages/pl-fe/src/pages/status-lists/events.tsx b/packages/pl-fe/src/pages/status-lists/events.tsx index 39fe38728..2a72aa12d 100644 --- a/packages/pl-fe/src/pages/status-lists/events.tsx +++ b/packages/pl-fe/src/pages/status-lists/events.tsx @@ -3,16 +3,16 @@ import React, { useCallback, useState } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import ReactSwipeableViews from 'react-swipeable-views'; -import EventPreview from 'pl-fe/components/event-preview'; -import Button from 'pl-fe/components/ui/button'; -import Card, { CardBody, CardHeader, CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import PlaceholderEventPreview from 'pl-fe/features/placeholder/components/placeholder-event-preview'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useJoinedEventsTimeline, useRecentEventsTimeline } from 'pl-fe/queries/timelines/use-events-lists'; -import { makeGetStatus } from 'pl-fe/selectors'; +import EventPreview from '@/components/event-preview'; +import Button from '@/components/ui/button'; +import Card, { CardBody, CardHeader, CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import PlaceholderEventPreview from '@/features/placeholder/components/placeholder-event-preview'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useJoinedEventsTimeline, useRecentEventsTimeline } from '@/queries/timelines/use-events-lists'; +import { makeGetStatus } from '@/selectors'; const messages = defineMessages({ title: { id: 'column.events', defaultMessage: 'Events' }, diff --git a/packages/pl-fe/src/pages/status-lists/favourited-statuses.tsx b/packages/pl-fe/src/pages/status-lists/favourited-statuses.tsx index 343da99a3..bb5bb9426 100644 --- a/packages/pl-fe/src/pages/status-lists/favourited-statuses.tsx +++ b/packages/pl-fe/src/pages/status-lists/favourited-statuses.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useAccountLookup } from 'pl-fe/api/hooks/accounts/use-account-lookup'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import StatusList from 'pl-fe/components/status-list'; -import Column from 'pl-fe/components/ui/column'; -import { profileFavoritesRoute } from 'pl-fe/features/ui/router'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { useFavourites } from 'pl-fe/queries/status-lists/use-favourites'; +import { useAccountLookup } from '@/api/hooks/accounts/use-account-lookup'; +import MissingIndicator from '@/components/missing-indicator'; +import StatusList from '@/components/status-list'; +import Column from '@/components/ui/column'; +import { profileFavoritesRoute } from '@/features/ui/router'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { useFavourites } from '@/queries/status-lists/use-favourites'; const messages = defineMessages({ heading: { id: 'column.favourited_statuses', defaultMessage: 'Liked posts' }, diff --git a/packages/pl-fe/src/pages/status-lists/interaction-requests.tsx b/packages/pl-fe/src/pages/status-lists/interaction-requests.tsx index d7fd538f5..68f7a3ce1 100644 --- a/packages/pl-fe/src/pages/status-lists/interaction-requests.tsx +++ b/packages/pl-fe/src/pages/status-lists/interaction-requests.tsx @@ -3,25 +3,25 @@ import clsx from 'clsx'; import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import AttachmentThumbs from 'pl-fe/components/attachment-thumbs'; -import Icon from 'pl-fe/components/icon'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import RelativeTimestamp from 'pl-fe/components/relative-timestamp'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import StatusContent from 'pl-fe/components/status-content'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import AccountContainer from 'pl-fe/containers/account-container'; -import { buildLink } from 'pl-fe/features/notifications/components/notification'; -import { Hotkeys } from 'pl-fe/features/ui/components/hotkeys'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { type MinifiedInteractionRequest, useAuthorizeInteractionRequestMutation, useFlatInteractionRequests, useRejectInteractionRequestMutation } from 'pl-fe/queries/statuses/use-interaction-requests'; -import toast from 'pl-fe/toast'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import AttachmentThumbs from '@/components/attachment-thumbs'; +import Icon from '@/components/icon'; +import PullToRefresh from '@/components/pull-to-refresh'; +import RelativeTimestamp from '@/components/relative-timestamp'; +import ScrollableList from '@/components/scrollable-list'; +import StatusContent from '@/components/status-content'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import AccountContainer from '@/containers/account-container'; +import { buildLink } from '@/features/notifications/components/notification'; +import { Hotkeys } from '@/features/ui/components/hotkeys'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { type MinifiedInteractionRequest, useAuthorizeInteractionRequestMutation, useFlatInteractionRequests, useRejectInteractionRequestMutation } from '@/queries/statuses/use-interaction-requests'; +import toast from '@/toast'; const messages = defineMessages({ title: { id: 'column.interaction_requests', defaultMessage: 'Interaction requests' }, diff --git a/packages/pl-fe/src/pages/status-lists/pinned-statuses.tsx b/packages/pl-fe/src/pages/status-lists/pinned-statuses.tsx index 8c40e6836..da8fdf3c7 100644 --- a/packages/pl-fe/src/pages/status-lists/pinned-statuses.tsx +++ b/packages/pl-fe/src/pages/status-lists/pinned-statuses.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import StatusList from 'pl-fe/components/status-list'; -import Column from 'pl-fe/components/ui/column'; -import { profilePinsRoute } from 'pl-fe/features/ui/router'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { usePinnedStatuses } from 'pl-fe/queries/status-lists/use-pinned-statuses'; +import MissingIndicator from '@/components/missing-indicator'; +import StatusList from '@/components/status-list'; +import Column from '@/components/ui/column'; +import { profilePinsRoute } from '@/features/ui/router'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { usePinnedStatuses } from '@/queries/status-lists/use-pinned-statuses'; const messages = defineMessages({ heading: { id: 'column.pins', defaultMessage: 'Pinned posts' }, diff --git a/packages/pl-fe/src/pages/status-lists/quotes.tsx b/packages/pl-fe/src/pages/status-lists/quotes.tsx index 9c35ba6e9..b5df67a57 100644 --- a/packages/pl-fe/src/pages/status-lists/quotes.tsx +++ b/packages/pl-fe/src/pages/status-lists/quotes.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import StatusList from 'pl-fe/components/status-list'; -import Column from 'pl-fe/components/ui/column'; -import { statusQuotesRoute } from 'pl-fe/features/ui/router'; -import { useStatusQuotes } from 'pl-fe/queries/statuses/use-status-quotes'; +import PullToRefresh from '@/components/pull-to-refresh'; +import StatusList from '@/components/status-list'; +import Column from '@/components/ui/column'; +import { statusQuotesRoute } from '@/features/ui/router'; +import { useStatusQuotes } from '@/queries/statuses/use-status-quotes'; const messages = defineMessages({ heading: { id: 'column.quotes', defaultMessage: 'Post quotes' }, diff --git a/packages/pl-fe/src/pages/status-lists/scheduled-statuses.tsx b/packages/pl-fe/src/pages/status-lists/scheduled-statuses.tsx index d87823cc4..c2a5f8eb2 100644 --- a/packages/pl-fe/src/pages/status-lists/scheduled-statuses.tsx +++ b/packages/pl-fe/src/pages/status-lists/scheduled-statuses.tsx @@ -2,10 +2,10 @@ import { useInfiniteQuery } from '@tanstack/react-query'; import React from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Column from 'pl-fe/components/ui/column'; -import ScheduledStatus from 'pl-fe/features/scheduled-statuses/components/scheduled-status'; -import { scheduledStatusesQueryOptions } from 'pl-fe/queries/statuses/scheduled-statuses'; +import ScrollableList from '@/components/scrollable-list'; +import Column from '@/components/ui/column'; +import ScheduledStatus from '@/features/scheduled-statuses/components/scheduled-status'; +import { scheduledStatusesQueryOptions } from '@/queries/statuses/scheduled-statuses'; const messages = defineMessages({ heading: { id: 'column.scheduled_statuses', defaultMessage: 'Scheduled posts' }, diff --git a/packages/pl-fe/src/pages/statuses/compose-event.tsx b/packages/pl-fe/src/pages/statuses/compose-event.tsx index 74f227545..25d19e420 100644 --- a/packages/pl-fe/src/pages/statuses/compose-event.tsx +++ b/packages/pl-fe/src/pages/statuses/compose-event.tsx @@ -1,14 +1,14 @@ import React, { useEffect, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { cancelEventCompose } from 'pl-fe/actions/events'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import Tabs from 'pl-fe/components/ui/tabs'; -import { EditEvent } from 'pl-fe/features/compose-event/tabs/edit-event'; -import { ManagePendingParticipants } from 'pl-fe/features/compose-event/tabs/manage-pending-participants'; -import { eventEditRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +import { cancelEventCompose } from '@/actions/events'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import Tabs from '@/components/ui/tabs'; +import { EditEvent } from '@/features/compose-event/tabs/edit-event'; +import { ManagePendingParticipants } from '@/features/compose-event/tabs/manage-pending-participants'; +import { eventEditRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; const messages = defineMessages({ manageEvent: { id: 'navigation_bar.manage_event', defaultMessage: 'Manage event' }, diff --git a/packages/pl-fe/src/pages/statuses/event-discussion.tsx b/packages/pl-fe/src/pages/statuses/event-discussion.tsx index f8674993b..0c2cbbcde 100644 --- a/packages/pl-fe/src/pages/statuses/event-discussion.tsx +++ b/packages/pl-fe/src/pages/statuses/event-discussion.tsx @@ -1,22 +1,22 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'; import { FormattedMessage, useIntl } from 'react-intl'; -import { eventDiscussionCompose } from 'pl-fe/actions/compose'; -import { fetchStatusWithContext } from 'pl-fe/actions/statuses'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Tombstone from 'pl-fe/components/tombstone'; -import Stack from 'pl-fe/components/ui/stack'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import { makeGetDescendantsIds } from 'pl-fe/features/status/components/thread'; -import ThreadStatus from 'pl-fe/features/status/components/thread-status'; -import PendingStatus from 'pl-fe/features/ui/components/pending-status'; -import { eventDiscussionRoute } from 'pl-fe/features/ui/router'; -import { ComposeForm } from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; -import { selectChild } from 'pl-fe/utils/scroll-utils'; +import { eventDiscussionCompose } from '@/actions/compose'; +import { fetchStatusWithContext } from '@/actions/statuses'; +import MissingIndicator from '@/components/missing-indicator'; +import ScrollableList from '@/components/scrollable-list'; +import Tombstone from '@/components/tombstone'; +import Stack from '@/components/ui/stack'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import { makeGetDescendantsIds } from '@/features/status/components/thread'; +import ThreadStatus from '@/features/status/components/thread-status'; +import PendingStatus from '@/features/ui/components/pending-status'; +import { eventDiscussionRoute } from '@/features/ui/router'; +import { ComposeForm } from '@/features/ui/util/async-components'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; +import { selectChild } from '@/utils/scroll-utils'; import type { VirtuosoHandle } from 'react-virtuoso'; diff --git a/packages/pl-fe/src/pages/statuses/event-information.tsx b/packages/pl-fe/src/pages/statuses/event-information.tsx index 2f36c657d..20e2a4b76 100644 --- a/packages/pl-fe/src/pages/statuses/event-information.tsx +++ b/packages/pl-fe/src/pages/statuses/event-information.tsx @@ -1,19 +1,19 @@ import React, { useCallback, useEffect, useState } from 'react'; import { FormattedDate, FormattedMessage, useIntl } from 'react-intl'; -import { fetchStatus } from 'pl-fe/actions/statuses'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import StatusContent from 'pl-fe/components/status-content'; -import HStack from 'pl-fe/components/ui/hstack'; -import Icon from 'pl-fe/components/ui/icon'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import { eventInformationRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { makeGetStatus } from 'pl-fe/selectors'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { fetchStatus } from '@/actions/statuses'; +import MissingIndicator from '@/components/missing-indicator'; +import StatusContent from '@/components/status-content'; +import HStack from '@/components/ui/hstack'; +import Icon from '@/components/ui/icon'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import { eventInformationRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { makeGetStatus } from '@/selectors'; +import { useModalsActions } from '@/stores/modals'; const EventInformationPage: React.FC = () => { const { statusId } = eventInformationRoute.useParams(); diff --git a/packages/pl-fe/src/pages/statuses/status.tsx b/packages/pl-fe/src/pages/statuses/status.tsx index 718920e96..536fe0a4d 100644 --- a/packages/pl-fe/src/pages/statuses/status.tsx +++ b/packages/pl-fe/src/pages/statuses/status.tsx @@ -2,20 +2,20 @@ import { Navigate } from '@tanstack/react-router'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { changeSetting } from 'pl-fe/actions/settings'; -import { fetchStatusWithContext } from 'pl-fe/actions/statuses'; -import DropdownMenu, { type Menu } from 'pl-fe/components/dropdown-menu'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import Thread from 'pl-fe/features/status/components/thread'; -import { statusRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { makeGetStatus } from 'pl-fe/selectors'; -import { useSettings } from 'pl-fe/stores/settings'; +import { changeSetting } from '@/actions/settings'; +import { fetchStatusWithContext } from '@/actions/statuses'; +import DropdownMenu, { type Menu } from '@/components/dropdown-menu'; +import MissingIndicator from '@/components/missing-indicator'; +import PullToRefresh from '@/components/pull-to-refresh'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import PlaceholderStatus from '@/features/placeholder/components/placeholder-status'; +import Thread from '@/features/status/components/thread'; +import { statusRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { makeGetStatus } from '@/selectors'; +import { useSettings } from '@/stores/settings'; const messages = defineMessages({ title: { id: 'status.title', defaultMessage: 'Post details' }, diff --git a/packages/pl-fe/src/pages/timelines/antenna-timeline.tsx b/packages/pl-fe/src/pages/timelines/antenna-timeline.tsx index e53bb276b..f83a9c677 100644 --- a/packages/pl-fe/src/pages/timelines/antenna-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/antenna-timeline.tsx @@ -2,17 +2,17 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useEffect } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { fetchAntennaTimeline } from 'pl-fe/actions/timelines'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -// import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { antennaTimelineRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAntenna, useDeleteAntenna } from 'pl-fe/queries/accounts/use-antennas'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { fetchAntennaTimeline } from '@/actions/timelines'; +import DropdownMenu from '@/components/dropdown-menu'; +import MissingIndicator from '@/components/missing-indicator'; +// import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import Timeline from '@/features/ui/components/timeline'; +import { antennaTimelineRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAntenna, useDeleteAntenna } from '@/queries/accounts/use-antennas'; +import { useModalsActions } from '@/stores/modals'; const messages = defineMessages({ deleteHeading: { id: 'confirmations.delete_antenna.heading', defaultMessage: 'Delete antenna' }, diff --git a/packages/pl-fe/src/pages/timelines/bubble-timeline.tsx b/packages/pl-fe/src/pages/timelines/bubble-timeline.tsx index 5f7e6608b..8e47684bc 100644 --- a/packages/pl-fe/src/pages/timelines/bubble-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/bubble-timeline.tsx @@ -1,14 +1,14 @@ import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { fetchBubbleTimeline } from 'pl-fe/actions/timelines'; -import { useBubbleStream } from 'pl-fe/api/hooks/streaming/use-bubble-stream'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import Column from 'pl-fe/components/ui/column'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useSettings } from 'pl-fe/stores/settings'; +import { fetchBubbleTimeline } from '@/actions/timelines'; +import { useBubbleStream } from '@/api/hooks/streaming/use-bubble-stream'; +import PullToRefresh from '@/components/pull-to-refresh'; +import Column from '@/components/ui/column'; +import Timeline from '@/features/ui/components/timeline'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useSettings } from '@/stores/settings'; const messages = defineMessages({ title: { id: 'column.bubble', defaultMessage: 'Bubble timeline' }, diff --git a/packages/pl-fe/src/pages/timelines/circle-timeline.tsx b/packages/pl-fe/src/pages/timelines/circle-timeline.tsx index cbeade478..c208beebb 100644 --- a/packages/pl-fe/src/pages/timelines/circle-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/circle-timeline.tsx @@ -2,17 +2,17 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useEffect } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { fetchCircleTimeline } from 'pl-fe/actions/timelines'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { circleTimelineRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useCircle, useDeleteCircle } from 'pl-fe/queries/accounts/use-circles'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { fetchCircleTimeline } from '@/actions/timelines'; +import DropdownMenu from '@/components/dropdown-menu'; +import MissingIndicator from '@/components/missing-indicator'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import Timeline from '@/features/ui/components/timeline'; +import { circleTimelineRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useCircle, useDeleteCircle } from '@/queries/accounts/use-circles'; +import { useModalsActions } from '@/stores/modals'; const messages = defineMessages({ deleteHeading: { id: 'confirmations.delete_circle.heading', defaultMessage: 'Delete circle' }, diff --git a/packages/pl-fe/src/pages/timelines/community-timeline.tsx b/packages/pl-fe/src/pages/timelines/community-timeline.tsx index 47cf95b07..47e645d3e 100644 --- a/packages/pl-fe/src/pages/timelines/community-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/community-timeline.tsx @@ -1,13 +1,13 @@ import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { fetchPublicTimeline } from 'pl-fe/actions/timelines'; -import { useCommunityStream } from 'pl-fe/api/hooks/streaming/use-community-stream'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import Column from 'pl-fe/components/ui/column'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useSettings } from 'pl-fe/stores/settings'; +import { fetchPublicTimeline } from '@/actions/timelines'; +import { useCommunityStream } from '@/api/hooks/streaming/use-community-stream'; +import PullToRefresh from '@/components/pull-to-refresh'; +import Column from '@/components/ui/column'; +import Timeline from '@/features/ui/components/timeline'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useSettings } from '@/stores/settings'; const messages = defineMessages({ title: { id: 'column.community', defaultMessage: 'Local timeline' }, diff --git a/packages/pl-fe/src/pages/timelines/group-timeline.tsx b/packages/pl-fe/src/pages/timelines/group-timeline.tsx index dc821c7e2..5cdc34afb 100644 --- a/packages/pl-fe/src/pages/timelines/group-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/group-timeline.tsx @@ -3,21 +3,21 @@ import clsx from 'clsx'; import React, { useEffect, useRef } from 'react'; import { FormattedMessage, useIntl } from 'react-intl'; -import { groupCompose, uploadCompose } from 'pl-fe/actions/compose'; -import { fetchGroupTimeline } from 'pl-fe/actions/timelines'; -import { useGroup } from 'pl-fe/api/hooks/groups/use-group'; -import { useGroupStream } from 'pl-fe/api/hooks/streaming/use-group-stream'; -import Avatar from 'pl-fe/components/ui/avatar'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { groupTimelineRoute } from 'pl-fe/features/ui/router'; -import { ComposeForm } from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useDraggedFiles } from 'pl-fe/hooks/use-dragged-files'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { makeGetStatusIds } from 'pl-fe/selectors'; +import { groupCompose, uploadCompose } from '@/actions/compose'; +import { fetchGroupTimeline } from '@/actions/timelines'; +import { useGroup } from '@/api/hooks/groups/use-group'; +import { useGroupStream } from '@/api/hooks/streaming/use-group-stream'; +import Avatar from '@/components/ui/avatar'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Timeline from '@/features/ui/components/timeline'; +import { groupTimelineRoute } from '@/features/ui/router'; +import { ComposeForm } from '@/features/ui/util/async-components'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useDraggedFiles } from '@/hooks/use-dragged-files'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { makeGetStatusIds } from '@/selectors'; const getStatusIds = makeGetStatusIds(); diff --git a/packages/pl-fe/src/pages/timelines/hashtag-timeline.tsx b/packages/pl-fe/src/pages/timelines/hashtag-timeline.tsx index 624419fea..ea0ebd309 100644 --- a/packages/pl-fe/src/pages/timelines/hashtag-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/hashtag-timeline.tsx @@ -1,18 +1,18 @@ import React, { useEffect } from 'react'; import { FormattedMessage } from 'react-intl'; -import { fetchHashtagTimeline, clearTimeline } from 'pl-fe/actions/timelines'; -import { useHashtagStream } from 'pl-fe/api/hooks/streaming/use-hashtag-stream'; -import List, { ListItem } from 'pl-fe/components/list'; -import Column from 'pl-fe/components/ui/column'; -import Toggle from 'pl-fe/components/ui/toggle'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { hashtagTimelineRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { useFollowHashtagMutation, useUnfollowHashtagMutation } from 'pl-fe/queries/hashtags/use-followed-tags'; -import { useHashtag } from 'pl-fe/queries/hashtags/use-hashtag'; +import { fetchHashtagTimeline, clearTimeline } from '@/actions/timelines'; +import { useHashtagStream } from '@/api/hooks/streaming/use-hashtag-stream'; +import List, { ListItem } from '@/components/list'; +import Column from '@/components/ui/column'; +import Toggle from '@/components/ui/toggle'; +import Timeline from '@/features/ui/components/timeline'; +import { hashtagTimelineRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { useFollowHashtagMutation, useUnfollowHashtagMutation } from '@/queries/hashtags/use-followed-tags'; +import { useHashtag } from '@/queries/hashtags/use-hashtag'; const HashtagTimelinePage: React.FC = () => { const { id: tagId } = hashtagTimelineRoute.useParams(); diff --git a/packages/pl-fe/src/pages/timelines/home-timeline.tsx b/packages/pl-fe/src/pages/timelines/home-timeline.tsx index 2b5654bce..7528d9204 100644 --- a/packages/pl-fe/src/pages/timelines/home-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/home-timeline.tsx @@ -2,16 +2,16 @@ import { Link } from '@tanstack/react-router'; import React, { useCallback, useEffect, useRef } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import { fetchHomeTimeline } from 'pl-fe/actions/timelines'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import { fetchHomeTimeline } from '@/actions/timelines'; +import PullToRefresh from '@/components/pull-to-refresh'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import Timeline from '@/features/ui/components/timeline'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; const messages = defineMessages({ title: { id: 'column.home', defaultMessage: 'Home' }, diff --git a/packages/pl-fe/src/pages/timelines/landing-timeline.tsx b/packages/pl-fe/src/pages/timelines/landing-timeline.tsx index 325f47c8e..fc1c8b7db 100644 --- a/packages/pl-fe/src/pages/timelines/landing-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/landing-timeline.tsx @@ -2,21 +2,21 @@ import clsx from 'clsx'; import React, { useEffect, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { fetchPublicTimeline } from 'pl-fe/actions/timelines'; -import { useCommunityStream } from 'pl-fe/api/hooks/streaming/use-community-stream'; -import Markup from 'pl-fe/components/markup'; -import { ParsedContent } from 'pl-fe/components/parsed-content'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useRegistrationStatus } from 'pl-fe/hooks/use-registration-status'; -import { About } from 'pl-fe/pages/utils/about'; -import { getTextDirection } from 'pl-fe/utils/rtl'; +import { fetchPublicTimeline } from '@/actions/timelines'; +import { useCommunityStream } from '@/api/hooks/streaming/use-community-stream'; +import Markup from '@/components/markup'; +import { ParsedContent } from '@/components/parsed-content'; +import PullToRefresh from '@/components/pull-to-refresh'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Timeline from '@/features/ui/components/timeline'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useInstance } from '@/hooks/use-instance'; +import { useRegistrationStatus } from '@/hooks/use-registration-status'; +import { About } from '@/pages/utils/about'; +import { getTextDirection } from '@/utils/rtl'; interface ILogoText extends Pick, 'className' | 'dir'> { children: React.ReactNode; diff --git a/packages/pl-fe/src/pages/timelines/link-timeline.tsx b/packages/pl-fe/src/pages/timelines/link-timeline.tsx index 2ad5f033c..50283a01b 100644 --- a/packages/pl-fe/src/pages/timelines/link-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/link-timeline.tsx @@ -1,11 +1,11 @@ import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { clearTimeline, fetchLinkTimeline } from 'pl-fe/actions/timelines'; -import Column from 'pl-fe/components/ui/column'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { linkTimelineRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +import { clearTimeline, fetchLinkTimeline } from '@/actions/timelines'; +import Column from '@/components/ui/column'; +import Timeline from '@/features/ui/components/timeline'; +import { linkTimelineRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; const messages = defineMessages({ header: { id: 'column.link_timeline', defaultMessage: 'Posts linking to {url}' }, diff --git a/packages/pl-fe/src/pages/timelines/list-timeline.tsx b/packages/pl-fe/src/pages/timelines/list-timeline.tsx index 01d09ad08..ffaf7bdba 100644 --- a/packages/pl-fe/src/pages/timelines/list-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/list-timeline.tsx @@ -2,18 +2,18 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useEffect } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; -import { fetchListTimeline } from 'pl-fe/actions/timelines'; -import { useListStream } from 'pl-fe/api/hooks/streaming/use-list-stream'; -import DropdownMenu from 'pl-fe/components/dropdown-menu'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import Button from 'pl-fe/components/ui/button'; -import Column from 'pl-fe/components/ui/column'; -import Spinner from 'pl-fe/components/ui/spinner'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { listTimelineRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useDeleteList, useList } from 'pl-fe/queries/accounts/use-lists'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { fetchListTimeline } from '@/actions/timelines'; +import { useListStream } from '@/api/hooks/streaming/use-list-stream'; +import DropdownMenu from '@/components/dropdown-menu'; +import MissingIndicator from '@/components/missing-indicator'; +import Button from '@/components/ui/button'; +import Column from '@/components/ui/column'; +import Spinner from '@/components/ui/spinner'; +import Timeline from '@/features/ui/components/timeline'; +import { listTimelineRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useDeleteList, useList } from '@/queries/accounts/use-lists'; +import { useModalsActions } from '@/stores/modals'; const messages = defineMessages({ deleteHeading: { id: 'confirmations.delete_list.heading', defaultMessage: 'Delete list' }, diff --git a/packages/pl-fe/src/pages/timelines/public-timeline.tsx b/packages/pl-fe/src/pages/timelines/public-timeline.tsx index 371afe31b..cd5779e39 100644 --- a/packages/pl-fe/src/pages/timelines/public-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/public-timeline.tsx @@ -2,17 +2,17 @@ import { Link } from '@tanstack/react-router'; import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { changeSetting } from 'pl-fe/actions/settings'; -import { fetchPublicTimeline } from 'pl-fe/actions/timelines'; -import { usePublicStream } from 'pl-fe/api/hooks/streaming/use-public-stream'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import Accordion from 'pl-fe/components/ui/accordion'; -import Column from 'pl-fe/components/ui/column'; -import PinnedHostsPicker from 'pl-fe/features/remote-timeline/components/pinned-hosts-picker'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useSettings } from 'pl-fe/stores/settings'; +import { changeSetting } from '@/actions/settings'; +import { fetchPublicTimeline } from '@/actions/timelines'; +import { usePublicStream } from '@/api/hooks/streaming/use-public-stream'; +import PullToRefresh from '@/components/pull-to-refresh'; +import Accordion from '@/components/ui/accordion'; +import Column from '@/components/ui/column'; +import PinnedHostsPicker from '@/features/remote-timeline/components/pinned-hosts-picker'; +import Timeline from '@/features/ui/components/timeline'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useInstance } from '@/hooks/use-instance'; +import { useSettings } from '@/stores/settings'; const messages = defineMessages({ title: { id: 'column.public', defaultMessage: 'Fediverse timeline' }, diff --git a/packages/pl-fe/src/pages/timelines/remote-timeline.tsx b/packages/pl-fe/src/pages/timelines/remote-timeline.tsx index 636fb15d1..543fdeee9 100644 --- a/packages/pl-fe/src/pages/timelines/remote-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/remote-timeline.tsx @@ -2,17 +2,17 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useEffect } from 'react'; import { FormattedMessage } from 'react-intl'; -import { fetchPublicTimeline } from 'pl-fe/actions/timelines'; -import { useRemoteStream } from 'pl-fe/api/hooks/streaming/use-remote-stream'; -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 PinnedHostsPicker from 'pl-fe/features/remote-timeline/components/pinned-hosts-picker'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { remoteTimelineRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useSettings } from 'pl-fe/stores/settings'; +import { fetchPublicTimeline } from '@/actions/timelines'; +import { useRemoteStream } from '@/api/hooks/streaming/use-remote-stream'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import IconButton from '@/components/ui/icon-button'; +import Text from '@/components/ui/text'; +import PinnedHostsPicker from '@/features/remote-timeline/components/pinned-hosts-picker'; +import Timeline from '@/features/ui/components/timeline'; +import { remoteTimelineRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useSettings } from '@/stores/settings'; /** View statuses from a remote instance. */ const RemoteTimelinePage: React.FC = () => { diff --git a/packages/pl-fe/src/pages/timelines/test-timeline.tsx b/packages/pl-fe/src/pages/timelines/test-timeline.tsx index b5a9e2029..23aa3e303 100644 --- a/packages/pl-fe/src/pages/timelines/test-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/test-timeline.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import { importEntities } from 'pl-fe/actions/importer'; -import { expandTimelineSuccess } from 'pl-fe/actions/timelines'; -import Column from 'pl-fe/components/ui/column'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +import { importEntities } from '@/actions/importer'; +import { expandTimelineSuccess } from '@/actions/timelines'; +import Column from '@/components/ui/column'; +import Timeline from '@/features/ui/components/timeline'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; const messages = defineMessages({ title: { id: 'column.test', defaultMessage: 'Test timeline' }, @@ -16,11 +16,11 @@ const messages = defineMessages({ * These get embedded into the build, but only in this chunk, so it's okay. */ const MOCK_STATUSES: any[] = [ - require('pl-fe/__fixtures__/pleroma-status.json'), - require('pl-fe/__fixtures__/pleroma-status-with-poll.json'), - require('pl-fe/__fixtures__/pleroma-status-vertical-video-without-metadata.json'), - require('pl-fe/__fixtures__/pleroma-status-with-poll-with-emojis.json'), - require('pl-fe/__fixtures__/pleroma-quote-of-quote-post.json'), + require('@/__fixtures__/pleroma-status.json'), + require('@/__fixtures__/pleroma-status-with-poll.json'), + require('@/__fixtures__/pleroma-status-vertical-video-without-metadata.json'), + require('@/__fixtures__/pleroma-status-with-poll-with-emojis.json'), + require('@/__fixtures__/pleroma-quote-of-quote-post.json'), ]; const timelineId = 'test'; diff --git a/packages/pl-fe/src/pages/timelines/wrenched-timeline.tsx b/packages/pl-fe/src/pages/timelines/wrenched-timeline.tsx index 528923d7e..da584c3ae 100644 --- a/packages/pl-fe/src/pages/timelines/wrenched-timeline.tsx +++ b/packages/pl-fe/src/pages/timelines/wrenched-timeline.tsx @@ -2,12 +2,12 @@ import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { fetchWrenchedTimeline } from 'pl-fe/actions/timelines'; -import PullToRefresh from 'pl-fe/components/pull-to-refresh'; -import Column from 'pl-fe/components/ui/column'; -import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useSettings } from 'pl-fe/stores/settings'; +import { fetchWrenchedTimeline } from '@/actions/timelines'; +import PullToRefresh from '@/components/pull-to-refresh'; +import Column from '@/components/ui/column'; +import Timeline from '@/features/ui/components/timeline'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useSettings } from '@/stores/settings'; const messages = defineMessages({ title: { id: 'column.wrenched', defaultMessage: 'Recent wrenches timeline' }, diff --git a/packages/pl-fe/src/pages/utils/about.tsx b/packages/pl-fe/src/pages/utils/about.tsx index 3eb2c6751..cbe570699 100644 --- a/packages/pl-fe/src/pages/utils/about.tsx +++ b/packages/pl-fe/src/pages/utils/about.tsx @@ -1,13 +1,13 @@ import React, { useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { Navlinks } from 'pl-fe/components/navlinks'; -import Card from 'pl-fe/components/ui/card'; -import { languages } from 'pl-fe/features/preferences'; -import { aboutRoute } from 'pl-fe/features/ui/router'; -import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; -import { useAboutPage } from 'pl-fe/queries/pl-fe/use-about-page'; -import { useSettings } from 'pl-fe/stores/settings'; +import { Navlinks } from '@/components/navlinks'; +import Card from '@/components/ui/card'; +import { languages } from '@/features/preferences'; +import { aboutRoute } from '@/features/ui/router'; +import { usePlFeConfig } from '@/hooks/use-pl-fe-config'; +import { useAboutPage } from '@/queries/pl-fe/use-about-page'; +import { useSettings } from '@/stores/settings'; interface IAbout { slug: string; diff --git a/packages/pl-fe/src/pages/utils/crypto-donate.tsx b/packages/pl-fe/src/pages/utils/crypto-donate.tsx index b55774824..e57929093 100644 --- a/packages/pl-fe/src/pages/utils/crypto-donate.tsx +++ b/packages/pl-fe/src/pages/utils/crypto-donate.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import Accordion from 'pl-fe/components/ui/accordion'; -import Column from 'pl-fe/components/ui/column'; -import Stack from 'pl-fe/components/ui/stack'; -import SiteWallet from 'pl-fe/features/crypto-donate/components/site-wallet'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import Accordion from '@/components/ui/accordion'; +import Column from '@/components/ui/column'; +import Stack from '@/components/ui/stack'; +import SiteWallet from '@/features/crypto-donate/components/site-wallet'; +import { useInstance } from '@/hooks/use-instance'; const messages = defineMessages({ heading: { id: 'column.crypto_donate', defaultMessage: 'Donate cryptocurrency' }, diff --git a/packages/pl-fe/src/pages/utils/federation-restrictions.tsx b/packages/pl-fe/src/pages/utils/federation-restrictions.tsx index 5e9d3ccd5..b54f46180 100644 --- a/packages/pl-fe/src/pages/utils/federation-restrictions.tsx +++ b/packages/pl-fe/src/pages/utils/federation-restrictions.tsx @@ -1,14 +1,14 @@ import React, { useState, useCallback } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import ScrollableList from 'pl-fe/components/scrollable-list'; -import Accordion from 'pl-fe/components/ui/accordion'; -import Column from 'pl-fe/components/ui/column'; -import RestrictedInstance from 'pl-fe/features/federation-restrictions/components/restricted-instance'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { makeGetHosts } from 'pl-fe/selectors'; -import { federationRestrictionsDisclosed } from 'pl-fe/utils/state'; +import ScrollableList from '@/components/scrollable-list'; +import Accordion from '@/components/ui/accordion'; +import Column from '@/components/ui/column'; +import RestrictedInstance from '@/features/federation-restrictions/components/restricted-instance'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useInstance } from '@/hooks/use-instance'; +import { makeGetHosts } from '@/selectors'; +import { federationRestrictionsDisclosed } from '@/utils/state'; const messages = defineMessages({ heading: { id: 'column.federation_restrictions', defaultMessage: 'Federation restrictions' }, diff --git a/packages/pl-fe/src/pages/utils/generic-not-found.tsx b/packages/pl-fe/src/pages/utils/generic-not-found.tsx index 9882f2409..289a6e0b1 100644 --- a/packages/pl-fe/src/pages/utils/generic-not-found.tsx +++ b/packages/pl-fe/src/pages/utils/generic-not-found.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import MissingIndicator from 'pl-fe/components/missing-indicator'; -import Layout from 'pl-fe/components/ui/layout'; +import MissingIndicator from '@/components/missing-indicator'; +import Layout from '@/components/ui/layout'; const GenericNotFoundPage = () => ( diff --git a/packages/pl-fe/src/pages/utils/landing.tsx b/packages/pl-fe/src/pages/utils/landing.tsx index 97761ee43..e6b14e421 100644 --- a/packages/pl-fe/src/pages/utils/landing.tsx +++ b/packages/pl-fe/src/pages/utils/landing.tsx @@ -1,14 +1,14 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import Button from 'pl-fe/components/ui/button'; -import Card, { CardTitle } from 'pl-fe/components/ui/card'; -import Column from 'pl-fe/components/ui/column'; -import HStack from 'pl-fe/components/ui/hstack'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import sourceCode from 'pl-fe/utils/code'; +import Button from '@/components/ui/button'; +import Card, { CardTitle } from '@/components/ui/card'; +import Column from '@/components/ui/column'; +import HStack from '@/components/ui/hstack'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import LinkFooter from '@/features/ui/components/link-footer'; +import sourceCode from '@/utils/code'; import { LogoText } from '../timelines/landing-timeline'; diff --git a/packages/pl-fe/src/pages/utils/new-status.tsx b/packages/pl-fe/src/pages/utils/new-status.tsx index 53a556823..ec865010c 100644 --- a/packages/pl-fe/src/pages/utils/new-status.tsx +++ b/packages/pl-fe/src/pages/utils/new-status.tsx @@ -1,7 +1,7 @@ import { Navigate } from '@tanstack/react-router'; import React, { useEffect } from 'react'; -import { useModalsActions } from 'pl-fe/stores/modals'; +import { useModalsActions } from '@/stores/modals'; const NewStatusPage = () => { const { openModal } = useModalsActions(); diff --git a/packages/pl-fe/src/pages/utils/server-info.tsx b/packages/pl-fe/src/pages/utils/server-info.tsx index 0e898a426..3657b83f3 100644 --- a/packages/pl-fe/src/pages/utils/server-info.tsx +++ b/packages/pl-fe/src/pages/utils/server-info.tsx @@ -1,13 +1,13 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import Column from 'pl-fe/components/ui/column'; -import Divider from 'pl-fe/components/ui/divider'; -import Stack from 'pl-fe/components/ui/stack'; -import Text from 'pl-fe/components/ui/text'; -import LinkFooter from 'pl-fe/features/ui/components/link-footer'; -import PromoPanel from 'pl-fe/features/ui/components/panels/promo-panel'; -import { useInstance } from 'pl-fe/hooks/use-instance'; +import Column from '@/components/ui/column'; +import Divider from '@/components/ui/divider'; +import Stack from '@/components/ui/stack'; +import Text from '@/components/ui/text'; +import LinkFooter from '@/features/ui/components/link-footer'; +import PromoPanel from '@/features/ui/components/panels/promo-panel'; +import { useInstance } from '@/hooks/use-instance'; const messages = defineMessages({ heading: { id: 'column.info', defaultMessage: 'Server information' }, diff --git a/packages/pl-fe/src/pages/utils/share.tsx b/packages/pl-fe/src/pages/utils/share.tsx index 31ee00857..047a93d1a 100644 --- a/packages/pl-fe/src/pages/utils/share.tsx +++ b/packages/pl-fe/src/pages/utils/share.tsx @@ -1,9 +1,9 @@ import { useNavigate } from '@tanstack/react-router'; import React, { useEffect } from 'react'; -import { openComposeWithText } from 'pl-fe/actions/compose'; -import { shareRoute } from 'pl-fe/features/ui/router'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; +import { openComposeWithText } from '@/actions/compose'; +import { shareRoute } from '@/features/ui/router'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; const SharePage: React.FC = () => { const dispatch = useAppDispatch(); diff --git a/packages/pl-fe/src/queries/accounts.ts b/packages/pl-fe/src/queries/accounts.ts index 0ea2a6cdf..6a88d8996 100644 --- a/packages/pl-fe/src/queries/accounts.ts +++ b/packages/pl-fe/src/queries/accounts.ts @@ -1,9 +1,9 @@ import { useMutation } from '@tanstack/react-query'; -import { patchMeSuccess } from 'pl-fe/actions/me'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import toast from 'pl-fe/toast'; +import { patchMeSuccess } from '@/actions/me'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import toast from '@/toast'; type UpdateCredentialsData = { accepts_chat_messages?: boolean; diff --git a/packages/pl-fe/src/queries/accounts/account-scrobble.ts b/packages/pl-fe/src/queries/accounts/account-scrobble.ts index 193b3f40d..7d8589db7 100644 --- a/packages/pl-fe/src/queries/accounts/account-scrobble.ts +++ b/packages/pl-fe/src/queries/accounts/account-scrobble.ts @@ -1,6 +1,6 @@ import { queryOptions } from '@tanstack/react-query'; -import { getClient } from 'pl-fe/api'; +import { getClient } from '@/api'; const accountScrobbleQueryOptions = (accountId?: string) => queryOptions({ queryKey: ['scrobbles', accountId!], diff --git a/packages/pl-fe/src/queries/accounts/use-antennas.ts b/packages/pl-fe/src/queries/accounts/use-antennas.ts index 638876a48..8d7e946bc 100644 --- a/packages/pl-fe/src/queries/accounts/use-antennas.ts +++ b/packages/pl-fe/src/queries/accounts/use-antennas.ts @@ -1,7 +1,7 @@ import { type InfiniteData, useMutation, useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import { queryClient } from '../client'; import { filterById } from '../utils/filter-id'; diff --git a/packages/pl-fe/src/queries/accounts/use-birthday-reminders.ts b/packages/pl-fe/src/queries/accounts/use-birthday-reminders.ts index 67f370ee1..b0a97d613 100644 --- a/packages/pl-fe/src/queries/accounts/use-birthday-reminders.ts +++ b/packages/pl-fe/src/queries/accounts/use-birthday-reminders.ts @@ -1,10 +1,10 @@ import { useQuery } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useLoggedIn } from '@/hooks/use-logged-in'; const useBirthdayReminders = (month: number, day: number) => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/accounts/use-circles.ts b/packages/pl-fe/src/queries/accounts/use-circles.ts index b69366557..5d32e9f2b 100644 --- a/packages/pl-fe/src/queries/accounts/use-circles.ts +++ b/packages/pl-fe/src/queries/accounts/use-circles.ts @@ -1,7 +1,7 @@ import { type InfiniteData, useMutation, useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import { queryClient } from '../client'; import { filterById } from '../utils/filter-id'; diff --git a/packages/pl-fe/src/queries/accounts/use-directory.ts b/packages/pl-fe/src/queries/accounts/use-directory.ts index 5dec97374..eb1886348 100644 --- a/packages/pl-fe/src/queries/accounts/use-directory.ts +++ b/packages/pl-fe/src/queries/accounts/use-directory.ts @@ -1,8 +1,8 @@ import { useInfiniteQuery } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; const useDirectory = (order: 'active' | 'new', local: boolean = false) => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/accounts/use-endorsed-accounts.ts b/packages/pl-fe/src/queries/accounts/use-endorsed-accounts.ts index 8e0ff27c1..4cb0c5ec5 100644 --- a/packages/pl-fe/src/queries/accounts/use-endorsed-accounts.ts +++ b/packages/pl-fe/src/queries/accounts/use-endorsed-accounts.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; const useEndorsedAccounts = (accountId: string) => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/accounts/use-familiar-followers.ts b/packages/pl-fe/src/queries/accounts/use-familiar-followers.ts index 951b0d591..44da1f72d 100644 --- a/packages/pl-fe/src/queries/accounts/use-familiar-followers.ts +++ b/packages/pl-fe/src/queries/accounts/use-familiar-followers.ts @@ -1,10 +1,10 @@ import { useQuery } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; const useFamiliarFollowers = (accountId: string) => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/accounts/use-follow-requests.ts b/packages/pl-fe/src/queries/accounts/use-follow-requests.ts index f171af80b..e53f16679 100644 --- a/packages/pl-fe/src/queries/accounts/use-follow-requests.ts +++ b/packages/pl-fe/src/queries/accounts/use-follow-requests.ts @@ -1,11 +1,11 @@ import { useMutation, type InfiniteData } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { queryClient } from 'pl-fe/queries/client'; -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyAccountList } from 'pl-fe/queries/utils/minify-list'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { queryClient } from '@/queries/client'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyAccountList } from '@/queries/utils/minify-list'; import { filterById } from '../utils/filter-id'; diff --git a/packages/pl-fe/src/queries/accounts/use-lists.ts b/packages/pl-fe/src/queries/accounts/use-lists.ts index 1a989f7d7..dfd38ff7f 100644 --- a/packages/pl-fe/src/queries/accounts/use-lists.ts +++ b/packages/pl-fe/src/queries/accounts/use-lists.ts @@ -1,7 +1,7 @@ import { type InfiniteData, useMutation, useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import { queryClient } from '../client'; import { filterById } from '../utils/filter-id'; diff --git a/packages/pl-fe/src/queries/accounts/use-relationship.ts b/packages/pl-fe/src/queries/accounts/use-relationship.ts index 12c9d581a..3f5ec2fc4 100644 --- a/packages/pl-fe/src/queries/accounts/use-relationship.ts +++ b/packages/pl-fe/src/queries/accounts/use-relationship.ts @@ -1,10 +1,10 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS, type AccountsAction } from 'pl-fe/actions/accounts'; -import { batcher } from 'pl-fe/api/batcher'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS, type AccountsAction } from '@/actions/accounts'; +import { batcher } from '@/api/batcher'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useLoggedIn } from '@/hooks/use-logged-in'; import type { MinifiedSuggestion } from '../trends/use-suggested-accounts'; import type { BlockAccountParams, FollowAccountParams, MuteAccountParams, Relationship } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/admin/use-accounts.ts b/packages/pl-fe/src/queries/admin/use-accounts.ts index 18dab2236..9f063d98d 100644 --- a/packages/pl-fe/src/queries/admin/use-accounts.ts +++ b/packages/pl-fe/src/queries/admin/use-accounts.ts @@ -1,10 +1,10 @@ import { InfiniteData, useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAccount } from 'pl-fe/api/hooks/accounts/use-account'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; +import { importEntities } from '@/actions/importer'; +import { useAccount } from '@/api/hooks/accounts/use-account'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useOwnAccount } from '@/hooks/use-own-account'; import { filterById } from '../utils/filter-id'; import { makePaginatedResponseQuery } from '../utils/make-paginated-response-query'; diff --git a/packages/pl-fe/src/queries/admin/use-announcements.ts b/packages/pl-fe/src/queries/admin/use-announcements.ts index aa6e1e581..763cd2d7c 100644 --- a/packages/pl-fe/src/queries/admin/use-announcements.ts +++ b/packages/pl-fe/src/queries/admin/use-announcements.ts @@ -9,8 +9,8 @@ import { } from 'pl-api'; import * as v from 'valibot'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { queryClient } from 'pl-fe/queries/client'; +import { useClient } from '@/hooks/use-client'; +import { queryClient } from '@/queries/client'; import { makePaginatedResponseQuery } from '../utils/make-paginated-response-query'; diff --git a/packages/pl-fe/src/queries/admin/use-domains.ts b/packages/pl-fe/src/queries/admin/use-domains.ts index b375db877..7148f7ced 100644 --- a/packages/pl-fe/src/queries/admin/use-domains.ts +++ b/packages/pl-fe/src/queries/admin/use-domains.ts @@ -1,7 +1,7 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { queryClient } from 'pl-fe/queries/client'; +import { useClient } from '@/hooks/use-client'; +import { queryClient } from '@/queries/client'; import type { AdminDomain } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/admin/use-metrics.ts b/packages/pl-fe/src/queries/admin/use-metrics.ts index 0cf3d9098..5a6ea5573 100644 --- a/packages/pl-fe/src/queries/admin/use-metrics.ts +++ b/packages/pl-fe/src/queries/admin/use-metrics.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useClient } from '@/hooks/use-client'; import type { AdminDimensionKey, AdminGetDimensionsParams, AdminGetMeasuresParams, AdminMeasureKey } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/admin/use-moderation-log.ts b/packages/pl-fe/src/queries/admin/use-moderation-log.ts index 48e2bb05e..ced75abb3 100644 --- a/packages/pl-fe/src/queries/admin/use-moderation-log.ts +++ b/packages/pl-fe/src/queries/admin/use-moderation-log.ts @@ -1,8 +1,8 @@ import { useInfiniteQuery } from '@tanstack/react-query'; import { PaginatedResponse } from 'pl-api'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { flattenPages } from 'pl-fe/utils/queries'; +import { useClient } from '@/hooks/use-client'; +import { flattenPages } from '@/utils/queries'; import type { AdminModerationLogEntry } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/admin/use-relays.ts b/packages/pl-fe/src/queries/admin/use-relays.ts index 551b58f80..aee548ccd 100644 --- a/packages/pl-fe/src/queries/admin/use-relays.ts +++ b/packages/pl-fe/src/queries/admin/use-relays.ts @@ -1,7 +1,7 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { queryClient } from 'pl-fe/queries/client'; +import { useClient } from '@/hooks/use-client'; +import { queryClient } from '@/queries/client'; import type { AdminRelay } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/admin/use-reports.ts b/packages/pl-fe/src/queries/admin/use-reports.ts index 5c2b954a8..6bc843612 100644 --- a/packages/pl-fe/src/queries/admin/use-reports.ts +++ b/packages/pl-fe/src/queries/admin/use-reports.ts @@ -1,8 +1,8 @@ import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; +import { useClient } from '@/hooks/use-client'; +import { useInstance } from '@/hooks/use-instance'; +import { useOwnAccount } from '@/hooks/use-own-account'; import { filterById } from '../utils/filter-id'; import { makePaginatedResponseQuery } from '../utils/make-paginated-response-query'; diff --git a/packages/pl-fe/src/queries/admin/use-rules.ts b/packages/pl-fe/src/queries/admin/use-rules.ts index 26be9e15e..a85bca38c 100644 --- a/packages/pl-fe/src/queries/admin/use-rules.ts +++ b/packages/pl-fe/src/queries/admin/use-rules.ts @@ -1,7 +1,7 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { queryClient } from 'pl-fe/queries/client'; +import { useClient } from '@/hooks/use-client'; +import { queryClient } from '@/queries/client'; import type { AdminRule } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/announcements/use-announcements.ts b/packages/pl-fe/src/queries/announcements/use-announcements.ts index 57559f244..853956e6a 100644 --- a/packages/pl-fe/src/queries/announcements/use-announcements.ts +++ b/packages/pl-fe/src/queries/announcements/use-announcements.ts @@ -2,8 +2,8 @@ import { useMutation, useQuery } from '@tanstack/react-query'; import { announcementReactionSchema, type AnnouncementReaction, type Announcement } from 'pl-api'; import * as v from 'valibot'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { queryClient } from 'pl-fe/queries/client'; +import { useClient } from '@/hooks/use-client'; +import { queryClient } from '@/queries/client'; const updateReaction = (reaction: AnnouncementReaction, count: number, me?: boolean, overwrite?: boolean) => v.parse(announcementReactionSchema, { ...reaction, diff --git a/packages/pl-fe/src/queries/chats.test.ts b/packages/pl-fe/src/queries/chats.test.ts index dbee2ffa0..b602879ca 100644 --- a/packages/pl-fe/src/queries/chats.test.ts +++ b/packages/pl-fe/src/queries/chats.test.ts @@ -2,12 +2,12 @@ import { Map as ImmutableMap } from 'immutable'; import sumBy from 'lodash/sumBy'; import { useEffect } from 'react'; -import { __stub } from 'pl-fe/api'; -import { buildAccount, buildRelationship } from 'pl-fe/jest/factory'; -import { createTestStore, mockStore, queryClient, renderHook, rootState, waitFor } from 'pl-fe/jest/test-helpers'; -import { normalizeChatMessage } from 'pl-fe/normalizers/chat-message'; -import { Store } from 'pl-fe/store'; -import { flattenPages } from 'pl-fe/utils/queries'; +import { __stub } from '@/api'; +import { buildAccount, buildRelationship } from '@/jest/factory'; +import { createTestStore, mockStore, queryClient, renderHook, rootState, waitFor } from '@/jest/test-helpers'; +import { normalizeChatMessage } from '@/normalizers/chat-message'; +import { Store } from '@/store'; +import { flattenPages } from '@/utils/queries'; import { ChatKeys, IChat, useChat, useChatActions, useChatMessages, useChats } from './chats'; diff --git a/packages/pl-fe/src/queries/chats.ts b/packages/pl-fe/src/queries/chats.ts index 98c51993d..f8dec1562 100644 --- a/packages/pl-fe/src/queries/chats.ts +++ b/packages/pl-fe/src/queries/chats.ts @@ -3,18 +3,18 @@ import sumBy from 'lodash/sumBy'; import { type Chat, type ChatMessage as BaseChatMessage, type PaginatedResponse, chatMessageSchema } from 'pl-api'; import * as v from 'valibot'; -import { importEntities } from 'pl-fe/actions/importer'; -import { batcher } from 'pl-fe/api/batcher'; -import { ChatWidgetScreens, useChatContext } from 'pl-fe/contexts/chat-context'; -import { useStatContext } from 'pl-fe/contexts/stat-context'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { type ChatMessage, normalizeChatMessage } from 'pl-fe/normalizers/chat-message'; -import { reOrderChatListItems } from 'pl-fe/utils/chats'; -import { flattenPages, updatePageItem } from 'pl-fe/utils/queries'; +import { importEntities } from '@/actions/importer'; +import { batcher } from '@/api/batcher'; +import { ChatWidgetScreens, useChatContext } from '@/contexts/chat-context'; +import { useStatContext } from '@/contexts/stat-context'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { type ChatMessage, normalizeChatMessage } from '@/normalizers/chat-message'; +import { reOrderChatListItems } from '@/utils/chats'; +import { flattenPages, updatePageItem } from '@/utils/queries'; import { useRelationshipQuery } from './accounts/use-relationship'; import { queryClient } from './client'; diff --git a/packages/pl-fe/src/queries/drive/use-drive-file.ts b/packages/pl-fe/src/queries/drive/use-drive-file.ts index 17e48f257..1fc219645 100644 --- a/packages/pl-fe/src/queries/drive/use-drive-file.ts +++ b/packages/pl-fe/src/queries/drive/use-drive-file.ts @@ -1,7 +1,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import type { UpdateFileParams } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/drive/use-drive-folder.ts b/packages/pl-fe/src/queries/drive/use-drive-folder.ts index 716d80e45..3db078868 100644 --- a/packages/pl-fe/src/queries/drive/use-drive-folder.ts +++ b/packages/pl-fe/src/queries/drive/use-drive-folder.ts @@ -1,8 +1,8 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import type { DriveFolder } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/embed.ts b/packages/pl-fe/src/queries/embed.ts index 0733f8a86..6d069a3b7 100644 --- a/packages/pl-fe/src/queries/embed.ts +++ b/packages/pl-fe/src/queries/embed.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useClient } from '@/hooks/use-client'; type Embed = { type: string; diff --git a/packages/pl-fe/src/queries/events/use-event-participation-requests.ts b/packages/pl-fe/src/queries/events/use-event-participation-requests.ts index 33a91afcc..a26f824f7 100644 --- a/packages/pl-fe/src/queries/events/use-event-participation-requests.ts +++ b/packages/pl-fe/src/queries/events/use-event-participation-requests.ts @@ -1,12 +1,12 @@ import { type InfiniteData, useMutation } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { queryClient } from 'pl-fe/queries/client'; -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyList } from 'pl-fe/queries/utils/minify-list'; -import { store } from 'pl-fe/store'; +import { importEntities } from '@/actions/importer'; +import { useClient } from '@/hooks/use-client'; +import { queryClient } from '@/queries/client'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyList } from '@/queries/utils/minify-list'; +import { store } from '@/store'; import type { PlApiClient } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/events/use-event-participations.ts b/packages/pl-fe/src/queries/events/use-event-participations.ts index 4b589a525..ca73ef742 100644 --- a/packages/pl-fe/src/queries/events/use-event-participations.ts +++ b/packages/pl-fe/src/queries/events/use-event-participations.ts @@ -1,5 +1,5 @@ -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyAccountList } from 'pl-fe/queries/utils/minify-list'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyAccountList } from '@/queries/utils/minify-list'; const useEventParticipations = makePaginatedResponseQuery( (statusId: string) => ['accountsLists', 'eventParticipations', statusId], diff --git a/packages/pl-fe/src/queries/groups/use-group-blocks.ts b/packages/pl-fe/src/queries/groups/use-group-blocks.ts index 472e1ebea..2031f6178 100644 --- a/packages/pl-fe/src/queries/groups/use-group-blocks.ts +++ b/packages/pl-fe/src/queries/groups/use-group-blocks.ts @@ -1,9 +1,9 @@ import { useMutation, type InfiniteData } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { queryClient } from 'pl-fe/queries/client'; -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyAccountList } from 'pl-fe/queries/utils/minify-list'; +import { useClient } from '@/hooks/use-client'; +import { queryClient } from '@/queries/client'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyAccountList } from '@/queries/utils/minify-list'; import { filterById } from '../utils/filter-id'; diff --git a/packages/pl-fe/src/queries/groups/use-group-members.ts b/packages/pl-fe/src/queries/groups/use-group-members.ts index 2d9dd554b..fca174824 100644 --- a/packages/pl-fe/src/queries/groups/use-group-members.ts +++ b/packages/pl-fe/src/queries/groups/use-group-members.ts @@ -1,10 +1,10 @@ import { type InfiniteData, useMutation } from '@tanstack/react-query'; import { GroupMember, GroupRole, PaginatedResponse } from 'pl-api'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { store } from 'pl-fe/store'; +import { importEntities } from '@/actions/importer'; +import { useClient } from '@/hooks/use-client'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { store } from '@/store'; import { queryClient } from '../client'; import { minifyList } from '../utils/minify-list'; diff --git a/packages/pl-fe/src/queries/hashtags/use-followed-tags.ts b/packages/pl-fe/src/queries/hashtags/use-followed-tags.ts index b86a26ce6..3d34a3acc 100644 --- a/packages/pl-fe/src/queries/hashtags/use-followed-tags.ts +++ b/packages/pl-fe/src/queries/hashtags/use-followed-tags.ts @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useClient } from '@/hooks/use-client'; import { queryClient } from '../client'; import { makePaginatedResponseQuery } from '../utils/make-paginated-response-query'; diff --git a/packages/pl-fe/src/queries/hashtags/use-hashtag.ts b/packages/pl-fe/src/queries/hashtags/use-hashtag.ts index a235bfb78..7a15fc083 100644 --- a/packages/pl-fe/src/queries/hashtags/use-hashtag.ts +++ b/packages/pl-fe/src/queries/hashtags/use-hashtag.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useClient } from '@/hooks/use-client'; const useHashtag = (tag: string) => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/instance/use-custom-emojis.ts b/packages/pl-fe/src/queries/instance/use-custom-emojis.ts index 282dac06b..708e31df1 100644 --- a/packages/pl-fe/src/queries/instance/use-custom-emojis.ts +++ b/packages/pl-fe/src/queries/instance/use-custom-emojis.ts @@ -1,8 +1,8 @@ import { queryOptions, useQuery } from '@tanstack/react-query'; -import { buildCustomEmojis } from 'pl-fe/features/emoji'; -import { addCustomToPool } from 'pl-fe/features/emoji/search'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { buildCustomEmojis } from '@/features/emoji'; +import { addCustomToPool } from '@/features/emoji/search'; +import { useClient } from '@/hooks/use-client'; import { queryClient } from '../client'; diff --git a/packages/pl-fe/src/queries/instance/use-translation-languages.ts b/packages/pl-fe/src/queries/instance/use-translation-languages.ts index bf04fa77a..81c2bb21f 100644 --- a/packages/pl-fe/src/queries/instance/use-translation-languages.ts +++ b/packages/pl-fe/src/queries/instance/use-translation-languages.ts @@ -1,9 +1,9 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useInstance } from 'pl-fe/hooks/use-instance'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useInstance } from '@/hooks/use-instance'; +import { useLoggedIn } from '@/hooks/use-logged-in'; const useTranslationLanguages = () => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/pl-fe/use-about-page.ts b/packages/pl-fe/src/queries/pl-fe/use-about-page.ts index 0081207ef..6fdd8b935 100644 --- a/packages/pl-fe/src/queries/pl-fe/use-about-page.ts +++ b/packages/pl-fe/src/queries/pl-fe/use-about-page.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { staticFetch } from 'pl-fe/api'; +import { staticFetch } from '@/api'; const fetchAboutPage = async (slug: string, locale?: string) => { const filename = `${slug}${locale ? `.${locale}` : ''}.html`; diff --git a/packages/pl-fe/src/queries/search/use-search-accounts.ts b/packages/pl-fe/src/queries/search/use-search-accounts.ts index 9e1228f69..d8549a711 100644 --- a/packages/pl-fe/src/queries/search/use-search-accounts.ts +++ b/packages/pl-fe/src/queries/search/use-search-accounts.ts @@ -1,8 +1,8 @@ import { useInfiniteQuery } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; import type { SearchAccountParams } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/search/use-search-location.ts b/packages/pl-fe/src/queries/search/use-search-location.ts index d28648016..9e004c01f 100644 --- a/packages/pl-fe/src/queries/search/use-search-location.ts +++ b/packages/pl-fe/src/queries/search/use-search-location.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useClient } from '@/hooks/use-client'; const useSearchLocation = (query: string) => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/search/use-search.ts b/packages/pl-fe/src/queries/search/use-search.ts index 493fefadb..6d8699b70 100644 --- a/packages/pl-fe/src/queries/search/use-search.ts +++ b/packages/pl-fe/src/queries/search/use-search.ts @@ -1,8 +1,8 @@ import { useInfiniteQuery } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; import type { PaginationParams, SearchParams } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/security/oauth-tokens.ts b/packages/pl-fe/src/queries/security/oauth-tokens.ts index 003fa5de4..57bb73b02 100644 --- a/packages/pl-fe/src/queries/security/oauth-tokens.ts +++ b/packages/pl-fe/src/queries/security/oauth-tokens.ts @@ -1,6 +1,6 @@ import { create } from 'mutative'; -import { getClient } from 'pl-fe/api'; +import { getClient } from '@/api'; import { queryClient } from '../client'; import { makePaginatedResponseQueryOptions } from '../utils/make-paginated-response-query-options'; diff --git a/packages/pl-fe/src/queries/security/use-mfa.ts b/packages/pl-fe/src/queries/security/use-mfa.ts index 9f5b7a33e..3d925ebd0 100644 --- a/packages/pl-fe/src/queries/security/use-mfa.ts +++ b/packages/pl-fe/src/queries/security/use-mfa.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useClient } from '@/hooks/use-client'; const useMfaConfig = () => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/settings/domain-blocks.ts b/packages/pl-fe/src/queries/settings/domain-blocks.ts index 4decf3a2c..3c2e7ed71 100644 --- a/packages/pl-fe/src/queries/settings/domain-blocks.ts +++ b/packages/pl-fe/src/queries/settings/domain-blocks.ts @@ -1,17 +1,17 @@ -import { getClient } from 'pl-fe/api'; -import { Entities } from 'pl-fe/entity-store/entities'; +import { getClient } from '@/api'; +import { Entities } from '@/entity-store/entities'; import { queryClient } from '../client'; import { makePaginatedResponseQueryOptions } from '../utils/make-paginated-response-query-options'; import { mutationOptions } from '../utils/mutation-options'; import type { MinifiedSuggestion } from '../trends/use-suggested-accounts'; +import type { EntityStore } from '@/entity-store/types'; +import type { RootState, Store } from '@/store'; import type { Account } from 'pl-api'; -import type { EntityStore } from 'pl-fe/entity-store/types'; -import type { RootState, Store } from 'pl-fe/store'; let store: Store; -import('pl-fe/store').then((value) => store = value.store).catch(() => {}); +import('@/store').then((value) => store = value.store).catch(() => {}); const domainBlocksQueryOptions = makePaginatedResponseQueryOptions( ['settings', 'domainBlocks'], diff --git a/packages/pl-fe/src/queries/settings/use-account-aliases.ts b/packages/pl-fe/src/queries/settings/use-account-aliases.ts index 0a834f016..70f65785d 100644 --- a/packages/pl-fe/src/queries/settings/use-account-aliases.ts +++ b/packages/pl-fe/src/queries/settings/use-account-aliases.ts @@ -1,10 +1,10 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { defineMessages } from 'react-intl'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import toast from 'pl-fe/toast'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import toast from '@/toast'; const messages = defineMessages({ createSuccess: { id: 'aliases.success.add', defaultMessage: 'Account alias created successfully' }, diff --git a/packages/pl-fe/src/queries/settings/use-backups.ts b/packages/pl-fe/src/queries/settings/use-backups.ts index 2cafcf315..6cf08b50b 100644 --- a/packages/pl-fe/src/queries/settings/use-backups.ts +++ b/packages/pl-fe/src/queries/settings/use-backups.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useClient } from '@/hooks/use-client'; import { queryClient } from '../client'; diff --git a/packages/pl-fe/src/queries/settings/use-interaction-policies.ts b/packages/pl-fe/src/queries/settings/use-interaction-policies.ts index 645df7fa0..5ebd9cad5 100644 --- a/packages/pl-fe/src/queries/settings/use-interaction-policies.ts +++ b/packages/pl-fe/src/queries/settings/use-interaction-policies.ts @@ -2,10 +2,10 @@ import { useMutation, useQuery } from '@tanstack/react-query'; import { type InteractionPolicies, interactionPoliciesSchema } from 'pl-api'; import * as v from 'valibot'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { queryClient } from 'pl-fe/queries/client'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { queryClient } from '@/queries/client'; const emptySchema = v.parse(interactionPoliciesSchema, {}); diff --git a/packages/pl-fe/src/queries/status-lists/use-bookmarks.ts b/packages/pl-fe/src/queries/status-lists/use-bookmarks.ts index 39b7fe8cc..438a93229 100644 --- a/packages/pl-fe/src/queries/status-lists/use-bookmarks.ts +++ b/packages/pl-fe/src/queries/status-lists/use-bookmarks.ts @@ -1,5 +1,5 @@ -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyStatusList } from 'pl-fe/queries/utils/minify-list'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyStatusList } from '@/queries/utils/minify-list'; const useBookmarks = makePaginatedResponseQuery( (folderId?: string) => ['statusLists', 'bookmarks', folderId], diff --git a/packages/pl-fe/src/queries/status-lists/use-favourites.ts b/packages/pl-fe/src/queries/status-lists/use-favourites.ts index a44f4a8e0..5a2fcd443 100644 --- a/packages/pl-fe/src/queries/status-lists/use-favourites.ts +++ b/packages/pl-fe/src/queries/status-lists/use-favourites.ts @@ -1,5 +1,5 @@ -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyStatusList } from 'pl-fe/queries/utils/minify-list'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyStatusList } from '@/queries/utils/minify-list'; const useFavourites = makePaginatedResponseQuery( (accountId?: string) => ['statusLists', 'favourites', accountId], diff --git a/packages/pl-fe/src/queries/status-lists/use-pinned-statuses.ts b/packages/pl-fe/src/queries/status-lists/use-pinned-statuses.ts index bf00c9937..f52dfd522 100644 --- a/packages/pl-fe/src/queries/status-lists/use-pinned-statuses.ts +++ b/packages/pl-fe/src/queries/status-lists/use-pinned-statuses.ts @@ -1,5 +1,5 @@ -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyStatusList } from 'pl-fe/queries/utils/minify-list'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyStatusList } from '@/queries/utils/minify-list'; const usePinnedStatuses = makePaginatedResponseQuery( (accountId: string) => ['statusLists', 'pins', accountId], diff --git a/packages/pl-fe/src/queries/statuses/scheduled-statuses.ts b/packages/pl-fe/src/queries/statuses/scheduled-statuses.ts index 55ee1ff61..d3f262d4a 100644 --- a/packages/pl-fe/src/queries/statuses/scheduled-statuses.ts +++ b/packages/pl-fe/src/queries/statuses/scheduled-statuses.ts @@ -1,7 +1,7 @@ import { infiniteQueryOptions } from '@tanstack/react-query'; import { create } from 'mutative'; -import { getClient } from 'pl-fe/api'; +import { getClient } from '@/api'; import { queryClient } from '../client'; import { makePaginatedResponseQueryOptions } from '../utils/make-paginated-response-query-options'; diff --git a/packages/pl-fe/src/queries/statuses/use-bookmark-folders.ts b/packages/pl-fe/src/queries/statuses/use-bookmark-folders.ts index 635598d9f..b2df29107 100644 --- a/packages/pl-fe/src/queries/statuses/use-bookmark-folders.ts +++ b/packages/pl-fe/src/queries/statuses/use-bookmark-folders.ts @@ -1,7 +1,7 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import { queryClient } from '../client'; diff --git a/packages/pl-fe/src/queries/statuses/use-draft-statuses.ts b/packages/pl-fe/src/queries/statuses/use-draft-statuses.ts index be54c068f..87f30e9cb 100644 --- a/packages/pl-fe/src/queries/statuses/use-draft-statuses.ts +++ b/packages/pl-fe/src/queries/statuses/use-draft-statuses.ts @@ -3,11 +3,11 @@ import { create } from 'mutative'; import { mediaAttachmentSchema } from 'pl-api'; import * as v from 'valibot'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; -import { filteredArray } from 'pl-fe/schemas/utils'; -import KVStore from 'pl-fe/storage/kv-store'; -import { APIEntity } from 'pl-fe/types/entities'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useOwnAccount } from '@/hooks/use-own-account'; +import { filteredArray } from '@/schemas/utils'; +import KVStore from '@/storage/kv-store'; +import { APIEntity } from '@/types/entities'; const draftStatusSchema = v.pipe(v.any(), v.transform((draft) => ({ content_type: draft.contentType, diff --git a/packages/pl-fe/src/queries/statuses/use-event-interactions.ts b/packages/pl-fe/src/queries/statuses/use-event-interactions.ts index d88230d34..290903398 100644 --- a/packages/pl-fe/src/queries/statuses/use-event-interactions.ts +++ b/packages/pl-fe/src/queries/statuses/use-event-interactions.ts @@ -1,11 +1,11 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { defineMessages } from 'react-intl'; -import { EventsAction } from 'pl-fe/actions/events'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import toast from 'pl-fe/toast'; +import { EventsAction } from '@/actions/events'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import toast from '@/toast'; import type { Status } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/statuses/use-interaction-requests.ts b/packages/pl-fe/src/queries/statuses/use-interaction-requests.ts index f54a61e38..ad020970a 100644 --- a/packages/pl-fe/src/queries/statuses/use-interaction-requests.ts +++ b/packages/pl-fe/src/queries/statuses/use-interaction-requests.ts @@ -1,13 +1,13 @@ import { type InfiniteData, useInfiniteQuery, useMutation } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import type { AppDispatch } from '@/store'; import type { InteractionRequest, PaginatedResponse } from 'pl-api'; -import type { AppDispatch } from 'pl-fe/store'; const minifyInteractionRequest = ({ account, status, reply, ...interactionRequest }: InteractionRequest) => ({ account_id: account.id, diff --git a/packages/pl-fe/src/queries/statuses/use-local-status-translation.ts b/packages/pl-fe/src/queries/statuses/use-local-status-translation.ts index 3f6ad4704..87cd3e9b2 100644 --- a/packages/pl-fe/src/queries/statuses/use-local-status-translation.ts +++ b/packages/pl-fe/src/queries/statuses/use-local-status-translation.ts @@ -2,8 +2,8 @@ import { useQuery } from '@tanstack/react-query'; import { translationSchema, type Translation } from 'pl-api'; import * as v from 'valibot'; -import { useAppSelector } from 'pl-fe/hooks/use-app-selector'; -import { useLanguageModelAvailabilityActions } from 'pl-fe/stores/language-model-availability'; +import { useAppSelector } from '@/hooks/use-app-selector'; +import { useLanguageModelAvailabilityActions } from '@/stores/language-model-availability'; const useLocalStatusTranslation = (statusId: string, targetLanguage?: string) => { const status = useAppSelector((state) => state.statuses[statusId]); diff --git a/packages/pl-fe/src/queries/statuses/use-poll.ts b/packages/pl-fe/src/queries/statuses/use-poll.ts index 5c40d9542..4996f5737 100644 --- a/packages/pl-fe/src/queries/statuses/use-poll.ts +++ b/packages/pl-fe/src/queries/statuses/use-poll.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { useClient } from '@/hooks/use-client'; import type { Poll } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/statuses/use-status-history.ts b/packages/pl-fe/src/queries/statuses/use-status-history.ts index bb2bda943..fdf14bd72 100644 --- a/packages/pl-fe/src/queries/statuses/use-status-history.ts +++ b/packages/pl-fe/src/queries/statuses/use-status-history.ts @@ -1,9 +1,9 @@ import { useQuery } from '@tanstack/react-query'; import { StatusEdit } from 'pl-api'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; const minifyStatusEdit = ({ account, ...statusEdit }: StatusEdit) => ({ account_id: account.id, diff --git a/packages/pl-fe/src/queries/statuses/use-status-interactions.ts b/packages/pl-fe/src/queries/statuses/use-status-interactions.ts index b73291677..242ea9044 100644 --- a/packages/pl-fe/src/queries/statuses/use-status-interactions.ts +++ b/packages/pl-fe/src/queries/statuses/use-status-interactions.ts @@ -1,16 +1,16 @@ import { InfiniteData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { defineMessages } from 'react-intl'; -import { importEntities } from 'pl-fe/actions/importer'; -import { PIN_SUCCESS, UNPIN_SUCCESS, type InteractionsAction } from 'pl-fe/actions/interactions'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyAccountList } from 'pl-fe/queries/utils/minify-list'; -import { useModalsActions } from 'pl-fe/stores/modals'; -import toast, { IToastOptions } from 'pl-fe/toast'; +import { importEntities } from '@/actions/importer'; +import { PIN_SUCCESS, UNPIN_SUCCESS, type InteractionsAction } from '@/actions/interactions'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyAccountList } from '@/queries/utils/minify-list'; +import { useModalsActions } from '@/stores/modals'; +import toast, { IToastOptions } from '@/toast'; import { filterById } from '../utils/filter-id'; diff --git a/packages/pl-fe/src/queries/statuses/use-status-quotes.ts b/packages/pl-fe/src/queries/statuses/use-status-quotes.ts index 928c30b45..e49263aa9 100644 --- a/packages/pl-fe/src/queries/statuses/use-status-quotes.ts +++ b/packages/pl-fe/src/queries/statuses/use-status-quotes.ts @@ -1,5 +1,5 @@ -import { makePaginatedResponseQuery } from 'pl-fe/queries/utils/make-paginated-response-query'; -import { minifyStatusList } from 'pl-fe/queries/utils/minify-list'; +import { makePaginatedResponseQuery } from '@/queries/utils/make-paginated-response-query'; +import { minifyStatusList } from '@/queries/utils/minify-list'; const useStatusQuotes = makePaginatedResponseQuery( (statusId: string) => ['statusLists', 'quotes', statusId], diff --git a/packages/pl-fe/src/queries/statuses/use-status-translation.ts b/packages/pl-fe/src/queries/statuses/use-status-translation.ts index 6cc0897de..cc852396e 100644 --- a/packages/pl-fe/src/queries/statuses/use-status-translation.ts +++ b/packages/pl-fe/src/queries/statuses/use-status-translation.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { batcher } from 'pl-fe/api/batcher'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { batcher } from '@/api/batcher'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import type { Translation } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/suggestions.ts b/packages/pl-fe/src/queries/suggestions.ts index 0d8690e14..689fa2e23 100644 --- a/packages/pl-fe/src/queries/suggestions.ts +++ b/packages/pl-fe/src/queries/suggestions.ts @@ -1,10 +1,10 @@ import { useMutation, keepPreviousData, useQuery } from '@tanstack/react-query'; -import { fetchRelationships } from 'pl-fe/actions/accounts'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { fetchRelationships } from '@/actions/accounts'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useLoggedIn } from '@/hooks/use-logged-in'; import { removePageItem } from '../utils/queries'; diff --git a/packages/pl-fe/src/queries/trends.test.ts b/packages/pl-fe/src/queries/trends.test.ts index cbc5b6f8d..cd8a410e4 100644 --- a/packages/pl-fe/src/queries/trends.test.ts +++ b/packages/pl-fe/src/queries/trends.test.ts @@ -1,5 +1,5 @@ -import { __stub } from 'pl-fe/api'; -import { queryClient, renderHook, waitFor } from 'pl-fe/jest/test-helpers'; +import { __stub } from '@/api'; +import { queryClient, renderHook, waitFor } from '@/jest/test-helpers'; import useTrends from './trends'; diff --git a/packages/pl-fe/src/queries/trends.ts b/packages/pl-fe/src/queries/trends.ts index 6e22e4b67..d405fa272 100644 --- a/packages/pl-fe/src/queries/trends.ts +++ b/packages/pl-fe/src/queries/trends.ts @@ -1,8 +1,8 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; import type { Tag } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/trends/use-suggested-accounts.ts b/packages/pl-fe/src/queries/trends/use-suggested-accounts.ts index a7cbf2d9c..dc14e585d 100644 --- a/packages/pl-fe/src/queries/trends/use-suggested-accounts.ts +++ b/packages/pl-fe/src/queries/trends/use-suggested-accounts.ts @@ -1,9 +1,9 @@ import { useQuery } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; import type { Suggestion } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/trends/use-trending-links.ts b/packages/pl-fe/src/queries/trends/use-trending-links.ts index e8b830e26..04b24a74c 100644 --- a/packages/pl-fe/src/queries/trends/use-trending-links.ts +++ b/packages/pl-fe/src/queries/trends/use-trending-links.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; const useTrendingLinks = () => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/trends/use-trending-statuses.ts b/packages/pl-fe/src/queries/trends/use-trending-statuses.ts index 675a7c71a..2b3642ac7 100644 --- a/packages/pl-fe/src/queries/trends/use-trending-statuses.ts +++ b/packages/pl-fe/src/queries/trends/use-trending-statuses.ts @@ -1,9 +1,9 @@ import { useQuery } from '@tanstack/react-query'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; +import { importEntities } from '@/actions/importer'; +import { useAppDispatch } from '@/hooks/use-app-dispatch'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; const useTrendingStatuses = () => { const client = useClient(); diff --git a/packages/pl-fe/src/queries/utils/make-paginated-response-query-options.ts b/packages/pl-fe/src/queries/utils/make-paginated-response-query-options.ts index 33f163b97..01ae6a2ea 100644 --- a/packages/pl-fe/src/queries/utils/make-paginated-response-query-options.ts +++ b/packages/pl-fe/src/queries/utils/make-paginated-response-query-options.ts @@ -1,6 +1,6 @@ import { type InfiniteData, infiniteQueryOptions, type QueryKey } from '@tanstack/react-query'; -import { store } from 'pl-fe/store'; +import { store } from '@/store'; import { PaginatedResponseArray } from './make-paginated-response-query'; diff --git a/packages/pl-fe/src/queries/utils/make-paginated-response-query.ts b/packages/pl-fe/src/queries/utils/make-paginated-response-query.ts index 9d078472a..829930ba6 100644 --- a/packages/pl-fe/src/queries/utils/make-paginated-response-query.ts +++ b/packages/pl-fe/src/queries/utils/make-paginated-response-query.ts @@ -1,7 +1,7 @@ import { type InfiniteData, type QueryKey, useInfiniteQuery } from '@tanstack/react-query'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useOwnAccount } from 'pl-fe/hooks/use-own-account'; +import { useClient } from '@/hooks/use-client'; +import { useOwnAccount } from '@/hooks/use-own-account'; import type { PaginatedResponse, PlApiClient } from 'pl-api'; diff --git a/packages/pl-fe/src/queries/utils/minify-list.ts b/packages/pl-fe/src/queries/utils/minify-list.ts index a30d76630..4bef0bd03 100644 --- a/packages/pl-fe/src/queries/utils/minify-list.ts +++ b/packages/pl-fe/src/queries/utils/minify-list.ts @@ -1,5 +1,5 @@ -import { importEntities } from 'pl-fe/actions/importer'; -import { store } from 'pl-fe/store'; +import { importEntities } from '@/actions/importer'; +import { store } from '@/store'; import { queryClient } from '../client'; diff --git a/packages/pl-fe/src/reducers/accounts-meta.ts b/packages/pl-fe/src/reducers/accounts-meta.ts index 2018840e5..94f6fdbac 100644 --- a/packages/pl-fe/src/reducers/accounts-meta.ts +++ b/packages/pl-fe/src/reducers/accounts-meta.ts @@ -4,8 +4,8 @@ */ import { create, type Immutable } from 'mutative'; -import { VERIFY_CREDENTIALS_SUCCESS, AUTH_ACCOUNT_REMEMBER_SUCCESS, type AuthAction } from 'pl-fe/actions/auth'; -import { ME_FETCH_SUCCESS, ME_PATCH_SUCCESS, type MeAction } from 'pl-fe/actions/me'; +import { VERIFY_CREDENTIALS_SUCCESS, AUTH_ACCOUNT_REMEMBER_SUCCESS, type AuthAction } from '@/actions/auth'; +import { ME_FETCH_SUCCESS, ME_PATCH_SUCCESS, type MeAction } from '@/actions/me'; import type { Account, CredentialAccount } from 'pl-api'; diff --git a/packages/pl-fe/src/reducers/admin.ts b/packages/pl-fe/src/reducers/admin.ts index a9965daff..5df57f656 100644 --- a/packages/pl-fe/src/reducers/admin.ts +++ b/packages/pl-fe/src/reducers/admin.ts @@ -5,9 +5,9 @@ import { ADMIN_CONFIG_UPDATE_SUCCESS, // ADMIN_USER_DELETE_SUCCESS, type AdminActions, -} from 'pl-fe/actions/admin'; +} from '@/actions/admin'; -import type { Config } from 'pl-fe/utils/config-db'; +import type { Config } from '@/utils/config-db'; interface State { configs: Array; diff --git a/packages/pl-fe/src/reducers/auth.test.ts b/packages/pl-fe/src/reducers/auth.test.ts index f9cc4bfc0..6e7913344 100644 --- a/packages/pl-fe/src/reducers/auth.test.ts +++ b/packages/pl-fe/src/reducers/auth.test.ts @@ -7,10 +7,10 @@ import { VERIFY_CREDENTIALS_SUCCESS, VERIFY_CREDENTIALS_FAIL, SWITCH_ACCOUNT, -} from 'pl-fe/actions/auth'; -import { ME_FETCH_SKIP } from 'pl-fe/actions/me'; -import { MASTODON_PRELOAD_IMPORT } from 'pl-fe/actions/preload'; -import { buildAccount } from 'pl-fe/jest/factory'; +} from '@/actions/auth'; +import { ME_FETCH_SKIP } from '@/actions/me'; +import { MASTODON_PRELOAD_IMPORT } from '@/actions/preload'; +import { buildAccount } from '@/jest/factory'; import reducer, { AuthAppRecord, AuthTokenRecord, AuthUserRecord, ReducerRecord } from './auth'; @@ -318,7 +318,7 @@ describe('auth reducer', () => { describe('MASTODON_PRELOAD_IMPORT', () => { it('imports the user and token', async () => { - const data = await import('pl-fe/__fixtures__/mastodon_initial_state.json'); + const data = await import('@/__fixtures__/mastodon_initial_state.json'); const action = { type: MASTODON_PRELOAD_IMPORT, diff --git a/packages/pl-fe/src/reducers/auth.ts b/packages/pl-fe/src/reducers/auth.ts index 57c87bfe6..89f91c5cc 100644 --- a/packages/pl-fe/src/reducers/auth.ts +++ b/packages/pl-fe/src/reducers/auth.ts @@ -3,11 +3,11 @@ import { create, Draft } from 'mutative'; import { type Account as AccountEntity, applicationSchema, instanceSchema, PlApiClient, tokenSchema, type CredentialAccount, type CredentialApplication, type Token } from 'pl-api'; import * as v from 'valibot'; -import { decodeFromMarkup, MASTODON_PRELOAD_IMPORT, pleromaDecoder, type PreloadAction } from 'pl-fe/actions/preload'; -import * as BuildConfig from 'pl-fe/build-config'; -import { coerceObject } from 'pl-fe/schemas/utils'; -import KVStore from 'pl-fe/storage/kv-store'; -import { validId, isURL, parseBaseURL } from 'pl-fe/utils/auth'; +import { decodeFromMarkup, MASTODON_PRELOAD_IMPORT, pleromaDecoder, type PreloadAction } from '@/actions/preload'; +import * as BuildConfig from '@/build-config'; +import { coerceObject } from '@/schemas/utils'; +import KVStore from '@/storage/kv-store'; +import { validId, isURL, parseBaseURL } from '@/utils/auth'; import { AUTH_APP_CREATED, @@ -21,7 +21,7 @@ import { } from '../actions/auth'; import { ME_FETCH_SKIP, type MeAction } from '../actions/me'; -import type { PlfeResponse } from 'pl-fe/api'; +import type { PlfeResponse } from '@/api'; const instance = (() => { try { diff --git a/packages/pl-fe/src/reducers/compose.test.ts b/packages/pl-fe/src/reducers/compose.test.ts index 72aa32bb3..d6baa4fc2 100644 --- a/packages/pl-fe/src/reducers/compose.test.ts +++ b/packages/pl-fe/src/reducers/compose.test.ts @@ -1,10 +1,10 @@ import { List as ImmutableList, Record as ImmutableRecord, fromJS } from 'immutable'; -import * as actions from 'pl-fe/actions/compose'; -import { ME_FETCH_SUCCESS, ME_PATCH_SUCCESS } from 'pl-fe/actions/me'; -import { SETTING_CHANGE } from 'pl-fe/actions/settings'; -import { TIMELINE_DELETE } from 'pl-fe/actions/timelines'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; +import * as actions from '@/actions/compose'; +import { ME_FETCH_SUCCESS, ME_PATCH_SUCCESS } from '@/actions/me'; +import { SETTING_CHANGE } from '@/actions/settings'; +import { TIMELINE_DELETE } from '@/actions/timelines'; +import { normalizeStatus } from '@/normalizers/status'; import reducer, { initialState, ReducerCompose } from './compose'; @@ -37,7 +37,7 @@ describe('compose reducer', () => { describe('COMPOSE_SET_STATUS', () => { it('strips Pleroma integer attachments', async () => { - const status = await import('pl-fe/__fixtures__/pleroma-status-deleted.json'); + const status = await import('@/__fixtures__/pleroma-status-deleted.json'); const action = { type: actions.COMPOSE_SET_STATUS, @@ -52,7 +52,7 @@ describe('compose reducer', () => { }); it('leaves non-Pleroma integer attachments alone', async () => { - const status = await import('pl-fe/__fixtures__/pleroma-status-deleted.json'); + const status = await import('@/__fixtures__/pleroma-status-deleted.json'); const action = { type: actions.COMPOSE_SET_STATUS, @@ -65,7 +65,7 @@ describe('compose reducer', () => { }); it('sets the id when editing a post', async () => { - const status = await import('pl-fe/__fixtures__/pleroma-status-deleted.json'); + const status = await import('@/__fixtures__/pleroma-status-deleted.json'); const action = { id: 'compose-modal', @@ -79,7 +79,7 @@ describe('compose reducer', () => { }); it('does not set the id when redrafting a post', async () => { - const status = await import('pl-fe/__fixtures__/pleroma-status-deleted.json'); + const status = await import('@/__fixtures__/pleroma-status-deleted.json'); const action = { id: 'compose-modal', diff --git a/packages/pl-fe/src/reducers/compose.ts b/packages/pl-fe/src/reducers/compose.ts index 230d4954c..04885b364 100644 --- a/packages/pl-fe/src/reducers/compose.ts +++ b/packages/pl-fe/src/reducers/compose.ts @@ -1,6 +1,6 @@ import { create } from 'mutative'; -import { INSTANCE_FETCH_SUCCESS, type InstanceAction } from 'pl-fe/actions/instance'; +import { INSTANCE_FETCH_SUCCESS, type InstanceAction } from '@/actions/instance'; import { COMPOSE_CHANGE, @@ -73,10 +73,10 @@ import { FE_NAME } from '../actions/settings'; import { TIMELINE_DELETE, type TimelineAction } from '../actions/timelines'; import { unescapeHTML } from '../utils/html'; +import type { Emoji } from '@/features/emoji'; +import type { Language } from '@/features/preferences'; +import type { Status } from '@/normalizers/status'; import type { Account, CredentialAccount, Instance, InteractionPolicy, Location, MediaAttachment, Status as BaseStatus, Tag, CreateStatusParams } from 'pl-api'; -import type { Emoji } from 'pl-fe/features/emoji'; -import type { Language } from 'pl-fe/features/preferences'; -import type { Status } from 'pl-fe/normalizers/status'; const getResetFileKey = () => Math.floor((Math.random() * 0x10000)); diff --git a/packages/pl-fe/src/reducers/contexts.test.ts b/packages/pl-fe/src/reducers/contexts.test.ts index 446c95c2e..9ab72f933 100644 --- a/packages/pl-fe/src/reducers/contexts.test.ts +++ b/packages/pl-fe/src/reducers/contexts.test.ts @@ -5,10 +5,10 @@ import { is, } from 'immutable'; -import { STATUS_IMPORT } from 'pl-fe/actions/importer'; -import { CONTEXT_FETCH_SUCCESS } from 'pl-fe/actions/statuses'; -import { TIMELINE_DELETE } from 'pl-fe/actions/timelines'; -import { applyActions } from 'pl-fe/jest/test-helpers'; +import { STATUS_IMPORT } from '@/actions/importer'; +import { CONTEXT_FETCH_SUCCESS } from '@/actions/statuses'; +import { TIMELINE_DELETE } from '@/actions/timelines'; +import { applyActions } from '@/jest/test-helpers'; import reducer, { ReducerRecord } from './contexts'; diff --git a/packages/pl-fe/src/reducers/contexts.ts b/packages/pl-fe/src/reducers/contexts.ts index b1be3388c..087fee1c3 100644 --- a/packages/pl-fe/src/reducers/contexts.ts +++ b/packages/pl-fe/src/reducers/contexts.ts @@ -1,6 +1,6 @@ import { create } from 'mutative'; -import { STATUS_IMPORT, STATUSES_IMPORT, type ImporterAction } from 'pl-fe/actions/importer'; +import { STATUS_IMPORT, STATUSES_IMPORT, type ImporterAction } from '@/actions/importer'; import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS, type AccountsAction } from '../actions/accounts'; import { diff --git a/packages/pl-fe/src/reducers/conversations.test.ts b/packages/pl-fe/src/reducers/conversations.test.ts index 80241be77..89027b95c 100644 --- a/packages/pl-fe/src/reducers/conversations.test.ts +++ b/packages/pl-fe/src/reducers/conversations.test.ts @@ -1,6 +1,6 @@ import { List as ImmutableList, Record as ImmutableRecord } from 'immutable'; -import * as actions from 'pl-fe/actions/conversations'; +import * as actions from '@/actions/conversations'; import reducer from './conversations'; diff --git a/packages/pl-fe/src/reducers/index.ts b/packages/pl-fe/src/reducers/index.ts index 713ded7b5..c8d61ad13 100644 --- a/packages/pl-fe/src/reducers/index.ts +++ b/packages/pl-fe/src/reducers/index.ts @@ -1,8 +1,8 @@ import { combineReducers } from '@reduxjs/toolkit'; -import { AUTH_LOGGED_OUT } from 'pl-fe/actions/auth'; -import * as BuildConfig from 'pl-fe/build-config'; -import entities from 'pl-fe/entity-store/reducer'; +import { AUTH_LOGGED_OUT } from '@/actions/auth'; +import * as BuildConfig from '@/build-config'; +import entities from '@/entity-store/reducer'; import accounts_meta from './accounts-meta'; import admin from './admin'; diff --git a/packages/pl-fe/src/reducers/instance.test.ts b/packages/pl-fe/src/reducers/instance.test.ts index 9584a47b0..5a0c87a82 100644 --- a/packages/pl-fe/src/reducers/instance.test.ts +++ b/packages/pl-fe/src/reducers/instance.test.ts @@ -1,4 +1,4 @@ -import { ADMIN_CONFIG_UPDATE_REQUEST } from 'pl-fe/actions/admin'; +import { ADMIN_CONFIG_UPDATE_REQUEST } from '@/actions/admin'; import reducer from './instance'; @@ -31,7 +31,7 @@ describe('instance reducer', () => { }); describe('ADMIN_CONFIG_UPDATE_REQUEST', async () => { - const { configs } = await import('pl-fe/__fixtures__/pleroma-admin-config.json'); + const { configs } = await import('@/__fixtures__/pleroma-admin-config.json'); it('imports the configs', () => { const action = { diff --git a/packages/pl-fe/src/reducers/instance.ts b/packages/pl-fe/src/reducers/instance.ts index 720eb3209..743478be0 100644 --- a/packages/pl-fe/src/reducers/instance.ts +++ b/packages/pl-fe/src/reducers/instance.ts @@ -2,11 +2,11 @@ import { create } from 'mutative'; import { type Instance, instanceSchema, PleromaConfig } from 'pl-api'; import * as v from 'valibot'; -import { ADMIN_CONFIG_UPDATE_REQUEST, ADMIN_CONFIG_UPDATE_SUCCESS, type AdminActions } from 'pl-fe/actions/admin'; -import { INSTANCE_FETCH_FAIL, INSTANCE_FETCH_SUCCESS, type InstanceAction } from 'pl-fe/actions/instance'; -import { PLEROMA_PRELOAD_IMPORT, type PreloadAction } from 'pl-fe/actions/preload'; -import KVStore from 'pl-fe/storage/kv-store'; -import ConfigDB from 'pl-fe/utils/config-db'; +import { ADMIN_CONFIG_UPDATE_REQUEST, ADMIN_CONFIG_UPDATE_SUCCESS, type AdminActions } from '@/actions/admin'; +import { INSTANCE_FETCH_FAIL, INSTANCE_FETCH_SUCCESS, type InstanceAction } from '@/actions/instance'; +import { PLEROMA_PRELOAD_IMPORT, type PreloadAction } from '@/actions/preload'; +import KVStore from '@/storage/kv-store'; +import ConfigDB from '@/utils/config-db'; const initialState: State = { fetched: false, ...v.parse(instanceSchema, {}) }; diff --git a/packages/pl-fe/src/reducers/me.ts b/packages/pl-fe/src/reducers/me.ts index 97686ce74..c44320bc9 100644 --- a/packages/pl-fe/src/reducers/me.ts +++ b/packages/pl-fe/src/reducers/me.ts @@ -12,8 +12,8 @@ import { type MeAction, } from '../actions/me'; -import type { PlfeResponse } from 'pl-fe/api'; -import type { Me } from 'pl-fe/types/pl-fe'; +import type { PlfeResponse } from '@/api'; +import type { Me } from '@/types/pl-fe'; const initialState: Me = null; diff --git a/packages/pl-fe/src/reducers/meta.ts b/packages/pl-fe/src/reducers/meta.ts index 3e8b47abd..a4ff2b389 100644 --- a/packages/pl-fe/src/reducers/meta.ts +++ b/packages/pl-fe/src/reducers/meta.ts @@ -1,4 +1,4 @@ -import { STANDALONE_CHECK_SUCCESS, type InstanceAction } from 'pl-fe/actions/instance'; +import { STANDALONE_CHECK_SUCCESS, type InstanceAction } from '@/actions/instance'; const initialState = { /** Whether /api/v1/instance 404'd (and we should display the external auth form). */ diff --git a/packages/pl-fe/src/reducers/pending-statuses.ts b/packages/pl-fe/src/reducers/pending-statuses.ts index 416b91d5a..8c30006a8 100644 --- a/packages/pl-fe/src/reducers/pending-statuses.ts +++ b/packages/pl-fe/src/reducers/pending-statuses.ts @@ -6,9 +6,9 @@ import { STATUS_CREATE_REQUEST, STATUS_CREATE_SUCCESS, type StatusesAction, -} from 'pl-fe/actions/statuses'; +} from '@/actions/statuses'; -import type { StatusVisibility } from 'pl-fe/normalizers/status'; +import type { StatusVisibility } from '@/normalizers/status'; interface PendingStatus { content_type: string; diff --git a/packages/pl-fe/src/reducers/pl-fe.test.ts b/packages/pl-fe/src/reducers/pl-fe.test.ts index f7e83e4c1..711895087 100644 --- a/packages/pl-fe/src/reducers/pl-fe.test.ts +++ b/packages/pl-fe/src/reducers/pl-fe.test.ts @@ -1,9 +1,9 @@ import { Map as ImmutableMap } from 'immutable'; -import plFeConfig from 'pl-fe/__fixtures__/admin_api_frontend_config.json'; -import plfe from 'pl-fe/__fixtures__/pl-fe.json'; -import { ADMIN_CONFIG_UPDATE_SUCCESS } from 'pl-fe/actions/admin'; -import * as actions from 'pl-fe/actions/pl-fe'; +import plFeConfig from '@/__fixtures__/admin_api_frontend_config.json'; +import plfe from '@/__fixtures__/pl-fe.json'; +import { ADMIN_CONFIG_UPDATE_SUCCESS } from '@/actions/admin'; +import * as actions from '@/actions/pl-fe'; import reducer from './pl-fe'; diff --git a/packages/pl-fe/src/reducers/pl-fe.ts b/packages/pl-fe/src/reducers/pl-fe.ts index 77affd122..9aac3d10c 100644 --- a/packages/pl-fe/src/reducers/pl-fe.ts +++ b/packages/pl-fe/src/reducers/pl-fe.ts @@ -1,6 +1,6 @@ -import { PLEROMA_PRELOAD_IMPORT } from 'pl-fe/actions/preload'; -import KVStore from 'pl-fe/storage/kv-store'; -import ConfigDB from 'pl-fe/utils/config-db'; +import { PLEROMA_PRELOAD_IMPORT } from '@/actions/preload'; +import KVStore from '@/storage/kv-store'; +import ConfigDB from '@/utils/config-db'; import { ADMIN_CONFIG_UPDATE_SUCCESS } from '../actions/admin'; import { @@ -9,8 +9,8 @@ import { PLFE_CONFIG_REQUEST_FAIL, } from '../actions/pl-fe'; +import type { PlFeConfig } from '@/normalizers/pl-fe/pl-fe-config'; import type { PleromaConfig } from 'pl-api'; -import type { PlFeConfig } from 'pl-fe/normalizers/pl-fe/pl-fe-config'; const initialState: Partial = {}; diff --git a/packages/pl-fe/src/reducers/push-notifications.ts b/packages/pl-fe/src/reducers/push-notifications.ts index dd38c9e0f..9ef6effc7 100644 --- a/packages/pl-fe/src/reducers/push-notifications.ts +++ b/packages/pl-fe/src/reducers/push-notifications.ts @@ -2,7 +2,7 @@ import { create } from 'mutative'; import { SET_BROWSER_SUPPORT, SET_SUBSCRIPTION, CLEAR_SUBSCRIPTION } from '../actions/push-notifications/setter'; -import type { SetterAction } from 'pl-fe/actions/push-notifications/setter'; +import type { SetterAction } from '@/actions/push-notifications/setter'; interface Subscription { id: string; diff --git a/packages/pl-fe/src/reducers/statuses.test.ts b/packages/pl-fe/src/reducers/statuses.test.ts index 4bf287745..b4eb857e4 100644 --- a/packages/pl-fe/src/reducers/statuses.test.ts +++ b/packages/pl-fe/src/reducers/statuses.test.ts @@ -3,14 +3,14 @@ import { Record as ImmutableRecord, } from 'immutable'; -import { STATUS_IMPORT } from 'pl-fe/actions/importer'; +import { STATUS_IMPORT } from '@/actions/importer'; import { STATUS_CREATE_REQUEST, STATUS_CREATE_FAIL, STATUS_DELETE_REQUEST, STATUS_DELETE_FAIL, -} from 'pl-fe/actions/statuses'; -import { normalizeStatus } from 'pl-fe/normalizers/status'; +} from '@/actions/statuses'; +import { normalizeStatus } from '@/normalizers/status'; import reducer, { ReducerStatus } from './statuses'; @@ -21,7 +21,7 @@ describe('statuses reducer', () => { describe('STATUS_IMPORT', () => { it('parses the status as a Record', async () => { - const status = await import('pl-fe/__fixtures__/pleroma-quote-post.json'); + const status = await import('@/__fixtures__/pleroma-quote-post.json'); const action = { type: STATUS_IMPORT, status }; const result = reducer(undefined, action).get('AFmFMSpITT9xcOJKcK'); @@ -29,7 +29,7 @@ describe('statuses reducer', () => { }); it('fixes the order of mentions', async () => { - const status = await import('pl-fe/__fixtures__/status-unordered-mentions.json'); + const status = await import('@/__fixtures__/status-unordered-mentions.json'); const action = { type: STATUS_IMPORT, status }; const expected = ['NEETzsche', 'alex', 'Lumeinshin', 'sneeden']; @@ -43,8 +43,8 @@ describe('statuses reducer', () => { }); it('preserves the quote', async () => { - const quotePost = await import('pl-fe/__fixtures__/pleroma-quote-post.json'); - const quotedQuotePost = await import('pl-fe/__fixtures__/pleroma-quote-of-quote-post.json'); + const quotePost = await import('@/__fixtures__/pleroma-quote-post.json'); + const quotedQuotePost = await import('@/__fixtures__/pleroma-quote-of-quote-post.json'); let state = undefined; state = reducer(state, { type: STATUS_IMPORT, status: quotePost }); @@ -54,7 +54,7 @@ describe('statuses reducer', () => { }); it('normalizes Mitra attachments', async () => { - const status = await import('pl-fe/__fixtures__/mitra-status-with-attachments.json'); + const status = await import('@/__fixtures__/mitra-status-with-attachments.json'); const state = reducer(undefined, { type: STATUS_IMPORT, status }); @@ -88,7 +88,7 @@ describe('statuses reducer', () => { }); it('fixes Pleroma attachments', async () => { - const status = await import('pl-fe/__fixtures__/pleroma-status-with-attachments.json'); + const status = await import('@/__fixtures__/pleroma-status-with-attachments.json'); const action = { type: STATUS_IMPORT, status }; const state = reducer(undefined, action); const result = state.get('AGNkA21auFR5lnEAHw')?.media_attachments; @@ -99,7 +99,7 @@ describe('statuses reducer', () => { }); it('hides CWs', async () => { - const status = await import('pl-fe/__fixtures__/status-cw.json'); + const status = await import('@/__fixtures__/status-cw.json'); const action = { type: STATUS_IMPORT, status }; const hidden = reducer(undefined, action).getIn(['107831528995252317', 'hidden']); @@ -107,7 +107,7 @@ describe('statuses reducer', () => { }); it('parses custom emojis', async () => { - const status = await import('pl-fe/__fixtures__/status-custom-emoji.json'); + const status = await import('@/__fixtures__/status-custom-emoji.json'); const action = { type: STATUS_IMPORT, status }; const expected = 'Hello :ablobcathyper: :ageblobcat: 😂 world 😋 test :blobcatphoto:'; @@ -117,7 +117,7 @@ describe('statuses reducer', () => { }); it('builds search_index', async () => { - const status = await import('pl-fe/__fixtures__/status-with-poll.json'); + const status = await import('@/__fixtures__/status-with-poll.json'); const action = { type: STATUS_IMPORT, status }; const expected = `What is tolerance? @@ -131,7 +131,7 @@ Promoting free speech, even for people and ideas you dislike`; }); it('builds search_index with mentions', async () => { - const status = await import('pl-fe/__fixtures__/pleroma-status-reply-with-mentions.json'); + const status = await import('@/__fixtures__/pleroma-status-reply-with-mentions.json'); const action = { type: STATUS_IMPORT, status }; const expected = `DMs are definitely only federated to the servers of the recipients tho. So if I DM a kfcc user, the kfcc admins can see it, but no other instance admins can. diff --git a/packages/pl-fe/src/reducers/statuses.ts b/packages/pl-fe/src/reducers/statuses.ts index 25008bc23..358284dcc 100644 --- a/packages/pl-fe/src/reducers/statuses.ts +++ b/packages/pl-fe/src/reducers/statuses.ts @@ -1,8 +1,8 @@ import omit from 'lodash/omit'; import { create } from 'mutative'; -import { normalizeStatus, Status as StatusRecord } from 'pl-fe/normalizers/status'; -import { simulateEmojiReact, simulateUnEmojiReact } from 'pl-fe/utils/emoji-reacts'; +import { normalizeStatus, Status as StatusRecord } from '@/normalizers/status'; +import { simulateEmojiReact, simulateUnEmojiReact } from '@/utils/emoji-reacts'; import { EMOJI_REACT_FAIL, diff --git a/packages/pl-fe/src/reducers/timelines.test.ts b/packages/pl-fe/src/reducers/timelines.test.ts index 6ea30c8df..3af0421f9 100644 --- a/packages/pl-fe/src/reducers/timelines.test.ts +++ b/packages/pl-fe/src/reducers/timelines.test.ts @@ -4,7 +4,7 @@ import { TIMELINE_EXPAND_REQUEST, TIMELINE_EXPAND_FAIL, TIMELINE_EXPAND_SUCCESS, -} from 'pl-fe/actions/timelines'; +} from '@/actions/timelines'; import reducer from './timelines'; diff --git a/packages/pl-fe/src/reducers/timelines.ts b/packages/pl-fe/src/reducers/timelines.ts index b14594ebb..e19e2b64d 100644 --- a/packages/pl-fe/src/reducers/timelines.ts +++ b/packages/pl-fe/src/reducers/timelines.ts @@ -17,9 +17,9 @@ import { type TimelineAction, } from '../actions/timelines'; +import type { ImportPosition } from '@/entity-store/types'; +import type { Status } from '@/normalizers/status'; import type { PaginatedResponse, Status as BaseStatus, Relationship, CreateStatusParams } from 'pl-api'; -import type { ImportPosition } from 'pl-fe/entity-store/types'; -import type { Status } from 'pl-fe/normalizers/status'; const TRUNCATE_LIMIT = 40; const TRUNCATE_SIZE = 20; diff --git a/packages/pl-fe/src/schemas/pl-fe/settings.ts b/packages/pl-fe/src/schemas/pl-fe/settings.ts index 9cbf2f410..6c5265cbf 100644 --- a/packages/pl-fe/src/schemas/pl-fe/settings.ts +++ b/packages/pl-fe/src/schemas/pl-fe/settings.ts @@ -1,6 +1,6 @@ import * as v from 'valibot'; -import { locales } from 'pl-fe/messages'; +import { locales } from '@/messages'; import { coerceObject } from '../utils'; diff --git a/packages/pl-fe/src/selectors/index.ts b/packages/pl-fe/src/selectors/index.ts index 337742cb3..053265f0d 100644 --- a/packages/pl-fe/src/selectors/index.ts +++ b/packages/pl-fe/src/selectors/index.ts @@ -1,18 +1,18 @@ import { createSelector } from 'reselect'; -import { Entities } from 'pl-fe/entity-store/entities'; -import { useSettingsStore } from 'pl-fe/stores/settings'; -import { getDomain } from 'pl-fe/utils/accounts'; -import { validId } from 'pl-fe/utils/auth'; -import ConfigDB from 'pl-fe/utils/config-db'; -import { shouldFilter } from 'pl-fe/utils/timelines'; +import { Entities } from '@/entity-store/entities'; +import { useSettingsStore } from '@/stores/settings'; +import { getDomain } from '@/utils/accounts'; +import { validId } from '@/utils/auth'; +import ConfigDB from '@/utils/config-db'; +import { shouldFilter } from '@/utils/timelines'; +import type { EntityStore } from '@/entity-store/types'; +import type { minifyAdminReport } from '@/queries/utils/minify-list'; +import type { MinifiedStatus } from '@/reducers/statuses'; +import type { MRFSimple } from '@/schemas/pleroma'; +import type { RootState } from '@/store'; import type { Account, Filter, FilterResult, Group, NotificationGroup } from 'pl-api'; -import type { EntityStore } from 'pl-fe/entity-store/types'; -import type { minifyAdminReport } from 'pl-fe/queries/utils/minify-list'; -import type { MinifiedStatus } from 'pl-fe/reducers/statuses'; -import type { MRFSimple } from 'pl-fe/schemas/pleroma'; -import type { RootState } from 'pl-fe/store'; const selectAccount = (state: RootState, accountId: string) => state.entities[Entities.ACCOUNTS]?.store[accountId] as Account | undefined; diff --git a/packages/pl-fe/src/sentry.ts b/packages/pl-fe/src/sentry.ts index eccbefbe1..4b1776d86 100644 --- a/packages/pl-fe/src/sentry.ts +++ b/packages/pl-fe/src/sentry.ts @@ -1,5 +1,5 @@ -import { NODE_ENV } from 'pl-fe/build-config'; -import sourceCode from 'pl-fe/utils/code'; +import { NODE_ENV } from '@/build-config'; +import sourceCode from '@/utils/code'; import type { CaptureContext, UserFeedback } from '@sentry/types'; import type { Account } from 'pl-api'; diff --git a/packages/pl-fe/src/stores/modals.ts b/packages/pl-fe/src/stores/modals.ts index ada812862..c9b3ec6be 100644 --- a/packages/pl-fe/src/stores/modals.ts +++ b/packages/pl-fe/src/stores/modals.ts @@ -1,44 +1,44 @@ import { create } from 'zustand'; import { mutative } from 'zustand-mutative'; -import type { ICryptoAddress } from 'pl-fe/features/crypto-donate/components/crypto-address'; -import type { ModalType } from 'pl-fe/features/ui/components/modal-root'; -import type { AltTextModalProps } from 'pl-fe/modals/alt-text-modal'; -import type { AntennaEditorModalProps } from 'pl-fe/modals/antenna-editor-modal'; -import type { BlockMuteModalProps } from 'pl-fe/modals/block-mute-modal'; -import type { BoostModalProps } from 'pl-fe/modals/boost-modal'; -import type { CircleEditorModalProps } from 'pl-fe/modals/circle-editor-modal'; -import type { CompareHistoryModalProps } from 'pl-fe/modals/compare-history-modal'; -import type { ComponentModalProps } from 'pl-fe/modals/component-modal'; -import type { ComposeInteractionPolicyModalProps } from 'pl-fe/modals/compose-interaction-policy-modal'; -import type { ComposeModalProps } from 'pl-fe/modals/compose-modal'; -import type { ConfirmationModalProps } from 'pl-fe/modals/confirmation-modal'; -import type { DislikesModalProps } from 'pl-fe/modals/dislikes-modal'; -import type { DropdownMenuModalProps } from 'pl-fe/modals/dropdown-menu-modal'; -import type { EditAnnouncementModalProps } from 'pl-fe/modals/edit-announcement-modal'; -import type { EditBookmarkFolderModalProps } from 'pl-fe/modals/edit-bookmark-folder-modal'; -import type { EditDomainModalProps } from 'pl-fe/modals/edit-domain-modal'; -import type { EditFederationModalProps } from 'pl-fe/modals/edit-federation-modal'; -import type { EditRuleModalProps } from 'pl-fe/modals/edit-rule-modal'; -import type { EmbedModalProps } from 'pl-fe/modals/embed-modal'; -import type { EventMapModalProps } from 'pl-fe/modals/event-map-modal'; -import type { EventParticipantsModalProps } from 'pl-fe/modals/event-participants-modal'; -import type { FamiliarFollowersModalProps } from 'pl-fe/modals/familiar-followers-modal'; -import type { FavouritesModalProps } from 'pl-fe/modals/favourites-modal'; -import type { JoinEventModalProps } from 'pl-fe/modals/join-event-modal'; -import type { ListAdderModalProps } from 'pl-fe/modals/list-adder-modal'; -import type { ListEditorModalProps } from 'pl-fe/modals/list-editor-modal'; -import type { MediaModalProps } from 'pl-fe/modals/media-modal'; -import type { MentionsModalProps } from 'pl-fe/modals/mentions-modal'; -import type { MissingDescriptionModalProps } from 'pl-fe/modals/missing-description-modal'; -import type { ReactionsModalProps } from 'pl-fe/modals/reactions-modal'; -import type { ReblogsModalProps } from 'pl-fe/modals/reblogs-modal'; -import type { ReplyMentionsModalProps } from 'pl-fe/modals/reply-mentions-modal'; -import type { ReportModalProps } from 'pl-fe/modals/report-modal'; -import type { SelectBookmarkFolderModalProps } from 'pl-fe/modals/select-bookmark-folder-modal'; -import type { SelectDriveFileModalProps } from 'pl-fe/modals/select-drive-file-modal'; -import type { TextFieldModalProps } from 'pl-fe/modals/text-field-modal'; -import type { UnauthorizedModalProps } from 'pl-fe/modals/unauthorized-modal'; +import type { ICryptoAddress } from '@/features/crypto-donate/components/crypto-address'; +import type { ModalType } from '@/features/ui/components/modal-root'; +import type { AltTextModalProps } from '@/modals/alt-text-modal'; +import type { AntennaEditorModalProps } from '@/modals/antenna-editor-modal'; +import type { BlockMuteModalProps } from '@/modals/block-mute-modal'; +import type { BoostModalProps } from '@/modals/boost-modal'; +import type { CircleEditorModalProps } from '@/modals/circle-editor-modal'; +import type { CompareHistoryModalProps } from '@/modals/compare-history-modal'; +import type { ComponentModalProps } from '@/modals/component-modal'; +import type { ComposeInteractionPolicyModalProps } from '@/modals/compose-interaction-policy-modal'; +import type { ComposeModalProps } from '@/modals/compose-modal'; +import type { ConfirmationModalProps } from '@/modals/confirmation-modal'; +import type { DislikesModalProps } from '@/modals/dislikes-modal'; +import type { DropdownMenuModalProps } from '@/modals/dropdown-menu-modal'; +import type { EditAnnouncementModalProps } from '@/modals/edit-announcement-modal'; +import type { EditBookmarkFolderModalProps } from '@/modals/edit-bookmark-folder-modal'; +import type { EditDomainModalProps } from '@/modals/edit-domain-modal'; +import type { EditFederationModalProps } from '@/modals/edit-federation-modal'; +import type { EditRuleModalProps } from '@/modals/edit-rule-modal'; +import type { EmbedModalProps } from '@/modals/embed-modal'; +import type { EventMapModalProps } from '@/modals/event-map-modal'; +import type { EventParticipantsModalProps } from '@/modals/event-participants-modal'; +import type { FamiliarFollowersModalProps } from '@/modals/familiar-followers-modal'; +import type { FavouritesModalProps } from '@/modals/favourites-modal'; +import type { JoinEventModalProps } from '@/modals/join-event-modal'; +import type { ListAdderModalProps } from '@/modals/list-adder-modal'; +import type { ListEditorModalProps } from '@/modals/list-editor-modal'; +import type { MediaModalProps } from '@/modals/media-modal'; +import type { MentionsModalProps } from '@/modals/mentions-modal'; +import type { MissingDescriptionModalProps } from '@/modals/missing-description-modal'; +import type { ReactionsModalProps } from '@/modals/reactions-modal'; +import type { ReblogsModalProps } from '@/modals/reblogs-modal'; +import type { ReplyMentionsModalProps } from '@/modals/reply-mentions-modal'; +import type { ReportModalProps } from '@/modals/report-modal'; +import type { SelectBookmarkFolderModalProps } from '@/modals/select-bookmark-folder-modal'; +import type { SelectDriveFileModalProps } from '@/modals/select-drive-file-modal'; +import type { TextFieldModalProps } from '@/modals/text-field-modal'; +import type { UnauthorizedModalProps } from '@/modals/unauthorized-modal'; type OpenModalProps = | [type: 'ALT_TEXT', props: AltTextModalProps] diff --git a/packages/pl-fe/src/stores/settings.ts b/packages/pl-fe/src/stores/settings.ts index 34109d382..7a89d2e6f 100644 --- a/packages/pl-fe/src/stores/settings.ts +++ b/packages/pl-fe/src/stores/settings.ts @@ -4,17 +4,17 @@ import * as v from 'valibot'; import { create } from 'zustand'; import { mutative } from 'zustand-mutative'; -import { settingsSchema, type Settings } from 'pl-fe/schemas/pl-fe/settings'; -import KVStore from 'pl-fe/storage/kv-store'; -import toast from 'pl-fe/toast'; -import { KVStoreRedirectServicesItem, resetRules, setManualRedirectServices, updateRedirectServicesFromUrl, updateRulesFromUrl } from 'pl-fe/utils/url-purify'; +import { settingsSchema, type Settings } from '@/schemas/pl-fe/settings'; +import KVStore from '@/storage/kv-store'; +import toast from '@/toast'; +import { KVStoreRedirectServicesItem, resetRules, setManualRedirectServices, updateRedirectServicesFromUrl, updateRulesFromUrl } from '@/utils/url-purify'; -import type { Emoji } from 'pl-fe/features/emoji'; -import type { store } from 'pl-fe/store'; -import type { APIEntity } from 'pl-fe/types/entities'; +import type { Emoji } from '@/features/emoji'; +import type { store } from '@/store'; +import type { APIEntity } from '@/types/entities'; let lazyStore: typeof store; -import('pl-fe/store').then(({ store }) => lazyStore = store).catch(() => {}); +import('@/store').then(({ store }) => lazyStore = store).catch(() => {}); const messages = defineMessages({ rulesUpdateSuccess: { id: 'url_privacy.update.success', defaultMessage: 'Successfully updated rules database' }, diff --git a/packages/pl-fe/src/stores/shoutbox.ts b/packages/pl-fe/src/stores/shoutbox.ts index 676752aa3..19826d24e 100644 --- a/packages/pl-fe/src/stores/shoutbox.ts +++ b/packages/pl-fe/src/stores/shoutbox.ts @@ -2,16 +2,16 @@ import { useEffect } from 'react'; import { create } from 'zustand'; import { mutative } from 'zustand-mutative'; -import { importEntities } from 'pl-fe/actions/importer'; -import { useClient } from 'pl-fe/hooks/use-client'; -import { useFeatures } from 'pl-fe/hooks/use-features'; -import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; +import { importEntities } from '@/actions/importer'; +import { useClient } from '@/hooks/use-client'; +import { useFeatures } from '@/hooks/use-features'; +import { useLoggedIn } from '@/hooks/use-logged-in'; +import type { store } from '@/store'; import type { PlApiClient, ShoutMessage as BaseShoutMessage } from 'pl-api'; -import type { store } from 'pl-fe/store'; let lazyStore: typeof store; -import('pl-fe/store').then(({ store }) => lazyStore = store).catch(() => {}); +import('@/store').then(({ store }) => lazyStore = store).catch(() => {}); const minifyMessage = ({ author, ...message }: BaseShoutMessage) => ({ author_id: author.id, diff --git a/packages/pl-fe/src/toast.test.tsx b/packages/pl-fe/src/toast.test.tsx index f7af5215c..af23c7e60 100644 --- a/packages/pl-fe/src/toast.test.tsx +++ b/packages/pl-fe/src/toast.test.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { Toaster } from 'react-hot-toast'; import { IntlProvider } from 'react-intl'; -import { act, screen } from 'pl-fe/jest/test-helpers'; +import { act, screen } from '@/jest/test-helpers'; import toast from './toast'; diff --git a/packages/pl-fe/src/utils/auth.ts b/packages/pl-fe/src/utils/auth.ts index 59cd8e545..54caa862b 100644 --- a/packages/pl-fe/src/utils/auth.ts +++ b/packages/pl-fe/src/utils/auth.ts @@ -1,6 +1,6 @@ -import { selectAccount, selectOwnAccount } from 'pl-fe/selectors'; +import { selectAccount, selectOwnAccount } from '@/selectors'; -import type { RootState } from 'pl-fe/store'; +import type { RootState } from '@/store'; const validId = (id: any) => typeof id === 'string' && id !== 'null' && id !== 'undefined'; diff --git a/packages/pl-fe/src/utils/badges.test.ts b/packages/pl-fe/src/utils/badges.test.ts index 889c2805a..2dff7a903 100644 --- a/packages/pl-fe/src/utils/badges.test.ts +++ b/packages/pl-fe/src/utils/badges.test.ts @@ -1,4 +1,4 @@ -import { buildAccount } from 'pl-fe/jest/factory'; +import { buildAccount } from '@/jest/factory'; import { tagToBadge, diff --git a/packages/pl-fe/src/utils/chats.test.ts b/packages/pl-fe/src/utils/chats.test.ts index c4c660bd0..cb6bee96e 100644 --- a/packages/pl-fe/src/utils/chats.test.ts +++ b/packages/pl-fe/src/utils/chats.test.ts @@ -1,7 +1,7 @@ -import { buildAccount } from 'pl-fe/jest/factory'; -import { normalizeChatMessage } from 'pl-fe/normalizers/chat-message'; -import { ChatKeys, IChat } from 'pl-fe/queries/chats'; -import { queryClient } from 'pl-fe/queries/client'; +import { buildAccount } from '@/jest/factory'; +import { normalizeChatMessage } from '@/normalizers/chat-message'; +import { ChatKeys, IChat } from '@/queries/chats'; +import { queryClient } from '@/queries/client'; import { updateChatMessage } from './chats'; diff --git a/packages/pl-fe/src/utils/chats.ts b/packages/pl-fe/src/utils/chats.ts index 391fefc04..25610b6b8 100644 --- a/packages/pl-fe/src/utils/chats.ts +++ b/packages/pl-fe/src/utils/chats.ts @@ -1,8 +1,8 @@ import sumBy from 'lodash/sumBy'; -import { normalizeChatMessage } from 'pl-fe/normalizers/chat-message'; -import { ChatKeys } from 'pl-fe/queries/chats'; -import { queryClient } from 'pl-fe/queries/client'; +import { normalizeChatMessage } from '@/normalizers/chat-message'; +import { ChatKeys } from '@/queries/chats'; +import { queryClient } from '@/queries/client'; import { compareDate } from './comparators'; import { appendPageItem, flattenPages, sortQueryData, updatePageItem } from './queries'; diff --git a/packages/pl-fe/src/utils/check-instance-capability.ts b/packages/pl-fe/src/utils/check-instance-capability.ts index 8425648a3..23452552d 100644 --- a/packages/pl-fe/src/utils/check-instance-capability.ts +++ b/packages/pl-fe/src/utils/check-instance-capability.ts @@ -1,4 +1,4 @@ -import KVStore from 'pl-fe/storage/kv-store'; +import KVStore from '@/storage/kv-store'; type DomainCapabilities = { lastChecked: number; diff --git a/packages/pl-fe/src/utils/colors.ts b/packages/pl-fe/src/utils/colors.ts index 83fbf1e52..fac599099 100644 --- a/packages/pl-fe/src/utils/colors.ts +++ b/packages/pl-fe/src/utils/colors.ts @@ -25,7 +25,7 @@ SOFTWARE. // Adapted from: // https://github.com/javisperez/tailwindcolorshades/blob/master/src/composables/colors.ts -import type { Rgb, TailwindColorObject } from 'pl-fe/types/colors'; +import type { Rgb, TailwindColorObject } from '@/types/colors'; const hexToRgb = (hex: string): Rgb | null => { const sanitizedHex = hex.replace(/##/g, '#'); diff --git a/packages/pl-fe/src/utils/config-db.test.ts b/packages/pl-fe/src/utils/config-db.test.ts index 1fb991caa..c9c73eb2e 100644 --- a/packages/pl-fe/src/utils/config-db.test.ts +++ b/packages/pl-fe/src/utils/config-db.test.ts @@ -1,6 +1,6 @@ import { List as ImmutableList, fromJS } from 'immutable'; -import config_db from 'pl-fe/__fixtures__/config_db.json'; +import config_db from '@/__fixtures__/config_db.json'; import { ConfigDB } from './config-db'; diff --git a/packages/pl-fe/src/utils/config-db.ts b/packages/pl-fe/src/utils/config-db.ts index 8f7e0e122..bc095b211 100644 --- a/packages/pl-fe/src/utils/config-db.ts +++ b/packages/pl-fe/src/utils/config-db.ts @@ -1,7 +1,7 @@ import trimStart from 'lodash/trimStart'; import * as v from 'valibot'; -import { mrfSimpleSchema, type MRFSimple } from 'pl-fe/schemas/pleroma'; +import { mrfSimpleSchema, type MRFSimple } from '@/schemas/pleroma'; import type { PleromaConfig } from 'pl-api'; diff --git a/packages/pl-fe/src/utils/numbers.test.tsx b/packages/pl-fe/src/utils/numbers.test.tsx index 4b883d218..747d7c59b 100644 --- a/packages/pl-fe/src/utils/numbers.test.tsx +++ b/packages/pl-fe/src/utils/numbers.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { render, screen } from 'pl-fe/jest/test-helpers'; +import { render, screen } from '@/jest/test-helpers'; import { isIntegerId, shortNumberFormat } from './numbers'; diff --git a/packages/pl-fe/src/utils/queries.test.ts b/packages/pl-fe/src/utils/queries.test.ts index 3c85b6ee5..451a76b32 100644 --- a/packages/pl-fe/src/utils/queries.test.ts +++ b/packages/pl-fe/src/utils/queries.test.ts @@ -1,6 +1,6 @@ import { InfiniteData } from '@tanstack/react-query'; -import { queryClient } from 'pl-fe/queries/client'; +import { queryClient } from '@/queries/client'; import { PaginatedResult, sortQueryData, updatePageItem } from './queries'; diff --git a/packages/pl-fe/src/utils/queries.ts b/packages/pl-fe/src/utils/queries.ts index 7cae4da8b..576755ab6 100644 --- a/packages/pl-fe/src/utils/queries.ts +++ b/packages/pl-fe/src/utils/queries.ts @@ -1,4 +1,4 @@ -import { queryClient } from 'pl-fe/queries/client'; +import { queryClient } from '@/queries/client'; import type { InfiniteData, QueryKey } from '@tanstack/react-query'; import type { PaginatedResponse } from 'pl-api'; diff --git a/packages/pl-fe/src/utils/scopes.ts b/packages/pl-fe/src/utils/scopes.ts index a86a9fb10..cd25e1e37 100644 --- a/packages/pl-fe/src/utils/scopes.ts +++ b/packages/pl-fe/src/utils/scopes.ts @@ -1,6 +1,6 @@ import { getFeatures, HOLLO, ICESHRIMP_NET, PLEROMA, TOKI, type Instance } from 'pl-api'; -import type { RootState } from 'pl-fe/store'; +import type { RootState } from '@/store'; /** * Get the OAuth scopes to use for login & signup. diff --git a/packages/pl-fe/src/utils/sounds.ts b/packages/pl-fe/src/utils/sounds.ts index 08540e4c5..d618699a9 100644 --- a/packages/pl-fe/src/utils/sounds.ts +++ b/packages/pl-fe/src/utils/sounds.ts @@ -1,7 +1,7 @@ -import boopMp3 from 'pl-fe/assets/sounds/boop.mp3'; -import boopOgg from 'pl-fe/assets/sounds/boop.ogg'; -import chatMp3 from 'pl-fe/assets/sounds/chat.mp3'; -import chatOgg from 'pl-fe/assets/sounds/chat.ogg'; +import boopMp3 from '@/assets/sounds/boop.mp3'; +import boopOgg from '@/assets/sounds/boop.ogg'; +import chatMp3 from '@/assets/sounds/chat.mp3'; +import chatOgg from '@/assets/sounds/chat.ogg'; /** pl-fe audio clip. */ interface Sound { diff --git a/packages/pl-fe/src/utils/state.ts b/packages/pl-fe/src/utils/state.ts index f461bff42..f49775b8f 100644 --- a/packages/pl-fe/src/utils/state.ts +++ b/packages/pl-fe/src/utils/state.ts @@ -3,13 +3,13 @@ * @module pl-fe/utils/state */ -import { getPlFeConfig } from 'pl-fe/actions/pl-fe'; -import * as BuildConfig from 'pl-fe/build-config'; -import { isPrerendered } from 'pl-fe/precheck'; -import { selectOwnAccount } from 'pl-fe/selectors'; -import { isURL } from 'pl-fe/utils/auth'; +import { getPlFeConfig } from '@/actions/pl-fe'; +import * as BuildConfig from '@/build-config'; +import { isPrerendered } from '@/precheck'; +import { selectOwnAccount } from '@/selectors'; +import { isURL } from '@/utils/auth'; -import type { RootState } from 'pl-fe/store'; +import type { RootState } from '@/store'; /** Whether to display the fqn instead of the acct. */ const displayFqn = (state: RootState): boolean => getPlFeConfig(state).displayFqn; diff --git a/packages/pl-fe/src/utils/static.ts b/packages/pl-fe/src/utils/static.ts index 28bf07c76..9f81c4997 100644 --- a/packages/pl-fe/src/utils/static.ts +++ b/packages/pl-fe/src/utils/static.ts @@ -5,7 +5,7 @@ import { join } from 'path-browserify'; -import * as BuildConfig from 'pl-fe/build-config'; +import * as BuildConfig from '@/build-config'; /** Gets the path to a file with build configuration being considered. */ const joinPublicPath = (...paths: string[]): string => join(BuildConfig.FE_SUBDIRECTORY, ...paths); diff --git a/packages/pl-fe/src/utils/status.test.ts b/packages/pl-fe/src/utils/status.test.ts index 89a5aa53b..e00e0ed5b 100644 --- a/packages/pl-fe/src/utils/status.test.ts +++ b/packages/pl-fe/src/utils/status.test.ts @@ -1,4 +1,4 @@ -import { buildStatus } from 'pl-fe/jest/factory'; +import { buildStatus } from '@/jest/factory'; import { hasIntegerMediaIds, @@ -7,7 +7,7 @@ import { describe('hasIntegerMediaIds()', () => { it('returns true for a Pleroma deleted status', async () => { - const status = buildStatus(await import('pl-fe/__fixtures__/pleroma-status-deleted.json') as any); + const status = buildStatus(await import('@/__fixtures__/pleroma-status-deleted.json') as any); expect(hasIntegerMediaIds(status)).toBe(true); }); }); diff --git a/packages/pl-fe/src/utils/status.ts b/packages/pl-fe/src/utils/status.ts index b7e149149..0c30075ac 100644 --- a/packages/pl-fe/src/utils/status.ts +++ b/packages/pl-fe/src/utils/status.ts @@ -1,6 +1,6 @@ -import { isIntegerId } from 'pl-fe/utils/numbers'; +import { isIntegerId } from '@/utils/numbers'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; import type { IntlShape } from 'react-intl'; /** Get the initial visibility of media attachments from user settings. */ diff --git a/packages/pl-fe/src/utils/tailwind.ts b/packages/pl-fe/src/utils/tailwind.ts index 72387334a..2b896bc50 100644 --- a/packages/pl-fe/src/utils/tailwind.ts +++ b/packages/pl-fe/src/utils/tailwind.ts @@ -1,7 +1,7 @@ -import tintify from 'pl-fe/utils/colors'; -import { generateAccent, generateNeutral } from 'pl-fe/utils/theme'; +import tintify from '@/utils/colors'; +import { generateAccent, generateNeutral } from '@/utils/theme'; -import type { TailwindColorPalette } from 'pl-fe/types/colors'; +import type { TailwindColorPalette } from '@/types/colors'; type PlFeColors = Record>; diff --git a/packages/pl-fe/src/utils/theme.ts b/packages/pl-fe/src/utils/theme.ts index 0b810e5e3..a627fcf53 100644 --- a/packages/pl-fe/src/utils/theme.ts +++ b/packages/pl-fe/src/utils/theme.ts @@ -1,6 +1,6 @@ import { hexToRgb } from './colors'; -import type { Rgb, Hsl, TailwindColorPalette, TailwindColorObject } from 'pl-fe/types/colors'; +import type { Rgb, Hsl, TailwindColorPalette, TailwindColorObject } from '@/types/colors'; // Taken from chromatism.js // https://github.com/graypegg/chromatism/blob/master/src/conversions/rgb.js diff --git a/packages/pl-fe/src/utils/timelines.test.ts b/packages/pl-fe/src/utils/timelines.test.ts index 52c91b9cb..f248e2ee9 100644 --- a/packages/pl-fe/src/utils/timelines.test.ts +++ b/packages/pl-fe/src/utils/timelines.test.ts @@ -1,6 +1,6 @@ import { fromJS } from 'immutable'; -import { buildStatus } from 'pl-fe/jest/factory'; +import { buildStatus } from '@/jest/factory'; import { shouldFilter } from './timelines'; diff --git a/packages/pl-fe/src/utils/timelines.ts b/packages/pl-fe/src/utils/timelines.ts index 31420dd97..ee308f4cd 100644 --- a/packages/pl-fe/src/utils/timelines.ts +++ b/packages/pl-fe/src/utils/timelines.ts @@ -1,6 +1,6 @@ -import { Settings } from 'pl-fe/schemas/pl-fe/settings'; +import { Settings } from '@/schemas/pl-fe/settings'; -import type { Status } from 'pl-fe/normalizers/status'; +import type { Status } from '@/normalizers/status'; const shouldFilter = ( status: Pick, diff --git a/packages/pl-fe/src/utils/url-purify.ts b/packages/pl-fe/src/utils/url-purify.ts index 7afff6718..a3735df81 100644 --- a/packages/pl-fe/src/utils/url-purify.ts +++ b/packages/pl-fe/src/utils/url-purify.ts @@ -14,8 +14,8 @@ // I hope I got this relicensing stuff right xD import { mappings, URLPurify, type SerializedRules, type SerializedServices } from '@mkljczk/url-purify'; -import KVStore from 'pl-fe/storage/kv-store'; -import { Me } from 'pl-fe/types/pl-fe'; +import KVStore from '@/storage/kv-store'; +import { Me } from '@/types/pl-fe'; interface KVStoreRulesItem { hashUrl?: string; diff --git a/packages/pl-fe/tsconfig.json b/packages/pl-fe/tsconfig.json index 4223a1add..52cdc94f6 100644 --- a/packages/pl-fe/tsconfig.json +++ b/packages/pl-fe/tsconfig.json @@ -13,7 +13,7 @@ "esModuleInterop": true, "skipLibCheck": true, "paths": { - "pl-fe/*": ["./src/*"], + "@/*": ["./src/*"], }, "typeRoots": [ "./src/types", diff --git a/packages/pl-fe/vite.config.ts b/packages/pl-fe/vite.config.ts index 11ea2a2a2..3b9fd0a09 100644 --- a/packages/pl-fe/vite.config.ts +++ b/packages/pl-fe/vite.config.ts @@ -174,8 +174,8 @@ const config = defineConfig(({ command }) => ({ resolve: { alias: [ { - find: 'pl-fe', - replacement: fileURLToPath(new URL('./src', import.meta.url)), + find: '@/', + replacement: fileURLToPath(new URL('./src/', import.meta.url)), }, ], dedupe: ['@floating-ui/react', 'tabbable', 'query-string', 'valibot'],