From a202fe68d1ffa9cc2f34ceaae89811535936688f Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 08:43:26 -0500 Subject: [PATCH 01/19] Move api into a folder --- .../api.ts => api/__mocks__/index.ts} | 2 +- app/soapbox/{api.ts => api/index.ts} | 40 +++++++++---------- app/soapbox/jest/test-setup.ts | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) rename app/soapbox/{__mocks__/api.ts => api/__mocks__/index.ts} (92%) rename app/soapbox/{api.ts => api/index.ts} (77%) diff --git a/app/soapbox/__mocks__/api.ts b/app/soapbox/api/__mocks__/index.ts similarity index 92% rename from app/soapbox/__mocks__/api.ts rename to app/soapbox/api/__mocks__/index.ts index 060846c94..dd2f1ec93 100644 --- a/app/soapbox/__mocks__/api.ts +++ b/app/soapbox/api/__mocks__/index.ts @@ -4,7 +4,7 @@ import LinkHeader from 'http-link-header'; import type { AxiosInstance, AxiosResponse } from 'axios'; -const api = jest.requireActual('../api') as Record; +const api = jest.requireActual('../index') as Record; let mocks: Array = []; export const __stub = (func: (mock: MockAdapter) => void) => mocks.push(func); diff --git a/app/soapbox/api.ts b/app/soapbox/api/index.ts similarity index 77% rename from app/soapbox/api.ts rename to app/soapbox/api/index.ts index bdcaf53d8..fde4a1a24 100644 --- a/app/soapbox/api.ts +++ b/app/soapbox/api/index.ts @@ -16,11 +16,11 @@ import { getAccessToken, getAppToken, isURL, parseBaseURL } from 'soapbox/utils/ import type MockAdapter from 'axios-mock-adapter'; /** - Parse Link headers, mostly for pagination. - @see {@link https://www.npmjs.com/package/http-link-header} - @param {object} response - Axios response object - @returns {object} Link object - */ + Parse Link headers, mostly for pagination. + @see {@link https://www.npmjs.com/package/http-link-header} + @param {object} response - Axios response object + @returns {object} Link object + */ export const getLinks = (response: AxiosResponse): LinkHeader => { return new LinkHeader(response.headers?.link); }; @@ -50,11 +50,11 @@ const getAuthBaseURL = createSelector([ }); /** - * Base client for HTTP requests. - * @param {string} accessToken - * @param {string} baseURL - * @returns {object} Axios instance - */ + * Base client for HTTP requests. + * @param {string} accessToken + * @param {string} baseURL + * @returns {object} Axios instance + */ export const baseClient = (accessToken?: string | null, baseURL: string = ''): AxiosInstance => { return axios.create({ // When BACKEND_URL is set, always use it. @@ -68,22 +68,22 @@ export const baseClient = (accessToken?: string | null, baseURL: string = ''): A }; /** - * Dumb client for grabbing static files. - * It uses FE_SUBDIRECTORY and parses JSON if possible. - * No authorization is needed. - */ + * Dumb client for grabbing static files. + * It uses FE_SUBDIRECTORY and parses JSON if possible. + * No authorization is needed. + */ export const staticClient = axios.create({ baseURL: BuildConfig.FE_SUBDIRECTORY, transformResponse: [maybeParseJSON], }); /** - * Stateful API client. - * Uses credentials from the Redux store if available. - * @param {function} getState - Must return the Redux state - * @param {string} authType - Either 'user' or 'app' - * @returns {object} Axios instance - */ + * Stateful API client. + * Uses credentials from the Redux store if available. + * @param {function} getState - Must return the Redux state + * @param {string} authType - Either 'user' or 'app' + * @returns {object} Axios instance + */ export default (getState: () => RootState, authType: string = 'user'): AxiosInstance => { const state = getState(); const accessToken = getToken(state, authType); diff --git a/app/soapbox/jest/test-setup.ts b/app/soapbox/jest/test-setup.ts index 0052388b0..c2a226a48 100644 --- a/app/soapbox/jest/test-setup.ts +++ b/app/soapbox/jest/test-setup.ts @@ -1,6 +1,6 @@ 'use strict'; -import { __clear as clearApiMocks } from '../__mocks__/api'; +import { __clear as clearApiMocks } from '../api/__mocks__'; // API mocking jest.mock('soapbox/api'); From db5d0d64004fb67146f4485f97fe5261c5466ea9 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 08:58:55 -0500 Subject: [PATCH 02/19] Move 'compareId' to comparators utils --- app/soapbox/__tests__/compare_id.test.ts | 2 +- app/soapbox/actions/notifications.ts | 2 +- .../features/admin/components/latest_accounts_panel.tsx | 2 +- app/soapbox/reducers/conversations.ts | 2 +- app/soapbox/{compare_id.ts => utils/comparators.ts} | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) rename app/soapbox/{compare_id.ts => utils/comparators.ts} (86%) diff --git a/app/soapbox/__tests__/compare_id.test.ts b/app/soapbox/__tests__/compare_id.test.ts index 583b4a1eb..1afbe0da3 100644 --- a/app/soapbox/__tests__/compare_id.test.ts +++ b/app/soapbox/__tests__/compare_id.test.ts @@ -1,4 +1,4 @@ -import compareId from '../compare_id'; +import { compareId } from '../utils/comparators'; test('compareId', () => { expect(compareId('3', '3')).toBe(0); diff --git a/app/soapbox/actions/notifications.ts b/app/soapbox/actions/notifications.ts index 8ef0e5715..068e65dc4 100644 --- a/app/soapbox/actions/notifications.ts +++ b/app/soapbox/actions/notifications.ts @@ -3,9 +3,9 @@ import 'intl-pluralrules'; import { defineMessages } from 'react-intl'; import api, { getLinks } from 'soapbox/api'; -import compareId from 'soapbox/compare_id'; import { getFilters, regexFromFilters } from 'soapbox/selectors'; import { isLoggedIn } from 'soapbox/utils/auth'; +import { compareId } from 'soapbox/utils/comparators'; import { getFeatures, parseVersion, PLEROMA } from 'soapbox/utils/features'; import { unescapeHTML } from 'soapbox/utils/html'; import { EXCLUDE_TYPES, NOTIFICATION_TYPES } from 'soapbox/utils/notification'; diff --git a/app/soapbox/features/admin/components/latest_accounts_panel.tsx b/app/soapbox/features/admin/components/latest_accounts_panel.tsx index 07b3c3f9d..f8a9fc04f 100644 --- a/app/soapbox/features/admin/components/latest_accounts_panel.tsx +++ b/app/soapbox/features/admin/components/latest_accounts_panel.tsx @@ -4,10 +4,10 @@ import { defineMessages, useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; import { fetchUsers } from 'soapbox/actions/admin'; -import compareId from 'soapbox/compare_id'; import { Widget } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; +import { compareId } from 'soapbox/utils/comparators'; const messages = defineMessages({ title: { id: 'admin.latest_accounts_panel.title', defaultMessage: 'Latest Accounts' }, diff --git a/app/soapbox/reducers/conversations.ts b/app/soapbox/reducers/conversations.ts index 622d11a23..57c907448 100644 --- a/app/soapbox/reducers/conversations.ts +++ b/app/soapbox/reducers/conversations.ts @@ -9,7 +9,7 @@ import { CONVERSATIONS_UPDATE, CONVERSATIONS_READ, } from '../actions/conversations'; -import compareId from '../compare_id'; +import { compareId } from '../utils/comparators'; import type { AnyAction } from 'redux'; import type { APIEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/compare_id.ts b/app/soapbox/utils/comparators.ts similarity index 86% rename from app/soapbox/compare_id.ts rename to app/soapbox/utils/comparators.ts index b92a44cf1..14c3ba4df 100644 --- a/app/soapbox/compare_id.ts +++ b/app/soapbox/utils/comparators.ts @@ -9,7 +9,7 @@ * - `1`: id1 > id2 * - `-1`: id1 < id2 */ -export default function compareId(id1: string, id2: string) { +function compareId(id1: string, id2: string) { if (id1 === id2) { return 0; } @@ -19,3 +19,5 @@ export default function compareId(id1: string, id2: string) { return id1.length > id2.length ? 1 : -1; } } + +export { compareId }; \ No newline at end of file From e78242806f4e8e5ec8f7717372e9482698bb1949 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 09:10:14 -0500 Subject: [PATCH 03/19] Rename files (0): _ -> - --- app/soapbox/actions/dropdown_menu.ts | 2 +- .../__tests__/avatar_overlay.test.tsx | 2 +- .../__tests__/emoji_selector.test.tsx | 2 +- ...{account_search.tsx => account-search.tsx} | 2 +- app/soapbox/components/attachment_list.tsx | 54 ------------------- ...nput.tsx => autosuggest-account-input.tsx} | 4 +- app/soapbox/components/autosuggest_input.tsx | 2 +- ...{avatar_overlay.tsx => avatar-overlay.tsx} | 0 ...{birthday_input.tsx => birthday-input.tsx} | 0 .../{column_header.js => column-header.js} | 0 .../{dropdown_menu.tsx => dropdown-menu.tsx} | 0 ...{emoji_selector.tsx => emoji-selector.tsx} | 0 ...{error_boundary.tsx => error-boundary.tsx} | 0 ...o_player.tsx => extended-video-player.tsx} | 0 ...awesome_icon.tsx => fork-awesome-icon.tsx} | 0 app/soapbox/components/icon.tsx | 2 +- app/soapbox/components/sidebar-navigation.tsx | 2 +- app/soapbox/components/status-action-bar.tsx | 2 +- .../containers/dropdown_menu_container.ts | 4 +- app/soapbox/containers/soapbox.tsx | 2 +- .../features/account/components/header.tsx | 2 +- .../components/moved_note.tsx | 2 +- .../components/registration_form.tsx | 2 +- .../chats/components/chat-message-list.tsx | 2 +- .../features/chats/components/chat-panes.tsx | 2 +- app/soapbox/features/chats/index.tsx | 2 +- .../features/compose/components/search.tsx | 2 +- app/soapbox/features/conversations/index.tsx | 2 +- .../features/direct_timeline/index.tsx | 4 +- app/soapbox/features/edit_profile/index.tsx | 2 +- .../features/ui/components/accordion.tsx | 2 +- .../features/ui/components/actions_modal.tsx | 2 +- .../features/ui/components/media-modal.tsx | 2 +- app/soapbox/reducers/dropdown_menu.ts | 2 +- 34 files changed, 28 insertions(+), 82 deletions(-) rename app/soapbox/components/{account_search.tsx => account-search.tsx} (99%) delete mode 100644 app/soapbox/components/attachment_list.tsx rename app/soapbox/components/{autosuggest_account_input.tsx => autosuggest-account-input.tsx} (96%) rename app/soapbox/components/{avatar_overlay.tsx => avatar-overlay.tsx} (100%) rename app/soapbox/components/{birthday_input.tsx => birthday-input.tsx} (100%) rename app/soapbox/components/{column_header.js => column-header.js} (100%) rename app/soapbox/components/{dropdown_menu.tsx => dropdown-menu.tsx} (100%) rename app/soapbox/components/{emoji_selector.tsx => emoji-selector.tsx} (100%) rename app/soapbox/components/{error_boundary.tsx => error-boundary.tsx} (100%) rename app/soapbox/components/{extended_video_player.tsx => extended-video-player.tsx} (100%) rename app/soapbox/components/{fork_awesome_icon.tsx => fork-awesome-icon.tsx} (100%) diff --git a/app/soapbox/actions/dropdown_menu.ts b/app/soapbox/actions/dropdown_menu.ts index 2c19735a1..0c6fc8536 100644 --- a/app/soapbox/actions/dropdown_menu.ts +++ b/app/soapbox/actions/dropdown_menu.ts @@ -1,4 +1,4 @@ -import type { DropdownPlacement } from 'soapbox/components/dropdown_menu'; +import type { DropdownPlacement } from 'soapbox/components/dropdown-menu'; const DROPDOWN_MENU_OPEN = 'DROPDOWN_MENU_OPEN'; const DROPDOWN_MENU_CLOSE = 'DROPDOWN_MENU_CLOSE'; diff --git a/app/soapbox/components/__tests__/avatar_overlay.test.tsx b/app/soapbox/components/__tests__/avatar_overlay.test.tsx index 105828556..4e83dd071 100644 --- a/app/soapbox/components/__tests__/avatar_overlay.test.tsx +++ b/app/soapbox/components/__tests__/avatar_overlay.test.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { normalizeAccount } from 'soapbox/normalizers'; import { render, screen } from '../../jest/test-helpers'; -import AvatarOverlay from '../avatar_overlay'; +import AvatarOverlay from '../avatar-overlay'; import type { ReducerAccount } from 'soapbox/reducers/accounts'; diff --git a/app/soapbox/components/__tests__/emoji_selector.test.tsx b/app/soapbox/components/__tests__/emoji_selector.test.tsx index c680d156e..b382a4b94 100644 --- a/app/soapbox/components/__tests__/emoji_selector.test.tsx +++ b/app/soapbox/components/__tests__/emoji_selector.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render, screen } from '../../jest/test-helpers'; -import EmojiSelector from '../emoji_selector'; +import EmojiSelector from '../emoji-selector'; describe('', () => { it('renders correctly', () => { diff --git a/app/soapbox/components/account_search.tsx b/app/soapbox/components/account-search.tsx similarity index 99% rename from app/soapbox/components/account_search.tsx rename to app/soapbox/components/account-search.tsx index bf9652b66..883278bcf 100644 --- a/app/soapbox/components/account_search.tsx +++ b/app/soapbox/components/account-search.tsx @@ -2,7 +2,7 @@ import classNames from 'clsx'; import React, { useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import AutosuggestAccountInput from 'soapbox/components/autosuggest_account_input'; +import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-input'; import Icon from 'soapbox/components/icon'; const messages = defineMessages({ diff --git a/app/soapbox/components/attachment_list.tsx b/app/soapbox/components/attachment_list.tsx deleted file mode 100644 index 94c496819..000000000 --- a/app/soapbox/components/attachment_list.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import React from 'react'; - -import Icon from 'soapbox/components/icon'; - -import type { Attachment as AttachmentEntity } from 'soapbox/types/entities'; - -const filename = (url: string) => url.split('/').pop()!.split('#')[0].split('?')[0]; - -interface IAttachmentList { - media: AttachmentEntity[], - compact?: boolean, -} - -const AttachmentList: React.FC = ({ media, compact }) => { - if (compact) { - return ( -
-
    - {media.map(attachment => { - const displayUrl = attachment.get('remote_url') || attachment.get('url'); - - return ( -
  • - {filename(displayUrl)} -
  • - ); - })} -
-
- ); - } - - return ( -
-
- -
- -
    - {media.map(attachment => { - const displayUrl = attachment.get('remote_url') || attachment.get('url'); - - return ( -
  • - {filename(displayUrl)} -
  • - ); - })} -
-
- ); -}; - -export default AttachmentList; diff --git a/app/soapbox/components/autosuggest_account_input.tsx b/app/soapbox/components/autosuggest-account-input.tsx similarity index 96% rename from app/soapbox/components/autosuggest_account_input.tsx rename to app/soapbox/components/autosuggest-account-input.tsx index e8cd63830..17c5f41cb 100644 --- a/app/soapbox/components/autosuggest_account_input.tsx +++ b/app/soapbox/components/autosuggest-account-input.tsx @@ -6,10 +6,10 @@ import { accountSearch } from 'soapbox/actions/accounts'; import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest_input'; import { useAppDispatch } from 'soapbox/hooks'; -import type { Menu } from 'soapbox/components/dropdown_menu'; +import type { Menu } from 'soapbox/components/dropdown-menu'; import type { InputThemes } from 'soapbox/components/ui/input/input'; -const noOp = () => {}; +const noOp = () => { }; interface IAutosuggestAccountInput { onChange: React.ChangeEventHandler, diff --git a/app/soapbox/components/autosuggest_input.tsx b/app/soapbox/components/autosuggest_input.tsx index eb51ae41f..9313e092f 100644 --- a/app/soapbox/components/autosuggest_input.tsx +++ b/app/soapbox/components/autosuggest_input.tsx @@ -10,7 +10,7 @@ import { Input } from 'soapbox/components/ui'; import AutosuggestAccount from 'soapbox/features/compose/components/autosuggest_account'; import { isRtl } from 'soapbox/rtl'; -import type { Menu, MenuItem } from 'soapbox/components/dropdown_menu'; +import type { Menu, MenuItem } from 'soapbox/components/dropdown-menu'; import type { InputThemes } from 'soapbox/components/ui/input/input'; type CursorMatch = [ diff --git a/app/soapbox/components/avatar_overlay.tsx b/app/soapbox/components/avatar-overlay.tsx similarity index 100% rename from app/soapbox/components/avatar_overlay.tsx rename to app/soapbox/components/avatar-overlay.tsx diff --git a/app/soapbox/components/birthday_input.tsx b/app/soapbox/components/birthday-input.tsx similarity index 100% rename from app/soapbox/components/birthday_input.tsx rename to app/soapbox/components/birthday-input.tsx diff --git a/app/soapbox/components/column_header.js b/app/soapbox/components/column-header.js similarity index 100% rename from app/soapbox/components/column_header.js rename to app/soapbox/components/column-header.js diff --git a/app/soapbox/components/dropdown_menu.tsx b/app/soapbox/components/dropdown-menu.tsx similarity index 100% rename from app/soapbox/components/dropdown_menu.tsx rename to app/soapbox/components/dropdown-menu.tsx diff --git a/app/soapbox/components/emoji_selector.tsx b/app/soapbox/components/emoji-selector.tsx similarity index 100% rename from app/soapbox/components/emoji_selector.tsx rename to app/soapbox/components/emoji-selector.tsx diff --git a/app/soapbox/components/error_boundary.tsx b/app/soapbox/components/error-boundary.tsx similarity index 100% rename from app/soapbox/components/error_boundary.tsx rename to app/soapbox/components/error-boundary.tsx diff --git a/app/soapbox/components/extended_video_player.tsx b/app/soapbox/components/extended-video-player.tsx similarity index 100% rename from app/soapbox/components/extended_video_player.tsx rename to app/soapbox/components/extended-video-player.tsx diff --git a/app/soapbox/components/fork_awesome_icon.tsx b/app/soapbox/components/fork-awesome-icon.tsx similarity index 100% rename from app/soapbox/components/fork_awesome_icon.tsx rename to app/soapbox/components/fork-awesome-icon.tsx diff --git a/app/soapbox/components/icon.tsx b/app/soapbox/components/icon.tsx index cba7b5805..93985d55a 100644 --- a/app/soapbox/components/icon.tsx +++ b/app/soapbox/components/icon.tsx @@ -7,7 +7,7 @@ import React from 'react'; -import ForkAwesomeIcon, { IForkAwesomeIcon } from './fork_awesome_icon'; +import ForkAwesomeIcon, { IForkAwesomeIcon } from './fork-awesome-icon'; import SvgIcon, { ISvgIcon } from './svg_icon'; export type IIcon = IForkAwesomeIcon | ISvgIcon; diff --git a/app/soapbox/components/sidebar-navigation.tsx b/app/soapbox/components/sidebar-navigation.tsx index 4dd47efff..9ff0ad0f8 100644 --- a/app/soapbox/components/sidebar-navigation.tsx +++ b/app/soapbox/components/sidebar-navigation.tsx @@ -9,7 +9,7 @@ import { getFeatures } from 'soapbox/utils/features'; import SidebarNavigationLink from './sidebar-navigation-link'; -import type { Menu } from 'soapbox/components/dropdown_menu'; +import type { Menu } from 'soapbox/components/dropdown-menu'; const messages = defineMessages({ follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx index 9153cb256..6429050d9 100644 --- a/app/soapbox/components/status-action-bar.tsx +++ b/app/soapbox/components/status-action-bar.tsx @@ -21,7 +21,7 @@ import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings import { isLocal } from 'soapbox/utils/accounts'; import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji_reacts'; -import type { Menu } from 'soapbox/components/dropdown_menu'; +import type { Menu } from 'soapbox/components/dropdown-menu'; import type { Account, Status } from 'soapbox/types/entities'; const messages = defineMessages({ diff --git a/app/soapbox/containers/dropdown_menu_container.ts b/app/soapbox/containers/dropdown_menu_container.ts index b047edfff..c5e0dc8cb 100644 --- a/app/soapbox/containers/dropdown_menu_container.ts +++ b/app/soapbox/containers/dropdown_menu_container.ts @@ -2,11 +2,11 @@ import { connect } from 'react-redux'; import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu'; import { openModal, closeModal } from '../actions/modals'; -import DropdownMenu from '../components/dropdown_menu'; +import DropdownMenu from '../components/dropdown-menu'; import { isUserTouching } from '../is_mobile'; import type { Dispatch } from 'redux'; -import type { DropdownPlacement, IDropdown } from 'soapbox/components/dropdown_menu'; +import type { DropdownPlacement, IDropdown } from 'soapbox/components/dropdown-menu'; import type { RootState } from 'soapbox/store'; const mapStateToProps = (state: RootState) => ({ diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx index 2841ec3ca..6249fe44a 100644 --- a/app/soapbox/containers/soapbox.tsx +++ b/app/soapbox/containers/soapbox.tsx @@ -45,7 +45,7 @@ import { generateThemeCss } from 'soapbox/utils/theme'; import { checkOnboardingStatus } from '../actions/onboarding'; import { preload } from '../actions/preload'; -import ErrorBoundary from '../components/error_boundary'; +import ErrorBoundary from '../components/error-boundary'; import UI from '../features/ui'; import { store } from '../store'; diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx index 21e44f33b..fdb12611f 100644 --- a/app/soapbox/features/account/components/header.tsx +++ b/app/soapbox/features/account/components/header.tsx @@ -27,7 +27,7 @@ import { normalizeAttachment } from 'soapbox/normalizers'; import { Account } from 'soapbox/types/entities'; import { isRemote } from 'soapbox/utils/accounts'; -import type { Menu as MenuType } from 'soapbox/components/dropdown_menu'; +import type { Menu as MenuType } from 'soapbox/components/dropdown-menu'; const messages = defineMessages({ edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' }, diff --git a/app/soapbox/features/account_timeline/components/moved_note.tsx b/app/soapbox/features/account_timeline/components/moved_note.tsx index 0ba6d8da5..19a9249f1 100644 --- a/app/soapbox/features/account_timeline/components/moved_note.tsx +++ b/app/soapbox/features/account_timeline/components/moved_note.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import { NavLink } from 'react-router-dom'; -import AvatarOverlay from 'soapbox/components/avatar_overlay'; +import AvatarOverlay from 'soapbox/components/avatar-overlay'; import DisplayName from 'soapbox/components/display-name'; import Icon from 'soapbox/components/icon'; diff --git a/app/soapbox/features/auth_login/components/registration_form.tsx b/app/soapbox/features/auth_login/components/registration_form.tsx index bdf4bc05d..fa5ad524c 100644 --- a/app/soapbox/features/auth_login/components/registration_form.tsx +++ b/app/soapbox/features/auth_login/components/registration_form.tsx @@ -9,7 +9,7 @@ import { v4 as uuidv4 } from 'uuid'; import { accountLookup } from 'soapbox/actions/accounts'; import { register, verifyCredentials } from 'soapbox/actions/auth'; import { openModal } from 'soapbox/actions/modals'; -import BirthdayInput from 'soapbox/components/birthday_input'; +import BirthdayInput from 'soapbox/components/birthday-input'; import { Checkbox, Form, FormGroup, FormActions, Button, Input, Textarea } from 'soapbox/components/ui'; import CaptchaField from 'soapbox/features/auth_login/components/captcha'; import { useAppSelector, useAppDispatch, useSettings, useFeatures } from 'soapbox/hooks'; diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx index 9303f2b33..c1d6362ed 100644 --- a/app/soapbox/features/chats/components/chat-message-list.tsx +++ b/app/soapbox/features/chats/components/chat-message-list.tsx @@ -21,7 +21,7 @@ import { MediaGallery } from 'soapbox/features/ui/util/async-components'; import { useAppSelector, useAppDispatch, useRefEventHandler } from 'soapbox/hooks'; import { onlyEmoji } from 'soapbox/utils/rich_content'; -import type { Menu } from 'soapbox/components/dropdown_menu'; +import type { Menu } from 'soapbox/components/dropdown-menu'; import type { ChatMessage as ChatMessageEntity } from 'soapbox/types/entities'; const BIG_EMOJI_LIMIT = 1; diff --git a/app/soapbox/features/chats/components/chat-panes.tsx b/app/soapbox/features/chats/components/chat-panes.tsx index 6ed873139..0aab9734f 100644 --- a/app/soapbox/features/chats/components/chat-panes.tsx +++ b/app/soapbox/features/chats/components/chat-panes.tsx @@ -6,7 +6,7 @@ import { createSelector } from 'reselect'; import { openChat, launchChat, toggleMainWindow } from 'soapbox/actions/chats'; import { getSettings } from 'soapbox/actions/settings'; -import AccountSearch from 'soapbox/components/account_search'; +import AccountSearch from 'soapbox/components/account-search'; import { Counter } from 'soapbox/components/ui'; import AudioToggle from 'soapbox/features/chats/components/audio-toggle'; import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; diff --git a/app/soapbox/features/chats/index.tsx b/app/soapbox/features/chats/index.tsx index 5635cbdc8..b3d0a2cff 100644 --- a/app/soapbox/features/chats/index.tsx +++ b/app/soapbox/features/chats/index.tsx @@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux'; import { useHistory } from 'react-router-dom'; import { launchChat } from 'soapbox/actions/chats'; -import AccountSearch from 'soapbox/components/account_search'; +import AccountSearch from 'soapbox/components/account-search'; import AudioToggle from 'soapbox/features/chats/components/audio-toggle'; import { Column } from '../../components/ui'; diff --git a/app/soapbox/features/compose/components/search.tsx b/app/soapbox/features/compose/components/search.tsx index 818080f2f..a5f310655 100644 --- a/app/soapbox/features/compose/components/search.tsx +++ b/app/soapbox/features/compose/components/search.tsx @@ -14,7 +14,7 @@ import { showSearch, submitSearch, } from 'soapbox/actions/search'; -import AutosuggestAccountInput from 'soapbox/components/autosuggest_account_input'; +import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-input'; import { Input } from 'soapbox/components/ui'; import SvgIcon from 'soapbox/components/ui/icon/svg-icon'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/conversations/index.tsx b/app/soapbox/features/conversations/index.tsx index 8e81ac1c5..0faf2237f 100644 --- a/app/soapbox/features/conversations/index.tsx +++ b/app/soapbox/features/conversations/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { directComposeById } from 'soapbox/actions/compose'; import { mountConversations, unmountConversations, expandConversations } from 'soapbox/actions/conversations'; import { connectDirectStream } from 'soapbox/actions/streaming'; -import AccountSearch from 'soapbox/components/account_search'; +import AccountSearch from 'soapbox/components/account-search'; import { Column } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/direct_timeline/index.tsx b/app/soapbox/features/direct_timeline/index.tsx index 9da60dd9f..885c617db 100644 --- a/app/soapbox/features/direct_timeline/index.tsx +++ b/app/soapbox/features/direct_timeline/index.tsx @@ -4,8 +4,8 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { directComposeById } from 'soapbox/actions/compose'; import { connectDirectStream } from 'soapbox/actions/streaming'; import { expandDirectTimeline } from 'soapbox/actions/timelines'; -import AccountSearch from 'soapbox/components/account_search'; -import ColumnHeader from 'soapbox/components/column_header'; +import AccountSearch from 'soapbox/components/account-search'; +import ColumnHeader from 'soapbox/components/column-header'; import { Column } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/edit_profile/index.tsx b/app/soapbox/features/edit_profile/index.tsx index c60298a7b..de7d6ee2d 100644 --- a/app/soapbox/features/edit_profile/index.tsx +++ b/app/soapbox/features/edit_profile/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import { updateNotificationSettings } from 'soapbox/actions/accounts'; import { patchMe } from 'soapbox/actions/me'; import snackbar from 'soapbox/actions/snackbar'; -import BirthdayInput from 'soapbox/components/birthday_input'; +import BirthdayInput from 'soapbox/components/birthday-input'; import List, { ListItem } from 'soapbox/components/list'; import { Button, diff --git a/app/soapbox/features/ui/components/accordion.tsx b/app/soapbox/features/ui/components/accordion.tsx index f425e5321..6c07aa25b 100644 --- a/app/soapbox/features/ui/components/accordion.tsx +++ b/app/soapbox/features/ui/components/accordion.tsx @@ -5,7 +5,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { Text } from 'soapbox/components/ui'; import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; -import type { Menu } from 'soapbox/components/dropdown_menu'; +import type { Menu } from 'soapbox/components/dropdown-menu'; const messages = defineMessages({ collapse: { id: 'accordion.collapse', defaultMessage: 'Collapse' }, diff --git a/app/soapbox/features/ui/components/actions_modal.tsx b/app/soapbox/features/ui/components/actions_modal.tsx index cc00126f6..67e29933f 100644 --- a/app/soapbox/features/ui/components/actions_modal.tsx +++ b/app/soapbox/features/ui/components/actions_modal.tsx @@ -10,7 +10,7 @@ import AccountContainer from 'soapbox/containers/account_container'; import Motion from '../util/optional_motion'; -import type { Menu, MenuItem } from 'soapbox/components/dropdown_menu'; +import type { Menu, MenuItem } from 'soapbox/components/dropdown-menu'; import type { Status as StatusEntity } from 'soapbox/types/entities'; interface IActionsModal { diff --git a/app/soapbox/features/ui/components/media-modal.tsx b/app/soapbox/features/ui/components/media-modal.tsx index 1a432de3b..c5530ec47 100644 --- a/app/soapbox/features/ui/components/media-modal.tsx +++ b/app/soapbox/features/ui/components/media-modal.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import { useHistory } from 'react-router-dom'; import ReactSwipeableViews from 'react-swipeable-views'; -import ExtendedVideoPlayer from 'soapbox/components/extended_video_player'; +import ExtendedVideoPlayer from 'soapbox/components/extended-video-player'; import Icon from 'soapbox/components/icon'; import IconButton from 'soapbox/components/icon_button'; import Audio from 'soapbox/features/audio'; diff --git a/app/soapbox/reducers/dropdown_menu.ts b/app/soapbox/reducers/dropdown_menu.ts index 2b5c50252..64bc316b9 100644 --- a/app/soapbox/reducers/dropdown_menu.ts +++ b/app/soapbox/reducers/dropdown_menu.ts @@ -6,7 +6,7 @@ import { } from '../actions/dropdown_menu'; import type { AnyAction } from 'redux'; -import type { DropdownPlacement } from 'soapbox/components/dropdown_menu'; +import type { DropdownPlacement } from 'soapbox/components/dropdown-menu'; const ReducerRecord = ImmutableRecord({ openId: null as number | null, From c95423c7e7dd2305bc0e25dbe733f0a26242a1af Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 09:11:30 -0500 Subject: [PATCH 04/19] Rename files (1): _ -> - --- app/soapbox/components/birthday-input.tsx | 2 +- app/soapbox/components/domain.tsx | 2 +- app/soapbox/components/{icon_button.js => icon-button.js} | 0 app/soapbox/features/admin/components/unapproved_account.tsx | 2 +- app/soapbox/features/aliases/components/account.tsx | 2 +- app/soapbox/features/chats/components/chat-box.tsx | 2 +- app/soapbox/features/chats/components/chat-window.tsx | 2 +- app/soapbox/features/compose/components/schedule_form.tsx | 2 +- app/soapbox/features/compose/components/search_results.tsx | 2 +- app/soapbox/features/compose/components/upload.tsx | 2 +- .../features/follow_requests/components/account_authorize.tsx | 2 +- app/soapbox/features/list_adder/components/list.tsx | 2 +- app/soapbox/features/list_editor/components/account.tsx | 2 +- app/soapbox/features/remote_timeline/index.tsx | 2 +- app/soapbox/features/reply_mentions/account.tsx | 2 +- .../components/scheduled_status_action_bar.tsx | 2 +- app/soapbox/features/ui/components/bundle_modal_error.tsx | 2 +- app/soapbox/features/ui/components/media-modal.tsx | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename app/soapbox/components/{icon_button.js => icon-button.js} (100%) diff --git a/app/soapbox/components/birthday-input.tsx b/app/soapbox/components/birthday-input.tsx index fc9521ca0..bd38666cf 100644 --- a/app/soapbox/components/birthday-input.tsx +++ b/app/soapbox/components/birthday-input.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; import { DatePicker } from 'soapbox/features/ui/util/async-components'; import { useAppSelector, useFeatures } from 'soapbox/hooks'; diff --git a/app/soapbox/components/domain.tsx b/app/soapbox/components/domain.tsx index 22c8272de..646c37205 100644 --- a/app/soapbox/components/domain.tsx +++ b/app/soapbox/components/domain.tsx @@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux'; import { unblockDomain } from 'soapbox/actions/domain_blocks'; -import IconButton from './icon_button'; +import IconButton from './icon-button'; const messages = defineMessages({ blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' }, diff --git a/app/soapbox/components/icon_button.js b/app/soapbox/components/icon-button.js similarity index 100% rename from app/soapbox/components/icon_button.js rename to app/soapbox/components/icon-button.js diff --git a/app/soapbox/features/admin/components/unapproved_account.tsx b/app/soapbox/features/admin/components/unapproved_account.tsx index a01421643..c1dae46fb 100644 --- a/app/soapbox/features/admin/components/unapproved_account.tsx +++ b/app/soapbox/features/admin/components/unapproved_account.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { approveUsers } from 'soapbox/actions/admin'; import { rejectUserModal } from 'soapbox/actions/moderation'; import snackbar from 'soapbox/actions/snackbar'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; diff --git a/app/soapbox/features/aliases/components/account.tsx b/app/soapbox/features/aliases/components/account.tsx index 802d3e0f6..f76431ba8 100644 --- a/app/soapbox/features/aliases/components/account.tsx +++ b/app/soapbox/features/aliases/components/account.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { addToAliases } from 'soapbox/actions/aliases'; import Avatar from 'soapbox/components/avatar'; import DisplayName from 'soapbox/components/display-name'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; import { getFeatures } from 'soapbox/utils/features'; diff --git a/app/soapbox/features/chats/components/chat-box.tsx b/app/soapbox/features/chats/components/chat-box.tsx index 66371bc8d..9a96a0d00 100644 --- a/app/soapbox/features/chats/components/chat-box.tsx +++ b/app/soapbox/features/chats/components/chat-box.tsx @@ -7,7 +7,7 @@ import { markChatRead, } from 'soapbox/actions/chats'; import { uploadMedia } from 'soapbox/actions/media'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import UploadProgress from 'soapbox/components/upload-progress'; import UploadButton from 'soapbox/features/compose/components/upload_button'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/chats/components/chat-window.tsx b/app/soapbox/features/chats/components/chat-window.tsx index 8b30d3ba8..13ba3ed39 100644 --- a/app/soapbox/features/chats/components/chat-window.tsx +++ b/app/soapbox/features/chats/components/chat-window.tsx @@ -7,7 +7,7 @@ import { } from 'soapbox/actions/chats'; import Avatar from 'soapbox/components/avatar'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { HStack, Counter } from 'soapbox/components/ui'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { makeGetChat } from 'soapbox/selectors'; diff --git a/app/soapbox/features/compose/components/schedule_form.tsx b/app/soapbox/features/compose/components/schedule_form.tsx index b619188e6..d08e3d252 100644 --- a/app/soapbox/features/compose/components/schedule_form.tsx +++ b/app/soapbox/features/compose/components/schedule_form.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { setSchedule, removeSchedule } from 'soapbox/actions/compose'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { HStack, Stack, Text } from 'soapbox/components/ui'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; import { DatePicker } from 'soapbox/features/ui/util/async-components'; diff --git a/app/soapbox/features/compose/components/search_results.tsx b/app/soapbox/features/compose/components/search_results.tsx index 8f8fa5938..de8b3807b 100644 --- a/app/soapbox/features/compose/components/search_results.tsx +++ b/app/soapbox/features/compose/components/search_results.tsx @@ -5,7 +5,7 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; import { expandSearch, setFilter, setSearchAccount } from 'soapbox/actions/search'; import { fetchTrendingStatuses } from 'soapbox/actions/trending_statuses'; import Hashtag from 'soapbox/components/hashtag'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import ScrollableList from 'soapbox/components/scrollable_list'; import { HStack, Tabs, Text } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; diff --git a/app/soapbox/features/compose/components/upload.tsx b/app/soapbox/features/compose/components/upload.tsx index fdef1f899..f2f199d6e 100644 --- a/app/soapbox/features/compose/components/upload.tsx +++ b/app/soapbox/features/compose/components/upload.tsx @@ -9,7 +9,7 @@ import { undoUploadCompose, changeUploadCompose, submitCompose } from 'soapbox/a import { openModal } from 'soapbox/actions/modals'; import Blurhash from 'soapbox/components/blurhash'; import Icon from 'soapbox/components/icon'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { useAppDispatch, useAppSelector, useCompose } from 'soapbox/hooks'; import Motion from '../../ui/util/optional_motion'; diff --git a/app/soapbox/features/follow_requests/components/account_authorize.tsx b/app/soapbox/features/follow_requests/components/account_authorize.tsx index 0c8e8a561..430a0d49f 100644 --- a/app/soapbox/features/follow_requests/components/account_authorize.tsx +++ b/app/soapbox/features/follow_requests/components/account_authorize.tsx @@ -6,7 +6,7 @@ import { Link } from 'react-router-dom'; import { authorizeFollowRequest, rejectFollowRequest } from 'soapbox/actions/accounts'; import Avatar from 'soapbox/components/avatar'; import DisplayName from 'soapbox/components/display-name'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { Text } from 'soapbox/components/ui'; import { useAppSelector } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; diff --git a/app/soapbox/features/list_adder/components/list.tsx b/app/soapbox/features/list_adder/components/list.tsx index c9358c98e..f1fb3ee40 100644 --- a/app/soapbox/features/list_adder/components/list.tsx +++ b/app/soapbox/features/list_adder/components/list.tsx @@ -3,7 +3,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { removeFromListAdder, addToListAdder } from 'soapbox/actions/lists'; import Icon from 'soapbox/components/icon'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; const messages = defineMessages({ diff --git a/app/soapbox/features/list_editor/components/account.tsx b/app/soapbox/features/list_editor/components/account.tsx index ef1b2e246..b6c04a9e6 100644 --- a/app/soapbox/features/list_editor/components/account.tsx +++ b/app/soapbox/features/list_editor/components/account.tsx @@ -3,7 +3,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { removeFromListEditor, addToListEditor } from 'soapbox/actions/lists'; import DisplayName from 'soapbox/components/display-name'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { Avatar } from 'soapbox/components/ui'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; diff --git a/app/soapbox/features/remote_timeline/index.tsx b/app/soapbox/features/remote_timeline/index.tsx index 00e2effe2..a3f8d2c68 100644 --- a/app/soapbox/features/remote_timeline/index.tsx +++ b/app/soapbox/features/remote_timeline/index.tsx @@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom'; import { connectRemoteStream } from 'soapbox/actions/streaming'; import { expandRemoteTimeline } from 'soapbox/actions/timelines'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { HStack, Text } from 'soapbox/components/ui'; import Column from 'soapbox/features/ui/components/column'; import { useAppDispatch, useSettings } from 'soapbox/hooks'; diff --git a/app/soapbox/features/reply_mentions/account.tsx b/app/soapbox/features/reply_mentions/account.tsx index 87ba71278..53dc4e02c 100644 --- a/app/soapbox/features/reply_mentions/account.tsx +++ b/app/soapbox/features/reply_mentions/account.tsx @@ -5,7 +5,7 @@ import { fetchAccount } from 'soapbox/actions/accounts'; import { addToMentions, removeFromMentions } from 'soapbox/actions/compose'; import Avatar from 'soapbox/components/avatar'; import DisplayName from 'soapbox/components/display-name'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { useAppDispatch, useAppSelector, useCompose } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx index dd73b8945..d22a90bf3 100644 --- a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx +++ b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { openModal } from 'soapbox/actions/modals'; import { cancelScheduledStatus } from 'soapbox/actions/scheduled_statuses'; import { getSettings } from 'soapbox/actions/settings'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import { HStack } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/bundle_modal_error.tsx b/app/soapbox/features/ui/components/bundle_modal_error.tsx index 2945c442b..21e140d5b 100644 --- a/app/soapbox/features/ui/components/bundle_modal_error.tsx +++ b/app/soapbox/features/ui/components/bundle_modal_error.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; const messages = defineMessages({ error: { id: 'bundle_modal_error.message', defaultMessage: 'Something went wrong while loading this page.' }, diff --git a/app/soapbox/features/ui/components/media-modal.tsx b/app/soapbox/features/ui/components/media-modal.tsx index c5530ec47..be80a27e4 100644 --- a/app/soapbox/features/ui/components/media-modal.tsx +++ b/app/soapbox/features/ui/components/media-modal.tsx @@ -6,7 +6,7 @@ import ReactSwipeableViews from 'react-swipeable-views'; import ExtendedVideoPlayer from 'soapbox/components/extended-video-player'; import Icon from 'soapbox/components/icon'; -import IconButton from 'soapbox/components/icon_button'; +import IconButton from 'soapbox/components/icon-button'; import Audio from 'soapbox/features/audio'; import Video from 'soapbox/features/video'; From a0d960dd219ad9061a256e60e14ef2d77994b664 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 11:00:49 -0500 Subject: [PATCH 05/19] Rename files (2): _ -> - --- app/soapbox/components/account.tsx | 2 +- app/soapbox/components/avatar-overlay.tsx | 2 +- app/soapbox/components/avatar.tsx | 2 +- app/soapbox/components/column-header.js | 2 +- app/soapbox/components/display-name.tsx | 2 +- app/soapbox/components/icon.tsx | 2 +- .../components/{load_gap.tsx => load-gap.tsx} | 0 .../{load_more.tsx => load-more.tsx} | 0 .../{media_gallery.tsx => media-gallery.tsx} | 2 +- ...ng_indicator.tsx => missing-indicator.tsx} | 0 .../{modal_root.tsx => modal-root.tsx} | 0 app/soapbox/components/more_follows.tsx | 48 ------------------- app/soapbox/components/quoted-status.tsx | 2 +- ...crollable_list.tsx => scrollable-list.tsx} | 2 +- .../{sidebar_menu.tsx => sidebar-menu.tsx} | 0 ...{status_content.tsx => status-content.tsx} | 0 .../{status_list.tsx => status-list.tsx} | 6 +-- app/soapbox/components/status.tsx | 2 +- .../{still_image.tsx => still-image.tsx} | 0 ...{sub_navigation.tsx => sub-navigation.tsx} | 0 .../components/{svg_icon.tsx => svg-icon.tsx} | 0 ...ion-link.tsx => thumb-navigation-link.tsx} | 0 ...mb_navigation.tsx => thumb-navigation.tsx} | 2 +- app/soapbox/components/ui/avatar/avatar.tsx | 2 +- ...ation_badge.tsx => verification-badge.tsx} | 0 .../features/account/components/header.tsx | 2 +- .../account_gallery/components/media_item.tsx | 2 +- .../features/account_gallery/index.tsx | 4 +- .../features/account_timeline/index.tsx | 4 +- .../admin/components/report_status.tsx | 2 +- app/soapbox/features/admin/moderation_log.tsx | 2 +- .../features/admin/tabs/awaiting-approval.tsx | 2 +- app/soapbox/features/admin/tabs/reports.tsx | 2 +- app/soapbox/features/admin/user_index.js | 2 +- app/soapbox/features/aliases/index.tsx | 2 +- app/soapbox/features/backups/index.tsx | 2 +- app/soapbox/features/blocks/index.tsx | 2 +- app/soapbox/features/bookmarks/index.tsx | 4 +- .../features/community_timeline/index.tsx | 2 +- .../compose/components/search_results.tsx | 2 +- .../components/conversations_list.tsx | 2 +- app/soapbox/features/directory/index.tsx | 2 +- app/soapbox/features/domain_blocks/index.tsx | 2 +- .../components/profile-preview.tsx | 4 +- .../features/embedded-status/index.tsx | 2 +- .../features/favourited_statuses/index.tsx | 4 +- .../federation_restrictions/index.tsx | 2 +- .../feed-suggestions/feed-suggestions.tsx | 2 +- app/soapbox/features/filters/index.tsx | 2 +- .../features/follow-recommendations/index.tsx | 2 +- .../features/follow_requests/index.tsx | 2 +- app/soapbox/features/followers/index.tsx | 4 +- app/soapbox/features/following/index.tsx | 4 +- .../features/generic_not_found/index.tsx | 2 +- .../features/hashtag-timeline/index.tsx | 2 +- app/soapbox/features/landing_page/index.tsx | 2 +- app/soapbox/features/list_timeline/index.tsx | 2 +- app/soapbox/features/lists/index.tsx | 2 +- app/soapbox/features/mutes/index.tsx | 2 +- app/soapbox/features/notifications/index.tsx | 2 +- .../steps/cover-photo-selection-step.tsx | 2 +- .../steps/suggested-accounts-step.tsx | 2 +- .../features/pinned_statuses/index.tsx | 4 +- .../features/public_timeline/index.tsx | 2 +- .../report/components/status_check_box.tsx | 2 +- .../components/scheduled_status.tsx | 2 +- .../features/scheduled_statuses/index.tsx | 2 +- .../status/components/detailed-status.tsx | 2 +- app/soapbox/features/status/index.tsx | 6 +-- app/soapbox/features/test_timeline/index.tsx | 2 +- .../features/ui/components/actions_modal.tsx | 2 +- .../ui/components/birthdays_modal.tsx | 2 +- .../features/ui/components/column_header.tsx | 2 +- .../features/ui/components/compose_modal.tsx | 2 +- .../components/familiar_followers_modal.tsx | 2 +- .../features/ui/components/mentions_modal.tsx | 2 +- .../features/ui/components/modal_root.tsx | 2 +- .../account-moderation-modal.tsx | 2 +- .../modals/report-modal/report-modal.tsx | 2 +- .../features/ui/components/pending_status.tsx | 2 +- .../components/profile_familiar_followers.tsx | 2 +- .../ui/components/profile_info_panel.tsx | 2 +- .../ui/components/reactions_modal.tsx | 2 +- .../features/ui/components/reblogs_modal.tsx | 2 +- .../features/ui/components/timeline.tsx | 2 +- .../features/ui/components/user_panel.tsx | 4 +- app/soapbox/features/ui/index.tsx | 2 +- .../features/ui/util/async-components.ts | 4 +- 88 files changed, 90 insertions(+), 138 deletions(-) rename app/soapbox/components/{load_gap.tsx => load-gap.tsx} (100%) rename app/soapbox/components/{load_more.tsx => load-more.tsx} (100%) rename app/soapbox/components/{media_gallery.tsx => media-gallery.tsx} (99%) rename app/soapbox/components/{missing_indicator.tsx => missing-indicator.tsx} (100%) rename app/soapbox/components/{modal_root.tsx => modal-root.tsx} (100%) delete mode 100644 app/soapbox/components/more_follows.tsx rename app/soapbox/components/{scrollable_list.tsx => scrollable-list.tsx} (99%) rename app/soapbox/components/{sidebar_menu.tsx => sidebar-menu.tsx} (100%) rename app/soapbox/components/{status_content.tsx => status-content.tsx} (100%) rename app/soapbox/components/{status_list.tsx => status-list.tsx} (98%) rename app/soapbox/components/{still_image.tsx => still-image.tsx} (100%) rename app/soapbox/components/{sub_navigation.tsx => sub-navigation.tsx} (100%) rename app/soapbox/components/{svg_icon.tsx => svg-icon.tsx} (100%) rename app/soapbox/components/{thumb_navigation-link.tsx => thumb-navigation-link.tsx} (100%) rename app/soapbox/components/{thumb_navigation.tsx => thumb-navigation.tsx} (97%) rename app/soapbox/components/{verification_badge.tsx => verification-badge.tsx} (100%) diff --git a/app/soapbox/components/account.tsx b/app/soapbox/components/account.tsx index e981e66ae..3137b25a3 100644 --- a/app/soapbox/components/account.tsx +++ b/app/soapbox/components/account.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { Link, useHistory } from 'react-router-dom'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; -import VerificationBadge from 'soapbox/components/verification_badge'; +import VerificationBadge from 'soapbox/components/verification-badge'; import ActionButton from 'soapbox/features/ui/components/action-button'; import { useAppSelector, useOnScreen } from 'soapbox/hooks'; import { getAcct } from 'soapbox/utils/accounts'; diff --git a/app/soapbox/components/avatar-overlay.tsx b/app/soapbox/components/avatar-overlay.tsx index ae38b5e4c..a463b35ce 100644 --- a/app/soapbox/components/avatar-overlay.tsx +++ b/app/soapbox/components/avatar-overlay.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; import type { Account as AccountEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/avatar.tsx b/app/soapbox/components/avatar.tsx index 4f40d46bb..4bc5c0774 100644 --- a/app/soapbox/components/avatar.tsx +++ b/app/soapbox/components/avatar.tsx @@ -1,7 +1,7 @@ import classNames from 'clsx'; import React from 'react'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; import type { Account } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/column-header.js b/app/soapbox/components/column-header.js index 83a61b7ea..2d915c9f8 100644 --- a/app/soapbox/components/column-header.js +++ b/app/soapbox/components/column-header.js @@ -7,7 +7,7 @@ import { withRouter } from 'react-router-dom'; // import classNames from 'clsx'; // import { injectIntl, defineMessages } from 'react-intl'; // import Icon from 'soapbox/components/icon'; -import SubNavigation from 'soapbox/components/sub_navigation'; +import SubNavigation from 'soapbox/components/sub-navigation'; // const messages = defineMessages({ // show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' }, diff --git a/app/soapbox/components/display-name.tsx b/app/soapbox/components/display-name.tsx index 63028ccfe..ccc6f6ed4 100644 --- a/app/soapbox/components/display-name.tsx +++ b/app/soapbox/components/display-name.tsx @@ -7,7 +7,7 @@ import { getAcct } from '../utils/accounts'; import Icon from './icon'; import RelativeTimestamp from './relative-timestamp'; -import VerificationBadge from './verification_badge'; +import VerificationBadge from './verification-badge'; import type { Account } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/icon.tsx b/app/soapbox/components/icon.tsx index 93985d55a..f03f40580 100644 --- a/app/soapbox/components/icon.tsx +++ b/app/soapbox/components/icon.tsx @@ -8,7 +8,7 @@ import React from 'react'; import ForkAwesomeIcon, { IForkAwesomeIcon } from './fork-awesome-icon'; -import SvgIcon, { ISvgIcon } from './svg_icon'; +import SvgIcon, { ISvgIcon } from './svg-icon'; export type IIcon = IForkAwesomeIcon | ISvgIcon; diff --git a/app/soapbox/components/load_gap.tsx b/app/soapbox/components/load-gap.tsx similarity index 100% rename from app/soapbox/components/load_gap.tsx rename to app/soapbox/components/load-gap.tsx diff --git a/app/soapbox/components/load_more.tsx b/app/soapbox/components/load-more.tsx similarity index 100% rename from app/soapbox/components/load_more.tsx rename to app/soapbox/components/load-more.tsx diff --git a/app/soapbox/components/media_gallery.tsx b/app/soapbox/components/media-gallery.tsx similarity index 99% rename from app/soapbox/components/media_gallery.tsx rename to app/soapbox/components/media-gallery.tsx index 390a300ca..e978e448e 100644 --- a/app/soapbox/components/media_gallery.tsx +++ b/app/soapbox/components/media-gallery.tsx @@ -3,7 +3,7 @@ import React, { useState, useRef, useEffect } from 'react'; import Blurhash from 'soapbox/components/blurhash'; import Icon from 'soapbox/components/icon'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; import { MIMETYPE_ICONS } from 'soapbox/features/compose/components/upload'; import { useSettings } from 'soapbox/hooks'; import { Attachment } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/missing_indicator.tsx b/app/soapbox/components/missing-indicator.tsx similarity index 100% rename from app/soapbox/components/missing_indicator.tsx rename to app/soapbox/components/missing-indicator.tsx diff --git a/app/soapbox/components/modal_root.tsx b/app/soapbox/components/modal-root.tsx similarity index 100% rename from app/soapbox/components/modal_root.tsx rename to app/soapbox/components/modal-root.tsx diff --git a/app/soapbox/components/more_follows.tsx b/app/soapbox/components/more_follows.tsx deleted file mode 100644 index f200cd543..000000000 --- a/app/soapbox/components/more_follows.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import React from 'react'; -import { defineMessages, useIntl } from 'react-intl'; - -import { useAppSelector } from 'soapbox/hooks'; -import { getFeatures } from 'soapbox/utils/features'; - -const messages = defineMessages({ - following: { - id: 'morefollows.following_label', - defaultMessage: '…and {count} more {count, plural, one {follow} other {follows}} on remote sites.', - }, - followers: { - id: 'morefollows.followers_label', - defaultMessage: '…and {count} more {count, plural, one {follower} other {followers}} on remote sites.', - }, -}); - -interface IMoreFollows { - visible?: Boolean, - count?: number, - type: 'following' | 'followers', -} - -const MoreFollows: React.FC = ({ visible = true, count, type }) => { - const intl = useIntl(); - const features = useAppSelector((state) => getFeatures(state.instance)); - - const getMessage = () => { - return intl.formatMessage(messages[type], { count }); - }; - - // If the instance isn't federating, there are no remote followers - if (!features.federating) { - return null; - } - - return ( -
-
-
- {getMessage()} -
-
-
- ); -}; - -export default MoreFollows; diff --git a/app/soapbox/components/quoted-status.tsx b/app/soapbox/components/quoted-status.tsx index 77adeffa6..24b382a7f 100644 --- a/app/soapbox/components/quoted-status.tsx +++ b/app/soapbox/components/quoted-status.tsx @@ -11,7 +11,7 @@ import { defaultMediaVisibility } from 'soapbox/utils/status'; import OutlineBox from './outline-box'; import StatusReplyMentions from './status-reply-mentions'; -import StatusContent from './status_content'; +import StatusContent from './status-content'; import SensitiveContentOverlay from './statuses/sensitive-content-overlay'; import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/scrollable_list.tsx b/app/soapbox/components/scrollable-list.tsx similarity index 99% rename from app/soapbox/components/scrollable_list.tsx rename to app/soapbox/components/scrollable-list.tsx index cdb74e580..86e40570e 100644 --- a/app/soapbox/components/scrollable_list.tsx +++ b/app/soapbox/components/scrollable-list.tsx @@ -5,7 +5,7 @@ import { Virtuoso, Components, VirtuosoProps, VirtuosoHandle, ListRange, IndexLo import { useSettings } from 'soapbox/hooks'; -import LoadMore from './load_more'; +import LoadMore from './load-more'; import { Card, Spinner } from './ui'; /** Custom Viruoso component context. */ diff --git a/app/soapbox/components/sidebar_menu.tsx b/app/soapbox/components/sidebar-menu.tsx similarity index 100% rename from app/soapbox/components/sidebar_menu.tsx rename to app/soapbox/components/sidebar-menu.tsx diff --git a/app/soapbox/components/status_content.tsx b/app/soapbox/components/status-content.tsx similarity index 100% rename from app/soapbox/components/status_content.tsx rename to app/soapbox/components/status-content.tsx diff --git a/app/soapbox/components/status_list.tsx b/app/soapbox/components/status-list.tsx similarity index 98% rename from app/soapbox/components/status_list.tsx rename to app/soapbox/components/status-list.tsx index 09fbe3275..1471b5ab0 100644 --- a/app/soapbox/components/status_list.tsx +++ b/app/soapbox/components/status-list.tsx @@ -5,8 +5,8 @@ import React, { useRef, useCallback } from 'react'; import { FormattedMessage } from 'react-intl'; import { v4 as uuidv4 } from 'uuid'; -import LoadGap from 'soapbox/components/load_gap'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import LoadGap from 'soapbox/components/load-gap'; +import ScrollableList from 'soapbox/components/scrollable-list'; import StatusContainer from 'soapbox/containers/status_container'; import Ad from 'soapbox/features/ads/components/ad'; import FeedSuggestions from 'soapbox/features/feed-suggestions/feed-suggestions'; @@ -18,7 +18,7 @@ import useAds from 'soapbox/queries/ads'; import type { OrderedSet as ImmutableOrderedSet } from 'immutable'; import type { VirtuosoHandle } from 'react-virtuoso'; -import type { IScrollableList } from 'soapbox/components/scrollable_list'; +import type { IScrollableList } from 'soapbox/components/scrollable-list'; import type { Ad as AdEntity } from 'soapbox/types/soapbox'; interface IStatusList extends Omit { diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx index 23fd5145b..ab8276556 100644 --- a/app/soapbox/components/status.tsx +++ b/app/soapbox/components/status.tsx @@ -18,7 +18,7 @@ import { defaultMediaVisibility, textForScreenReader, getActualStatus } from 'so import StatusActionBar from './status-action-bar'; import StatusMedia from './status-media'; import StatusReplyMentions from './status-reply-mentions'; -import StatusContent from './status_content'; +import StatusContent from './status-content'; import SensitiveContentOverlay from './statuses/sensitive-content-overlay'; import { Card, HStack, Stack, Text } from './ui'; diff --git a/app/soapbox/components/still_image.tsx b/app/soapbox/components/still-image.tsx similarity index 100% rename from app/soapbox/components/still_image.tsx rename to app/soapbox/components/still-image.tsx diff --git a/app/soapbox/components/sub_navigation.tsx b/app/soapbox/components/sub-navigation.tsx similarity index 100% rename from app/soapbox/components/sub_navigation.tsx rename to app/soapbox/components/sub-navigation.tsx diff --git a/app/soapbox/components/svg_icon.tsx b/app/soapbox/components/svg-icon.tsx similarity index 100% rename from app/soapbox/components/svg_icon.tsx rename to app/soapbox/components/svg-icon.tsx diff --git a/app/soapbox/components/thumb_navigation-link.tsx b/app/soapbox/components/thumb-navigation-link.tsx similarity index 100% rename from app/soapbox/components/thumb_navigation-link.tsx rename to app/soapbox/components/thumb-navigation-link.tsx diff --git a/app/soapbox/components/thumb_navigation.tsx b/app/soapbox/components/thumb-navigation.tsx similarity index 97% rename from app/soapbox/components/thumb_navigation.tsx rename to app/soapbox/components/thumb-navigation.tsx index e46f7c7c3..45a980f86 100644 --- a/app/soapbox/components/thumb_navigation.tsx +++ b/app/soapbox/components/thumb-navigation.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import ThumbNavigationLink from 'soapbox/components/thumb_navigation-link'; +import ThumbNavigationLink from 'soapbox/components/thumb-navigation-link'; import { useAppSelector, useOwnAccount } from 'soapbox/hooks'; import { getFeatures } from 'soapbox/utils/features'; diff --git a/app/soapbox/components/ui/avatar/avatar.tsx b/app/soapbox/components/ui/avatar/avatar.tsx index bdd38df9c..ec1980978 100644 --- a/app/soapbox/components/ui/avatar/avatar.tsx +++ b/app/soapbox/components/ui/avatar/avatar.tsx @@ -1,7 +1,7 @@ import classNames from 'clsx'; import * as React from 'react'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; const AVATAR_SIZE = 42; diff --git a/app/soapbox/components/verification_badge.tsx b/app/soapbox/components/verification-badge.tsx similarity index 100% rename from app/soapbox/components/verification_badge.tsx rename to app/soapbox/components/verification-badge.tsx diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx index fdb12611f..c20a37611 100644 --- a/app/soapbox/features/account/components/header.tsx +++ b/app/soapbox/features/account/components/header.tsx @@ -16,7 +16,7 @@ import { setSearchAccount } from 'soapbox/actions/search'; import { getSettings } from 'soapbox/actions/settings'; import snackbar from 'soapbox/actions/snackbar'; import Badge from 'soapbox/components/badge'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; import { HStack, IconButton, Menu, MenuButton, MenuItem, MenuList, MenuLink, MenuDivider, Avatar } from 'soapbox/components/ui'; import SvgIcon from 'soapbox/components/ui/icon/svg-icon'; import MovedNote from 'soapbox/features/account_timeline/components/moved_note'; diff --git a/app/soapbox/features/account_gallery/components/media_item.tsx b/app/soapbox/features/account_gallery/components/media_item.tsx index d98f74363..3999fb85f 100644 --- a/app/soapbox/features/account_gallery/components/media_item.tsx +++ b/app/soapbox/features/account_gallery/components/media_item.tsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import Blurhash from 'soapbox/components/blurhash'; import Icon from 'soapbox/components/icon'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; import { useSettings } from 'soapbox/hooks'; import { isIOS } from 'soapbox/is_mobile'; diff --git a/app/soapbox/features/account_gallery/index.tsx b/app/soapbox/features/account_gallery/index.tsx index ddd2b3160..ab3f9748e 100644 --- a/app/soapbox/features/account_gallery/index.tsx +++ b/app/soapbox/features/account_gallery/index.tsx @@ -8,8 +8,8 @@ import { } from 'soapbox/actions/accounts'; import { openModal } from 'soapbox/actions/modals'; import { expandAccountMediaTimeline } from 'soapbox/actions/timelines'; -import LoadMore from 'soapbox/components/load_more'; -import MissingIndicator from 'soapbox/components/missing_indicator'; +import LoadMore from 'soapbox/components/load-more'; +import MissingIndicator from 'soapbox/components/missing-indicator'; import { Column, Spinner } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { getAccountGallery, findAccountByUsername } from 'soapbox/selectors'; diff --git a/app/soapbox/features/account_timeline/index.tsx b/app/soapbox/features/account_timeline/index.tsx index 3ebe43d1d..fb99ca04c 100644 --- a/app/soapbox/features/account_timeline/index.tsx +++ b/app/soapbox/features/account_timeline/index.tsx @@ -5,8 +5,8 @@ import { useHistory } from 'react-router-dom'; import { fetchAccountByUsername } from 'soapbox/actions/accounts'; import { fetchPatronAccount } from 'soapbox/actions/patron'; import { expandAccountFeaturedTimeline, expandAccountTimeline } from 'soapbox/actions/timelines'; -import MissingIndicator from 'soapbox/components/missing_indicator'; -import StatusList from 'soapbox/components/status_list'; +import MissingIndicator from 'soapbox/components/missing-indicator'; +import StatusList from 'soapbox/components/status-list'; import { Card, CardBody, Spinner, Text } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useFeatures, useSettings, useSoapboxConfig } from 'soapbox/hooks'; import { makeGetStatusIds, findAccountByUsername } from 'soapbox/selectors'; diff --git a/app/soapbox/features/admin/components/report_status.tsx b/app/soapbox/features/admin/components/report_status.tsx index 4f9ff1af0..41067585e 100644 --- a/app/soapbox/features/admin/components/report_status.tsx +++ b/app/soapbox/features/admin/components/report_status.tsx @@ -4,7 +4,7 @@ import { useIntl, defineMessages } from 'react-intl'; import { openModal } from 'soapbox/actions/modals'; import { deleteStatusModal } from 'soapbox/actions/moderation'; -import StatusContent from 'soapbox/components/status_content'; +import StatusContent from 'soapbox/components/status-content'; import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; import Bundle from 'soapbox/features/ui/components/bundle'; import { MediaGallery, Video, Audio } from 'soapbox/features/ui/util/async-components'; diff --git a/app/soapbox/features/admin/moderation_log.tsx b/app/soapbox/features/admin/moderation_log.tsx index 606858ec8..063e3092a 100644 --- a/app/soapbox/features/admin/moderation_log.tsx +++ b/app/soapbox/features/admin/moderation_log.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import { defineMessages, FormattedDate, useIntl } from 'react-intl'; import { fetchModerationLog } from 'soapbox/actions/admin'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import Column from '../ui/components/column'; diff --git a/app/soapbox/features/admin/tabs/awaiting-approval.tsx b/app/soapbox/features/admin/tabs/awaiting-approval.tsx index 6f79897a6..0a73bb7cc 100644 --- a/app/soapbox/features/admin/tabs/awaiting-approval.tsx +++ b/app/soapbox/features/admin/tabs/awaiting-approval.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { fetchUsers } from 'soapbox/actions/admin'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import UnapprovedAccount from '../components/unapproved_account'; diff --git a/app/soapbox/features/admin/tabs/reports.tsx b/app/soapbox/features/admin/tabs/reports.tsx index 5c2854cc4..8975fff5c 100644 --- a/app/soapbox/features/admin/tabs/reports.tsx +++ b/app/soapbox/features/admin/tabs/reports.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { fetchReports } from 'soapbox/actions/admin'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import Report from '../components/report'; diff --git a/app/soapbox/features/admin/user_index.js b/app/soapbox/features/admin/user_index.js index 032ed6dc2..3a6d5c283 100644 --- a/app/soapbox/features/admin/user_index.js +++ b/app/soapbox/features/admin/user_index.js @@ -7,7 +7,7 @@ import { injectIntl, defineMessages } from 'react-intl'; import { connect } from 'react-redux'; import { fetchUsers } from 'soapbox/actions/admin'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import AccountContainer from 'soapbox/containers/account_container'; import { SimpleForm, TextInput } from 'soapbox/features/forms'; import Column from 'soapbox/features/ui/components/column'; diff --git a/app/soapbox/features/aliases/index.tsx b/app/soapbox/features/aliases/index.tsx index d76c7988d..4b29c7f29 100644 --- a/app/soapbox/features/aliases/index.tsx +++ b/app/soapbox/features/aliases/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchAliases, removeFromAliases } from 'soapbox/actions/aliases'; import Icon from 'soapbox/components/icon'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { CardHeader, CardTitle, Column, HStack, Text } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; diff --git a/app/soapbox/features/backups/index.tsx b/app/soapbox/features/backups/index.tsx index 87049a936..bbffec85f 100644 --- a/app/soapbox/features/backups/index.tsx +++ b/app/soapbox/features/backups/index.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { fetchBackups, createBackup } from 'soapbox/actions/backups'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import Column from '../ui/components/better_column'; diff --git a/app/soapbox/features/blocks/index.tsx b/app/soapbox/features/blocks/index.tsx index 842950e49..08cc3352a 100644 --- a/app/soapbox/features/blocks/index.tsx +++ b/app/soapbox/features/blocks/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; import { fetchBlocks, expandBlocks } from 'soapbox/actions/blocks'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Column, Spinner } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/bookmarks/index.tsx b/app/soapbox/features/bookmarks/index.tsx index c645a56d1..a3cb4e47e 100644 --- a/app/soapbox/features/bookmarks/index.tsx +++ b/app/soapbox/features/bookmarks/index.tsx @@ -4,8 +4,8 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'soapbox/actions/bookmarks'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; -import StatusList from 'soapbox/components/status_list'; -import SubNavigation from 'soapbox/components/sub_navigation'; +import StatusList from 'soapbox/components/status-list'; +import SubNavigation from 'soapbox/components/sub-navigation'; import { Column } from 'soapbox/components/ui'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/community_timeline/index.tsx b/app/soapbox/features/community_timeline/index.tsx index 4fd4e1d0a..cae4c4f3f 100644 --- a/app/soapbox/features/community_timeline/index.tsx +++ b/app/soapbox/features/community_timeline/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { connectCommunityStream } from 'soapbox/actions/streaming'; import { expandCommunityTimeline } from 'soapbox/actions/timelines'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; -import SubNavigation from 'soapbox/components/sub_navigation'; +import SubNavigation from 'soapbox/components/sub-navigation'; import { Column } from 'soapbox/components/ui'; import { useAppDispatch, useSettings } from 'soapbox/hooks'; diff --git a/app/soapbox/features/compose/components/search_results.tsx b/app/soapbox/features/compose/components/search_results.tsx index de8b3807b..d96cb6b16 100644 --- a/app/soapbox/features/compose/components/search_results.tsx +++ b/app/soapbox/features/compose/components/search_results.tsx @@ -6,7 +6,7 @@ import { expandSearch, setFilter, setSearchAccount } from 'soapbox/actions/searc import { fetchTrendingStatuses } from 'soapbox/actions/trending_statuses'; import Hashtag from 'soapbox/components/hashtag'; import IconButton from 'soapbox/components/icon-button'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { HStack, Tabs, Text } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import StatusContainer from 'soapbox/containers/status_container'; diff --git a/app/soapbox/features/conversations/components/conversations_list.tsx b/app/soapbox/features/conversations/components/conversations_list.tsx index 01705fd30..83b43a622 100644 --- a/app/soapbox/features/conversations/components/conversations_list.tsx +++ b/app/soapbox/features/conversations/components/conversations_list.tsx @@ -3,7 +3,7 @@ import React, { useRef } from 'react'; import { FormattedMessage } from 'react-intl'; import { expandConversations } from 'soapbox/actions/conversations'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import Conversation from '../components/conversation'; diff --git a/app/soapbox/features/directory/index.tsx b/app/soapbox/features/directory/index.tsx index 1824ddfe3..68eafb4ba 100644 --- a/app/soapbox/features/directory/index.tsx +++ b/app/soapbox/features/directory/index.tsx @@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux'; import { useLocation } from 'react-router-dom'; import { fetchDirectory, expandDirectory } from 'soapbox/actions/directory'; -import LoadMore from 'soapbox/components/load_more'; +import LoadMore from 'soapbox/components/load-more'; import RadioButton from 'soapbox/components/radio_button'; import Column from 'soapbox/features/ui/components/column'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/domain_blocks/index.tsx b/app/soapbox/features/domain_blocks/index.tsx index cad165b3b..91c0337c9 100644 --- a/app/soapbox/features/domain_blocks/index.tsx +++ b/app/soapbox/features/domain_blocks/index.tsx @@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux'; import { fetchDomainBlocks, expandDomainBlocks } from 'soapbox/actions/domain_blocks'; import Domain from 'soapbox/components/domain'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Spinner } from 'soapbox/components/ui'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/edit_profile/components/profile-preview.tsx b/app/soapbox/features/edit_profile/components/profile-preview.tsx index b486efcbf..c85ff3d2f 100644 --- a/app/soapbox/features/edit_profile/components/profile-preview.tsx +++ b/app/soapbox/features/edit_profile/components/profile-preview.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; import { HStack, Stack, Text } from 'soapbox/components/ui'; -import VerificationBadge from 'soapbox/components/verification_badge'; +import VerificationBadge from 'soapbox/components/verification-badge'; import { useSoapboxConfig } from 'soapbox/hooks'; import type { Account } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/embedded-status/index.tsx b/app/soapbox/features/embedded-status/index.tsx index 931b3fb66..56d836d1b 100644 --- a/app/soapbox/features/embedded-status/index.tsx +++ b/app/soapbox/features/embedded-status/index.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import { useHistory } from 'react-router-dom'; import { fetchStatus } from 'soapbox/actions/statuses'; -import MissingIndicator from 'soapbox/components/missing_indicator'; +import MissingIndicator from 'soapbox/components/missing-indicator'; import SiteLogo from 'soapbox/components/site-logo'; import Status from 'soapbox/components/status'; import { Spinner } from 'soapbox/components/ui'; diff --git a/app/soapbox/features/favourited_statuses/index.tsx b/app/soapbox/features/favourited_statuses/index.tsx index 1a8ba3bfa..fe284fce1 100644 --- a/app/soapbox/features/favourited_statuses/index.tsx +++ b/app/soapbox/features/favourited_statuses/index.tsx @@ -5,8 +5,8 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchAccount, fetchAccountByUsername } from 'soapbox/actions/accounts'; import { fetchFavouritedStatuses, expandFavouritedStatuses, fetchAccountFavouritedStatuses, expandAccountFavouritedStatuses } from 'soapbox/actions/favourites'; -import MissingIndicator from 'soapbox/components/missing_indicator'; -import StatusList from 'soapbox/components/status_list'; +import MissingIndicator from 'soapbox/components/missing-indicator'; +import StatusList from 'soapbox/components/status-list'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; import { findAccountByUsername } from 'soapbox/selectors'; diff --git a/app/soapbox/features/federation_restrictions/index.tsx b/app/soapbox/features/federation_restrictions/index.tsx index 95adc8b25..33e68a06e 100644 --- a/app/soapbox/features/federation_restrictions/index.tsx +++ b/app/soapbox/features/federation_restrictions/index.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import Accordion from 'soapbox/features/ui/components/accordion'; import { useAppSelector } from 'soapbox/hooks'; import { makeGetHosts } from 'soapbox/selectors'; diff --git a/app/soapbox/features/feed-suggestions/feed-suggestions.tsx b/app/soapbox/features/feed-suggestions/feed-suggestions.tsx index 2545c72e5..61f7a09af 100644 --- a/app/soapbox/features/feed-suggestions/feed-suggestions.tsx +++ b/app/soapbox/features/feed-suggestions/feed-suggestions.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { Link } from 'react-router-dom'; -import VerificationBadge from 'soapbox/components/verification_badge'; +import VerificationBadge from 'soapbox/components/verification-badge'; import { useAccount, useAppSelector } from 'soapbox/hooks'; import { Card, CardBody, CardTitle, HStack, Stack, Text } from '../../components/ui'; diff --git a/app/soapbox/features/filters/index.tsx b/app/soapbox/features/filters/index.tsx index ebf5943ac..470655344 100644 --- a/app/soapbox/features/filters/index.tsx +++ b/app/soapbox/features/filters/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchFilters, createFilter, deleteFilter } from 'soapbox/actions/filters'; import snackbar from 'soapbox/actions/snackbar'; import Icon from 'soapbox/components/icon'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Button, CardHeader, CardTitle, Column, Form, FormActions, FormGroup, Input, Text } from 'soapbox/components/ui'; import { FieldsGroup, diff --git a/app/soapbox/features/follow-recommendations/index.tsx b/app/soapbox/features/follow-recommendations/index.tsx index 221ca1491..bcfcf8fe9 100644 --- a/app/soapbox/features/follow-recommendations/index.tsx +++ b/app/soapbox/features/follow-recommendations/index.tsx @@ -3,7 +3,7 @@ import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchSuggestions } from 'soapbox/actions/suggestions'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Stack, Text } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import Column from 'soapbox/features/ui/components/column'; diff --git a/app/soapbox/features/follow_requests/index.tsx b/app/soapbox/features/follow_requests/index.tsx index eed1a8e1f..a073c346d 100644 --- a/app/soapbox/features/follow_requests/index.tsx +++ b/app/soapbox/features/follow_requests/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import { useDispatch } from 'react-redux'; import { fetchFollowRequests, expandFollowRequests } from 'soapbox/actions/accounts'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Spinner } from 'soapbox/components/ui'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/followers/index.tsx b/app/soapbox/features/followers/index.tsx index 8625f2142..d8a8337ec 100644 --- a/app/soapbox/features/followers/index.tsx +++ b/app/soapbox/features/followers/index.tsx @@ -9,8 +9,8 @@ import { expandFollowers, fetchAccountByUsername, } from 'soapbox/actions/accounts'; -import MissingIndicator from 'soapbox/components/missing_indicator'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import MissingIndicator from 'soapbox/components/missing-indicator'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Spinner } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; diff --git a/app/soapbox/features/following/index.tsx b/app/soapbox/features/following/index.tsx index cd0a10351..bdfc8fd91 100644 --- a/app/soapbox/features/following/index.tsx +++ b/app/soapbox/features/following/index.tsx @@ -9,8 +9,8 @@ import { expandFollowing, fetchAccountByUsername, } from 'soapbox/actions/accounts'; -import MissingIndicator from 'soapbox/components/missing_indicator'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import MissingIndicator from 'soapbox/components/missing-indicator'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Spinner } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; diff --git a/app/soapbox/features/generic_not_found/index.tsx b/app/soapbox/features/generic_not_found/index.tsx index 09da310e1..0ec9241e3 100644 --- a/app/soapbox/features/generic_not_found/index.tsx +++ b/app/soapbox/features/generic_not_found/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import MissingIndicator from '../../components/missing_indicator'; +import MissingIndicator from '../../components/missing-indicator'; const GenericNotFound = () => ( diff --git a/app/soapbox/features/hashtag-timeline/index.tsx b/app/soapbox/features/hashtag-timeline/index.tsx index e10b74aee..2282bc1c7 100644 --- a/app/soapbox/features/hashtag-timeline/index.tsx +++ b/app/soapbox/features/hashtag-timeline/index.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { connectHashtagStream } from 'soapbox/actions/streaming'; import { expandHashtagTimeline, clearTimeline } from 'soapbox/actions/timelines'; -import SubNavigation from 'soapbox/components/sub_navigation'; +import SubNavigation from 'soapbox/components/sub-navigation'; import { Column } from 'soapbox/components/ui'; import Timeline from 'soapbox/features/ui/components/timeline'; import { useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/landing_page/index.tsx b/app/soapbox/features/landing_page/index.tsx index 937e599c8..e4dcf5aca 100644 --- a/app/soapbox/features/landing_page/index.tsx +++ b/app/soapbox/features/landing_page/index.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { prepareRequest } from 'soapbox/actions/consumer-auth'; import { Button, Card, CardBody, Stack, Text } from 'soapbox/components/ui'; -import VerificationBadge from 'soapbox/components/verification_badge'; +import VerificationBadge from 'soapbox/components/verification-badge'; import RegistrationForm from 'soapbox/features/auth_login/components/registration_form'; import { useAppDispatch, useAppSelector, useFeatures, useSoapboxConfig } from 'soapbox/hooks'; import { capitalize } from 'soapbox/utils/strings'; diff --git a/app/soapbox/features/list_timeline/index.tsx b/app/soapbox/features/list_timeline/index.tsx index 5082dd71b..c8acc7a4c 100644 --- a/app/soapbox/features/list_timeline/index.tsx +++ b/app/soapbox/features/list_timeline/index.tsx @@ -6,7 +6,7 @@ import { fetchList } from 'soapbox/actions/lists'; import { openModal } from 'soapbox/actions/modals'; import { connectListStream } from 'soapbox/actions/streaming'; import { expandListTimeline } from 'soapbox/actions/timelines'; -import MissingIndicator from 'soapbox/components/missing_indicator'; +import MissingIndicator from 'soapbox/components/missing-indicator'; import { Button, Spinner } from 'soapbox/components/ui'; import Column from 'soapbox/features/ui/components/column'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/lists/index.tsx b/app/soapbox/features/lists/index.tsx index 6ec93ee5a..f37c2bf20 100644 --- a/app/soapbox/features/lists/index.tsx +++ b/app/soapbox/features/lists/index.tsx @@ -7,7 +7,7 @@ import { createSelector } from 'reselect'; import { deleteList, fetchLists } from 'soapbox/actions/lists'; import { openModal } from 'soapbox/actions/modals'; import Icon from 'soapbox/components/icon'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Column, IconButton, Spinner } from 'soapbox/components/ui'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/mutes/index.tsx b/app/soapbox/features/mutes/index.tsx index caf15ca26..ac8bdd2e6 100644 --- a/app/soapbox/features/mutes/index.tsx +++ b/app/soapbox/features/mutes/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import { useDispatch } from 'react-redux'; import { fetchMutes, expandMutes } from 'soapbox/actions/mutes'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Column, Spinner } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/notifications/index.tsx b/app/soapbox/features/notifications/index.tsx index de99b9043..1e10db25a 100644 --- a/app/soapbox/features/notifications/index.tsx +++ b/app/soapbox/features/notifications/index.tsx @@ -13,7 +13,7 @@ import { import { getSettings } from 'soapbox/actions/settings'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; import ScrollTopButton from 'soapbox/components/scroll-top-button'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Column } from 'soapbox/components/ui'; import PlaceholderNotification from 'soapbox/features/placeholder/components/placeholder_notification'; import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; diff --git a/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx b/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx index 9961a08c0..4d1ae3f12 100644 --- a/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx +++ b/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx @@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux'; import { patchMe } from 'soapbox/actions/me'; import snackbar from 'soapbox/actions/snackbar'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; import { Avatar, Button, Card, CardBody, Icon, Spinner, Stack, Text } from 'soapbox/components/ui'; import { useOwnAccount } from 'soapbox/hooks'; import resizeImage from 'soapbox/utils/resize_image'; diff --git a/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx b/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx index a05202ff9..5bcbe445c 100644 --- a/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx +++ b/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx @@ -2,7 +2,7 @@ import debounce from 'lodash/debounce'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Button, Card, CardBody, Stack, Text } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useOnboardingSuggestions } from 'soapbox/queries/suggestions'; diff --git a/app/soapbox/features/pinned_statuses/index.tsx b/app/soapbox/features/pinned_statuses/index.tsx index b5263ea4a..c04643647 100644 --- a/app/soapbox/features/pinned_statuses/index.tsx +++ b/app/soapbox/features/pinned_statuses/index.tsx @@ -3,8 +3,8 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { useParams } from 'react-router-dom'; import { fetchPinnedStatuses } from 'soapbox/actions/pin_statuses'; -import MissingIndicator from 'soapbox/components/missing_indicator'; -import StatusList from 'soapbox/components/status_list'; +import MissingIndicator from 'soapbox/components/missing-indicator'; +import StatusList from 'soapbox/components/status-list'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import Column from '../ui/components/column'; diff --git a/app/soapbox/features/public_timeline/index.tsx b/app/soapbox/features/public_timeline/index.tsx index 34017a0d3..894771da4 100644 --- a/app/soapbox/features/public_timeline/index.tsx +++ b/app/soapbox/features/public_timeline/index.tsx @@ -6,7 +6,7 @@ import { changeSetting } from 'soapbox/actions/settings'; import { connectPublicStream } from 'soapbox/actions/streaming'; import { expandPublicTimeline } from 'soapbox/actions/timelines'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; -import SubNavigation from 'soapbox/components/sub_navigation'; +import SubNavigation from 'soapbox/components/sub-navigation'; import { Column } from 'soapbox/components/ui'; import Accordion from 'soapbox/features/ui/components/accordion'; import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; diff --git a/app/soapbox/features/report/components/status_check_box.tsx b/app/soapbox/features/report/components/status_check_box.tsx index cb2424ea7..f8b1f6635 100644 --- a/app/soapbox/features/report/components/status_check_box.tsx +++ b/app/soapbox/features/report/components/status_check_box.tsx @@ -3,7 +3,7 @@ import React from 'react'; import Toggle from 'react-toggle'; import { toggleStatusReport } from 'soapbox/actions/reports'; -import StatusContent from 'soapbox/components/status_content'; +import StatusContent from 'soapbox/components/status-content'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import Bundle from '../../ui/components/bundle'; diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx b/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx index b9b90ef27..5741bd34a 100644 --- a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx +++ b/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx @@ -3,7 +3,7 @@ import React from 'react'; import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; -import StatusContent from 'soapbox/components/status_content'; +import StatusContent from 'soapbox/components/status-content'; import { HStack } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import PollPreview from 'soapbox/features/ui/components/poll_preview'; diff --git a/app/soapbox/features/scheduled_statuses/index.tsx b/app/soapbox/features/scheduled_statuses/index.tsx index 1bf9b5aee..6f30d16b5 100644 --- a/app/soapbox/features/scheduled_statuses/index.tsx +++ b/app/soapbox/features/scheduled_statuses/index.tsx @@ -3,7 +3,7 @@ import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchScheduledStatuses, expandScheduledStatuses } from 'soapbox/actions/scheduled_statuses'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import Column from '../ui/components/column'; diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx index ff176ebdb..336a7e2aa 100644 --- a/app/soapbox/features/status/components/detailed-status.tsx +++ b/app/soapbox/features/status/components/detailed-status.tsx @@ -5,7 +5,7 @@ import { FormattedDate, FormattedMessage, useIntl } from 'react-intl'; import Icon from 'soapbox/components/icon'; import StatusMedia from 'soapbox/components/status-media'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; -import StatusContent from 'soapbox/components/status_content'; +import StatusContent from 'soapbox/components/status-content'; import SensitiveContentOverlay from 'soapbox/components/statuses/sensitive-content-overlay'; import TranslateButton from 'soapbox/components/translate-button'; import { HStack, Stack, Text } from 'soapbox/components/ui'; diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx index 2d419ca84..18460b1ec 100644 --- a/app/soapbox/features/status/index.tsx +++ b/app/soapbox/features/status/index.tsx @@ -25,11 +25,11 @@ import { fetchStatusWithContext, fetchNext, } from 'soapbox/actions/statuses'; -import MissingIndicator from 'soapbox/components/missing_indicator'; +import MissingIndicator from 'soapbox/components/missing-indicator'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import StatusActionBar from 'soapbox/components/status-action-bar'; -import SubNavigation from 'soapbox/components/sub_navigation'; +import SubNavigation from 'soapbox/components/sub-navigation'; import Tombstone from 'soapbox/components/tombstone'; import { Column, Stack } from 'soapbox/components/ui'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status'; diff --git a/app/soapbox/features/test_timeline/index.tsx b/app/soapbox/features/test_timeline/index.tsx index 9addcfa92..7102d9602 100644 --- a/app/soapbox/features/test_timeline/index.tsx +++ b/app/soapbox/features/test_timeline/index.tsx @@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux'; import { importFetchedStatuses } from 'soapbox/actions/importer'; import { expandTimelineSuccess } from 'soapbox/actions/timelines'; -import SubNavigation from 'soapbox/components/sub_navigation'; +import SubNavigation from 'soapbox/components/sub-navigation'; import { Column } from '../../components/ui'; import Timeline from '../ui/components/timeline'; diff --git a/app/soapbox/features/ui/components/actions_modal.tsx b/app/soapbox/features/ui/components/actions_modal.tsx index 67e29933f..d7a8be28a 100644 --- a/app/soapbox/features/ui/components/actions_modal.tsx +++ b/app/soapbox/features/ui/components/actions_modal.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; import { spring } from 'react-motion'; import Icon from 'soapbox/components/icon'; -import StatusContent from 'soapbox/components/status_content'; +import StatusContent from 'soapbox/components/status-content'; import { Stack } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; diff --git a/app/soapbox/features/ui/components/birthdays_modal.tsx b/app/soapbox/features/ui/components/birthdays_modal.tsx index 058a16cfc..2eb9504ec 100644 --- a/app/soapbox/features/ui/components/birthdays_modal.tsx +++ b/app/soapbox/features/ui/components/birthdays_modal.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Modal, Spinner } from 'soapbox/components/ui'; import Account from 'soapbox/features/birthdays/account'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/column_header.tsx b/app/soapbox/features/ui/components/column_header.tsx index fc0d6e7c9..2c61be235 100644 --- a/app/soapbox/features/ui/components/column_header.tsx +++ b/app/soapbox/features/ui/components/column_header.tsx @@ -2,7 +2,7 @@ import React from 'react'; // import classNames from 'clsx'; // import Icon from 'soapbox/components/icon'; -import SubNavigation from 'soapbox/components/sub_navigation'; +import SubNavigation from 'soapbox/components/sub-navigation'; interface IColumnHeader { icon?: string, diff --git a/app/soapbox/features/ui/components/compose_modal.tsx b/app/soapbox/features/ui/components/compose_modal.tsx index 5dc86766b..703f3e46f 100644 --- a/app/soapbox/features/ui/components/compose_modal.tsx +++ b/app/soapbox/features/ui/components/compose_modal.tsx @@ -3,7 +3,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { cancelReplyCompose } from 'soapbox/actions/compose'; import { openModal, closeModal } from 'soapbox/actions/modals'; -import { checkComposeContent } from 'soapbox/components/modal_root'; +import { checkComposeContent } from 'soapbox/components/modal-root'; import { Modal } from 'soapbox/components/ui'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/familiar_followers_modal.tsx b/app/soapbox/features/ui/components/familiar_followers_modal.tsx index f276e9a9a..cf57495a5 100644 --- a/app/soapbox/features/ui/components/familiar_followers_modal.tsx +++ b/app/soapbox/features/ui/components/familiar_followers_modal.tsx @@ -2,7 +2,7 @@ import { OrderedSet as ImmutableOrderedSet } from 'immutable'; import React from 'react'; import { FormattedMessage } from 'react-intl'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Modal, Spinner } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/mentions_modal.tsx b/app/soapbox/features/ui/components/mentions_modal.tsx index 0cd104cfb..58383eda5 100644 --- a/app/soapbox/features/ui/components/mentions_modal.tsx +++ b/app/soapbox/features/ui/components/mentions_modal.tsx @@ -3,7 +3,7 @@ import React, { useCallback, useEffect } from 'react'; import { FormattedMessage } from 'react-intl'; import { fetchStatusWithContext } from 'soapbox/actions/statuses'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Modal, Spinner } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/modal_root.tsx b/app/soapbox/features/ui/components/modal_root.tsx index 4e7a82e04..282bb4104 100644 --- a/app/soapbox/features/ui/components/modal_root.tsx +++ b/app/soapbox/features/ui/components/modal_root.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import Base from 'soapbox/components/modal_root'; +import Base from 'soapbox/components/modal-root'; import { MediaModal, VideoModal, diff --git a/app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx b/app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx index 8c9f3df06..264ffcfb4 100644 --- a/app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx +++ b/app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx @@ -12,7 +12,7 @@ import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation import snackbar from 'soapbox/actions/snackbar'; import Account from 'soapbox/components/account'; import List, { ListItem } from 'soapbox/components/list'; -import MissingIndicator from 'soapbox/components/missing_indicator'; +import MissingIndicator from 'soapbox/components/missing-indicator'; import OutlineBox from 'soapbox/components/outline-box'; import { Button, Text, HStack, Modal, Stack, Toggle } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx index f0e5d562b..e4e2e0ea4 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx @@ -5,7 +5,7 @@ import { blockAccount } from 'soapbox/actions/accounts'; import { submitReport, submitReportSuccess, submitReportFail } from 'soapbox/actions/reports'; import { expandAccountTimeline } from 'soapbox/actions/timelines'; import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; -import StatusContent from 'soapbox/components/status_content'; +import StatusContent from 'soapbox/components/status-content'; import { Modal, ProgressBar, Stack, Text } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAccount, useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/pending_status.tsx b/app/soapbox/features/ui/components/pending_status.tsx index 64f0d168b..f7f6ec92f 100644 --- a/app/soapbox/features/ui/components/pending_status.tsx +++ b/app/soapbox/features/ui/components/pending_status.tsx @@ -1,8 +1,8 @@ import classNames from 'clsx'; import React from 'react'; +import StatusContent from 'soapbox/components/status-content'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; -import StatusContent from 'soapbox/components/status_content'; import { Card, HStack } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card'; diff --git a/app/soapbox/features/ui/components/profile_familiar_followers.tsx b/app/soapbox/features/ui/components/profile_familiar_followers.tsx index a07f18c4d..dcb3b3d87 100644 --- a/app/soapbox/features/ui/components/profile_familiar_followers.tsx +++ b/app/soapbox/features/ui/components/profile_familiar_followers.tsx @@ -8,7 +8,7 @@ import { fetchAccountFamiliarFollowers } from 'soapbox/actions/familiar_follower import { openModal } from 'soapbox/actions/modals'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; import { Text } from 'soapbox/components/ui'; -import VerificationBadge from 'soapbox/components/verification_badge'; +import VerificationBadge from 'soapbox/components/verification-badge'; import { useAppSelector, useFeatures } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; diff --git a/app/soapbox/features/ui/components/profile_info_panel.tsx b/app/soapbox/features/ui/components/profile_info_panel.tsx index c6c6d084e..ce39c9b3c 100644 --- a/app/soapbox/features/ui/components/profile_info_panel.tsx +++ b/app/soapbox/features/ui/components/profile_info_panel.tsx @@ -5,7 +5,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import Badge from 'soapbox/components/badge'; import { Icon, HStack, Stack, Text } from 'soapbox/components/ui'; -import VerificationBadge from 'soapbox/components/verification_badge'; +import VerificationBadge from 'soapbox/components/verification-badge'; import { useSoapboxConfig } from 'soapbox/hooks'; import { isLocal } from 'soapbox/utils/accounts'; import { badgeToTag, getBadges as getAccountBadges } from 'soapbox/utils/badges'; diff --git a/app/soapbox/features/ui/components/reactions_modal.tsx b/app/soapbox/features/ui/components/reactions_modal.tsx index 7d0498c6d..baf4cb8ea 100644 --- a/app/soapbox/features/ui/components/reactions_modal.tsx +++ b/app/soapbox/features/ui/components/reactions_modal.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; import { fetchFavourites, fetchReactions } from 'soapbox/actions/interactions'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Emoji, Modal, Spinner, Tabs } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/reblogs_modal.tsx b/app/soapbox/features/ui/components/reblogs_modal.tsx index 3bacf3a25..c7f13eb81 100644 --- a/app/soapbox/features/ui/components/reblogs_modal.tsx +++ b/app/soapbox/features/ui/components/reblogs_modal.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { fetchReblogs } from 'soapbox/actions/interactions'; import { fetchStatus } from 'soapbox/actions/statuses'; -import ScrollableList from 'soapbox/components/scrollable_list'; +import ScrollableList from 'soapbox/components/scrollable-list'; import { Modal, Spinner } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/timeline.tsx b/app/soapbox/features/ui/components/timeline.tsx index 38c5a4341..3b5e71f81 100644 --- a/app/soapbox/features/ui/components/timeline.tsx +++ b/app/soapbox/features/ui/components/timeline.tsx @@ -5,7 +5,7 @@ import { defineMessages } from 'react-intl'; import { dequeueTimeline, scrollTopTimeline } from 'soapbox/actions/timelines'; import ScrollTopButton from 'soapbox/components/scroll-top-button'; -import StatusList, { IStatusList } from 'soapbox/components/status_list'; +import StatusList, { IStatusList } from 'soapbox/components/status-list'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { makeGetStatusIds } from 'soapbox/selectors'; diff --git a/app/soapbox/features/ui/components/user_panel.tsx b/app/soapbox/features/ui/components/user_panel.tsx index 3c801fd25..8f0fbf517 100644 --- a/app/soapbox/features/ui/components/user_panel.tsx +++ b/app/soapbox/features/ui/components/user_panel.tsx @@ -3,9 +3,9 @@ import { FormattedMessage, useIntl } from 'react-intl'; import { Link } from 'react-router-dom'; import Avatar from 'soapbox/components/avatar'; -import StillImage from 'soapbox/components/still_image'; +import StillImage from 'soapbox/components/still-image'; import { HStack, Stack, Text } from 'soapbox/components/ui'; -import VerificationBadge from 'soapbox/components/verification_badge'; +import VerificationBadge from 'soapbox/components/verification-badge'; import { useAppSelector } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; import { getAcct } from 'soapbox/utils/accounts'; diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx index 973a2187c..d168c8d56 100644 --- a/app/soapbox/features/ui/index.tsx +++ b/app/soapbox/features/ui/index.tsx @@ -23,7 +23,7 @@ import { fetchSuggestionsForTimeline } from 'soapbox/actions/suggestions'; import { expandHomeTimeline } from 'soapbox/actions/timelines'; import Icon from 'soapbox/components/icon'; import SidebarNavigation from 'soapbox/components/sidebar-navigation'; -import ThumbNavigation from 'soapbox/components/thumb_navigation'; +import ThumbNavigation from 'soapbox/components/thumb-navigation'; import { Layout } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useOwnAccount, useSoapboxConfig, useFeatures } from 'soapbox/hooks'; import AdminPage from 'soapbox/pages/admin_page'; diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts index 773eed795..e954f8b0e 100644 --- a/app/soapbox/features/ui/util/async-components.ts +++ b/app/soapbox/features/ui/util/async-components.ts @@ -111,7 +111,7 @@ export function AccountModerationModal() { } export function MediaGallery() { - return import(/* webpackChunkName: "status/media_gallery" */'../../../components/media_gallery'); + return import(/* webpackChunkName: "status/media_gallery" */'../../../components/media-gallery'); } export function Video() { @@ -363,7 +363,7 @@ export function LatestAccountsPanel() { } export function SidebarMenu() { - return import(/* webpackChunkName: "features/ui" */'../../../components/sidebar_menu'); + return import(/* webpackChunkName: "features/ui" */'../../../components/sidebar-menu'); } export function UploadArea() { From 5a449e791606d3f9b38494ab4b925258559b0670 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 11:11:42 -0500 Subject: [PATCH 06/19] Rename files (3): _ -> - --- app/soapbox/actions/compose.ts | 4 ++-- app/soapbox/actions/emojis.ts | 2 +- ...utosuggest_emoji.test.tsx => autosuggest-emoji.test.tsx} | 2 +- .../{avatar_overlay.test.tsx => avatar-overlay.test.tsx} | 0 .../{display_name.test.tsx => display-name.test.tsx} | 0 .../{emoji_selector.test.tsx => emoji-selector.test.tsx} | 0 app/soapbox/components/announcements/reactions-bar.tsx | 2 +- app/soapbox/components/autosuggest-account-input.tsx | 2 +- .../{autosuggest_emoji.tsx => autosuggest-emoji.tsx} | 0 .../{autosuggest_input.tsx => autosuggest-input.tsx} | 2 +- .../{autosuggest_textarea.tsx => autosuggest-textarea.tsx} | 2 +- app/soapbox/features/compose/components/compose-form.tsx | 6 +++--- .../components/emoji-picker/emoji-picker-dropdown.tsx | 2 +- .../compose/components/emoji-picker/emoji-picker-menu.tsx | 2 +- app/soapbox/features/compose/components/polls/poll-form.tsx | 4 ++-- app/soapbox/features/compose/components/spoiler-input.tsx | 2 +- app/soapbox/reducers/compose.ts | 2 +- app/soapbox/reducers/settings.ts | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename app/soapbox/components/__tests__/{autosuggest_emoji.test.tsx => autosuggest-emoji.test.tsx} (94%) rename app/soapbox/components/__tests__/{avatar_overlay.test.tsx => avatar-overlay.test.tsx} (100%) rename app/soapbox/components/__tests__/{display_name.test.tsx => display-name.test.tsx} (100%) rename app/soapbox/components/__tests__/{emoji_selector.test.tsx => emoji-selector.test.tsx} (100%) rename app/soapbox/components/{autosuggest_emoji.tsx => autosuggest-emoji.tsx} (100%) rename app/soapbox/components/{autosuggest_input.tsx => autosuggest-input.tsx} (99%) rename app/soapbox/components/{autosuggest_textarea.tsx => autosuggest-textarea.tsx} (99%) diff --git a/app/soapbox/actions/compose.ts b/app/soapbox/actions/compose.ts index 57e7909a1..5d8139d71 100644 --- a/app/soapbox/actions/compose.ts +++ b/app/soapbox/actions/compose.ts @@ -21,8 +21,8 @@ import { getSettings } from './settings'; import { createStatus } from './statuses'; import type { History } from 'history'; -import type { Emoji } from 'soapbox/components/autosuggest_emoji'; -import type { AutoSuggestion } from 'soapbox/components/autosuggest_input'; +import type { Emoji } from 'soapbox/components/autosuggest-emoji'; +import type { AutoSuggestion } from 'soapbox/components/autosuggest-input'; import type { AppDispatch, RootState } from 'soapbox/store'; import type { Account, APIEntity, Status, Tag } from 'soapbox/types/entities'; diff --git a/app/soapbox/actions/emojis.ts b/app/soapbox/actions/emojis.ts index 04bda6c89..46f591b06 100644 --- a/app/soapbox/actions/emojis.ts +++ b/app/soapbox/actions/emojis.ts @@ -1,6 +1,6 @@ import { saveSettings } from './settings'; -import type { Emoji } from 'soapbox/components/autosuggest_emoji'; +import type { Emoji } from 'soapbox/components/autosuggest-emoji'; import type { AppDispatch } from 'soapbox/store'; const EMOJI_USE = 'EMOJI_USE'; diff --git a/app/soapbox/components/__tests__/autosuggest_emoji.test.tsx b/app/soapbox/components/__tests__/autosuggest-emoji.test.tsx similarity index 94% rename from app/soapbox/components/__tests__/autosuggest_emoji.test.tsx rename to app/soapbox/components/__tests__/autosuggest-emoji.test.tsx index 8fab0ef8b..e2f059ff7 100644 --- a/app/soapbox/components/__tests__/autosuggest_emoji.test.tsx +++ b/app/soapbox/components/__tests__/autosuggest-emoji.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render, screen } from '../../jest/test-helpers'; -import AutosuggestEmoji from '../autosuggest_emoji'; +import AutosuggestEmoji from '../autosuggest-emoji'; describe('', () => { it('renders native emoji', () => { diff --git a/app/soapbox/components/__tests__/avatar_overlay.test.tsx b/app/soapbox/components/__tests__/avatar-overlay.test.tsx similarity index 100% rename from app/soapbox/components/__tests__/avatar_overlay.test.tsx rename to app/soapbox/components/__tests__/avatar-overlay.test.tsx diff --git a/app/soapbox/components/__tests__/display_name.test.tsx b/app/soapbox/components/__tests__/display-name.test.tsx similarity index 100% rename from app/soapbox/components/__tests__/display_name.test.tsx rename to app/soapbox/components/__tests__/display-name.test.tsx diff --git a/app/soapbox/components/__tests__/emoji_selector.test.tsx b/app/soapbox/components/__tests__/emoji-selector.test.tsx similarity index 100% rename from app/soapbox/components/__tests__/emoji_selector.test.tsx rename to app/soapbox/components/__tests__/emoji-selector.test.tsx diff --git a/app/soapbox/components/announcements/reactions-bar.tsx b/app/soapbox/components/announcements/reactions-bar.tsx index 130db2d99..f9569fb90 100644 --- a/app/soapbox/components/announcements/reactions-bar.tsx +++ b/app/soapbox/components/announcements/reactions-bar.tsx @@ -9,7 +9,7 @@ import { useSettings } from 'soapbox/hooks'; import Reaction from './reaction'; import type { List as ImmutableList, Map as ImmutableMap } from 'immutable'; -import type { Emoji } from 'soapbox/components/autosuggest_emoji'; +import type { Emoji } from 'soapbox/components/autosuggest-emoji'; import type { AnnouncementReaction } from 'soapbox/types/entities'; interface IReactionsBar { diff --git a/app/soapbox/components/autosuggest-account-input.tsx b/app/soapbox/components/autosuggest-account-input.tsx index 17c5f41cb..1be14c3ec 100644 --- a/app/soapbox/components/autosuggest-account-input.tsx +++ b/app/soapbox/components/autosuggest-account-input.tsx @@ -3,7 +3,7 @@ import throttle from 'lodash/throttle'; import React, { useState, useRef, useCallback, useEffect } from 'react'; import { accountSearch } from 'soapbox/actions/accounts'; -import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest_input'; +import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest-input'; import { useAppDispatch } from 'soapbox/hooks'; import type { Menu } from 'soapbox/components/dropdown-menu'; diff --git a/app/soapbox/components/autosuggest_emoji.tsx b/app/soapbox/components/autosuggest-emoji.tsx similarity index 100% rename from app/soapbox/components/autosuggest_emoji.tsx rename to app/soapbox/components/autosuggest-emoji.tsx diff --git a/app/soapbox/components/autosuggest_input.tsx b/app/soapbox/components/autosuggest-input.tsx similarity index 99% rename from app/soapbox/components/autosuggest_input.tsx rename to app/soapbox/components/autosuggest-input.tsx index 9313e092f..cbb79af44 100644 --- a/app/soapbox/components/autosuggest_input.tsx +++ b/app/soapbox/components/autosuggest-input.tsx @@ -4,7 +4,7 @@ import { List as ImmutableList } from 'immutable'; import React from 'react'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import AutosuggestEmoji, { Emoji } from 'soapbox/components/autosuggest_emoji'; +import AutosuggestEmoji, { Emoji } from 'soapbox/components/autosuggest-emoji'; import Icon from 'soapbox/components/icon'; import { Input } from 'soapbox/components/ui'; import AutosuggestAccount from 'soapbox/features/compose/components/autosuggest_account'; diff --git a/app/soapbox/components/autosuggest_textarea.tsx b/app/soapbox/components/autosuggest-textarea.tsx similarity index 99% rename from app/soapbox/components/autosuggest_textarea.tsx rename to app/soapbox/components/autosuggest-textarea.tsx index 4f80d0b3b..321514cb6 100644 --- a/app/soapbox/components/autosuggest_textarea.tsx +++ b/app/soapbox/components/autosuggest-textarea.tsx @@ -7,7 +7,7 @@ import Textarea from 'react-textarea-autosize'; import AutosuggestAccount from '../features/compose/components/autosuggest_account'; import { isRtl } from '../rtl'; -import AutosuggestEmoji, { Emoji } from './autosuggest_emoji'; +import AutosuggestEmoji, { Emoji } from './autosuggest-emoji'; import type { List as ImmutableList } from 'immutable'; diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx index e93215aec..df3a7faa4 100644 --- a/app/soapbox/features/compose/components/compose-form.tsx +++ b/app/soapbox/features/compose/components/compose-form.tsx @@ -13,8 +13,8 @@ import { insertEmojiCompose, uploadCompose, } from 'soapbox/actions/compose'; -import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest_input'; -import AutosuggestTextarea from 'soapbox/components/autosuggest_textarea'; +import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest-input'; +import AutosuggestTextarea from 'soapbox/components/autosuggest-textarea'; import Icon from 'soapbox/components/icon'; import { Button, Stack } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useCompose, useFeatures, usePrevious } from 'soapbox/hooks'; @@ -41,7 +41,7 @@ import SpoilerInput from './spoiler-input'; import TextCharacterCounter from './text_character_counter'; import VisualCharacterCounter from './visual_character_counter'; -import type { Emoji } from 'soapbox/components/autosuggest_emoji'; +import type { Emoji } from 'soapbox/components/autosuggest-emoji'; const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d'; diff --git a/app/soapbox/features/compose/components/emoji-picker/emoji-picker-dropdown.tsx b/app/soapbox/features/compose/components/emoji-picker/emoji-picker-dropdown.tsx index 697f38c8c..c65f8ecad 100644 --- a/app/soapbox/features/compose/components/emoji-picker/emoji-picker-dropdown.tsx +++ b/app/soapbox/features/compose/components/emoji-picker/emoji-picker-dropdown.tsx @@ -14,7 +14,7 @@ import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import EmojiPickerMenu from './emoji-picker-menu'; -import type { Emoji as EmojiType } from 'soapbox/components/autosuggest_emoji'; +import type { Emoji as EmojiType } from 'soapbox/components/autosuggest-emoji'; import type { RootState } from 'soapbox/store'; let EmojiPicker: any, Emoji: any; // load asynchronously diff --git a/app/soapbox/features/compose/components/emoji-picker/emoji-picker-menu.tsx b/app/soapbox/features/compose/components/emoji-picker/emoji-picker-menu.tsx index 7cb12e8f5..a7a4dff28 100644 --- a/app/soapbox/features/compose/components/emoji-picker/emoji-picker-menu.tsx +++ b/app/soapbox/features/compose/components/emoji-picker/emoji-picker-menu.tsx @@ -9,7 +9,7 @@ import { buildCustomEmojis } from '../../../emoji/emoji'; import { EmojiPicker } from './emoji-picker-dropdown'; import ModifierPicker from './modifier-picker'; -import type { Emoji } from 'soapbox/components/autosuggest_emoji'; +import type { Emoji } from 'soapbox/components/autosuggest-emoji'; const backgroundImageFn = () => require('emoji-datasource/img/twitter/sheets/32.png'); const listenerOptions = supportsPassiveEvents ? { passive: true } : false; diff --git a/app/soapbox/features/compose/components/polls/poll-form.tsx b/app/soapbox/features/compose/components/polls/poll-form.tsx index e61f1975f..07a3fb729 100644 --- a/app/soapbox/features/compose/components/polls/poll-form.tsx +++ b/app/soapbox/features/compose/components/polls/poll-form.tsx @@ -2,13 +2,13 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { addPollOption, changePollOption, changePollSettings, clearComposeSuggestions, fetchComposeSuggestions, removePoll, removePollOption, selectComposeSuggestion } from 'soapbox/actions/compose'; -import AutosuggestInput from 'soapbox/components/autosuggest_input'; +import AutosuggestInput from 'soapbox/components/autosuggest-input'; import { Button, Divider, HStack, Stack, Text, Toggle } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useCompose } from 'soapbox/hooks'; import DurationSelector from './duration-selector'; -import type { AutoSuggestion } from 'soapbox/components/autosuggest_input'; +import type { AutoSuggestion } from 'soapbox/components/autosuggest-input'; const messages = defineMessages({ option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Answer #{number}' }, diff --git a/app/soapbox/features/compose/components/spoiler-input.tsx b/app/soapbox/features/compose/components/spoiler-input.tsx index 873450116..139960b68 100644 --- a/app/soapbox/features/compose/components/spoiler-input.tsx +++ b/app/soapbox/features/compose/components/spoiler-input.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { changeComposeSpoilerness, changeComposeSpoilerText } from 'soapbox/actions/compose'; -import AutosuggestInput, { IAutosuggestInput } from 'soapbox/components/autosuggest_input'; +import AutosuggestInput, { IAutosuggestInput } from 'soapbox/components/autosuggest-input'; import { Divider, Stack, Text } from 'soapbox/components/ui'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; diff --git a/app/soapbox/reducers/compose.ts b/app/soapbox/reducers/compose.ts index 3f02f8cac..8e7fe6b0e 100644 --- a/app/soapbox/reducers/compose.ts +++ b/app/soapbox/reducers/compose.ts @@ -56,7 +56,7 @@ import { normalizeAttachment } from '../normalizers/attachment'; import { unescapeHTML } from '../utils/html'; import type { AnyAction } from 'redux'; -import type { Emoji } from 'soapbox/components/autosuggest_emoji'; +import type { Emoji } from 'soapbox/components/autosuggest-emoji'; import type { Account as AccountEntity, APIEntity, diff --git a/app/soapbox/reducers/settings.ts b/app/soapbox/reducers/settings.ts index ee8ddc558..70a28a478 100644 --- a/app/soapbox/reducers/settings.ts +++ b/app/soapbox/reducers/settings.ts @@ -13,7 +13,7 @@ import { FE_NAME, } from '../actions/settings'; -import type { Emoji } from 'soapbox/components/autosuggest_emoji'; +import type { Emoji } from 'soapbox/components/autosuggest-emoji'; import type { APIEntity } from 'soapbox/types/entities'; type State = ImmutableMap; From 717e61a6e05fe14da41bed7806de39dab80a09a9 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 11:13:54 -0500 Subject: [PATCH 07/19] Rename files (4): _ -> - --- app/soapbox/actions/moderation.tsx | 2 +- app/soapbox/components/birthday-panel.tsx | 2 +- app/soapbox/components/quoted-status.tsx | 4 ++-- app/soapbox/components/sidebar-navigation.tsx | 2 +- app/soapbox/components/status-action-bar.tsx | 2 +- app/soapbox/components/status-hover-card.tsx | 2 +- app/soapbox/components/status-list.tsx | 2 +- app/soapbox/components/status.tsx | 4 ++-- .../containers/{account_container.js => account-container.js} | 0 ...{dropdown_menu_container.ts => dropdown-menu-container.ts} | 0 .../containers/{status_container.tsx => status-container.tsx} | 0 .../features/admin/components/latest_accounts_panel.tsx | 2 +- app/soapbox/features/admin/components/report.tsx | 2 +- app/soapbox/features/admin/components/report_status.tsx | 2 +- app/soapbox/features/admin/user_index.js | 2 +- app/soapbox/features/blocks/index.tsx | 2 +- app/soapbox/features/chats/components/chat-message-list.tsx | 2 +- app/soapbox/features/compose/components/reply_indicator.tsx | 2 +- app/soapbox/features/compose/components/search_results.tsx | 4 ++-- .../features/conversations/components/conversation.tsx | 2 +- app/soapbox/features/follow-recommendations/index.tsx | 2 +- app/soapbox/features/followers/index.tsx | 2 +- app/soapbox/features/following/index.tsx | 2 +- app/soapbox/features/mutes/index.tsx | 2 +- .../features/notifications/components/notification.tsx | 4 ++-- .../features/onboarding/steps/suggested-accounts-step.tsx | 2 +- .../scheduled_statuses/components/scheduled_status.tsx | 2 +- app/soapbox/features/status/components/detailed-status.tsx | 4 ++-- app/soapbox/features/status/components/thread-status.tsx | 2 +- app/soapbox/features/ui/components/accordion.tsx | 2 +- app/soapbox/features/ui/components/actions_modal.tsx | 2 +- app/soapbox/features/ui/components/better_column.js | 2 +- .../features/ui/components/familiar_followers_modal.tsx | 2 +- .../features/ui/components/instance_moderation_panel.tsx | 2 +- app/soapbox/features/ui/components/mentions_modal.tsx | 2 +- .../features/ui/components/modals/favourites-modal.tsx | 2 +- .../ui/components/modals/report-modal/report-modal.tsx | 2 +- app/soapbox/features/ui/components/pending_status.tsx | 2 +- app/soapbox/features/ui/components/pinned_accounts_panel.tsx | 2 +- app/soapbox/features/ui/components/reactions_modal.tsx | 2 +- app/soapbox/features/ui/components/reblogs_modal.tsx | 2 +- app/soapbox/features/ui/components/who-to-follow-panel.tsx | 2 +- 42 files changed, 44 insertions(+), 44 deletions(-) rename app/soapbox/containers/{account_container.js => account-container.js} (100%) rename app/soapbox/containers/{dropdown_menu_container.ts => dropdown-menu-container.ts} (100%) rename app/soapbox/containers/{status_container.tsx => status-container.tsx} (100%) diff --git a/app/soapbox/actions/moderation.tsx b/app/soapbox/actions/moderation.tsx index bf0ccf332..1791500b5 100644 --- a/app/soapbox/actions/moderation.tsx +++ b/app/soapbox/actions/moderation.tsx @@ -7,7 +7,7 @@ import { openModal } from 'soapbox/actions/modals'; import snackbar from 'soapbox/actions/snackbar'; import OutlineBox from 'soapbox/components/outline-box'; import { Stack, Text } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { isLocal } from 'soapbox/utils/accounts'; import type { AppDispatch, RootState } from 'soapbox/store'; diff --git a/app/soapbox/components/birthday-panel.tsx b/app/soapbox/components/birthday-panel.tsx index 8381203b9..059b8678b 100644 --- a/app/soapbox/components/birthday-panel.tsx +++ b/app/soapbox/components/birthday-panel.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; import { fetchBirthdayReminders } from 'soapbox/actions/accounts'; import { Widget } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; const timeToMidnight = () => { diff --git a/app/soapbox/components/quoted-status.tsx b/app/soapbox/components/quoted-status.tsx index 24b382a7f..8b358158b 100644 --- a/app/soapbox/components/quoted-status.tsx +++ b/app/soapbox/components/quoted-status.tsx @@ -5,13 +5,13 @@ import { useHistory } from 'react-router-dom'; import StatusMedia from 'soapbox/components/status-media'; import { Stack } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useSettings } from 'soapbox/hooks'; import { defaultMediaVisibility } from 'soapbox/utils/status'; import OutlineBox from './outline-box'; -import StatusReplyMentions from './status-reply-mentions'; import StatusContent from './status-content'; +import StatusReplyMentions from './status-reply-mentions'; import SensitiveContentOverlay from './statuses/sensitive-content-overlay'; import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/sidebar-navigation.tsx b/app/soapbox/components/sidebar-navigation.tsx index 9ff0ad0f8..18c104b16 100644 --- a/app/soapbox/components/sidebar-navigation.tsx +++ b/app/soapbox/components/sidebar-navigation.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { getSettings } from 'soapbox/actions/settings'; -import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; +import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; import ComposeButton from 'soapbox/features/ui/components/compose-button'; import { useAppSelector, useOwnAccount } from 'soapbox/hooks'; import { getFeatures } from 'soapbox/utils/features'; diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx index 6429050d9..b4f5c187b 100644 --- a/app/soapbox/components/status-action-bar.tsx +++ b/app/soapbox/components/status-action-bar.tsx @@ -16,7 +16,7 @@ import { initReport } from 'soapbox/actions/reports'; import { deleteStatus, editStatus, toggleMuteStatus } from 'soapbox/actions/statuses'; import EmojiButtonWrapper from 'soapbox/components/emoji-button-wrapper'; import StatusActionButton from 'soapbox/components/status-action-button'; -import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container'; +import DropdownMenuContainer from 'soapbox/containers/dropdown-menu-container'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks'; import { isLocal } from 'soapbox/utils/accounts'; import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji_reacts'; diff --git a/app/soapbox/components/status-hover-card.tsx b/app/soapbox/components/status-hover-card.tsx index 4ae3f705e..37ca117a0 100644 --- a/app/soapbox/components/status-hover-card.tsx +++ b/app/soapbox/components/status-hover-card.tsx @@ -8,7 +8,7 @@ import { updateStatusHoverCard, } from 'soapbox/actions/status-hover-card'; import { fetchStatus } from 'soapbox/actions/statuses'; -import StatusContainer from 'soapbox/containers/status_container'; +import StatusContainer from 'soapbox/containers/status-container'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { showStatusHoverCard } from './hover-status-wrapper'; diff --git a/app/soapbox/components/status-list.tsx b/app/soapbox/components/status-list.tsx index 1471b5ab0..3480baf6a 100644 --- a/app/soapbox/components/status-list.tsx +++ b/app/soapbox/components/status-list.tsx @@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid'; import LoadGap from 'soapbox/components/load-gap'; import ScrollableList from 'soapbox/components/scrollable-list'; -import StatusContainer from 'soapbox/containers/status_container'; +import StatusContainer from 'soapbox/containers/status-container'; import Ad from 'soapbox/features/ads/components/ad'; import FeedSuggestions from 'soapbox/features/feed-suggestions/feed-suggestions'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status'; diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx index ab8276556..eb5f3704e 100644 --- a/app/soapbox/components/status.tsx +++ b/app/soapbox/components/status.tsx @@ -10,15 +10,15 @@ import { openModal } from 'soapbox/actions/modals'; import { toggleStatusHidden } from 'soapbox/actions/statuses'; import Icon from 'soapbox/components/icon'; import TranslateButton from 'soapbox/components/translate-button'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container'; import { useAppDispatch, useSettings } from 'soapbox/hooks'; import { defaultMediaVisibility, textForScreenReader, getActualStatus } from 'soapbox/utils/status'; import StatusActionBar from './status-action-bar'; +import StatusContent from './status-content'; import StatusMedia from './status-media'; import StatusReplyMentions from './status-reply-mentions'; -import StatusContent from './status-content'; import SensitiveContentOverlay from './statuses/sensitive-content-overlay'; import { Card, HStack, Stack, Text } from './ui'; diff --git a/app/soapbox/containers/account_container.js b/app/soapbox/containers/account-container.js similarity index 100% rename from app/soapbox/containers/account_container.js rename to app/soapbox/containers/account-container.js diff --git a/app/soapbox/containers/dropdown_menu_container.ts b/app/soapbox/containers/dropdown-menu-container.ts similarity index 100% rename from app/soapbox/containers/dropdown_menu_container.ts rename to app/soapbox/containers/dropdown-menu-container.ts diff --git a/app/soapbox/containers/status_container.tsx b/app/soapbox/containers/status-container.tsx similarity index 100% rename from app/soapbox/containers/status_container.tsx rename to app/soapbox/containers/status-container.tsx diff --git a/app/soapbox/features/admin/components/latest_accounts_panel.tsx b/app/soapbox/features/admin/components/latest_accounts_panel.tsx index f8a9fc04f..81efa7d46 100644 --- a/app/soapbox/features/admin/components/latest_accounts_panel.tsx +++ b/app/soapbox/features/admin/components/latest_accounts_panel.tsx @@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom'; import { fetchUsers } from 'soapbox/actions/admin'; import { Widget } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { compareId } from 'soapbox/utils/comparators'; diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx index 75c3ecb1d..0fd1712f7 100644 --- a/app/soapbox/features/admin/components/report.tsx +++ b/app/soapbox/features/admin/components/report.tsx @@ -8,7 +8,7 @@ import snackbar from 'soapbox/actions/snackbar'; import Avatar from 'soapbox/components/avatar'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; import { Button, HStack } from 'soapbox/components/ui'; -import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; +import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; import Accordion from 'soapbox/features/ui/components/accordion'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { makeGetReport } from 'soapbox/selectors'; diff --git a/app/soapbox/features/admin/components/report_status.tsx b/app/soapbox/features/admin/components/report_status.tsx index 41067585e..f81deeab7 100644 --- a/app/soapbox/features/admin/components/report_status.tsx +++ b/app/soapbox/features/admin/components/report_status.tsx @@ -5,7 +5,7 @@ import { useIntl, defineMessages } from 'react-intl'; import { openModal } from 'soapbox/actions/modals'; import { deleteStatusModal } from 'soapbox/actions/moderation'; import StatusContent from 'soapbox/components/status-content'; -import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; +import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; import Bundle from 'soapbox/features/ui/components/bundle'; import { MediaGallery, Video, Audio } from 'soapbox/features/ui/util/async-components'; import { useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/admin/user_index.js b/app/soapbox/features/admin/user_index.js index 3a6d5c283..eb91badb1 100644 --- a/app/soapbox/features/admin/user_index.js +++ b/app/soapbox/features/admin/user_index.js @@ -8,7 +8,7 @@ import { connect } from 'react-redux'; import { fetchUsers } from 'soapbox/actions/admin'; import ScrollableList from 'soapbox/components/scrollable-list'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { SimpleForm, TextInput } from 'soapbox/features/forms'; import Column from 'soapbox/features/ui/components/column'; diff --git a/app/soapbox/features/blocks/index.tsx b/app/soapbox/features/blocks/index.tsx index 08cc3352a..730ef3643 100644 --- a/app/soapbox/features/blocks/index.tsx +++ b/app/soapbox/features/blocks/index.tsx @@ -6,7 +6,7 @@ import { useDispatch } from 'react-redux'; import { fetchBlocks, expandBlocks } from 'soapbox/actions/blocks'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Column, Spinner } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppSelector } from 'soapbox/hooks'; const messages = defineMessages({ diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx index c1d6362ed..330fd9f9a 100644 --- a/app/soapbox/features/chats/components/chat-message-list.tsx +++ b/app/soapbox/features/chats/components/chat-message-list.tsx @@ -14,7 +14,7 @@ import { fetchChatMessages, deleteChatMessage } from 'soapbox/actions/chats'; import { openModal } from 'soapbox/actions/modals'; import { initReportById } from 'soapbox/actions/reports'; import { Text } from 'soapbox/components/ui'; -import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container'; +import DropdownMenuContainer from 'soapbox/containers/dropdown-menu-container'; import emojify from 'soapbox/features/emoji/emoji'; import Bundle from 'soapbox/features/ui/components/bundle'; import { MediaGallery } from 'soapbox/features/ui/util/async-components'; diff --git a/app/soapbox/features/compose/components/reply_indicator.tsx b/app/soapbox/features/compose/components/reply_indicator.tsx index 3af9c49a8..4ecc37816 100644 --- a/app/soapbox/features/compose/components/reply_indicator.tsx +++ b/app/soapbox/features/compose/components/reply_indicator.tsx @@ -2,7 +2,7 @@ import React from 'react'; import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; import { Stack, Text } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { isRtl } from 'soapbox/rtl'; import type { Status } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/compose/components/search_results.tsx b/app/soapbox/features/compose/components/search_results.tsx index d96cb6b16..2f39a8b85 100644 --- a/app/soapbox/features/compose/components/search_results.tsx +++ b/app/soapbox/features/compose/components/search_results.tsx @@ -8,8 +8,8 @@ import Hashtag from 'soapbox/components/hashtag'; import IconButton from 'soapbox/components/icon-button'; import ScrollableList from 'soapbox/components/scrollable-list'; import { HStack, Tabs, Text } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; -import StatusContainer from 'soapbox/containers/status_container'; +import AccountContainer from 'soapbox/containers/account-container'; +import StatusContainer from 'soapbox/containers/status-container'; import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder_account'; import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder_hashtag'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status'; diff --git a/app/soapbox/features/conversations/components/conversation.tsx b/app/soapbox/features/conversations/components/conversation.tsx index e48c0e17f..9e589bbbc 100644 --- a/app/soapbox/features/conversations/components/conversation.tsx +++ b/app/soapbox/features/conversations/components/conversation.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useHistory } from 'react-router-dom'; import { markConversationRead } from 'soapbox/actions/conversations'; -import StatusContainer from 'soapbox/containers/status_container'; +import StatusContainer from 'soapbox/containers/status-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; interface IConversation { diff --git a/app/soapbox/features/follow-recommendations/index.tsx b/app/soapbox/features/follow-recommendations/index.tsx index bcfcf8fe9..756812bb7 100644 --- a/app/soapbox/features/follow-recommendations/index.tsx +++ b/app/soapbox/features/follow-recommendations/index.tsx @@ -5,7 +5,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchSuggestions } from 'soapbox/actions/suggestions'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Stack, Text } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import Column from 'soapbox/features/ui/components/column'; import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks'; diff --git a/app/soapbox/features/followers/index.tsx b/app/soapbox/features/followers/index.tsx index d8a8337ec..d9025499b 100644 --- a/app/soapbox/features/followers/index.tsx +++ b/app/soapbox/features/followers/index.tsx @@ -12,7 +12,7 @@ import { import MissingIndicator from 'soapbox/components/missing-indicator'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Spinner } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; import { findAccountByUsername } from 'soapbox/selectors'; diff --git a/app/soapbox/features/following/index.tsx b/app/soapbox/features/following/index.tsx index bdfc8fd91..a189fddf1 100644 --- a/app/soapbox/features/following/index.tsx +++ b/app/soapbox/features/following/index.tsx @@ -12,7 +12,7 @@ import { import MissingIndicator from 'soapbox/components/missing-indicator'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Spinner } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; import { findAccountByUsername } from 'soapbox/selectors'; diff --git a/app/soapbox/features/mutes/index.tsx b/app/soapbox/features/mutes/index.tsx index ac8bdd2e6..e7e8365aa 100644 --- a/app/soapbox/features/mutes/index.tsx +++ b/app/soapbox/features/mutes/index.tsx @@ -6,7 +6,7 @@ import { useDispatch } from 'react-redux'; import { fetchMutes, expandMutes } from 'soapbox/actions/mutes'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Column, Spinner } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppSelector } from 'soapbox/hooks'; const messages = defineMessages({ diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index bd4433e8d..b50d953c8 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -10,8 +10,8 @@ import { getSettings } from 'soapbox/actions/settings'; import { hideStatus, revealStatus } from 'soapbox/actions/statuses'; import Icon from 'soapbox/components/icon'; import { HStack, Text, Emoji } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; -import StatusContainer from 'soapbox/containers/status_container'; +import AccountContainer from 'soapbox/containers/account-container'; +import StatusContainer from 'soapbox/containers/status-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { makeGetNotification } from 'soapbox/selectors'; import { NotificationType, validType } from 'soapbox/utils/notification'; diff --git a/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx b/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx index 5bcbe445c..e01206251 100644 --- a/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx +++ b/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Button, Card, CardBody, Stack, Text } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useOnboardingSuggestions } from 'soapbox/queries/suggestions'; const SuggestedAccountsStep = ({ onNext }: { onNext: () => void }) => { diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx b/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx index 5741bd34a..6fcd66921 100644 --- a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx +++ b/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx @@ -5,7 +5,7 @@ import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; import StatusContent from 'soapbox/components/status-content'; import { HStack } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import PollPreview from 'soapbox/features/ui/components/poll_preview'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx index 336a7e2aa..33a112b52 100644 --- a/app/soapbox/features/status/components/detailed-status.tsx +++ b/app/soapbox/features/status/components/detailed-status.tsx @@ -3,13 +3,13 @@ import React, { useRef } from 'react'; import { FormattedDate, FormattedMessage, useIntl } from 'react-intl'; import Icon from 'soapbox/components/icon'; +import StatusContent from 'soapbox/components/status-content'; import StatusMedia from 'soapbox/components/status-media'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; -import StatusContent from 'soapbox/components/status-content'; import SensitiveContentOverlay from 'soapbox/components/statuses/sensitive-content-overlay'; import TranslateButton from 'soapbox/components/translate-button'; import { HStack, Stack, Text } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container'; import { getActualStatus } from 'soapbox/utils/status'; diff --git a/app/soapbox/features/status/components/thread-status.tsx b/app/soapbox/features/status/components/thread-status.tsx index d3d587e7a..35b3db672 100644 --- a/app/soapbox/features/status/components/thread-status.tsx +++ b/app/soapbox/features/status/components/thread-status.tsx @@ -2,7 +2,7 @@ import classNames from 'clsx'; import { OrderedSet as ImmutableOrderedSet } from 'immutable'; import React from 'react'; -import StatusContainer from 'soapbox/containers/status_container'; +import StatusContainer from 'soapbox/containers/status-container'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status'; import { useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/accordion.tsx b/app/soapbox/features/ui/components/accordion.tsx index 6c07aa25b..bf6938c70 100644 --- a/app/soapbox/features/ui/components/accordion.tsx +++ b/app/soapbox/features/ui/components/accordion.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { Text } from 'soapbox/components/ui'; -import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; +import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; import type { Menu } from 'soapbox/components/dropdown-menu'; diff --git a/app/soapbox/features/ui/components/actions_modal.tsx b/app/soapbox/features/ui/components/actions_modal.tsx index d7a8be28a..43815a3dd 100644 --- a/app/soapbox/features/ui/components/actions_modal.tsx +++ b/app/soapbox/features/ui/components/actions_modal.tsx @@ -6,7 +6,7 @@ import { spring } from 'react-motion'; import Icon from 'soapbox/components/icon'; import StatusContent from 'soapbox/components/status-content'; import { Stack } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import Motion from '../util/optional_motion'; diff --git a/app/soapbox/features/ui/components/better_column.js b/app/soapbox/features/ui/components/better_column.js index 0efc19c3f..cbbf067a3 100644 --- a/app/soapbox/features/ui/components/better_column.js +++ b/app/soapbox/features/ui/components/better_column.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { Column } from 'soapbox/components/ui'; -import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; +import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; import ColumnHeader from './column_header'; diff --git a/app/soapbox/features/ui/components/familiar_followers_modal.tsx b/app/soapbox/features/ui/components/familiar_followers_modal.tsx index cf57495a5..3b137ca5f 100644 --- a/app/soapbox/features/ui/components/familiar_followers_modal.tsx +++ b/app/soapbox/features/ui/components/familiar_followers_modal.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Modal, Spinner } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppSelector } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; diff --git a/app/soapbox/features/ui/components/instance_moderation_panel.tsx b/app/soapbox/features/ui/components/instance_moderation_panel.tsx index 3ea9cf715..1b403ed53 100644 --- a/app/soapbox/features/ui/components/instance_moderation_panel.tsx +++ b/app/soapbox/features/ui/components/instance_moderation_panel.tsx @@ -5,7 +5,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import { openModal } from 'soapbox/actions/modals'; import { Widget } from 'soapbox/components/ui'; -import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; +import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; import InstanceRestrictions from 'soapbox/features/federation_restrictions/components/instance_restrictions'; import { useAppSelector, useAppDispatch, useOwnAccount } from 'soapbox/hooks'; import { makeGetRemoteInstance } from 'soapbox/selectors'; diff --git a/app/soapbox/features/ui/components/mentions_modal.tsx b/app/soapbox/features/ui/components/mentions_modal.tsx index 58383eda5..1df00fb08 100644 --- a/app/soapbox/features/ui/components/mentions_modal.tsx +++ b/app/soapbox/features/ui/components/mentions_modal.tsx @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl'; import { fetchStatusWithContext } from 'soapbox/actions/statuses'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Modal, Spinner } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { makeGetStatus } from 'soapbox/selectors'; diff --git a/app/soapbox/features/ui/components/modals/favourites-modal.tsx b/app/soapbox/features/ui/components/modals/favourites-modal.tsx index d414a3c09..9e2b72a61 100644 --- a/app/soapbox/features/ui/components/modals/favourites-modal.tsx +++ b/app/soapbox/features/ui/components/modals/favourites-modal.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { fetchFavourites } from 'soapbox/actions/interactions'; import { Modal, Spinner, Stack } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; interface IFavouritesModal { diff --git a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx index e4e2e0ea4..05ce5f960 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx @@ -7,7 +7,7 @@ import { expandAccountTimeline } from 'soapbox/actions/timelines'; import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; import StatusContent from 'soapbox/components/status-content'; import { Modal, ProgressBar, Stack, Text } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAccount, useAppDispatch, useAppSelector } from 'soapbox/hooks'; import ConfirmationStep from './steps/confirmation-step'; diff --git a/app/soapbox/features/ui/components/pending_status.tsx b/app/soapbox/features/ui/components/pending_status.tsx index f7f6ec92f..d584d7b28 100644 --- a/app/soapbox/features/ui/components/pending_status.tsx +++ b/app/soapbox/features/ui/components/pending_status.tsx @@ -4,7 +4,7 @@ import React from 'react'; import StatusContent from 'soapbox/components/status-content'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; import { Card, HStack } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card'; import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder_media_gallery'; import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container'; diff --git a/app/soapbox/features/ui/components/pinned_accounts_panel.tsx b/app/soapbox/features/ui/components/pinned_accounts_panel.tsx index d1b168c7c..f99cb02df 100644 --- a/app/soapbox/features/ui/components/pinned_accounts_panel.tsx +++ b/app/soapbox/features/ui/components/pinned_accounts_panel.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; import { fetchPinnedAccounts } from 'soapbox/actions/accounts'; import { Widget } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; import { WhoToFollowPanel } from 'soapbox/features/ui/util/async-components'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/reactions_modal.tsx b/app/soapbox/features/ui/components/reactions_modal.tsx index baf4cb8ea..5656eca18 100644 --- a/app/soapbox/features/ui/components/reactions_modal.tsx +++ b/app/soapbox/features/ui/components/reactions_modal.tsx @@ -5,7 +5,7 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; import { fetchFavourites, fetchReactions } from 'soapbox/actions/interactions'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Emoji, Modal, Spinner, Tabs } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { ReactionRecord } from 'soapbox/reducers/user_lists'; diff --git a/app/soapbox/features/ui/components/reblogs_modal.tsx b/app/soapbox/features/ui/components/reblogs_modal.tsx index c7f13eb81..526e7507f 100644 --- a/app/soapbox/features/ui/components/reblogs_modal.tsx +++ b/app/soapbox/features/ui/components/reblogs_modal.tsx @@ -5,7 +5,7 @@ import { fetchReblogs } from 'soapbox/actions/interactions'; import { fetchStatus } from 'soapbox/actions/statuses'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Modal, Spinner } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; interface IReblogsModal { diff --git a/app/soapbox/features/ui/components/who-to-follow-panel.tsx b/app/soapbox/features/ui/components/who-to-follow-panel.tsx index 852abcdba..f479acead 100644 --- a/app/soapbox/features/ui/components/who-to-follow-panel.tsx +++ b/app/soapbox/features/ui/components/who-to-follow-panel.tsx @@ -3,7 +3,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { Link } from 'react-router-dom'; import { Text, Widget } from 'soapbox/components/ui'; -import AccountContainer from 'soapbox/containers/account_container'; +import AccountContainer from 'soapbox/containers/account-container'; import PlaceholderSidebarSuggestions from 'soapbox/features/placeholder/components/placeholder-sidebar-suggestions'; import { useDismissSuggestion, useSuggestions } from 'soapbox/queries/suggestions'; From d4f5fd4d88c36f668908c31e1dc0984dd1f92bc3 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 12:23:36 -0500 Subject: [PATCH 08/19] Rename files (5): _ -> - --- app/soapbox/actions/compose.ts | 2 +- .../components/announcements/emoji.tsx | 2 +- .../components/announcements/reaction.tsx | 2 +- app/soapbox/components/autosuggest-emoji.tsx | 2 +- app/soapbox/components/autosuggest-input.tsx | 2 +- .../components/autosuggest-textarea.tsx | 2 +- app/soapbox/containers/soapbox.tsx | 2 +- .../components/media-item.tsx} | 0 .../index.tsx | 2 +- .../components/moved-note.tsx} | 0 .../index.tsx | 0 .../features/account/components/header.tsx | 2 +- ...ts_panel.tsx => latest-accounts-panel.tsx} | 0 ...icker.tsx => registration-mode-picker.tsx} | 0 .../{report_status.tsx => report-status.tsx} | 0 .../features/admin/components/report.tsx | 2 +- ...ved_account.tsx => unapproved-account.tsx} | 0 ...{moderation_log.tsx => moderation-log.tsx} | 0 .../features/admin/tabs/awaiting-approval.tsx | 2 +- app/soapbox/features/admin/tabs/dashboard.tsx | 2 +- .../admin/{user_index.js => user-index.js} | 0 .../{auth_layout => auth-layout}/index.tsx | 10 ++-- .../components/__tests__/captcha.test.tsx | 0 .../components/__tests__/login_form.test.tsx | 0 .../components/__tests__/login_page.test.tsx | 0 .../__tests__/otp_auth_form.test.tsx | 0 .../__tests__/password_reset_confirm.test.tsx | 0 .../components/captcha.tsx | 0 .../components/consumer-button.tsx | 0 .../components/consumers-list.tsx | 0 .../components/login_form.tsx | 0 .../components/login_page.tsx | 0 .../components/logout.tsx | 0 .../components/otp_auth_form.tsx | 0 .../components/password_reset.tsx | 0 .../components/password_reset_confirm.tsx | 0 .../components/registration_form.tsx | 2 +- .../index.tsx | 0 .../{date_picker.ts => date-picker.ts} | 0 .../features/chats/components/chat-box.tsx | 2 +- .../index.tsx | 0 ...st_account.tsx => autosuggest-account.tsx} | 0 ...orm_button.tsx => compose-form-button.tsx} | 0 .../compose/components/compose-form.tsx | 34 ++++++------ ...arkdown_button.tsx => markdown-button.tsx} | 2 +- .../{poll_button.tsx => poll-button.tsx} | 2 +- ...vacy_dropdown.tsx => privacy-dropdown.tsx} | 0 ...eply_indicator.tsx => reply-indicator.tsx} | 0 ...{reply_mentions.tsx => reply-mentions.tsx} | 0 ...chedule_button.tsx => schedule-button.tsx} | 2 +- .../{schedule_form.tsx => schedule-form.tsx} | 0 ...{search_results.tsx => search-results.tsx} | 0 ...{spoiler_button.tsx => spoiler-button.tsx} | 2 +- ...counter.tsx => text-character-counter.tsx} | 0 ...t_icon_button.tsx => text-icon-button.tsx} | 0 .../{upload_button.tsx => upload-button.tsx} | 0 .../{upload_form.tsx => upload-form.tsx} | 0 ...unter.tsx => visual-character-counter.tsx} | 0 ...tainer.tsx => quoted-status-container.tsx} | 0 ...tainer.ts => reply-indicator-container.ts} | 2 +- ...tainer.tsx => schedule-form-container.tsx} | 2 +- ...ontainer.ts => upload-button-container.ts} | 2 +- ...ng_container.tsx => warning-container.tsx} | 0 app/soapbox/features/compose/util/counter.ts | 2 +- .../util/{url_regex.ts => url-regex.ts} | 0 ...ations_list.tsx => conversations-list.tsx} | 2 +- app/soapbox/features/conversations/index.tsx | 2 +- .../components/crypto-address.tsx} | 6 +-- .../components/crypto-donate-panel.tsx} | 2 +- .../components/crypto-icon.tsx} | 0 .../components/detailed-crypto-address.tsx} | 6 +-- .../components/site-wallet.tsx} | 2 +- .../index.tsx | 2 +- .../utils/block-explorer.ts} | 2 +- .../utils/block-explorers.json} | 0 .../utils/coin-db.ts} | 2 +- .../utils/manifest-map.ts} | 0 .../index.tsx | 0 .../index.tsx | 0 .../index.tsx | 0 .../{edit_email => edit-email}/index.tsx | 0 .../index.tsx | 0 .../components/profile-preview.tsx | 0 .../{edit_profile => edit-profile}/index.tsx | 0 .../index.tsx | 0 ...moji_index.test.ts => emoji-index.test.ts} | 2 +- ...moji_compressed.js => emoji-compressed.js} | 8 +-- .../emoji/{emoji_map.json => emoji-map.json} | 0 ...data_light.ts => emoji-mart-data-light.ts} | 4 +- ...ch_light.js => emoji-mart-search-light.js} | 4 +- .../{emoji_picker.js => emoji-picker.js} | 0 ...ight.js => emoji-unicode-mapping-light.js} | 4 +- .../emoji/{emoji_utils.js => emoji-utils.js} | 2 +- app/soapbox/features/emoji/emoji.js | 2 +- ..._to_filename.js => unicode-to-filename.js} | 0 ...ied_name.js => unicode-to-unified-name.js} | 0 .../components/csv-exporter.tsx} | 0 .../{export_data => export-data}/index.tsx | 2 +- .../components/external-login-form.tsx | 0 .../index.tsx | 0 .../index.tsx | 0 app/soapbox/features/landing_page/index.tsx | 2 +- .../features/register_invite/index.tsx | 2 +- app/soapbox/features/search/index.tsx | 2 +- .../features/ui/components/boost_modal.tsx | 2 +- .../ui/components/crypto_donate_modal.tsx | 4 +- .../ui/components/profile_media_panel.tsx | 2 +- .../features/ui/util/async-components.ts | 54 +++++++++---------- app/soapbox/reducers/custom_emojis.ts | 4 +- webpack/shared.ts | 2 +- 110 files changed, 108 insertions(+), 108 deletions(-) rename app/soapbox/features/{account_gallery/components/media_item.tsx => account-gallery/components/media-item.tsx} (100%) rename app/soapbox/features/{account_gallery => account-gallery}/index.tsx (99%) rename app/soapbox/features/{account_timeline/components/moved_note.tsx => account-timeline/components/moved-note.tsx} (100%) rename app/soapbox/features/{account_timeline => account-timeline}/index.tsx (100%) rename app/soapbox/features/admin/components/{latest_accounts_panel.tsx => latest-accounts-panel.tsx} (100%) rename app/soapbox/features/admin/components/{registration_mode_picker.tsx => registration-mode-picker.tsx} (100%) rename app/soapbox/features/admin/components/{report_status.tsx => report-status.tsx} (100%) rename app/soapbox/features/admin/components/{unapproved_account.tsx => unapproved-account.tsx} (100%) rename app/soapbox/features/admin/{moderation_log.tsx => moderation-log.tsx} (100%) rename app/soapbox/features/admin/{user_index.js => user-index.js} (100%) rename app/soapbox/features/{auth_layout => auth-layout}/index.tsx (92%) rename app/soapbox/features/{auth_login => auth-login}/components/__tests__/captcha.test.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/__tests__/login_form.test.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/__tests__/login_page.test.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/__tests__/otp_auth_form.test.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/__tests__/password_reset_confirm.test.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/captcha.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/consumer-button.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/consumers-list.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/login_form.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/login_page.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/logout.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/otp_auth_form.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/password_reset.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/password_reset_confirm.tsx (100%) rename app/soapbox/features/{auth_login => auth-login}/components/registration_form.tsx (99%) rename app/soapbox/features/{auth_token_list => auth-token-list}/index.tsx (100%) rename app/soapbox/features/birthdays/{date_picker.ts => date-picker.ts} (100%) rename app/soapbox/features/{community_timeline => community-timeline}/index.tsx (100%) rename app/soapbox/features/compose/components/{autosuggest_account.tsx => autosuggest-account.tsx} (100%) rename app/soapbox/features/compose/components/{compose_form_button.tsx => compose-form-button.tsx} (100%) rename app/soapbox/features/compose/components/{markdown_button.tsx => markdown-button.tsx} (95%) rename app/soapbox/features/compose/components/{poll_button.tsx => poll-button.tsx} (95%) rename app/soapbox/features/compose/components/{privacy_dropdown.tsx => privacy-dropdown.tsx} (100%) rename app/soapbox/features/compose/components/{reply_indicator.tsx => reply-indicator.tsx} (100%) rename app/soapbox/features/compose/components/{reply_mentions.tsx => reply-mentions.tsx} (100%) rename app/soapbox/features/compose/components/{schedule_button.tsx => schedule-button.tsx} (95%) rename app/soapbox/features/compose/components/{schedule_form.tsx => schedule-form.tsx} (100%) rename app/soapbox/features/compose/components/{search_results.tsx => search-results.tsx} (100%) rename app/soapbox/features/compose/components/{spoiler_button.tsx => spoiler-button.tsx} (94%) rename app/soapbox/features/compose/components/{text_character_counter.tsx => text-character-counter.tsx} (100%) rename app/soapbox/features/compose/components/{text_icon_button.tsx => text-icon-button.tsx} (100%) rename app/soapbox/features/compose/components/{upload_button.tsx => upload-button.tsx} (100%) rename app/soapbox/features/compose/components/{upload_form.tsx => upload-form.tsx} (100%) rename app/soapbox/features/compose/components/{visual_character_counter.tsx => visual-character-counter.tsx} (100%) rename app/soapbox/features/compose/containers/{quoted_status_container.tsx => quoted-status-container.tsx} (100%) rename app/soapbox/features/compose/containers/{reply_indicator_container.ts => reply-indicator-container.ts} (93%) rename app/soapbox/features/compose/containers/{schedule_form_container.tsx => schedule-form-container.tsx} (86%) rename app/soapbox/features/compose/containers/{upload_button_container.ts => upload-button-container.ts} (92%) rename app/soapbox/features/compose/containers/{warning_container.tsx => warning-container.tsx} (100%) rename app/soapbox/features/compose/util/{url_regex.ts => url-regex.ts} (100%) rename app/soapbox/features/conversations/components/{conversations_list.tsx => conversations-list.tsx} (97%) rename app/soapbox/features/{crypto_donate/components/crypto_address.tsx => crypto-donate/components/crypto-address.tsx} (92%) rename app/soapbox/features/{crypto_donate/components/crypto_donate_panel.tsx => crypto-donate/components/crypto-donate-panel.tsx} (97%) rename app/soapbox/features/{crypto_donate/components/crypto_icon.tsx => crypto-donate/components/crypto-icon.tsx} (100%) rename app/soapbox/features/{crypto_donate/components/detailed_crypto_address.tsx => crypto-donate/components/detailed-crypto-address.tsx} (89%) rename app/soapbox/features/{crypto_donate/components/site_wallet.tsx => crypto-donate/components/site-wallet.tsx} (93%) rename app/soapbox/features/{crypto_donate => crypto-donate}/index.tsx (96%) rename app/soapbox/features/{crypto_donate/utils/block_explorer.ts => crypto-donate/utils/block-explorer.ts} (84%) rename app/soapbox/features/{crypto_donate/utils/block_explorers.json => crypto-donate/utils/block-explorers.json} (100%) rename app/soapbox/features/{crypto_donate/utils/coin_db.ts => crypto-donate/utils/coin-db.ts} (90%) rename app/soapbox/features/{crypto_donate/utils/manifest_map.ts => crypto-donate/utils/manifest-map.ts} (100%) rename app/soapbox/features/{delete_account => delete-account}/index.tsx (100%) rename app/soapbox/features/{direct_timeline => direct-timeline}/index.tsx (100%) rename app/soapbox/features/{domain_blocks => domain-blocks}/index.tsx (100%) rename app/soapbox/features/{edit_email => edit-email}/index.tsx (100%) rename app/soapbox/features/{edit_password => edit-password}/index.tsx (100%) rename app/soapbox/features/{edit_profile => edit-profile}/components/profile-preview.tsx (100%) rename app/soapbox/features/{edit_profile => edit-profile}/index.tsx (100%) rename app/soapbox/features/{email_confirmation => email-confirmation}/index.tsx (100%) rename app/soapbox/features/emoji/__tests__/{emoji_index.test.ts => emoji-index.test.ts} (98%) rename app/soapbox/features/emoji/{emoji_compressed.js => emoji-compressed.js} (93%) rename app/soapbox/features/emoji/{emoji_map.json => emoji-map.json} (100%) rename app/soapbox/features/emoji/{emoji_mart_data_light.ts => emoji-mart-data-light.ts} (88%) rename app/soapbox/features/emoji/{emoji_mart_search_light.js => emoji-mart-search-light.js} (98%) rename app/soapbox/features/emoji/{emoji_picker.js => emoji-picker.js} (100%) rename app/soapbox/features/emoji/{emoji_unicode_mapping_light.js => emoji-unicode-mapping-light.js} (91%) rename app/soapbox/features/emoji/{emoji_utils.js => emoji-utils.js} (99%) rename app/soapbox/features/emoji/{unicode_to_filename.js => unicode-to-filename.js} (100%) rename app/soapbox/features/emoji/{unicode_to_unified_name.js => unicode-to-unified-name.js} (100%) rename app/soapbox/features/{export_data/components/csv_exporter.tsx => export-data/components/csv-exporter.tsx} (100%) rename app/soapbox/features/{export_data => export-data}/index.tsx (97%) rename app/soapbox/features/{external_login => external-login}/components/external-login-form.tsx (100%) rename app/soapbox/features/{external_login => external-login}/index.tsx (100%) rename app/soapbox/features/{favourited_statuses => favourited-statuses}/index.tsx (100%) diff --git a/app/soapbox/actions/compose.ts b/app/soapbox/actions/compose.ts index 5d8139d71..65d437a36 100644 --- a/app/soapbox/actions/compose.ts +++ b/app/soapbox/actions/compose.ts @@ -5,7 +5,7 @@ import { defineMessages, IntlShape } from 'react-intl'; import snackbar from 'soapbox/actions/snackbar'; import api from 'soapbox/api'; -import { search as emojiSearch } from 'soapbox/features/emoji/emoji_mart_search_light'; +import { search as emojiSearch } from 'soapbox/features/emoji/emoji-mart-search-light'; import { tagHistory } from 'soapbox/settings'; import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures, parseVersion } from 'soapbox/utils/features'; diff --git a/app/soapbox/components/announcements/emoji.tsx b/app/soapbox/components/announcements/emoji.tsx index eb9683f08..64266639d 100644 --- a/app/soapbox/components/announcements/emoji.tsx +++ b/app/soapbox/components/announcements/emoji.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import unicodeMapping from 'soapbox/features/emoji/emoji_unicode_mapping_light'; +import unicodeMapping from 'soapbox/features/emoji/emoji-unicode-mapping-light'; import { useSettings } from 'soapbox/hooks'; import { joinPublicPath } from 'soapbox/utils/static'; diff --git a/app/soapbox/components/announcements/reaction.tsx b/app/soapbox/components/announcements/reaction.tsx index 8e2391aec..230613701 100644 --- a/app/soapbox/components/announcements/reaction.tsx +++ b/app/soapbox/components/announcements/reaction.tsx @@ -2,7 +2,7 @@ import classNames from 'clsx'; import React, { useState } from 'react'; import AnimatedNumber from 'soapbox/components/animated-number'; -import unicodeMapping from 'soapbox/features/emoji/emoji_unicode_mapping_light'; +import unicodeMapping from 'soapbox/features/emoji/emoji-unicode-mapping-light'; import Emoji from './emoji'; diff --git a/app/soapbox/components/autosuggest-emoji.tsx b/app/soapbox/components/autosuggest-emoji.tsx index 22979d454..7074605a2 100644 --- a/app/soapbox/components/autosuggest-emoji.tsx +++ b/app/soapbox/components/autosuggest-emoji.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import unicodeMapping from 'soapbox/features/emoji/emoji_unicode_mapping_light'; +import unicodeMapping from 'soapbox/features/emoji/emoji-unicode-mapping-light'; import { joinPublicPath } from 'soapbox/utils/static'; export type Emoji = { diff --git a/app/soapbox/components/autosuggest-input.tsx b/app/soapbox/components/autosuggest-input.tsx index cbb79af44..746bee9df 100644 --- a/app/soapbox/components/autosuggest-input.tsx +++ b/app/soapbox/components/autosuggest-input.tsx @@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import AutosuggestEmoji, { Emoji } from 'soapbox/components/autosuggest-emoji'; import Icon from 'soapbox/components/icon'; import { Input } from 'soapbox/components/ui'; -import AutosuggestAccount from 'soapbox/features/compose/components/autosuggest_account'; +import AutosuggestAccount from 'soapbox/features/compose/components/autosuggest-account'; import { isRtl } from 'soapbox/rtl'; import type { Menu, MenuItem } from 'soapbox/components/dropdown-menu'; diff --git a/app/soapbox/components/autosuggest-textarea.tsx b/app/soapbox/components/autosuggest-textarea.tsx index 321514cb6..8e877021f 100644 --- a/app/soapbox/components/autosuggest-textarea.tsx +++ b/app/soapbox/components/autosuggest-textarea.tsx @@ -4,7 +4,7 @@ import React from 'react'; import ImmutablePureComponent from 'react-immutable-pure-component'; import Textarea from 'react-textarea-autosize'; -import AutosuggestAccount from '../features/compose/components/autosuggest_account'; +import AutosuggestAccount from '../features/compose/components/autosuggest-account'; import { isRtl } from '../rtl'; import AutosuggestEmoji, { Emoji } from './autosuggest-emoji'; diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx index 6249fe44a..fac92a03c 100644 --- a/app/soapbox/containers/soapbox.tsx +++ b/app/soapbox/containers/soapbox.tsx @@ -17,7 +17,7 @@ import * as BuildConfig from 'soapbox/build_config'; import GdprBanner from 'soapbox/components/gdpr-banner'; import Helmet from 'soapbox/components/helmet'; import LoadingScreen from 'soapbox/components/loading-screen'; -import AuthLayout from 'soapbox/features/auth_layout'; +import AuthLayout from 'soapbox/features/auth-layout'; import EmbeddedStatus from 'soapbox/features/embedded-status'; import PublicLayout from 'soapbox/features/public_layout'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; diff --git a/app/soapbox/features/account_gallery/components/media_item.tsx b/app/soapbox/features/account-gallery/components/media-item.tsx similarity index 100% rename from app/soapbox/features/account_gallery/components/media_item.tsx rename to app/soapbox/features/account-gallery/components/media-item.tsx diff --git a/app/soapbox/features/account_gallery/index.tsx b/app/soapbox/features/account-gallery/index.tsx similarity index 99% rename from app/soapbox/features/account_gallery/index.tsx rename to app/soapbox/features/account-gallery/index.tsx index ab3f9748e..da6fb226a 100644 --- a/app/soapbox/features/account_gallery/index.tsx +++ b/app/soapbox/features/account-gallery/index.tsx @@ -15,7 +15,7 @@ import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { getAccountGallery, findAccountByUsername } from 'soapbox/selectors'; import { getFeatures } from 'soapbox/utils/features'; -import MediaItem from './components/media_item'; +import MediaItem from './components/media-item'; import type { List as ImmutableList } from 'immutable'; import type { Attachment, Status } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/account_timeline/components/moved_note.tsx b/app/soapbox/features/account-timeline/components/moved-note.tsx similarity index 100% rename from app/soapbox/features/account_timeline/components/moved_note.tsx rename to app/soapbox/features/account-timeline/components/moved-note.tsx diff --git a/app/soapbox/features/account_timeline/index.tsx b/app/soapbox/features/account-timeline/index.tsx similarity index 100% rename from app/soapbox/features/account_timeline/index.tsx rename to app/soapbox/features/account-timeline/index.tsx diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx index c20a37611..5454d7b50 100644 --- a/app/soapbox/features/account/components/header.tsx +++ b/app/soapbox/features/account/components/header.tsx @@ -19,7 +19,7 @@ import Badge from 'soapbox/components/badge'; import StillImage from 'soapbox/components/still-image'; import { HStack, IconButton, Menu, MenuButton, MenuItem, MenuList, MenuLink, MenuDivider, Avatar } from 'soapbox/components/ui'; import SvgIcon from 'soapbox/components/ui/icon/svg-icon'; -import MovedNote from 'soapbox/features/account_timeline/components/moved_note'; +import MovedNote from 'soapbox/features/account-timeline/components/moved-note'; import ActionButton from 'soapbox/features/ui/components/action-button'; import SubscriptionButton from 'soapbox/features/ui/components/subscription-button'; import { useAppDispatch, useFeatures, useOwnAccount } from 'soapbox/hooks'; diff --git a/app/soapbox/features/admin/components/latest_accounts_panel.tsx b/app/soapbox/features/admin/components/latest-accounts-panel.tsx similarity index 100% rename from app/soapbox/features/admin/components/latest_accounts_panel.tsx rename to app/soapbox/features/admin/components/latest-accounts-panel.tsx diff --git a/app/soapbox/features/admin/components/registration_mode_picker.tsx b/app/soapbox/features/admin/components/registration-mode-picker.tsx similarity index 100% rename from app/soapbox/features/admin/components/registration_mode_picker.tsx rename to app/soapbox/features/admin/components/registration-mode-picker.tsx diff --git a/app/soapbox/features/admin/components/report_status.tsx b/app/soapbox/features/admin/components/report-status.tsx similarity index 100% rename from app/soapbox/features/admin/components/report_status.tsx rename to app/soapbox/features/admin/components/report-status.tsx diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx index 0fd1712f7..fe28ab21c 100644 --- a/app/soapbox/features/admin/components/report.tsx +++ b/app/soapbox/features/admin/components/report.tsx @@ -13,7 +13,7 @@ import Accordion from 'soapbox/features/ui/components/accordion'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { makeGetReport } from 'soapbox/selectors'; -import ReportStatus from './report_status'; +import ReportStatus from './report-status'; import type { List as ImmutableList } from 'immutable'; import type { Account, AdminReport, Status } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/admin/components/unapproved_account.tsx b/app/soapbox/features/admin/components/unapproved-account.tsx similarity index 100% rename from app/soapbox/features/admin/components/unapproved_account.tsx rename to app/soapbox/features/admin/components/unapproved-account.tsx diff --git a/app/soapbox/features/admin/moderation_log.tsx b/app/soapbox/features/admin/moderation-log.tsx similarity index 100% rename from app/soapbox/features/admin/moderation_log.tsx rename to app/soapbox/features/admin/moderation-log.tsx diff --git a/app/soapbox/features/admin/tabs/awaiting-approval.tsx b/app/soapbox/features/admin/tabs/awaiting-approval.tsx index 0a73bb7cc..0a412f400 100644 --- a/app/soapbox/features/admin/tabs/awaiting-approval.tsx +++ b/app/soapbox/features/admin/tabs/awaiting-approval.tsx @@ -5,7 +5,7 @@ import { fetchUsers } from 'soapbox/actions/admin'; import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; -import UnapprovedAccount from '../components/unapproved_account'; +import UnapprovedAccount from '../components/unapproved-account'; const messages = defineMessages({ heading: { id: 'column.admin.awaiting_approval', defaultMessage: 'Awaiting Approval' }, diff --git a/app/soapbox/features/admin/tabs/dashboard.tsx b/app/soapbox/features/admin/tabs/dashboard.tsx index f6b81ea29..876cab00b 100644 --- a/app/soapbox/features/admin/tabs/dashboard.tsx +++ b/app/soapbox/features/admin/tabs/dashboard.tsx @@ -9,7 +9,7 @@ import sourceCode from 'soapbox/utils/code'; import { parseVersion } from 'soapbox/utils/features'; import { isNumber } from 'soapbox/utils/numbers'; -import RegistrationModePicker from '../components/registration_mode_picker'; +import RegistrationModePicker from '../components/registration-mode-picker'; import type { AxiosResponse } from 'axios'; diff --git a/app/soapbox/features/admin/user_index.js b/app/soapbox/features/admin/user-index.js similarity index 100% rename from app/soapbox/features/admin/user_index.js rename to app/soapbox/features/admin/user-index.js diff --git a/app/soapbox/features/auth_layout/index.tsx b/app/soapbox/features/auth-layout/index.tsx similarity index 92% rename from app/soapbox/features/auth_layout/index.tsx rename to app/soapbox/features/auth-layout/index.tsx index 08653110d..9a7d502f7 100644 --- a/app/soapbox/features/auth_layout/index.tsx +++ b/app/soapbox/features/auth-layout/index.tsx @@ -7,11 +7,11 @@ import SiteLogo from 'soapbox/components/site-logo'; import { useAppSelector, useFeatures, useSoapboxConfig, useOwnAccount } from 'soapbox/hooks'; import { Button, Card, CardBody } from '../../components/ui'; -import LoginPage from '../auth_login/components/login_page'; -import PasswordReset from '../auth_login/components/password_reset'; -import PasswordResetConfirm from '../auth_login/components/password_reset_confirm'; -import RegistrationForm from '../auth_login/components/registration_form'; -import ExternalLoginForm from '../external_login/components/external-login-form'; +import LoginPage from '../auth-login/components/login_page'; +import PasswordReset from '../auth-login/components/password_reset'; +import PasswordResetConfirm from '../auth-login/components/password_reset_confirm'; +import RegistrationForm from '../auth-login/components/registration_form'; +import ExternalLoginForm from '../external-login/components/external-login-form'; import Footer from '../public_layout/components/footer'; import RegisterInvite from '../register_invite'; import Verification from '../verification'; diff --git a/app/soapbox/features/auth_login/components/__tests__/captcha.test.tsx b/app/soapbox/features/auth-login/components/__tests__/captcha.test.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/__tests__/captcha.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/captcha.test.tsx diff --git a/app/soapbox/features/auth_login/components/__tests__/login_form.test.tsx b/app/soapbox/features/auth-login/components/__tests__/login_form.test.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/__tests__/login_form.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/login_form.test.tsx diff --git a/app/soapbox/features/auth_login/components/__tests__/login_page.test.tsx b/app/soapbox/features/auth-login/components/__tests__/login_page.test.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/__tests__/login_page.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/login_page.test.tsx diff --git a/app/soapbox/features/auth_login/components/__tests__/otp_auth_form.test.tsx b/app/soapbox/features/auth-login/components/__tests__/otp_auth_form.test.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/__tests__/otp_auth_form.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/otp_auth_form.test.tsx diff --git a/app/soapbox/features/auth_login/components/__tests__/password_reset_confirm.test.tsx b/app/soapbox/features/auth-login/components/__tests__/password_reset_confirm.test.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/__tests__/password_reset_confirm.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/password_reset_confirm.test.tsx diff --git a/app/soapbox/features/auth_login/components/captcha.tsx b/app/soapbox/features/auth-login/components/captcha.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/captcha.tsx rename to app/soapbox/features/auth-login/components/captcha.tsx diff --git a/app/soapbox/features/auth_login/components/consumer-button.tsx b/app/soapbox/features/auth-login/components/consumer-button.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/consumer-button.tsx rename to app/soapbox/features/auth-login/components/consumer-button.tsx diff --git a/app/soapbox/features/auth_login/components/consumers-list.tsx b/app/soapbox/features/auth-login/components/consumers-list.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/consumers-list.tsx rename to app/soapbox/features/auth-login/components/consumers-list.tsx diff --git a/app/soapbox/features/auth_login/components/login_form.tsx b/app/soapbox/features/auth-login/components/login_form.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/login_form.tsx rename to app/soapbox/features/auth-login/components/login_form.tsx diff --git a/app/soapbox/features/auth_login/components/login_page.tsx b/app/soapbox/features/auth-login/components/login_page.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/login_page.tsx rename to app/soapbox/features/auth-login/components/login_page.tsx diff --git a/app/soapbox/features/auth_login/components/logout.tsx b/app/soapbox/features/auth-login/components/logout.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/logout.tsx rename to app/soapbox/features/auth-login/components/logout.tsx diff --git a/app/soapbox/features/auth_login/components/otp_auth_form.tsx b/app/soapbox/features/auth-login/components/otp_auth_form.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/otp_auth_form.tsx rename to app/soapbox/features/auth-login/components/otp_auth_form.tsx diff --git a/app/soapbox/features/auth_login/components/password_reset.tsx b/app/soapbox/features/auth-login/components/password_reset.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/password_reset.tsx rename to app/soapbox/features/auth-login/components/password_reset.tsx diff --git a/app/soapbox/features/auth_login/components/password_reset_confirm.tsx b/app/soapbox/features/auth-login/components/password_reset_confirm.tsx similarity index 100% rename from app/soapbox/features/auth_login/components/password_reset_confirm.tsx rename to app/soapbox/features/auth-login/components/password_reset_confirm.tsx diff --git a/app/soapbox/features/auth_login/components/registration_form.tsx b/app/soapbox/features/auth-login/components/registration_form.tsx similarity index 99% rename from app/soapbox/features/auth_login/components/registration_form.tsx rename to app/soapbox/features/auth-login/components/registration_form.tsx index fa5ad524c..edd55deb3 100644 --- a/app/soapbox/features/auth_login/components/registration_form.tsx +++ b/app/soapbox/features/auth-login/components/registration_form.tsx @@ -11,7 +11,7 @@ import { register, verifyCredentials } from 'soapbox/actions/auth'; import { openModal } from 'soapbox/actions/modals'; import BirthdayInput from 'soapbox/components/birthday-input'; import { Checkbox, Form, FormGroup, FormActions, Button, Input, Textarea } from 'soapbox/components/ui'; -import CaptchaField from 'soapbox/features/auth_login/components/captcha'; +import CaptchaField from 'soapbox/features/auth-login/components/captcha'; import { useAppSelector, useAppDispatch, useSettings, useFeatures } from 'soapbox/hooks'; const messages = defineMessages({ diff --git a/app/soapbox/features/auth_token_list/index.tsx b/app/soapbox/features/auth-token-list/index.tsx similarity index 100% rename from app/soapbox/features/auth_token_list/index.tsx rename to app/soapbox/features/auth-token-list/index.tsx diff --git a/app/soapbox/features/birthdays/date_picker.ts b/app/soapbox/features/birthdays/date-picker.ts similarity index 100% rename from app/soapbox/features/birthdays/date_picker.ts rename to app/soapbox/features/birthdays/date-picker.ts diff --git a/app/soapbox/features/chats/components/chat-box.tsx b/app/soapbox/features/chats/components/chat-box.tsx index 9a96a0d00..de97cd45a 100644 --- a/app/soapbox/features/chats/components/chat-box.tsx +++ b/app/soapbox/features/chats/components/chat-box.tsx @@ -9,7 +9,7 @@ import { import { uploadMedia } from 'soapbox/actions/media'; import IconButton from 'soapbox/components/icon-button'; import UploadProgress from 'soapbox/components/upload-progress'; -import UploadButton from 'soapbox/features/compose/components/upload_button'; +import UploadButton from 'soapbox/features/compose/components/upload-button'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { truncateFilename } from 'soapbox/utils/media'; diff --git a/app/soapbox/features/community_timeline/index.tsx b/app/soapbox/features/community-timeline/index.tsx similarity index 100% rename from app/soapbox/features/community_timeline/index.tsx rename to app/soapbox/features/community-timeline/index.tsx diff --git a/app/soapbox/features/compose/components/autosuggest_account.tsx b/app/soapbox/features/compose/components/autosuggest-account.tsx similarity index 100% rename from app/soapbox/features/compose/components/autosuggest_account.tsx rename to app/soapbox/features/compose/components/autosuggest-account.tsx diff --git a/app/soapbox/features/compose/components/compose_form_button.tsx b/app/soapbox/features/compose/components/compose-form-button.tsx similarity index 100% rename from app/soapbox/features/compose/components/compose_form_button.tsx rename to app/soapbox/features/compose/components/compose-form-button.tsx diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx index df3a7faa4..99bd27474 100644 --- a/app/soapbox/features/compose/components/compose-form.tsx +++ b/app/soapbox/features/compose/components/compose-form.tsx @@ -20,26 +20,26 @@ import { Button, Stack } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useCompose, useFeatures, usePrevious } from 'soapbox/hooks'; import { isMobile } from 'soapbox/is_mobile'; -import EmojiPickerDropdown from '../components/emoji-picker/emoji-picker-dropdown'; -import MarkdownButton from '../components/markdown_button'; -import PollButton from '../components/poll_button'; -import PollForm from '../components/polls/poll-form'; -import PrivacyDropdown from '../components/privacy_dropdown'; -import ReplyMentions from '../components/reply_mentions'; -import ScheduleButton from '../components/schedule_button'; -import SpoilerButton from '../components/spoiler_button'; -import UploadForm from '../components/upload_form'; -import Warning from '../components/warning'; -import QuotedStatusContainer from '../containers/quoted_status_container'; -import ReplyIndicatorContainer from '../containers/reply_indicator_container'; -import ScheduleFormContainer from '../containers/schedule_form_container'; -import UploadButtonContainer from '../containers/upload_button_container'; -import WarningContainer from '../containers/warning_container'; +import QuotedStatusContainer from '../containers/quoted-status-container'; +import ReplyIndicatorContainer from '../containers/reply-indicator-container'; +import ScheduleFormContainer from '../containers/schedule-form-container'; +import UploadButtonContainer from '../containers/upload-button-container'; +import WarningContainer from '../containers/warning-container'; import { countableText } from '../util/counter'; +import EmojiPickerDropdown from './emoji-picker/emoji-picker-dropdown'; +import MarkdownButton from './markdown-button'; +import PollButton from './poll-button'; +import PollForm from './polls/poll-form'; +import PrivacyDropdown from './privacy-dropdown'; +import ReplyMentions from './reply-mentions'; +import ScheduleButton from './schedule-button'; +import SpoilerButton from './spoiler-button'; import SpoilerInput from './spoiler-input'; -import TextCharacterCounter from './text_character_counter'; -import VisualCharacterCounter from './visual_character_counter'; +import TextCharacterCounter from './text-character-counter'; +import UploadForm from './upload-form'; +import VisualCharacterCounter from './visual-character-counter'; +import Warning from './warning'; import type { Emoji } from 'soapbox/components/autosuggest-emoji'; diff --git a/app/soapbox/features/compose/components/markdown_button.tsx b/app/soapbox/features/compose/components/markdown-button.tsx similarity index 95% rename from app/soapbox/features/compose/components/markdown_button.tsx rename to app/soapbox/features/compose/components/markdown-button.tsx index 0f44d8786..935f8e7b1 100644 --- a/app/soapbox/features/compose/components/markdown_button.tsx +++ b/app/soapbox/features/compose/components/markdown-button.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { changeComposeContentType } from 'soapbox/actions/compose'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; -import ComposeFormButton from './compose_form_button'; +import ComposeFormButton from './compose-form-button'; const messages = defineMessages({ marked: { id: 'compose_form.markdown.marked', defaultMessage: 'Post markdown enabled' }, diff --git a/app/soapbox/features/compose/components/poll_button.tsx b/app/soapbox/features/compose/components/poll-button.tsx similarity index 95% rename from app/soapbox/features/compose/components/poll_button.tsx rename to app/soapbox/features/compose/components/poll-button.tsx index 7b340bb58..43af2e594 100644 --- a/app/soapbox/features/compose/components/poll_button.tsx +++ b/app/soapbox/features/compose/components/poll-button.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { addPoll, removePoll } from 'soapbox/actions/compose'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; -import ComposeFormButton from './compose_form_button'; +import ComposeFormButton from './compose-form-button'; const messages = defineMessages({ add_poll: { id: 'poll_button.add_poll', defaultMessage: 'Add a poll' }, diff --git a/app/soapbox/features/compose/components/privacy_dropdown.tsx b/app/soapbox/features/compose/components/privacy-dropdown.tsx similarity index 100% rename from app/soapbox/features/compose/components/privacy_dropdown.tsx rename to app/soapbox/features/compose/components/privacy-dropdown.tsx diff --git a/app/soapbox/features/compose/components/reply_indicator.tsx b/app/soapbox/features/compose/components/reply-indicator.tsx similarity index 100% rename from app/soapbox/features/compose/components/reply_indicator.tsx rename to app/soapbox/features/compose/components/reply-indicator.tsx diff --git a/app/soapbox/features/compose/components/reply_mentions.tsx b/app/soapbox/features/compose/components/reply-mentions.tsx similarity index 100% rename from app/soapbox/features/compose/components/reply_mentions.tsx rename to app/soapbox/features/compose/components/reply-mentions.tsx diff --git a/app/soapbox/features/compose/components/schedule_button.tsx b/app/soapbox/features/compose/components/schedule-button.tsx similarity index 95% rename from app/soapbox/features/compose/components/schedule_button.tsx rename to app/soapbox/features/compose/components/schedule-button.tsx index 16b3cd163..1d98b9cd0 100644 --- a/app/soapbox/features/compose/components/schedule_button.tsx +++ b/app/soapbox/features/compose/components/schedule-button.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { addSchedule, removeSchedule } from 'soapbox/actions/compose'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; -import ComposeFormButton from './compose_form_button'; +import ComposeFormButton from './compose-form-button'; const messages = defineMessages({ add_schedule: { id: 'schedule_button.add_schedule', defaultMessage: 'Schedule post for later' }, diff --git a/app/soapbox/features/compose/components/schedule_form.tsx b/app/soapbox/features/compose/components/schedule-form.tsx similarity index 100% rename from app/soapbox/features/compose/components/schedule_form.tsx rename to app/soapbox/features/compose/components/schedule-form.tsx diff --git a/app/soapbox/features/compose/components/search_results.tsx b/app/soapbox/features/compose/components/search-results.tsx similarity index 100% rename from app/soapbox/features/compose/components/search_results.tsx rename to app/soapbox/features/compose/components/search-results.tsx diff --git a/app/soapbox/features/compose/components/spoiler_button.tsx b/app/soapbox/features/compose/components/spoiler-button.tsx similarity index 94% rename from app/soapbox/features/compose/components/spoiler_button.tsx rename to app/soapbox/features/compose/components/spoiler-button.tsx index cf0f1c975..15f87a791 100644 --- a/app/soapbox/features/compose/components/spoiler_button.tsx +++ b/app/soapbox/features/compose/components/spoiler-button.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { changeComposeSpoilerness } from 'soapbox/actions/compose'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; -import ComposeFormButton from './compose_form_button'; +import ComposeFormButton from './compose-form-button'; const messages = defineMessages({ marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' }, diff --git a/app/soapbox/features/compose/components/text_character_counter.tsx b/app/soapbox/features/compose/components/text-character-counter.tsx similarity index 100% rename from app/soapbox/features/compose/components/text_character_counter.tsx rename to app/soapbox/features/compose/components/text-character-counter.tsx diff --git a/app/soapbox/features/compose/components/text_icon_button.tsx b/app/soapbox/features/compose/components/text-icon-button.tsx similarity index 100% rename from app/soapbox/features/compose/components/text_icon_button.tsx rename to app/soapbox/features/compose/components/text-icon-button.tsx diff --git a/app/soapbox/features/compose/components/upload_button.tsx b/app/soapbox/features/compose/components/upload-button.tsx similarity index 100% rename from app/soapbox/features/compose/components/upload_button.tsx rename to app/soapbox/features/compose/components/upload-button.tsx diff --git a/app/soapbox/features/compose/components/upload_form.tsx b/app/soapbox/features/compose/components/upload-form.tsx similarity index 100% rename from app/soapbox/features/compose/components/upload_form.tsx rename to app/soapbox/features/compose/components/upload-form.tsx diff --git a/app/soapbox/features/compose/components/visual_character_counter.tsx b/app/soapbox/features/compose/components/visual-character-counter.tsx similarity index 100% rename from app/soapbox/features/compose/components/visual_character_counter.tsx rename to app/soapbox/features/compose/components/visual-character-counter.tsx diff --git a/app/soapbox/features/compose/containers/quoted_status_container.tsx b/app/soapbox/features/compose/containers/quoted-status-container.tsx similarity index 100% rename from app/soapbox/features/compose/containers/quoted_status_container.tsx rename to app/soapbox/features/compose/containers/quoted-status-container.tsx diff --git a/app/soapbox/features/compose/containers/reply_indicator_container.ts b/app/soapbox/features/compose/containers/reply-indicator-container.ts similarity index 93% rename from app/soapbox/features/compose/containers/reply_indicator_container.ts rename to app/soapbox/features/compose/containers/reply-indicator-container.ts index 2f1d5b131..b77c4a8d0 100644 --- a/app/soapbox/features/compose/containers/reply_indicator_container.ts +++ b/app/soapbox/features/compose/containers/reply-indicator-container.ts @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import { cancelReplyCompose } from 'soapbox/actions/compose'; import { makeGetStatus } from 'soapbox/selectors'; -import ReplyIndicator from '../components/reply_indicator'; +import ReplyIndicator from '../components/reply-indicator'; import type { AppDispatch, RootState } from 'soapbox/store'; import type { Status } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/compose/containers/schedule_form_container.tsx b/app/soapbox/features/compose/containers/schedule-form-container.tsx similarity index 86% rename from app/soapbox/features/compose/containers/schedule_form_container.tsx rename to app/soapbox/features/compose/containers/schedule-form-container.tsx index d34f9ee5e..efa30a894 100644 --- a/app/soapbox/features/compose/containers/schedule_form_container.tsx +++ b/app/soapbox/features/compose/containers/schedule-form-container.tsx @@ -3,7 +3,7 @@ import React from 'react'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; import { ScheduleForm } from 'soapbox/features/ui/util/async-components'; -import type { IScheduleForm } from '../components/schedule_form'; +import type { IScheduleForm } from '../components/schedule-form'; const ScheduleFormContainer: React.FC = (props) => ( diff --git a/app/soapbox/features/compose/containers/upload_button_container.ts b/app/soapbox/features/compose/containers/upload-button-container.ts similarity index 92% rename from app/soapbox/features/compose/containers/upload_button_container.ts rename to app/soapbox/features/compose/containers/upload-button-container.ts index c338f7449..6b2307c93 100644 --- a/app/soapbox/features/compose/containers/upload_button_container.ts +++ b/app/soapbox/features/compose/containers/upload-button-container.ts @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { uploadCompose } from 'soapbox/actions/compose'; -import UploadButton from '../components/upload_button'; +import UploadButton from '../components/upload-button'; import type { IntlShape } from 'react-intl'; import type { AppDispatch, RootState } from 'soapbox/store'; diff --git a/app/soapbox/features/compose/containers/warning_container.tsx b/app/soapbox/features/compose/containers/warning-container.tsx similarity index 100% rename from app/soapbox/features/compose/containers/warning_container.tsx rename to app/soapbox/features/compose/containers/warning-container.tsx diff --git a/app/soapbox/features/compose/util/counter.ts b/app/soapbox/features/compose/util/counter.ts index 0ae62a598..379da63b9 100644 --- a/app/soapbox/features/compose/util/counter.ts +++ b/app/soapbox/features/compose/util/counter.ts @@ -1,4 +1,4 @@ -import { urlRegex } from './url_regex'; +import { urlRegex } from './url-regex'; const urlPlaceholder = 'xxxxxxxxxxxxxxxxxxxxxxx'; diff --git a/app/soapbox/features/compose/util/url_regex.ts b/app/soapbox/features/compose/util/url-regex.ts similarity index 100% rename from app/soapbox/features/compose/util/url_regex.ts rename to app/soapbox/features/compose/util/url-regex.ts diff --git a/app/soapbox/features/conversations/components/conversations_list.tsx b/app/soapbox/features/conversations/components/conversations-list.tsx similarity index 97% rename from app/soapbox/features/conversations/components/conversations_list.tsx rename to app/soapbox/features/conversations/components/conversations-list.tsx index 83b43a622..bf439626a 100644 --- a/app/soapbox/features/conversations/components/conversations_list.tsx +++ b/app/soapbox/features/conversations/components/conversations-list.tsx @@ -6,7 +6,7 @@ import { expandConversations } from 'soapbox/actions/conversations'; import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; -import Conversation from '../components/conversation'; +import Conversation from './conversation'; import type { VirtuosoHandle } from 'react-virtuoso'; diff --git a/app/soapbox/features/conversations/index.tsx b/app/soapbox/features/conversations/index.tsx index 0faf2237f..12b418eb0 100644 --- a/app/soapbox/features/conversations/index.tsx +++ b/app/soapbox/features/conversations/index.tsx @@ -8,7 +8,7 @@ import AccountSearch from 'soapbox/components/account-search'; import { Column } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; -import ConversationsList from './components/conversations_list'; +import ConversationsList from './components/conversations-list'; const messages = defineMessages({ title: { id: 'column.direct', defaultMessage: 'Direct messages' }, diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.tsx b/app/soapbox/features/crypto-donate/components/crypto-address.tsx similarity index 92% rename from app/soapbox/features/crypto_donate/components/crypto_address.tsx rename to app/soapbox/features/crypto-donate/components/crypto-address.tsx index 04a6e6388..cab59caa3 100644 --- a/app/soapbox/features/crypto_donate/components/crypto_address.tsx +++ b/app/soapbox/features/crypto-donate/components/crypto-address.tsx @@ -5,10 +5,10 @@ import { openModal } from 'soapbox/actions/modals'; import CopyableInput from 'soapbox/components/copyable-input'; import { Text, Icon, Stack, HStack } from 'soapbox/components/ui'; -import { getExplorerUrl } from '../utils/block_explorer'; -import { getTitle } from '../utils/coin_db'; +import { getExplorerUrl } from '../utils/block-explorer'; +import { getTitle } from '../utils/coin-db'; -import CryptoIcon from './crypto_icon'; +import CryptoIcon from './crypto-icon'; export interface ICryptoAddress { address: string, diff --git a/app/soapbox/features/crypto_donate/components/crypto_donate_panel.tsx b/app/soapbox/features/crypto-donate/components/crypto-donate-panel.tsx similarity index 97% rename from app/soapbox/features/crypto_donate/components/crypto_donate_panel.tsx rename to app/soapbox/features/crypto-donate/components/crypto-donate-panel.tsx index 581f53f03..3151738df 100644 --- a/app/soapbox/features/crypto_donate/components/crypto_donate_panel.tsx +++ b/app/soapbox/features/crypto-donate/components/crypto-donate-panel.tsx @@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom'; import { Text, Widget } from 'soapbox/components/ui'; import { useAppSelector, useSoapboxConfig } from 'soapbox/hooks'; -import SiteWallet from './site_wallet'; +import SiteWallet from './site-wallet'; const messages = defineMessages({ actionTitle: { id: 'crypto_donate_panel.actions.view', defaultMessage: 'Click to see {count} {count, plural, one {wallet} other {wallets}}' }, diff --git a/app/soapbox/features/crypto_donate/components/crypto_icon.tsx b/app/soapbox/features/crypto-donate/components/crypto-icon.tsx similarity index 100% rename from app/soapbox/features/crypto_donate/components/crypto_icon.tsx rename to app/soapbox/features/crypto-donate/components/crypto-icon.tsx diff --git a/app/soapbox/features/crypto_donate/components/detailed_crypto_address.tsx b/app/soapbox/features/crypto-donate/components/detailed-crypto-address.tsx similarity index 89% rename from app/soapbox/features/crypto_donate/components/detailed_crypto_address.tsx rename to app/soapbox/features/crypto-donate/components/detailed-crypto-address.tsx index 3435273c7..c0ab30bf9 100644 --- a/app/soapbox/features/crypto_donate/components/detailed_crypto_address.tsx +++ b/app/soapbox/features/crypto-donate/components/detailed-crypto-address.tsx @@ -4,10 +4,10 @@ import React from 'react'; import CopyableInput from 'soapbox/components/copyable-input'; import Icon from 'soapbox/components/icon'; -import { getExplorerUrl } from '../utils/block_explorer'; -import { getTitle } from '../utils/coin_db'; +import { getExplorerUrl } from '../utils/block-explorer'; +import { getTitle } from '../utils/coin-db'; -import CryptoIcon from './crypto_icon'; +import CryptoIcon from './crypto-icon'; interface IDetailedCryptoAddress { address: string, diff --git a/app/soapbox/features/crypto_donate/components/site_wallet.tsx b/app/soapbox/features/crypto-donate/components/site-wallet.tsx similarity index 93% rename from app/soapbox/features/crypto_donate/components/site_wallet.tsx rename to app/soapbox/features/crypto-donate/components/site-wallet.tsx index 1e09292bd..3adb4c02d 100644 --- a/app/soapbox/features/crypto_donate/components/site_wallet.tsx +++ b/app/soapbox/features/crypto-donate/components/site-wallet.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { Stack } from 'soapbox/components/ui'; import { useSoapboxConfig } from 'soapbox/hooks'; -import CryptoAddress from './crypto_address'; +import CryptoAddress from './crypto-address'; interface ISiteWallet { limit?: number, diff --git a/app/soapbox/features/crypto_donate/index.tsx b/app/soapbox/features/crypto-donate/index.tsx similarity index 96% rename from app/soapbox/features/crypto_donate/index.tsx rename to app/soapbox/features/crypto-donate/index.tsx index e1e38d7fc..acc935e6f 100644 --- a/app/soapbox/features/crypto_donate/index.tsx +++ b/app/soapbox/features/crypto-donate/index.tsx @@ -5,7 +5,7 @@ import { Column, Stack } from 'soapbox/components/ui'; import Accordion from 'soapbox/features/ui/components/accordion'; import { useAppSelector } from 'soapbox/hooks'; -import SiteWallet from './components/site_wallet'; +import SiteWallet from './components/site-wallet'; const messages = defineMessages({ heading: { id: 'column.crypto_donate', defaultMessage: 'Donate Cryptocurrency' }, diff --git a/app/soapbox/features/crypto_donate/utils/block_explorer.ts b/app/soapbox/features/crypto-donate/utils/block-explorer.ts similarity index 84% rename from app/soapbox/features/crypto_donate/utils/block_explorer.ts rename to app/soapbox/features/crypto-donate/utils/block-explorer.ts index c02ea4abc..b0f7a6965 100644 --- a/app/soapbox/features/crypto_donate/utils/block_explorer.ts +++ b/app/soapbox/features/crypto-donate/utils/block-explorer.ts @@ -1,4 +1,4 @@ -import blockExplorers from './block_explorers.json'; +import blockExplorers from './block-explorers.json'; type BlockExplorers = Record; diff --git a/app/soapbox/features/crypto_donate/utils/block_explorers.json b/app/soapbox/features/crypto-donate/utils/block-explorers.json similarity index 100% rename from app/soapbox/features/crypto_donate/utils/block_explorers.json rename to app/soapbox/features/crypto-donate/utils/block-explorers.json diff --git a/app/soapbox/features/crypto_donate/utils/coin_db.ts b/app/soapbox/features/crypto-donate/utils/coin-db.ts similarity index 90% rename from app/soapbox/features/crypto_donate/utils/coin_db.ts rename to app/soapbox/features/crypto-donate/utils/coin-db.ts index 582ace540..1949a62cf 100644 --- a/app/soapbox/features/crypto_donate/utils/coin_db.ts +++ b/app/soapbox/features/crypto-donate/utils/coin-db.ts @@ -1,6 +1,6 @@ import { fromJS } from 'immutable'; -import manifestMap from './manifest_map'; +import manifestMap from './manifest-map'; // All this does is converts the result from manifest_map.js into an ImmutableMap const coinDB = fromJS(manifestMap); diff --git a/app/soapbox/features/crypto_donate/utils/manifest_map.ts b/app/soapbox/features/crypto-donate/utils/manifest-map.ts similarity index 100% rename from app/soapbox/features/crypto_donate/utils/manifest_map.ts rename to app/soapbox/features/crypto-donate/utils/manifest-map.ts diff --git a/app/soapbox/features/delete_account/index.tsx b/app/soapbox/features/delete-account/index.tsx similarity index 100% rename from app/soapbox/features/delete_account/index.tsx rename to app/soapbox/features/delete-account/index.tsx diff --git a/app/soapbox/features/direct_timeline/index.tsx b/app/soapbox/features/direct-timeline/index.tsx similarity index 100% rename from app/soapbox/features/direct_timeline/index.tsx rename to app/soapbox/features/direct-timeline/index.tsx diff --git a/app/soapbox/features/domain_blocks/index.tsx b/app/soapbox/features/domain-blocks/index.tsx similarity index 100% rename from app/soapbox/features/domain_blocks/index.tsx rename to app/soapbox/features/domain-blocks/index.tsx diff --git a/app/soapbox/features/edit_email/index.tsx b/app/soapbox/features/edit-email/index.tsx similarity index 100% rename from app/soapbox/features/edit_email/index.tsx rename to app/soapbox/features/edit-email/index.tsx diff --git a/app/soapbox/features/edit_password/index.tsx b/app/soapbox/features/edit-password/index.tsx similarity index 100% rename from app/soapbox/features/edit_password/index.tsx rename to app/soapbox/features/edit-password/index.tsx diff --git a/app/soapbox/features/edit_profile/components/profile-preview.tsx b/app/soapbox/features/edit-profile/components/profile-preview.tsx similarity index 100% rename from app/soapbox/features/edit_profile/components/profile-preview.tsx rename to app/soapbox/features/edit-profile/components/profile-preview.tsx diff --git a/app/soapbox/features/edit_profile/index.tsx b/app/soapbox/features/edit-profile/index.tsx similarity index 100% rename from app/soapbox/features/edit_profile/index.tsx rename to app/soapbox/features/edit-profile/index.tsx diff --git a/app/soapbox/features/email_confirmation/index.tsx b/app/soapbox/features/email-confirmation/index.tsx similarity index 100% rename from app/soapbox/features/email_confirmation/index.tsx rename to app/soapbox/features/email-confirmation/index.tsx diff --git a/app/soapbox/features/emoji/__tests__/emoji_index.test.ts b/app/soapbox/features/emoji/__tests__/emoji-index.test.ts similarity index 98% rename from app/soapbox/features/emoji/__tests__/emoji_index.test.ts rename to app/soapbox/features/emoji/__tests__/emoji-index.test.ts index 78698981a..faefaa72c 100644 --- a/app/soapbox/features/emoji/__tests__/emoji_index.test.ts +++ b/app/soapbox/features/emoji/__tests__/emoji-index.test.ts @@ -2,7 +2,7 @@ import { emojiIndex } from 'emoji-mart'; import pick from 'lodash/pick'; -import { search } from '../emoji_mart_search_light'; +import { search } from '../emoji-mart-search-light'; const trimEmojis = (emoji: any) => pick(emoji, ['id', 'unified', 'native', 'custom']); diff --git a/app/soapbox/features/emoji/emoji_compressed.js b/app/soapbox/features/emoji/emoji-compressed.js similarity index 93% rename from app/soapbox/features/emoji/emoji_compressed.js rename to app/soapbox/features/emoji/emoji-compressed.js index 74cb1cf06..adea912b9 100644 --- a/app/soapbox/features/emoji/emoji_compressed.js +++ b/app/soapbox/features/emoji/emoji-compressed.js @@ -1,7 +1,7 @@ // @preval // http://www.unicode.org/Public/emoji/5.0/emoji-test.txt // This file contains the compressed version of the emoji data from -// both emoji_map.json and from emoji-mart's emojiIndex and data objects. +// both emoji-map.json and from emoji-mart's emojiIndex and data objects. // It's designed to be emitted in an array format to take up less space // over the wire. @@ -9,9 +9,9 @@ const { emojiIndex } = require('emoji-mart'); let data = require('emoji-mart/data/all.json'); const { uncompress: emojiMartUncompress } = require('emoji-mart/dist/utils/data'); -const emojiMap = require('./emoji_map.json'); -const { unicodeToFilename } = require('./unicode_to_filename'); -const { unicodeToUnifiedName } = require('./unicode_to_unified_name'); +const emojiMap = require('./emoji-map.json'); +const { unicodeToFilename } = require('./unicode-to-filename'); +const { unicodeToUnifiedName } = require('./unicode-to-unified-name'); if (data.compressed) { data = emojiMartUncompress(data); diff --git a/app/soapbox/features/emoji/emoji_map.json b/app/soapbox/features/emoji/emoji-map.json similarity index 100% rename from app/soapbox/features/emoji/emoji_map.json rename to app/soapbox/features/emoji/emoji-map.json diff --git a/app/soapbox/features/emoji/emoji_mart_data_light.ts b/app/soapbox/features/emoji/emoji-mart-data-light.ts similarity index 88% rename from app/soapbox/features/emoji/emoji_mart_data_light.ts rename to app/soapbox/features/emoji/emoji-mart-data-light.ts index 03bdbf765..efdce96fa 100644 --- a/app/soapbox/features/emoji/emoji_mart_data_light.ts +++ b/app/soapbox/features/emoji/emoji-mart-data-light.ts @@ -1,8 +1,8 @@ // The output of this module is designed to mimic emoji-mart's // "data" object, such that we can use it for a light version of emoji-mart's // emojiIndex.search functionality. -import emojiCompressed from './emoji_compressed'; -import { unicodeToUnifiedName } from './unicode_to_unified_name'; +import emojiCompressed from './emoji-compressed'; +import { unicodeToUnifiedName } from './unicode-to-unified-name'; const [ shortCodesToEmojiData, skins, categories, short_names ] = emojiCompressed; diff --git a/app/soapbox/features/emoji/emoji_mart_search_light.js b/app/soapbox/features/emoji/emoji-mart-search-light.js similarity index 98% rename from app/soapbox/features/emoji/emoji_mart_search_light.js rename to app/soapbox/features/emoji/emoji-mart-search-light.js index f16918ada..fcf7a6e59 100644 --- a/app/soapbox/features/emoji/emoji_mart_search_light.js +++ b/app/soapbox/features/emoji/emoji-mart-search-light.js @@ -1,8 +1,8 @@ // This code is largely borrowed from: // https://github.com/missive/emoji-mart/blob/5f2ffcc/src/utils/emoji-index.js -import data from './emoji_mart_data_light'; -import { getData, getSanitizedData, uniq, intersect } from './emoji_utils'; +import data from './emoji-mart-data-light'; +import { getData, getSanitizedData, uniq, intersect } from './emoji-utils'; const originalPool = {}; let index = {}; diff --git a/app/soapbox/features/emoji/emoji_picker.js b/app/soapbox/features/emoji/emoji-picker.js similarity index 100% rename from app/soapbox/features/emoji/emoji_picker.js rename to app/soapbox/features/emoji/emoji-picker.js diff --git a/app/soapbox/features/emoji/emoji_unicode_mapping_light.js b/app/soapbox/features/emoji/emoji-unicode-mapping-light.js similarity index 91% rename from app/soapbox/features/emoji/emoji_unicode_mapping_light.js rename to app/soapbox/features/emoji/emoji-unicode-mapping-light.js index 7784bc852..aa1233460 100644 --- a/app/soapbox/features/emoji/emoji_unicode_mapping_light.js +++ b/app/soapbox/features/emoji/emoji-unicode-mapping-light.js @@ -8,8 +8,8 @@ const [ categories, // eslint-disable-line @typescript-eslint/no-unused-vars short_names, // eslint-disable-line @typescript-eslint/no-unused-vars emojisWithoutShortCodes, -] = require('./emoji_compressed'); -const { unicodeToFilename } = require('./unicode_to_filename'); +] = require('./emoji-compressed'); +const { unicodeToFilename } = require('./unicode-to-filename'); // decompress const unicodeMapping = {}; diff --git a/app/soapbox/features/emoji/emoji_utils.js b/app/soapbox/features/emoji/emoji-utils.js similarity index 99% rename from app/soapbox/features/emoji/emoji_utils.js rename to app/soapbox/features/emoji/emoji-utils.js index ad0319598..43fdfa89c 100644 --- a/app/soapbox/features/emoji/emoji_utils.js +++ b/app/soapbox/features/emoji/emoji-utils.js @@ -1,7 +1,7 @@ // This code is largely borrowed from: // https://github.com/missive/emoji-mart/blob/5f2ffcc/src/utils/index.js -import data from './emoji_mart_data_light'; +import data from './emoji-mart-data-light'; const buildSearch = (data) => { const search = []; diff --git a/app/soapbox/features/emoji/emoji.js b/app/soapbox/features/emoji/emoji.js index 0ce74c4de..6baba1996 100644 --- a/app/soapbox/features/emoji/emoji.js +++ b/app/soapbox/features/emoji/emoji.js @@ -2,7 +2,7 @@ import Trie from 'substring-trie'; import { joinPublicPath } from 'soapbox/utils/static'; -import unicodeMapping from './emoji_unicode_mapping_light'; +import unicodeMapping from './emoji-unicode-mapping-light'; const trie = new Trie(Object.keys(unicodeMapping)); diff --git a/app/soapbox/features/emoji/unicode_to_filename.js b/app/soapbox/features/emoji/unicode-to-filename.js similarity index 100% rename from app/soapbox/features/emoji/unicode_to_filename.js rename to app/soapbox/features/emoji/unicode-to-filename.js diff --git a/app/soapbox/features/emoji/unicode_to_unified_name.js b/app/soapbox/features/emoji/unicode-to-unified-name.js similarity index 100% rename from app/soapbox/features/emoji/unicode_to_unified_name.js rename to app/soapbox/features/emoji/unicode-to-unified-name.js diff --git a/app/soapbox/features/export_data/components/csv_exporter.tsx b/app/soapbox/features/export-data/components/csv-exporter.tsx similarity index 100% rename from app/soapbox/features/export_data/components/csv_exporter.tsx rename to app/soapbox/features/export-data/components/csv-exporter.tsx diff --git a/app/soapbox/features/export_data/index.tsx b/app/soapbox/features/export-data/index.tsx similarity index 97% rename from app/soapbox/features/export_data/index.tsx rename to app/soapbox/features/export-data/index.tsx index 3a00b6051..d05c94293 100644 --- a/app/soapbox/features/export_data/index.tsx +++ b/app/soapbox/features/export-data/index.tsx @@ -9,7 +9,7 @@ import { import Column from '../ui/components/column'; -import CSVExporter from './components/csv_exporter'; +import CSVExporter from './components/csv-exporter'; const messages = defineMessages({ heading: { id: 'column.export_data', defaultMessage: 'Export data' }, diff --git a/app/soapbox/features/external_login/components/external-login-form.tsx b/app/soapbox/features/external-login/components/external-login-form.tsx similarity index 100% rename from app/soapbox/features/external_login/components/external-login-form.tsx rename to app/soapbox/features/external-login/components/external-login-form.tsx diff --git a/app/soapbox/features/external_login/index.tsx b/app/soapbox/features/external-login/index.tsx similarity index 100% rename from app/soapbox/features/external_login/index.tsx rename to app/soapbox/features/external-login/index.tsx diff --git a/app/soapbox/features/favourited_statuses/index.tsx b/app/soapbox/features/favourited-statuses/index.tsx similarity index 100% rename from app/soapbox/features/favourited_statuses/index.tsx rename to app/soapbox/features/favourited-statuses/index.tsx diff --git a/app/soapbox/features/landing_page/index.tsx b/app/soapbox/features/landing_page/index.tsx index e4dcf5aca..04e59044a 100644 --- a/app/soapbox/features/landing_page/index.tsx +++ b/app/soapbox/features/landing_page/index.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; import { prepareRequest } from 'soapbox/actions/consumer-auth'; import { Button, Card, CardBody, Stack, Text } from 'soapbox/components/ui'; import VerificationBadge from 'soapbox/components/verification-badge'; -import RegistrationForm from 'soapbox/features/auth_login/components/registration_form'; +import RegistrationForm from 'soapbox/features/auth-login/components/registration_form'; import { useAppDispatch, useAppSelector, useFeatures, useSoapboxConfig } from 'soapbox/hooks'; import { capitalize } from 'soapbox/utils/strings'; diff --git a/app/soapbox/features/register_invite/index.tsx b/app/soapbox/features/register_invite/index.tsx index e312c1126..3614fb91f 100644 --- a/app/soapbox/features/register_invite/index.tsx +++ b/app/soapbox/features/register_invite/index.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { useParams } from 'react-router-dom'; import { Stack, CardTitle, Text } from 'soapbox/components/ui'; -import RegistrationForm from 'soapbox/features/auth_login/components/registration_form'; +import RegistrationForm from 'soapbox/features/auth-login/components/registration_form'; import { useAppSelector } from 'soapbox/hooks'; interface RegisterInviteParams { diff --git a/app/soapbox/features/search/index.tsx b/app/soapbox/features/search/index.tsx index c17691c37..a61700b2b 100644 --- a/app/soapbox/features/search/index.tsx +++ b/app/soapbox/features/search/index.tsx @@ -3,7 +3,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { Column } from 'soapbox/components/ui'; import Search from 'soapbox/features/compose/components/search'; -import SearchResults from 'soapbox/features/compose/components/search_results'; +import SearchResults from 'soapbox/features/compose/components/search-results'; const messages = defineMessages({ heading: { id: 'column.search', defaultMessage: 'Search' }, diff --git a/app/soapbox/features/ui/components/boost_modal.tsx b/app/soapbox/features/ui/components/boost_modal.tsx index 613fdaba2..3a09be5c3 100644 --- a/app/soapbox/features/ui/components/boost_modal.tsx +++ b/app/soapbox/features/ui/components/boost_modal.tsx @@ -3,7 +3,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import Icon from 'soapbox/components/icon'; import { Modal, Stack, Text } from 'soapbox/components/ui'; -import ReplyIndicator from 'soapbox/features/compose/components/reply_indicator'; +import ReplyIndicator from 'soapbox/features/compose/components/reply-indicator'; import type { Status as StatusEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/ui/components/crypto_donate_modal.tsx b/app/soapbox/features/ui/components/crypto_donate_modal.tsx index 29c2dfaa8..48a9ccd00 100644 --- a/app/soapbox/features/ui/components/crypto_donate_modal.tsx +++ b/app/soapbox/features/ui/components/crypto_donate_modal.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { Modal } from 'soapbox/components/ui'; -import DetailedCryptoAddress from 'soapbox/features/crypto_donate/components/detailed_crypto_address'; +import DetailedCryptoAddress from 'soapbox/features/crypto-donate/components/detailed-crypto-address'; -import type { ICryptoAddress } from '../../crypto_donate/components/crypto_address'; +import type { ICryptoAddress } from '../../crypto-donate/components/crypto-address'; const CryptoDonateModal: React.FC void }> = ({ onClose, ...props }) => { diff --git a/app/soapbox/features/ui/components/profile_media_panel.tsx b/app/soapbox/features/ui/components/profile_media_panel.tsx index 78ecfa2c7..64d7c8180 100644 --- a/app/soapbox/features/ui/components/profile_media_panel.tsx +++ b/app/soapbox/features/ui/components/profile_media_panel.tsx @@ -9,7 +9,7 @@ import { Spinner, Widget } from 'soapbox/components/ui'; import { useAppSelector } from 'soapbox/hooks'; import { getAccountGallery } from 'soapbox/selectors'; -import MediaItem from '../../account_gallery/components/media_item'; +import MediaItem from '../../account-gallery/components/media-item'; import type { Account, Attachment } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts index e954f8b0e..e5c70b340 100644 --- a/app/soapbox/features/ui/util/async-components.ts +++ b/app/soapbox/features/ui/util/async-components.ts @@ -1,5 +1,5 @@ export function EmojiPicker() { - return import(/* webpackChunkName: "emoji_picker" */'../../emoji/emoji_picker'); + return import(/* webpackChunkName: "emoji_picker" */'../../emoji/emoji-picker'); } export function Notifications() { @@ -19,7 +19,7 @@ export function RemoteTimeline() { } export function CommunityTimeline() { - return import(/* webpackChunkName: "features/community_timeline" */'../../community_timeline'); + return import(/* webpackChunkName: "features/community_timeline" */'../../community-timeline'); } export function HashtagTimeline() { @@ -27,7 +27,7 @@ export function HashtagTimeline() { } export function DirectTimeline() { - return import(/* webpackChunkName: "features/direct_timeline" */'../../direct_timeline'); + return import(/* webpackChunkName: "features/direct_timeline" */'../../direct-timeline'); } export function Conversations() { @@ -55,11 +55,11 @@ export function PinnedStatuses() { } export function AccountTimeline() { - return import(/* webpackChunkName: "features/account_timeline" */'../../account_timeline'); + return import(/* webpackChunkName: "features/account_timeline" */'../../account-timeline'); } export function AccountGallery() { - return import(/* webpackChunkName: "features/account_gallery" */'../../account_gallery'); + return import(/* webpackChunkName: "features/account_gallery" */'../../account-gallery'); } export function Followers() { @@ -79,7 +79,7 @@ export function GenericNotFound() { } export function FavouritedStatuses() { - return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited_statuses'); + return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited-statuses'); } export function Blocks() { @@ -87,7 +87,7 @@ export function Blocks() { } export function DomainBlocks() { - return import(/* webpackChunkName: "features/domain_blocks" */'../../domain_blocks'); + return import(/* webpackChunkName: "features/domain_blocks" */'../../domain-blocks'); } export function Mutes() { @@ -219,15 +219,15 @@ export function Search() { } export function LoginPage() { - return import(/* webpackChunkName: "features/auth_login" */'../../auth_login/components/login_page'); + return import(/* webpackChunkName: "features/auth_login" */'../../auth-login/components/login_page'); } export function ExternalLogin() { - return import(/* webpackChunkName: "features/external_login" */'../../external_login'); + return import(/* webpackChunkName: "features/external_login" */'../../external-login'); } export function LogoutPage() { - return import(/* webpackChunkName: "features/auth_login" */'../../auth_login/components/logout'); + return import(/* webpackChunkName: "features/auth_login" */'../../auth-login/components/logout'); } export function Settings() { @@ -239,23 +239,23 @@ export function MediaDisplay() { } export function EditProfile() { - return import(/* webpackChunkName: "features/edit_profile" */'../../edit_profile'); + return import(/* webpackChunkName: "features/edit_profile" */'../../edit-profile'); } export function EditEmail() { - return import(/* webpackChunkName: "features/edit_email" */'../../edit_email'); + return import(/* webpackChunkName: "features/edit_email" */'../../edit-email'); } export function EmailConfirmation() { - return import(/* webpackChunkName: "features/email_confirmation" */'../../email_confirmation'); + return import(/* webpackChunkName: "features/email_confirmation" */'../../email-confirmation'); } export function EditPassword() { - return import(/* webpackChunkName: "features/edit_password" */'../../edit_password'); + return import(/* webpackChunkName: "features/edit_password" */'../../edit-password'); } export function DeleteAccount() { - return import(/* webpackChunkName: "features/delete_account" */'../../delete_account'); + return import(/* webpackChunkName: "features/delete_account" */'../../delete-account'); } export function SoapboxConfig() { @@ -263,7 +263,7 @@ export function SoapboxConfig() { } export function ExportData() { - return import(/* webpackChunkName: "features/export_data" */ '../../export_data'); + return import(/* webpackChunkName: "features/export_data" */ '../../export-data'); } export function ImportData() { @@ -275,11 +275,11 @@ export function Backups() { } export function PasswordReset() { - return import(/* webpackChunkName: "features/auth_login" */'../../auth_login/components/password_reset'); + return import(/* webpackChunkName: "features/auth_login" */'../../auth-login/components/password_reset'); } export function PasswordResetConfirm() { - return import(/* webpackChunkName: "features/auth_login/password_reset_confirm" */'../../auth_login/components/password_reset_confirm'); + return import(/* webpackChunkName: "features/auth_login/password_reset_confirm" */'../../auth-login/components/password_reset_confirm'); } export function MfaForm() { @@ -307,7 +307,7 @@ export function Dashboard() { } export function ModerationLog() { - return import(/* webpackChunkName: "features/admin/moderation_log" */'../../admin/moderation_log'); + return import(/* webpackChunkName: "features/admin/moderation_log" */'../../admin/moderation-log'); } export function UserPanel() { @@ -359,7 +359,7 @@ export function InstanceModerationPanel() { } export function LatestAccountsPanel() { - return import(/* webpackChunkName: "features/admin" */'../../admin/components/latest_accounts_panel'); + return import(/* webpackChunkName: "features/admin" */'../../admin/components/latest-accounts-panel'); } export function SidebarMenu() { @@ -387,15 +387,15 @@ export function StatusHoverCard() { } export function CryptoDonate() { - return import(/* webpackChunkName: "features/crypto_donate" */'../../crypto_donate'); + return import(/* webpackChunkName: "features/crypto_donate" */'../../crypto-donate'); } export function CryptoDonatePanel() { - return import(/* webpackChunkName: "features/crypto_donate" */'../../crypto_donate/components/crypto_donate_panel'); + return import(/* webpackChunkName: "features/crypto_donate" */'../../crypto-donate/components/crypto-donate-panel'); } export function CryptoAddress() { - return import(/* webpackChunkName: "features/crypto_donate" */'../../crypto_donate/components/crypto_address'); + return import(/* webpackChunkName: "features/crypto_donate" */'../../crypto-donate/components/crypto-address'); } export function CryptoDonateModal() { @@ -407,7 +407,7 @@ export function ScheduledStatuses() { } export function UserIndex() { - return import(/* webpackChunkName: "features/admin/user_index" */'../../admin/user_index'); + return import(/* webpackChunkName: "features/admin/user_index" */'../../admin/user-index'); } export function FederationRestrictions() { @@ -423,7 +423,7 @@ export function Migration() { } export function ScheduleForm() { - return import(/* webpackChunkName: "features/compose" */'../../compose/components/schedule_form'); + return import(/* webpackChunkName: "features/compose" */'../../compose/components/schedule-form'); } export function WhoToFollowPanel() { @@ -475,7 +475,7 @@ export function ServiceWorkerInfo() { } export function DatePicker() { - return import(/* webpackChunkName: "date_picker" */'../../birthdays/date_picker'); + return import(/* webpackChunkName: "date_picker" */'../../birthdays/date-picker'); } export function OnboardingWizard() { @@ -491,7 +491,7 @@ export function CompareHistoryModal() { } export function AuthTokenList() { - return import(/* webpackChunkName: "features/auth_token_list" */'../../auth_token_list'); + return import(/* webpackChunkName: "features/auth_token_list" */'../../auth-token-list'); } export function VerifySmsModal() { diff --git a/app/soapbox/reducers/custom_emojis.ts b/app/soapbox/reducers/custom_emojis.ts index 38b54a673..eb4ab3b1c 100644 --- a/app/soapbox/reducers/custom_emojis.ts +++ b/app/soapbox/reducers/custom_emojis.ts @@ -1,7 +1,7 @@ import { List as ImmutableList, Map as ImmutableMap, fromJS } from 'immutable'; -import { emojis as emojiData } from 'soapbox/features/emoji/emoji_mart_data_light'; -import { addCustomToPool } from 'soapbox/features/emoji/emoji_mart_search_light'; +import { emojis as emojiData } from 'soapbox/features/emoji/emoji-mart-data-light'; +import { addCustomToPool } from 'soapbox/features/emoji/emoji-mart-search-light'; import { CUSTOM_EMOJIS_FETCH_SUCCESS } from '../actions/custom_emojis'; import { buildCustomEmojis } from '../features/emoji/emoji'; diff --git a/webpack/shared.ts b/webpack/shared.ts index dfcf9b2aa..eb587cfaf 100644 --- a/webpack/shared.ts +++ b/webpack/shared.ts @@ -114,7 +114,7 @@ const configuration: Configuration = { '**/__*__/*', '**/(LICENSE|README|COPYING)(.md|.txt)?', // This file is imported with @preval - 'app/soapbox/features/emoji/emoji_map.json', + 'app/soapbox/features/emoji/emoji-map.json', ], }), // https://github.com/jantimon/html-webpack-plugin#options From 24e7873bcece700c639099b5afb61098560c6a3c Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 14:00:40 -0500 Subject: [PATCH 09/19] Rename files (6): _ -> - --- app/soapbox/components/status-list.tsx | 2 +- app/soapbox/components/status-media.tsx | 2 +- app/soapbox/components/status.tsx | 2 +- app/soapbox/containers/soapbox.tsx | 2 +- app/soapbox/features/auth-layout/index.tsx | 4 +-- .../features/chats/components/chat-list.tsx | 2 +- .../compose/components/search-results.tsx | 6 ++-- .../features/developers/settings-store.tsx | 2 +- .../components/instance-restrictions.tsx} | 0 .../components/restricted-instance.tsx} | 2 +- .../index.tsx | 2 +- .../features/feed-filtering/feed-carousel.tsx | 2 +- .../components/account-authorize.tsx} | 0 .../index.tsx | 2 +- .../index.tsx | 0 .../index.tsx | 0 .../components/csv-importer.tsx} | 0 .../{import_data => import-data}/index.tsx | 2 +- .../index.tsx | 0 .../__tests__/landing-page.test.tsx} | 0 .../{landing_page => landing-page}/index.tsx | 0 .../instance-description.css | 0 .../components/account.tsx | 0 .../components/list.tsx | 0 .../{list_adder => list-adder}/index.tsx | 2 +- .../{new_list_form.tsx => new-list-form.tsx} | 0 app/soapbox/features/lists/index.tsx | 2 +- .../{new_status => new-status}/index.tsx | 0 ...umn_button.tsx => clear-column-button.tsx} | 0 .../{filter_bar.tsx => filter-bar.tsx} | 0 ...{setting_toggle.tsx => setting-toggle.tsx} | 0 app/soapbox/features/notifications/index.tsx | 4 +-- .../index.tsx | 0 ...er_account.tsx => placeholder-account.tsx} | 4 +-- ...lder_avatar.tsx => placeholder-avatar.tsx} | 0 ...ceholder_card.tsx => placeholder-card.tsx} | 0 ...ceholder_chat.tsx => placeholder-chat.tsx} | 4 +-- ..._name.tsx => placeholder-display-name.tsx} | 0 ...er_hashtag.tsx => placeholder-hashtag.tsx} | 0 ...us.tsx => placeholder-material-status.tsx} | 2 +- ...lery.tsx => placeholder-media-gallery.tsx} | 0 ...ation.tsx => placeholder-notification.tsx} | 6 ++-- ...ent.tsx => placeholder-status-content.tsx} | 0 ...lder_status.tsx => placeholder-status.tsx} | 6 ++-- app/soapbox/features/preferences/index.tsx | 2 +- .../components/footer.tsx | 0 .../components/header.tsx | 0 .../components/sonar.tsx | 0 .../index.tsx | 2 +- .../index.tsx | 2 +- .../index.tsx | 0 .../components/pinned-hosts-picker.tsx} | 0 .../index.tsx | 2 +- .../account.tsx | 0 ...tus_check_box.tsx => status-check-box.tsx} | 0 .../builder.tsx | 0 .../scheduled-status-action-bar.tsx} | 0 .../components/scheduled-status.tsx} | 4 +-- .../index.tsx | 2 +- .../security/{mfa_form.tsx => mfa-form.tsx} | 6 ++-- ...able_otp_form.tsx => disable-otp-form.tsx} | 0 ...nable_otp_form.tsx => enable-otp-form.tsx} | 0 ..._confirm_form.tsx => otp-confirm-form.tsx} | 0 .../{server_info => server-info}/index.tsx | 0 .../{media_display.tsx => media-display.tsx} | 0 .../components/color-picker.tsx | 0 .../components/color-with-picker.tsx | 0 .../components/crypto-address-input.tsx | 0 .../components/footer-link-input.tsx | 0 .../components/icon-picker-dropdown.js} | 0 .../components/icon-picker-menu.js | 0 .../components/icon-picker.tsx | 2 +- .../components/promo-panel-input.tsx | 0 .../components/site-preview.tsx | 0 .../forkawesome.json | 0 .../index.tsx | 0 .../status/components/detailed-status.tsx | 2 +- .../status/components/thread-status.tsx | 2 +- ...tainer.tsx => quoted-status-container.tsx} | 0 app/soapbox/features/status/index.tsx | 2 +- .../index.tsx | 0 .../components/instance_moderation_panel.tsx | 2 +- .../report-modal/steps/other-actions-step.tsx | 2 +- .../features/ui/components/pending_status.tsx | 6 ++-- .../ui/components/reply_mentions_modal.tsx | 2 +- .../features/ui/util/async-components.ts | 36 +++++++++---------- 86 files changed, 69 insertions(+), 69 deletions(-) rename app/soapbox/features/{federation_restrictions/components/instance_restrictions.tsx => federation-restrictions/components/instance-restrictions.tsx} (100%) rename app/soapbox/features/{federation_restrictions/components/restricted_instance.tsx => federation-restrictions/components/restricted-instance.tsx} (95%) rename app/soapbox/features/{federation_restrictions => federation-restrictions}/index.tsx (97%) rename app/soapbox/features/{follow_requests/components/account_authorize.tsx => follow-requests/components/account-authorize.tsx} (100%) rename app/soapbox/features/{follow_requests => follow-requests}/index.tsx (96%) rename app/soapbox/features/{generic_not_found => generic-not-found}/index.tsx (100%) rename app/soapbox/features/{home_timeline => home-timeline}/index.tsx (100%) rename app/soapbox/features/{import_data/components/csv_importer.tsx => import-data/components/csv-importer.tsx} (100%) rename app/soapbox/features/{import_data => import-data}/index.tsx (97%) rename app/soapbox/features/{intentional_error => intentional-error}/index.tsx (100%) rename app/soapbox/features/{landing_page/__tests__/landing_page.test.tsx => landing-page/__tests__/landing-page.test.tsx} (100%) rename app/soapbox/features/{landing_page => landing-page}/index.tsx (100%) rename app/soapbox/features/{landing_page => landing-page}/instance-description.css (100%) rename app/soapbox/features/{list_adder => list-adder}/components/account.tsx (100%) rename app/soapbox/features/{list_adder => list-adder}/components/list.tsx (100%) rename app/soapbox/features/{list_adder => list-adder}/index.tsx (97%) rename app/soapbox/features/lists/components/{new_list_form.tsx => new-list-form.tsx} (100%) rename app/soapbox/features/{new_status => new-status}/index.tsx (100%) rename app/soapbox/features/notifications/components/{clear_column_button.tsx => clear-column-button.tsx} (100%) rename app/soapbox/features/notifications/components/{filter_bar.tsx => filter-bar.tsx} (100%) rename app/soapbox/features/notifications/components/{setting_toggle.tsx => setting-toggle.tsx} (100%) rename app/soapbox/features/{pinned_statuses => pinned-statuses}/index.tsx (100%) rename app/soapbox/features/placeholder/components/{placeholder_account.tsx => placeholder-account.tsx} (81%) rename app/soapbox/features/placeholder/components/{placeholder_avatar.tsx => placeholder-avatar.tsx} (100%) rename app/soapbox/features/placeholder/components/{placeholder_card.tsx => placeholder-card.tsx} (100%) rename app/soapbox/features/placeholder/components/{placeholder_chat.tsx => placeholder-chat.tsx} (87%) rename app/soapbox/features/placeholder/components/{placeholder_display_name.tsx => placeholder-display-name.tsx} (100%) rename app/soapbox/features/placeholder/components/{placeholder_hashtag.tsx => placeholder-hashtag.tsx} (100%) rename app/soapbox/features/placeholder/components/{placeholder_material_status.tsx => placeholder-material-status.tsx} (87%) rename app/soapbox/features/placeholder/components/{placeholder_media_gallery.tsx => placeholder-media-gallery.tsx} (100%) rename app/soapbox/features/placeholder/components/{placeholder_notification.tsx => placeholder-notification.tsx} (82%) rename app/soapbox/features/placeholder/components/{placeholder_status_content.tsx => placeholder-status-content.tsx} (100%) rename app/soapbox/features/placeholder/components/{placeholder_status.tsx => placeholder-status.tsx} (85%) rename app/soapbox/features/{public_layout => public-layout}/components/footer.tsx (100%) rename app/soapbox/features/{public_layout => public-layout}/components/header.tsx (100%) rename app/soapbox/features/{public_layout => public-layout}/components/sonar.tsx (100%) rename app/soapbox/features/{public_layout => public-layout}/index.tsx (96%) rename app/soapbox/features/{public_timeline => public-timeline}/index.tsx (98%) rename app/soapbox/features/{register_invite => register-invite}/index.tsx (100%) rename app/soapbox/features/{remote_timeline/components/pinned_hosts_picker.tsx => remote-timeline/components/pinned-hosts-picker.tsx} (100%) rename app/soapbox/features/{remote_timeline => remote-timeline}/index.tsx (97%) rename app/soapbox/features/{reply_mentions => reply-mentions}/account.tsx (100%) rename app/soapbox/features/report/components/{status_check_box.tsx => status-check-box.tsx} (100%) rename app/soapbox/features/{scheduled_statuses => scheduled-statuses}/builder.tsx (100%) rename app/soapbox/features/{scheduled_statuses/components/scheduled_status_action_bar.tsx => scheduled-statuses/components/scheduled-status-action-bar.tsx} (100%) rename app/soapbox/features/{scheduled_statuses/components/scheduled_status.tsx => scheduled-statuses/components/scheduled-status.tsx} (97%) rename app/soapbox/features/{scheduled_statuses => scheduled-statuses}/index.tsx (96%) rename app/soapbox/features/security/{mfa_form.tsx => mfa-form.tsx} (91%) rename app/soapbox/features/security/mfa/{disable_otp_form.tsx => disable-otp-form.tsx} (100%) rename app/soapbox/features/security/mfa/{enable_otp_form.tsx => enable-otp-form.tsx} (100%) rename app/soapbox/features/security/mfa/{otp_confirm_form.tsx => otp-confirm-form.tsx} (100%) rename app/soapbox/features/{server_info => server-info}/index.tsx (100%) rename app/soapbox/features/settings/{media_display.tsx => media-display.tsx} (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/components/color-picker.tsx (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/components/color-with-picker.tsx (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/components/crypto-address-input.tsx (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/components/footer-link-input.tsx (100%) rename app/soapbox/features/{soapbox_config/components/icon_picker_dropdown.js => soapbox-config/components/icon-picker-dropdown.js} (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/components/icon-picker-menu.js (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/components/icon-picker.tsx (88%) rename app/soapbox/features/{soapbox_config => soapbox-config}/components/promo-panel-input.tsx (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/components/site-preview.tsx (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/forkawesome.json (100%) rename app/soapbox/features/{soapbox_config => soapbox-config}/index.tsx (100%) rename app/soapbox/features/status/containers/{quoted_status_container.tsx => quoted-status-container.tsx} (100%) rename app/soapbox/features/{test_timeline => test-timeline}/index.tsx (100%) diff --git a/app/soapbox/components/status-list.tsx b/app/soapbox/components/status-list.tsx index 3480baf6a..dc782248f 100644 --- a/app/soapbox/components/status-list.tsx +++ b/app/soapbox/components/status-list.tsx @@ -10,7 +10,7 @@ import ScrollableList from 'soapbox/components/scrollable-list'; import StatusContainer from 'soapbox/containers/status-container'; import Ad from 'soapbox/features/ads/components/ad'; import FeedSuggestions from 'soapbox/features/feed-suggestions/feed-suggestions'; -import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status'; +import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status'; import { ALGORITHMS } from 'soapbox/features/timeline-insertion'; import PendingStatus from 'soapbox/features/ui/components/pending_status'; import { useSoapboxConfig } from 'soapbox/hooks'; diff --git a/app/soapbox/components/status-media.tsx b/app/soapbox/components/status-media.tsx index b159d4fe5..71177cb12 100644 --- a/app/soapbox/components/status-media.tsx +++ b/app/soapbox/components/status-media.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { openModal } from 'soapbox/actions/modals'; import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; -import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card'; +import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder-card'; import Card from 'soapbox/features/status/components/card'; import Bundle from 'soapbox/features/ui/components/bundle'; import { MediaGallery, Video, Audio } from 'soapbox/features/ui/util/async-components'; diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx index eb5f3704e..fab25ea92 100644 --- a/app/soapbox/components/status.tsx +++ b/app/soapbox/components/status.tsx @@ -11,7 +11,7 @@ import { toggleStatusHidden } from 'soapbox/actions/statuses'; import Icon from 'soapbox/components/icon'; import TranslateButton from 'soapbox/components/translate-button'; import AccountContainer from 'soapbox/containers/account-container'; -import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container'; +import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container'; import { useAppDispatch, useSettings } from 'soapbox/hooks'; import { defaultMediaVisibility, textForScreenReader, getActualStatus } from 'soapbox/utils/status'; diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx index fac92a03c..b1e6fb719 100644 --- a/app/soapbox/containers/soapbox.tsx +++ b/app/soapbox/containers/soapbox.tsx @@ -19,7 +19,7 @@ import Helmet from 'soapbox/components/helmet'; import LoadingScreen from 'soapbox/components/loading-screen'; import AuthLayout from 'soapbox/features/auth-layout'; import EmbeddedStatus from 'soapbox/features/embedded-status'; -import PublicLayout from 'soapbox/features/public_layout'; +import PublicLayout from 'soapbox/features/public-layout'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; import { ModalContainer, diff --git a/app/soapbox/features/auth-layout/index.tsx b/app/soapbox/features/auth-layout/index.tsx index 9a7d502f7..556db1042 100644 --- a/app/soapbox/features/auth-layout/index.tsx +++ b/app/soapbox/features/auth-layout/index.tsx @@ -12,8 +12,8 @@ import PasswordReset from '../auth-login/components/password_reset'; import PasswordResetConfirm from '../auth-login/components/password_reset_confirm'; import RegistrationForm from '../auth-login/components/registration_form'; import ExternalLoginForm from '../external-login/components/external-login-form'; -import Footer from '../public_layout/components/footer'; -import RegisterInvite from '../register_invite'; +import Footer from '../public-layout/components/footer'; +import RegisterInvite from '../register-invite'; import Verification from '../verification'; import EmailPassthru from '../verification/email_passthru'; diff --git a/app/soapbox/features/chats/components/chat-list.tsx b/app/soapbox/features/chats/components/chat-list.tsx index 825b64871..6ac0d17c9 100644 --- a/app/soapbox/features/chats/components/chat-list.tsx +++ b/app/soapbox/features/chats/components/chat-list.tsx @@ -8,7 +8,7 @@ import { createSelector } from 'reselect'; import { fetchChats, expandChats } from 'soapbox/actions/chats'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; import { Card, Text } from 'soapbox/components/ui'; -import PlaceholderChat from 'soapbox/features/placeholder/components/placeholder_chat'; +import PlaceholderChat from 'soapbox/features/placeholder/components/placeholder-chat'; import { useAppSelector } from 'soapbox/hooks'; import Chat from './chat'; diff --git a/app/soapbox/features/compose/components/search-results.tsx b/app/soapbox/features/compose/components/search-results.tsx index 2f39a8b85..ed8c973c2 100644 --- a/app/soapbox/features/compose/components/search-results.tsx +++ b/app/soapbox/features/compose/components/search-results.tsx @@ -10,9 +10,9 @@ import ScrollableList from 'soapbox/components/scrollable-list'; import { HStack, Tabs, Text } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account-container'; import StatusContainer from 'soapbox/containers/status-container'; -import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder_account'; -import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder_hashtag'; -import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status'; +import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder-account'; +import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder-hashtag'; +import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import type { OrderedSet as ImmutableOrderedSet } from 'immutable'; diff --git a/app/soapbox/features/developers/settings-store.tsx b/app/soapbox/features/developers/settings-store.tsx index c2fbf0cc9..cfddc637e 100644 --- a/app/soapbox/features/developers/settings-store.tsx +++ b/app/soapbox/features/developers/settings-store.tsx @@ -15,7 +15,7 @@ import { FormGroup, Textarea, } from 'soapbox/components/ui'; -import SettingToggle from 'soapbox/features/notifications/components/setting_toggle'; +import SettingToggle from 'soapbox/features/notifications/components/setting-toggle'; import { useAppSelector, useAppDispatch, useSettings } from 'soapbox/hooks'; const isJSONValid = (text: any): boolean => { diff --git a/app/soapbox/features/federation_restrictions/components/instance_restrictions.tsx b/app/soapbox/features/federation-restrictions/components/instance-restrictions.tsx similarity index 100% rename from app/soapbox/features/federation_restrictions/components/instance_restrictions.tsx rename to app/soapbox/features/federation-restrictions/components/instance-restrictions.tsx diff --git a/app/soapbox/features/federation_restrictions/components/restricted_instance.tsx b/app/soapbox/features/federation-restrictions/components/restricted-instance.tsx similarity index 95% rename from app/soapbox/features/federation_restrictions/components/restricted_instance.tsx rename to app/soapbox/features/federation-restrictions/components/restricted-instance.tsx index 9b5889208..97c838984 100644 --- a/app/soapbox/features/federation_restrictions/components/restricted_instance.tsx +++ b/app/soapbox/features/federation-restrictions/components/restricted-instance.tsx @@ -5,7 +5,7 @@ import Icon from 'soapbox/components/icon'; import { useAppSelector } from 'soapbox/hooks'; import { makeGetRemoteInstance } from 'soapbox/selectors'; -import InstanceRestrictions from './instance_restrictions'; +import InstanceRestrictions from './instance-restrictions'; const getRemoteInstance = makeGetRemoteInstance(); diff --git a/app/soapbox/features/federation_restrictions/index.tsx b/app/soapbox/features/federation-restrictions/index.tsx similarity index 97% rename from app/soapbox/features/federation_restrictions/index.tsx rename to app/soapbox/features/federation-restrictions/index.tsx index 33e68a06e..f7b317822 100644 --- a/app/soapbox/features/federation_restrictions/index.tsx +++ b/app/soapbox/features/federation-restrictions/index.tsx @@ -9,7 +9,7 @@ import { federationRestrictionsDisclosed } from 'soapbox/utils/state'; import Column from '../ui/components/column'; -import RestrictedInstance from './components/restricted_instance'; +import RestrictedInstance from './components/restricted-instance'; import type { OrderedSet as ImmutableOrderedSet } from 'immutable'; diff --git a/app/soapbox/features/feed-filtering/feed-carousel.tsx b/app/soapbox/features/feed-filtering/feed-carousel.tsx index c3fac39be..621c48374 100644 --- a/app/soapbox/features/feed-filtering/feed-carousel.tsx +++ b/app/soapbox/features/feed-filtering/feed-carousel.tsx @@ -7,7 +7,7 @@ import { useAppDispatch, useAppSelector, useDimensions } from 'soapbox/hooks'; import useCarouselAvatars from 'soapbox/queries/carousels'; import { Card, HStack, Icon, Stack, Text } from '../../components/ui'; -import PlaceholderAvatar from '../placeholder/components/placeholder_avatar'; +import PlaceholderAvatar from '../placeholder/components/placeholder-avatar'; const CarouselItem = ({ avatar }: { avatar: any }) => { const dispatch = useAppDispatch(); diff --git a/app/soapbox/features/follow_requests/components/account_authorize.tsx b/app/soapbox/features/follow-requests/components/account-authorize.tsx similarity index 100% rename from app/soapbox/features/follow_requests/components/account_authorize.tsx rename to app/soapbox/features/follow-requests/components/account-authorize.tsx diff --git a/app/soapbox/features/follow_requests/index.tsx b/app/soapbox/features/follow-requests/index.tsx similarity index 96% rename from app/soapbox/features/follow_requests/index.tsx rename to app/soapbox/features/follow-requests/index.tsx index a073c346d..976b3586f 100644 --- a/app/soapbox/features/follow_requests/index.tsx +++ b/app/soapbox/features/follow-requests/index.tsx @@ -10,7 +10,7 @@ import { useAppSelector } from 'soapbox/hooks'; import Column from '../ui/components/column'; -import AccountAuthorize from './components/account_authorize'; +import AccountAuthorize from './components/account-authorize'; const messages = defineMessages({ heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' }, diff --git a/app/soapbox/features/generic_not_found/index.tsx b/app/soapbox/features/generic-not-found/index.tsx similarity index 100% rename from app/soapbox/features/generic_not_found/index.tsx rename to app/soapbox/features/generic-not-found/index.tsx diff --git a/app/soapbox/features/home_timeline/index.tsx b/app/soapbox/features/home-timeline/index.tsx similarity index 100% rename from app/soapbox/features/home_timeline/index.tsx rename to app/soapbox/features/home-timeline/index.tsx diff --git a/app/soapbox/features/import_data/components/csv_importer.tsx b/app/soapbox/features/import-data/components/csv-importer.tsx similarity index 100% rename from app/soapbox/features/import_data/components/csv_importer.tsx rename to app/soapbox/features/import-data/components/csv-importer.tsx diff --git a/app/soapbox/features/import_data/index.tsx b/app/soapbox/features/import-data/index.tsx similarity index 97% rename from app/soapbox/features/import_data/index.tsx rename to app/soapbox/features/import-data/index.tsx index 5d26fa0ec..ca03e6701 100644 --- a/app/soapbox/features/import_data/index.tsx +++ b/app/soapbox/features/import-data/index.tsx @@ -9,7 +9,7 @@ import { import Column from '../ui/components/column'; -import CSVImporter from './components/csv_importer'; +import CSVImporter from './components/csv-importer'; const messages = defineMessages({ heading: { id: 'column.import_data', defaultMessage: 'Import data' }, diff --git a/app/soapbox/features/intentional_error/index.tsx b/app/soapbox/features/intentional-error/index.tsx similarity index 100% rename from app/soapbox/features/intentional_error/index.tsx rename to app/soapbox/features/intentional-error/index.tsx diff --git a/app/soapbox/features/landing_page/__tests__/landing_page.test.tsx b/app/soapbox/features/landing-page/__tests__/landing-page.test.tsx similarity index 100% rename from app/soapbox/features/landing_page/__tests__/landing_page.test.tsx rename to app/soapbox/features/landing-page/__tests__/landing-page.test.tsx diff --git a/app/soapbox/features/landing_page/index.tsx b/app/soapbox/features/landing-page/index.tsx similarity index 100% rename from app/soapbox/features/landing_page/index.tsx rename to app/soapbox/features/landing-page/index.tsx diff --git a/app/soapbox/features/landing_page/instance-description.css b/app/soapbox/features/landing-page/instance-description.css similarity index 100% rename from app/soapbox/features/landing_page/instance-description.css rename to app/soapbox/features/landing-page/instance-description.css diff --git a/app/soapbox/features/list_adder/components/account.tsx b/app/soapbox/features/list-adder/components/account.tsx similarity index 100% rename from app/soapbox/features/list_adder/components/account.tsx rename to app/soapbox/features/list-adder/components/account.tsx diff --git a/app/soapbox/features/list_adder/components/list.tsx b/app/soapbox/features/list-adder/components/list.tsx similarity index 100% rename from app/soapbox/features/list_adder/components/list.tsx rename to app/soapbox/features/list-adder/components/list.tsx diff --git a/app/soapbox/features/list_adder/index.tsx b/app/soapbox/features/list-adder/index.tsx similarity index 97% rename from app/soapbox/features/list_adder/index.tsx rename to app/soapbox/features/list-adder/index.tsx index 191c71b75..1e9d7c745 100644 --- a/app/soapbox/features/list_adder/index.tsx +++ b/app/soapbox/features/list-adder/index.tsx @@ -6,7 +6,7 @@ import { setupListAdder, resetListAdder } from 'soapbox/actions/lists'; import { CardHeader, CardTitle, Modal } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; -import NewListForm from '../lists/components/new_list_form'; +import NewListForm from '../lists/components/new-list-form'; import Account from './components/account'; import List from './components/list'; diff --git a/app/soapbox/features/lists/components/new_list_form.tsx b/app/soapbox/features/lists/components/new-list-form.tsx similarity index 100% rename from app/soapbox/features/lists/components/new_list_form.tsx rename to app/soapbox/features/lists/components/new-list-form.tsx diff --git a/app/soapbox/features/lists/index.tsx b/app/soapbox/features/lists/index.tsx index f37c2bf20..082da7c5d 100644 --- a/app/soapbox/features/lists/index.tsx +++ b/app/soapbox/features/lists/index.tsx @@ -11,7 +11,7 @@ import ScrollableList from 'soapbox/components/scrollable-list'; import { Column, IconButton, Spinner } from 'soapbox/components/ui'; import { useAppSelector } from 'soapbox/hooks'; -import NewListForm from './components/new_list_form'; +import NewListForm from './components/new-list-form'; import type { RootState } from 'soapbox/store'; diff --git a/app/soapbox/features/new_status/index.tsx b/app/soapbox/features/new-status/index.tsx similarity index 100% rename from app/soapbox/features/new_status/index.tsx rename to app/soapbox/features/new-status/index.tsx diff --git a/app/soapbox/features/notifications/components/clear_column_button.tsx b/app/soapbox/features/notifications/components/clear-column-button.tsx similarity index 100% rename from app/soapbox/features/notifications/components/clear_column_button.tsx rename to app/soapbox/features/notifications/components/clear-column-button.tsx diff --git a/app/soapbox/features/notifications/components/filter_bar.tsx b/app/soapbox/features/notifications/components/filter-bar.tsx similarity index 100% rename from app/soapbox/features/notifications/components/filter_bar.tsx rename to app/soapbox/features/notifications/components/filter-bar.tsx diff --git a/app/soapbox/features/notifications/components/setting_toggle.tsx b/app/soapbox/features/notifications/components/setting-toggle.tsx similarity index 100% rename from app/soapbox/features/notifications/components/setting_toggle.tsx rename to app/soapbox/features/notifications/components/setting-toggle.tsx diff --git a/app/soapbox/features/notifications/index.tsx b/app/soapbox/features/notifications/index.tsx index 1e10db25a..820bb64c3 100644 --- a/app/soapbox/features/notifications/index.tsx +++ b/app/soapbox/features/notifications/index.tsx @@ -15,10 +15,10 @@ import PullToRefresh from 'soapbox/components/pull-to-refresh'; import ScrollTopButton from 'soapbox/components/scroll-top-button'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Column } from 'soapbox/components/ui'; -import PlaceholderNotification from 'soapbox/features/placeholder/components/placeholder_notification'; +import PlaceholderNotification from 'soapbox/features/placeholder/components/placeholder-notification'; import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; -import FilterBar from './components/filter_bar'; +import FilterBar from './components/filter-bar'; import Notification from './components/notification'; import type { VirtuosoHandle } from 'react-virtuoso'; diff --git a/app/soapbox/features/pinned_statuses/index.tsx b/app/soapbox/features/pinned-statuses/index.tsx similarity index 100% rename from app/soapbox/features/pinned_statuses/index.tsx rename to app/soapbox/features/pinned-statuses/index.tsx diff --git a/app/soapbox/features/placeholder/components/placeholder_account.tsx b/app/soapbox/features/placeholder/components/placeholder-account.tsx similarity index 81% rename from app/soapbox/features/placeholder/components/placeholder_account.tsx rename to app/soapbox/features/placeholder/components/placeholder-account.tsx index ad31db3a4..113ed02f9 100644 --- a/app/soapbox/features/placeholder/components/placeholder_account.tsx +++ b/app/soapbox/features/placeholder/components/placeholder-account.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import PlaceholderAvatar from './placeholder_avatar'; -import PlaceholderDisplayName from './placeholder_display_name'; +import PlaceholderAvatar from './placeholder-avatar'; +import PlaceholderDisplayName from './placeholder-display-name'; /** Fake account to display while data is loading. */ const PlaceholderAccount: React.FC = () => { diff --git a/app/soapbox/features/placeholder/components/placeholder_avatar.tsx b/app/soapbox/features/placeholder/components/placeholder-avatar.tsx similarity index 100% rename from app/soapbox/features/placeholder/components/placeholder_avatar.tsx rename to app/soapbox/features/placeholder/components/placeholder-avatar.tsx diff --git a/app/soapbox/features/placeholder/components/placeholder_card.tsx b/app/soapbox/features/placeholder/components/placeholder-card.tsx similarity index 100% rename from app/soapbox/features/placeholder/components/placeholder_card.tsx rename to app/soapbox/features/placeholder/components/placeholder-card.tsx diff --git a/app/soapbox/features/placeholder/components/placeholder_chat.tsx b/app/soapbox/features/placeholder/components/placeholder-chat.tsx similarity index 87% rename from app/soapbox/features/placeholder/components/placeholder_chat.tsx rename to app/soapbox/features/placeholder/components/placeholder-chat.tsx index 6b587f03d..be33d5aa9 100644 --- a/app/soapbox/features/placeholder/components/placeholder_chat.tsx +++ b/app/soapbox/features/placeholder/components/placeholder-chat.tsx @@ -2,8 +2,8 @@ import React from 'react'; import { randomIntFromInterval, generateText } from '../utils'; -import PlaceholderAvatar from './placeholder_avatar'; -import PlaceholderDisplayName from './placeholder_display_name'; +import PlaceholderAvatar from './placeholder-avatar'; +import PlaceholderDisplayName from './placeholder-display-name'; /** Fake chat to display while data is loading. */ const PlaceholderChat: React.FC = () => { diff --git a/app/soapbox/features/placeholder/components/placeholder_display_name.tsx b/app/soapbox/features/placeholder/components/placeholder-display-name.tsx similarity index 100% rename from app/soapbox/features/placeholder/components/placeholder_display_name.tsx rename to app/soapbox/features/placeholder/components/placeholder-display-name.tsx diff --git a/app/soapbox/features/placeholder/components/placeholder_hashtag.tsx b/app/soapbox/features/placeholder/components/placeholder-hashtag.tsx similarity index 100% rename from app/soapbox/features/placeholder/components/placeholder_hashtag.tsx rename to app/soapbox/features/placeholder/components/placeholder-hashtag.tsx diff --git a/app/soapbox/features/placeholder/components/placeholder_material_status.tsx b/app/soapbox/features/placeholder/components/placeholder-material-status.tsx similarity index 87% rename from app/soapbox/features/placeholder/components/placeholder_material_status.tsx rename to app/soapbox/features/placeholder/components/placeholder-material-status.tsx index 28581cb09..e3b289d70 100644 --- a/app/soapbox/features/placeholder/components/placeholder_material_status.tsx +++ b/app/soapbox/features/placeholder/components/placeholder-material-status.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import PlaceholderStatus from './placeholder_status'; +import PlaceholderStatus from './placeholder-status'; /** Fake material status to display while data is loading. */ const PlaceholderMaterialStatus: React.FC = () => { diff --git a/app/soapbox/features/placeholder/components/placeholder_media_gallery.tsx b/app/soapbox/features/placeholder/components/placeholder-media-gallery.tsx similarity index 100% rename from app/soapbox/features/placeholder/components/placeholder_media_gallery.tsx rename to app/soapbox/features/placeholder/components/placeholder-media-gallery.tsx diff --git a/app/soapbox/features/placeholder/components/placeholder_notification.tsx b/app/soapbox/features/placeholder/components/placeholder-notification.tsx similarity index 82% rename from app/soapbox/features/placeholder/components/placeholder_notification.tsx rename to app/soapbox/features/placeholder/components/placeholder-notification.tsx index 8b673b5bb..1a035066d 100644 --- a/app/soapbox/features/placeholder/components/placeholder_notification.tsx +++ b/app/soapbox/features/placeholder/components/placeholder-notification.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; -import PlaceholderAvatar from './placeholder_avatar'; -import PlaceholderDisplayName from './placeholder_display_name'; -import PlaceholderStatusContent from './placeholder_status_content'; +import PlaceholderAvatar from './placeholder-avatar'; +import PlaceholderDisplayName from './placeholder-display-name'; +import PlaceholderStatusContent from './placeholder-status-content'; /** Fake notification to display while data is loading. */ const PlaceholderNotification = () => ( diff --git a/app/soapbox/features/placeholder/components/placeholder_status_content.tsx b/app/soapbox/features/placeholder/components/placeholder-status-content.tsx similarity index 100% rename from app/soapbox/features/placeholder/components/placeholder_status_content.tsx rename to app/soapbox/features/placeholder/components/placeholder-status-content.tsx diff --git a/app/soapbox/features/placeholder/components/placeholder_status.tsx b/app/soapbox/features/placeholder/components/placeholder-status.tsx similarity index 85% rename from app/soapbox/features/placeholder/components/placeholder_status.tsx rename to app/soapbox/features/placeholder/components/placeholder-status.tsx index 1bff89459..b015c9df9 100644 --- a/app/soapbox/features/placeholder/components/placeholder_status.tsx +++ b/app/soapbox/features/placeholder/components/placeholder-status.tsx @@ -1,9 +1,9 @@ import classNames from 'clsx'; import * as React from 'react'; -import PlaceholderAvatar from './placeholder_avatar'; -import PlaceholderDisplayName from './placeholder_display_name'; -import PlaceholderStatusContent from './placeholder_status_content'; +import PlaceholderAvatar from './placeholder-avatar'; +import PlaceholderDisplayName from './placeholder-display-name'; +import PlaceholderStatusContent from './placeholder-status-content'; interface IPlaceholderStatus { thread?: boolean diff --git a/app/soapbox/features/preferences/index.tsx b/app/soapbox/features/preferences/index.tsx index 98221a8fd..6c620adb1 100644 --- a/app/soapbox/features/preferences/index.tsx +++ b/app/soapbox/features/preferences/index.tsx @@ -6,7 +6,7 @@ import { changeSetting } from 'soapbox/actions/settings'; import List, { ListItem } from 'soapbox/components/list'; import { Form } from 'soapbox/components/ui'; import { SelectDropdown } from 'soapbox/features/forms'; -import SettingToggle from 'soapbox/features/notifications/components/setting_toggle'; +import SettingToggle from 'soapbox/features/notifications/components/setting-toggle'; import { useFeatures, useSettings } from 'soapbox/hooks'; import ThemeToggle from '../ui/components/theme-toggle'; diff --git a/app/soapbox/features/public_layout/components/footer.tsx b/app/soapbox/features/public-layout/components/footer.tsx similarity index 100% rename from app/soapbox/features/public_layout/components/footer.tsx rename to app/soapbox/features/public-layout/components/footer.tsx diff --git a/app/soapbox/features/public_layout/components/header.tsx b/app/soapbox/features/public-layout/components/header.tsx similarity index 100% rename from app/soapbox/features/public_layout/components/header.tsx rename to app/soapbox/features/public-layout/components/header.tsx diff --git a/app/soapbox/features/public_layout/components/sonar.tsx b/app/soapbox/features/public-layout/components/sonar.tsx similarity index 100% rename from app/soapbox/features/public_layout/components/sonar.tsx rename to app/soapbox/features/public-layout/components/sonar.tsx diff --git a/app/soapbox/features/public_layout/index.tsx b/app/soapbox/features/public-layout/index.tsx similarity index 96% rename from app/soapbox/features/public_layout/index.tsx rename to app/soapbox/features/public-layout/index.tsx index 5615e950e..0fdc8b946 100644 --- a/app/soapbox/features/public_layout/index.tsx +++ b/app/soapbox/features/public-layout/index.tsx @@ -6,7 +6,7 @@ import { useAppSelector } from 'soapbox/hooks'; import { isStandalone } from 'soapbox/utils/state'; import AboutPage from '../about'; -import LandingPage from '../landing_page'; +import LandingPage from '../landing-page'; import Footer from './components/footer'; import Header from './components/header'; diff --git a/app/soapbox/features/public_timeline/index.tsx b/app/soapbox/features/public-timeline/index.tsx similarity index 98% rename from app/soapbox/features/public_timeline/index.tsx rename to app/soapbox/features/public-timeline/index.tsx index 894771da4..ae9378ba3 100644 --- a/app/soapbox/features/public_timeline/index.tsx +++ b/app/soapbox/features/public-timeline/index.tsx @@ -11,7 +11,7 @@ import { Column } from 'soapbox/components/ui'; import Accordion from 'soapbox/features/ui/components/accordion'; import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; -import PinnedHostsPicker from '../remote_timeline/components/pinned_hosts_picker'; +import PinnedHostsPicker from '../remote-timeline/components/pinned-hosts-picker'; import Timeline from '../ui/components/timeline'; const messages = defineMessages({ diff --git a/app/soapbox/features/register_invite/index.tsx b/app/soapbox/features/register-invite/index.tsx similarity index 100% rename from app/soapbox/features/register_invite/index.tsx rename to app/soapbox/features/register-invite/index.tsx diff --git a/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.tsx b/app/soapbox/features/remote-timeline/components/pinned-hosts-picker.tsx similarity index 100% rename from app/soapbox/features/remote_timeline/components/pinned_hosts_picker.tsx rename to app/soapbox/features/remote-timeline/components/pinned-hosts-picker.tsx diff --git a/app/soapbox/features/remote_timeline/index.tsx b/app/soapbox/features/remote-timeline/index.tsx similarity index 97% rename from app/soapbox/features/remote_timeline/index.tsx rename to app/soapbox/features/remote-timeline/index.tsx index a3f8d2c68..7ab185be9 100644 --- a/app/soapbox/features/remote_timeline/index.tsx +++ b/app/soapbox/features/remote-timeline/index.tsx @@ -11,7 +11,7 @@ import { useAppDispatch, useSettings } from 'soapbox/hooks'; import Timeline from '../ui/components/timeline'; -import PinnedHostsPicker from './components/pinned_hosts_picker'; +import PinnedHostsPicker from './components/pinned-hosts-picker'; const messages = defineMessages({ title: { id: 'column.remote', defaultMessage: 'Federated timeline' }, diff --git a/app/soapbox/features/reply_mentions/account.tsx b/app/soapbox/features/reply-mentions/account.tsx similarity index 100% rename from app/soapbox/features/reply_mentions/account.tsx rename to app/soapbox/features/reply-mentions/account.tsx diff --git a/app/soapbox/features/report/components/status_check_box.tsx b/app/soapbox/features/report/components/status-check-box.tsx similarity index 100% rename from app/soapbox/features/report/components/status_check_box.tsx rename to app/soapbox/features/report/components/status-check-box.tsx diff --git a/app/soapbox/features/scheduled_statuses/builder.tsx b/app/soapbox/features/scheduled-statuses/builder.tsx similarity index 100% rename from app/soapbox/features/scheduled_statuses/builder.tsx rename to app/soapbox/features/scheduled-statuses/builder.tsx diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx similarity index 100% rename from app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx rename to app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx similarity index 97% rename from app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx rename to app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx index 6fcd66921..e0e174dfb 100644 --- a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx +++ b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx @@ -2,8 +2,8 @@ import classNames from 'clsx'; import React from 'react'; import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; -import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; import StatusContent from 'soapbox/components/status-content'; +import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; import { HStack } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account-container'; import PollPreview from 'soapbox/features/ui/components/poll_preview'; @@ -11,7 +11,7 @@ import { useAppSelector } from 'soapbox/hooks'; import { buildStatus } from '../builder'; -import ScheduledStatusActionBar from './scheduled_status_action_bar'; +import ScheduledStatusActionBar from './scheduled-status-action-bar'; import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/scheduled_statuses/index.tsx b/app/soapbox/features/scheduled-statuses/index.tsx similarity index 96% rename from app/soapbox/features/scheduled_statuses/index.tsx rename to app/soapbox/features/scheduled-statuses/index.tsx index 6f30d16b5..03d27512e 100644 --- a/app/soapbox/features/scheduled_statuses/index.tsx +++ b/app/soapbox/features/scheduled-statuses/index.tsx @@ -8,7 +8,7 @@ import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import Column from '../ui/components/column'; -import ScheduledStatus from './components/scheduled_status'; +import ScheduledStatus from './components/scheduled-status'; const messages = defineMessages({ heading: { id: 'column.scheduled_statuses', defaultMessage: 'Scheduled Posts' }, diff --git a/app/soapbox/features/security/mfa_form.tsx b/app/soapbox/features/security/mfa-form.tsx similarity index 91% rename from app/soapbox/features/security/mfa_form.tsx rename to app/soapbox/features/security/mfa-form.tsx index 1cbb15f7e..1fd47445f 100644 --- a/app/soapbox/features/security/mfa_form.tsx +++ b/app/soapbox/features/security/mfa-form.tsx @@ -5,9 +5,9 @@ import { fetchMfa } from 'soapbox/actions/mfa'; import { Card, CardBody, CardHeader, CardTitle, Column, Stack } from 'soapbox/components/ui'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; -import DisableOtpForm from './mfa/disable_otp_form'; -import EnableOtpForm from './mfa/enable_otp_form'; -import OtpConfirmForm from './mfa/otp_confirm_form'; +import DisableOtpForm from './mfa/disable-otp-form'; +import EnableOtpForm from './mfa/enable-otp-form'; +import OtpConfirmForm from './mfa/otp-confirm-form'; /* Security settings page for user account diff --git a/app/soapbox/features/security/mfa/disable_otp_form.tsx b/app/soapbox/features/security/mfa/disable-otp-form.tsx similarity index 100% rename from app/soapbox/features/security/mfa/disable_otp_form.tsx rename to app/soapbox/features/security/mfa/disable-otp-form.tsx diff --git a/app/soapbox/features/security/mfa/enable_otp_form.tsx b/app/soapbox/features/security/mfa/enable-otp-form.tsx similarity index 100% rename from app/soapbox/features/security/mfa/enable_otp_form.tsx rename to app/soapbox/features/security/mfa/enable-otp-form.tsx diff --git a/app/soapbox/features/security/mfa/otp_confirm_form.tsx b/app/soapbox/features/security/mfa/otp-confirm-form.tsx similarity index 100% rename from app/soapbox/features/security/mfa/otp_confirm_form.tsx rename to app/soapbox/features/security/mfa/otp-confirm-form.tsx diff --git a/app/soapbox/features/server_info/index.tsx b/app/soapbox/features/server-info/index.tsx similarity index 100% rename from app/soapbox/features/server_info/index.tsx rename to app/soapbox/features/server-info/index.tsx diff --git a/app/soapbox/features/settings/media_display.tsx b/app/soapbox/features/settings/media-display.tsx similarity index 100% rename from app/soapbox/features/settings/media_display.tsx rename to app/soapbox/features/settings/media-display.tsx diff --git a/app/soapbox/features/soapbox_config/components/color-picker.tsx b/app/soapbox/features/soapbox-config/components/color-picker.tsx similarity index 100% rename from app/soapbox/features/soapbox_config/components/color-picker.tsx rename to app/soapbox/features/soapbox-config/components/color-picker.tsx diff --git a/app/soapbox/features/soapbox_config/components/color-with-picker.tsx b/app/soapbox/features/soapbox-config/components/color-with-picker.tsx similarity index 100% rename from app/soapbox/features/soapbox_config/components/color-with-picker.tsx rename to app/soapbox/features/soapbox-config/components/color-with-picker.tsx diff --git a/app/soapbox/features/soapbox_config/components/crypto-address-input.tsx b/app/soapbox/features/soapbox-config/components/crypto-address-input.tsx similarity index 100% rename from app/soapbox/features/soapbox_config/components/crypto-address-input.tsx rename to app/soapbox/features/soapbox-config/components/crypto-address-input.tsx diff --git a/app/soapbox/features/soapbox_config/components/footer-link-input.tsx b/app/soapbox/features/soapbox-config/components/footer-link-input.tsx similarity index 100% rename from app/soapbox/features/soapbox_config/components/footer-link-input.tsx rename to app/soapbox/features/soapbox-config/components/footer-link-input.tsx diff --git a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js b/app/soapbox/features/soapbox-config/components/icon-picker-dropdown.js similarity index 100% rename from app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js rename to app/soapbox/features/soapbox-config/components/icon-picker-dropdown.js diff --git a/app/soapbox/features/soapbox_config/components/icon-picker-menu.js b/app/soapbox/features/soapbox-config/components/icon-picker-menu.js similarity index 100% rename from app/soapbox/features/soapbox_config/components/icon-picker-menu.js rename to app/soapbox/features/soapbox-config/components/icon-picker-menu.js diff --git a/app/soapbox/features/soapbox_config/components/icon-picker.tsx b/app/soapbox/features/soapbox-config/components/icon-picker.tsx similarity index 88% rename from app/soapbox/features/soapbox_config/components/icon-picker.tsx rename to app/soapbox/features/soapbox-config/components/icon-picker.tsx index 05020af74..f1e3de670 100644 --- a/app/soapbox/features/soapbox_config/components/icon-picker.tsx +++ b/app/soapbox/features/soapbox-config/components/icon-picker.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import IconPickerDropdown from './icon_picker_dropdown'; +import IconPickerDropdown from './icon-picker-dropdown'; interface IIconPicker { value: string, diff --git a/app/soapbox/features/soapbox_config/components/promo-panel-input.tsx b/app/soapbox/features/soapbox-config/components/promo-panel-input.tsx similarity index 100% rename from app/soapbox/features/soapbox_config/components/promo-panel-input.tsx rename to app/soapbox/features/soapbox-config/components/promo-panel-input.tsx diff --git a/app/soapbox/features/soapbox_config/components/site-preview.tsx b/app/soapbox/features/soapbox-config/components/site-preview.tsx similarity index 100% rename from app/soapbox/features/soapbox_config/components/site-preview.tsx rename to app/soapbox/features/soapbox-config/components/site-preview.tsx diff --git a/app/soapbox/features/soapbox_config/forkawesome.json b/app/soapbox/features/soapbox-config/forkawesome.json similarity index 100% rename from app/soapbox/features/soapbox_config/forkawesome.json rename to app/soapbox/features/soapbox-config/forkawesome.json diff --git a/app/soapbox/features/soapbox_config/index.tsx b/app/soapbox/features/soapbox-config/index.tsx similarity index 100% rename from app/soapbox/features/soapbox_config/index.tsx rename to app/soapbox/features/soapbox-config/index.tsx diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx index 33a112b52..80ab50022 100644 --- a/app/soapbox/features/status/components/detailed-status.tsx +++ b/app/soapbox/features/status/components/detailed-status.tsx @@ -10,7 +10,7 @@ import SensitiveContentOverlay from 'soapbox/components/statuses/sensitive-conte import TranslateButton from 'soapbox/components/translate-button'; import { HStack, Stack, Text } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account-container'; -import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container'; +import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container'; import { getActualStatus } from 'soapbox/utils/status'; import StatusInteractionBar from './status-interaction-bar'; diff --git a/app/soapbox/features/status/components/thread-status.tsx b/app/soapbox/features/status/components/thread-status.tsx index 35b3db672..8054e268a 100644 --- a/app/soapbox/features/status/components/thread-status.tsx +++ b/app/soapbox/features/status/components/thread-status.tsx @@ -3,7 +3,7 @@ import { OrderedSet as ImmutableOrderedSet } from 'immutable'; import React from 'react'; import StatusContainer from 'soapbox/containers/status-container'; -import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status'; +import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status'; import { useAppSelector } from 'soapbox/hooks'; interface IThreadStatus { diff --git a/app/soapbox/features/status/containers/quoted_status_container.tsx b/app/soapbox/features/status/containers/quoted-status-container.tsx similarity index 100% rename from app/soapbox/features/status/containers/quoted_status_container.tsx rename to app/soapbox/features/status/containers/quoted-status-container.tsx diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx index 18460b1ec..37598c45c 100644 --- a/app/soapbox/features/status/index.tsx +++ b/app/soapbox/features/status/index.tsx @@ -32,7 +32,7 @@ import StatusActionBar from 'soapbox/components/status-action-bar'; import SubNavigation from 'soapbox/components/sub-navigation'; import Tombstone from 'soapbox/components/tombstone'; import { Column, Stack } from 'soapbox/components/ui'; -import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status'; +import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status'; import PendingStatus from 'soapbox/features/ui/components/pending_status'; import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; import { makeGetStatus } from 'soapbox/selectors'; diff --git a/app/soapbox/features/test_timeline/index.tsx b/app/soapbox/features/test-timeline/index.tsx similarity index 100% rename from app/soapbox/features/test_timeline/index.tsx rename to app/soapbox/features/test-timeline/index.tsx diff --git a/app/soapbox/features/ui/components/instance_moderation_panel.tsx b/app/soapbox/features/ui/components/instance_moderation_panel.tsx index 1b403ed53..4a53a769f 100644 --- a/app/soapbox/features/ui/components/instance_moderation_panel.tsx +++ b/app/soapbox/features/ui/components/instance_moderation_panel.tsx @@ -6,7 +6,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import { openModal } from 'soapbox/actions/modals'; import { Widget } from 'soapbox/components/ui'; import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; -import InstanceRestrictions from 'soapbox/features/federation_restrictions/components/instance_restrictions'; +import InstanceRestrictions from 'soapbox/features/federation-restrictions/components/instance-restrictions'; import { useAppSelector, useAppDispatch, useOwnAccount } from 'soapbox/hooks'; import { makeGetRemoteInstance } from 'soapbox/selectors'; diff --git a/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx index e50a90778..964fbd1ca 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx @@ -7,7 +7,7 @@ import Toggle from 'react-toggle'; import { changeReportBlock, changeReportForward } from 'soapbox/actions/reports'; import { fetchRules } from 'soapbox/actions/rules'; import { Button, FormGroup, HStack, Stack, Text } from 'soapbox/components/ui'; -import StatusCheckBox from 'soapbox/features/report/components/status_check_box'; +import StatusCheckBox from 'soapbox/features/report/components/status-check-box'; import { useAppSelector, useFeatures } from 'soapbox/hooks'; import { isRemote, getDomain } from 'soapbox/utils/accounts'; diff --git a/app/soapbox/features/ui/components/pending_status.tsx b/app/soapbox/features/ui/components/pending_status.tsx index d584d7b28..343c88f43 100644 --- a/app/soapbox/features/ui/components/pending_status.tsx +++ b/app/soapbox/features/ui/components/pending_status.tsx @@ -5,9 +5,9 @@ import StatusContent from 'soapbox/components/status-content'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; import { Card, HStack } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account-container'; -import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card'; -import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder_media_gallery'; -import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container'; +import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder-card'; +import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder-media-gallery'; +import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container'; import { useAppSelector } from 'soapbox/hooks'; import { buildStatus } from '../util/pending_status_builder'; diff --git a/app/soapbox/features/ui/components/reply_mentions_modal.tsx b/app/soapbox/features/ui/components/reply_mentions_modal.tsx index 2c8fc73b1..00be2e19f 100644 --- a/app/soapbox/features/ui/components/reply_mentions_modal.tsx +++ b/app/soapbox/features/ui/components/reply_mentions_modal.tsx @@ -6,7 +6,7 @@ import { useAppSelector, useCompose } from 'soapbox/hooks'; import { statusToMentionsAccountIdsArray } from 'soapbox/reducers/compose'; import { makeGetStatus } from 'soapbox/selectors'; -import Account from '../../reply_mentions/account'; +import Account from '../../reply-mentions/account'; import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts index e5c70b340..997f6b7da 100644 --- a/app/soapbox/features/ui/util/async-components.ts +++ b/app/soapbox/features/ui/util/async-components.ts @@ -7,15 +7,15 @@ export function Notifications() { } export function HomeTimeline() { - return import(/* webpackChunkName: "features/home_timeline" */'../../home_timeline'); + return import(/* webpackChunkName: "features/home_timeline" */'../../home-timeline'); } export function PublicTimeline() { - return import(/* webpackChunkName: "features/public_timeline" */'../../public_timeline'); + return import(/* webpackChunkName: "features/public_timeline" */'../../public-timeline'); } export function RemoteTimeline() { - return import(/* webpackChunkName: "features/remote_timeline" */'../../remote_timeline'); + return import(/* webpackChunkName: "features/remote_timeline" */'../../remote-timeline'); } export function CommunityTimeline() { @@ -51,7 +51,7 @@ export function Status() { } export function PinnedStatuses() { - return import(/* webpackChunkName: "features/pinned_statuses" */'../../pinned_statuses'); + return import(/* webpackChunkName: "features/pinned_statuses" */'../../pinned-statuses'); } export function AccountTimeline() { @@ -71,11 +71,11 @@ export function Following() { } export function FollowRequests() { - return import(/* webpackChunkName: "features/follow_requests" */'../../follow_requests'); + return import(/* webpackChunkName: "features/follow_requests" */'../../follow-requests'); } export function GenericNotFound() { - return import(/* webpackChunkName: "features/generic_not_found" */'../../generic_not_found'); + return import(/* webpackChunkName: "features/generic_not_found" */'../../generic-not-found'); } export function FavouritedStatuses() { @@ -211,7 +211,7 @@ export function ListEditor() { } export function ListAdder() { - return import(/*webpackChunkName: "features/list_adder" */'../../list_adder'); + return import(/*webpackChunkName: "features/list_adder" */'../../list-adder'); } export function Search() { @@ -235,7 +235,7 @@ export function Settings() { } export function MediaDisplay() { - return import(/* webpackChunkName: "features/settings" */'../../settings/media_display'); + return import(/* webpackChunkName: "features/settings" */'../../settings/media-display'); } export function EditProfile() { @@ -259,7 +259,7 @@ export function DeleteAccount() { } export function SoapboxConfig() { - return import(/* webpackChunkName: "features/soapbox_config" */'../../soapbox_config'); + return import(/* webpackChunkName: "features/soapbox_config" */'../../soapbox-config'); } export function ExportData() { @@ -267,7 +267,7 @@ export function ExportData() { } export function ImportData() { - return import(/* webpackChunkName: "features/import_data" */'../../import_data'); + return import(/* webpackChunkName: "features/import_data" */'../../import-data'); } export function Backups() { @@ -283,7 +283,7 @@ export function PasswordResetConfirm() { } export function MfaForm() { - return import(/* webpackChunkName: "features/security/mfa_form" */'../../security/mfa_form'); + return import(/* webpackChunkName: "features/security/mfa_form" */'../../security/mfa-form'); } export function ChatIndex() { @@ -299,7 +299,7 @@ export function ChatPanes() { } export function ServerInfo() { - return import(/* webpackChunkName: "features/server_info" */'../../server_info'); + return import(/* webpackChunkName: "features/server_info" */'../../server-info'); } export function Dashboard() { @@ -403,7 +403,7 @@ export function CryptoDonateModal() { } export function ScheduledStatuses() { - return import(/* webpackChunkName: "features/scheduled_statuses" */'../../scheduled_statuses'); + return import(/* webpackChunkName: "features/scheduled_statuses" */'../../scheduled-statuses'); } export function UserIndex() { @@ -411,7 +411,7 @@ export function UserIndex() { } export function FederationRestrictions() { - return import(/* webpackChunkName: "features/federation_restrictions" */'../../federation_restrictions'); + return import(/* webpackChunkName: "features/federation_restrictions" */'../../federation-restrictions'); } export function Aliases() { @@ -439,7 +439,7 @@ export function Directory() { } export function RegisterInvite() { - return import(/* webpackChunkName: "features/register_invite" */'../../register_invite'); + return import(/* webpackChunkName: "features/register_invite" */'../../register-invite'); } export function Share() { @@ -447,11 +447,11 @@ export function Share() { } export function NewStatus() { - return import(/* webpackChunkName: "features/new_status" */'../../new_status'); + return import(/* webpackChunkName: "features/new_status" */'../../new-status'); } export function IntentionalError() { - return import(/* webpackChunkName: "error" */'../../intentional_error'); + return import(/* webpackChunkName: "error" */'../../intentional-error'); } export function Developers() { @@ -467,7 +467,7 @@ export function SettingsStore() { } export function TestTimeline() { - return import(/* webpackChunkName: "features/test_timeline" */'../../test_timeline'); + return import(/* webpackChunkName: "features/test_timeline" */'../../test-timeline'); } export function ServiceWorkerInfo() { From 8a6ad5e6f798b3e0041e0768a695a34df1051dc8 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 14:06:20 -0500 Subject: [PATCH 10/19] Rename files (7): normalizers --- .../{admin_account.ts => admin-account.ts} | 0 .../normalizers/{admin_report.ts => admin-report.ts} | 0 ...uncement_reaction.ts => announcement-reaction.ts} | 0 app/soapbox/normalizers/announcement.ts | 2 +- .../normalizers/{chat_message.ts => chat-message.ts} | 0 app/soapbox/normalizers/index.ts | 12 ++++++------ .../soapbox/__tests__/soapbox_config-test.ts | 2 +- .../soapbox/{soapbox_config.ts => soapbox-config.ts} | 0 .../normalizers/{status_edit.ts => status-edit.ts} | 0 app/soapbox/types/soapbox.ts | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename app/soapbox/normalizers/{admin_account.ts => admin-account.ts} (100%) rename app/soapbox/normalizers/{admin_report.ts => admin-report.ts} (100%) rename app/soapbox/normalizers/{announcement_reaction.ts => announcement-reaction.ts} (100%) rename app/soapbox/normalizers/{chat_message.ts => chat-message.ts} (100%) rename app/soapbox/normalizers/soapbox/{soapbox_config.ts => soapbox-config.ts} (100%) rename app/soapbox/normalizers/{status_edit.ts => status-edit.ts} (100%) diff --git a/app/soapbox/normalizers/admin_account.ts b/app/soapbox/normalizers/admin-account.ts similarity index 100% rename from app/soapbox/normalizers/admin_account.ts rename to app/soapbox/normalizers/admin-account.ts diff --git a/app/soapbox/normalizers/admin_report.ts b/app/soapbox/normalizers/admin-report.ts similarity index 100% rename from app/soapbox/normalizers/admin_report.ts rename to app/soapbox/normalizers/admin-report.ts diff --git a/app/soapbox/normalizers/announcement_reaction.ts b/app/soapbox/normalizers/announcement-reaction.ts similarity index 100% rename from app/soapbox/normalizers/announcement_reaction.ts rename to app/soapbox/normalizers/announcement-reaction.ts diff --git a/app/soapbox/normalizers/announcement.ts b/app/soapbox/normalizers/announcement.ts index 59bc087ae..b7573091c 100644 --- a/app/soapbox/normalizers/announcement.ts +++ b/app/soapbox/normalizers/announcement.ts @@ -14,7 +14,7 @@ import emojify from 'soapbox/features/emoji/emoji'; import { normalizeEmoji } from 'soapbox/normalizers/emoji'; import { makeEmojiMap } from 'soapbox/utils/normalizers'; -import { normalizeAnnouncementReaction } from './announcement_reaction'; +import { normalizeAnnouncementReaction } from './announcement-reaction'; import { normalizeMention } from './mention'; import type { AnnouncementReaction, Emoji, Mention } from 'soapbox/types/entities'; diff --git a/app/soapbox/normalizers/chat_message.ts b/app/soapbox/normalizers/chat-message.ts similarity index 100% rename from app/soapbox/normalizers/chat_message.ts rename to app/soapbox/normalizers/chat-message.ts diff --git a/app/soapbox/normalizers/index.ts b/app/soapbox/normalizers/index.ts index 9fdc04f68..0d2d1622c 100644 --- a/app/soapbox/normalizers/index.ts +++ b/app/soapbox/normalizers/index.ts @@ -1,12 +1,12 @@ export { AccountRecord, FieldRecord, normalizeAccount } from './account'; -export { AdminAccountRecord, normalizeAdminAccount } from './admin_account'; -export { AdminReportRecord, normalizeAdminReport } from './admin_report'; +export { AdminAccountRecord, normalizeAdminAccount } from './admin-account'; +export { AdminReportRecord, normalizeAdminReport } from './admin-report'; export { AnnouncementRecord, normalizeAnnouncement } from './announcement'; -export { AnnouncementReactionRecord, normalizeAnnouncementReaction } from './announcement_reaction'; +export { AnnouncementReactionRecord, normalizeAnnouncementReaction } from './announcement-reaction'; export { AttachmentRecord, normalizeAttachment } from './attachment'; export { CardRecord, normalizeCard } from './card'; export { ChatRecord, normalizeChat } from './chat'; -export { ChatMessageRecord, normalizeChatMessage } from './chat_message'; +export { ChatMessageRecord, normalizeChatMessage } from './chat-message'; export { EmojiRecord, normalizeEmoji } from './emoji'; export { FilterRecord, normalizeFilter } from './filter'; export { HistoryRecord, normalizeHistory } from './history'; @@ -17,8 +17,8 @@ export { NotificationRecord, normalizeNotification } from './notification'; export { PollRecord, PollOptionRecord, normalizePoll } from './poll'; export { RelationshipRecord, normalizeRelationship } from './relationship'; export { StatusRecord, normalizeStatus } from './status'; -export { StatusEditRecord, normalizeStatusEdit } from './status_edit'; +export { StatusEditRecord, normalizeStatusEdit } from './status-edit'; export { TagRecord, normalizeTag } from './tag'; export { AdRecord, normalizeAd } from './soapbox/ad'; -export { SoapboxConfigRecord, normalizeSoapboxConfig } from './soapbox/soapbox_config'; +export { SoapboxConfigRecord, normalizeSoapboxConfig } from './soapbox/soapbox-config'; diff --git a/app/soapbox/normalizers/soapbox/__tests__/soapbox_config-test.ts b/app/soapbox/normalizers/soapbox/__tests__/soapbox_config-test.ts index e48198ecc..9b70eba36 100644 --- a/app/soapbox/normalizers/soapbox/__tests__/soapbox_config-test.ts +++ b/app/soapbox/normalizers/soapbox/__tests__/soapbox_config-test.ts @@ -1,6 +1,6 @@ import { Record as ImmutableRecord } from 'immutable'; -import { normalizeSoapboxConfig } from '../soapbox_config'; +import { normalizeSoapboxConfig } from '../soapbox-config'; describe('normalizeSoapboxConfig()', () => { it('adds base fields', () => { diff --git a/app/soapbox/normalizers/soapbox/soapbox_config.ts b/app/soapbox/normalizers/soapbox/soapbox-config.ts similarity index 100% rename from app/soapbox/normalizers/soapbox/soapbox_config.ts rename to app/soapbox/normalizers/soapbox/soapbox-config.ts diff --git a/app/soapbox/normalizers/status_edit.ts b/app/soapbox/normalizers/status-edit.ts similarity index 100% rename from app/soapbox/normalizers/status_edit.ts rename to app/soapbox/normalizers/status-edit.ts diff --git a/app/soapbox/types/soapbox.ts b/app/soapbox/types/soapbox.ts index 1a37d1a88..3b8b247a6 100644 --- a/app/soapbox/types/soapbox.ts +++ b/app/soapbox/types/soapbox.ts @@ -4,7 +4,7 @@ import { FooterItemRecord, CryptoAddressRecord, SoapboxConfigRecord, -} from 'soapbox/normalizers/soapbox/soapbox_config'; +} from 'soapbox/normalizers/soapbox/soapbox-config'; type Me = string | null | false | undefined; From ad2acd26f5df98882d9491ab54fb8d34b9ee8964 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 14:36:52 -0500 Subject: [PATCH 11/19] Rename files (8): pages --- app/soapbox/features/ui/index.tsx | 12 ++++++------ app/soapbox/pages/{admin_page.tsx => admin-page.tsx} | 0 .../pages/{default_page.tsx => default-page.tsx} | 0 app/soapbox/pages/{empty_page.tsx => empty-page.tsx} | 0 app/soapbox/pages/{home_page.tsx => home-page.tsx} | 0 .../pages/{profile_page.tsx => profile-page.tsx} | 0 ...te_instance_page.tsx => remote-instance-page.tsx} | 0 .../pages/{status_page.tsx => status-page.tsx} | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename app/soapbox/pages/{admin_page.tsx => admin-page.tsx} (100%) rename app/soapbox/pages/{default_page.tsx => default-page.tsx} (100%) rename app/soapbox/pages/{empty_page.tsx => empty-page.tsx} (100%) rename app/soapbox/pages/{home_page.tsx => home-page.tsx} (100%) rename app/soapbox/pages/{profile_page.tsx => profile-page.tsx} (100%) rename app/soapbox/pages/{remote_instance_page.tsx => remote-instance-page.tsx} (100%) rename app/soapbox/pages/{status_page.tsx => status-page.tsx} (100%) diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx index d168c8d56..88e543e62 100644 --- a/app/soapbox/features/ui/index.tsx +++ b/app/soapbox/features/ui/index.tsx @@ -26,14 +26,14 @@ import SidebarNavigation from 'soapbox/components/sidebar-navigation'; import ThumbNavigation from 'soapbox/components/thumb-navigation'; import { Layout } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useOwnAccount, useSoapboxConfig, useFeatures } from 'soapbox/hooks'; -import AdminPage from 'soapbox/pages/admin_page'; -import DefaultPage from 'soapbox/pages/default_page'; +import AdminPage from 'soapbox/pages/admin-page'; +import DefaultPage from 'soapbox/pages/default-page'; // import GroupsPage from 'soapbox/pages/groups_page'; // import GroupPage from 'soapbox/pages/group_page'; -import HomePage from 'soapbox/pages/home_page'; -import ProfilePage from 'soapbox/pages/profile_page'; -import RemoteInstancePage from 'soapbox/pages/remote_instance_page'; -import StatusPage from 'soapbox/pages/status_page'; +import HomePage from 'soapbox/pages/home-page'; +import ProfilePage from 'soapbox/pages/profile-page'; +import RemoteInstancePage from 'soapbox/pages/remote-instance-page'; +import StatusPage from 'soapbox/pages/status-page'; import { getAccessToken, getVapidKey } from 'soapbox/utils/auth'; import { isStandalone } from 'soapbox/utils/state'; // import GroupSidebarPanel from '../groups/sidebar_panel'; diff --git a/app/soapbox/pages/admin_page.tsx b/app/soapbox/pages/admin-page.tsx similarity index 100% rename from app/soapbox/pages/admin_page.tsx rename to app/soapbox/pages/admin-page.tsx diff --git a/app/soapbox/pages/default_page.tsx b/app/soapbox/pages/default-page.tsx similarity index 100% rename from app/soapbox/pages/default_page.tsx rename to app/soapbox/pages/default-page.tsx diff --git a/app/soapbox/pages/empty_page.tsx b/app/soapbox/pages/empty-page.tsx similarity index 100% rename from app/soapbox/pages/empty_page.tsx rename to app/soapbox/pages/empty-page.tsx diff --git a/app/soapbox/pages/home_page.tsx b/app/soapbox/pages/home-page.tsx similarity index 100% rename from app/soapbox/pages/home_page.tsx rename to app/soapbox/pages/home-page.tsx diff --git a/app/soapbox/pages/profile_page.tsx b/app/soapbox/pages/profile-page.tsx similarity index 100% rename from app/soapbox/pages/profile_page.tsx rename to app/soapbox/pages/profile-page.tsx diff --git a/app/soapbox/pages/remote_instance_page.tsx b/app/soapbox/pages/remote-instance-page.tsx similarity index 100% rename from app/soapbox/pages/remote_instance_page.tsx rename to app/soapbox/pages/remote-instance-page.tsx diff --git a/app/soapbox/pages/status_page.tsx b/app/soapbox/pages/status-page.tsx similarity index 100% rename from app/soapbox/pages/status_page.tsx rename to app/soapbox/pages/status-page.tsx From d99339ee6cd550ede8a5f36464c663a91a90bfd0 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 15:39:43 -0500 Subject: [PATCH 12/19] Rename files (9): reducers --- .../actions/__tests__/account-notes.test.ts | 2 +- .../actions/__tests__/accounts.test.ts | 2 +- app/soapbox/actions/__tests__/blocks.test.ts | 2 +- .../features/scheduled-statuses/builder.tsx | 2 +- .../ui/components/reactions_modal.tsx | 2 +- .../ui/util/pending_status_builder.ts | 2 +- ...ters.test.ts => accounts-counters.test.ts} | 2 +- ...m_emojis.test.ts => custom-emojis.test.ts} | 2 +- ...ain_lists.test.ts => domain-lists.test.ts} | 2 +- ...own_menu.test.ts => dropdown-menu.test.ts} | 2 +- ...{list_adder.test.ts => list-adder.test.ts} | 2 +- ...ons.test.ts => push-notifications.test.ts} | 2 +- ...tus_lists.test.ts => status-lists.test.ts} | 2 +- ...{user_lists.test.ts => user-lists.test.ts} | 2 +- .../{account_notes.ts => account-notes.ts} | 0 ...ounts_counters.ts => accounts-counters.ts} | 0 .../reducers/{admin_log.ts => admin-log.ts} | 0 ...message_lists.ts => chat-message-lists.ts} | 0 .../{chat_messages.ts => chat-messages.ts} | 0 .../{custom_emojis.ts => custom-emojis.ts} | 0 .../{domain_lists.ts => domain-lists.ts} | 0 .../{dropdown_menu.ts => dropdown-menu.ts} | 0 app/soapbox/reducers/index.ts | 34 +++++++++---------- .../reducers/{list_adder.ts => list-adder.ts} | 0 .../{list_editor.ts => list-editor.ts} | 0 ...ending_statuses.ts => pending-statuses.ts} | 0 ...le_hover_card.ts => profile-hover-card.ts} | 0 ...notifications.ts => push-notifications.ts} | 0 ...uled_statuses.ts => scheduled-statuses.ts} | 0 .../{status_lists.ts => status-lists.ts} | 0 ...nding_statuses.ts => trending-statuses.ts} | 0 .../reducers/{user_lists.ts => user-lists.ts} | 0 32 files changed, 31 insertions(+), 31 deletions(-) rename app/soapbox/reducers/__tests__/{accounts_counters.test.ts => accounts-counters.test.ts} (97%) rename app/soapbox/reducers/__tests__/{custom_emojis.test.ts => custom-emojis.test.ts} (84%) rename app/soapbox/reducers/__tests__/{domain_lists.test.ts => domain-lists.test.ts} (85%) rename app/soapbox/reducers/__tests__/{dropdown_menu.test.ts => dropdown-menu.test.ts} (85%) rename app/soapbox/reducers/__tests__/{list_adder.test.ts => list-adder.test.ts} (98%) rename app/soapbox/reducers/__tests__/{push_notifications.test.ts => push-notifications.test.ts} (90%) rename app/soapbox/reducers/__tests__/{status_lists.test.ts => status-lists.test.ts} (94%) rename app/soapbox/reducers/__tests__/{user_lists.test.ts => user-lists.test.ts} (95%) rename app/soapbox/reducers/{account_notes.ts => account-notes.ts} (100%) rename app/soapbox/reducers/{accounts_counters.ts => accounts-counters.ts} (100%) rename app/soapbox/reducers/{admin_log.ts => admin-log.ts} (100%) rename app/soapbox/reducers/{chat_message_lists.ts => chat-message-lists.ts} (100%) rename app/soapbox/reducers/{chat_messages.ts => chat-messages.ts} (100%) rename app/soapbox/reducers/{custom_emojis.ts => custom-emojis.ts} (100%) rename app/soapbox/reducers/{domain_lists.ts => domain-lists.ts} (100%) rename app/soapbox/reducers/{dropdown_menu.ts => dropdown-menu.ts} (100%) rename app/soapbox/reducers/{list_adder.ts => list-adder.ts} (100%) rename app/soapbox/reducers/{list_editor.ts => list-editor.ts} (100%) rename app/soapbox/reducers/{pending_statuses.ts => pending-statuses.ts} (100%) rename app/soapbox/reducers/{profile_hover_card.ts => profile-hover-card.ts} (100%) rename app/soapbox/reducers/{push_notifications.ts => push-notifications.ts} (100%) rename app/soapbox/reducers/{scheduled_statuses.ts => scheduled-statuses.ts} (100%) rename app/soapbox/reducers/{status_lists.ts => status-lists.ts} (100%) rename app/soapbox/reducers/{trending_statuses.ts => trending-statuses.ts} (100%) rename app/soapbox/reducers/{user_lists.ts => user-lists.ts} (100%) diff --git a/app/soapbox/actions/__tests__/account-notes.test.ts b/app/soapbox/actions/__tests__/account-notes.test.ts index 61e0c20b0..8b85eecc5 100644 --- a/app/soapbox/actions/__tests__/account-notes.test.ts +++ b/app/soapbox/actions/__tests__/account-notes.test.ts @@ -2,7 +2,7 @@ import { Map as ImmutableMap } from 'immutable'; import { __stub } from 'soapbox/api'; import { mockStore, rootState } from 'soapbox/jest/test-helpers'; -import { ReducerRecord, EditRecord } from 'soapbox/reducers/account_notes'; +import { ReducerRecord, EditRecord } from 'soapbox/reducers/account-notes'; import { normalizeAccount, normalizeRelationship } from '../../normalizers'; import { changeAccountNoteComment, initAccountNoteModal, submitAccountNote } from '../account-notes'; diff --git a/app/soapbox/actions/__tests__/accounts.test.ts b/app/soapbox/actions/__tests__/accounts.test.ts index 0793e36f7..d9faa0213 100644 --- a/app/soapbox/actions/__tests__/accounts.test.ts +++ b/app/soapbox/actions/__tests__/accounts.test.ts @@ -2,7 +2,7 @@ import { Map as ImmutableMap } from 'immutable'; import { __stub } from 'soapbox/api'; import { mockStore, rootState } from 'soapbox/jest/test-helpers'; -import { ListRecord, ReducerRecord } from 'soapbox/reducers/user_lists'; +import { ListRecord, ReducerRecord } from 'soapbox/reducers/user-lists'; import { normalizeAccount, normalizeInstance, normalizeRelationship } from '../../normalizers'; import { diff --git a/app/soapbox/actions/__tests__/blocks.test.ts b/app/soapbox/actions/__tests__/blocks.test.ts index 8b4c040b3..49f649ab6 100644 --- a/app/soapbox/actions/__tests__/blocks.test.ts +++ b/app/soapbox/actions/__tests__/blocks.test.ts @@ -1,6 +1,6 @@ import { __stub } from 'soapbox/api'; import { mockStore, rootState } from 'soapbox/jest/test-helpers'; -import { ListRecord, ReducerRecord as UserListsRecord } from 'soapbox/reducers/user_lists'; +import { ListRecord, ReducerRecord as UserListsRecord } from 'soapbox/reducers/user-lists'; import { expandBlocks, fetchBlocks } from '../blocks'; diff --git a/app/soapbox/features/scheduled-statuses/builder.tsx b/app/soapbox/features/scheduled-statuses/builder.tsx index 9db827412..dbd40f101 100644 --- a/app/soapbox/features/scheduled-statuses/builder.tsx +++ b/app/soapbox/features/scheduled-statuses/builder.tsx @@ -4,7 +4,7 @@ import { normalizeStatus } from 'soapbox/normalizers/status'; import { calculateStatus } from 'soapbox/reducers/statuses'; import { makeGetAccount } from 'soapbox/selectors'; -import type { ScheduledStatus } from 'soapbox/reducers/scheduled_statuses'; +import type { ScheduledStatus } from 'soapbox/reducers/scheduled-statuses'; import type { RootState } from 'soapbox/store'; export const buildStatus = (state: RootState, scheduledStatus: ScheduledStatus) => { diff --git a/app/soapbox/features/ui/components/reactions_modal.tsx b/app/soapbox/features/ui/components/reactions_modal.tsx index 5656eca18..60c8bd158 100644 --- a/app/soapbox/features/ui/components/reactions_modal.tsx +++ b/app/soapbox/features/ui/components/reactions_modal.tsx @@ -7,7 +7,7 @@ import ScrollableList from 'soapbox/components/scrollable-list'; import { Emoji, Modal, Spinner, Tabs } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; -import { ReactionRecord } from 'soapbox/reducers/user_lists'; +import { ReactionRecord } from 'soapbox/reducers/user-lists'; import type { Item } from 'soapbox/components/ui/tabs/tabs'; diff --git a/app/soapbox/features/ui/util/pending_status_builder.ts b/app/soapbox/features/ui/util/pending_status_builder.ts index 1ec288bbe..cc3a06102 100644 --- a/app/soapbox/features/ui/util/pending_status_builder.ts +++ b/app/soapbox/features/ui/util/pending_status_builder.ts @@ -4,7 +4,7 @@ import { normalizeStatus } from 'soapbox/normalizers/status'; import { calculateStatus } from 'soapbox/reducers/statuses'; import { makeGetAccount } from 'soapbox/selectors'; -import type { PendingStatus } from 'soapbox/reducers/pending_statuses'; +import type { PendingStatus } from 'soapbox/reducers/pending-statuses'; import type { RootState } from 'soapbox/store'; const getAccount = makeGetAccount(); diff --git a/app/soapbox/reducers/__tests__/accounts_counters.test.ts b/app/soapbox/reducers/__tests__/accounts-counters.test.ts similarity index 97% rename from app/soapbox/reducers/__tests__/accounts_counters.test.ts rename to app/soapbox/reducers/__tests__/accounts-counters.test.ts index 114f28b54..f1259696a 100644 --- a/app/soapbox/reducers/__tests__/accounts_counters.test.ts +++ b/app/soapbox/reducers/__tests__/accounts-counters.test.ts @@ -1,6 +1,6 @@ import { Map as ImmutableMap } from 'immutable'; -import reducer from '../accounts_counters'; +import reducer from '../accounts-counters'; // import { ACCOUNT_FOLLOW_SUCCESS, ACCOUNT_UNFOLLOW_SUCCESS } from 'soapbox/actions/accounts'; // import relationship from 'soapbox/__fixtures__/relationship.json'; // import accounts_counter_initial from 'soapbox/__fixtures__/accounts_counter_initial.json'; diff --git a/app/soapbox/reducers/__tests__/custom_emojis.test.ts b/app/soapbox/reducers/__tests__/custom-emojis.test.ts similarity index 84% rename from app/soapbox/reducers/__tests__/custom_emojis.test.ts rename to app/soapbox/reducers/__tests__/custom-emojis.test.ts index e2991d5fb..294c9c0cf 100644 --- a/app/soapbox/reducers/__tests__/custom_emojis.test.ts +++ b/app/soapbox/reducers/__tests__/custom-emojis.test.ts @@ -1,6 +1,6 @@ import { List as ImmutableList } from 'immutable'; -import reducer from '../custom_emojis'; +import reducer from '../custom-emojis'; describe('custom_emojis reducer', () => { it('should return the initial state', () => { diff --git a/app/soapbox/reducers/__tests__/domain_lists.test.ts b/app/soapbox/reducers/__tests__/domain-lists.test.ts similarity index 85% rename from app/soapbox/reducers/__tests__/domain_lists.test.ts rename to app/soapbox/reducers/__tests__/domain-lists.test.ts index 573ec9262..7ba4d32f7 100644 --- a/app/soapbox/reducers/__tests__/domain_lists.test.ts +++ b/app/soapbox/reducers/__tests__/domain-lists.test.ts @@ -1,4 +1,4 @@ -import reducer from '../domain_lists'; +import reducer from '../domain-lists'; describe('domain_lists reducer', () => { it('should return the initial state', () => { diff --git a/app/soapbox/reducers/__tests__/dropdown_menu.test.ts b/app/soapbox/reducers/__tests__/dropdown-menu.test.ts similarity index 85% rename from app/soapbox/reducers/__tests__/dropdown_menu.test.ts rename to app/soapbox/reducers/__tests__/dropdown-menu.test.ts index 676af592f..5168d5e73 100644 --- a/app/soapbox/reducers/__tests__/dropdown_menu.test.ts +++ b/app/soapbox/reducers/__tests__/dropdown-menu.test.ts @@ -1,4 +1,4 @@ -import reducer from '../dropdown_menu'; +import reducer from '../dropdown-menu'; describe('dropdown_menu reducer', () => { it('should return the initial state', () => { diff --git a/app/soapbox/reducers/__tests__/list_adder.test.ts b/app/soapbox/reducers/__tests__/list-adder.test.ts similarity index 98% rename from app/soapbox/reducers/__tests__/list_adder.test.ts rename to app/soapbox/reducers/__tests__/list-adder.test.ts index 3989cf5e7..f3ede138c 100644 --- a/app/soapbox/reducers/__tests__/list_adder.test.ts +++ b/app/soapbox/reducers/__tests__/list-adder.test.ts @@ -2,7 +2,7 @@ import { List as ImmutableList, Record as ImmutableRecord } from 'immutable'; import * as actions from 'soapbox/actions/lists'; -import reducer from '../list_adder'; +import reducer from '../list-adder'; describe('list_adder reducer', () => { it('should return the initial state', () => { diff --git a/app/soapbox/reducers/__tests__/push_notifications.test.ts b/app/soapbox/reducers/__tests__/push-notifications.test.ts similarity index 90% rename from app/soapbox/reducers/__tests__/push_notifications.test.ts rename to app/soapbox/reducers/__tests__/push-notifications.test.ts index 6afcba258..89778cf23 100644 --- a/app/soapbox/reducers/__tests__/push_notifications.test.ts +++ b/app/soapbox/reducers/__tests__/push-notifications.test.ts @@ -1,4 +1,4 @@ -import reducer from '../push_notifications'; +import reducer from '../push-notifications'; describe('push_notifications reducer', () => { it('should return the initial state', () => { diff --git a/app/soapbox/reducers/__tests__/status_lists.test.ts b/app/soapbox/reducers/__tests__/status-lists.test.ts similarity index 94% rename from app/soapbox/reducers/__tests__/status_lists.test.ts rename to app/soapbox/reducers/__tests__/status-lists.test.ts index 2333df89a..b01daee09 100644 --- a/app/soapbox/reducers/__tests__/status_lists.test.ts +++ b/app/soapbox/reducers/__tests__/status-lists.test.ts @@ -1,4 +1,4 @@ -import reducer from '../status_lists'; +import reducer from '../status-lists'; describe('status_lists reducer', () => { it('should return the initial state', () => { diff --git a/app/soapbox/reducers/__tests__/user_lists.test.ts b/app/soapbox/reducers/__tests__/user-lists.test.ts similarity index 95% rename from app/soapbox/reducers/__tests__/user_lists.test.ts rename to app/soapbox/reducers/__tests__/user-lists.test.ts index fa23f845f..396ca7239 100644 --- a/app/soapbox/reducers/__tests__/user_lists.test.ts +++ b/app/soapbox/reducers/__tests__/user-lists.test.ts @@ -1,6 +1,6 @@ import { OrderedSet as ImmutableOrderedSet } from 'immutable'; -import reducer from '../user_lists'; +import reducer from '../user-lists'; describe('user_lists reducer', () => { it('should return the initial state', () => { diff --git a/app/soapbox/reducers/account_notes.ts b/app/soapbox/reducers/account-notes.ts similarity index 100% rename from app/soapbox/reducers/account_notes.ts rename to app/soapbox/reducers/account-notes.ts diff --git a/app/soapbox/reducers/accounts_counters.ts b/app/soapbox/reducers/accounts-counters.ts similarity index 100% rename from app/soapbox/reducers/accounts_counters.ts rename to app/soapbox/reducers/accounts-counters.ts diff --git a/app/soapbox/reducers/admin_log.ts b/app/soapbox/reducers/admin-log.ts similarity index 100% rename from app/soapbox/reducers/admin_log.ts rename to app/soapbox/reducers/admin-log.ts diff --git a/app/soapbox/reducers/chat_message_lists.ts b/app/soapbox/reducers/chat-message-lists.ts similarity index 100% rename from app/soapbox/reducers/chat_message_lists.ts rename to app/soapbox/reducers/chat-message-lists.ts diff --git a/app/soapbox/reducers/chat_messages.ts b/app/soapbox/reducers/chat-messages.ts similarity index 100% rename from app/soapbox/reducers/chat_messages.ts rename to app/soapbox/reducers/chat-messages.ts diff --git a/app/soapbox/reducers/custom_emojis.ts b/app/soapbox/reducers/custom-emojis.ts similarity index 100% rename from app/soapbox/reducers/custom_emojis.ts rename to app/soapbox/reducers/custom-emojis.ts diff --git a/app/soapbox/reducers/domain_lists.ts b/app/soapbox/reducers/domain-lists.ts similarity index 100% rename from app/soapbox/reducers/domain_lists.ts rename to app/soapbox/reducers/domain-lists.ts diff --git a/app/soapbox/reducers/dropdown_menu.ts b/app/soapbox/reducers/dropdown-menu.ts similarity index 100% rename from app/soapbox/reducers/dropdown_menu.ts rename to app/soapbox/reducers/dropdown-menu.ts diff --git a/app/soapbox/reducers/index.ts b/app/soapbox/reducers/index.ts index 8c59c014f..16e7307da 100644 --- a/app/soapbox/reducers/index.ts +++ b/app/soapbox/reducers/index.ts @@ -4,31 +4,31 @@ import { combineReducers } from 'redux-immutable'; import { AUTH_LOGGED_OUT } from 'soapbox/actions/auth'; import * as BuildConfig from 'soapbox/build_config'; -import account_notes from './account_notes'; +import account_notes from './account-notes'; import accounts from './accounts'; -import accounts_counters from './accounts_counters'; +import accounts_counters from './accounts-counters'; import accounts_meta from './accounts_meta'; import admin from './admin'; -import admin_log from './admin_log'; +import admin_log from './admin-log'; import alerts from './alerts'; import aliases from './aliases'; import announcements from './announcements'; import auth from './auth'; import backups from './backups'; -import chat_message_lists from './chat_message_lists'; -import chat_messages from './chat_messages'; +import chat_message_lists from './chat-message-lists'; +import chat_messages from './chat-messages'; import chats from './chats'; import compose from './compose'; import contexts from './contexts'; import conversations from './conversations'; -import custom_emojis from './custom_emojis'; -import domain_lists from './domain_lists'; -import dropdown_menu from './dropdown_menu'; +import custom_emojis from './custom-emojis'; +import domain_lists from './domain-lists'; +import dropdown_menu from './dropdown-menu'; import filters from './filters'; import history from './history'; import instance from './instance'; -import listAdder from './list_adder'; -import listEditor from './list_editor'; +import listAdder from './list-adder'; +import listEditor from './list-editor'; import lists from './lists'; import me from './me'; import meta from './meta'; @@ -37,27 +37,27 @@ import mutes from './mutes'; import notifications from './notifications'; import onboarding from './onboarding'; import patron from './patron'; -import pending_statuses from './pending_statuses'; +import pending_statuses from './pending-statuses'; import polls from './polls'; -import profile_hover_card from './profile_hover_card'; -import push_notifications from './push_notifications'; +import profile_hover_card from './profile-hover-card'; +import push_notifications from './push-notifications'; import relationships from './relationships'; import reports from './reports'; import rules from './rules'; -import scheduled_statuses from './scheduled_statuses'; +import scheduled_statuses from './scheduled-statuses'; import search from './search'; import security from './security'; import settings from './settings'; import sidebar from './sidebar'; import soapbox from './soapbox'; import status_hover_card from './status-hover-card'; -import status_lists from './status_lists'; +import status_lists from './status-lists'; import statuses from './statuses'; import suggestions from './suggestions'; import timelines from './timelines'; -import trending_statuses from './trending_statuses'; +import trending_statuses from './trending-statuses'; import trends from './trends'; -import user_lists from './user_lists'; +import user_lists from './user-lists'; import verification from './verification'; const reducers = { diff --git a/app/soapbox/reducers/list_adder.ts b/app/soapbox/reducers/list-adder.ts similarity index 100% rename from app/soapbox/reducers/list_adder.ts rename to app/soapbox/reducers/list-adder.ts diff --git a/app/soapbox/reducers/list_editor.ts b/app/soapbox/reducers/list-editor.ts similarity index 100% rename from app/soapbox/reducers/list_editor.ts rename to app/soapbox/reducers/list-editor.ts diff --git a/app/soapbox/reducers/pending_statuses.ts b/app/soapbox/reducers/pending-statuses.ts similarity index 100% rename from app/soapbox/reducers/pending_statuses.ts rename to app/soapbox/reducers/pending-statuses.ts diff --git a/app/soapbox/reducers/profile_hover_card.ts b/app/soapbox/reducers/profile-hover-card.ts similarity index 100% rename from app/soapbox/reducers/profile_hover_card.ts rename to app/soapbox/reducers/profile-hover-card.ts diff --git a/app/soapbox/reducers/push_notifications.ts b/app/soapbox/reducers/push-notifications.ts similarity index 100% rename from app/soapbox/reducers/push_notifications.ts rename to app/soapbox/reducers/push-notifications.ts diff --git a/app/soapbox/reducers/scheduled_statuses.ts b/app/soapbox/reducers/scheduled-statuses.ts similarity index 100% rename from app/soapbox/reducers/scheduled_statuses.ts rename to app/soapbox/reducers/scheduled-statuses.ts diff --git a/app/soapbox/reducers/status_lists.ts b/app/soapbox/reducers/status-lists.ts similarity index 100% rename from app/soapbox/reducers/status_lists.ts rename to app/soapbox/reducers/status-lists.ts diff --git a/app/soapbox/reducers/trending_statuses.ts b/app/soapbox/reducers/trending-statuses.ts similarity index 100% rename from app/soapbox/reducers/trending_statuses.ts rename to app/soapbox/reducers/trending-statuses.ts diff --git a/app/soapbox/reducers/user_lists.ts b/app/soapbox/reducers/user-lists.ts similarity index 100% rename from app/soapbox/reducers/user_lists.ts rename to app/soapbox/reducers/user-lists.ts From fe34af29d3d26c049b670348533ececec3f1d045 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 15:42:22 -0500 Subject: [PATCH 13/19] Rename files (10): service-worker + storage --- app/soapbox/actions/auth.ts | 2 +- app/soapbox/actions/instance.ts | 2 +- app/soapbox/actions/me.ts | 2 +- app/soapbox/actions/soapbox.ts | 2 +- app/soapbox/components/error-boundary.tsx | 2 +- app/soapbox/reducers/auth.js | 2 +- app/soapbox/reducers/instance.ts | 2 +- app/soapbox/reducers/soapbox.js | 2 +- app/soapbox/service-worker/entry.ts | 1 + .../web_push_locales.js => service-worker/web-push-locales.js} | 0 .../web-push-notifications.ts} | 2 +- app/soapbox/service_worker/entry.ts | 1 - app/soapbox/storage/{kv_store.ts => kv-store.ts} | 0 13 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 app/soapbox/service-worker/entry.ts rename app/soapbox/{service_worker/web_push_locales.js => service-worker/web-push-locales.js} (100%) rename app/soapbox/{service_worker/web_push_notifications.ts => service-worker/web-push-notifications.ts} (99%) delete mode 100644 app/soapbox/service_worker/entry.ts rename app/soapbox/storage/{kv_store.ts => kv-store.ts} (100%) diff --git a/app/soapbox/actions/auth.ts b/app/soapbox/actions/auth.ts index 5a686d045..25b3f2196 100644 --- a/app/soapbox/actions/auth.ts +++ b/app/soapbox/actions/auth.ts @@ -16,7 +16,7 @@ import { obtainOAuthToken, revokeOAuthToken } from 'soapbox/actions/oauth'; import { startOnboarding } from 'soapbox/actions/onboarding'; import snackbar from 'soapbox/actions/snackbar'; import { custom } from 'soapbox/custom'; -import KVStore from 'soapbox/storage/kv_store'; +import KVStore from 'soapbox/storage/kv-store'; import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth'; import sourceCode from 'soapbox/utils/code'; import { getFeatures } from 'soapbox/utils/features'; diff --git a/app/soapbox/actions/instance.ts b/app/soapbox/actions/instance.ts index 151ad3672..ca1fc3ef5 100644 --- a/app/soapbox/actions/instance.ts +++ b/app/soapbox/actions/instance.ts @@ -1,7 +1,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import get from 'lodash/get'; -import KVStore from 'soapbox/storage/kv_store'; +import KVStore from 'soapbox/storage/kv-store'; import { RootState } from 'soapbox/store'; import { getAuthUserUrl } from 'soapbox/utils/auth'; import { parseVersion } from 'soapbox/utils/features'; diff --git a/app/soapbox/actions/me.ts b/app/soapbox/actions/me.ts index e76399d21..17beae21d 100644 --- a/app/soapbox/actions/me.ts +++ b/app/soapbox/actions/me.ts @@ -1,4 +1,4 @@ -import KVStore from 'soapbox/storage/kv_store'; +import KVStore from 'soapbox/storage/kv-store'; import { getAuthUserId, getAuthUserUrl } from 'soapbox/utils/auth'; import api from '../api'; diff --git a/app/soapbox/actions/soapbox.ts b/app/soapbox/actions/soapbox.ts index 89d3080d8..725ff1ae3 100644 --- a/app/soapbox/actions/soapbox.ts +++ b/app/soapbox/actions/soapbox.ts @@ -2,7 +2,7 @@ import { createSelector } from 'reselect'; import { getHost } from 'soapbox/actions/instance'; import { normalizeSoapboxConfig } from 'soapbox/normalizers'; -import KVStore from 'soapbox/storage/kv_store'; +import KVStore from 'soapbox/storage/kv-store'; import { removeVS16s } from 'soapbox/utils/emoji'; import { getFeatures } from 'soapbox/utils/features'; diff --git a/app/soapbox/components/error-boundary.tsx b/app/soapbox/components/error-boundary.tsx index 76adf9728..b4b6d8235 100644 --- a/app/soapbox/components/error-boundary.tsx +++ b/app/soapbox/components/error-boundary.tsx @@ -6,7 +6,7 @@ import { getSoapboxConfig } from 'soapbox/actions/soapbox'; import * as BuildConfig from 'soapbox/build_config'; import { Text, Stack } from 'soapbox/components/ui'; import { captureException } from 'soapbox/monitoring'; -import KVStore from 'soapbox/storage/kv_store'; +import KVStore from 'soapbox/storage/kv-store'; import sourceCode from 'soapbox/utils/code'; import { unregisterSw } from 'soapbox/utils/sw'; diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js index 2f0c773cd..55b9fd3ae 100644 --- a/app/soapbox/reducers/auth.js +++ b/app/soapbox/reducers/auth.js @@ -3,7 +3,7 @@ import trim from 'lodash/trim'; import { MASTODON_PRELOAD_IMPORT } from 'soapbox/actions/preload'; import { FE_SUBDIRECTORY } from 'soapbox/build_config'; -import KVStore from 'soapbox/storage/kv_store'; +import KVStore from 'soapbox/storage/kv-store'; import { validId, isURL } from 'soapbox/utils/auth'; import { diff --git a/app/soapbox/reducers/instance.ts b/app/soapbox/reducers/instance.ts index 4c1456dc4..bf3c47463 100644 --- a/app/soapbox/reducers/instance.ts +++ b/app/soapbox/reducers/instance.ts @@ -3,7 +3,7 @@ import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable'; import { ADMIN_CONFIG_UPDATE_REQUEST, ADMIN_CONFIG_UPDATE_SUCCESS } from 'soapbox/actions/admin'; import { PLEROMA_PRELOAD_IMPORT } from 'soapbox/actions/preload'; import { normalizeInstance } from 'soapbox/normalizers/instance'; -import KVStore from 'soapbox/storage/kv_store'; +import KVStore from 'soapbox/storage/kv-store'; import { ConfigDB } from 'soapbox/utils/config_db'; import { diff --git a/app/soapbox/reducers/soapbox.js b/app/soapbox/reducers/soapbox.js index 0affe2e36..0cd8ed9b4 100644 --- a/app/soapbox/reducers/soapbox.js +++ b/app/soapbox/reducers/soapbox.js @@ -1,7 +1,7 @@ import { Map as ImmutableMap, fromJS } from 'immutable'; import { PLEROMA_PRELOAD_IMPORT } from 'soapbox/actions/preload'; -import KVStore from 'soapbox/storage/kv_store'; +import KVStore from 'soapbox/storage/kv-store'; import { ConfigDB } from 'soapbox/utils/config_db'; import { ADMIN_CONFIG_UPDATE_SUCCESS } from '../actions/admin'; diff --git a/app/soapbox/service-worker/entry.ts b/app/soapbox/service-worker/entry.ts new file mode 100644 index 000000000..3dbfee2ce --- /dev/null +++ b/app/soapbox/service-worker/entry.ts @@ -0,0 +1 @@ +import './web-push-notifications'; diff --git a/app/soapbox/service_worker/web_push_locales.js b/app/soapbox/service-worker/web-push-locales.js similarity index 100% rename from app/soapbox/service_worker/web_push_locales.js rename to app/soapbox/service-worker/web-push-locales.js diff --git a/app/soapbox/service_worker/web_push_notifications.ts b/app/soapbox/service-worker/web-push-notifications.ts similarity index 99% rename from app/soapbox/service_worker/web_push_notifications.ts rename to app/soapbox/service-worker/web-push-notifications.ts index 787e60941..c1da2b67d 100644 --- a/app/soapbox/service_worker/web_push_notifications.ts +++ b/app/soapbox/service-worker/web-push-notifications.ts @@ -2,7 +2,7 @@ import IntlMessageFormat from 'intl-messageformat'; import 'intl-pluralrules'; import unescape from 'lodash/unescape'; -import locales from './web_push_locales'; +import locales from './web-push-locales'; import type { Account as AccountEntity, diff --git a/app/soapbox/service_worker/entry.ts b/app/soapbox/service_worker/entry.ts deleted file mode 100644 index 364b67066..000000000 --- a/app/soapbox/service_worker/entry.ts +++ /dev/null @@ -1 +0,0 @@ -import './web_push_notifications'; diff --git a/app/soapbox/storage/kv_store.ts b/app/soapbox/storage/kv-store.ts similarity index 100% rename from app/soapbox/storage/kv_store.ts rename to app/soapbox/storage/kv-store.ts From 637d78db010c18b09a76cadc2f5050583f4ab8bd Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 15:46:23 -0500 Subject: [PATCH 14/19] Rename files (11): utils --- app/soapbox/actions/compose.ts | 2 +- app/soapbox/actions/mrf.ts | 4 ++-- app/soapbox/components/account.tsx | 2 +- app/soapbox/components/display-name.tsx | 2 +- app/soapbox/components/emoji-button-wrapper.tsx | 2 +- app/soapbox/components/helmet.tsx | 2 +- .../{hover_ref_wrapper.tsx => hover-ref-wrapper.tsx} | 0 .../{icon_with_counter.tsx => icon-with-counter.tsx} | 0 app/soapbox/components/media-gallery.tsx | 2 +- app/soapbox/components/profile-hover-card.tsx | 2 +- .../components/{progress_circle.tsx => progress-circle.tsx} | 0 app/soapbox/components/{radio_button.tsx => radio-button.tsx} | 0 app/soapbox/components/status-action-bar.tsx | 2 +- app/soapbox/components/status-content.tsx | 2 +- app/soapbox/components/status-reply-mentions.tsx | 2 +- app/soapbox/components/thumb-navigation-link.tsx | 2 +- app/soapbox/features/admin/components/report.tsx | 2 +- app/soapbox/features/chats/components/chat-message-list.tsx | 2 +- app/soapbox/features/chats/components/chat-window.tsx | 2 +- .../features/compose/components/visual-character-counter.tsx | 2 +- app/soapbox/features/directory/index.tsx | 2 +- app/soapbox/features/edit-profile/index.tsx | 2 +- .../features/onboarding/steps/avatar-selection-step.tsx | 2 +- .../features/onboarding/steps/cover-photo-selection-step.tsx | 2 +- .../features/status/components/status-interaction-bar.tsx | 2 +- .../features/ui/components/profile_familiar_followers.tsx | 2 +- app/soapbox/features/video/index.tsx | 2 +- app/soapbox/reducers/admin.ts | 2 +- app/soapbox/reducers/instance.ts | 2 +- app/soapbox/reducers/soapbox.js | 2 +- app/soapbox/reducers/statuses.ts | 2 +- app/soapbox/selectors/index.ts | 2 +- .../utils/__tests__/{config_db.test.ts => config-db.test.ts} | 2 +- .../__tests__/{emoji_reacts.test.ts => emoji-reacts.test.ts} | 2 +- app/soapbox/utils/{config_db.ts => config-db.ts} | 0 app/soapbox/utils/{emoji_reacts.ts => emoji-reacts.ts} | 0 app/soapbox/utils/{favicon_service.ts => favicon-service.ts} | 0 app/soapbox/utils/greentext.ts | 2 +- .../utils/{media_aspect_ratio.ts => media-aspect-ratio.ts} | 0 app/soapbox/utils/{resize_image.ts => resize-image.ts} | 0 app/soapbox/utils/{rich_content.ts => rich-content.ts} | 0 .../utils/{soapbox_prop_types.ts => soapbox-prop-types.ts} | 0 ...iny_post_html_processor.ts => tiny-post-html-processor.ts} | 0 43 files changed, 32 insertions(+), 32 deletions(-) rename app/soapbox/components/{hover_ref_wrapper.tsx => hover-ref-wrapper.tsx} (100%) rename app/soapbox/components/{icon_with_counter.tsx => icon-with-counter.tsx} (100%) rename app/soapbox/components/{progress_circle.tsx => progress-circle.tsx} (100%) rename app/soapbox/components/{radio_button.tsx => radio-button.tsx} (100%) rename app/soapbox/utils/__tests__/{config_db.test.ts => config-db.test.ts} (90%) rename app/soapbox/utils/__tests__/{emoji_reacts.test.ts => emoji-reacts.test.ts} (99%) rename app/soapbox/utils/{config_db.ts => config-db.ts} (100%) rename app/soapbox/utils/{emoji_reacts.ts => emoji-reacts.ts} (100%) rename app/soapbox/utils/{favicon_service.ts => favicon-service.ts} (100%) rename app/soapbox/utils/{media_aspect_ratio.ts => media-aspect-ratio.ts} (100%) rename app/soapbox/utils/{resize_image.ts => resize-image.ts} (100%) rename app/soapbox/utils/{rich_content.ts => rich-content.ts} (100%) rename app/soapbox/utils/{soapbox_prop_types.ts => soapbox-prop-types.ts} (100%) rename app/soapbox/utils/{tiny_post_html_processor.ts => tiny-post-html-processor.ts} (100%) diff --git a/app/soapbox/actions/compose.ts b/app/soapbox/actions/compose.ts index 65d437a36..3010ae3fd 100644 --- a/app/soapbox/actions/compose.ts +++ b/app/soapbox/actions/compose.ts @@ -10,7 +10,7 @@ import { tagHistory } from 'soapbox/settings'; import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures, parseVersion } from 'soapbox/utils/features'; import { formatBytes, getVideoDuration } from 'soapbox/utils/media'; -import resizeImage from 'soapbox/utils/resize_image'; +import resizeImage from 'soapbox/utils/resize-image'; import { showAlert, showAlertForError } from './alerts'; import { useEmoji } from './emojis'; diff --git a/app/soapbox/actions/mrf.ts b/app/soapbox/actions/mrf.ts index e2cef5938..1b9cbad93 100644 --- a/app/soapbox/actions/mrf.ts +++ b/app/soapbox/actions/mrf.ts @@ -1,11 +1,11 @@ import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable'; -import ConfigDB from 'soapbox/utils/config_db'; +import ConfigDB from 'soapbox/utils/config-db'; import { fetchConfig, updateConfig } from './admin'; import type { AppDispatch, RootState } from 'soapbox/store'; -import type { Policy } from 'soapbox/utils/config_db'; +import type { Policy } from 'soapbox/utils/config-db'; const simplePolicyMerge = (simplePolicy: Policy, host: string, restrictions: ImmutableMap) => { return simplePolicy.map((hosts, key) => { diff --git a/app/soapbox/components/account.tsx b/app/soapbox/components/account.tsx index 3137b25a3..006584e8d 100644 --- a/app/soapbox/components/account.tsx +++ b/app/soapbox/components/account.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Link, useHistory } from 'react-router-dom'; -import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; +import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; import VerificationBadge from 'soapbox/components/verification-badge'; import ActionButton from 'soapbox/features/ui/components/action-button'; import { useAppSelector, useOnScreen } from 'soapbox/hooks'; diff --git a/app/soapbox/components/display-name.tsx b/app/soapbox/components/display-name.tsx index ccc6f6ed4..8fd2bfa53 100644 --- a/app/soapbox/components/display-name.tsx +++ b/app/soapbox/components/display-name.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; +import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; import { useSoapboxConfig } from 'soapbox/hooks'; import { getAcct } from '../utils/accounts'; diff --git a/app/soapbox/components/emoji-button-wrapper.tsx b/app/soapbox/components/emoji-button-wrapper.tsx index d85d22627..9a71c9e1a 100644 --- a/app/soapbox/components/emoji-button-wrapper.tsx +++ b/app/soapbox/components/emoji-button-wrapper.tsx @@ -8,7 +8,7 @@ import { openModal } from 'soapbox/actions/modals'; import EmojiSelector from 'soapbox/components/ui/emoji-selector/emoji-selector'; import { useAppSelector, useOwnAccount, useSoapboxConfig } from 'soapbox/hooks'; import { isUserTouching } from 'soapbox/is_mobile'; -import { getReactForStatus } from 'soapbox/utils/emoji_reacts'; +import { getReactForStatus } from 'soapbox/utils/emoji-reacts'; interface IEmojiButtonWrapper { statusId: string, diff --git a/app/soapbox/components/helmet.tsx b/app/soapbox/components/helmet.tsx index cd13dd30a..ba4a82fd3 100644 --- a/app/soapbox/components/helmet.tsx +++ b/app/soapbox/components/helmet.tsx @@ -3,7 +3,7 @@ import { Helmet as ReactHelmet } from 'react-helmet'; import { useAppSelector, useSettings } from 'soapbox/hooks'; import { RootState } from 'soapbox/store'; -import FaviconService from 'soapbox/utils/favicon_service'; +import FaviconService from 'soapbox/utils/favicon-service'; FaviconService.initFaviconService(); diff --git a/app/soapbox/components/hover_ref_wrapper.tsx b/app/soapbox/components/hover-ref-wrapper.tsx similarity index 100% rename from app/soapbox/components/hover_ref_wrapper.tsx rename to app/soapbox/components/hover-ref-wrapper.tsx diff --git a/app/soapbox/components/icon_with_counter.tsx b/app/soapbox/components/icon-with-counter.tsx similarity index 100% rename from app/soapbox/components/icon_with_counter.tsx rename to app/soapbox/components/icon-with-counter.tsx diff --git a/app/soapbox/components/media-gallery.tsx b/app/soapbox/components/media-gallery.tsx index e978e448e..4215356d5 100644 --- a/app/soapbox/components/media-gallery.tsx +++ b/app/soapbox/components/media-gallery.tsx @@ -10,7 +10,7 @@ import { Attachment } from 'soapbox/types/entities'; import { truncateFilename } from 'soapbox/utils/media'; import { isIOS } from '../is_mobile'; -import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media_aspect_ratio'; +import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media-aspect-ratio'; import type { Property } from 'csstype'; import type { List as ImmutableList } from 'immutable'; diff --git a/app/soapbox/components/profile-hover-card.tsx b/app/soapbox/components/profile-hover-card.tsx index 5baabeb86..1fce4feb3 100644 --- a/app/soapbox/components/profile-hover-card.tsx +++ b/app/soapbox/components/profile-hover-card.tsx @@ -17,7 +17,7 @@ import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; import { isLocal } from 'soapbox/utils/accounts'; -import { showProfileHoverCard } from './hover_ref_wrapper'; +import { showProfileHoverCard } from './hover-ref-wrapper'; import { Card, CardBody, HStack, Icon, Stack, Text } from './ui'; import type { AppDispatch } from 'soapbox/store'; diff --git a/app/soapbox/components/progress_circle.tsx b/app/soapbox/components/progress-circle.tsx similarity index 100% rename from app/soapbox/components/progress_circle.tsx rename to app/soapbox/components/progress-circle.tsx diff --git a/app/soapbox/components/radio_button.tsx b/app/soapbox/components/radio-button.tsx similarity index 100% rename from app/soapbox/components/radio_button.tsx rename to app/soapbox/components/radio-button.tsx diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx index b4f5c187b..011fc63a8 100644 --- a/app/soapbox/components/status-action-bar.tsx +++ b/app/soapbox/components/status-action-bar.tsx @@ -19,7 +19,7 @@ import StatusActionButton from 'soapbox/components/status-action-button'; import DropdownMenuContainer from 'soapbox/containers/dropdown-menu-container'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks'; import { isLocal } from 'soapbox/utils/accounts'; -import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji_reacts'; +import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji-reacts'; import type { Menu } from 'soapbox/components/dropdown-menu'; import type { Account, Status } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/status-content.tsx b/app/soapbox/components/status-content.tsx index b3592c62d..a495a9f82 100644 --- a/app/soapbox/components/status-content.tsx +++ b/app/soapbox/components/status-content.tsx @@ -6,7 +6,7 @@ import { useHistory } from 'react-router-dom'; import Icon from 'soapbox/components/icon'; import { useSoapboxConfig } from 'soapbox/hooks'; import { addGreentext } from 'soapbox/utils/greentext'; -import { onlyEmoji as isOnlyEmoji } from 'soapbox/utils/rich_content'; +import { onlyEmoji as isOnlyEmoji } from 'soapbox/utils/rich-content'; import { isRtl } from '../rtl'; diff --git a/app/soapbox/components/status-reply-mentions.tsx b/app/soapbox/components/status-reply-mentions.tsx index 4d65abd11..887c41a8e 100644 --- a/app/soapbox/components/status-reply-mentions.tsx +++ b/app/soapbox/components/status-reply-mentions.tsx @@ -3,8 +3,8 @@ import { FormattedList, FormattedMessage } from 'react-intl'; import { Link } from 'react-router-dom'; import { openModal } from 'soapbox/actions/modals'; +import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; import HoverStatusWrapper from 'soapbox/components/hover-status-wrapper'; -import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; import { useAppDispatch } from 'soapbox/hooks'; import type { Account, Status } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/thumb-navigation-link.tsx b/app/soapbox/components/thumb-navigation-link.tsx index 58a55e7e6..069849507 100644 --- a/app/soapbox/components/thumb-navigation-link.tsx +++ b/app/soapbox/components/thumb-navigation-link.tsx @@ -2,7 +2,7 @@ import classNames from 'clsx'; import React from 'react'; import { NavLink, useLocation } from 'react-router-dom'; -import IconWithCounter from 'soapbox/components/icon_with_counter'; +import IconWithCounter from 'soapbox/components/icon-with-counter'; import { Icon, Text } from 'soapbox/components/ui'; interface IThumbNavigationLink { diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx index fe28ab21c..3304a17a9 100644 --- a/app/soapbox/features/admin/components/report.tsx +++ b/app/soapbox/features/admin/components/report.tsx @@ -6,7 +6,7 @@ import { closeReports } from 'soapbox/actions/admin'; import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation'; import snackbar from 'soapbox/actions/snackbar'; import Avatar from 'soapbox/components/avatar'; -import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; +import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; import { Button, HStack } from 'soapbox/components/ui'; import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; import Accordion from 'soapbox/features/ui/components/accordion'; diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx index 330fd9f9a..90c27e4a6 100644 --- a/app/soapbox/features/chats/components/chat-message-list.tsx +++ b/app/soapbox/features/chats/components/chat-message-list.tsx @@ -19,7 +19,7 @@ import emojify from 'soapbox/features/emoji/emoji'; import Bundle from 'soapbox/features/ui/components/bundle'; import { MediaGallery } from 'soapbox/features/ui/util/async-components'; import { useAppSelector, useAppDispatch, useRefEventHandler } from 'soapbox/hooks'; -import { onlyEmoji } from 'soapbox/utils/rich_content'; +import { onlyEmoji } from 'soapbox/utils/rich-content'; import type { Menu } from 'soapbox/components/dropdown-menu'; import type { ChatMessage as ChatMessageEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/chats/components/chat-window.tsx b/app/soapbox/features/chats/components/chat-window.tsx index 13ba3ed39..3bcb83165 100644 --- a/app/soapbox/features/chats/components/chat-window.tsx +++ b/app/soapbox/features/chats/components/chat-window.tsx @@ -6,7 +6,7 @@ import { toggleChat, } from 'soapbox/actions/chats'; import Avatar from 'soapbox/components/avatar'; -import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; +import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; import IconButton from 'soapbox/components/icon-button'; import { HStack, Counter } from 'soapbox/components/ui'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/compose/components/visual-character-counter.tsx b/app/soapbox/features/compose/components/visual-character-counter.tsx index bba7053e8..8bf37af29 100644 --- a/app/soapbox/features/compose/components/visual-character-counter.tsx +++ b/app/soapbox/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 'soapbox/components/progress_circle'; +import ProgressCircle from 'soapbox/components/progress-circle'; const messages = defineMessages({ title: { id: 'compose.character_counter.title', defaultMessage: 'Used {chars} out of {maxChars} characters' }, diff --git a/app/soapbox/features/directory/index.tsx b/app/soapbox/features/directory/index.tsx index 68eafb4ba..ff06e6659 100644 --- a/app/soapbox/features/directory/index.tsx +++ b/app/soapbox/features/directory/index.tsx @@ -6,7 +6,7 @@ import { useLocation } from 'react-router-dom'; import { fetchDirectory, expandDirectory } from 'soapbox/actions/directory'; import LoadMore from 'soapbox/components/load-more'; -import RadioButton from 'soapbox/components/radio_button'; +import RadioButton from 'soapbox/components/radio-button'; import Column from 'soapbox/features/ui/components/column'; import { useAppSelector } from 'soapbox/hooks'; import { getFeatures } from 'soapbox/utils/features'; diff --git a/app/soapbox/features/edit-profile/index.tsx b/app/soapbox/features/edit-profile/index.tsx index de7d6ee2d..1967e9138 100644 --- a/app/soapbox/features/edit-profile/index.tsx +++ b/app/soapbox/features/edit-profile/index.tsx @@ -21,7 +21,7 @@ import { import Streamfield, { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield'; import { useAppSelector, useAppDispatch, useOwnAccount, useFeatures } from 'soapbox/hooks'; import { normalizeAccount } from 'soapbox/normalizers'; -import resizeImage from 'soapbox/utils/resize_image'; +import resizeImage from 'soapbox/utils/resize-image'; import ProfilePreview from './components/profile-preview'; diff --git a/app/soapbox/features/onboarding/steps/avatar-selection-step.tsx b/app/soapbox/features/onboarding/steps/avatar-selection-step.tsx index 8f95b496f..753ef4d7f 100644 --- a/app/soapbox/features/onboarding/steps/avatar-selection-step.tsx +++ b/app/soapbox/features/onboarding/steps/avatar-selection-step.tsx @@ -7,7 +7,7 @@ import { patchMe } from 'soapbox/actions/me'; import snackbar from 'soapbox/actions/snackbar'; import { Avatar, Button, Card, CardBody, Icon, Spinner, Stack, Text } from 'soapbox/components/ui'; import { useOwnAccount } from 'soapbox/hooks'; -import resizeImage from 'soapbox/utils/resize_image'; +import resizeImage from 'soapbox/utils/resize-image'; import type { AxiosError } from 'axios'; diff --git a/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx b/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx index 4d1ae3f12..520fbc1b9 100644 --- a/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx +++ b/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx @@ -8,7 +8,7 @@ import snackbar from 'soapbox/actions/snackbar'; import StillImage from 'soapbox/components/still-image'; import { Avatar, Button, Card, CardBody, Icon, Spinner, Stack, Text } from 'soapbox/components/ui'; import { useOwnAccount } from 'soapbox/hooks'; -import resizeImage from 'soapbox/utils/resize_image'; +import resizeImage from 'soapbox/utils/resize-image'; import type { AxiosError } from 'axios'; diff --git a/app/soapbox/features/status/components/status-interaction-bar.tsx b/app/soapbox/features/status/components/status-interaction-bar.tsx index 79d4f82bd..a0abcf98e 100644 --- a/app/soapbox/features/status/components/status-interaction-bar.tsx +++ b/app/soapbox/features/status/components/status-interaction-bar.tsx @@ -7,7 +7,7 @@ import { useDispatch } from 'react-redux'; import { openModal } from 'soapbox/actions/modals'; import { HStack, IconButton, Text, Emoji } from 'soapbox/components/ui'; import { useAppSelector, useSoapboxConfig, useFeatures } from 'soapbox/hooks'; -import { reduceEmoji } from 'soapbox/utils/emoji_reacts'; +import { reduceEmoji } from 'soapbox/utils/emoji-reacts'; import type { Status } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/ui/components/profile_familiar_followers.tsx b/app/soapbox/features/ui/components/profile_familiar_followers.tsx index dcb3b3d87..2d395a2a6 100644 --- a/app/soapbox/features/ui/components/profile_familiar_followers.tsx +++ b/app/soapbox/features/ui/components/profile_familiar_followers.tsx @@ -6,7 +6,7 @@ import { Link } from 'react-router-dom'; import { fetchAccountFamiliarFollowers } from 'soapbox/actions/familiar_followers'; import { openModal } from 'soapbox/actions/modals'; -import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; +import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; import { Text } from 'soapbox/components/ui'; import VerificationBadge from 'soapbox/components/verification-badge'; import { useAppSelector, useFeatures } from 'soapbox/hooks'; diff --git a/app/soapbox/features/video/index.tsx b/app/soapbox/features/video/index.tsx index 871e80774..f418714bd 100644 --- a/app/soapbox/features/video/index.tsx +++ b/app/soapbox/features/video/index.tsx @@ -7,7 +7,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import Blurhash from 'soapbox/components/blurhash'; import Icon from 'soapbox/components/icon'; import { useSettings } from 'soapbox/hooks'; -import { isPanoramic, isPortrait, minimumAspectRatio, maximumAspectRatio } from 'soapbox/utils/media_aspect_ratio'; +import { isPanoramic, isPortrait, minimumAspectRatio, maximumAspectRatio } from 'soapbox/utils/media-aspect-ratio'; import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen'; diff --git a/app/soapbox/reducers/admin.ts b/app/soapbox/reducers/admin.ts index b51368f46..19a803f16 100644 --- a/app/soapbox/reducers/admin.ts +++ b/app/soapbox/reducers/admin.ts @@ -25,7 +25,7 @@ import { normalizeId } from 'soapbox/utils/normalizers'; import type { AnyAction } from 'redux'; import type { APIEntity } from 'soapbox/types/entities'; -import type { Config } from 'soapbox/utils/config_db'; +import type { Config } from 'soapbox/utils/config-db'; const ReducerRecord = ImmutableRecord({ reports: ImmutableMap(), diff --git a/app/soapbox/reducers/instance.ts b/app/soapbox/reducers/instance.ts index bf3c47463..1c15891e9 100644 --- a/app/soapbox/reducers/instance.ts +++ b/app/soapbox/reducers/instance.ts @@ -4,7 +4,7 @@ import { ADMIN_CONFIG_UPDATE_REQUEST, ADMIN_CONFIG_UPDATE_SUCCESS } from 'soapbo import { PLEROMA_PRELOAD_IMPORT } from 'soapbox/actions/preload'; import { normalizeInstance } from 'soapbox/normalizers/instance'; import KVStore from 'soapbox/storage/kv-store'; -import { ConfigDB } from 'soapbox/utils/config_db'; +import { ConfigDB } from 'soapbox/utils/config-db'; import { rememberInstance, diff --git a/app/soapbox/reducers/soapbox.js b/app/soapbox/reducers/soapbox.js index 0cd8ed9b4..b959a5596 100644 --- a/app/soapbox/reducers/soapbox.js +++ b/app/soapbox/reducers/soapbox.js @@ -2,7 +2,7 @@ import { Map as ImmutableMap, fromJS } from 'immutable'; import { PLEROMA_PRELOAD_IMPORT } from 'soapbox/actions/preload'; import KVStore from 'soapbox/storage/kv-store'; -import { ConfigDB } from 'soapbox/utils/config_db'; +import { ConfigDB } from 'soapbox/utils/config-db'; import { ADMIN_CONFIG_UPDATE_SUCCESS } from '../actions/admin'; import { diff --git a/app/soapbox/reducers/statuses.ts b/app/soapbox/reducers/statuses.ts index 088191edd..e63cd48c3 100644 --- a/app/soapbox/reducers/statuses.ts +++ b/app/soapbox/reducers/statuses.ts @@ -3,7 +3,7 @@ import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable'; import emojify from 'soapbox/features/emoji/emoji'; import { normalizeStatus } from 'soapbox/normalizers'; -import { simulateEmojiReact, simulateUnEmojiReact } from 'soapbox/utils/emoji_reacts'; +import { simulateEmojiReact, simulateUnEmojiReact } from 'soapbox/utils/emoji-reacts'; import { stripCompatibilityFeatures, unescapeHTML } from 'soapbox/utils/html'; import { makeEmojiMap, normalizeId } from 'soapbox/utils/normalizers'; diff --git a/app/soapbox/selectors/index.ts b/app/soapbox/selectors/index.ts index 84165fc98..047faefa6 100644 --- a/app/soapbox/selectors/index.ts +++ b/app/soapbox/selectors/index.ts @@ -9,7 +9,7 @@ import { createSelector } from 'reselect'; import { getSettings } from 'soapbox/actions/settings'; import { getDomain } from 'soapbox/utils/accounts'; import { validId } from 'soapbox/utils/auth'; -import ConfigDB from 'soapbox/utils/config_db'; +import ConfigDB from 'soapbox/utils/config-db'; import { shouldFilter } from 'soapbox/utils/timelines'; import type { ReducerChat } from 'soapbox/reducers/chats'; diff --git a/app/soapbox/utils/__tests__/config_db.test.ts b/app/soapbox/utils/__tests__/config-db.test.ts similarity index 90% rename from app/soapbox/utils/__tests__/config_db.test.ts rename to app/soapbox/utils/__tests__/config-db.test.ts index a83757eb3..8f398ee9a 100644 --- a/app/soapbox/utils/__tests__/config_db.test.ts +++ b/app/soapbox/utils/__tests__/config-db.test.ts @@ -2,7 +2,7 @@ import { List as ImmutableList, fromJS } from 'immutable'; import config_db from 'soapbox/__fixtures__/config_db.json'; -import { ConfigDB } from '../config_db'; +import { ConfigDB } from '../config-db'; test('find', () => { const configs = fromJS(config_db).get('configs'); diff --git a/app/soapbox/utils/__tests__/emoji_reacts.test.ts b/app/soapbox/utils/__tests__/emoji-reacts.test.ts similarity index 99% rename from app/soapbox/utils/__tests__/emoji_reacts.test.ts rename to app/soapbox/utils/__tests__/emoji-reacts.test.ts index 14832210c..97f8e34db 100644 --- a/app/soapbox/utils/__tests__/emoji_reacts.test.ts +++ b/app/soapbox/utils/__tests__/emoji-reacts.test.ts @@ -11,7 +11,7 @@ import { getReactForStatus, simulateEmojiReact, simulateUnEmojiReact, -} from '../emoji_reacts'; +} from '../emoji-reacts'; const ALLOWED_EMOJI = ImmutableList([ '👍', diff --git a/app/soapbox/utils/config_db.ts b/app/soapbox/utils/config-db.ts similarity index 100% rename from app/soapbox/utils/config_db.ts rename to app/soapbox/utils/config-db.ts diff --git a/app/soapbox/utils/emoji_reacts.ts b/app/soapbox/utils/emoji-reacts.ts similarity index 100% rename from app/soapbox/utils/emoji_reacts.ts rename to app/soapbox/utils/emoji-reacts.ts diff --git a/app/soapbox/utils/favicon_service.ts b/app/soapbox/utils/favicon-service.ts similarity index 100% rename from app/soapbox/utils/favicon_service.ts rename to app/soapbox/utils/favicon-service.ts diff --git a/app/soapbox/utils/greentext.ts b/app/soapbox/utils/greentext.ts index eab93b22a..70c5e05d8 100644 --- a/app/soapbox/utils/greentext.ts +++ b/app/soapbox/utils/greentext.ts @@ -1,4 +1,4 @@ -import { processHtml } from './tiny_post_html_processor'; +import { processHtml } from './tiny-post-html-processor'; export const addGreentext = (html: string): string => { // Copied from Pleroma FE diff --git a/app/soapbox/utils/media_aspect_ratio.ts b/app/soapbox/utils/media-aspect-ratio.ts similarity index 100% rename from app/soapbox/utils/media_aspect_ratio.ts rename to app/soapbox/utils/media-aspect-ratio.ts diff --git a/app/soapbox/utils/resize_image.ts b/app/soapbox/utils/resize-image.ts similarity index 100% rename from app/soapbox/utils/resize_image.ts rename to app/soapbox/utils/resize-image.ts diff --git a/app/soapbox/utils/rich_content.ts b/app/soapbox/utils/rich-content.ts similarity index 100% rename from app/soapbox/utils/rich_content.ts rename to app/soapbox/utils/rich-content.ts diff --git a/app/soapbox/utils/soapbox_prop_types.ts b/app/soapbox/utils/soapbox-prop-types.ts similarity index 100% rename from app/soapbox/utils/soapbox_prop_types.ts rename to app/soapbox/utils/soapbox-prop-types.ts diff --git a/app/soapbox/utils/tiny_post_html_processor.ts b/app/soapbox/utils/tiny-post-html-processor.ts similarity index 100% rename from app/soapbox/utils/tiny_post_html_processor.ts rename to app/soapbox/utils/tiny-post-html-processor.ts From 8818763f28e7f020c046be8a25cc9f8c47ffc056 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 15:48:54 -0500 Subject: [PATCH 15/19] Rename files (12): rand --- app/soapbox/actions/consumer-auth.ts | 2 +- app/soapbox/api/index.ts | 2 +- app/soapbox/{base_polyfills.ts => base-polyfills.ts} | 0 app/soapbox/{build_config.js => build-config.js} | 0 app/soapbox/components/emoji-button-wrapper.tsx | 2 +- app/soapbox/components/error-boundary.tsx | 2 +- app/soapbox/components/extended-video-player.tsx | 2 +- app/soapbox/components/hover-ref-wrapper.tsx | 2 +- app/soapbox/components/hover-status-wrapper.tsx | 2 +- app/soapbox/components/media-gallery.tsx | 2 +- app/soapbox/containers/dropdown-menu-container.ts | 2 +- app/soapbox/containers/soapbox.tsx | 2 +- app/soapbox/custom.ts | 2 +- app/soapbox/{extra_polyfills.ts => extra-polyfills.ts} | 0 .../features/account-gallery/components/media-item.tsx | 2 +- app/soapbox/features/compose/components/compose-form.tsx | 2 +- app/soapbox/features/compose/components/privacy-dropdown.tsx | 2 +- .../features/soapbox-config/components/color-picker.tsx | 2 +- .../features/soapbox-config/components/color-with-picker.tsx | 2 +- app/soapbox/{is_mobile.ts => is-mobile.ts} | 0 app/soapbox/{load_polyfills.ts => load-polyfills.ts} | 4 ++-- app/soapbox/main.tsx | 2 +- app/soapbox/monitoring.ts | 2 +- app/soapbox/performance.ts | 2 +- app/soapbox/reducers/auth.js | 2 +- app/soapbox/reducers/index.ts | 2 +- .../__tests__/comparators.test.ts} | 4 ++-- app/soapbox/utils/state.ts | 2 +- app/soapbox/utils/static.ts | 2 +- 29 files changed, 27 insertions(+), 27 deletions(-) rename app/soapbox/{base_polyfills.ts => base-polyfills.ts} (100%) rename app/soapbox/{build_config.js => build-config.js} (100%) rename app/soapbox/{extra_polyfills.ts => extra-polyfills.ts} (100%) rename app/soapbox/{is_mobile.ts => is-mobile.ts} (100%) rename app/soapbox/{load_polyfills.ts => load-polyfills.ts} (97%) rename app/soapbox/{__tests__/compare_id.test.ts => utils/__tests__/comparators.test.ts} (73%) diff --git a/app/soapbox/actions/consumer-auth.ts b/app/soapbox/actions/consumer-auth.ts index b669c6393..171941577 100644 --- a/app/soapbox/actions/consumer-auth.ts +++ b/app/soapbox/actions/consumer-auth.ts @@ -1,6 +1,6 @@ import axios from 'axios'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; import { isURL } from 'soapbox/utils/auth'; import sourceCode from 'soapbox/utils/code'; import { getFeatures } from 'soapbox/utils/features'; diff --git a/app/soapbox/api/index.ts b/app/soapbox/api/index.ts index fde4a1a24..97d7d25d7 100644 --- a/app/soapbox/api/index.ts +++ b/app/soapbox/api/index.ts @@ -9,7 +9,7 @@ import axios, { AxiosInstance, AxiosResponse } from 'axios'; import LinkHeader from 'http-link-header'; import { createSelector } from 'reselect'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; import { RootState } from 'soapbox/store'; import { getAccessToken, getAppToken, isURL, parseBaseURL } from 'soapbox/utils/auth'; diff --git a/app/soapbox/base_polyfills.ts b/app/soapbox/base-polyfills.ts similarity index 100% rename from app/soapbox/base_polyfills.ts rename to app/soapbox/base-polyfills.ts diff --git a/app/soapbox/build_config.js b/app/soapbox/build-config.js similarity index 100% rename from app/soapbox/build_config.js rename to app/soapbox/build-config.js diff --git a/app/soapbox/components/emoji-button-wrapper.tsx b/app/soapbox/components/emoji-button-wrapper.tsx index 9a71c9e1a..241596612 100644 --- a/app/soapbox/components/emoji-button-wrapper.tsx +++ b/app/soapbox/components/emoji-button-wrapper.tsx @@ -7,7 +7,7 @@ import { simpleEmojiReact } from 'soapbox/actions/emoji_reacts'; import { openModal } from 'soapbox/actions/modals'; import EmojiSelector from 'soapbox/components/ui/emoji-selector/emoji-selector'; import { useAppSelector, useOwnAccount, useSoapboxConfig } from 'soapbox/hooks'; -import { isUserTouching } from 'soapbox/is_mobile'; +import { isUserTouching } from 'soapbox/is-mobile'; import { getReactForStatus } from 'soapbox/utils/emoji-reacts'; interface IEmojiButtonWrapper { diff --git a/app/soapbox/components/error-boundary.tsx b/app/soapbox/components/error-boundary.tsx index b4b6d8235..830f3e679 100644 --- a/app/soapbox/components/error-boundary.tsx +++ b/app/soapbox/components/error-boundary.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { getSoapboxConfig } from 'soapbox/actions/soapbox'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; import { Text, Stack } from 'soapbox/components/ui'; import { captureException } from 'soapbox/monitoring'; import KVStore from 'soapbox/storage/kv-store'; diff --git a/app/soapbox/components/extended-video-player.tsx b/app/soapbox/components/extended-video-player.tsx index 99a0af01c..ec7e7f3f4 100644 --- a/app/soapbox/components/extended-video-player.tsx +++ b/app/soapbox/components/extended-video-player.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef } from 'react'; -import { isIOS } from 'soapbox/is_mobile'; +import { isIOS } from 'soapbox/is-mobile'; interface IExtendedVideoPlayer { src: string, diff --git a/app/soapbox/components/hover-ref-wrapper.tsx b/app/soapbox/components/hover-ref-wrapper.tsx index f509b2efe..c8536fcdf 100644 --- a/app/soapbox/components/hover-ref-wrapper.tsx +++ b/app/soapbox/components/hover-ref-wrapper.tsx @@ -8,7 +8,7 @@ import { closeProfileHoverCard, } from 'soapbox/actions/profile_hover_card'; import { useAppDispatch } from 'soapbox/hooks'; -import { isMobile } from 'soapbox/is_mobile'; +import { isMobile } from 'soapbox/is-mobile'; const showProfileHoverCard = debounce((dispatch, ref, accountId) => { dispatch(openProfileHoverCard(ref, accountId)); diff --git a/app/soapbox/components/hover-status-wrapper.tsx b/app/soapbox/components/hover-status-wrapper.tsx index da962e47c..a90969da2 100644 --- a/app/soapbox/components/hover-status-wrapper.tsx +++ b/app/soapbox/components/hover-status-wrapper.tsx @@ -7,7 +7,7 @@ import { openStatusHoverCard, closeStatusHoverCard, } from 'soapbox/actions/status-hover-card'; -import { isMobile } from 'soapbox/is_mobile'; +import { isMobile } from 'soapbox/is-mobile'; const showStatusHoverCard = debounce((dispatch, ref, statusId) => { dispatch(openStatusHoverCard(ref, statusId)); diff --git a/app/soapbox/components/media-gallery.tsx b/app/soapbox/components/media-gallery.tsx index 4215356d5..42b961dc1 100644 --- a/app/soapbox/components/media-gallery.tsx +++ b/app/soapbox/components/media-gallery.tsx @@ -9,7 +9,7 @@ import { useSettings } from 'soapbox/hooks'; import { Attachment } from 'soapbox/types/entities'; import { truncateFilename } from 'soapbox/utils/media'; -import { isIOS } from '../is_mobile'; +import { isIOS } from '../is-mobile'; import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media-aspect-ratio'; import type { Property } from 'csstype'; diff --git a/app/soapbox/containers/dropdown-menu-container.ts b/app/soapbox/containers/dropdown-menu-container.ts index c5e0dc8cb..173203e50 100644 --- a/app/soapbox/containers/dropdown-menu-container.ts +++ b/app/soapbox/containers/dropdown-menu-container.ts @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu'; import { openModal, closeModal } from '../actions/modals'; import DropdownMenu from '../components/dropdown-menu'; -import { isUserTouching } from '../is_mobile'; +import { isUserTouching } from '../is-mobile'; import type { Dispatch } from 'redux'; import type { DropdownPlacement, IDropdown } from 'soapbox/components/dropdown-menu'; diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx index b1e6fb719..10d4d3950 100644 --- a/app/soapbox/containers/soapbox.tsx +++ b/app/soapbox/containers/soapbox.tsx @@ -13,7 +13,7 @@ import { loadInstance } from 'soapbox/actions/instance'; import { fetchMe } from 'soapbox/actions/me'; import { loadSoapboxConfig, getSoapboxConfig } from 'soapbox/actions/soapbox'; import { fetchVerificationConfig } from 'soapbox/actions/verification'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; import GdprBanner from 'soapbox/components/gdpr-banner'; import Helmet from 'soapbox/components/helmet'; import LoadingScreen from 'soapbox/components/loading-screen'; diff --git a/app/soapbox/custom.ts b/app/soapbox/custom.ts index 4bccb386d..461f64845 100644 --- a/app/soapbox/custom.ts +++ b/app/soapbox/custom.ts @@ -1,7 +1,7 @@ /** * Functions for dealing with custom build configuration. */ -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; /** Require a custom JSON file if it exists */ export const custom = (filename: string, fallback: any = {}): any => { diff --git a/app/soapbox/extra_polyfills.ts b/app/soapbox/extra-polyfills.ts similarity index 100% rename from app/soapbox/extra_polyfills.ts rename to app/soapbox/extra-polyfills.ts diff --git a/app/soapbox/features/account-gallery/components/media-item.tsx b/app/soapbox/features/account-gallery/components/media-item.tsx index 3999fb85f..a2a171bfc 100644 --- a/app/soapbox/features/account-gallery/components/media-item.tsx +++ b/app/soapbox/features/account-gallery/components/media-item.tsx @@ -5,7 +5,7 @@ import Blurhash from 'soapbox/components/blurhash'; import Icon from 'soapbox/components/icon'; import StillImage from 'soapbox/components/still-image'; import { useSettings } from 'soapbox/hooks'; -import { isIOS } from 'soapbox/is_mobile'; +import { isIOS } from 'soapbox/is-mobile'; import type { Attachment } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx index 99bd27474..78a9cd11a 100644 --- a/app/soapbox/features/compose/components/compose-form.tsx +++ b/app/soapbox/features/compose/components/compose-form.tsx @@ -18,7 +18,7 @@ import AutosuggestTextarea from 'soapbox/components/autosuggest-textarea'; import Icon from 'soapbox/components/icon'; import { Button, Stack } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useCompose, useFeatures, usePrevious } from 'soapbox/hooks'; -import { isMobile } from 'soapbox/is_mobile'; +import { isMobile } from 'soapbox/is-mobile'; import QuotedStatusContainer from '../containers/quoted-status-container'; import ReplyIndicatorContainer from '../containers/reply-indicator-container'; diff --git a/app/soapbox/features/compose/components/privacy-dropdown.tsx b/app/soapbox/features/compose/components/privacy-dropdown.tsx index 4873769c3..074e86ec4 100644 --- a/app/soapbox/features/compose/components/privacy-dropdown.tsx +++ b/app/soapbox/features/compose/components/privacy-dropdown.tsx @@ -11,7 +11,7 @@ import { closeModal, openModal } from 'soapbox/actions/modals'; import Icon from 'soapbox/components/icon'; import { IconButton } from 'soapbox/components/ui'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; -import { isUserTouching } from 'soapbox/is_mobile'; +import { isUserTouching } from 'soapbox/is-mobile'; import Motion from '../../ui/util/optional_motion'; diff --git a/app/soapbox/features/soapbox-config/components/color-picker.tsx b/app/soapbox/features/soapbox-config/components/color-picker.tsx index 4ac3943fc..4cba36e6a 100644 --- a/app/soapbox/features/soapbox-config/components/color-picker.tsx +++ b/app/soapbox/features/soapbox-config/components/color-picker.tsx @@ -2,7 +2,7 @@ import { supportsPassiveEvents } from 'detect-passive-events'; import React, { useEffect, useRef } from 'react'; import { SketchPicker, ColorChangeHandler } from 'react-color'; -import { isMobile } from 'soapbox/is_mobile'; +import { isMobile } from 'soapbox/is-mobile'; const listenerOptions = supportsPassiveEvents ? { passive: true } : false; diff --git a/app/soapbox/features/soapbox-config/components/color-with-picker.tsx b/app/soapbox/features/soapbox-config/components/color-with-picker.tsx index c82e1bf11..c1c7dd3cd 100644 --- a/app/soapbox/features/soapbox-config/components/color-with-picker.tsx +++ b/app/soapbox/features/soapbox-config/components/color-with-picker.tsx @@ -2,7 +2,7 @@ import React, { useState, useRef } from 'react'; // @ts-ignore: TODO: upgrade react-overlays. v3.1 and above have TS definitions import Overlay from 'react-overlays/lib/Overlay'; -import { isMobile } from 'soapbox/is_mobile'; +import { isMobile } from 'soapbox/is-mobile'; import ColorPicker from './color-picker'; diff --git a/app/soapbox/is_mobile.ts b/app/soapbox/is-mobile.ts similarity index 100% rename from app/soapbox/is_mobile.ts rename to app/soapbox/is-mobile.ts diff --git a/app/soapbox/load_polyfills.ts b/app/soapbox/load-polyfills.ts similarity index 97% rename from app/soapbox/load_polyfills.ts rename to app/soapbox/load-polyfills.ts index e636098e7..cfd6f741f 100644 --- a/app/soapbox/load_polyfills.ts +++ b/app/soapbox/load-polyfills.ts @@ -5,11 +5,11 @@ // it will execute in the same tick of the event loop (i.e. near-instant). function importBasePolyfills() { - return import(/* webpackChunkName: "base_polyfills" */ './base_polyfills'); + return import(/* webpackChunkName: "base_polyfills" */ './base-polyfills'); } function importExtraPolyfills() { - return import(/* webpackChunkName: "extra_polyfills" */ './extra_polyfills'); + return import(/* webpackChunkName: "extra_polyfills" */ './extra-polyfills'); } function loadPolyfills() { diff --git a/app/soapbox/main.tsx b/app/soapbox/main.tsx index 84ea3739a..b4a0eeaac 100644 --- a/app/soapbox/main.tsx +++ b/app/soapbox/main.tsx @@ -8,7 +8,7 @@ import { defineMessages } from 'react-intl'; import snackbar from 'soapbox/actions/snackbar'; import { setSwUpdating } from 'soapbox/actions/sw'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; import { store } from 'soapbox/store'; import { printConsoleWarning } from 'soapbox/utils/console'; diff --git a/app/soapbox/monitoring.ts b/app/soapbox/monitoring.ts index cfa800bde..da9bf46e7 100644 --- a/app/soapbox/monitoring.ts +++ b/app/soapbox/monitoring.ts @@ -1,4 +1,4 @@ -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; import type { CaptureContext } from '@sentry/types'; diff --git a/app/soapbox/performance.ts b/app/soapbox/performance.ts index b524b6e15..36f9948a6 100644 --- a/app/soapbox/performance.ts +++ b/app/soapbox/performance.ts @@ -1,6 +1,6 @@ 'use strict'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; // // Tools for performance debugging, only enabled in development mode. diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js index 55b9fd3ae..bfe6b9249 100644 --- a/app/soapbox/reducers/auth.js +++ b/app/soapbox/reducers/auth.js @@ -2,7 +2,7 @@ import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable'; import trim from 'lodash/trim'; import { MASTODON_PRELOAD_IMPORT } from 'soapbox/actions/preload'; -import { FE_SUBDIRECTORY } from 'soapbox/build_config'; +import { FE_SUBDIRECTORY } from 'soapbox/build-config'; import KVStore from 'soapbox/storage/kv-store'; import { validId, isURL } from 'soapbox/utils/auth'; diff --git a/app/soapbox/reducers/index.ts b/app/soapbox/reducers/index.ts index 16e7307da..1caa7d976 100644 --- a/app/soapbox/reducers/index.ts +++ b/app/soapbox/reducers/index.ts @@ -2,7 +2,7 @@ import { Record as ImmutableRecord } from 'immutable'; import { combineReducers } from 'redux-immutable'; import { AUTH_LOGGED_OUT } from 'soapbox/actions/auth'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; import account_notes from './account-notes'; import accounts from './accounts'; diff --git a/app/soapbox/__tests__/compare_id.test.ts b/app/soapbox/utils/__tests__/comparators.test.ts similarity index 73% rename from app/soapbox/__tests__/compare_id.test.ts rename to app/soapbox/utils/__tests__/comparators.test.ts index 1afbe0da3..f1cf72634 100644 --- a/app/soapbox/__tests__/compare_id.test.ts +++ b/app/soapbox/utils/__tests__/comparators.test.ts @@ -1,7 +1,7 @@ -import { compareId } from '../utils/comparators'; +import { compareId } from '../comparators'; test('compareId', () => { expect(compareId('3', '3')).toBe(0); expect(compareId('10', '1')).toBe(1); expect(compareId('99', '100')).toBe(-1); -}); +}); \ No newline at end of file diff --git a/app/soapbox/utils/state.ts b/app/soapbox/utils/state.ts index 45e849917..c3cfdb570 100644 --- a/app/soapbox/utils/state.ts +++ b/app/soapbox/utils/state.ts @@ -4,7 +4,7 @@ */ import { getSoapboxConfig } from 'soapbox/actions/soapbox'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; import { isPrerendered } from 'soapbox/precheck'; import { isURL } from 'soapbox/utils/auth'; diff --git a/app/soapbox/utils/static.ts b/app/soapbox/utils/static.ts index 79ba46931..0a8048a32 100644 --- a/app/soapbox/utils/static.ts +++ b/app/soapbox/utils/static.ts @@ -5,7 +5,7 @@ import { join } from 'path'; -import * as BuildConfig from 'soapbox/build_config'; +import * as BuildConfig from 'soapbox/build-config'; /** Gets the path to a file with build configuration being considered. */ export const joinPublicPath = (...paths: string[]): string => { From 863ac4ea7028c94a89a8b5e61ca30e8395d9ee13 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 15:50:11 -0500 Subject: [PATCH 16/19] Rename files (13): cleanup misc --- app/application.ts | 2 +- .../actions/{push_notifications => push-notifications}/index.ts | 0 .../{push_notifications => push-notifications}/registerer.ts | 0 .../{push_notifications => push-notifications}/setter.ts | 0 app/soapbox/features/ui/index.tsx | 2 +- .../{soapbox_config-test.ts => soapbox-config.test.ts} | 0 app/soapbox/reducers/push-notifications.ts | 2 +- 7 files changed, 3 insertions(+), 3 deletions(-) rename app/soapbox/actions/{push_notifications => push-notifications}/index.ts (100%) rename app/soapbox/actions/{push_notifications => push-notifications}/registerer.ts (100%) rename app/soapbox/actions/{push_notifications => push-notifications}/setter.ts (100%) rename app/soapbox/normalizers/soapbox/__tests__/{soapbox_config-test.ts => soapbox-config.test.ts} (100%) diff --git a/app/application.ts b/app/application.ts index 111923abd..9610b4f9a 100644 --- a/app/application.ts +++ b/app/application.ts @@ -1,4 +1,4 @@ -import loadPolyfills from './soapbox/load_polyfills'; +import loadPolyfills from './soapbox/load-polyfills'; // Load iframe event listener require('./soapbox/iframe'); diff --git a/app/soapbox/actions/push_notifications/index.ts b/app/soapbox/actions/push-notifications/index.ts similarity index 100% rename from app/soapbox/actions/push_notifications/index.ts rename to app/soapbox/actions/push-notifications/index.ts diff --git a/app/soapbox/actions/push_notifications/registerer.ts b/app/soapbox/actions/push-notifications/registerer.ts similarity index 100% rename from app/soapbox/actions/push_notifications/registerer.ts rename to app/soapbox/actions/push-notifications/registerer.ts diff --git a/app/soapbox/actions/push_notifications/setter.ts b/app/soapbox/actions/push-notifications/setter.ts similarity index 100% rename from app/soapbox/actions/push_notifications/setter.ts rename to app/soapbox/actions/push-notifications/setter.ts diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx index 88e543e62..1ce57e0c7 100644 --- a/app/soapbox/features/ui/index.tsx +++ b/app/soapbox/features/ui/index.tsx @@ -16,7 +16,7 @@ import { fetchFilters } from 'soapbox/actions/filters'; import { fetchMarker } from 'soapbox/actions/markers'; import { openModal } from 'soapbox/actions/modals'; import { expandNotifications } from 'soapbox/actions/notifications'; -import { register as registerPushNotifications } from 'soapbox/actions/push_notifications'; +import { register as registerPushNotifications } from 'soapbox/actions/push-notifications'; import { fetchScheduledStatuses } from 'soapbox/actions/scheduled_statuses'; import { connectUserStream } from 'soapbox/actions/streaming'; import { fetchSuggestionsForTimeline } from 'soapbox/actions/suggestions'; diff --git a/app/soapbox/normalizers/soapbox/__tests__/soapbox_config-test.ts b/app/soapbox/normalizers/soapbox/__tests__/soapbox-config.test.ts similarity index 100% rename from app/soapbox/normalizers/soapbox/__tests__/soapbox_config-test.ts rename to app/soapbox/normalizers/soapbox/__tests__/soapbox-config.test.ts diff --git a/app/soapbox/reducers/push-notifications.ts b/app/soapbox/reducers/push-notifications.ts index 0448abf08..a2b8ca51f 100644 --- a/app/soapbox/reducers/push-notifications.ts +++ b/app/soapbox/reducers/push-notifications.ts @@ -1,6 +1,6 @@ import { Map as ImmutableMap, Record as ImmutableRecord } from 'immutable'; -import { SET_BROWSER_SUPPORT, SET_SUBSCRIPTION, CLEAR_SUBSCRIPTION, SET_ALERTS } from '../actions/push_notifications'; +import { SET_BROWSER_SUPPORT, SET_SUBSCRIPTION, CLEAR_SUBSCRIPTION, SET_ALERTS } from '../actions/push-notifications'; import type { AnyAction } from 'redux'; From 774b62739751a182047acfefad762f39bb78fe03 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Wed, 16 Nov 2022 08:32:32 -0500 Subject: [PATCH 17/19] Rename files (14): cleanup misc v2 --- .../{custom_emojis.ts => custom-emojis.ts} | 0 .../{domain_blocks.ts => domain-blocks.ts} | 0 .../{dropdown_menu.ts => dropdown-menu.ts} | 0 .../actions/{email_list.ts => email-list.ts} | 0 .../{emoji_reacts.ts => emoji-reacts.ts} | 0 .../{export_data.ts => export-data.ts} | 0 .../{external_auth.ts => external-auth.ts} | 0 ...iar_followers.ts => familiar-followers.ts} | 0 .../{import_data.ts => import-data.ts} | 0 app/soapbox/actions/modals.ts | 2 +- .../{pin_statuses.ts => pin-statuses.ts} | 0 ...le_hover_card.ts => profile-hover-card.ts} | 0 .../actions/push-notifications/registerer.ts | 2 +- ...subscriptions.ts => push-subscriptions.ts} | 0 ...{remote_timeline.ts => remote-timeline.ts} | 0 ...uled_statuses.ts => scheduled-statuses.ts} | 0 ...nding_statuses.ts => trending-statuses.ts} | 0 app/soapbox/build-config.js | 2 +- app/soapbox/components/birthday-input.tsx | 2 +- app/soapbox/components/domain.tsx | 2 +- app/soapbox/components/dropdown-menu.tsx | 2 +- .../components/emoji-button-wrapper.tsx | 2 +- app/soapbox/components/hover-ref-wrapper.tsx | 2 +- app/soapbox/components/icon-button.js | 2 +- app/soapbox/components/modal-root.tsx | 2 +- app/soapbox/components/profile-hover-card.tsx | 4 +- app/soapbox/components/sidebar-menu.tsx | 2 +- app/soapbox/components/status-list.tsx | 2 +- app/soapbox/components/upload-progress.tsx | 2 +- .../containers/dropdown-menu-container.ts | 2 +- app/soapbox/containers/soapbox.tsx | 2 +- .../features/account/components/header.tsx | 2 +- app/soapbox/features/admin/tabs/dashboard.tsx | 2 +- app/soapbox/features/auth-layout/index.tsx | 10 +-- ...ogin_form.test.tsx => login-form.test.tsx} | 2 +- ...ogin_page.test.tsx => login-page.test.tsx} | 2 +- ...h_form.test.tsx => otp-auth-form.test.tsx} | 2 +- ...st.tsx => password-reset-confirm.test.tsx} | 2 +- .../{login_form.tsx => login-form.tsx} | 0 .../{login_page.tsx => login-page.tsx} | 4 +- .../{otp_auth_form.tsx => otp-auth-form.tsx} | 0 ...confirm.tsx => password-reset-confirm.tsx} | 0 ...{password_reset.tsx => password-reset.tsx} | 0 ...tration_form.tsx => registration-form.tsx} | 0 app/soapbox/features/backups/index.tsx | 2 +- .../compose/components/privacy-dropdown.tsx | 2 +- .../compose/components/schedule-form.tsx | 2 +- .../compose/components/search-results.tsx | 2 +- .../features/compose/components/upload.tsx | 2 +- .../features/compose/components/warning.tsx | 2 +- .../containers/schedule-form-container.tsx | 2 +- .../{account_card.tsx => account-card.tsx} | 0 app/soapbox/features/directory/index.tsx | 2 +- app/soapbox/features/domain-blocks/index.tsx | 2 +- app/soapbox/features/export-data/index.tsx | 2 +- .../components/external-login-form.tsx | 2 +- app/soapbox/features/import-data/index.tsx | 2 +- app/soapbox/features/landing-page/index.tsx | 2 +- .../components/account.tsx | 0 .../components/edit-list-form.tsx} | 0 .../components/search.tsx | 0 .../{list_editor => list-editor}/index.tsx | 2 +- .../index.tsx | 0 .../features/pinned-statuses/index.tsx | 2 +- .../features/register-invite/index.tsx | 2 +- .../scheduled-status-action-bar.tsx | 2 +- .../components/scheduled-status.tsx | 2 +- .../features/scheduled-statuses/index.tsx | 2 +- app/soapbox/features/server-info/index.tsx | 4 +- .../components/site-preview.tsx | 2 +- app/soapbox/features/status/index.tsx | 2 +- .../features/ui/__tests__/index.test.tsx | 2 +- ..._note_modal.tsx => account-note-modal.tsx} | 0 .../{actions_modal.tsx => actions-modal.tsx} | 2 +- ...round_shapes.tsx => background-shapes.tsx} | 0 .../{better_column.js => better-column.js} | 2 +- ...irthdays_modal.tsx => birthdays-modal.tsx} | 0 .../{boost_modal.tsx => boost-modal.tsx} | 0 ...lumn_error.tsx => bundle-column-error.tsx} | 0 ...modal_error.tsx => bundle-modal-error.tsx} | 0 ...umn_forbidden.tsx => column-forbidden.tsx} | 0 .../{column_header.tsx => column-header.tsx} | 0 ...{column_loading.tsx => column-loading.tsx} | 0 app/soapbox/features/ui/components/column.tsx | 2 +- .../{columns_area.tsx => columns-area.tsx} | 0 ...ry_modal.tsx => compare-history-modal.tsx} | 0 ...omponent_modal.tsx => component-modal.tsx} | 0 .../{compose_modal.tsx => compose-modal.tsx} | 0 ...ation_modal.tsx => confirmation-modal.tsx} | 0 ...nate_modal.tsx => crypto-donate-modal.tsx} | 0 ...on_modal.tsx => edit-federation-modal.tsx} | 0 ...modal.tsx => familiar-followers-modal.tsx} | 0 .../{funding_panel.tsx => funding-panel.tsx} | 0 .../{hotkeys_modal.tsx => hotkeys-modal.tsx} | 0 ...info_panel.tsx => instance-info-panel.tsx} | 2 +- ...anel.tsx => instance-moderation-panel.tsx} | 0 .../{link_footer.tsx => link-footer.tsx} | 0 .../{list_panel.tsx => list-panel.tsx} | 0 ...{mentions_modal.tsx => mentions-modal.tsx} | 0 ...odal.tsx => missing-description-modal.tsx} | 0 .../{modal_loading.tsx => modal-loading.tsx} | 0 .../{modal_root.tsx => modal-root.tsx} | 6 +- .../{mute_modal.tsx => mute-modal.tsx} | 0 ...{pending_status.tsx => pending-status.tsx} | 4 +- ...ts_panel.tsx => pinned-accounts-panel.tsx} | 2 +- .../{poll_preview.tsx => poll-preview.tsx} | 0 ...ers.tsx => profile-familiar-followers.tsx} | 2 +- ...lds_panel.tsx => profile-fields-panel.tsx} | 2 +- ..._info_panel.tsx => profile-info-panel.tsx} | 4 +- ...edia_panel.tsx => profile-media-panel.tsx} | 0 .../{profile_stats.tsx => profile-stats.tsx} | 0 .../{promo_panel.tsx => promo-panel.tsx} | 0 ...eactions_modal.tsx => reactions-modal.tsx} | 0 .../{reblogs_modal.tsx => reblogs-modal.tsx} | 0 ...ons_modal.tsx => reply-mentions-modal.tsx} | 0 ...rized_modal.tsx => unauthorized-modal.tsx} | 0 .../{upload_area.tsx => upload-area.tsx} | 2 +- .../{user_panel.tsx => user-panel.tsx} | 0 .../{video_modal.tsx => video-modal.tsx} | 0 ...dle_container.tsx => bundle-container.tsx} | 0 ...{modal_container.ts => modal-container.ts} | 2 +- ...tainer.tsx => notifications-container.tsx} | 0 app/soapbox/features/ui/index.tsx | 10 +-- .../features/ui/util/async-components.ts | 76 +++++++++---------- ...ptional_motion.tsx => optional-motion.tsx} | 2 +- ...s_builder.ts => pending-status-builder.ts} | 0 ...r_helpers.tsx => react-router-helpers.tsx} | 10 +-- ...{reduced_motion.tsx => reduced-motion.tsx} | 0 ...{email_passthru.tsx => email-passthru.tsx} | 0 .../{waitlist_page.tsx => waitlist-page.tsx} | 0 app/soapbox/jest/test-helpers.tsx | 2 +- app/soapbox/pages/admin-page.tsx | 4 +- app/soapbox/pages/default-page.tsx | 4 +- app/soapbox/pages/home-page.tsx | 4 +- app/soapbox/pages/profile-page.tsx | 4 +- app/soapbox/pages/remote-instance-page.tsx | 4 +- app/soapbox/pages/status-page.tsx | 4 +- .../{accounts_meta.ts => accounts-meta.ts} | 0 app/soapbox/reducers/custom-emojis.ts | 2 +- app/soapbox/reducers/domain-lists.ts | 2 +- app/soapbox/reducers/dropdown-menu.ts | 2 +- app/soapbox/reducers/index.ts | 2 +- app/soapbox/reducers/profile-hover-card.ts | 2 +- app/soapbox/reducers/relationships.ts | 2 +- app/soapbox/reducers/scheduled-statuses.ts | 2 +- app/soapbox/reducers/status-lists.ts | 4 +- app/soapbox/reducers/statuses.ts | 2 +- app/soapbox/reducers/suggestions.ts | 2 +- app/soapbox/reducers/trending-statuses.ts | 2 +- app/soapbox/reducers/user-lists.ts | 2 +- app/styles/application.scss | 4 +- ...over_card.scss => profile-hover-card.scss} | 0 .../{emoji_picker.scss => emoji-picker.scss} | 0 jsdoc.conf.js | 2 +- webpack/configuration.ts | 2 +- webpack/development.ts | 2 +- webpack/production.ts | 2 +- webpack/rules/babel-build-config.ts | 4 +- webpack/shared.ts | 2 +- 159 files changed, 154 insertions(+), 154 deletions(-) rename app/soapbox/actions/{custom_emojis.ts => custom-emojis.ts} (100%) rename app/soapbox/actions/{domain_blocks.ts => domain-blocks.ts} (100%) rename app/soapbox/actions/{dropdown_menu.ts => dropdown-menu.ts} (100%) rename app/soapbox/actions/{email_list.ts => email-list.ts} (100%) rename app/soapbox/actions/{emoji_reacts.ts => emoji-reacts.ts} (100%) rename app/soapbox/actions/{export_data.ts => export-data.ts} (100%) rename app/soapbox/actions/{external_auth.ts => external-auth.ts} (100%) rename app/soapbox/actions/{familiar_followers.ts => familiar-followers.ts} (100%) rename app/soapbox/actions/{import_data.ts => import-data.ts} (100%) rename app/soapbox/actions/{pin_statuses.ts => pin-statuses.ts} (100%) rename app/soapbox/actions/{profile_hover_card.ts => profile-hover-card.ts} (100%) rename app/soapbox/actions/{push_subscriptions.ts => push-subscriptions.ts} (100%) rename app/soapbox/actions/{remote_timeline.ts => remote-timeline.ts} (100%) rename app/soapbox/actions/{scheduled_statuses.ts => scheduled-statuses.ts} (100%) rename app/soapbox/actions/{trending_statuses.ts => trending-statuses.ts} (100%) rename app/soapbox/features/auth-login/components/__tests__/{login_form.test.tsx => login-form.test.tsx} (96%) rename app/soapbox/features/auth-login/components/__tests__/{login_page.test.tsx => login-page.test.tsx} (97%) rename app/soapbox/features/auth-login/components/__tests__/{otp_auth_form.test.tsx => otp-auth-form.test.tsx} (88%) rename app/soapbox/features/auth-login/components/__tests__/{password_reset_confirm.test.tsx => password-reset-confirm.test.tsx} (96%) rename app/soapbox/features/auth-login/components/{login_form.tsx => login-form.tsx} (100%) rename app/soapbox/features/auth-login/components/{login_page.tsx => login-page.tsx} (96%) rename app/soapbox/features/auth-login/components/{otp_auth_form.tsx => otp-auth-form.tsx} (100%) rename app/soapbox/features/auth-login/components/{password_reset_confirm.tsx => password-reset-confirm.tsx} (100%) rename app/soapbox/features/auth-login/components/{password_reset.tsx => password-reset.tsx} (100%) rename app/soapbox/features/auth-login/components/{registration_form.tsx => registration-form.tsx} (100%) rename app/soapbox/features/directory/components/{account_card.tsx => account-card.tsx} (100%) rename app/soapbox/features/{list_editor => list-editor}/components/account.tsx (100%) rename app/soapbox/features/{list_editor/components/edit_list_form.tsx => list-editor/components/edit-list-form.tsx} (100%) rename app/soapbox/features/{list_editor => list-editor}/components/search.tsx (100%) rename app/soapbox/features/{list_editor => list-editor}/index.tsx (97%) rename app/soapbox/features/{list_timeline => list-timeline}/index.tsx (100%) rename app/soapbox/features/ui/components/{account_note_modal.tsx => account-note-modal.tsx} (100%) rename app/soapbox/features/ui/components/{actions_modal.tsx => actions-modal.tsx} (98%) rename app/soapbox/features/ui/components/{background_shapes.tsx => background-shapes.tsx} (100%) rename app/soapbox/features/ui/components/{better_column.js => better-column.js} (96%) rename app/soapbox/features/ui/components/{birthdays_modal.tsx => birthdays-modal.tsx} (100%) rename app/soapbox/features/ui/components/{boost_modal.tsx => boost-modal.tsx} (100%) rename app/soapbox/features/ui/components/{bundle_column_error.tsx => bundle-column-error.tsx} (100%) rename app/soapbox/features/ui/components/{bundle_modal_error.tsx => bundle-modal-error.tsx} (100%) rename app/soapbox/features/ui/components/{column_forbidden.tsx => column-forbidden.tsx} (100%) rename app/soapbox/features/ui/components/{column_header.tsx => column-header.tsx} (100%) rename app/soapbox/features/ui/components/{column_loading.tsx => column-loading.tsx} (100%) rename app/soapbox/features/ui/components/{columns_area.tsx => columns-area.tsx} (100%) rename app/soapbox/features/ui/components/{compare_history_modal.tsx => compare-history-modal.tsx} (100%) rename app/soapbox/features/ui/components/{component_modal.tsx => component-modal.tsx} (100%) rename app/soapbox/features/ui/components/{compose_modal.tsx => compose-modal.tsx} (100%) rename app/soapbox/features/ui/components/{confirmation_modal.tsx => confirmation-modal.tsx} (100%) rename app/soapbox/features/ui/components/{crypto_donate_modal.tsx => crypto-donate-modal.tsx} (100%) rename app/soapbox/features/ui/components/{edit_federation_modal.tsx => edit-federation-modal.tsx} (100%) rename app/soapbox/features/ui/components/{familiar_followers_modal.tsx => familiar-followers-modal.tsx} (100%) rename app/soapbox/features/ui/components/{funding_panel.tsx => funding-panel.tsx} (100%) rename app/soapbox/features/ui/components/{hotkeys_modal.tsx => hotkeys-modal.tsx} (100%) rename app/soapbox/features/ui/components/{instance_info_panel.tsx => instance-info-panel.tsx} (96%) rename app/soapbox/features/ui/components/{instance_moderation_panel.tsx => instance-moderation-panel.tsx} (100%) rename app/soapbox/features/ui/components/{link_footer.tsx => link-footer.tsx} (100%) rename app/soapbox/features/ui/components/{list_panel.tsx => list-panel.tsx} (100%) rename app/soapbox/features/ui/components/{mentions_modal.tsx => mentions-modal.tsx} (100%) rename app/soapbox/features/ui/components/{missing_description_modal.tsx => missing-description-modal.tsx} (100%) rename app/soapbox/features/ui/components/{modal_loading.tsx => modal-loading.tsx} (100%) rename app/soapbox/features/ui/components/{modal_root.tsx => modal-root.tsx} (95%) rename app/soapbox/features/ui/components/{mute_modal.tsx => mute-modal.tsx} (100%) rename app/soapbox/features/ui/components/{pending_status.tsx => pending-status.tsx} (96%) rename app/soapbox/features/ui/components/{pinned_accounts_panel.tsx => pinned-accounts-panel.tsx} (99%) rename app/soapbox/features/ui/components/{poll_preview.tsx => poll-preview.tsx} (100%) rename app/soapbox/features/ui/components/{profile_familiar_followers.tsx => profile-familiar-followers.tsx} (97%) rename app/soapbox/features/ui/components/{profile_fields_panel.tsx => profile-fields-panel.tsx} (99%) rename app/soapbox/features/ui/components/{profile_info_panel.tsx => profile-info-panel.tsx} (98%) rename app/soapbox/features/ui/components/{profile_media_panel.tsx => profile-media-panel.tsx} (100%) rename app/soapbox/features/ui/components/{profile_stats.tsx => profile-stats.tsx} (100%) rename app/soapbox/features/ui/components/{promo_panel.tsx => promo-panel.tsx} (100%) rename app/soapbox/features/ui/components/{reactions_modal.tsx => reactions-modal.tsx} (100%) rename app/soapbox/features/ui/components/{reblogs_modal.tsx => reblogs-modal.tsx} (100%) rename app/soapbox/features/ui/components/{reply_mentions_modal.tsx => reply-mentions-modal.tsx} (100%) rename app/soapbox/features/ui/components/{unauthorized_modal.tsx => unauthorized-modal.tsx} (100%) rename app/soapbox/features/ui/components/{upload_area.tsx => upload-area.tsx} (97%) rename app/soapbox/features/ui/components/{user_panel.tsx => user-panel.tsx} (100%) rename app/soapbox/features/ui/components/{video_modal.tsx => video-modal.tsx} (100%) rename app/soapbox/features/ui/containers/{bundle_container.tsx => bundle-container.tsx} (100%) rename app/soapbox/features/ui/containers/{modal_container.ts => modal-container.ts} (93%) rename app/soapbox/features/ui/containers/{notifications_container.tsx => notifications-container.tsx} (100%) rename app/soapbox/features/ui/util/{optional_motion.tsx => optional-motion.tsx} (88%) rename app/soapbox/features/ui/util/{pending_status_builder.ts => pending-status-builder.ts} (100%) rename app/soapbox/features/ui/util/{react_router_helpers.tsx => react-router-helpers.tsx} (90%) rename app/soapbox/features/ui/util/{reduced_motion.tsx => reduced-motion.tsx} (100%) rename app/soapbox/features/verification/{email_passthru.tsx => email-passthru.tsx} (100%) rename app/soapbox/features/verification/{waitlist_page.tsx => waitlist-page.tsx} (100%) rename app/soapbox/reducers/{accounts_meta.ts => accounts-meta.ts} (100%) rename app/styles/components/{profile_hover_card.scss => profile-hover-card.scss} (100%) rename app/styles/{emoji_picker.scss => emoji-picker.scss} (100%) diff --git a/app/soapbox/actions/custom_emojis.ts b/app/soapbox/actions/custom-emojis.ts similarity index 100% rename from app/soapbox/actions/custom_emojis.ts rename to app/soapbox/actions/custom-emojis.ts diff --git a/app/soapbox/actions/domain_blocks.ts b/app/soapbox/actions/domain-blocks.ts similarity index 100% rename from app/soapbox/actions/domain_blocks.ts rename to app/soapbox/actions/domain-blocks.ts diff --git a/app/soapbox/actions/dropdown_menu.ts b/app/soapbox/actions/dropdown-menu.ts similarity index 100% rename from app/soapbox/actions/dropdown_menu.ts rename to app/soapbox/actions/dropdown-menu.ts diff --git a/app/soapbox/actions/email_list.ts b/app/soapbox/actions/email-list.ts similarity index 100% rename from app/soapbox/actions/email_list.ts rename to app/soapbox/actions/email-list.ts diff --git a/app/soapbox/actions/emoji_reacts.ts b/app/soapbox/actions/emoji-reacts.ts similarity index 100% rename from app/soapbox/actions/emoji_reacts.ts rename to app/soapbox/actions/emoji-reacts.ts diff --git a/app/soapbox/actions/export_data.ts b/app/soapbox/actions/export-data.ts similarity index 100% rename from app/soapbox/actions/export_data.ts rename to app/soapbox/actions/export-data.ts diff --git a/app/soapbox/actions/external_auth.ts b/app/soapbox/actions/external-auth.ts similarity index 100% rename from app/soapbox/actions/external_auth.ts rename to app/soapbox/actions/external-auth.ts diff --git a/app/soapbox/actions/familiar_followers.ts b/app/soapbox/actions/familiar-followers.ts similarity index 100% rename from app/soapbox/actions/familiar_followers.ts rename to app/soapbox/actions/familiar-followers.ts diff --git a/app/soapbox/actions/import_data.ts b/app/soapbox/actions/import-data.ts similarity index 100% rename from app/soapbox/actions/import_data.ts rename to app/soapbox/actions/import-data.ts diff --git a/app/soapbox/actions/modals.ts b/app/soapbox/actions/modals.ts index 00d4fd01a..83b52cb3e 100644 --- a/app/soapbox/actions/modals.ts +++ b/app/soapbox/actions/modals.ts @@ -1,4 +1,4 @@ -import type { ModalType } from 'soapbox/features/ui/components/modal_root'; +import type { ModalType } from 'soapbox/features/ui/components/modal-root'; export const MODAL_OPEN = 'MODAL_OPEN'; export const MODAL_CLOSE = 'MODAL_CLOSE'; diff --git a/app/soapbox/actions/pin_statuses.ts b/app/soapbox/actions/pin-statuses.ts similarity index 100% rename from app/soapbox/actions/pin_statuses.ts rename to app/soapbox/actions/pin-statuses.ts diff --git a/app/soapbox/actions/profile_hover_card.ts b/app/soapbox/actions/profile-hover-card.ts similarity index 100% rename from app/soapbox/actions/profile_hover_card.ts rename to app/soapbox/actions/profile-hover-card.ts diff --git a/app/soapbox/actions/push-notifications/registerer.ts b/app/soapbox/actions/push-notifications/registerer.ts index e66e3a01a..3a9d4fb9e 100644 --- a/app/soapbox/actions/push-notifications/registerer.ts +++ b/app/soapbox/actions/push-notifications/registerer.ts @@ -1,4 +1,4 @@ -import { createPushSubscription, updatePushSubscription } from 'soapbox/actions/push_subscriptions'; +import { createPushSubscription, updatePushSubscription } from 'soapbox/actions/push-subscriptions'; import { pushNotificationsSetting } from 'soapbox/settings'; import { getVapidKey } from 'soapbox/utils/auth'; import { decode as decodeBase64 } from 'soapbox/utils/base64'; diff --git a/app/soapbox/actions/push_subscriptions.ts b/app/soapbox/actions/push-subscriptions.ts similarity index 100% rename from app/soapbox/actions/push_subscriptions.ts rename to app/soapbox/actions/push-subscriptions.ts diff --git a/app/soapbox/actions/remote_timeline.ts b/app/soapbox/actions/remote-timeline.ts similarity index 100% rename from app/soapbox/actions/remote_timeline.ts rename to app/soapbox/actions/remote-timeline.ts diff --git a/app/soapbox/actions/scheduled_statuses.ts b/app/soapbox/actions/scheduled-statuses.ts similarity index 100% rename from app/soapbox/actions/scheduled_statuses.ts rename to app/soapbox/actions/scheduled-statuses.ts diff --git a/app/soapbox/actions/trending_statuses.ts b/app/soapbox/actions/trending-statuses.ts similarity index 100% rename from app/soapbox/actions/trending_statuses.ts rename to app/soapbox/actions/trending-statuses.ts diff --git a/app/soapbox/build-config.js b/app/soapbox/build-config.js index 04b48bf78..a11faa0e8 100644 --- a/app/soapbox/build-config.js +++ b/app/soapbox/build-config.js @@ -1,7 +1,7 @@ // @preval /** * Build config: configuration set at build time. - * @module soapbox/build_config + * @module soapbox/build-config */ const trim = require('lodash/trim'); diff --git a/app/soapbox/components/birthday-input.tsx b/app/soapbox/components/birthday-input.tsx index bd38666cf..21a10a1e5 100644 --- a/app/soapbox/components/birthday-input.tsx +++ b/app/soapbox/components/birthday-input.tsx @@ -2,7 +2,7 @@ import React, { useMemo } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import IconButton from 'soapbox/components/icon-button'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { DatePicker } from 'soapbox/features/ui/util/async-components'; import { useAppSelector, useFeatures } from 'soapbox/hooks'; diff --git a/app/soapbox/components/domain.tsx b/app/soapbox/components/domain.tsx index 646c37205..a8096523b 100644 --- a/app/soapbox/components/domain.tsx +++ b/app/soapbox/components/domain.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; -import { unblockDomain } from 'soapbox/actions/domain_blocks'; +import { unblockDomain } from 'soapbox/actions/domain-blocks'; import IconButton from './icon-button'; diff --git a/app/soapbox/components/dropdown-menu.tsx b/app/soapbox/components/dropdown-menu.tsx index 01d69483d..77be0f18d 100644 --- a/app/soapbox/components/dropdown-menu.tsx +++ b/app/soapbox/components/dropdown-menu.tsx @@ -8,7 +8,7 @@ import { withRouter, RouteComponentProps } from 'react-router-dom'; import { IconButton, Counter } from 'soapbox/components/ui'; import SvgIcon from 'soapbox/components/ui/icon/svg-icon'; -import Motion from 'soapbox/features/ui/util/optional_motion'; +import Motion from 'soapbox/features/ui/util/optional-motion'; import type { Status } from 'soapbox/types/entities'; diff --git a/app/soapbox/components/emoji-button-wrapper.tsx b/app/soapbox/components/emoji-button-wrapper.tsx index 241596612..23a165fcb 100644 --- a/app/soapbox/components/emoji-button-wrapper.tsx +++ b/app/soapbox/components/emoji-button-wrapper.tsx @@ -3,7 +3,7 @@ import React, { useState, useEffect, useRef } from 'react'; import { usePopper } from 'react-popper'; import { useDispatch } from 'react-redux'; -import { simpleEmojiReact } from 'soapbox/actions/emoji_reacts'; +import { simpleEmojiReact } from 'soapbox/actions/emoji-reacts'; import { openModal } from 'soapbox/actions/modals'; import EmojiSelector from 'soapbox/components/ui/emoji-selector/emoji-selector'; import { useAppSelector, useOwnAccount, useSoapboxConfig } from 'soapbox/hooks'; diff --git a/app/soapbox/components/hover-ref-wrapper.tsx b/app/soapbox/components/hover-ref-wrapper.tsx index c8536fcdf..bcde02720 100644 --- a/app/soapbox/components/hover-ref-wrapper.tsx +++ b/app/soapbox/components/hover-ref-wrapper.tsx @@ -6,7 +6,7 @@ import { fetchAccount } from 'soapbox/actions/accounts'; import { openProfileHoverCard, closeProfileHoverCard, -} from 'soapbox/actions/profile_hover_card'; +} from 'soapbox/actions/profile-hover-card'; import { useAppDispatch } from 'soapbox/hooks'; import { isMobile } from 'soapbox/is-mobile'; diff --git a/app/soapbox/components/icon-button.js b/app/soapbox/components/icon-button.js index cb92c2841..bdfe157a6 100644 --- a/app/soapbox/components/icon-button.js +++ b/app/soapbox/components/icon-button.js @@ -6,7 +6,7 @@ import spring from 'react-motion/lib/spring'; import Icon from 'soapbox/components/icon'; import emojify from 'soapbox/features/emoji/emoji'; -import Motion from '../features/ui/util/optional_motion'; +import Motion from '../features/ui/util/optional-motion'; export default class IconButton extends React.PureComponent { diff --git a/app/soapbox/components/modal-root.tsx b/app/soapbox/components/modal-root.tsx index d17be3efc..f3cdac7da 100644 --- a/app/soapbox/components/modal-root.tsx +++ b/app/soapbox/components/modal-root.tsx @@ -9,7 +9,7 @@ import { openModal, closeModal } from 'soapbox/actions/modals'; import { useAppDispatch, useAppSelector, usePrevious } from 'soapbox/hooks'; import type { UnregisterCallback } from 'history'; -import type { ModalType } from 'soapbox/features/ui/components/modal_root'; +import type { ModalType } from 'soapbox/features/ui/components/modal-root'; import type { ReducerCompose } from 'soapbox/reducers/compose'; const messages = defineMessages({ diff --git a/app/soapbox/components/profile-hover-card.tsx b/app/soapbox/components/profile-hover-card.tsx index 1fce4feb3..367c788e0 100644 --- a/app/soapbox/components/profile-hover-card.tsx +++ b/app/soapbox/components/profile-hover-card.tsx @@ -8,10 +8,10 @@ import { fetchRelationships } from 'soapbox/actions/accounts'; import { closeProfileHoverCard, updateProfileHoverCard, -} from 'soapbox/actions/profile_hover_card'; +} from 'soapbox/actions/profile-hover-card'; import Badge from 'soapbox/components/badge'; import ActionButton from 'soapbox/features/ui/components/action-button'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { UserPanel } from 'soapbox/features/ui/util/async-components'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; diff --git a/app/soapbox/components/sidebar-menu.tsx b/app/soapbox/components/sidebar-menu.tsx index 2c695e5a1..0e0ae7f6f 100644 --- a/app/soapbox/components/sidebar-menu.tsx +++ b/app/soapbox/components/sidebar-menu.tsx @@ -9,7 +9,7 @@ import { getSettings } from 'soapbox/actions/settings'; import { closeSidebar } from 'soapbox/actions/sidebar'; import Account from 'soapbox/components/account'; import { Stack } from 'soapbox/components/ui'; -import ProfileStats from 'soapbox/features/ui/components/profile_stats'; +import ProfileStats from 'soapbox/features/ui/components/profile-stats'; import { useAppSelector, useFeatures } from 'soapbox/hooks'; import { makeGetAccount, makeGetOtherAccounts } from 'soapbox/selectors'; diff --git a/app/soapbox/components/status-list.tsx b/app/soapbox/components/status-list.tsx index dc782248f..68dba32c6 100644 --- a/app/soapbox/components/status-list.tsx +++ b/app/soapbox/components/status-list.tsx @@ -12,7 +12,7 @@ import Ad from 'soapbox/features/ads/components/ad'; import FeedSuggestions from 'soapbox/features/feed-suggestions/feed-suggestions'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status'; import { ALGORITHMS } from 'soapbox/features/timeline-insertion'; -import PendingStatus from 'soapbox/features/ui/components/pending_status'; +import PendingStatus from 'soapbox/features/ui/components/pending-status'; import { useSoapboxConfig } from 'soapbox/hooks'; import useAds from 'soapbox/queries/ads'; diff --git a/app/soapbox/components/upload-progress.tsx b/app/soapbox/components/upload-progress.tsx index a7996e1bf..fe9b84797 100644 --- a/app/soapbox/components/upload-progress.tsx +++ b/app/soapbox/components/upload-progress.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { spring } from 'react-motion'; import { HStack, Icon, Stack, Text } from 'soapbox/components/ui'; -import Motion from 'soapbox/features/ui/util/optional_motion'; +import Motion from 'soapbox/features/ui/util/optional-motion'; interface IUploadProgress { /** Number between 0 and 1 to represent the percentage complete. */ diff --git a/app/soapbox/containers/dropdown-menu-container.ts b/app/soapbox/containers/dropdown-menu-container.ts index 173203e50..936e3c5c2 100644 --- a/app/soapbox/containers/dropdown-menu-container.ts +++ b/app/soapbox/containers/dropdown-menu-container.ts @@ -1,6 +1,6 @@ import { connect } from 'react-redux'; -import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu'; +import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown-menu'; import { openModal, closeModal } from '../actions/modals'; import DropdownMenu from '../components/dropdown-menu'; import { isUserTouching } from '../is-mobile'; diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx index 10d4d3950..f1623f585 100644 --- a/app/soapbox/containers/soapbox.tsx +++ b/app/soapbox/containers/soapbox.tsx @@ -20,7 +20,7 @@ import LoadingScreen from 'soapbox/components/loading-screen'; import AuthLayout from 'soapbox/features/auth-layout'; import EmbeddedStatus from 'soapbox/features/embedded-status'; import PublicLayout from 'soapbox/features/public-layout'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { ModalContainer, NotificationsContainer, diff --git a/app/soapbox/features/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx index 5454d7b50..a015db3bd 100644 --- a/app/soapbox/features/account/components/header.tsx +++ b/app/soapbox/features/account/components/header.tsx @@ -8,7 +8,7 @@ import { Link, useHistory } from 'react-router-dom'; import { blockAccount, followAccount, pinAccount, removeFromFollowers, unblockAccount, unmuteAccount, unpinAccount } from 'soapbox/actions/accounts'; import { launchChat } from 'soapbox/actions/chats'; import { mentionCompose, directCompose } from 'soapbox/actions/compose'; -import { blockDomain, unblockDomain } from 'soapbox/actions/domain_blocks'; +import { blockDomain, unblockDomain } from 'soapbox/actions/domain-blocks'; import { openModal } from 'soapbox/actions/modals'; import { initMuteModal } from 'soapbox/actions/mutes'; import { initReport } from 'soapbox/actions/reports'; diff --git a/app/soapbox/features/admin/tabs/dashboard.tsx b/app/soapbox/features/admin/tabs/dashboard.tsx index 876cab00b..495f0ff37 100644 --- a/app/soapbox/features/admin/tabs/dashboard.tsx +++ b/app/soapbox/features/admin/tabs/dashboard.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { FormattedMessage, FormattedNumber } from 'react-intl'; import { Link } from 'react-router-dom'; -import { getSubscribersCsv, getUnsubscribersCsv, getCombinedCsv } from 'soapbox/actions/email_list'; +import { getSubscribersCsv, getUnsubscribersCsv, getCombinedCsv } from 'soapbox/actions/email-list'; import { Text } from 'soapbox/components/ui'; import { useAppSelector, useAppDispatch, useOwnAccount, useFeatures } from 'soapbox/hooks'; import sourceCode from 'soapbox/utils/code'; diff --git a/app/soapbox/features/auth-layout/index.tsx b/app/soapbox/features/auth-layout/index.tsx index 556db1042..b4f7ee12b 100644 --- a/app/soapbox/features/auth-layout/index.tsx +++ b/app/soapbox/features/auth-layout/index.tsx @@ -7,15 +7,15 @@ import SiteLogo from 'soapbox/components/site-logo'; import { useAppSelector, useFeatures, useSoapboxConfig, useOwnAccount } from 'soapbox/hooks'; import { Button, Card, CardBody } from '../../components/ui'; -import LoginPage from '../auth-login/components/login_page'; -import PasswordReset from '../auth-login/components/password_reset'; -import PasswordResetConfirm from '../auth-login/components/password_reset_confirm'; -import RegistrationForm from '../auth-login/components/registration_form'; +import LoginPage from '../auth-login/components/login-page'; +import PasswordReset from '../auth-login/components/password-reset'; +import PasswordResetConfirm from '../auth-login/components/password-reset-confirm'; +import RegistrationForm from '../auth-login/components/registration-form'; import ExternalLoginForm from '../external-login/components/external-login-form'; import Footer from '../public-layout/components/footer'; import RegisterInvite from '../register-invite'; import Verification from '../verification'; -import EmailPassthru from '../verification/email_passthru'; +import EmailPassthru from '../verification/email-passthru'; const messages = defineMessages({ register: { id: 'auth_layout.register', defaultMessage: 'Create an account' }, diff --git a/app/soapbox/features/auth-login/components/__tests__/login_form.test.tsx b/app/soapbox/features/auth-login/components/__tests__/login-form.test.tsx similarity index 96% rename from app/soapbox/features/auth-login/components/__tests__/login_form.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/login-form.test.tsx index 8c388601f..52a9210bb 100644 --- a/app/soapbox/features/auth-login/components/__tests__/login_form.test.tsx +++ b/app/soapbox/features/auth-login/components/__tests__/login-form.test.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { normalizeInstance } from 'soapbox/normalizers'; import { fireEvent, render, screen } from '../../../../jest/test-helpers'; -import LoginForm from '../login_form'; +import LoginForm from '../login-form'; describe('', () => { it('renders for Pleroma', () => { diff --git a/app/soapbox/features/auth-login/components/__tests__/login_page.test.tsx b/app/soapbox/features/auth-login/components/__tests__/login-page.test.tsx similarity index 97% rename from app/soapbox/features/auth-login/components/__tests__/login_page.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/login-page.test.tsx index 70a0f3b95..987403bce 100644 --- a/app/soapbox/features/auth-login/components/__tests__/login_page.test.tsx +++ b/app/soapbox/features/auth-login/components/__tests__/login-page.test.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { normalizeInstance } from 'soapbox/normalizers'; import { render, screen } from '../../../../jest/test-helpers'; -import LoginPage from '../login_page'; +import LoginPage from '../login-page'; describe('', () => { it('renders correctly on load', () => { diff --git a/app/soapbox/features/auth-login/components/__tests__/otp_auth_form.test.tsx b/app/soapbox/features/auth-login/components/__tests__/otp-auth-form.test.tsx similarity index 88% rename from app/soapbox/features/auth-login/components/__tests__/otp_auth_form.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/otp-auth-form.test.tsx index 2217d62e5..3b1890102 100644 --- a/app/soapbox/features/auth-login/components/__tests__/otp_auth_form.test.tsx +++ b/app/soapbox/features/auth-login/components/__tests__/otp-auth-form.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render, screen } from '../../../../jest/test-helpers'; -import OtpAuthForm from '../otp_auth_form'; +import OtpAuthForm from '../otp-auth-form'; describe('', () => { it('renders correctly', () => { diff --git a/app/soapbox/features/auth-login/components/__tests__/password_reset_confirm.test.tsx b/app/soapbox/features/auth-login/components/__tests__/password-reset-confirm.test.tsx similarity index 96% rename from app/soapbox/features/auth-login/components/__tests__/password_reset_confirm.test.tsx rename to app/soapbox/features/auth-login/components/__tests__/password-reset-confirm.test.tsx index 1d38e6e58..0213d1a59 100644 --- a/app/soapbox/features/auth-login/components/__tests__/password_reset_confirm.test.tsx +++ b/app/soapbox/features/auth-login/components/__tests__/password-reset-confirm.test.tsx @@ -4,7 +4,7 @@ import { Route, Switch } from 'react-router-dom'; import { __stub } from 'soapbox/api'; import { fireEvent, render, screen, waitFor } from '../../../../jest/test-helpers'; -import PasswordResetConfirm from '../password_reset_confirm'; +import PasswordResetConfirm from '../password-reset-confirm'; const TestableComponent = () => ( diff --git a/app/soapbox/features/auth-login/components/login_form.tsx b/app/soapbox/features/auth-login/components/login-form.tsx similarity index 100% rename from app/soapbox/features/auth-login/components/login_form.tsx rename to app/soapbox/features/auth-login/components/login-form.tsx diff --git a/app/soapbox/features/auth-login/components/login_page.tsx b/app/soapbox/features/auth-login/components/login-page.tsx similarity index 96% rename from app/soapbox/features/auth-login/components/login_page.tsx rename to app/soapbox/features/auth-login/components/login-page.tsx index dd37e5f63..c137d0165 100644 --- a/app/soapbox/features/auth-login/components/login_page.tsx +++ b/app/soapbox/features/auth-login/components/login-page.tsx @@ -8,8 +8,8 @@ import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { getRedirectUrl } from 'soapbox/utils/redirect'; import { isStandalone } from 'soapbox/utils/state'; -import LoginForm from './login_form'; -import OtpAuthForm from './otp_auth_form'; +import LoginForm from './login-form'; +import OtpAuthForm from './otp-auth-form'; import type { AxiosError } from 'axios'; diff --git a/app/soapbox/features/auth-login/components/otp_auth_form.tsx b/app/soapbox/features/auth-login/components/otp-auth-form.tsx similarity index 100% rename from app/soapbox/features/auth-login/components/otp_auth_form.tsx rename to app/soapbox/features/auth-login/components/otp-auth-form.tsx diff --git a/app/soapbox/features/auth-login/components/password_reset_confirm.tsx b/app/soapbox/features/auth-login/components/password-reset-confirm.tsx similarity index 100% rename from app/soapbox/features/auth-login/components/password_reset_confirm.tsx rename to app/soapbox/features/auth-login/components/password-reset-confirm.tsx diff --git a/app/soapbox/features/auth-login/components/password_reset.tsx b/app/soapbox/features/auth-login/components/password-reset.tsx similarity index 100% rename from app/soapbox/features/auth-login/components/password_reset.tsx rename to app/soapbox/features/auth-login/components/password-reset.tsx diff --git a/app/soapbox/features/auth-login/components/registration_form.tsx b/app/soapbox/features/auth-login/components/registration-form.tsx similarity index 100% rename from app/soapbox/features/auth-login/components/registration_form.tsx rename to app/soapbox/features/auth-login/components/registration-form.tsx diff --git a/app/soapbox/features/backups/index.tsx b/app/soapbox/features/backups/index.tsx index bbffec85f..27930f208 100644 --- a/app/soapbox/features/backups/index.tsx +++ b/app/soapbox/features/backups/index.tsx @@ -6,7 +6,7 @@ import { fetchBackups, createBackup } from 'soapbox/actions/backups'; import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; -import Column from '../ui/components/better_column'; +import Column from '../ui/components/better-column'; const messages = defineMessages({ heading: { id: 'column.backups', defaultMessage: 'Backups' }, diff --git a/app/soapbox/features/compose/components/privacy-dropdown.tsx b/app/soapbox/features/compose/components/privacy-dropdown.tsx index 074e86ec4..2543763da 100644 --- a/app/soapbox/features/compose/components/privacy-dropdown.tsx +++ b/app/soapbox/features/compose/components/privacy-dropdown.tsx @@ -13,7 +13,7 @@ import { IconButton } from 'soapbox/components/ui'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; import { isUserTouching } from 'soapbox/is-mobile'; -import Motion from '../../ui/util/optional_motion'; +import Motion from '../../ui/util/optional-motion'; const messages = defineMessages({ public_short: { id: 'privacy.public.short', defaultMessage: 'Public' }, diff --git a/app/soapbox/features/compose/components/schedule-form.tsx b/app/soapbox/features/compose/components/schedule-form.tsx index d08e3d252..bb8ef7368 100644 --- a/app/soapbox/features/compose/components/schedule-form.tsx +++ b/app/soapbox/features/compose/components/schedule-form.tsx @@ -7,7 +7,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { setSchedule, removeSchedule } from 'soapbox/actions/compose'; import IconButton from 'soapbox/components/icon-button'; import { HStack, Stack, Text } from 'soapbox/components/ui'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { DatePicker } from 'soapbox/features/ui/util/async-components'; import { useAppDispatch, useCompose } from 'soapbox/hooks'; diff --git a/app/soapbox/features/compose/components/search-results.tsx b/app/soapbox/features/compose/components/search-results.tsx index ed8c973c2..4484ea281 100644 --- a/app/soapbox/features/compose/components/search-results.tsx +++ b/app/soapbox/features/compose/components/search-results.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useRef } from 'react'; import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; import { expandSearch, setFilter, setSearchAccount } from 'soapbox/actions/search'; -import { fetchTrendingStatuses } from 'soapbox/actions/trending_statuses'; +import { fetchTrendingStatuses } from 'soapbox/actions/trending-statuses'; import Hashtag from 'soapbox/components/hashtag'; import IconButton from 'soapbox/components/icon-button'; import ScrollableList from 'soapbox/components/scrollable-list'; diff --git a/app/soapbox/features/compose/components/upload.tsx b/app/soapbox/features/compose/components/upload.tsx index f2f199d6e..769efcdd1 100644 --- a/app/soapbox/features/compose/components/upload.tsx +++ b/app/soapbox/features/compose/components/upload.tsx @@ -12,7 +12,7 @@ import Icon from 'soapbox/components/icon'; import IconButton from 'soapbox/components/icon-button'; import { useAppDispatch, useAppSelector, useCompose } from 'soapbox/hooks'; -import Motion from '../../ui/util/optional_motion'; +import Motion from '../../ui/util/optional-motion'; const bookIcon = require('@tabler/icons/book.svg'); const fileCodeIcon = require('@tabler/icons/file-code.svg'); diff --git a/app/soapbox/features/compose/components/warning.tsx b/app/soapbox/features/compose/components/warning.tsx index b8ec90e09..8100e3781 100644 --- a/app/soapbox/features/compose/components/warning.tsx +++ b/app/soapbox/features/compose/components/warning.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { spring } from 'react-motion'; -import Motion from '../../ui/util/optional_motion'; +import Motion from '../../ui/util/optional-motion'; interface IWarning { message: React.ReactNode, diff --git a/app/soapbox/features/compose/containers/schedule-form-container.tsx b/app/soapbox/features/compose/containers/schedule-form-container.tsx index efa30a894..7044f4cd2 100644 --- a/app/soapbox/features/compose/containers/schedule-form-container.tsx +++ b/app/soapbox/features/compose/containers/schedule-form-container.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { ScheduleForm } from 'soapbox/features/ui/util/async-components'; import type { IScheduleForm } from '../components/schedule-form'; diff --git a/app/soapbox/features/directory/components/account_card.tsx b/app/soapbox/features/directory/components/account-card.tsx similarity index 100% rename from app/soapbox/features/directory/components/account_card.tsx rename to app/soapbox/features/directory/components/account-card.tsx diff --git a/app/soapbox/features/directory/index.tsx b/app/soapbox/features/directory/index.tsx index ff06e6659..218df836f 100644 --- a/app/soapbox/features/directory/index.tsx +++ b/app/soapbox/features/directory/index.tsx @@ -11,7 +11,7 @@ import Column from 'soapbox/features/ui/components/column'; import { useAppSelector } from 'soapbox/hooks'; import { getFeatures } from 'soapbox/utils/features'; -import AccountCard from './components/account_card'; +import AccountCard from './components/account-card'; const messages = defineMessages({ title: { id: 'column.directory', defaultMessage: 'Browse profiles' }, diff --git a/app/soapbox/features/domain-blocks/index.tsx b/app/soapbox/features/domain-blocks/index.tsx index 91c0337c9..531ad1874 100644 --- a/app/soapbox/features/domain-blocks/index.tsx +++ b/app/soapbox/features/domain-blocks/index.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import { useDispatch } from 'react-redux'; -import { fetchDomainBlocks, expandDomainBlocks } from 'soapbox/actions/domain_blocks'; +import { fetchDomainBlocks, expandDomainBlocks } from 'soapbox/actions/domain-blocks'; import Domain from 'soapbox/components/domain'; import ScrollableList from 'soapbox/components/scrollable-list'; import { Spinner } from 'soapbox/components/ui'; diff --git a/app/soapbox/features/export-data/index.tsx b/app/soapbox/features/export-data/index.tsx index d05c94293..5883f5ac2 100644 --- a/app/soapbox/features/export-data/index.tsx +++ b/app/soapbox/features/export-data/index.tsx @@ -5,7 +5,7 @@ import { exportFollows, exportBlocks, exportMutes, -} from 'soapbox/actions/export_data'; +} from 'soapbox/actions/export-data'; import Column from '../ui/components/column'; diff --git a/app/soapbox/features/external-login/components/external-login-form.tsx b/app/soapbox/features/external-login/components/external-login-form.tsx index f56f6678a..4a9e6edbf 100644 --- a/app/soapbox/features/external-login/components/external-login-form.tsx +++ b/app/soapbox/features/external-login/components/external-login-form.tsx @@ -1,7 +1,7 @@ import React, { useState, useEffect } from 'react'; import { useIntl, FormattedMessage, defineMessages } from 'react-intl'; -import { externalLogin, loginWithCode } from 'soapbox/actions/external_auth'; +import { externalLogin, loginWithCode } from 'soapbox/actions/external-auth'; import snackbar from 'soapbox/actions/snackbar'; import { Button, Form, FormActions, FormGroup, Input, Spinner } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/import-data/index.tsx b/app/soapbox/features/import-data/index.tsx index ca03e6701..9955ec6c3 100644 --- a/app/soapbox/features/import-data/index.tsx +++ b/app/soapbox/features/import-data/index.tsx @@ -5,7 +5,7 @@ import { importFollows, importBlocks, importMutes, -} from 'soapbox/actions/import_data'; +} from 'soapbox/actions/import-data'; import Column from '../ui/components/column'; diff --git a/app/soapbox/features/landing-page/index.tsx b/app/soapbox/features/landing-page/index.tsx index 04e59044a..b5332fa34 100644 --- a/app/soapbox/features/landing-page/index.tsx +++ b/app/soapbox/features/landing-page/index.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; import { prepareRequest } from 'soapbox/actions/consumer-auth'; import { Button, Card, CardBody, Stack, Text } from 'soapbox/components/ui'; import VerificationBadge from 'soapbox/components/verification-badge'; -import RegistrationForm from 'soapbox/features/auth-login/components/registration_form'; +import RegistrationForm from 'soapbox/features/auth-login/components/registration-form'; import { useAppDispatch, useAppSelector, useFeatures, useSoapboxConfig } from 'soapbox/hooks'; import { capitalize } from 'soapbox/utils/strings'; diff --git a/app/soapbox/features/list_editor/components/account.tsx b/app/soapbox/features/list-editor/components/account.tsx similarity index 100% rename from app/soapbox/features/list_editor/components/account.tsx rename to app/soapbox/features/list-editor/components/account.tsx diff --git a/app/soapbox/features/list_editor/components/edit_list_form.tsx b/app/soapbox/features/list-editor/components/edit-list-form.tsx similarity index 100% rename from app/soapbox/features/list_editor/components/edit_list_form.tsx rename to app/soapbox/features/list-editor/components/edit-list-form.tsx diff --git a/app/soapbox/features/list_editor/components/search.tsx b/app/soapbox/features/list-editor/components/search.tsx similarity index 100% rename from app/soapbox/features/list_editor/components/search.tsx rename to app/soapbox/features/list-editor/components/search.tsx diff --git a/app/soapbox/features/list_editor/index.tsx b/app/soapbox/features/list-editor/index.tsx similarity index 97% rename from app/soapbox/features/list_editor/index.tsx rename to app/soapbox/features/list-editor/index.tsx index c2a784adc..38726ceac 100644 --- a/app/soapbox/features/list_editor/index.tsx +++ b/app/soapbox/features/list-editor/index.tsx @@ -6,7 +6,7 @@ import { CardHeader, CardTitle, Modal } from 'soapbox/components/ui'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import Account from './components/account'; -import EditListForm from './components/edit_list_form'; +import EditListForm from './components/edit-list-form'; import Search from './components/search'; const messages = defineMessages({ diff --git a/app/soapbox/features/list_timeline/index.tsx b/app/soapbox/features/list-timeline/index.tsx similarity index 100% rename from app/soapbox/features/list_timeline/index.tsx rename to app/soapbox/features/list-timeline/index.tsx diff --git a/app/soapbox/features/pinned-statuses/index.tsx b/app/soapbox/features/pinned-statuses/index.tsx index c04643647..54c7b7d08 100644 --- a/app/soapbox/features/pinned-statuses/index.tsx +++ b/app/soapbox/features/pinned-statuses/index.tsx @@ -2,7 +2,7 @@ import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { useParams } from 'react-router-dom'; -import { fetchPinnedStatuses } from 'soapbox/actions/pin_statuses'; +import { fetchPinnedStatuses } from 'soapbox/actions/pin-statuses'; import MissingIndicator from 'soapbox/components/missing-indicator'; import StatusList from 'soapbox/components/status-list'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/register-invite/index.tsx b/app/soapbox/features/register-invite/index.tsx index 3614fb91f..c97469011 100644 --- a/app/soapbox/features/register-invite/index.tsx +++ b/app/soapbox/features/register-invite/index.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { useParams } from 'react-router-dom'; import { Stack, CardTitle, Text } from 'soapbox/components/ui'; -import RegistrationForm from 'soapbox/features/auth-login/components/registration_form'; +import RegistrationForm from 'soapbox/features/auth-login/components/registration-form'; import { useAppSelector } from 'soapbox/hooks'; interface RegisterInviteParams { diff --git a/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx index d22a90bf3..6ee898eb6 100644 --- a/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx +++ b/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { openModal } from 'soapbox/actions/modals'; -import { cancelScheduledStatus } from 'soapbox/actions/scheduled_statuses'; +import { cancelScheduledStatus } from 'soapbox/actions/scheduled-statuses'; import { getSettings } from 'soapbox/actions/settings'; import IconButton from 'soapbox/components/icon-button'; import { HStack } from 'soapbox/components/ui'; diff --git a/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx index e0e174dfb..1d1a68c94 100644 --- a/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx +++ b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx @@ -6,7 +6,7 @@ import StatusContent from 'soapbox/components/status-content'; import StatusReplyMentions from 'soapbox/components/status-reply-mentions'; import { HStack } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account-container'; -import PollPreview from 'soapbox/features/ui/components/poll_preview'; +import PollPreview from 'soapbox/features/ui/components/poll-preview'; import { useAppSelector } from 'soapbox/hooks'; import { buildStatus } from '../builder'; diff --git a/app/soapbox/features/scheduled-statuses/index.tsx b/app/soapbox/features/scheduled-statuses/index.tsx index 03d27512e..1982af5b9 100644 --- a/app/soapbox/features/scheduled-statuses/index.tsx +++ b/app/soapbox/features/scheduled-statuses/index.tsx @@ -2,7 +2,7 @@ import debounce from 'lodash/debounce'; import React, { useEffect } from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; -import { fetchScheduledStatuses, expandScheduledStatuses } from 'soapbox/actions/scheduled_statuses'; +import { fetchScheduledStatuses, expandScheduledStatuses } from 'soapbox/actions/scheduled-statuses'; import ScrollableList from 'soapbox/components/scrollable-list'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/server-info/index.tsx b/app/soapbox/features/server-info/index.tsx index 0e12538d4..cadcf26a4 100644 --- a/app/soapbox/features/server-info/index.tsx +++ b/app/soapbox/features/server-info/index.tsx @@ -4,8 +4,8 @@ import { defineMessages, useIntl } from 'react-intl'; import { useAppSelector } from 'soapbox/hooks'; import Column from '../ui/components/column'; -import LinkFooter from '../ui/components/link_footer'; -import PromoPanel from '../ui/components/promo_panel'; +import LinkFooter from '../ui/components/link-footer'; +import PromoPanel from '../ui/components/promo-panel'; const messages = defineMessages({ heading: { id: 'column.info', defaultMessage: 'Server information' }, diff --git a/app/soapbox/features/soapbox-config/components/site-preview.tsx b/app/soapbox/features/soapbox-config/components/site-preview.tsx index 94c349e25..b9f795d4a 100644 --- a/app/soapbox/features/soapbox-config/components/site-preview.tsx +++ b/app/soapbox/features/soapbox-config/components/site-preview.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; import { defaultSettings } from 'soapbox/actions/settings'; import SiteLogo from 'soapbox/components/site-logo'; -import BackgroundShapes from 'soapbox/features/ui/components/background_shapes'; +import BackgroundShapes from 'soapbox/features/ui/components/background-shapes'; import { useSystemTheme } from 'soapbox/hooks'; import { normalizeSoapboxConfig } from 'soapbox/normalizers'; import { generateThemeCss } from 'soapbox/utils/theme'; diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx index 37598c45c..c043a9b2a 100644 --- a/app/soapbox/features/status/index.tsx +++ b/app/soapbox/features/status/index.tsx @@ -33,7 +33,7 @@ import SubNavigation from 'soapbox/components/sub-navigation'; import Tombstone from 'soapbox/components/tombstone'; import { Column, Stack } from 'soapbox/components/ui'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status'; -import PendingStatus from 'soapbox/features/ui/components/pending_status'; +import PendingStatus from 'soapbox/features/ui/components/pending-status'; import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; import { makeGetStatus } from 'soapbox/selectors'; import { defaultMediaVisibility, textForScreenReader } from 'soapbox/utils/status'; diff --git a/app/soapbox/features/ui/__tests__/index.test.tsx b/app/soapbox/features/ui/__tests__/index.test.tsx index c28c21589..1d3164f77 100644 --- a/app/soapbox/features/ui/__tests__/index.test.tsx +++ b/app/soapbox/features/ui/__tests__/index.test.tsx @@ -5,7 +5,7 @@ import { Route, Switch } from 'react-router-dom'; import { render, screen, waitFor } from '../../../jest/test-helpers'; import { normalizeAccount } from '../../../normalizers'; import UI from '../index'; -import { WrappedRoute } from '../util/react_router_helpers'; +import { WrappedRoute } from '../util/react-router-helpers'; const TestableComponent = () => ( diff --git a/app/soapbox/features/ui/components/account_note_modal.tsx b/app/soapbox/features/ui/components/account-note-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/account_note_modal.tsx rename to app/soapbox/features/ui/components/account-note-modal.tsx diff --git a/app/soapbox/features/ui/components/actions_modal.tsx b/app/soapbox/features/ui/components/actions-modal.tsx similarity index 98% rename from app/soapbox/features/ui/components/actions_modal.tsx rename to app/soapbox/features/ui/components/actions-modal.tsx index 43815a3dd..9e833be16 100644 --- a/app/soapbox/features/ui/components/actions_modal.tsx +++ b/app/soapbox/features/ui/components/actions-modal.tsx @@ -8,7 +8,7 @@ import StatusContent from 'soapbox/components/status-content'; import { Stack } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account-container'; -import Motion from '../util/optional_motion'; +import Motion from '../util/optional-motion'; import type { Menu, MenuItem } from 'soapbox/components/dropdown-menu'; import type { Status as StatusEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/ui/components/background_shapes.tsx b/app/soapbox/features/ui/components/background-shapes.tsx similarity index 100% rename from app/soapbox/features/ui/components/background_shapes.tsx rename to app/soapbox/features/ui/components/background-shapes.tsx diff --git a/app/soapbox/features/ui/components/better_column.js b/app/soapbox/features/ui/components/better-column.js similarity index 96% rename from app/soapbox/features/ui/components/better_column.js rename to app/soapbox/features/ui/components/better-column.js index cbbf067a3..2547acb33 100644 --- a/app/soapbox/features/ui/components/better_column.js +++ b/app/soapbox/features/ui/components/better-column.js @@ -4,7 +4,7 @@ import React from 'react'; import { Column } from 'soapbox/components/ui'; import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; -import ColumnHeader from './column_header'; +import ColumnHeader from './column-header'; // Yes, there are 3 types of columns at this point, but this one is better, I swear export default class BetterColumn extends React.PureComponent { diff --git a/app/soapbox/features/ui/components/birthdays_modal.tsx b/app/soapbox/features/ui/components/birthdays-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/birthdays_modal.tsx rename to app/soapbox/features/ui/components/birthdays-modal.tsx diff --git a/app/soapbox/features/ui/components/boost_modal.tsx b/app/soapbox/features/ui/components/boost-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/boost_modal.tsx rename to app/soapbox/features/ui/components/boost-modal.tsx diff --git a/app/soapbox/features/ui/components/bundle_column_error.tsx b/app/soapbox/features/ui/components/bundle-column-error.tsx similarity index 100% rename from app/soapbox/features/ui/components/bundle_column_error.tsx rename to app/soapbox/features/ui/components/bundle-column-error.tsx diff --git a/app/soapbox/features/ui/components/bundle_modal_error.tsx b/app/soapbox/features/ui/components/bundle-modal-error.tsx similarity index 100% rename from app/soapbox/features/ui/components/bundle_modal_error.tsx rename to app/soapbox/features/ui/components/bundle-modal-error.tsx diff --git a/app/soapbox/features/ui/components/column_forbidden.tsx b/app/soapbox/features/ui/components/column-forbidden.tsx similarity index 100% rename from app/soapbox/features/ui/components/column_forbidden.tsx rename to app/soapbox/features/ui/components/column-forbidden.tsx diff --git a/app/soapbox/features/ui/components/column_header.tsx b/app/soapbox/features/ui/components/column-header.tsx similarity index 100% rename from app/soapbox/features/ui/components/column_header.tsx rename to app/soapbox/features/ui/components/column-header.tsx diff --git a/app/soapbox/features/ui/components/column_loading.tsx b/app/soapbox/features/ui/components/column-loading.tsx similarity index 100% rename from app/soapbox/features/ui/components/column_loading.tsx rename to app/soapbox/features/ui/components/column-loading.tsx diff --git a/app/soapbox/features/ui/components/column.tsx b/app/soapbox/features/ui/components/column.tsx index f0bc6cfdf..9604049b4 100644 --- a/app/soapbox/features/ui/components/column.tsx +++ b/app/soapbox/features/ui/components/column.tsx @@ -3,7 +3,7 @@ import React from 'react'; import Pullable from 'soapbox/components/pullable'; import { Column } from 'soapbox/components/ui'; -import ColumnHeader from './column_header'; +import ColumnHeader from './column-header'; import type { IColumn } from 'soapbox/components/ui/column/column'; diff --git a/app/soapbox/features/ui/components/columns_area.tsx b/app/soapbox/features/ui/components/columns-area.tsx similarity index 100% rename from app/soapbox/features/ui/components/columns_area.tsx rename to app/soapbox/features/ui/components/columns-area.tsx diff --git a/app/soapbox/features/ui/components/compare_history_modal.tsx b/app/soapbox/features/ui/components/compare-history-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/compare_history_modal.tsx rename to app/soapbox/features/ui/components/compare-history-modal.tsx diff --git a/app/soapbox/features/ui/components/component_modal.tsx b/app/soapbox/features/ui/components/component-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/component_modal.tsx rename to app/soapbox/features/ui/components/component-modal.tsx diff --git a/app/soapbox/features/ui/components/compose_modal.tsx b/app/soapbox/features/ui/components/compose-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/compose_modal.tsx rename to app/soapbox/features/ui/components/compose-modal.tsx diff --git a/app/soapbox/features/ui/components/confirmation_modal.tsx b/app/soapbox/features/ui/components/confirmation-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/confirmation_modal.tsx rename to app/soapbox/features/ui/components/confirmation-modal.tsx diff --git a/app/soapbox/features/ui/components/crypto_donate_modal.tsx b/app/soapbox/features/ui/components/crypto-donate-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/crypto_donate_modal.tsx rename to app/soapbox/features/ui/components/crypto-donate-modal.tsx diff --git a/app/soapbox/features/ui/components/edit_federation_modal.tsx b/app/soapbox/features/ui/components/edit-federation-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/edit_federation_modal.tsx rename to app/soapbox/features/ui/components/edit-federation-modal.tsx diff --git a/app/soapbox/features/ui/components/familiar_followers_modal.tsx b/app/soapbox/features/ui/components/familiar-followers-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/familiar_followers_modal.tsx rename to app/soapbox/features/ui/components/familiar-followers-modal.tsx diff --git a/app/soapbox/features/ui/components/funding_panel.tsx b/app/soapbox/features/ui/components/funding-panel.tsx similarity index 100% rename from app/soapbox/features/ui/components/funding_panel.tsx rename to app/soapbox/features/ui/components/funding-panel.tsx diff --git a/app/soapbox/features/ui/components/hotkeys_modal.tsx b/app/soapbox/features/ui/components/hotkeys-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/hotkeys_modal.tsx rename to app/soapbox/features/ui/components/hotkeys-modal.tsx diff --git a/app/soapbox/features/ui/components/instance_info_panel.tsx b/app/soapbox/features/ui/components/instance-info-panel.tsx similarity index 96% rename from app/soapbox/features/ui/components/instance_info_panel.tsx rename to app/soapbox/features/ui/components/instance-info-panel.tsx index 3467455b3..281182cbc 100644 --- a/app/soapbox/features/ui/components/instance_info_panel.tsx +++ b/app/soapbox/features/ui/components/instance-info-panel.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { useIntl, defineMessages } from 'react-intl'; -import { pinHost, unpinHost } from 'soapbox/actions/remote_timeline'; +import { pinHost, unpinHost } from 'soapbox/actions/remote-timeline'; import { Widget } from 'soapbox/components/ui'; import { useAppSelector, useAppDispatch, useSettings } from 'soapbox/hooks'; import { makeGetRemoteInstance } from 'soapbox/selectors'; diff --git a/app/soapbox/features/ui/components/instance_moderation_panel.tsx b/app/soapbox/features/ui/components/instance-moderation-panel.tsx similarity index 100% rename from app/soapbox/features/ui/components/instance_moderation_panel.tsx rename to app/soapbox/features/ui/components/instance-moderation-panel.tsx diff --git a/app/soapbox/features/ui/components/link_footer.tsx b/app/soapbox/features/ui/components/link-footer.tsx similarity index 100% rename from app/soapbox/features/ui/components/link_footer.tsx rename to app/soapbox/features/ui/components/link-footer.tsx diff --git a/app/soapbox/features/ui/components/list_panel.tsx b/app/soapbox/features/ui/components/list-panel.tsx similarity index 100% rename from app/soapbox/features/ui/components/list_panel.tsx rename to app/soapbox/features/ui/components/list-panel.tsx diff --git a/app/soapbox/features/ui/components/mentions_modal.tsx b/app/soapbox/features/ui/components/mentions-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/mentions_modal.tsx rename to app/soapbox/features/ui/components/mentions-modal.tsx diff --git a/app/soapbox/features/ui/components/missing_description_modal.tsx b/app/soapbox/features/ui/components/missing-description-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/missing_description_modal.tsx rename to app/soapbox/features/ui/components/missing-description-modal.tsx diff --git a/app/soapbox/features/ui/components/modal_loading.tsx b/app/soapbox/features/ui/components/modal-loading.tsx similarity index 100% rename from app/soapbox/features/ui/components/modal_loading.tsx rename to app/soapbox/features/ui/components/modal-loading.tsx diff --git a/app/soapbox/features/ui/components/modal_root.tsx b/app/soapbox/features/ui/components/modal-root.tsx similarity index 95% rename from app/soapbox/features/ui/components/modal_root.tsx rename to app/soapbox/features/ui/components/modal-root.tsx index 282bb4104..ceee5c1ec 100644 --- a/app/soapbox/features/ui/components/modal_root.tsx +++ b/app/soapbox/features/ui/components/modal-root.tsx @@ -33,11 +33,11 @@ import { AccountModerationModal, } from 'soapbox/features/ui/util/async-components'; -import BundleContainer from '../containers/bundle_container'; +import BundleContainer from '../containers/bundle-container'; import { BundleProps } from './bundle'; -import BundleModalError from './bundle_modal_error'; -import ModalLoading from './modal_loading'; +import BundleModalError from './bundle-modal-error'; +import ModalLoading from './modal-loading'; const MODAL_COMPONENTS = { 'MEDIA': MediaModal, diff --git a/app/soapbox/features/ui/components/mute_modal.tsx b/app/soapbox/features/ui/components/mute-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/mute_modal.tsx rename to app/soapbox/features/ui/components/mute-modal.tsx diff --git a/app/soapbox/features/ui/components/pending_status.tsx b/app/soapbox/features/ui/components/pending-status.tsx similarity index 96% rename from app/soapbox/features/ui/components/pending_status.tsx rename to app/soapbox/features/ui/components/pending-status.tsx index 343c88f43..5ea14a72b 100644 --- a/app/soapbox/features/ui/components/pending_status.tsx +++ b/app/soapbox/features/ui/components/pending-status.tsx @@ -10,9 +10,9 @@ import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/pla import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container'; import { useAppSelector } from 'soapbox/hooks'; -import { buildStatus } from '../util/pending_status_builder'; +import { buildStatus } from '../util/pending-status-builder'; -import PollPreview from './poll_preview'; +import PollPreview from './poll-preview'; import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/ui/components/pinned_accounts_panel.tsx b/app/soapbox/features/ui/components/pinned-accounts-panel.tsx similarity index 99% rename from app/soapbox/features/ui/components/pinned_accounts_panel.tsx rename to app/soapbox/features/ui/components/pinned-accounts-panel.tsx index f99cb02df..8139f342e 100644 --- a/app/soapbox/features/ui/components/pinned_accounts_panel.tsx +++ b/app/soapbox/features/ui/components/pinned-accounts-panel.tsx @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl'; import { fetchPinnedAccounts } from 'soapbox/actions/accounts'; import { Widget } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account-container'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { WhoToFollowPanel } from 'soapbox/features/ui/util/async-components'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; diff --git a/app/soapbox/features/ui/components/poll_preview.tsx b/app/soapbox/features/ui/components/poll-preview.tsx similarity index 100% rename from app/soapbox/features/ui/components/poll_preview.tsx rename to app/soapbox/features/ui/components/poll-preview.tsx diff --git a/app/soapbox/features/ui/components/profile_familiar_followers.tsx b/app/soapbox/features/ui/components/profile-familiar-followers.tsx similarity index 97% rename from app/soapbox/features/ui/components/profile_familiar_followers.tsx rename to app/soapbox/features/ui/components/profile-familiar-followers.tsx index 2d395a2a6..5a9d9ede9 100644 --- a/app/soapbox/features/ui/components/profile_familiar_followers.tsx +++ b/app/soapbox/features/ui/components/profile-familiar-followers.tsx @@ -4,7 +4,7 @@ import { FormattedList, FormattedMessage } from 'react-intl'; import { useDispatch } from 'react-redux'; import { Link } from 'react-router-dom'; -import { fetchAccountFamiliarFollowers } from 'soapbox/actions/familiar_followers'; +import { fetchAccountFamiliarFollowers } from 'soapbox/actions/familiar-followers'; import { openModal } from 'soapbox/actions/modals'; import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; import { Text } from 'soapbox/components/ui'; diff --git a/app/soapbox/features/ui/components/profile_fields_panel.tsx b/app/soapbox/features/ui/components/profile-fields-panel.tsx similarity index 99% rename from app/soapbox/features/ui/components/profile_fields_panel.tsx rename to app/soapbox/features/ui/components/profile-fields-panel.tsx index 053226dcc..dfa4dc84a 100644 --- a/app/soapbox/features/ui/components/profile_fields_panel.tsx +++ b/app/soapbox/features/ui/components/profile-fields-panel.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { defineMessages, useIntl, FormattedMessage, FormatDateOptions } from 'react-intl'; import { Widget, Stack, HStack, Icon, Text } from 'soapbox/components/ui'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { CryptoAddress } from 'soapbox/features/ui/util/async-components'; import type { Account, Field } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/ui/components/profile_info_panel.tsx b/app/soapbox/features/ui/components/profile-info-panel.tsx similarity index 98% rename from app/soapbox/features/ui/components/profile_info_panel.tsx rename to app/soapbox/features/ui/components/profile-info-panel.tsx index ce39c9b3c..cf97b78e7 100644 --- a/app/soapbox/features/ui/components/profile_info_panel.tsx +++ b/app/soapbox/features/ui/components/profile-info-panel.tsx @@ -11,8 +11,8 @@ import { isLocal } from 'soapbox/utils/accounts'; import { badgeToTag, getBadges as getAccountBadges } from 'soapbox/utils/badges'; import { capitalize } from 'soapbox/utils/strings'; -import ProfileFamiliarFollowers from './profile_familiar_followers'; -import ProfileStats from './profile_stats'; +import ProfileFamiliarFollowers from './profile-familiar-followers'; +import ProfileStats from './profile-stats'; import type { Account } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/ui/components/profile_media_panel.tsx b/app/soapbox/features/ui/components/profile-media-panel.tsx similarity index 100% rename from app/soapbox/features/ui/components/profile_media_panel.tsx rename to app/soapbox/features/ui/components/profile-media-panel.tsx diff --git a/app/soapbox/features/ui/components/profile_stats.tsx b/app/soapbox/features/ui/components/profile-stats.tsx similarity index 100% rename from app/soapbox/features/ui/components/profile_stats.tsx rename to app/soapbox/features/ui/components/profile-stats.tsx diff --git a/app/soapbox/features/ui/components/promo_panel.tsx b/app/soapbox/features/ui/components/promo-panel.tsx similarity index 100% rename from app/soapbox/features/ui/components/promo_panel.tsx rename to app/soapbox/features/ui/components/promo-panel.tsx diff --git a/app/soapbox/features/ui/components/reactions_modal.tsx b/app/soapbox/features/ui/components/reactions-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/reactions_modal.tsx rename to app/soapbox/features/ui/components/reactions-modal.tsx diff --git a/app/soapbox/features/ui/components/reblogs_modal.tsx b/app/soapbox/features/ui/components/reblogs-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/reblogs_modal.tsx rename to app/soapbox/features/ui/components/reblogs-modal.tsx diff --git a/app/soapbox/features/ui/components/reply_mentions_modal.tsx b/app/soapbox/features/ui/components/reply-mentions-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/reply_mentions_modal.tsx rename to app/soapbox/features/ui/components/reply-mentions-modal.tsx diff --git a/app/soapbox/features/ui/components/unauthorized_modal.tsx b/app/soapbox/features/ui/components/unauthorized-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/unauthorized_modal.tsx rename to app/soapbox/features/ui/components/unauthorized-modal.tsx diff --git a/app/soapbox/features/ui/components/upload_area.tsx b/app/soapbox/features/ui/components/upload-area.tsx similarity index 97% rename from app/soapbox/features/ui/components/upload_area.tsx rename to app/soapbox/features/ui/components/upload-area.tsx index 6aeb5caa2..5cc0c9e64 100644 --- a/app/soapbox/features/ui/components/upload_area.tsx +++ b/app/soapbox/features/ui/components/upload-area.tsx @@ -5,7 +5,7 @@ import { spring } from 'react-motion'; import { Icon, Stack, Text } from 'soapbox/components/ui'; -import Motion from '../../ui/util/optional_motion'; +import Motion from '../util/optional-motion'; interface IUploadArea { /** Whether the upload area is active. */ diff --git a/app/soapbox/features/ui/components/user_panel.tsx b/app/soapbox/features/ui/components/user-panel.tsx similarity index 100% rename from app/soapbox/features/ui/components/user_panel.tsx rename to app/soapbox/features/ui/components/user-panel.tsx diff --git a/app/soapbox/features/ui/components/video_modal.tsx b/app/soapbox/features/ui/components/video-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/video_modal.tsx rename to app/soapbox/features/ui/components/video-modal.tsx diff --git a/app/soapbox/features/ui/containers/bundle_container.tsx b/app/soapbox/features/ui/containers/bundle-container.tsx similarity index 100% rename from app/soapbox/features/ui/containers/bundle_container.tsx rename to app/soapbox/features/ui/containers/bundle-container.tsx diff --git a/app/soapbox/features/ui/containers/modal_container.ts b/app/soapbox/features/ui/containers/modal-container.ts similarity index 93% rename from app/soapbox/features/ui/containers/modal_container.ts rename to app/soapbox/features/ui/containers/modal-container.ts index dc24254c3..987a8d574 100644 --- a/app/soapbox/features/ui/containers/modal_container.ts +++ b/app/soapbox/features/ui/containers/modal-container.ts @@ -4,7 +4,7 @@ import { cancelReplyCompose } from 'soapbox/actions/compose'; import { closeModal } from 'soapbox/actions/modals'; import { cancelReport } from 'soapbox/actions/reports'; -import ModalRoot, { ModalType } from '../components/modal_root'; +import ModalRoot, { ModalType } from '../components/modal-root'; import type { AppDispatch, RootState } from 'soapbox/store'; diff --git a/app/soapbox/features/ui/containers/notifications_container.tsx b/app/soapbox/features/ui/containers/notifications-container.tsx similarity index 100% rename from app/soapbox/features/ui/containers/notifications_container.tsx rename to app/soapbox/features/ui/containers/notifications-container.tsx diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx index 1ce57e0c7..019c14997 100644 --- a/app/soapbox/features/ui/index.tsx +++ b/app/soapbox/features/ui/index.tsx @@ -11,13 +11,13 @@ import { fetchReports, fetchUsers, fetchConfig } from 'soapbox/actions/admin'; import { fetchAnnouncements } from 'soapbox/actions/announcements'; import { fetchChats } from 'soapbox/actions/chats'; import { uploadCompose, resetCompose } from 'soapbox/actions/compose'; -import { fetchCustomEmojis } from 'soapbox/actions/custom_emojis'; +import { fetchCustomEmojis } from 'soapbox/actions/custom-emojis'; import { fetchFilters } from 'soapbox/actions/filters'; import { fetchMarker } from 'soapbox/actions/markers'; import { openModal } from 'soapbox/actions/modals'; import { expandNotifications } from 'soapbox/actions/notifications'; import { register as registerPushNotifications } from 'soapbox/actions/push-notifications'; -import { fetchScheduledStatuses } from 'soapbox/actions/scheduled_statuses'; +import { fetchScheduledStatuses } from 'soapbox/actions/scheduled-statuses'; import { connectUserStream } from 'soapbox/actions/streaming'; import { fetchSuggestionsForTimeline } from 'soapbox/actions/suggestions'; import { expandHomeTimeline } from 'soapbox/actions/timelines'; @@ -38,9 +38,9 @@ import { getAccessToken, getVapidKey } from 'soapbox/utils/auth'; import { isStandalone } from 'soapbox/utils/state'; // import GroupSidebarPanel from '../groups/sidebar_panel'; -import BackgroundShapes from './components/background_shapes'; +import BackgroundShapes from './components/background-shapes'; import Navbar from './components/navbar'; -import BundleContainer from './containers/bundle_container'; +import BundleContainer from './containers/bundle-container'; import { Status, CommunityTimeline, @@ -114,7 +114,7 @@ import { AuthTokenList, ServiceWorkerInfo, } from './util/async-components'; -import { WrappedRoute } from './util/react_router_helpers'; +import { WrappedRoute } from './util/react-router-helpers'; // Dummy import, to make sure that ends up in the application bundle. // Without this it ends up in ~8 very commonly used bundles. diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts index 997f6b7da..8280a59c2 100644 --- a/app/soapbox/features/ui/util/async-components.ts +++ b/app/soapbox/features/ui/util/async-components.ts @@ -35,7 +35,7 @@ export function Conversations() { } export function ListTimeline() { - return import(/* webpackChunkName: "features/list_timeline" */'../../list_timeline'); + return import(/* webpackChunkName: "features/list_timeline" */'../../list-timeline'); } export function Lists() { @@ -95,7 +95,7 @@ export function Mutes() { } export function MuteModal() { - return import(/* webpackChunkName: "modals/mute_modal" */'../components/mute_modal'); + return import(/* webpackChunkName: "modals/mute_modal" */'../components/mute-modal'); } export function Filters() { @@ -127,43 +127,43 @@ export function MediaModal() { } export function VideoModal() { - return import(/* webpackChunkName: "features/ui" */'../components/video_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/video-modal'); } export function BoostModal() { - return import(/* webpackChunkName: "features/ui" */'../components/boost_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/boost-modal'); } export function ConfirmationModal() { - return import(/* webpackChunkName: "features/ui" */'../components/confirmation_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/confirmation-modal'); } export function MissingDescriptionModal() { - return import(/* webpackChunkName: "features/ui" */'../components/missing_description_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/missing-description-modal'); } export function ActionsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/actions_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/actions-modal'); } export function HotkeysModal() { - return import(/* webpackChunkName: "features/ui" */'../components/hotkeys_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/hotkeys-modal'); } export function ComposeModal() { - return import(/* webpackChunkName: "features/ui" */'../components/compose_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/compose-modal'); } export function ReplyMentionsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/reply_mentions_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/reply-mentions-modal'); } export function UnauthorizedModal() { - return import(/* webpackChunkName: "features/ui" */'../components/unauthorized_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/unauthorized-modal'); } export function EditFederationModal() { - return import(/* webpackChunkName: "features/ui" */'../components/edit_federation_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/edit-federation-modal'); } export function EmbedModal() { @@ -171,11 +171,11 @@ export function EmbedModal() { } export function ComponentModal() { - return import(/* webpackChunkName: "features/ui" */'../components/component_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/component-modal'); } export function ReblogsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/reblogs_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/reblogs-modal'); } export function FavouritesModal() { @@ -183,11 +183,11 @@ export function FavouritesModal() { } export function ReactionsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/reactions_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/reactions-modal'); } export function MentionsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/mentions_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/mentions-modal'); } export function LandingPageModal() { @@ -195,7 +195,7 @@ export function LandingPageModal() { } export function BirthdaysModal() { - return import(/* webpackChunkName: "features/ui" */'../components/birthdays_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/birthdays-modal'); } export function BirthdayPanel() { @@ -203,11 +203,11 @@ export function BirthdayPanel() { } export function AccountNoteModal() { - return import(/* webpackChunkName: "features/ui" */'../components/account_note_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/account-note-modal'); } export function ListEditor() { - return import(/* webpackChunkName: "features/list_editor" */'../../list_editor'); + return import(/* webpackChunkName: "features/list_editor" */'../../list-editor'); } export function ListAdder() { @@ -219,7 +219,7 @@ export function Search() { } export function LoginPage() { - return import(/* webpackChunkName: "features/auth_login" */'../../auth-login/components/login_page'); + return import(/* webpackChunkName: "features/auth_login" */'../../auth-login/components/login-page'); } export function ExternalLogin() { @@ -275,11 +275,11 @@ export function Backups() { } export function PasswordReset() { - return import(/* webpackChunkName: "features/auth_login" */'../../auth-login/components/password_reset'); + return import(/* webpackChunkName: "features/auth_login" */'../../auth-login/components/password-reset'); } export function PasswordResetConfirm() { - return import(/* webpackChunkName: "features/auth_login/password_reset_confirm" */'../../auth-login/components/password_reset_confirm'); + return import(/* webpackChunkName: "features/auth_login/password_reset_confirm" */'../../auth-login/components/password-reset-confirm'); } export function MfaForm() { @@ -311,11 +311,11 @@ export function ModerationLog() { } export function UserPanel() { - return import(/* webpackChunkName: "features/ui" */'../components/user_panel'); + return import(/* webpackChunkName: "features/ui" */'../components/user-panel'); } export function PromoPanel() { - return import(/* webpackChunkName: "features/ui" */'../components/promo_panel'); + return import(/* webpackChunkName: "features/ui" */'../components/promo-panel'); } export function SignUpPanel() { @@ -327,7 +327,7 @@ export function CtaBanner() { } export function FundingPanel() { - return import(/* webpackChunkName: "features/ui" */'../components/funding_panel'); + return import(/* webpackChunkName: "features/ui" */'../components/funding-panel'); } export function TrendsPanel() { @@ -335,27 +335,27 @@ export function TrendsPanel() { } export function ProfileInfoPanel() { - return import(/* webpackChunkName: "features/account_timeline" */'../components/profile_info_panel'); + return import(/* webpackChunkName: "features/account_timeline" */'../components/profile-info-panel'); } export function ProfileMediaPanel() { - return import(/* webpackChunkName: "features/account_gallery" */'../components/profile_media_panel'); + return import(/* webpackChunkName: "features/account_gallery" */'../components/profile-media-panel'); } export function ProfileFieldsPanel() { - return import(/* webpackChunkName: "features/account_timeline" */'../components/profile_fields_panel'); + return import(/* webpackChunkName: "features/account_timeline" */'../components/profile-fields-panel'); } export function PinnedAccountsPanel() { - return import(/* webpackChunkName: "features/pinned_accounts" */'../components/pinned_accounts_panel'); + return import(/* webpackChunkName: "features/pinned_accounts" */'../components/pinned-accounts-panel'); } export function InstanceInfoPanel() { - return import(/* webpackChunkName: "features/remote_timeline" */'../components/instance_info_panel'); + return import(/* webpackChunkName: "features/remote_timeline" */'../components/instance-info-panel'); } export function InstanceModerationPanel() { - return import(/* webpackChunkName: "features/remote_timeline" */'../components/instance_moderation_panel'); + return import(/* webpackChunkName: "features/remote_timeline" */'../components/instance-moderation-panel'); } export function LatestAccountsPanel() { @@ -367,15 +367,15 @@ export function SidebarMenu() { } export function UploadArea() { - return import(/* webpackChunkName: "features/compose" */'../components/upload_area'); + return import(/* webpackChunkName: "features/compose" */'../components/upload-area'); } export function NotificationsContainer() { - return import(/* webpackChunkName: "features/ui" */'../containers/notifications_container'); + return import(/* webpackChunkName: "features/ui" */'../containers/notifications-container'); } export function ModalContainer() { - return import(/* webpackChunkName: "features/ui" */'../containers/modal_container'); + return import(/* webpackChunkName: "features/ui" */'../containers/modal-container'); } export function ProfileHoverCard() { @@ -399,7 +399,7 @@ export function CryptoAddress() { } export function CryptoDonateModal() { - return import(/* webpackChunkName: "features/crypto_donate" */'../components/crypto_donate_modal'); + return import(/* webpackChunkName: "features/crypto_donate" */'../components/crypto-donate-modal'); } export function ScheduledStatuses() { @@ -483,11 +483,11 @@ export function OnboardingWizard() { } export function WaitlistPage() { - return import(/* webpackChunkName: "features/verification" */'../../verification/waitlist_page'); + return import(/* webpackChunkName: "features/verification" */'../../verification/waitlist-page'); } export function CompareHistoryModal() { - return import(/*webpackChunkName: "modals/compare_history_modal" */'../components/compare_history_modal'); + return import(/*webpackChunkName: "modals/compare_history_modal" */'../components/compare-history-modal'); } export function AuthTokenList() { @@ -499,7 +499,7 @@ export function VerifySmsModal() { } export function FamiliarFollowersModal() { - return import(/*webpackChunkName: "modals/familiar_followers_modal" */'../components/familiar_followers_modal'); + return import(/*webpackChunkName: "modals/familiar_followers_modal" */'../components/familiar-followers-modal'); } export function AnnouncementsPanel() { diff --git a/app/soapbox/features/ui/util/optional_motion.tsx b/app/soapbox/features/ui/util/optional-motion.tsx similarity index 88% rename from app/soapbox/features/ui/util/optional_motion.tsx rename to app/soapbox/features/ui/util/optional-motion.tsx index 15c0d0cd1..a51e84766 100644 --- a/app/soapbox/features/ui/util/optional_motion.tsx +++ b/app/soapbox/features/ui/util/optional-motion.tsx @@ -3,7 +3,7 @@ import { Motion, MotionProps } from 'react-motion'; import { useSettings } from 'soapbox/hooks'; -import ReducedMotion from './reduced_motion'; +import ReducedMotion from './reduced-motion'; const OptionalMotion = (props: MotionProps) => { const reduceMotion = useSettings().get('reduceMotion'); diff --git a/app/soapbox/features/ui/util/pending_status_builder.ts b/app/soapbox/features/ui/util/pending-status-builder.ts similarity index 100% rename from app/soapbox/features/ui/util/pending_status_builder.ts rename to app/soapbox/features/ui/util/pending-status-builder.ts diff --git a/app/soapbox/features/ui/util/react_router_helpers.tsx b/app/soapbox/features/ui/util/react-router-helpers.tsx similarity index 90% rename from app/soapbox/features/ui/util/react_router_helpers.tsx rename to app/soapbox/features/ui/util/react-router-helpers.tsx index 992a60e2b..bb911af18 100644 --- a/app/soapbox/features/ui/util/react_router_helpers.tsx +++ b/app/soapbox/features/ui/util/react-router-helpers.tsx @@ -4,11 +4,11 @@ import { Redirect, Route, useHistory, RouteProps, RouteComponentProps, match as import { Layout } from 'soapbox/components/ui'; import { useOwnAccount, useSettings } from 'soapbox/hooks'; -import BundleColumnError from '../components/bundle_column_error'; -import ColumnForbidden from '../components/column_forbidden'; -import ColumnLoading from '../components/column_loading'; -import ColumnsArea from '../components/columns_area'; -import BundleContainer from '../containers/bundle_container'; +import BundleColumnError from '../components/bundle-column-error'; +import ColumnForbidden from '../components/column-forbidden'; +import ColumnLoading from '../components/column-loading'; +import ColumnsArea from '../components/columns-area'; +import BundleContainer from '../containers/bundle-container'; type PageProps = { params?: MatchType['params'], diff --git a/app/soapbox/features/ui/util/reduced_motion.tsx b/app/soapbox/features/ui/util/reduced-motion.tsx similarity index 100% rename from app/soapbox/features/ui/util/reduced_motion.tsx rename to app/soapbox/features/ui/util/reduced-motion.tsx diff --git a/app/soapbox/features/verification/email_passthru.tsx b/app/soapbox/features/verification/email-passthru.tsx similarity index 100% rename from app/soapbox/features/verification/email_passthru.tsx rename to app/soapbox/features/verification/email-passthru.tsx diff --git a/app/soapbox/features/verification/waitlist_page.tsx b/app/soapbox/features/verification/waitlist-page.tsx similarity index 100% rename from app/soapbox/features/verification/waitlist_page.tsx rename to app/soapbox/features/verification/waitlist-page.tsx diff --git a/app/soapbox/jest/test-helpers.tsx b/app/soapbox/jest/test-helpers.tsx index 721783879..85e0c5bec 100644 --- a/app/soapbox/jest/test-helpers.tsx +++ b/app/soapbox/jest/test-helpers.tsx @@ -11,7 +11,7 @@ import { Action, applyMiddleware, createStore } from 'redux'; import thunk from 'redux-thunk'; import '@testing-library/jest-dom'; -import NotificationsContainer from '../features/ui/containers/notifications_container'; +import NotificationsContainer from '../features/ui/containers/notifications-container'; import { default as rootReducer } from '../reducers'; import type { AnyAction } from 'redux'; diff --git a/app/soapbox/pages/admin-page.tsx b/app/soapbox/pages/admin-page.tsx index 909955abe..eeccc004c 100644 --- a/app/soapbox/pages/admin-page.tsx +++ b/app/soapbox/pages/admin-page.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { Layout } from 'soapbox/components/ui'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { LatestAccountsPanel, } from 'soapbox/features/ui/util/async-components'; -import LinkFooter from '../features/ui/components/link_footer'; +import LinkFooter from '../features/ui/components/link-footer'; const AdminPage: React.FC = ({ children }) => { return ( diff --git a/app/soapbox/pages/default-page.tsx b/app/soapbox/pages/default-page.tsx index f6561cbf0..c95ca5bf1 100644 --- a/app/soapbox/pages/default-page.tsx +++ b/app/soapbox/pages/default-page.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import LinkFooter from 'soapbox/features/ui/components/link_footer'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import LinkFooter from 'soapbox/features/ui/components/link-footer'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { WhoToFollowPanel, TrendsPanel, diff --git a/app/soapbox/pages/home-page.tsx b/app/soapbox/pages/home-page.tsx index 2d73673d7..d3908fd1e 100644 --- a/app/soapbox/pages/home-page.tsx +++ b/app/soapbox/pages/home-page.tsx @@ -2,7 +2,7 @@ import React, { useRef } from 'react'; import { Link } from 'react-router-dom'; import FeedCarousel from 'soapbox/features/feed-filtering/feed-carousel'; -import LinkFooter from 'soapbox/features/ui/components/link_footer'; +import LinkFooter from 'soapbox/features/ui/components/link-footer'; import { WhoToFollowPanel, TrendsPanel, @@ -19,7 +19,7 @@ import { useAppSelector, useOwnAccount, useFeatures, useSoapboxConfig } from 'so import Avatar from '../components/avatar'; import { Card, CardBody, Layout } from '../components/ui'; import ComposeForm from '../features/compose/components/compose-form'; -import BundleContainer from '../features/ui/containers/bundle_container'; +import BundleContainer from '../features/ui/containers/bundle-container'; // import GroupSidebarPanel from '../features/groups/sidebar_panel'; const HomePage: React.FC = ({ children }) => { diff --git a/app/soapbox/pages/profile-page.tsx b/app/soapbox/pages/profile-page.tsx index 1cc5f64fe..95f35bc6a 100644 --- a/app/soapbox/pages/profile-page.tsx +++ b/app/soapbox/pages/profile-page.tsx @@ -4,8 +4,8 @@ import { Redirect, useHistory } from 'react-router-dom'; import { Column, Layout, Tabs } from 'soapbox/components/ui'; import Header from 'soapbox/features/account/components/header'; -import LinkFooter from 'soapbox/features/ui/components/link_footer'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import LinkFooter from 'soapbox/features/ui/components/link-footer'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { WhoToFollowPanel, ProfileInfoPanel, diff --git a/app/soapbox/pages/remote-instance-page.tsx b/app/soapbox/pages/remote-instance-page.tsx index e3488908c..92f1eb56a 100644 --- a/app/soapbox/pages/remote-instance-page.tsx +++ b/app/soapbox/pages/remote-instance-page.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import LinkFooter from 'soapbox/features/ui/components/link_footer'; -import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; +import LinkFooter from 'soapbox/features/ui/components/link-footer'; +import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; import { PromoPanel, InstanceInfoPanel, diff --git a/app/soapbox/pages/status-page.tsx b/app/soapbox/pages/status-page.tsx index c0c99abd7..feb9de202 100644 --- a/app/soapbox/pages/status-page.tsx +++ b/app/soapbox/pages/status-page.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import LinkFooter from 'soapbox/features/ui/components/link_footer'; +import LinkFooter from 'soapbox/features/ui/components/link-footer'; import { WhoToFollowPanel, TrendsPanel, @@ -10,7 +10,7 @@ import { import { useAppSelector, useFeatures } from 'soapbox/hooks'; import { Layout } from '../components/ui'; -import BundleContainer from '../features/ui/containers/bundle_container'; +import BundleContainer from '../features/ui/containers/bundle-container'; interface IStatusPage { children: React.ReactNode, diff --git a/app/soapbox/reducers/accounts_meta.ts b/app/soapbox/reducers/accounts-meta.ts similarity index 100% rename from app/soapbox/reducers/accounts_meta.ts rename to app/soapbox/reducers/accounts-meta.ts diff --git a/app/soapbox/reducers/custom-emojis.ts b/app/soapbox/reducers/custom-emojis.ts index eb4ab3b1c..06b6bf79d 100644 --- a/app/soapbox/reducers/custom-emojis.ts +++ b/app/soapbox/reducers/custom-emojis.ts @@ -3,7 +3,7 @@ import { List as ImmutableList, Map as ImmutableMap, fromJS } from 'immutable'; import { emojis as emojiData } from 'soapbox/features/emoji/emoji-mart-data-light'; import { addCustomToPool } from 'soapbox/features/emoji/emoji-mart-search-light'; -import { CUSTOM_EMOJIS_FETCH_SUCCESS } from '../actions/custom_emojis'; +import { CUSTOM_EMOJIS_FETCH_SUCCESS } from '../actions/custom-emojis'; import { buildCustomEmojis } from '../features/emoji/emoji'; import type { AnyAction } from 'redux'; diff --git a/app/soapbox/reducers/domain-lists.ts b/app/soapbox/reducers/domain-lists.ts index 78af7f515..30f55aaf8 100644 --- a/app/soapbox/reducers/domain-lists.ts +++ b/app/soapbox/reducers/domain-lists.ts @@ -4,7 +4,7 @@ import { DOMAIN_BLOCKS_FETCH_SUCCESS, DOMAIN_BLOCKS_EXPAND_SUCCESS, DOMAIN_UNBLOCK_SUCCESS, -} from '../actions/domain_blocks'; +} from '../actions/domain-blocks'; import type { AnyAction } from 'redux'; diff --git a/app/soapbox/reducers/dropdown-menu.ts b/app/soapbox/reducers/dropdown-menu.ts index 64bc316b9..dd5c70369 100644 --- a/app/soapbox/reducers/dropdown-menu.ts +++ b/app/soapbox/reducers/dropdown-menu.ts @@ -3,7 +3,7 @@ import { Record as ImmutableRecord } from 'immutable'; import { DROPDOWN_MENU_OPEN, DROPDOWN_MENU_CLOSE, -} from '../actions/dropdown_menu'; +} from '../actions/dropdown-menu'; import type { AnyAction } from 'redux'; import type { DropdownPlacement } from 'soapbox/components/dropdown-menu'; diff --git a/app/soapbox/reducers/index.ts b/app/soapbox/reducers/index.ts index 1caa7d976..c900be16c 100644 --- a/app/soapbox/reducers/index.ts +++ b/app/soapbox/reducers/index.ts @@ -7,7 +7,7 @@ import * as BuildConfig from 'soapbox/build-config'; import account_notes from './account-notes'; import accounts from './accounts'; import accounts_counters from './accounts-counters'; -import accounts_meta from './accounts_meta'; +import accounts_meta from './accounts-meta'; import admin from './admin'; import admin_log from './admin-log'; import alerts from './alerts'; diff --git a/app/soapbox/reducers/profile-hover-card.ts b/app/soapbox/reducers/profile-hover-card.ts index b07897715..f662a3b99 100644 --- a/app/soapbox/reducers/profile-hover-card.ts +++ b/app/soapbox/reducers/profile-hover-card.ts @@ -4,7 +4,7 @@ import { PROFILE_HOVER_CARD_OPEN, PROFILE_HOVER_CARD_CLOSE, PROFILE_HOVER_CARD_UPDATE, -} from 'soapbox/actions/profile_hover_card'; +} from 'soapbox/actions/profile-hover-card'; import type { AnyAction } from 'redux'; diff --git a/app/soapbox/reducers/relationships.ts b/app/soapbox/reducers/relationships.ts index 9aafa5542..47e222260 100644 --- a/app/soapbox/reducers/relationships.ts +++ b/app/soapbox/reducers/relationships.ts @@ -26,7 +26,7 @@ import { import { DOMAIN_BLOCK_SUCCESS, DOMAIN_UNBLOCK_SUCCESS, -} from '../actions/domain_blocks'; +} from '../actions/domain-blocks'; import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT, diff --git a/app/soapbox/reducers/scheduled-statuses.ts b/app/soapbox/reducers/scheduled-statuses.ts index 13b4a934d..edcc86337 100644 --- a/app/soapbox/reducers/scheduled-statuses.ts +++ b/app/soapbox/reducers/scheduled-statuses.ts @@ -5,7 +5,7 @@ import { SCHEDULED_STATUSES_FETCH_SUCCESS, SCHEDULED_STATUS_CANCEL_REQUEST, SCHEDULED_STATUS_CANCEL_SUCCESS, -} from 'soapbox/actions/scheduled_statuses'; +} from 'soapbox/actions/scheduled-statuses'; import { STATUS_CREATE_SUCCESS } from 'soapbox/actions/statuses'; import type { AnyAction } from 'redux'; diff --git a/app/soapbox/reducers/status-lists.ts b/app/soapbox/reducers/status-lists.ts index be87e2910..3a19c5eea 100644 --- a/app/soapbox/reducers/status-lists.ts +++ b/app/soapbox/reducers/status-lists.ts @@ -36,7 +36,7 @@ import { } from '../actions/interactions'; import { PINNED_STATUSES_FETCH_SUCCESS, -} from '../actions/pin_statuses'; +} from '../actions/pin-statuses'; import { SCHEDULED_STATUSES_FETCH_REQUEST, SCHEDULED_STATUSES_FETCH_SUCCESS, @@ -46,7 +46,7 @@ import { SCHEDULED_STATUSES_EXPAND_FAIL, SCHEDULED_STATUS_CANCEL_REQUEST, SCHEDULED_STATUS_CANCEL_SUCCESS, -} from '../actions/scheduled_statuses'; +} from '../actions/scheduled-statuses'; import type { AnyAction } from 'redux'; import type { Status as StatusEntity } from 'soapbox/types/entities'; diff --git a/app/soapbox/reducers/statuses.ts b/app/soapbox/reducers/statuses.ts index e63cd48c3..2c19b2511 100644 --- a/app/soapbox/reducers/statuses.ts +++ b/app/soapbox/reducers/statuses.ts @@ -10,7 +10,7 @@ import { makeEmojiMap, normalizeId } from 'soapbox/utils/normalizers'; import { EMOJI_REACT_REQUEST, UNEMOJI_REACT_REQUEST, -} from '../actions/emoji_reacts'; +} from '../actions/emoji-reacts'; import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer'; import { REBLOG_REQUEST, diff --git a/app/soapbox/reducers/suggestions.ts b/app/soapbox/reducers/suggestions.ts index 8335ff9ec..e3d72a34c 100644 --- a/app/soapbox/reducers/suggestions.ts +++ b/app/soapbox/reducers/suggestions.ts @@ -1,7 +1,7 @@ import { OrderedSet as ImmutableOrderedSet, Record as ImmutableRecord } from 'immutable'; import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS } from 'soapbox/actions/accounts'; -import { DOMAIN_BLOCK_SUCCESS } from 'soapbox/actions/domain_blocks'; +import { DOMAIN_BLOCK_SUCCESS } from 'soapbox/actions/domain-blocks'; import { SUGGESTIONS_FETCH_REQUEST, SUGGESTIONS_FETCH_SUCCESS, diff --git a/app/soapbox/reducers/trending-statuses.ts b/app/soapbox/reducers/trending-statuses.ts index c27ab31a0..189f7006d 100644 --- a/app/soapbox/reducers/trending-statuses.ts +++ b/app/soapbox/reducers/trending-statuses.ts @@ -3,7 +3,7 @@ import { OrderedSet as ImmutableOrderedSet, Record as ImmutableRecord } from 'im import { TRENDING_STATUSES_FETCH_REQUEST, TRENDING_STATUSES_FETCH_SUCCESS, -} from 'soapbox/actions/trending_statuses'; +} from 'soapbox/actions/trending-statuses'; import { APIEntity } from 'soapbox/types/entities'; import type { AnyAction } from 'redux'; diff --git a/app/soapbox/reducers/user-lists.ts b/app/soapbox/reducers/user-lists.ts index 4c84f1836..721af9b73 100644 --- a/app/soapbox/reducers/user-lists.ts +++ b/app/soapbox/reducers/user-lists.ts @@ -31,7 +31,7 @@ import { } from '../actions/directory'; import { FAMILIAR_FOLLOWERS_FETCH_SUCCESS, -} from '../actions/familiar_followers'; +} from '../actions/familiar-followers'; import { REBLOGS_FETCH_SUCCESS, FAVOURITES_FETCH_SUCCESS, diff --git a/app/styles/application.scss b/app/styles/application.scss index e7974c887..1c14c5c0e 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -19,7 +19,7 @@ @import 'loading'; @import 'ui'; // @import 'introduction'; -@import 'emoji_picker'; +@import 'emoji-picker'; @import 'about'; @import 'rtl'; @import 'accessibility'; @@ -58,7 +58,7 @@ @import 'components/spoiler-button'; @import 'components/video-player'; @import 'components/audio-player'; -@import 'components/profile_hover_card'; +@import 'components/profile-hover-card'; @import 'components/filters'; @import 'components/snackbar'; @import 'components/accordion'; diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile-hover-card.scss similarity index 100% rename from app/styles/components/profile_hover_card.scss rename to app/styles/components/profile-hover-card.scss diff --git a/app/styles/emoji_picker.scss b/app/styles/emoji-picker.scss similarity index 100% rename from app/styles/emoji_picker.scss rename to app/styles/emoji-picker.scss diff --git a/jsdoc.conf.js b/jsdoc.conf.js index e3d2325a0..ec2335fbe 100644 --- a/jsdoc.conf.js +++ b/jsdoc.conf.js @@ -5,7 +5,7 @@ const { join } = require('path'); const { FE_BUILD_DIR, FE_SUBDIRECTORY, -} = require(join(__dirname, 'app', 'soapbox', 'build_config')); +} = require(join(__dirname, 'app', 'soapbox', 'build-config')); module.exports = { plugins: [], diff --git a/webpack/configuration.ts b/webpack/configuration.ts index 9596cf8e3..39b8bef8e 100644 --- a/webpack/configuration.ts +++ b/webpack/configuration.ts @@ -4,7 +4,7 @@ import { env } from 'process'; const { FE_SUBDIRECTORY, FE_BUILD_DIR, -} = require(join(__dirname, '..', 'app', 'soapbox', 'build_config')); +} = require(join(__dirname, '..', 'app', 'soapbox', 'build-config')); const settings = { source_path: 'app', diff --git a/webpack/development.ts b/webpack/development.ts index 1b8593717..57401e7d3 100644 --- a/webpack/development.ts +++ b/webpack/development.ts @@ -24,7 +24,7 @@ const DEFAULTS = { PATRON_URL: 'http://localhost:3037', }; -const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build_config')); +const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build-config')); const backendEndpoints = [ '/api', diff --git a/webpack/production.ts b/webpack/production.ts index 6115b6aa4..9632754ce 100644 --- a/webpack/production.ts +++ b/webpack/production.ts @@ -12,7 +12,7 @@ import sharedConfig from './shared'; import type { Configuration } from 'webpack'; -const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build_config')); +const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build-config')); const joinPublicPath = (...paths: string[]) => join(FE_SUBDIRECTORY, ...paths); const configuration: Configuration = { diff --git a/webpack/rules/babel-build-config.ts b/webpack/rules/babel-build-config.ts index 9e2e4e657..0e1fa0b7c 100644 --- a/webpack/rules/babel-build-config.ts +++ b/webpack/rules/babel-build-config.ts @@ -4,11 +4,11 @@ import { env } from '../configuration'; import type { RuleSetRule } from 'webpack'; -// This is a hack, used to force build_config @preval to recompile +// This is a hack, used to force build-config @preval to recompile // https://github.com/kentcdodds/babel-plugin-preval/issues/19 const rule: RuleSetRule = { - test: resolve(__dirname, '../../app/soapbox/build_config.js'), + test: resolve(__dirname, '../../app/soapbox/build-config.js'), use: [ { loader: 'babel-loader', diff --git a/webpack/shared.ts b/webpack/shared.ts index eb587cfaf..2f56ccca4 100644 --- a/webpack/shared.ts +++ b/webpack/shared.ts @@ -15,7 +15,7 @@ import DeadCodePlugin from 'webpack-deadcode-plugin'; import { env, settings, output } from './configuration'; import rules from './rules'; -const { FE_SUBDIRECTORY, FE_INSTANCE_SOURCE_DIR } = require(join(__dirname, '..', 'app', 'soapbox', 'build_config')); +const { FE_SUBDIRECTORY, FE_INSTANCE_SOURCE_DIR } = require(join(__dirname, '..', 'app', 'soapbox', 'build-config')); /** Return file as string, or return empty string. */ const readFile = (filename: string) => { From 17b0c45a3ea8f5c10481e1415cead12d87b04c18 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Wed, 16 Nov 2022 09:00:19 -0500 Subject: [PATCH 18/19] Fix build --- jest.config.js | 4 ++-- webpack/production.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jest.config.js b/jest.config.js index 468401c51..396486a39 100644 --- a/jest.config.js +++ b/jest.config.js @@ -20,9 +20,9 @@ module.exports = { 'app/soapbox/**/*.js', 'app/soapbox/**/*.ts', 'app/soapbox/**/*.tsx', - '!app/soapbox/features/emoji/emoji_compressed.js', + '!app/soapbox/features/emoji/emoji-compressed.js', '!app/soapbox/locales/locale-data/*.js', - '!app/soapbox/service_worker/entry.ts', + '!app/soapbox/service-worker/entry.ts', '!app/soapbox/jest/test-setup.ts', '!app/soapbox/jest/test-helpers.ts', ], diff --git a/webpack/production.ts b/webpack/production.ts index 9632754ce..a1af5a0f9 100644 --- a/webpack/production.ts +++ b/webpack/production.ts @@ -95,7 +95,7 @@ const configuration: Configuration = { ], ServiceWorker: { cacheName: 'soapbox', - entry: join(__dirname, '../app/soapbox/service_worker/entry.ts'), + entry: join(__dirname, '../app/soapbox/service-worker/entry.ts'), events: true, minify: true, }, From 2b46fe2d40a9fac9e1ae5758299834b65afd75c4 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Wed, 16 Nov 2022 09:06:20 -0500 Subject: [PATCH 19/19] Fix test --- app/soapbox/actions/__tests__/me.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/actions/__tests__/me.test.ts b/app/soapbox/actions/__tests__/me.test.ts index 6d37fc68c..c75d128f0 100644 --- a/app/soapbox/actions/__tests__/me.test.ts +++ b/app/soapbox/actions/__tests__/me.test.ts @@ -7,7 +7,7 @@ import { fetchMe, patchMe, } from '../me'; -jest.mock('../../storage/kv_store', () => ({ +jest.mock('../../storage/kv-store', () => ({ __esModule: true, default: { getItemOrError: jest.fn().mockReturnValue(Promise.resolve({})),