-
- );
- }
-
- 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 95%
rename from app/soapbox/components/autosuggest_account_input.tsx
rename to app/soapbox/components/autosuggest-account-input.tsx
index e8cd63830..1be14c3ec 100644
--- a/app/soapbox/components/autosuggest_account_input.tsx
+++ b/app/soapbox/components/autosuggest-account-input.tsx
@@ -3,13 +3,13 @@ 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';
+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
-
-
- -
- {media.map(attachment => {
- const displayUrl = attachment.get('remote_url') || attachment.get('url');
-
- return (
-
- - {filename(displayUrl)} - - ); - })} -
-
+
-
- {domain}
-
-
-
-
-
-
+
+
+ );
+};
+
+export default ExtendedVideoPlayer;
diff --git a/app/soapbox/components/extended_video_player.js b/app/soapbox/components/extended_video_player.js
deleted file mode 100644
index 59a6b938e..000000000
--- a/app/soapbox/components/extended_video_player.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import { isIOS } from 'soapbox/is_mobile';
-
-export default class ExtendedVideoPlayer extends React.PureComponent {
-
- static propTypes = {
- src: PropTypes.string.isRequired,
- alt: PropTypes.string,
- width: PropTypes.number,
- height: PropTypes.number,
- time: PropTypes.number,
- controls: PropTypes.bool.isRequired,
- muted: PropTypes.bool.isRequired,
- onClick: PropTypes.func,
- };
-
- handleLoadedData = () => {
- if (this.props.time) {
- this.video.currentTime = this.props.time;
- }
- }
-
- componentDidMount() {
- this.video.addEventListener('loadeddata', this.handleLoadedData);
- }
-
- componentWillUnmount() {
- this.video.removeEventListener('loadeddata', this.handleLoadedData);
- }
-
- setRef = (c) => {
- this.video = c;
- }
-
- handleClick = e => {
- e.stopPropagation();
- const handler = this.props.onClick;
- if (handler) handler();
- }
-
- render() {
- const { src, muted, controls, alt } = this.props;
- const conditionalAttributes = {};
- if (isIOS()) {
- conditionalAttributes.playsInline = '1';
- }
-
- return (
-
-
-
- );
- }
-
-}
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/hashtag.tsx b/app/soapbox/components/hashtag.tsx
index 0b0cc5bae..41267d19c 100644
--- a/app/soapbox/components/hashtag.tsx
+++ b/app/soapbox/components/hashtag.tsx
@@ -1,10 +1,10 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
+import { Link } from 'react-router-dom';
import { Sparklines, SparklinesCurve } from 'react-sparklines';
import { shortNumberFormat } from '../utils/numbers';
-import Permalink from './permalink';
import { HStack, Stack, Text } from './ui';
import type { Tag } from 'soapbox/types/entities';
@@ -19,9 +19,9 @@ const Hashtag: React.FC
-
- );
-};
-
-export default MoreFollows;
diff --git a/app/soapbox/components/permalink.tsx b/app/soapbox/components/permalink.tsx
deleted file mode 100644
index db68811e5..000000000
--- a/app/soapbox/components/permalink.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as React from 'react';
-import { useHistory } from 'react-router-dom';
-
-interface IPermaLink extends Pick
-
-
- {getMessage()}
-
-
+
{intl.formatMessage(isUnderReview ? messages.underReviewTitle : messages.sensitiveTitle)}
@@ -84,7 +84,7 @@ const SensitiveContentOverlay = (props: ISensitiveContentOverlay) => {
{status.spoiler_text && (
);
-};
+});
-export default SensitiveContentOverlay;
\ No newline at end of file
+export default SensitiveContentOverlay;
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 96%
rename from app/soapbox/components/thumb_navigation-link.tsx
rename to 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/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/accordion/accordion.tsx b/app/soapbox/components/ui/accordion/accordion.tsx
new file mode 100644
index 000000000..299848d84
--- /dev/null
+++ b/app/soapbox/components/ui/accordion/accordion.tsx
@@ -0,0 +1,74 @@
+import classNames from 'clsx';
+import React from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+
+import { HStack, Icon, Text } from 'soapbox/components/ui';
+import DropdownMenu from 'soapbox/containers/dropdown-menu-container';
+
+import type { Menu } from 'soapbox/components/dropdown-menu';
+
+const messages = defineMessages({
+ collapse: { id: 'accordion.collapse', defaultMessage: 'Collapse' },
+ expand: { id: 'accordion.expand', defaultMessage: 'Expand' },
+});
+
+interface IAccordion {
+ headline: React.ReactNode,
+ children?: React.ReactNode,
+ menu?: Menu,
+ expanded?: boolean,
+ onToggle?: (value: boolean) => void,
+}
+
+/**
+ * Accordion
+ * An accordion is a vertically stacked group of collapsible sections.
+ */
+const Accordion: React.FC = ({ headline, children, menu, expanded = false, onToggle = () => {} }) => {
+ const intl = useIntl();
+
+ const handleToggle = (e: React.MouseEvent) => {
+ onToggle(!expanded);
+ e.preventDefault();
+ };
+
+ return (
+
+ label: React.ReactNode
+}
+
+/**
+ * A group for radio input with label.
+ */
+const RadioButton: React.FC = ({ name, value, checked, onChange, label }) => {
+ const formFieldId: string = useMemo(() => `radio-${uuidv4()}`, []);
+
+ return (
+ = ({ className }) => {
const soapboxConfig = useSoapboxConfig();
// Prefer a custom icon if found
- const icon = soapboxConfig.verifiedIcon || require('icons/verified.svg');
+ const icon = soapboxConfig.verifiedIcon || require('assets/icons/verified.svg');
// Render component based on file extension
const Element = icon.endsWith('.svg') ? Icon : 'img';
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 89%
rename from app/soapbox/containers/dropdown_menu_container.ts
rename to app/soapbox/containers/dropdown-menu-container.ts
index b047edfff..936e3c5c2 100644
--- a/app/soapbox/containers/dropdown_menu_container.ts
+++ b/app/soapbox/containers/dropdown-menu-container.ts
@@ -1,12 +1,12 @@
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';
+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..f1623f585 100644
--- a/app/soapbox/containers/soapbox.tsx
+++ b/app/soapbox/containers/soapbox.tsx
@@ -13,14 +13,14 @@ 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';
-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';
+import PublicLayout from 'soapbox/features/public-layout';
+import BundleContainer from 'soapbox/features/ui/containers/bundle-container';
import {
ModalContainer,
NotificationsContainer,
@@ -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/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/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/about/index.tsx b/app/soapbox/features/about/index.tsx
index 5c184a97a..9cc1e9295 100644
--- a/app/soapbox/features/about/index.tsx
+++ b/app/soapbox/features/about/index.tsx
@@ -35,11 +35,11 @@ const AboutPage: React.FC = () => {
}, [locale, slug]);
const alsoAvailable = (defaultLocale) && (
-
-
+
“”
@@ -127,6 +127,6 @@ const SensitiveContentOverlay = (props: ISensitiveContentOverlay) => {
)}
+
+
+
+ );
+};
+
+export default Accordion;
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/ui/index.ts b/app/soapbox/components/ui/index.ts
index fd9cb055e..90f5933ed 100644
--- a/app/soapbox/components/ui/index.ts
+++ b/app/soapbox/components/ui/index.ts
@@ -1,3 +1,4 @@
+export { default as Accordion } from './accordion/accordion';
export { default as Avatar } from './avatar/avatar';
export { default as Banner } from './banner/banner';
export { default as Button } from './button/button';
@@ -30,6 +31,7 @@ export {
export { default as Modal } from './modal/modal';
export { default as PhoneInput } from './phone-input/phone-input';
export { default as ProgressBar } from './progress-bar/progress-bar';
+export { default as RadioButton } from './radio-button/radio-button';
export { default as Select } from './select/select';
export { default as Spinner } from './spinner/spinner';
export { default as Stack } from './stack/stack';
diff --git a/app/soapbox/components/ui/radio-button/radio-button.tsx b/app/soapbox/components/ui/radio-button/radio-button.tsx
new file mode 100644
index 000000000..322cbd7e7
--- /dev/null
+++ b/app/soapbox/components/ui/radio-button/radio-button.tsx
@@ -0,0 +1,37 @@
+import React, { useMemo } from 'react';
+import { v4 as uuidv4 } from 'uuid';
+
+interface IRadioButton {
+ value: string
+ checked?: boolean
+ name: string
+ onChange: React.ChangeEventHandler
+ {children}
+
+
+
+
+
+
+ );
+};
+
+export default RadioButton;
diff --git a/app/soapbox/components/ui/tooltip/tooltip.tsx b/app/soapbox/components/ui/tooltip/tooltip.tsx
index e04221200..02a811bac 100644
--- a/app/soapbox/components/ui/tooltip/tooltip.tsx
+++ b/app/soapbox/components/ui/tooltip/tooltip.tsx
@@ -1,4 +1,4 @@
-import Portal from '@reach/portal';
+import { Portal } from '@reach/portal';
import { TooltipPopup, useTooltip } from '@reach/tooltip';
import React from 'react';
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/components/verification_badge.tsx b/app/soapbox/components/verification-badge.tsx
similarity index 91%
rename from app/soapbox/components/verification_badge.tsx
rename to app/soapbox/components/verification-badge.tsx
index ce1d3792a..766decb88 100644
--- a/app/soapbox/components/verification_badge.tsx
+++ b/app/soapbox/components/verification-badge.tsx
@@ -18,7 +18,7 @@ const VerificationBadge: React.FC
+
-
-
-
+
-
+
- setLocale(defaultLocale)}> {/* @ts-ignore */} {languages[defaultLocale] || defaultLocale} @@ -47,7 +47,7 @@ const AboutPage: React.FC = () => { { pageLocales?.map(locale => ( -
- +
-
setLocale(locale)}>
{/* @ts-ignore */}
{languages[locale] || locale}
@@ -60,14 +60,10 @@ const AboutPage: React.FC = () => {
);
return (
- -) : ( -- - {alsoAvailable} -++ + + {alsoAvailable}); }; diff --git a/app/soapbox/features/account_gallery/components/media_item.tsx b/app/soapbox/features/account-gallery/components/media-item.tsx similarity index 97% rename from app/soapbox/features/account_gallery/components/media_item.tsx rename to app/soapbox/features/account-gallery/components/media-item.tsx index d98f74363..a2a171bfc 100644 --- a/app/soapbox/features/account_gallery/components/media_item.tsx +++ b/app/soapbox/features/account-gallery/components/media-item.tsx @@ -3,9 +3,9 @@ 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'; +import { isIOS } from 'soapbox/is-mobile'; import type { Attachment } from 'soapbox/types/entities'; diff --git a/app/soapbox/features/account_gallery/index.tsx b/app/soapbox/features/account-gallery/index.tsx similarity index 97% rename from app/soapbox/features/account_gallery/index.tsx rename to app/soapbox/features/account-gallery/index.tsx index ddd2b3160..da6fb226a 100644 --- a/app/soapbox/features/account_gallery/index.tsx +++ b/app/soapbox/features/account-gallery/index.tsx @@ -8,14 +8,14 @@ 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'; 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 new file mode 100644 index 000000000..cfd752fc1 --- /dev/null +++ b/app/soapbox/features/account-timeline/components/moved-note.tsx @@ -0,0 +1,41 @@ +import React from 'react'; +import { FormattedMessage } from 'react-intl'; + +import Account from 'soapbox/components/account'; +import Icon from 'soapbox/components/icon'; +import { HStack, Text } from 'soapbox/components/ui'; + +import type { Account as AccountEntity } from 'soapbox/types/entities'; + +interface IMovedNote { + from: AccountEntity, + to: AccountEntity, +} + +const MovedNote: React.FC
= ({ from, to }) => ( + ++); + +export default MovedNote; diff --git a/app/soapbox/features/account_timeline/index.tsx b/app/soapbox/features/account-timeline/index.tsx similarity index 97% rename from app/soapbox/features/account_timeline/index.tsx rename to 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/account/components/header.tsx b/app/soapbox/features/account/components/header.tsx index a8f8f2901..016f0ef74 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'; @@ -16,10 +16,10 @@ 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'; +import MovedNote from 'soapbox/features/account-timeline/components/moved-note'; import ActionButton from 'soapbox/features/ui/components/action-button'; import FeedButton from 'soapbox/features/ui/components/feed-button'; import SubscriptionButton from 'soapbox/features/ui/components/subscription-button'; @@ -28,7 +28,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' }, @@ -67,6 +67,7 @@ const messages = defineMessages({ removeFromFollowersConfirm: { id: 'confirmations.remove_from_followers.confirm', defaultMessage: 'Remove' }, userEndorsed: { id: 'account.endorse.success', defaultMessage: 'You are now featuring @{acct} on your profile' }, userUnendorsed: { id: 'account.unendorse.success', defaultMessage: 'You are no longer featuring @{acct}' }, + profileExternal: { id: 'account.profile_external', defaultMessage: 'View profile on {domain}' }, }); interface IHeader { @@ -174,6 +175,10 @@ const Header: React.FC+ + ++ + +++ +, + targetName: to.acct, + }} + /> + + = ({ account }) => { dispatch(unblockDomain(domain)); }; + const onProfileExternal = (url: string) => { + window.open(url, '_blank'); + }; + const onAddToList = () => { dispatch(openModal('LIST_ADDER', { accountId: account.id, @@ -422,6 +427,14 @@ const Header: React.FC = ({ account }) => { icon: require('@tabler/icons/ban.svg'), }); } + + if (features.federating) { + menu.push({ + text: intl.formatMessage(messages.profileExternal, { domain }), + action: () => onProfileExternal(account.url), + icon: require('@tabler/icons/external-link.svg'), + }); + } } if (ownAccount?.staff) { diff --git a/app/soapbox/features/account_timeline/components/moved_note.tsx b/app/soapbox/features/account_timeline/components/moved_note.tsx deleted file mode 100644 index 0ba6d8da5..000000000 --- a/app/soapbox/features/account_timeline/components/moved_note.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import React from 'react'; -import { FormattedMessage } from 'react-intl'; -import { NavLink } from 'react-router-dom'; - -import AvatarOverlay from 'soapbox/components/avatar_overlay'; -import DisplayName from 'soapbox/components/display-name'; -import Icon from 'soapbox/components/icon'; - -import type { Account as AccountEntity } from 'soapbox/types/entities'; - -interface IMovedNote { - from: AccountEntity, - to: AccountEntity, -} - -const MovedNote: React.FC = ({ from, to }) => { - const displayNameHtml = { __html: from.display_name_html }; - - return ( - -- ); -}; - -export default MovedNote; diff --git a/app/soapbox/features/admin/components/latest_accounts_panel.tsx b/app/soapbox/features/admin/components/latest-accounts-panel.tsx similarity index 94% rename from app/soapbox/features/admin/components/latest_accounts_panel.tsx rename to app/soapbox/features/admin/components/latest-accounts-panel.tsx index 07b3c3f9d..81efa7d46 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 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/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 96% rename from app/soapbox/features/admin/components/report_status.tsx rename to app/soapbox/features/admin/components/report-status.tsx index 4f9ff1af0..f81deeab7 100644 --- a/app/soapbox/features/admin/components/report_status.tsx +++ b/app/soapbox/features/admin/components/report-status.tsx @@ -4,8 +4,8 @@ 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 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'; import { useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx index 75c3ecb1d..4c37b7b61 100644 --- a/app/soapbox/features/admin/components/report.tsx +++ b/app/soapbox/features/admin/components/report.tsx @@ -6,14 +6,13 @@ 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 { Button, HStack } from 'soapbox/components/ui'; -import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; -import Accordion from 'soapbox/features/ui/components/accordion'; +import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; +import { Accordion, Button, HStack } from 'soapbox/components/ui'; +import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; 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 97% rename from app/soapbox/features/admin/components/unapproved_account.tsx rename to 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/admin/moderation_log.tsx b/app/soapbox/features/admin/moderation-log.tsx similarity index 97% rename from app/soapbox/features/admin/moderation_log.tsx rename to 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..0a412f400 100644 --- a/app/soapbox/features/admin/tabs/awaiting-approval.tsx +++ b/app/soapbox/features/admin/tabs/awaiting-approval.tsx @@ -2,10 +2,10 @@ 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'; +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..495f0ff37 100644 --- a/app/soapbox/features/admin/tabs/dashboard.tsx +++ b/app/soapbox/features/admin/tabs/dashboard.tsx @@ -2,14 +2,14 @@ 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'; 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/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 similarity index 95% rename from app/soapbox/features/admin/user_index.js rename to app/soapbox/features/admin/user-index.js index 032ed6dc2..eb91badb1 100644 --- a/app/soapbox/features/admin/user_index.js +++ b/app/soapbox/features/admin/user-index.js @@ -7,8 +7,8 @@ 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 AccountContainer from 'soapbox/containers/account_container'; +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/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/aliases/index.tsx b/app/soapbox/features/aliases/index.tsx index d76c7988d..cf5ee3e16 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'; @@ -63,7 +63,7 @@ const Aliases = () => {-- --}} /> - - --- +{searchAccountIds.map(accountId =>) diff --git a/app/soapbox/features/audio/index.tsx b/app/soapbox/features/audio/index.tsx index 0bef3c3d9..ecbae5b16 100644 --- a/app/soapbox/features/audio/index.tsx +++ b/app/soapbox/features/audio/index.tsx @@ -449,6 +449,7 @@ const Audio: React.FC)} = (props) => { onMouseLeave={handleMouseLeave} tabIndex={0} onKeyDown={handleKeyDown} + onClick={e => e.stopPropagation()} > ', () => { 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/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 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/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_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 98% rename from app/soapbox/features/auth_login/components/registration_form.tsx rename to app/soapbox/features/auth-login/components/registration-form.tsx index bdf4bc05d..edd55deb3 100644 --- a/app/soapbox/features/auth_login/components/registration_form.tsx +++ b/app/soapbox/features/auth-login/components/registration-form.tsx @@ -9,9 +9,9 @@ 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 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/backups/index.tsx b/app/soapbox/features/backups/index.tsx index 87049a936..27930f208 100644 --- a/app/soapbox/features/backups/index.tsx +++ b/app/soapbox/features/backups/index.tsx @@ -3,10 +3,10 @@ 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'; +import Column from '../ui/components/better-column'; const messages = defineMessages({ heading: { id: 'column.backups', defaultMessage: 'Backups' }, diff --git a/app/soapbox/features/birthdays/account.tsx b/app/soapbox/features/birthdays/account.tsx index 745ca5268..805538fd5 100644 --- a/app/soapbox/features/birthdays/account.tsx +++ b/app/soapbox/features/birthdays/account.tsx @@ -1,10 +1,10 @@ import React, { useCallback } from 'react'; import { defineMessages, useIntl } from 'react-intl'; +import { Link } from 'react-router-dom'; import Avatar from 'soapbox/components/avatar'; import DisplayName from 'soapbox/components/display-name'; import Icon from 'soapbox/components/icon'; -import Permalink from 'soapbox/components/permalink'; import { useAppSelector } from 'soapbox/hooks'; import { makeGetAccount } from 'soapbox/selectors'; @@ -38,13 +38,13 @@ const Account: React.FC = ({ accountId }) => { return ( - {/*-); diff --git a/app/soapbox/features/chats/components/chat-box.tsx b/app/soapbox/features/chats/components/chat-box.tsx index 66371bc8d..de97cd45a 100644 --- a/app/soapbox/features/chats/components/chat-box.tsx +++ b/app/soapbox/features/chats/components/chat-box.tsx @@ -7,9 +7,9 @@ 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 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/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/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx index 9303f2b33..90c27e4a6 100644 --- a/app/soapbox/features/chats/components/chat-message-list.tsx +++ b/app/soapbox/features/chats/components/chat-message-list.tsx @@ -14,14 +14,14 @@ 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'; 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 { 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/components/chat-window.tsx b/app/soapbox/features/chats/components/chat-window.tsx index 8b30d3ba8..3bcb83165 100644 --- a/app/soapbox/features/chats/components/chat-window.tsx +++ b/app/soapbox/features/chats/components/chat-window.tsx @@ -6,8 +6,8 @@ import { toggleChat, } 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 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'; import { makeGetChat } from 'soapbox/selectors'; 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/community_timeline/index.tsx b/app/soapbox/features/community-timeline/index.tsx similarity index 96% rename from app/soapbox/features/community_timeline/index.tsx rename to 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/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 e93215aec..78a9cd11a 100644 --- a/app/soapbox/features/compose/components/compose-form.tsx +++ b/app/soapbox/features/compose/components/compose-form.tsx @@ -13,35 +13,35 @@ 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'; -import { isMobile } from 'soapbox/is_mobile'; +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'; +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/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/polls/poll-form.tsx b/app/soapbox/features/compose/components/polls/poll-form.tsx index e61f1975f..f080ae1fa 100644 --- a/app/soapbox/features/compose/components/polls/poll-form.tsx +++ b/app/soapbox/features/compose/components/polls/poll-form.tsx @@ -2,18 +2,17 @@ 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}' }, add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add an answer' }, - remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this answer' }, pollDuration: { id: 'compose_form.poll.duration', defaultMessage: 'Duration' }, removePoll: { id: 'compose_form.poll.remove', defaultMessage: 'Remove poll' }, switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple answers' }, @@ -95,7 +94,9 @@ const Option: React.FC+ +-= ({ showLabel }) => { +const AudioToggle: React.FC = () => { const dispatch = useDispatch(); const intl = useIntl(); @@ -37,7 +33,6 @@ const AudioToggle: React.FC= ({ showLabel }) => { onChange={handleToggleAudio} // onKeyDown={this.onKeyDown} /> - {showLabel && ()} = ({ {index > 1 && ( - +)} diff --git a/app/soapbox/features/compose/components/privacy_dropdown.tsx b/app/soapbox/features/compose/components/privacy-dropdown.tsx similarity index 98% rename from app/soapbox/features/compose/components/privacy_dropdown.tsx rename to app/soapbox/features/compose/components/privacy-dropdown.tsx index 4873769c3..2543763da 100644 --- a/app/soapbox/features/compose/components/privacy_dropdown.tsx +++ b/app/soapbox/features/compose/components/privacy-dropdown.tsx @@ -11,9 +11,9 @@ 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'; +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/reply_indicator.tsx b/app/soapbox/features/compose/components/reply-indicator.tsx similarity index 95% rename from app/soapbox/features/compose/components/reply_indicator.tsx rename to 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/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 97% rename from app/soapbox/features/compose/components/schedule_form.tsx rename to app/soapbox/features/compose/components/schedule-form.tsx index b619188e6..bb8ef7368 100644 --- a/app/soapbox/features/compose/components/schedule_form.tsx +++ b/app/soapbox/features/compose/components/schedule-form.tsx @@ -5,9 +5,9 @@ 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 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 similarity index 95% rename from app/soapbox/features/compose/components/search_results.tsx rename to app/soapbox/features/compose/components/search-results.tsx index 8f8fa5938..4484ea281 100644 --- a/app/soapbox/features/compose/components/search_results.tsx +++ b/app/soapbox/features/compose/components/search-results.tsx @@ -3,16 +3,16 @@ 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'; +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 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 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 { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import type { OrderedSet as ImmutableOrderedSet } from 'immutable'; 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/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/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/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/upload.tsx b/app/soapbox/features/compose/components/upload.tsx index fdef1f899..769efcdd1 100644 --- a/app/soapbox/features/compose/components/upload.tsx +++ b/app/soapbox/features/compose/components/upload.tsx @@ -9,10 +9,10 @@ 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'; +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/visual_character_counter.tsx b/app/soapbox/features/compose/components/visual-character-counter.tsx similarity index 93% rename from app/soapbox/features/compose/components/visual_character_counter.tsx rename to 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/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/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 83% rename from app/soapbox/features/compose/containers/schedule_form_container.tsx rename to app/soapbox/features/compose/containers/schedule-form-container.tsx index d34f9ee5e..7044f4cd2 100644 --- a/app/soapbox/features/compose/containers/schedule_form_container.tsx +++ b/app/soapbox/features/compose/containers/schedule-form-container.tsx @@ -1,9 +1,9 @@ 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'; +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/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/conversations/components/conversations_list.tsx b/app/soapbox/features/conversations/components/conversations-list.tsx similarity index 94% rename from app/soapbox/features/conversations/components/conversations_list.tsx rename to app/soapbox/features/conversations/components/conversations-list.tsx index 01705fd30..bf439626a 100644 --- a/app/soapbox/features/conversations/components/conversations_list.tsx +++ b/app/soapbox/features/conversations/components/conversations-list.tsx @@ -3,10 +3,10 @@ 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'; +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 8e81ac1c5..12b418eb0 100644 --- a/app/soapbox/features/conversations/index.tsx +++ b/app/soapbox/features/conversations/index.tsx @@ -4,11 +4,11 @@ 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'; -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 88% rename from app/soapbox/features/crypto_donate/index.tsx rename to app/soapbox/features/crypto-donate/index.tsx index e1e38d7fc..820124b9d 100644 --- a/app/soapbox/features/crypto_donate/index.tsx +++ b/app/soapbox/features/crypto-donate/index.tsx @@ -1,11 +1,10 @@ import React, { useState } from 'react'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; -import { Column, Stack } from 'soapbox/components/ui'; -import Accordion from 'soapbox/features/ui/components/accordion'; +import { Accordion, Column, Stack } from 'soapbox/components/ui'; 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 } - hint={ } - > - - */} - } hint={ } diff --git a/app/soapbox/features/direct_timeline/index.tsx b/app/soapbox/features/direct-timeline/index.tsx similarity index 94% rename from app/soapbox/features/direct_timeline/index.tsx rename to 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/directory/components/account-card.tsx b/app/soapbox/features/directory/components/account-card.tsx new file mode 100644 index 000000000..6c6d0a697 --- /dev/null +++ b/app/soapbox/features/directory/components/account-card.tsx @@ -0,0 +1,106 @@ +import classNames from 'clsx'; +import React from 'react'; +import { FormattedMessage } from 'react-intl'; + +import { getSettings } from 'soapbox/actions/settings'; +import Badge from 'soapbox/components/badge'; +import RelativeTimestamp from 'soapbox/components/relative-timestamp'; +import { Stack, Text } from 'soapbox/components/ui'; +import AccountContainer from 'soapbox/containers/account-container'; +import ActionButton from 'soapbox/features/ui/components/action-button'; +import { useAppSelector } from 'soapbox/hooks'; +import { makeGetAccount } from 'soapbox/selectors'; +import { shortNumberFormat } from 'soapbox/utils/numbers'; + +const getAccount = makeGetAccount(); + +interface IAccountCard { + id: string, +} + +const AccountCard: React.FC = ({ id }) => { + const me = useAppSelector((state) => state.me); + const account = useAppSelector((state) => getAccount(state, id)); + const autoPlayGif = useAppSelector((state) => getSettings(state).get('autoPlayGif')); + + if (!account) return null; + + const followedBy = me !== account.id && account.relationship?.followed_by; + + return ( + ++ ); +}; + +export default AccountCard; diff --git a/app/soapbox/features/directory/components/account_card.tsx b/app/soapbox/features/directory/components/account_card.tsx deleted file mode 100644 index 12ac5e7a7..000000000 --- a/app/soapbox/features/directory/components/account_card.tsx +++ /dev/null @@ -1,82 +0,0 @@ -import classNames from 'clsx'; -import React from 'react'; -import { FormattedMessage } from 'react-intl'; - -import { getSettings } from 'soapbox/actions/settings'; -import Avatar from 'soapbox/components/avatar'; -import DisplayName from 'soapbox/components/display-name'; -import Permalink from 'soapbox/components/permalink'; -import RelativeTimestamp from 'soapbox/components/relative-timestamp'; -import { Text } from 'soapbox/components/ui'; -import ActionButton from 'soapbox/features/ui/components/action-button'; -import { useAppSelector } from 'soapbox/hooks'; -import { makeGetAccount } from 'soapbox/selectors'; -import { shortNumberFormat } from 'soapbox/utils/numbers'; - -const getAccount = makeGetAccount(); - -interface IAccountCard { - id: string, -} - -const AccountCard: React.FC+ {followedBy && ( ++ +++ )} + +} + /> + ++ ++ +
+ + ++ + + +++ + ++ {shortNumberFormat(account.statuses_count)} + + ++ ++ + + ++ {shortNumberFormat(account.followers_count)} + + ++ ++ + ++ {account.last_status_at === null ? ( + + ++ ) : ( + + )} + + ++ = ({ id }) => { - const me = useAppSelector((state) => state.me); - const account = useAppSelector((state) => getAccount(state, id)); - const autoPlayGif = useAppSelector((state) => getSettings(state).get('autoPlayGif')); - - if (!account) return null; - - const followedBy = me !== account.id && account.relationship?.followed_by; - - return ( - - {followedBy && -- ); -}; - -export default AccountCard; diff --git a/app/soapbox/features/directory/index.tsx b/app/soapbox/features/directory/index.tsx index 1824ddfe3..1266ed0ab 100644 --- a/app/soapbox/features/directory/index.tsx +++ b/app/soapbox/features/directory/index.tsx @@ -5,13 +5,12 @@ 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 RadioButton from 'soapbox/components/radio_button'; -import Column from 'soapbox/features/ui/components/column'; +import LoadMore from 'soapbox/components/load-more'; +import { Column, RadioButton, Stack, Text } from 'soapbox/components/ui'; 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' }, @@ -52,26 +51,49 @@ const Directory = () => { }; return ( -- -} -- - --- -- --- -- -- - -- -') && 'empty')} - dangerouslySetInnerHTML={{ __html: account.note_emojified }} - /> - ----- {shortNumberFormat(account.statuses_count)} - - --- {shortNumberFormat(account.followers_count)} - - - - {account.last_status_at === null - ?-} - - --+- + + + +- {features.federating && ( -++ + {features.federating && ( +Display filter + +++ )}Fediverse filter + +-- )} -- - + {accountIds.map((accountId) => ( +-), + )} + - {accountIds.map((accountId) =>- -)} - + + ); }; diff --git a/app/soapbox/features/domain_blocks/index.tsx b/app/soapbox/features/domain-blocks/index.tsx similarity index 89% rename from app/soapbox/features/domain_blocks/index.tsx rename to app/soapbox/features/domain-blocks/index.tsx index cad165b3b..c623ee981 100644 --- a/app/soapbox/features/domain_blocks/index.tsx +++ b/app/soapbox/features/domain-blocks/index.tsx @@ -3,9 +3,9 @@ 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 ScrollableList from 'soapbox/components/scrollable-list'; import { Spinner } from 'soapbox/components/ui'; import { useAppSelector } from 'soapbox/hooks'; @@ -48,8 +48,9 @@ const DomainBlocks: React.FC = () => { onLoadMore={() => handleLoadMore(dispatch)} hasMore={hasMore} emptyMessage={emptyMessage} + className='divide-y divide-gray-200 dark:divide-gray-800' > - {domains.map((domain) => + {['gab.com', 'gab.ai'].map((domain) => , )} 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 92% rename from app/soapbox/features/edit_profile/components/profile-preview.tsx rename to 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/edit_profile/index.tsx b/app/soapbox/features/edit-profile/index.tsx similarity index 99% rename from app/soapbox/features/edit_profile/index.tsx rename to app/soapbox/features/edit-profile/index.tsx index c60298a7b..1967e9138 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, @@ -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/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/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/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/__tests__/emoji.test.ts b/app/soapbox/features/emoji/__tests__/emoji.test.ts index f1374e8c1..83b6ef14d 100644 --- a/app/soapbox/features/emoji/__tests__/emoji.test.ts +++ b/app/soapbox/features/emoji/__tests__/emoji.test.ts @@ -11,8 +11,8 @@ describe('emoji', () => { }); it('works with unclosed tags', () => { - expect(emojify('hello>')).toEqual('hello>'); - expect(emojify(' 
');
+ '');
expect(emojify('👨👩👧👧')).toEqual(
- '
');
- expect(emojify('👩👩👦')).toEqual('
');
+ '');
+ expect(emojify('👩👩👦')).toEqual('');
expect(emojify('\u2757')).toEqual(
- '
');
+ '');
});
it('does multiple unicode', () => {
expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
- ' 
');
+ ' ');
expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
- '');
+ '');
expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
- ' ');
+ ' ');
expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
- 'foo bar');
+ 'foo bar');
});
it('ignores unicode inside of tags', () => {
@@ -46,16 +46,16 @@ describe('emoji', () => {
});
it('does multiple emoji properly (issue 5188)', () => {
- expect(emojify('👌🌈💕')).toEqual('
');
- expect(emojify('👌 🌈 💕')).toEqual(' ');
+ expect(emojify('👌🌈💕')).toEqual('');
+ expect(emojify('👌 🌈 💕')).toEqual(' ');
});
it('does an emoji that has no shortcode', () => {
- expect(emojify('👁🗨')).toEqual('
');
+ expect(emojify('👁🗨')).toEqual('');
});
it('does an emoji whose filename is irregular', () => {
- expect(emojify('↙️')).toEqual('
');
+ expect(emojify('↙️')).toEqual('');
});
it('avoid emojifying on invisible text', () => {
@@ -67,16 +67,26 @@ describe('emoji', () => {
it('avoid emojifying on invisible text with nested tags', () => {
expect(emojify('😄bar😴😇'))
- .toEqual('😄bar😴
');
+ .toEqual('😄bar😴');
expect(emojify('😄😕😴😇'))
- .toEqual('😄😕😴');
+ .toEqual('😄😕😴');
expect(emojify('😄
😴😇')) - .toEqual('😄
😴');
+ .toEqual('😄
😴');
});
it('skips the textual presentation VS15 character', () => {
expect(emojify('✴︎')) // This is U+2734 EIGHT POINTED BLACK STAR then U+FE0E VARIATION SELECTOR-15
- .toEqual('
');
+ .toEqual('');
+ });
+
+ it('does an simple emoji properly', () => {
+ expect(emojify('♀♂'))
+ .toEqual('
');
+ });
+
+ it('does an emoji containing ZWJ properly', () => {
+ expect(emojify('💂♀️💂♂️'))
+ .toEqual('
');
});
});
});
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..9eadddbc6 100644
--- a/app/soapbox/features/emoji/emoji.js
+++ b/app/soapbox/features/emoji/emoji.js
@@ -2,64 +2,48 @@ 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));
-const emojify = (str, customEmojis = {}, autoplay = false) => {
- const tagCharsWithoutEmojis = '<&';
- const tagCharsWithEmojis = Object.keys(customEmojis).length ? '<&:' : '<&';
- let rtn = '', tagChars = tagCharsWithEmojis, invisible = 0;
+const domParser = new DOMParser();
+
+const emojifyTextNode = (node, customEmojis, autoPlayGif = false) => {
+ let str = node.textContent;
+
+ const fragment = new DocumentFragment();
+
for (;;) {
- let match, i = 0, tag;
- while (i < str.length && (tag = tagChars.indexOf(str[i])) === -1 && (invisible || !(match = trie.search(str.slice(i))))) {
- i += str.codePointAt(i) < 65536 ? 1 : 2;
+ let match, i = 0;
+
+ if (customEmojis === null) {
+ while (i < str.length && !(match = trie.search(str.slice(i)))) {
+ i += str.codePointAt(i) < 65536 ? 1 : 2;
+ }
+ } else {
+ while (i < str.length && str[i] !== ':' && !(match = trie.search(str.slice(i)))) {
+ i += str.codePointAt(i) < 65536 ? 1 : 2;
+ }
}
+
let rend, replacement = '';
if (i === str.length) {
break;
} else if (str[i] === ':') {
- // FIXME: This is insane.
- /* eslint-disable no-loop-func */
+ // eslint-disable-next-line no-loop-func
if (!(() => {
rend = str.indexOf(':', i + 1) + 1;
if (!rend) return false; // no pair of ':'
- const lt = str.indexOf('<', i + 1);
- if (!(lt === -1 || lt >= rend)) return false; // tag appeared before closing ':'
const shortname = str.slice(i, rend);
// now got a replacee as ':shortname:'
// if you want additional emoji handler, add statements below which set replacement and return true.
if (shortname in customEmojis) {
- const filename = autoplay ? customEmojis[shortname].url : customEmojis[shortname].static_url;
- replacement = ``; + const filename = autoPlayGif ? customEmojis[shortname].url : customEmojis[shortname].static_url; + replacement = `
= ({ id }) => { return ( -diff --git a/app/soapbox/features/follow_requests/index.tsx b/app/soapbox/features/follow-requests/index.tsx similarity index 93% rename from app/soapbox/features/follow_requests/index.tsx rename to app/soapbox/features/follow-requests/index.tsx index eed1a8e1f..976b3586f 100644 --- a/app/soapbox/features/follow_requests/index.tsx +++ b/app/soapbox/features/follow-requests/index.tsx @@ -4,13 +4,13 @@ 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'; 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/followers/index.tsx b/app/soapbox/features/followers/index.tsx index 8625f2142..d9025499b 100644 --- a/app/soapbox/features/followers/index.tsx +++ b/app/soapbox/features/followers/index.tsx @@ -9,10 +9,10 @@ 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 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 cd0a10351..a189fddf1 100644 --- a/app/soapbox/features/following/index.tsx +++ b/app/soapbox/features/following/index.tsx @@ -9,10 +9,10 @@ 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 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/generic_not_found/index.tsx b/app/soapbox/features/generic-not-found/index.tsx similarity index 65% rename from app/soapbox/features/generic_not_found/index.tsx rename to 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 7ead1a9f5..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'; @@ -95,7 +95,7 @@ export const HashtagTimeline: React.FC = ({ params }) => { subscribe(); dispatch(clearTimeline(`hashtag:${id}`)); dispatch(expandHashtagTimeline(id, { tags })); - }, [id, tags]); + }, [id]); return ( 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 95% rename from app/soapbox/features/import_data/index.tsx rename to app/soapbox/features/import-data/index.tsx index 5d26fa0ec..9955ec6c3 100644 --- a/app/soapbox/features/import_data/index.tsx +++ b/app/soapbox/features/import-data/index.tsx @@ -5,11 +5,11 @@ import { importFollows, importBlocks, importMutes, -} from 'soapbox/actions/import_data'; +} from 'soapbox/actions/import-data'; 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 96% rename from app/soapbox/features/landing_page/index.tsx rename to app/soapbox/features/landing-page/index.tsx index 937e599c8..b5332fa34 100644 --- a/app/soapbox/features/landing_page/index.tsx +++ b/app/soapbox/features/landing-page/index.tsx @@ -3,8 +3,8 @@ 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 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/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 96% rename from app/soapbox/features/list_adder/components/list.tsx rename to 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_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/list_editor/components/account.tsx b/app/soapbox/features/list-editor/components/account.tsx similarity index 97% rename from app/soapbox/features/list_editor/components/account.tsx rename to 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/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 98% rename from app/soapbox/features/list_timeline/index.tsx rename to 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/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 6ec93ee5a..082da7c5d 100644 --- a/app/soapbox/features/lists/index.tsx +++ b/app/soapbox/features/lists/index.tsx @@ -7,11 +7,11 @@ 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'; -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/mutes/index.tsx b/app/soapbox/features/mutes/index.tsx index caf15ca26..e7e8365aa 100644 --- a/app/soapbox/features/mutes/index.tsx +++ b/app/soapbox/features/mutes/index.tsx @@ -4,9 +4,9 @@ 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 AccountContainer from 'soapbox/containers/account-container'; import { useAppSelector } from 'soapbox/hooks'; const messages = defineMessages({ 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/__tests__/notification.test.tsx b/app/soapbox/features/notifications/components/__tests__/notification.test.tsx index 9c86474b7..b9c5df641 100644 --- a/app/soapbox/features/notifications/components/__tests__/notification.test.tsx +++ b/app/soapbox/features/notifications/components/__tests__/notification.test.tsx @@ -13,7 +13,7 @@ const normalize = (notification: any) => { return { // @ts-ignore - notification: state.notifications.items.get(notification.id), + notification: state.notifications.items.get(notification.id)!, state, }; }; 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/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index 1871b3a89..b50d953c8 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -1,7 +1,7 @@ import React, { useCallback } from 'react'; import { HotKeys } from 'react-hotkeys'; -import { defineMessages, useIntl, FormattedMessage, IntlShape, MessageDescriptor } from 'react-intl'; -import { useHistory } from 'react-router-dom'; +import { defineMessages, useIntl, FormattedMessage, IntlShape, MessageDescriptor, defineMessage } from 'react-intl'; +import { Link, useHistory } from 'react-router-dom'; import { mentionCompose } from 'soapbox/actions/compose'; import { reblog, favourite, unreblog, unfavourite } from 'soapbox/actions/interactions'; @@ -9,10 +9,9 @@ import { openModal } from 'soapbox/actions/modals'; import { getSettings } from 'soapbox/actions/settings'; import { hideStatus, revealStatus } from 'soapbox/actions/statuses'; import Icon from 'soapbox/components/icon'; -import Permalink from 'soapbox/components/permalink'; 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'; @@ -30,9 +29,8 @@ const notificationForScreenReader = (intl: IntlShape, message: string, timestamp const buildLink = (account: Account): JSX.Element => ( - = { update: require('@tabler/icons/pencil.svg'), }; +const nameMessage = defineMessage({ + id: 'notification.name', + defaultMessage: '{link}{others}', +}); + const messages: Record void }) => { diff --git a/app/soapbox/features/pinned_statuses/index.tsx b/app/soapbox/features/pinned-statuses/index.tsx similarity index 89% rename from app/soapbox/features/pinned_statuses/index.tsx rename to app/soapbox/features/pinned-statuses/index.tsx index b5263ea4a..54c7b7d08 100644 --- a/app/soapbox/features/pinned_statuses/index.tsx +++ b/app/soapbox/features/pinned-statuses/index.tsx @@ -2,9 +2,9 @@ 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 MissingIndicator from 'soapbox/components/missing_indicator'; -import StatusList from 'soapbox/components/status_list'; +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'; import Column from '../ui/components/column'; 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 62% rename from app/soapbox/features/placeholder/components/placeholder_hashtag.tsx rename to app/soapbox/features/placeholder/components/placeholder-hashtag.tsx index 28dceec72..8830b1e90 100644 --- a/app/soapbox/features/placeholder/components/placeholder_hashtag.tsx +++ b/app/soapbox/features/placeholder/components/placeholder-hashtag.tsx @@ -7,12 +7,8 @@ const PlaceholderHashtag: React.FC = () => { const length = randomIntFromInterval(15, 30); return ( - --+- {generateText(length)} --+); }; 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 new file mode 100644 index 000000000..3eab10e4d --- /dev/null +++ b/app/soapbox/features/placeholder/components/placeholder-media-gallery.tsx @@ -0,0 +1,93 @@ +import { List as ImmutableList, Record as ImmutableRecord } from 'immutable'; +import React, { useState } from 'react'; + +import type { Attachment as AttachmentEntity } from 'soapbox/types/entities'; + +interface IPlaceholderMediaGallery { + media: ImmutableList{generateText(length)}
; + defaultWidth?: number; +} + +const SizeData = ImmutableRecord({ + style: {} as React.CSSProperties, + itemsDimensions: [] as Record = ({ media, defaultWidth }) => { + const [width, setWidth] = useState(defaultWidth); + + const handleRef = (node: HTMLDivElement) => { + if (node) { + setWidth(node.offsetWidth); + } + }; + + const getSizeData = (size: number) => { + const style: React.CSSProperties = {}; + let itemsDimensions: Record + {media.take(4).map((_, i) => renderItem(sizeData.get('itemsDimensions')[i], i))} ++ ); +}; + +export default PlaceholderMediaGallery; 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/placeholder/components/placeholder_media_gallery.js b/app/soapbox/features/placeholder/components/placeholder_media_gallery.js deleted file mode 100644 index c1b2dd3b9..000000000 --- a/app/soapbox/features/placeholder/components/placeholder_media_gallery.js +++ /dev/null @@ -1,96 +0,0 @@ -import { Map as ImmutableMap } from 'immutable'; -import PropTypes from 'prop-types'; -import React from 'react'; -import ImmutablePropTypes from 'react-immutable-proptypes'; - -export default class PlaceholderMediaGallery extends React.Component { - - static propTypes = { - media: ImmutablePropTypes.map.isRequired, - defaultWidth: PropTypes.number, - } - - state = { - width: this.props.defaultWidth, - }; - - handleRef = (node) => { - if (node) { - this.setState({ - width: node.offsetWidth, - }); - } - } - - getSizeData = size => { - const { defaultWidth } = this.props; - const width = this.state.width || defaultWidth; - - const style = {}; - let itemsDimensions = []; - - if (size === 1) { - style.height = width * 9 / 16; - - itemsDimensions = [ - { w: '100%', h: '100%' }, - ]; - } else if (size === 2) { - style.height = width / 2; - - itemsDimensions = [ - { w: '50%', h: '100%', r: '2px' }, - { w: '50%', h: '100%', l: '2px' }, - ]; - } else if (size === 3) { - style.height = width; - - itemsDimensions = [ - { w: '50%', h: '50%', b: '2px', r: '2px' }, - { w: '50%', h: '50%', b: '2px', l: '2px' }, - { w: '100%', h: '50%', t: '2px' }, - ]; - } else if (size >= 4) { - style.height = width; - - itemsDimensions = [ - { w: '50%', h: '50%', b: '2px', r: '2px' }, - { w: '50%', h: '50%', b: '2px', l: '2px' }, - { w: '50%', h: '50%', t: '2px', r: '2px' }, - { w: '50%', h: '50%', t: '2px', l: '2px' }, - ]; - } - - return ImmutableMap({ - style, - itemsDimensions, - size, - width, - }); - } - - renderItem = (dimensions, i) => { - const width = dimensions.w; - const height = dimensions.h; - const top = dimensions.t || 'auto'; - const right = dimensions.r || 'auto'; - const bottom = dimensions.b || 'auto'; - const left = dimensions.l || 'auto'; - const float = dimensions.float || 'left'; - const position = dimensions.pos || 'relative'; - - return ; - } - - render() { - const { media } = this.props; - const sizeData = this.getSizeData(media.size); - - return ( -- {media.take(4).map((_, i) => this.renderItem(sizeData.get('itemsDimensions')[i], i))} -- ); - } - -} diff --git a/app/soapbox/features/placeholder/utils.js b/app/soapbox/features/placeholder/utils.ts similarity index 68% rename from app/soapbox/features/placeholder/utils.js rename to app/soapbox/features/placeholder/utils.ts index f2001a61d..15eb4e5e5 100644 --- a/app/soapbox/features/placeholder/utils.js +++ b/app/soapbox/features/placeholder/utils.ts @@ -1,6 +1,6 @@ export const PLACEHOLDER_CHAR = '█'; -export const generateText = length => { +export const generateText = (length: number) => { let text = ''; for (let i = 0; i < length; i++) { @@ -11,6 +11,6 @@ export const generateText = length => { }; // https://stackoverflow.com/a/7228322/8811886 -export const randomIntFromInterval = (min, max) => { +export const randomIntFromInterval = (min: number, max: number) => { return Math.floor(Math.random() * (max - min + 1) + min); }; diff --git a/app/soapbox/features/preferences/index.tsx b/app/soapbox/features/preferences/index.tsx index 3adb90861..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'; @@ -193,6 +193,10 @@ const Preferences = () => {+ }> + + + {features.spoilers && }> } 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 93% rename from app/soapbox/features/public_timeline/index.tsx rename to app/soapbox/features/public-timeline/index.tsx index 34017a0d3..6fec372ce 100644 --- a/app/soapbox/features/public_timeline/index.tsx +++ b/app/soapbox/features/public-timeline/index.tsx @@ -6,12 +6,11 @@ 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 { Column } from 'soapbox/components/ui'; -import Accordion from 'soapbox/features/ui/components/accordion'; +import SubNavigation from 'soapbox/components/sub-navigation'; +import { Accordion, Column } from 'soapbox/components/ui'; 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 92% rename from app/soapbox/features/register_invite/index.tsx rename to app/soapbox/features/register-invite/index.tsx index e312c1126..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/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 96% rename from app/soapbox/features/remote_timeline/index.tsx rename to app/soapbox/features/remote-timeline/index.tsx index 00e2effe2..7ab185be9 100644 --- a/app/soapbox/features/remote_timeline/index.tsx +++ b/app/soapbox/features/remote-timeline/index.tsx @@ -4,14 +4,14 @@ 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'; 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 97% rename from app/soapbox/features/reply_mentions/account.tsx rename to 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/report/components/status_check_box.tsx b/app/soapbox/features/report/components/status-check-box.tsx similarity index 97% rename from app/soapbox/features/report/components/status_check_box.tsx rename to 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/builder.tsx b/app/soapbox/features/scheduled-statuses/builder.tsx similarity index 98% rename from app/soapbox/features/scheduled_statuses/builder.tsx rename to 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/scheduled_statuses/components/scheduled_status_action_bar.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status-action-bar.tsx similarity index 96% 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 index dd73b8945..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,9 +2,9 @@ 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 IconButton from 'soapbox/components/icon-button'; import { HStack } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx similarity index 88% rename from app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx rename to app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx index b9b90ef27..1d1a68c94 100644 --- a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx +++ b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx @@ -2,16 +2,16 @@ import classNames from 'clsx'; import React from 'react'; import AttachmentThumbs from 'soapbox/components/attachment-thumbs'; +import StatusContent from 'soapbox/components/status-content'; 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 PollPreview from 'soapbox/features/ui/components/poll_preview'; +import AccountContainer from 'soapbox/containers/account-container'; +import PollPreview from 'soapbox/features/ui/components/poll-preview'; 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 91% rename from app/soapbox/features/scheduled_statuses/index.tsx rename to app/soapbox/features/scheduled-statuses/index.tsx index 1bf9b5aee..1982af5b9 100644 --- a/app/soapbox/features/scheduled_statuses/index.tsx +++ b/app/soapbox/features/scheduled-statuses/index.tsx @@ -2,13 +2,13 @@ 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 ScrollableList from 'soapbox/components/scrollable_list'; +import { fetchScheduledStatuses, expandScheduledStatuses } from 'soapbox/actions/scheduled-statuses'; +import ScrollableList from 'soapbox/components/scrollable-list'; 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/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/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 new file mode 100644 index 000000000..94619f72f --- /dev/null +++ b/app/soapbox/features/server-info/index.tsx @@ -0,0 +1,38 @@ +import React from 'react'; +import { defineMessages, useIntl } from 'react-intl'; + +import { Column, Divider, Stack, Text } from 'soapbox/components/ui'; +import { useAppSelector } from 'soapbox/hooks'; + +import LinkFooter from '../ui/components/link-footer'; +import PromoPanel from '../ui/components/promo-panel'; + +const messages = defineMessages({ + heading: { id: 'column.info', defaultMessage: 'Server information' }, +}); + +const ServerInfo = () => { + const intl = useIntl(); + const instance = useAppSelector((state) => state.instance); + + return ( + + + ); +}; + +export default ServerInfo; diff --git a/app/soapbox/features/server_info/index.tsx b/app/soapbox/features/server_info/index.tsx deleted file mode 100644 index 0e12538d4..000000000 --- a/app/soapbox/features/server_info/index.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -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'; - -const messages = defineMessages({ - heading: { id: 'column.info', defaultMessage: 'Server information' }, -}); - -const ServerInfo = () => { - const intl = useIntl(); - const instance = useAppSelector((state) => state.instance); - - return ( -+ ++ + +{instance.title} +{instance.description} ++ + + + + + + - - ); -}; - -export default ServerInfo; 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 96% rename from app/soapbox/features/soapbox_config/components/color-picker.tsx rename to 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 similarity index 96% rename from app/soapbox/features/soapbox_config/components/color-with-picker.tsx rename to 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/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.tsx b/app/soapbox/features/soapbox-config/components/icon-picker-dropdown.tsx new file mode 100644 index 000000000..d23e9f004 --- /dev/null +++ b/app/soapbox/features/soapbox-config/components/icon-picker-dropdown.tsx @@ -0,0 +1,85 @@ +import React, { useRef, useState } from 'react'; +import { defineMessages, useIntl } from 'react-intl'; +// @ts-ignore +import Overlay from 'react-overlays/lib/Overlay'; + +import Icon from 'soapbox/components/icon'; + +import IconPickerMenu from './icon-picker-menu'; + +const messages = defineMessages({ + emoji: { id: 'icon_button.label', defaultMessage: 'Select icon' }, +}); + +interface IIconPickerDropdown { + value: string, + onPickEmoji: React.ChangeEventHandler, +} + +const IconPickerDropdown: React.FC------{instance.title}
-- {instance.description} --- - = ({ value, onPickEmoji }) => { + const intl = useIntl(); + + const [active, setActive] = useState(false); + const [placement, setPlacement] = useState<'bottom' | 'top'>(); + + const target = useRef(null); + + const onShowDropdown: React.KeyboardEventHandler = ({ target }) => { + setActive(true); + + const { top } = (target as any).getBoundingClientRect(); + setPlacement(top * 2 < innerHeight ? 'bottom' : 'top'); + }; + + const onHideDropdown = () => { + setActive(false); + }; + + const onToggle: React.KeyboardEventHandler = (e) => { + e.stopPropagation(); + if (!e.key || e.key === 'Enter') { + if (active) { + onHideDropdown(); + } else { + onShowDropdown(e); + } + } + }; + + const handleKeyDown: React.KeyboardEventHandler = (e) => { + if (e.key === 'Escape') { + onHideDropdown(); + } + }; + + const title = intl.formatMessage(messages.emoji); + const forkAwesomeIcons = require('../forkawesome.json'); + + return ( + ++ ); +}; + +export default IconPickerDropdown; diff --git a/app/soapbox/features/soapbox-config/components/icon-picker-menu.tsx b/app/soapbox/features/soapbox-config/components/icon-picker-menu.tsx new file mode 100644 index 000000000..c88c1afd7 --- /dev/null +++ b/app/soapbox/features/soapbox-config/components/icon-picker-menu.tsx @@ -0,0 +1,131 @@ +import classNames from 'clsx'; +import { supportsPassiveEvents } from 'detect-passive-events'; +// @ts-ignore +import Picker from 'emoji-mart/dist-es/components/picker/picker'; +import React, { useCallback, useEffect, useRef } from 'react'; +import { defineMessages, useIntl } from 'react-intl'; + +const messages = defineMessages({ + emoji: { id: 'icon_button.label', defaultMessage: 'Select icon' }, + emoji_search: { id: 'emoji_button.search', defaultMessage: 'Search…' }, + emoji_not_found: { id: 'icon_button.not_found', defaultMessage: 'No icons!! (╯°□°）╯︵ ┻━┻' }, + custom: { id: 'icon_button.icons', defaultMessage: 'Icons' }, + search_results: { id: 'emoji_button.search_results', defaultMessage: 'Search results' }, +}); + +const backgroundImageFn = () => ''; +const listenerOptions = supportsPassiveEvents ? { passive: true } : false; + +const categoriesSort = ['custom']; + +interface IIconPickerMenu { + customEmojis: Record} + onKeyDown={onToggle} + tabIndex={0} + > ++ ++ + ++ = ({ customEmojis, onClose, onPick, style }) => { + const intl = useIntl(); + + const node = useRef (null); + + const handleDocumentClick = useCallback((e: MouseEvent | TouchEvent) => { + if (node.current && !node.current.contains(e.target as Node)) { + onClose(); + } + }, []); + + useEffect(() => { + document.addEventListener('click', handleDocumentClick, false); + document.addEventListener('touchend', handleDocumentClick, listenerOptions); + + return () => { + document.removeEventListener('click', handleDocumentClick, false); + document.removeEventListener('touchend', handleDocumentClick, listenerOptions as any); + + }; + }, []); + + const setRef = (c: HTMLDivElement) => { + node.current = c; + + if (!c) return; + + // Nice and dirty hack to display the icons + c.querySelectorAll('button.emoji-mart-emoji > img').forEach(elem => { + const newIcon = document.createElement('span'); + newIcon.innerHTML = ``; + (elem.parentNode as any).replaceChild(newIcon, elem); + }); + }; + + const getI18n = () => { + + return { + search: intl.formatMessage(messages.emoji_search), + notfound: intl.formatMessage(messages.emoji_not_found), + categories: { + search: intl.formatMessage(messages.search_results), + custom: intl.formatMessage(messages.custom), + }, + }; + }; + + const handleClick = (emoji: Record ++ ); +}; + +export default IconPickerMenu; 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 99% rename from app/soapbox/features/soapbox_config/components/site-preview.tsx rename to 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/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 99% rename from app/soapbox/features/soapbox_config/index.tsx rename to app/soapbox/features/soapbox-config/index.tsx index 0f71bbf61..1bf39b543 100644 --- a/app/soapbox/features/soapbox_config/index.tsx +++ b/app/soapbox/features/soapbox-config/index.tsx @@ -7,6 +7,7 @@ import { uploadMedia } from 'soapbox/actions/media'; import snackbar from 'soapbox/actions/snackbar'; import List, { ListItem } from 'soapbox/components/list'; import { + Accordion, Column, CardHeader, CardTitle, @@ -24,8 +25,6 @@ import ThemeSelector from 'soapbox/features/ui/components/theme-selector'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { normalizeSoapboxConfig } from 'soapbox/normalizers'; -import Accordion from '../ui/components/accordion'; - import ColorWithPicker from './components/color-with-picker'; import CryptoAddressInput from './components/crypto-address-input'; import FooterLinkInput from './components/footer-link-input'; diff --git a/app/soapbox/features/soapbox_config/components/icon-picker-menu.js b/app/soapbox/features/soapbox_config/components/icon-picker-menu.js deleted file mode 100644 index c89b00488..000000000 --- a/app/soapbox/features/soapbox_config/components/icon-picker-menu.js +++ /dev/null @@ -1,154 +0,0 @@ -import classNames from 'clsx'; -import { supportsPassiveEvents } from 'detect-passive-events'; -import Picker from 'emoji-mart/dist-es/components/picker/picker'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { defineMessages, injectIntl } from 'react-intl'; - -const messages = defineMessages({ - emoji: { id: 'icon_button.label', defaultMessage: 'Select icon' }, - emoji_search: { id: 'emoji_button.search', defaultMessage: 'Search…' }, - emoji_not_found: { id: 'icon_button.not_found', defaultMessage: 'No icons!! (╯°□°）╯︵ ┻━┻' }, - custom: { id: 'icon_button.icons', defaultMessage: 'Icons' }, - search_results: { id: 'emoji_button.search_results', defaultMessage: 'Search results' }, -}); - -const backgroundImageFn = () => ''; -const listenerOptions = supportsPassiveEvents ? { passive: true } : false; - -const categoriesSort = ['custom']; - - -class IconPickerMenu extends React.PureComponent { - - static propTypes = { - custom_emojis: PropTypes.object, - loading: PropTypes.bool, - onClose: PropTypes.func.isRequired, - onPick: PropTypes.func.isRequired, - style: PropTypes.object, - placement: PropTypes.string, - arrowOffsetLeft: PropTypes.string, - arrowOffsetTop: PropTypes.string, - intl: PropTypes.object.isRequired, - }; - - static defaultProps = { - style: {}, - loading: true, - }; - - state = { - modifierOpen: false, - placement: null, - }; - - handleDocumentClick = e => { - if (this.node && !this.node.contains(e.target)) { - this.props.onClose(); - } - } - - componentDidMount() { - document.addEventListener('click', this.handleDocumentClick, false); - document.addEventListener('touchend', this.handleDocumentClick, listenerOptions); - } - - componentWillUnmount() { - document.removeEventListener('click', this.handleDocumentClick, false); - document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions); - } - - setRef = c => { - this.node = c; - - if (!c) return; - - // Nice and dirty hack to display the icons - c.querySelectorAll('button.emoji-mart-emoji > img').forEach(elem => { - const newIcon = document.createElement('span'); - newIcon.innerHTML = ``; - elem.parentNode.replaceChild(newIcon, elem); - }); - } - - getI18n = () => { - const { intl } = this.props; - - return { - search: intl.formatMessage(messages.emoji_search), - notfound: intl.formatMessage(messages.emoji_not_found), - categories: { - search: intl.formatMessage(messages.search_results), - custom: intl.formatMessage(messages.custom), - }, - }; - } - - handleClick = emoji => { - emoji.native = emoji.colons; - - this.props.onClose(); - this.props.onPick(emoji); - } - - buildIcons = (customEmojis, autoplay = false) => { - const emojis = []; - - Object.values(customEmojis).forEach(category => { - category.forEach(function(icon) { - const name = icon.replace('fa fa-', ''); - if (icon !== 'email' && icon !== 'memo') { - emojis.push({ - id: name, - name, - short_names: [name], - emoticons: [], - keywords: [name], - imageUrl: '', - }); - } - }); - }); - - return emojis; - }; - - render() { - const { loading, style, intl, custom_emojis } = this.props; - - if (loading) { - return ; - } - - const data = { compressed: true, categories: [], aliases: [], emojis: [] }; - const title = intl.formatMessage(messages.emoji); - const { modifierOpen } = this.state; - - return ( -+ -- ); - } - -} - -export default injectIntl(IconPickerMenu); diff --git a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js deleted file mode 100644 index 5393f0dc8..000000000 --- a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js +++ /dev/null @@ -1,103 +0,0 @@ -import PropTypes from 'prop-types'; -import React from 'react'; -import { defineMessages, injectIntl } from 'react-intl'; -import Overlay from 'react-overlays/lib/Overlay'; - -import Icon from 'soapbox/components/icon'; - -import IconPickerMenu from './icon-picker-menu'; - -const messages = defineMessages({ - emoji: { id: 'icon_button.label', defaultMessage: 'Select icon' }, -}); - -class IconPickerDropdown extends React.PureComponent { - - static propTypes = { - frequentlyUsedEmojis: PropTypes.arrayOf(PropTypes.string), - intl: PropTypes.object.isRequired, - onPickEmoji: PropTypes.func.isRequired, - value: PropTypes.string, - }; - - state = { - active: false, - loading: false, - }; - - setRef = (c) => { - this.dropdown = c; - } - - onShowDropdown = ({ target }) => { - this.setState({ active: true }); - - const { top } = target.getBoundingClientRect(); - this.setState({ placement: top * 2 < innerHeight ? 'bottom' : 'top' }); - } - - onHideDropdown = () => { - this.setState({ active: false }); - } - - onToggle = (e) => { - if (!this.state.loading && (!e.key || e.key === 'Enter')) { - if (this.state.active) { - this.onHideDropdown(); - } else { - this.onShowDropdown(e); - } - } - } - - handleKeyDown = e => { - if (e.key === 'Escape') { - this.onHideDropdown(); - } - } - - setTargetRef = c => { - this.target = c; - } - - findTarget = () => { - return this.target; - } - - render() { - const { intl, onPickEmoji, value } = this.props; - const title = intl.formatMessage(messages.emoji); - const { active, loading, placement } = this.state; - const forkAwesomeIcons = require('../forkawesome.json'); - - return ( -- -- ); - } - -} - -export default injectIntl(IconPickerDropdown); \ No newline at end of file diff --git a/app/soapbox/features/status/components/card.tsx b/app/soapbox/features/status/components/card.tsx index 3d83020fe..18dd427a5 100644 --- a/app/soapbox/features/status/components/card.tsx +++ b/app/soapbox/features/status/components/card.tsx @@ -5,7 +5,9 @@ import React, { useState, useEffect } from 'react'; import Blurhash from 'soapbox/components/blurhash'; import Icon from 'soapbox/components/icon'; import { HStack, Stack, Text } from 'soapbox/components/ui'; +import { useSettings } from 'soapbox/hooks'; import { normalizeAttachment } from 'soapbox/normalizers'; +import { addAutoPlay } from 'soapbox/utils/media'; import type { Card as CardEntity, Attachment } from 'soapbox/types/entities'; @@ -19,30 +21,6 @@ const trim = (text: string, len: number): string => { return text.substring(0, cut) + (text.length > len ? '…' : ''); }; -const domParser = new DOMParser(); - -const addAutoPlay = (html: string): string => { - const document = domParser.parseFromString(html, 'text/html').documentElement; - const iframe = document.querySelector('iframe'); - - if (iframe) { - if (iframe.src.includes('?')) { - iframe.src += '&'; - } else { - iframe.src += '?'; - } - - iframe.src += 'autoplay=1&auto_play=1'; - iframe.allow = 'autoplay'; - - // DOM parser creates html/body elements around original HTML fragment, - // so we need to get innerHTML out of the body and not the entire document - return (document.querySelector('body') as HTMLBodyElement).innerHTML; - } - - return html; -}; - interface ICard { card: CardEntity, maxTitle?: number, @@ -64,6 +42,9 @@ const Card: React.FC-- -- - -- = ({ onOpenMedia, horizontal, }): JSX.Element => { + const settings = useSettings(); + const shouldAutoPlayVideo = settings.get('autoPlayVideo'); + const [width, setWidth] = useState(defaultWidth); const [embedded, setEmbedded] = useState(false); @@ -111,7 +92,7 @@ const Card: React.FC = ({ }; const renderVideo = () => { - const content = { __html: addAutoPlay(card.html) }; + const content = { __html: shouldAutoPlayVideo ? addAutoPlay(card.html) : card.html }; const ratio = getRatio(card); const height = width / ratio; diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx index eb6fb240f..a1fdc5434 100644 --- a/app/soapbox/features/status/components/detailed-status.tsx +++ b/app/soapbox/features/status/components/detailed-status.tsx @@ -1,16 +1,15 @@ -import classNames from 'clsx'; -import React, { useRef } from 'react'; +import React, { useEffect, useRef, useState } 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 QuotedStatus from 'soapbox/features/status/containers/quoted_status_container'; +import AccountContainer from 'soapbox/containers/account-container'; +import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container'; import { getActualStatus } from 'soapbox/utils/status'; import StatusInteractionBar from './status-interaction-bar'; @@ -35,7 +34,17 @@ const DetailedStatus: React.FC = ({ showMedia, }) => { const intl = useIntl(); + const node = useRef (null); + const overlay = useRef (null); + + const [minHeight, setMinHeight] = useState(208); + + useEffect(() => { + if (overlay.current) { + setMinHeight(overlay.current.getBoundingClientRect().height); + } + }, [overlay.current]); const handleOpenCompareHistoryModal = () => { onOpenCompareHistoryModal(status); @@ -87,17 +96,15 @@ const DetailedStatus: React.FC = ({ {(isUnderReview || isSensitive) && ( )} 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/status/components/thread-status.tsx b/app/soapbox/features/status/components/thread-status.tsx index d3d587e7a..8054e268a 100644 --- a/app/soapbox/features/status/components/thread-status.tsx +++ b/app/soapbox/features/status/components/thread-status.tsx @@ -2,8 +2,8 @@ import classNames from 'clsx'; 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 StatusContainer from 'soapbox/containers/status-container'; +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 2d419ca84..2ef33f9c3 100644 --- a/app/soapbox/features/status/index.tsx +++ b/app/soapbox/features/status/index.tsx @@ -25,15 +25,15 @@ 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'; -import PendingStatus from 'soapbox/features/ui/components/pending_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'; import { defaultMediaVisibility, textForScreenReader } from 'soapbox/utils/status'; @@ -402,7 +402,7 @@ const Thread: React.FC = (props) => { offset: -80, }); - setImmediate(() => statusRef.current?.querySelector ('.detailed-status')?.focus()); + setImmediate(() => statusRef.current?.querySelector ('.detailed-actualStatus')?.focus()); }, [props.params.statusId, status?.id, ancestorsIds.size, isLoaded]); const handleRefresh = () => { @@ -456,11 +456,11 @@ const Thread: React.FC = (props) => { const titleMessage = status.visibility === 'direct' ? messages.titleDirect : messages.title; const focusedStatus = ( - +(diff --git a/app/soapbox/features/ui/components/modal_root.js b/app/soapbox/features/ui/components/modal-root.tsx similarity index 76% rename from app/soapbox/features/ui/components/modal_root.js rename to app/soapbox/features/ui/components/modal-root.tsx index 32425cffd..ceee5c1ec 100644 --- a/app/soapbox/features/ui/components/modal_root.js +++ b/app/soapbox/features/ui/components/modal-root.tsx @@ -1,7 +1,6 @@ -import PropTypes from 'prop-types'; import React from 'react'; -import Base from 'soapbox/components/modal_root'; +import Base from 'soapbox/components/modal-root'; import { MediaModal, VideoModal, @@ -34,10 +33,11 @@ import { AccountModerationModal, } from 'soapbox/features/ui/util/async-components'; -import BundleContainer from '../containers/bundle_container'; +import BundleContainer from '../containers/bundle-container'; -import BundleModalError from './bundle_modal_error'; -import ModalLoading from './modal_loading'; +import { BundleProps } from './bundle'; +import BundleModalError from './bundle-modal-error'; +import ModalLoading from './modal-loading'; const MODAL_COMPONENTS = { 'MEDIA': MediaModal, @@ -71,19 +71,21 @@ const MODAL_COMPONENTS = { 'ACCOUNT_MODERATION': AccountModerationModal, }; -export default class ModalRoot extends React.PureComponent { +export type ModalType = keyof typeof MODAL_COMPONENTS | null; - static propTypes = { - type: PropTypes.string, - props: PropTypes.object, - onClose: PropTypes.func.isRequired, - }; +interface IModalRoot { + type: ModalType, + props?: Recorddiff --git a/app/soapbox/features/ui/components/accordion.tsx b/app/soapbox/features/ui/components/accordion.tsx deleted file mode 100644 index f425e5321..000000000 --- a/app/soapbox/features/ui/components/accordion.tsx +++ /dev/null @@ -1,53 +0,0 @@ -import classNames from 'clsx'; -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 type { Menu } from 'soapbox/components/dropdown_menu'; - -const messages = defineMessages({ - collapse: { id: 'accordion.collapse', defaultMessage: 'Collapse' }, - expand: { id: 'accordion.expand', defaultMessage: 'Expand' }, -}); - -interface IAccordion { - headline: React.ReactNode, - children?: React.ReactNode, - menu?: Menu, - expanded?: boolean, - onToggle?: (value: boolean) => void, -} - -const Accordion: React.FC = ({ headline, children, menu, expanded = false, onToggle = () => {} }) => { - const intl = useIntl(); - - const handleToggle = (e: React.MouseEvent ) => { - onToggle(!expanded); - e.preventDefault(); - }; - - return ( - - {menu && ( -- ); -}; - -export default Accordion; 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 91% rename from app/soapbox/features/ui/components/better_column.js rename to app/soapbox/features/ui/components/better-column.js index 0efc19c3f..2547acb33 100644 --- a/app/soapbox/features/ui/components/better_column.js +++ b/app/soapbox/features/ui/components/better-column.js @@ -2,9 +2,9 @@ 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'; +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/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 90% rename from app/soapbox/features/ui/components/bundle_modal_error.tsx rename to app/soapbox/features/ui/components/bundle-modal-error.tsx index 2945c442b..f5eedd005 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.' }, @@ -32,7 +32,7 @@ const BundleModalError: React.FC-- )} - -- --{children} -= ({ onRetry, onClose }) => diff --git a/app/soapbox/features/ui/components/bundle.tsx b/app/soapbox/features/ui/components/bundle.tsx index 55f6478bc..79851b978 100644 --- a/app/soapbox/features/ui/components/bundle.tsx +++ b/app/soapbox/features/ui/components/bundle.tsx @@ -3,10 +3,10 @@ import React from 'react'; const emptyComponent = () => null; const noop = () => { }; -interface BundleProps { +export interface BundleProps { fetchComponent: () => Promise, loading: React.ComponentType, - error: React.ComponentType<{ onRetry: (props: BundleProps) => void }>, + error: React.ComponentType<{ onRetry: (props?: BundleProps) => void }>, children: (mod: any) => React.ReactNode, renderDelay?: number, onFetch: () => void, @@ -57,7 +57,7 @@ class Bundle extends React.PureComponent } onActionClick={handleDonateClick} > - --{ratioText} -- --{goalText} -- -++ ); }; 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 90% rename from app/soapbox/features/ui/components/instance_moderation_panel.tsx rename to app/soapbox/features/ui/components/instance-moderation-panel.tsx index 3ea9cf715..4a53a769f 100644 --- a/app/soapbox/features/ui/components/instance_moderation_panel.tsx +++ b/app/soapbox/features/ui/components/instance-moderation-panel.tsx @@ -5,8 +5,8 @@ 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 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/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/modal_loading.tsx b/app/soapbox/features/ui/components/modal-loading.tsx similarity index 86% rename from app/soapbox/features/ui/components/modal_loading.tsx rename to app/soapbox/features/ui/components/modal-loading.tsx index 0516cb275..e3effb060 100644 --- a/app/soapbox/features/ui/components/modal_loading.tsx +++ b/app/soapbox/features/ui/components/modal-loading.tsx @@ -11,7 +11,7 @@ const ModalLoading = () => (+ + +{ratioText} ++ + +{goalText} + +- +{ getSnapshotBeforeUpdate() { return { visible: !!this.props.type }; } - componentDidUpdate(prevProps, prevState, { visible }) { + componentDidUpdate(prevProps: IModalRoot, prevState: any, { visible }: any) { if (visible) { document.body.classList.add('with-modals'); } else { @@ -91,15 +93,15 @@ export default class ModalRoot extends React.PureComponent { } } - renderLoading = modalId => () => { + renderLoading = (modalId: string) => () => { return !['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].includes(modalId) ? : null; } - renderError = (props) => { + renderError: React.ComponentType<{ onRetry: (props?: BundleProps) => void }> = (props) => { return ; } - onClickClose = (_) => { + onClickClose = (_?: ModalType) => { const { onClose, type } = this.props; onClose(type); } 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/account_note_modal.tsx b/app/soapbox/features/ui/components/modals/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/modals/account-note-modal.tsx diff --git a/app/soapbox/features/ui/components/actions_modal.tsx b/app/soapbox/features/ui/components/modals/actions-modal.tsx similarity index 93% rename from app/soapbox/features/ui/components/actions_modal.tsx rename to app/soapbox/features/ui/components/modals/actions-modal.tsx index cc00126f6..7648069fa 100644 --- a/app/soapbox/features/ui/components/actions_modal.tsx +++ b/app/soapbox/features/ui/components/modals/actions-modal.tsx @@ -4,13 +4,13 @@ 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'; +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 { 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/birthdays_modal.tsx b/app/soapbox/features/ui/components/modals/birthdays-modal.tsx similarity index 95% rename from app/soapbox/features/ui/components/birthdays_modal.tsx rename to app/soapbox/features/ui/components/modals/birthdays-modal.tsx index 058a16cfc..2eb9504ec 100644 --- a/app/soapbox/features/ui/components/birthdays_modal.tsx +++ b/app/soapbox/features/ui/components/modals/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/boost_modal.tsx b/app/soapbox/features/ui/components/modals/boost-modal.tsx similarity index 98% rename from app/soapbox/features/ui/components/boost_modal.tsx rename to app/soapbox/features/ui/components/modals/boost-modal.tsx index 613fdaba2..3a09be5c3 100644 --- a/app/soapbox/features/ui/components/boost_modal.tsx +++ b/app/soapbox/features/ui/components/modals/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/compare_history_modal.tsx b/app/soapbox/features/ui/components/modals/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/modals/compare-history-modal.tsx diff --git a/app/soapbox/features/ui/components/component_modal.tsx b/app/soapbox/features/ui/components/modals/component-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/component_modal.tsx rename to app/soapbox/features/ui/components/modals/component-modal.tsx diff --git a/app/soapbox/features/ui/components/compose_modal.tsx b/app/soapbox/features/ui/components/modals/compose-modal.tsx similarity index 95% rename from app/soapbox/features/ui/components/compose_modal.tsx rename to app/soapbox/features/ui/components/modals/compose-modal.tsx index 5dc86766b..bf2cdd562 100644 --- a/app/soapbox/features/ui/components/compose_modal.tsx +++ b/app/soapbox/features/ui/components/modals/compose-modal.tsx @@ -3,11 +3,11 @@ 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'; -import ComposeForm from '../../compose/components/compose-form'; +import ComposeForm from '../../../compose/components/compose-form'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/soapbox/features/ui/components/confirmation_modal.tsx b/app/soapbox/features/ui/components/modals/confirmation-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/confirmation_modal.tsx rename to app/soapbox/features/ui/components/modals/confirmation-modal.tsx diff --git a/app/soapbox/features/ui/components/crypto_donate_modal.tsx b/app/soapbox/features/ui/components/modals/crypto-donate-modal.tsx similarity index 67% rename from app/soapbox/features/ui/components/crypto_donate_modal.tsx rename to app/soapbox/features/ui/components/modals/crypto-donate-modal.tsx index 29c2dfaa8..c1724ee78 100644 --- a/app/soapbox/features/ui/components/crypto_donate_modal.tsx +++ b/app/soapbox/features/ui/components/modals/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/edit_federation_modal.tsx b/app/soapbox/features/ui/components/modals/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/modals/edit-federation-modal.tsx diff --git a/app/soapbox/features/ui/components/embed-modal.tsx b/app/soapbox/features/ui/components/modals/embed-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/embed-modal.tsx rename to app/soapbox/features/ui/components/modals/embed-modal.tsx diff --git a/app/soapbox/features/ui/components/familiar_followers_modal.tsx b/app/soapbox/features/ui/components/modals/familiar-followers-modal.tsx similarity index 93% rename from app/soapbox/features/ui/components/familiar_followers_modal.tsx rename to app/soapbox/features/ui/components/modals/familiar-followers-modal.tsx index f276e9a9a..3b137ca5f 100644 --- a/app/soapbox/features/ui/components/familiar_followers_modal.tsx +++ b/app/soapbox/features/ui/components/modals/familiar-followers-modal.tsx @@ -2,9 +2,9 @@ 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 AccountContainer from 'soapbox/containers/account-container'; import { useAppSelector } from 'soapbox/hooks'; import { makeGetAccount } 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/hotkeys_modal.tsx b/app/soapbox/features/ui/components/modals/hotkeys-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/hotkeys_modal.tsx rename to app/soapbox/features/ui/components/modals/hotkeys-modal.tsx diff --git a/app/soapbox/features/ui/components/media-modal.tsx b/app/soapbox/features/ui/components/modals/media-modal.tsx similarity index 97% rename from app/soapbox/features/ui/components/media-modal.tsx rename to app/soapbox/features/ui/components/modals/media-modal.tsx index 92b5ecad9..6ed8ef435 100644 --- a/app/soapbox/features/ui/components/media-modal.tsx +++ b/app/soapbox/features/ui/components/modals/media-modal.tsx @@ -4,13 +4,13 @@ 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 IconButton from 'soapbox/components/icon-button'; import Audio from 'soapbox/features/audio'; import Video from 'soapbox/features/video'; -import ImageLoader from './image-loader'; +import ImageLoader from '../image-loader'; import type { List as ImmutableList } from 'immutable'; import type { Account, Attachment, Status } from 'soapbox/types/entities'; @@ -225,7 +225,6 @@ const MediaModal: React.FC = (props) => { muted controls={false} width={width} - link={link} height={height} key={attachment.preview_url} alt={attachment.description} @@ -298,4 +297,4 @@ const MediaModal: React.FC = (props) => { ); }; -export default MediaModal; \ No newline at end of file +export default MediaModal; diff --git a/app/soapbox/features/ui/components/mentions_modal.tsx b/app/soapbox/features/ui/components/modals/mentions-modal.tsx similarity index 92% rename from app/soapbox/features/ui/components/mentions_modal.tsx rename to app/soapbox/features/ui/components/modals/mentions-modal.tsx index 0cd104cfb..1df00fb08 100644 --- a/app/soapbox/features/ui/components/mentions_modal.tsx +++ b/app/soapbox/features/ui/components/modals/mentions-modal.tsx @@ -3,9 +3,9 @@ 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 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/missing_description_modal.tsx b/app/soapbox/features/ui/components/modals/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/modals/missing-description-modal.tsx diff --git a/app/soapbox/features/ui/components/mute_modal.tsx b/app/soapbox/features/ui/components/modals/mute-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/mute_modal.tsx rename to app/soapbox/features/ui/components/modals/mute-modal.tsx diff --git a/app/soapbox/features/ui/components/reactions_modal.tsx b/app/soapbox/features/ui/components/modals/reactions-modal.tsx similarity index 94% rename from app/soapbox/features/ui/components/reactions_modal.tsx rename to app/soapbox/features/ui/components/modals/reactions-modal.tsx index 7d0498c6d..60c8bd158 100644 --- a/app/soapbox/features/ui/components/reactions_modal.tsx +++ b/app/soapbox/features/ui/components/modals/reactions-modal.tsx @@ -3,11 +3,11 @@ 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 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/components/reblogs_modal.tsx b/app/soapbox/features/ui/components/modals/reblogs-modal.tsx similarity index 92% rename from app/soapbox/features/ui/components/reblogs_modal.tsx rename to app/soapbox/features/ui/components/modals/reblogs-modal.tsx index 3bacf3a25..526e7507f 100644 --- a/app/soapbox/features/ui/components/reblogs_modal.tsx +++ b/app/soapbox/features/ui/components/modals/reblogs-modal.tsx @@ -3,9 +3,9 @@ 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 AccountContainer from 'soapbox/containers/account-container'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; interface IReblogsModal { diff --git a/app/soapbox/features/ui/components/reply_mentions_modal.tsx b/app/soapbox/features/ui/components/modals/reply-mentions-modal.tsx similarity index 96% rename from app/soapbox/features/ui/components/reply_mentions_modal.tsx rename to app/soapbox/features/ui/components/modals/reply-mentions-modal.tsx index 2c8fc73b1..eb85d4ecb 100644 --- a/app/soapbox/features/ui/components/reply_mentions_modal.tsx +++ b/app/soapbox/features/ui/components/modals/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/components/modals/report-modal/report-modal.tsx b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx index f0e5d562b..bbcd83d6a 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,9 +5,9 @@ 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 AccountContainer from 'soapbox/containers/account-container'; import { useAccount, useAppDispatch, useAppSelector } from 'soapbox/hooks'; import ConfirmationStep from './steps/confirmation-step'; @@ -179,6 +179,7 @@ const ReportModal = ({ onClose }: IReportModal) => { @{account.acct} }} />} onClose={onClose} + cancelText={ } cancelAction={currentStep === Steps.THREE ? undefined : onClose} confirmationAction={handleNextStep} confirmationText={confirmationText} 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/unauthorized_modal.tsx b/app/soapbox/features/ui/components/modals/unauthorized-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/unauthorized_modal.tsx rename to app/soapbox/features/ui/components/modals/unauthorized-modal.tsx diff --git a/app/soapbox/features/ui/components/modals/verify-sms-modal.tsx b/app/soapbox/features/ui/components/modals/verify-sms-modal.tsx index ccc9d7221..6441e8763 100644 --- a/app/soapbox/features/ui/components/modals/verify-sms-modal.tsx +++ b/app/soapbox/features/ui/components/modals/verify-sms-modal.tsx @@ -1,5 +1,5 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; -import { useIntl } from 'react-intl'; +import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import OtpInput from 'react-otp-input'; import { verifyCredentials } from 'soapbox/actions/auth'; @@ -10,6 +10,37 @@ import { FormGroup, PhoneInput, Modal, Stack, Text } from 'soapbox/components/ui import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { getAccessToken } from 'soapbox/utils/auth'; +const messages = defineMessages({ + verificationInvalid: { + id: 'sms_verification.invalid', + defaultMessage: 'Please enter a valid phone number.', + }, + verificationSuccess: { + id: 'sms_verification.success', + defaultMessage: 'A verification code has been sent to your phone number.', + }, + verificationFail: { + id: 'sms_verification.fail', + defaultMessage: 'Failed to send SMS message to your phone number.', + }, + verificationExpired: { + id: 'sms_verification.expired', + defaultMessage: 'Your SMS token has expired.', + }, + verifySms: { + id: 'sms_verification.modal.verify_sms', + defaultMessage: 'Verify SMS', + }, + verifyNumber: { + id: 'sms_verification.modal.verify_number', + defaultMessage: 'Verify phone number', + }, + verifyCode: { + id: 'sms_verification.modal.verify_code', + defaultMessage: 'Verify code', + }, +}); + interface IVerifySmsModal { onClose: (type: string) => void, } @@ -47,10 +78,7 @@ const VerifySmsModal: React.FC = ({ onClose }) => { setStatus(Statuses.IDLE); dispatch( snackbar.error( - intl.formatMessage({ - id: 'sms_verification.invalid', - defaultMessage: 'Please enter a valid phone number.', - }), + intl.formatMessage(messages.verificationInvalid), ), ); return; @@ -59,10 +87,7 @@ const VerifySmsModal: React.FC = ({ onClose }) => { dispatch(reRequestPhoneVerification(phone!)).then(() => { dispatch( snackbar.success( - intl.formatMessage({ - id: 'sms_verification.success', - defaultMessage: 'A verification code has been sent to your phone number.', - }), + intl.formatMessage(messages.verificationSuccess), ), ); }) @@ -70,10 +95,7 @@ const VerifySmsModal: React.FC = ({ onClose }) => { .catch(() => { dispatch( snackbar.error( - intl.formatMessage({ - id: 'sms_verification.fail', - defaultMessage: 'Failed to send SMS message to your phone number.', - }), + intl.formatMessage(messages.verificationFail), ), ); }); @@ -102,20 +124,11 @@ const VerifySmsModal: React.FC = ({ onClose }) => { const confirmationText = useMemo(() => { switch (status) { case Statuses.IDLE: - return intl.formatMessage({ - id: 'sms_verification.modal.verify_sms', - defaultMessage: 'Verify SMS', - }); + return intl.formatMessage(messages.verifySms); case Statuses.READY: - return intl.formatMessage({ - id: 'sms_verification.modal.verify_number', - defaultMessage: 'Verify phone number', - }); + return intl.formatMessage(messages.verifyNumber); case Statuses.REQUESTED: - return intl.formatMessage({ - id: 'sms_verification.modal.verify_code', - defaultMessage: 'Verify code', - }); + return intl.formatMessage(messages.verifyCode); default: return null; } @@ -126,12 +139,13 @@ const VerifySmsModal: React.FC = ({ onClose }) => { case Statuses.IDLE: return ( - {intl.formatMessage({ - id: 'sms_verification.modal.verify_help_text', - defaultMessage: 'Verify your phone number to start using {instance}.', - }, { - instance: title, - })} + ); case Statuses.READY: @@ -149,10 +163,10 @@ const VerifySmsModal: React.FC= ({ onClose }) => { return ( <> - {intl.formatMessage({ - id: 'sms_verification.modal.enter_code', - defaultMessage: 'We sent you a 6-digit code via SMS. Enter it below.', - })} + = ({ onClose }) => { }) .catch(() => dispatch( snackbar.error( - intl.formatMessage({ - id: 'sms_verification.invalid', - defaultMessage: 'Your SMS token has expired.', - }), + intl.formatMessage(messages.verificationExpired), ), )); }; @@ -201,10 +212,10 @@ const VerifySmsModal: React.FC = ({ onClose }) => { return ( } onClose={() => onClose('VERIFY_SMS')} cancelAction={status === Statuses.IDLE ? () => onClose('VERIFY_SMS') : undefined} @@ -212,10 +223,12 @@ const VerifySmsModal: React.FC = ({ onClose }) => { confirmationAction={onConfirmationClick} confirmationText={confirmationText} secondaryAction={status === Statuses.REQUESTED ? resendVerificationCode : undefined} - secondaryText={status === Statuses.REQUESTED ? intl.formatMessage({ - id: 'sms_verification.modal.resend_code', - defaultMessage: 'Resend verification code?', - }) : undefined} + secondaryText={status === Statuses.REQUESTED ? ( + + ) : undefined} secondaryDisabled={requestedAnother} > diff --git a/app/soapbox/features/ui/components/video_modal.tsx b/app/soapbox/features/ui/components/modals/video-modal.tsx similarity index 100% rename from app/soapbox/features/ui/components/video_modal.tsx rename to app/soapbox/features/ui/components/modals/video-modal.tsx diff --git a/app/soapbox/features/ui/components/pending_status.tsx b/app/soapbox/features/ui/components/pending-status.tsx similarity index 90% rename from app/soapbox/features/ui/components/pending_status.tsx rename to app/soapbox/features/ui/components/pending-status.tsx index 64f0d168b..5ea14a72b 100644 --- a/app/soapbox/features/ui/components/pending_status.tsx +++ b/app/soapbox/features/ui/components/pending-status.tsx @@ -1,18 +1,18 @@ 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'; -import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder_media_gallery'; -import QuotedStatus from 'soapbox/features/status/containers/quoted_status_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'; 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 95% rename from app/soapbox/features/ui/components/pinned_accounts_panel.tsx rename to app/soapbox/features/ui/components/pinned-accounts-panel.tsx index d1b168c7c..8139f342e 100644 --- a/app/soapbox/features/ui/components/pinned_accounts_panel.tsx +++ b/app/soapbox/features/ui/components/pinned-accounts-panel.tsx @@ -4,8 +4,8 @@ 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 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/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 93% rename from app/soapbox/features/ui/components/profile_familiar_followers.tsx rename to app/soapbox/features/ui/components/profile-familiar-followers.tsx index a07f18c4d..5a9d9ede9 100644 --- a/app/soapbox/features/ui/components/profile_familiar_followers.tsx +++ b/app/soapbox/features/ui/components/profile-familiar-followers.tsx @@ -4,11 +4,11 @@ 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 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_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 97% rename from app/soapbox/features/ui/components/profile_info_panel.tsx rename to app/soapbox/features/ui/components/profile-info-panel.tsx index c6c6d084e..cf97b78e7 100644 --- a/app/soapbox/features/ui/components/profile_info_panel.tsx +++ b/app/soapbox/features/ui/components/profile-info-panel.tsx @@ -5,14 +5,14 @@ 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'; 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 90% rename from app/soapbox/features/ui/components/profile_media_panel.tsx rename to app/soapbox/features/ui/components/profile-media-panel.tsx index 78ecfa2c7..68c9987e5 100644 --- a/app/soapbox/features/ui/components/profile_media_panel.tsx +++ b/app/soapbox/features/ui/components/profile-media-panel.tsx @@ -5,11 +5,11 @@ import { useDispatch } from 'react-redux'; import { openModal } from 'soapbox/actions/modals'; import { expandAccountMediaTimeline } from 'soapbox/actions/timelines'; -import { Spinner, Widget } from 'soapbox/components/ui'; +import { Spinner, Text, 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'; @@ -52,7 +52,7 @@ const ProfileMediaPanel: React.FC = ({ account }) => { if (!nineAttachments.isEmpty()) { return ( - +{nineAttachments.map((attachment, _index) => (= ({ account }) => { ); } else { return ( - ++ ); } }; @@ -75,7 +75,7 @@ const ProfileMediaPanel: React.FC- = ({ account }) => { return ( }> {account && ( - +{loading ? () : ( 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/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/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 97% rename from app/soapbox/features/ui/components/user_panel.tsx rename to 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/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'; diff --git a/app/soapbox/features/ui/containers/bundle_container.tsx b/app/soapbox/features/ui/containers/bundle-container.tsx similarity index 93% rename from app/soapbox/features/ui/containers/bundle_container.tsx rename to app/soapbox/features/ui/containers/bundle-container.tsx index 12e4b3787..50a8b8629 100644 --- a/app/soapbox/features/ui/containers/bundle_container.tsx +++ b/app/soapbox/features/ui/containers/bundle-container.tsx @@ -1,6 +1,7 @@ import { connect } from 'react-redux'; -import { fetchBundleRequest, fetchBundleSuccess, fetchBundleFail } from '../../../actions/bundles'; +import { fetchBundleRequest, fetchBundleSuccess, fetchBundleFail } from 'soapbox/actions/bundles'; + import Bundle from '../components/bundle'; import type { AppDispatch } from 'soapbox/store'; diff --git a/app/soapbox/features/ui/containers/modal_container.js b/app/soapbox/features/ui/containers/modal-container.ts similarity index 65% rename from app/soapbox/features/ui/containers/modal_container.js rename to app/soapbox/features/ui/containers/modal-container.ts index 54f07a371..987a8d574 100644 --- a/app/soapbox/features/ui/containers/modal_container.js +++ b/app/soapbox/features/ui/containers/modal-container.ts @@ -4,22 +4,24 @@ import { cancelReplyCompose } from 'soapbox/actions/compose'; import { closeModal } from 'soapbox/actions/modals'; import { cancelReport } from 'soapbox/actions/reports'; -import ModalRoot from '../components/modal_root'; +import ModalRoot, { ModalType } from '../components/modal-root'; -const mapStateToProps = state => { - const modal = state.get('modals').last({ +import type { AppDispatch, RootState } from 'soapbox/store'; + +const mapStateToProps = (state: RootState) => { + const modal = state.modals.last({ modalType: null, modalProps: {}, }); return { - type: modal.modalType, + type: modal.modalType as ModalType, props: modal.modalProps, }; }; -const mapDispatchToProps = (dispatch) => ({ - onClose(type) { +const mapDispatchToProps = (dispatch: AppDispatch) => ({ + onClose(type?: ModalType) { switch (type) { case 'COMPOSE': dispatch(cancelReplyCompose()); 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 973a2187c..019c14997 100644 --- a/app/soapbox/features/ui/index.tsx +++ b/app/soapbox/features/ui/index.tsx @@ -11,36 +11,36 @@ 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 { 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'; 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'; -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'; -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 773eed795..23f221cea 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() { @@ -7,19 +7,19 @@ 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() { - 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() { @@ -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() { @@ -51,15 +51,15 @@ 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() { - 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() { @@ -71,15 +71,15 @@ 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() { - 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() { @@ -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/modals/mute-modal'); } export function Filters() { @@ -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() { @@ -123,59 +123,59 @@ export function Audio() { } export function MediaModal() { - return import(/* webpackChunkName: "features/ui" */'../components/media-modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/media-modal'); } export function VideoModal() { - return import(/* webpackChunkName: "features/ui" */'../components/video_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/video-modal'); } export function BoostModal() { - return import(/* webpackChunkName: "features/ui" */'../components/boost_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/boost-modal'); } export function ConfirmationModal() { - return import(/* webpackChunkName: "features/ui" */'../components/confirmation_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/confirmation-modal'); } export function MissingDescriptionModal() { - return import(/* webpackChunkName: "features/ui" */'../components/missing_description_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/missing-description-modal'); } export function ActionsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/actions_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/actions-modal'); } export function HotkeysModal() { - return import(/* webpackChunkName: "features/ui" */'../components/hotkeys_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/hotkeys-modal'); } export function ComposeModal() { - return import(/* webpackChunkName: "features/ui" */'../components/compose_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/compose-modal'); } export function ReplyMentionsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/reply_mentions_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/reply-mentions-modal'); } export function UnauthorizedModal() { - return import(/* webpackChunkName: "features/ui" */'../components/unauthorized_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/unauthorized-modal'); } export function EditFederationModal() { - return import(/* webpackChunkName: "features/ui" */'../components/edit_federation_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/edit-federation-modal'); } export function EmbedModal() { - return import(/* webpackChunkName: "modals/embed_modal" */'../components/embed-modal'); + return import(/* webpackChunkName: "modals/embed_modal" */'../components/modals/embed-modal'); } export function ComponentModal() { - return import(/* webpackChunkName: "features/ui" */'../components/component_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/component-modal'); } export function ReblogsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/reblogs_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/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/modals/reactions-modal'); } export function MentionsModal() { - return import(/* webpackChunkName: "features/ui" */'../components/mentions_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/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/modals/birthdays-modal'); } export function BirthdayPanel() { @@ -203,15 +203,15 @@ export function BirthdayPanel() { } export function AccountNoteModal() { - return import(/* webpackChunkName: "features/ui" */'../components/account_note_modal'); + return import(/* webpackChunkName: "features/ui" */'../components/modals/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() { - return import(/*webpackChunkName: "features/list_adder" */'../../list_adder'); + return import(/*webpackChunkName: "features/list_adder" */'../../list-adder'); } export function Search() { @@ -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() { @@ -235,39 +235,39 @@ 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() { - 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() { - return import(/* webpackChunkName: "features/soapbox_config" */'../../soapbox_config'); + return import(/* webpackChunkName: "features/soapbox_config" */'../../soapbox-config'); } export function ExportData() { - return import(/* webpackChunkName: "features/export_data" */ '../../export_data'); + return import(/* webpackChunkName: "features/export_data" */ '../../export-data'); } export function ImportData() { - return import(/* webpackChunkName: "features/import_data" */'../../import_data'); + return import(/* webpackChunkName: "features/import_data" */'../../import-data'); } export function Backups() { @@ -275,15 +275,15 @@ 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() { - 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() { @@ -307,15 +307,15 @@ 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() { - 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,47 +335,47 @@ 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() { - return import(/* webpackChunkName: "features/admin" */'../../admin/components/latest_accounts_panel'); + return import(/* webpackChunkName: "features/admin" */'../../admin/components/latest-accounts-panel'); } export function SidebarMenu() { - return import(/* webpackChunkName: "features/ui" */'../../../components/sidebar_menu'); + return import(/* webpackChunkName: "features/ui" */'../../../components/sidebar-menu'); } 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() { @@ -387,31 +387,31 @@ 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() { - return import(/* webpackChunkName: "features/crypto_donate" */'../components/crypto_donate_modal'); + return import(/* webpackChunkName: "features/crypto_donate" */'../components/modals/crypto-donate-modal'); } export function ScheduledStatuses() { - return import(/* webpackChunkName: "features/scheduled_statuses" */'../../scheduled_statuses'); + return import(/* webpackChunkName: "features/scheduled_statuses" */'../../scheduled-statuses'); } 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() { - return import(/* webpackChunkName: "features/federation_restrictions" */'../../federation_restrictions'); + return import(/* webpackChunkName: "features/federation_restrictions" */'../../federation-restrictions'); } export function Aliases() { @@ -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() { @@ -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() { @@ -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() { @@ -483,15 +483,15 @@ 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/modals/compare-history-modal'); } 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() { @@ -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/modals/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 96% rename from app/soapbox/features/ui/util/pending_status_builder.ts rename to 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/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 86% rename from app/soapbox/features/verification/email_passthru.tsx rename to app/soapbox/features/verification/email-passthru.tsx index 43432c586..e51f3220f 100644 --- a/app/soapbox/features/verification/email_passthru.tsx +++ b/app/soapbox/features/verification/email-passthru.tsx @@ -28,6 +28,11 @@ const messages = defineMessages({ tokenNotFoundBody: { id: 'email_passthru.token_not_found.body', defaultMessage: 'Your email token was not found. Please request a new email confirmation from the {bold} from which you sent this email confirmation.' }, tokenExpiredHeading: { id: 'email_passthru.token_expired.heading', defaultMessage: 'Token Expired' }, tokenExpiredBody: { id: 'email_passthru.token_expired.body', defaultMessage: 'Your email token has expired. Please request a new email confirmation from the {bold} from which you sent this email confirmation.' }, + emailConfirmed: { id: 'email_passthru.success', defaultMessage: 'Your email has been verified!' }, + genericFail: { id: 'email_passthru.fail.generic', defaultMessage: 'Unable to confirm your email' }, + tokenExpired: { id: 'email_passthru.fail.expired', defaultMessage: 'Your email token has expired' }, + tokenNotFound: { id: 'email_passthru.fail.not_found', defaultMessage: 'Your email token is invalid.' }, + invalidToken: { id: 'email_passthru.fail.invalid_token', defaultMessage: 'Your token is invalid' }, }); const Success = () => { @@ -116,30 +121,21 @@ const EmailPassThru = () => { dispatch(confirmEmailVerification(token)) .then(() => { setStatus(Statuses.SUCCESS); - dispatch(snackbar.success(intl.formatMessage({ id: 'email_passthru.success', defaultMessage: 'Your email has been verified!' }))); + dispatch(snackbar.success(intl.formatMessage(messages.emailConfirmed))); }) .catch((error: AxiosError ) => { const errorKey = error?.response?.data?.error; - let message = intl.formatMessage({ - id: 'email_passthru.fail.generic', - defaultMessage: 'Unable to confirm your email', - }); + let message = intl.formatMessage(messages.genericFail); if (errorKey) { switch (errorKey) { case 'token_expired': - message = intl.formatMessage({ - id: 'email_passthru.fail.expired', - defaultMessage: 'Your email token has expired.', - }); + message = intl.formatMessage(messages.tokenExpired); setStatus(Statuses.TOKEN_EXPIRED); break; case 'token_not_found': - message = intl.formatMessage({ - id: 'email_passthru.fail.not_found', - defaultMessage: 'Your email token is invalid.', - }); - message = 'Your token is invalid'; + message = intl.formatMessage(messages.tokenNotFound); + message = intl.formatMessage(messages.invalidToken); setStatus(Statuses.TOKEN_NOT_FOUND); break; default: diff --git a/app/soapbox/features/verification/steps/email-verification.tsx b/app/soapbox/features/verification/steps/email-verification.tsx index bec6c2868..98c11b829 100644 --- a/app/soapbox/features/verification/steps/email-verification.tsx +++ b/app/soapbox/features/verification/steps/email-verification.tsx @@ -1,6 +1,6 @@ import { AxiosError } from 'axios'; import React from 'react'; -import { useIntl } from 'react-intl'; +import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import snackbar from 'soapbox/actions/snackbar'; import { checkEmailVerification, postEmailVerification, requestEmailVerification } from 'soapbox/actions/verification'; @@ -8,6 +8,13 @@ import Icon from 'soapbox/components/icon'; import { Button, Form, FormGroup, Input, Text } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; +const messages = defineMessages({ + verificationSuccess: { id: 'email_verification.success', defaultMessage: 'Verification email sent successfully.' }, + verificationFail: { id: 'email_verification.fail', defaultMessage: 'Failed to request email verification.' }, + verificationFailTakenAlert: { id: 'email_verifilcation.exists', defaultMessage: 'This email has already been taken.' }, + verificationFailTaken: { id: 'email_verification.taken', defaultMessage: 'is taken' }, +}); + const Statuses = { IDLE: 'IDLE', REQUESTED: 'REQUESTED', @@ -77,26 +84,23 @@ const EmailVerification = () => { dispatch( snackbar.success( - intl.formatMessage({ - id: 'email_verification.exists', - defaultMessage: 'Verification email sent successfully.', - }), + intl.formatMessage(messages.verificationSuccess), ), ); }) .catch((error: AxiosError) => { const errorMessage = (error.response?.data as any)?.error; const isEmailTaken = errorMessage === 'email_taken'; - let message = intl.formatMessage({ id: 'email_verification.fail', defaultMessage: 'Failed to request email verification.' }); + let message = intl.formatMessage(messages.verificationFail); if (isEmailTaken) { - message = intl.formatMessage({ id: 'email_verification.exists', defaultMessage: 'This email has already been taken.' }); + message = intl.formatMessage(messages.verificationFailTakenAlert); } else if (errorMessage) { message = errorMessage; } if (isEmailTaken) { - setErrors([intl.formatMessage({ id: 'email_verification.taken', defaultMessage: 'is taken' })]); + setErrors([intl.formatMessage(messages.verificationFailTaken)]); } dispatch(snackbar.error(message)); @@ -111,7 +115,9 @@ const EmailVerification = () => { return ( -{intl.formatMessage({ id: 'email_verification.header', defaultMessage: 'Enter your email address' })}
++
+ diff --git a/app/soapbox/features/verification/steps/sms-verification.tsx b/app/soapbox/features/verification/steps/sms-verification.tsx index 8f545e1ad..7337c706d 100644 --- a/app/soapbox/features/verification/steps/sms-verification.tsx +++ b/app/soapbox/features/verification/steps/sms-verification.tsx @@ -1,6 +1,6 @@ import { AxiosError } from 'axios'; import React from 'react'; -import { useIntl } from 'react-intl'; +import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import OtpInput from 'react-otp-input'; import snackbar from 'soapbox/actions/snackbar'; @@ -8,6 +8,13 @@ import { confirmPhoneVerification, requestPhoneVerification } from 'soapbox/acti import { Button, Form, FormGroup, PhoneInput, Text } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; +const messages = defineMessages({ + verificationInvalid: { id: 'sms_verification.invalid', defaultMessage: 'Please enter a valid phone number.' }, + verificationSuccess: { id: 'sms_verification.success', defaultMessage: 'A verification code has been sent to your phone number.' }, + verificationFail: { id: 'sms_verification.fail', defaultMessage: 'Failed to send SMS message to your phone number.' }, + verificationExpired: { id: 'sms_verification.expired', defaultMessage: 'Your SMS token has expired.' }, +}); + const Statuses = { IDLE: 'IDLE', REQUESTED: 'REQUESTED', @@ -38,10 +45,7 @@ const SmsVerification = () => { setStatus(Statuses.IDLE); dispatch( snackbar.error( - intl.formatMessage({ - id: 'sms_verification.invalid', - defaultMessage: 'Please enter a valid phone number.', - }), + intl.formatMessage(messages.verificationInvalid), ), ); return; @@ -50,18 +54,12 @@ const SmsVerification = () => { dispatch(requestPhoneVerification(phone!)).then(() => { dispatch( snackbar.success( - intl.formatMessage({ - id: 'sms_verification.success', - defaultMessage: 'A verification code has been sent to your phone number.', - }), + intl.formatMessage(messages.verificationSuccess), ), ); setStatus(Statuses.REQUESTED); }).catch((error: AxiosError) => { - const message = (error.response?.data as any)?.message || intl.formatMessage({ - id: 'sms_verification.fail', - defaultMessage: 'Failed to send SMS message to your phone number.', - }); + const message = (error.response?.data as any)?.message || intl.formatMessage(messages.verificationFail); dispatch(snackbar.error(message)); setStatus(Statuses.FAIL); @@ -78,10 +76,7 @@ const SmsVerification = () => { dispatch(confirmPhoneVerification(verificationCode)) .catch(() => dispatch( snackbar.error( - intl.formatMessage({ - id: 'sms_verification.invalid', - defaultMessage: 'Your SMS token has expired.', - }), + intl.formatMessage(messages.verificationExpired), ), )); }; @@ -97,7 +92,7 @@ const SmsVerification = () => {@@ -136,7 +131,9 @@ const SmsVerification = () => { return (- {intl.formatMessage({ id: 'sms_verification.sent.header', defaultMessage: 'Verification code' })} +
-{intl.formatMessage({ id: 'sms_verification.header', defaultMessage: 'Enter your phone number' })}
++
+ 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/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/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/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/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'); 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/locales/ast.json b/app/soapbox/locales/ast.json index cf907e74d..798f2c98e 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publish", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index c470f3895..c1851a73e 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Раздумай", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index 4008d5d24..d82a83ae8 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publish", diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json index 8d40c597b..652666a92 100644 --- a/app/soapbox/locales/cs.json +++ b/app/soapbox/locales/cs.json @@ -1,141 +1,159 @@ { - "about.also_available": "Available in:", - "accordion.collapse": "Složit", - "accordion.expand": "Rozšířit", + "about.also_available": "Dostupné v:", + "accordion.collapse": "Sbalit", + "accordion.expand": "Rozbalit", "account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů", "account.badges.bot": "Robot", - "account.birthday": "Born {date}", + "account.birthday": "Narozen/a dne {date}", "account.birthday_today": "Birthday is today!", - "account.block": "Zablokovat uživatele @{name}", - "account.block_domain": "Skrýt vše z {domain}", + "account.block": "Zablokovat @{name}", + "account.block_domain": "Zablokovat doménu {domain}", "account.blocked": "Blokován/a", - "account.chat": "Chat with @{name}", - "account.column_settings.description": "These settings apply to all account timelines.", - "account.column_settings.title": "Acccount timeline settings", + "account.chat": "Chatovat s @{name}", "account.deactivated": "Deaktivován", "account.direct": "Poslat přímou zprávu uživateli @{name}", + "account.domain_blocked": "Domain hidden", "account.edit_profile": "Upravit profil", "account.endorse": "Představit na profilu", + "account.endorse.success": "You are now featuring @{acct} on your profile", + "account.familiar_followers": "Followed by {accounts}", + "account.familiar_followers.empty": "No one you know follows {name}.", + "account.familiar_followers.more": "{count} {count, plural, one {other} other {others}} you follow", "account.follow": "Sledovat", - "account.followers": "Sledující", + "account.followers": "Sledujících", "account.followers.empty": "Tohoto uživatele ještě nikdo nesleduje.", - "account.follows": "Sledovaní", + "account.follows": "Sledovaných", "account.follows.empty": "Tento uživatel ještě nikoho nesleduje.", "account.follows_you": "Sleduje vás", - "account.hide_reblogs": "Skrýt boosty od uživatele @{name}", + "account.hide_reblogs": "Skrýt boosty od @{name}", "account.last_status": "Last active", - "account.link_verified_on": "Vlastnictví tohoto odkazu bylo zkontrolováno {date}", + "account.link_verified_on": "Vlastnictví tohoto odkazu bylo zkontrolováno dne {date}", "account.locked_info": "Stav soukromí tohoto účtu je nastaven na zamčeno. Jeho vlastník ručně posuzuje, kdo ho může sledovat.", "account.login": "Přihlásit se", "account.media": "Média", - "account.member_since": "Registroval/a se {date}", + "account.member_since": "Zaregistrován/a od: {date}", "account.mention": "Zmínit uživatele", "account.moved_to": "{name} se přesunul/a na:", - "account.mute": "Skrýt uživatele @{name}", + "account.mute": "Skrýt @{name}", + "account.muted": "Skrytý", "account.never_active": "Never", "account.posts": "Příspěvky", "account.posts_with_replies": "Příspěvky a odpovědi", "account.profile": "Profil", + "account.profile_external": "Zobrazit profil na doméně {domain}", "account.register": "Registrovat se", "account.remote_follow": "Remote follow", + "account.remove_from_followers": "Remove this follower", "account.report": "Nahlásit uživatele @{name}", "account.requested": "Čeká na schválení. Kliknutím zrušíte požadavek o sledování", "account.requested_small": "Čeká na schválení", - "account.share": "Sdílet profil uživatele @{name}", - "account.show_reblogs": "Zobrazit boosty od uživatele @{name}", - "account.subscribe": "Subscribe to notifications from @{name}", - "account.subscribed": "Subscribed", + "account.search": "Hledat příspěvky od @{name}", + "account.search_self": "Hledat vlastní příspěvky", + "account.share": "Sdílet profil @{name}", + "account.show_reblogs": "Zobrazit boosty od @{name}", + "account.subscribe": "Odebírat oznámení o nových příspěvcích od @{name}", + "account.subscribe.failure": "Při přihlašování odběru došlo k chybě.", + "account.subscribe.success": "Přihlásili jste se k odběru oznámení o nových příspěvcích.", "account.unblock": "Odblokovat uživatele @{name}", "account.unblock_domain": "Odkrýt doménu {domain}", "account.unendorse": "Nepředstavit na profilu", + "account.unendorse.success": "You are no longer featuring @{acct}", "account.unfollow": "Přestat sledovat", "account.unmute": "Odkrýt uživatele @{name}", - "account.unsubscribe": "Unsubscribe to notifications from @{name}", - "account.verified": "Verified Account", - "account.welcome": "Welcome", - "account_gallery.none": "Žádná média k zobrazení.", + "account.unsubscribe": "Odhlásit odběr oznámení o nových příspěvcích od uživatele @{name}", + "account.unsubscribe.failure": "Při rušení odběru došlo k chybě.", + "account.unsubscribe.success": "Zrušili jste odběr oznámení o nových příspěvcích.", + "account.verified": "Ověřený účet", + "account_gallery.none": "Nejsou tu žádná média.", + "account_moderation_modal.admin_fe": "Otevřít v AdminFE", + "account_moderation_modal.fields.account_role": "Role", + "account_moderation_modal.fields.badges": "Vlastní role", + "account_moderation_modal.fields.deactivate": "Deaktivovat účet", + "account_moderation_modal.fields.delete": "Smazat účet", + "account_moderation_modal.fields.suggested": "Suggested in people to follow", + "account_moderation_modal.fields.verified": "Ověřený účet", + "account_moderation_modal.info.id": "ID: {id}", + "account_moderation_modal.roles.admin": "Admin", + "account_moderation_modal.roles.moderator": "Moderátor", + "account_moderation_modal.roles.user": "Uživatel", + "account_moderation_modal.title": "Moderace účtu @{acct}", "account_note.hint": "You can keep notes about this user for yourself (this will not be shared with them):", "account_note.placeholder": "No comment provided", - "account_note.save": "Save", + "account_note.save": "Uložit", "account_note.target": "Note for @{target}", "account_search.placeholder": "Search for an account", - "account_timeline.column_settings.show_pinned": "Show pinned posts", - "admin.awaiting_approval.approved_message": "{acct} was approved!", - "admin.awaiting_approval.empty_message": "There is nobody waiting for approval. When a new user signs up, you can review them here.", - "admin.awaiting_approval.rejected_message": "{acct} was rejected.", - "admin.dashboard.registration_mode.approval_hint": "Users can sign up, but their account only gets activated when an admin approves it.", - "admin.dashboard.registration_mode.approval_label": "Approval Required", - "admin.dashboard.registration_mode.closed_hint": "Nobody can sign up. You can still invite people.", - "admin.dashboard.registration_mode.closed_label": "Closed", - "admin.dashboard.registration_mode.open_hint": "Anyone can join.", - "admin.dashboard.registration_mode.open_label": "Open", - "admin.dashboard.registration_mode_label": "Registrations", - "admin.dashboard.settings_saved": "Settings saved!", - "admin.dashcounters.domain_count_label": "peers", - "admin.dashcounters.mau_label": "monthly active users", - "admin.dashcounters.retention_label": "user retention", - "admin.dashcounters.status_count_label": "posts", - "admin.dashcounters.user_count_label": "total users", + "actualStatus.edited": "Edited {date}", + "actualStatuses.quote_tombstone": "Příspěvek není dostupný.", + "admin.awaiting_approval.approved_message": "Účet {acct} byl schválen!", + "admin.awaiting_approval.empty_message": "Na schválení nikdo nečeká. Až se nějaký nový uživatel zaregistruje, tady si můžete jeho žádost prohlédnout.", + "admin.awaiting_approval.rejected_message": "Účet {acct} byl odmítnut.", + "admin.dashboard.registration_mode.approval_hint": "Uživatelé se mohou zaregistrovat, ale jejich účet se aktivuje až když ho schválí administrátor", + "admin.dashboard.registration_mode.approval_label": "Pouze po schválení", + "admin.dashboard.registration_mode.closed_hint": "Zaregistrovat se nemůže nikdo. Ale vy můžete lidi pozvat.", + "admin.dashboard.registration_mode.closed_label": "Zavřená", + "admin.dashboard.registration_mode.open_hint": "Zaregistrovat se může kdokoliv.", + "admin.dashboard.registration_mode.open_label": "Otevřená", + "admin.dashboard.registration_mode_label": "Registrace", + "admin.dashboard.settings_saved": "Nastavení uloženo!", + "admin.dashcounters.domain_count_label": "propojených domén", + "admin.dashcounters.mau_label": "aktivních uživatelů za poslední měsíc", + "admin.dashcounters.retention_label": "míra udržení uživatelů", + "admin.dashcounters.status_count_label": "příspěvků", + "admin.dashcounters.user_count_label": "uživatelů celkem", "admin.dashwidgets.email_list_header": "Email list", "admin.dashwidgets.software_header": "Software", "admin.latest_accounts_panel.more": "Click to see {count} {count, plural, one {account} other {accounts}}", - "admin.latest_accounts_panel.title": "Latest Accounts", + "admin.latest_accounts_panel.title": "Nové účty", "admin.moderation_log.empty_message": "You have not performed any moderation actions yet. When you do, a history will be shown here.", "admin.reports.actions.close": "Close", "admin.reports.actions.view_status": "View post", - "admin.reports.empty_message": "There are no open reports. If a user gets reported, they will show up here.", + "admin.reports.empty_message": "Momentálně není nikdo nahlášený. Až někdo někoho nahlásí, tady to bude vidět.", "admin.reports.report_closed_message": "Report on @{name} was closed", "admin.reports.report_title": "Report on {acct}", - "admin.statuses.actions.delete_status": "Delete post", + "admin.statuses.actions.delete_status": "Smazat příspěvek", "admin.statuses.actions.mark_status_not_sensitive": "Mark post not sensitive", - "admin.statuses.actions.mark_status_sensitive": "Mark post sensitive", - "admin.statuses.status_deleted_message": "Post by @{acct} was deleted", - "admin.statuses.status_marked_message_not_sensitive": "Post by @{acct} was marked not sensitive", - "admin.statuses.status_marked_message_sensitive": "Post by @{acct} was marked sensitive", + "admin.statuses.actions.mark_status_sensitive": "Označit citlivý obsah", + "admin.statuses.status_deleted_message": "Příspěvek uživatele @{acct} byl smazán", + "admin.statuses.status_marked_message_not_sensitive": "Příspěvek uživatele @{acct} nebyl označen jako citlivý", + "admin.statuses.status_marked_message_sensitive": "Příspěvek uživatele @{acct} byl označen jako citlivý", "admin.user_index.empty": "No users found.", - "admin.user_index.search_input_placeholder": "Who are you looking for?", - "admin.users.actions.deactivate_user": "Deactivate @{name}", - "admin.users.actions.delete_user": "Delete @{name}", - "admin.users.actions.demote_to_moderator": "Demote @{name} to a moderator", - "admin.users.actions.demote_to_moderator_message": "@{acct} was demoted to a moderator", - "admin.users.actions.demote_to_user": "Demote @{name} to a regular user", - "admin.users.actions.demote_to_user_message": "@{acct} was demoted to a regular user", - "admin.users.actions.promote_to_admin": "Promote @{name} to an admin", - "admin.users.actions.promote_to_admin_message": "@{acct} was promoted to an admin", - "admin.users.actions.promote_to_moderator": "Promote @{name} to a moderator", - "admin.users.actions.promote_to_moderator_message": "@{acct} was promoted to a moderator", - "admin.users.actions.remove_donor": "Remove @{name} as a donor", - "admin.users.actions.set_donor": "Set @{name} as a donor", - "admin.users.actions.suggest_user": "Suggest @{name}", - "admin.users.actions.unsuggest_user": "Unsuggest @{name}", - "admin.users.actions.unverify_user": "Unverify @{name}", - "admin.users.actions.verify_user": "Verify @{name}", + "admin.user_index.search_input_placeholder": "Koho hledáte?", + "admin.users.actions.deactivate_user": "Deaktivovat účet @{name}", + "admin.users.actions.delete_user": "Smazat účet @{name}", + "admin.users.actions.demote_to_moderator_message": "@{acct} je nyní moderátor", + "admin.users.actions.demote_to_user_message": "@{acct} je nyní běžný uživatel", + "admin.users.actions.promote_to_admin_message": "@{acct} je nyní admin", + "admin.users.actions.promote_to_moderator_message": "@{acct} je nyní moderátor", + "admin.users.badges_saved_message": "Vlastní role uloženy.", "admin.users.remove_donor_message": "@{acct} was removed as a donor", "admin.users.set_donor_message": "@{acct} was set as a donor", - "admin.users.user_deactivated_message": "@{acct} was deactivated", - "admin.users.user_deleted_message": "@{acct} was deleted", + "admin.users.user_deactivated_message": "Účet @{acct} byl deaktivován", + "admin.users.user_deleted_message": "Účet @{acct} byl smazán", "admin.users.user_suggested_message": "@{acct} was suggested", "admin.users.user_unsuggested_message": "@{acct} was unsuggested", "admin.users.user_unverified_message": "@{acct} was unverified", "admin.users.user_verified_message": "@{acct} was verified", - "admin_nav.awaiting_approval": "Awaiting Approval", - "admin_nav.dashboard": "Dashboard", - "admin_nav.reports": "Reports", + "admin_nav.awaiting_approval": "Čeká na schválení", + "admin_nav.dashboard": "Ovládací panel", + "admin_nav.reports": "Nahlášeno", + "age_verification.fail": "You must be {ageMinimum, plural, one {# year} other {# years}} old or older.", + "age_verification.header": "Enter your birth date", "alert.unexpected.body": "We're sorry for the interruption. If the problem persists, please reach out to our support team. You may also try to {clearCookies} (this will log you out).", "alert.unexpected.browser": "Browser", "alert.unexpected.clear_cookies": "clear cookies and browser data", "alert.unexpected.links.help": "Help Center", "alert.unexpected.links.status": "Status", "alert.unexpected.links.support": "Support", - "alert.unexpected.message": "Objevila se neočekávaná chyba.", + "alert.unexpected.message": "Došlo k neočekávané chybě.", "alert.unexpected.return_home": "Return Home", "alert.unexpected.title": "Jejda!", - "aliases.account.add": "Create alias", - "aliases.account_label": "Old account:", + "aliases.account.add": "Vytvořit alias", + "aliases.account_label": "Starý účet:", "aliases.aliases_list_delete": "Unlink alias", - "aliases.search": "Search your old account", - "aliases.success.add": "Account alias created successfully", - "aliases.success.remove": "Account alias removed successfully", + "aliases.search": "Vyhledejte svůj starý účet", + "aliases.success.add": "Alias úspěšně vytvořen", + "aliases.success.remove": "Alias úspěšně odebrán", + "announcements.title": "Announcements", "app_create.name_label": "App name", "app_create.name_placeholder": "e.g. 'Soapbox'", "app_create.redirect_uri_label": "Redirect URIs", @@ -149,13 +167,15 @@ "app_create.submit": "Create app", "app_create.website_label": "Website", "auth.invalid_credentials": "Wrong username or password", - "auth.logged_out": "Logged out.", + "auth.logged_out": "Odhlásili jste se.", + "auth_layout.register": "Create an account", "backups.actions.create": "Create backup", "backups.empty_message": "No backups found. {action}", "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", - "beta.also_available": "Available in:", + "badge_input.placeholder": "Zadejte roli…", "birthday_panel.title": "Birthdays", + "birthdays_modal.empty": "None of your friends have birthday today.", "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}", "bundle_column_error.body": "Při načítání tohoto komponentu se něco pokazilo.", "bundle_column_error.retry": "Zkuste to znovu", @@ -166,7 +186,7 @@ "card.back.label": "Back", "chat_box.actions.send": "Poslat", "chat_box.input.placeholder": "Poslat zprávu…", - "chat_panels.main_window.empty": "Žádné chaty nenalezeny. Pro začnutí chatu, navštivte nečí profil.", + "chat_panels.main_window.empty": "Žádné chaty nenalezeny. Chat můžete začít na něčím profilu.", "chat_panels.main_window.title": "Chaty", "chats.actions.delete": "Odstranit zprávu", "chats.actions.more": "Více", @@ -176,33 +196,35 @@ "chats.audio_toggle_off": "Audio upozornění vypnuté", "chats.audio_toggle_on": "Audio upozornění zapnoté", "chats.dividers.today": "Dnes", - "chats.search_placeholder": "Start a chat with…", - "column.admin.awaiting_approval": "Awaiting Approval", - "column.admin.dashboard": "Dashboard", + "chats.search_placeholder": "Chatovat s…", + "column.admin.awaiting_approval": "Čeká na schválení", + "column.admin.dashboard": "Ovládací panel", "column.admin.moderation_log": "Moderation Log", - "column.admin.reports": "Reports", + "column.admin.reports": "Nahlášeno", "column.admin.reports.menu.moderation_log": "Moderation Log", - "column.admin.users": "Users", - "column.aliases": "Account aliases", - "column.aliases.create_error": "Error creating alias", - "column.aliases.delete": "Delete", - "column.aliases.delete_error": "Error deleting alias", - "column.aliases.subheading_add_new": "Add New Alias", - "column.aliases.subheading_aliases": "Current aliases", + "column.admin.users": "Uživatelé", + "column.aliases": "Aliasy účtů", + "column.aliases.create_error": "Chyba při vytváření aliasu", + "column.aliases.delete": "Smazat", + "column.aliases.delete_error": "Chyba při mazání aliasu", + "column.aliases.subheading_add_new": "Vytvořit nový alias", + "column.aliases.subheading_aliases": "Současné aliasy", "column.app_create": "Create app", "column.backups": "Backups", "column.birthdays": "Birthdays", "column.blocks": "Blokovaní uživatelé", "column.bookmarks": "Záložky", "column.chats": "Chaty", - "column.community": "Místní zeď", + "column.community": "Místní časová osa", "column.crypto_donate": "Donate Cryptocurrency", "column.developers": "Developers", + "column.developers.service_worker": "Service Worker", "column.direct": "Přímé zprávy", "column.directory": "Browse profiles", "column.domain_blocks": "Skryté domény", - "column.edit_profile": "Editovat profil", + "column.edit_profile": "Upravit profil", "column.export_data": "Export data", + "column.familiar_followers": "People you know following {name}", "column.favourited_statuses": "Liked posts", "column.favourites": "Likes", "column.federation_restrictions": "Federation Restrictions", @@ -213,27 +235,27 @@ "column.filters.delete": "Odstranit", "column.filters.delete_error": "Chyba při odstraňování filtru", "column.filters.drop_header": "Zahodit místo schovat", - "column.filters.drop_hint": "Filtrované příspěvky zmizí navždy, ikdyž filtr později odstraníte", + "column.filters.drop_hint": "Filtrované příspěvky zmizí navždy, i když filtr později odstraníte", "column.filters.expires": "Vypršet po", "column.filters.expires_hint": "Vyprchávání momentálně není podporováno", - "column.filters.home_timeline": "Domácí zeď", + "column.filters.home_timeline": "Domovská časová osa", "column.filters.keyword": "Klíčové slovo nebo fráze", "column.filters.notifications": "Oznámení", - "column.filters.public_timeline": "Federovaná zeď", + "column.filters.public_timeline": "Federovaná časová osa", "column.filters.subheading_add_new": "Přidat filter", "column.filters.subheading_filters": "Současné filtry", "column.filters.whole_word_header": "Celé slovo", - "column.filters.whole_word_hint": "Pokud je klíčové slovo či fráze pouze alfanumerické, bude aplikováno pouze pokud je kompletně shodné", + "column.filters.whole_word_hint": "Pokud se klíčové slovo skládá pouze z písmen a číslic, bude aplikováno pouze pokud je kompletně shodné", + "column.filters.whole_word_hint": "Filtr bude aplikován, pokud se hledaný řetězec bude shodovat s celým jedním slovem v příspěvku. Pokud se bude shodovat pouze s částí slova, aplikován nebude. (Klíčové slovo tu musí obsahovat výhradně písmena a číslice.)", "column.follow_requests": "Požadavky o sledování", - "column.followers": "Followers", - "column.following": "Following", - "column.groups": "Skupiny", + "column.followers": "Sledující", + "column.following": "Sledovaní", "column.home": "Domů", "column.import_data": "Importovat data", "column.info": "Server information", "column.lists": "Seznamy", "column.mentions": "Mentions", - "column.mfa": "Multi-Faktorová Authentifikace", + "column.mfa": "Dvoufaktorové ověření", "column.mfa_cancel": "Zrušit", "column.mfa_confirm_button": "Potvrdit", "column.mfa_disable_button": "Deaktivovat", @@ -243,24 +265,23 @@ "column.notifications": "Oznámení", "column.pins": "Pinned posts", "column.preferences": "Preference", - "column.public": "Federovaná zeď", + "column.public": "Federovaná časová osa", "column.reactions": "Reactions", "column.reblogs": "Reposts", "column.remote": "Federated timeline", "column.scheduled_statuses": "Scheduled Posts", "column.search": "Search", - "column.security": "Security", "column.settings_store": "Settings store", "column.soapbox_config": "Soapbox nastavení", "column.test": "Test timeline", "column_back_button.label": "Zpět", "column_forbidden.body": "You do not have permission to access this page.", "column_forbidden.title": "Forbidden", - "column_header.show_settings": "Zobrazit nastavení", - "common.cancel": "Cancel", - "community.column_settings.media_only": "Pouze média", - "community.column_settings.title": "Local timeline settings", + "common.cancel": "Zrušit", + "common.error": "Something isn't right. Try reloading the page.", + "compare_history_modal.header": "Edit history", "compose.character_counter.title": "Used {chars} out of {maxChars} characters", + "compose.edit_success": "Your post was edited", "compose.invalid_schedule": "You must schedule a post at least 5 minutes out.", "compose.submit_success": "Your post was sent", "compose_form.direct_message_warning": "Tento příspěvek bude odeslán pouze zmíněným uživatelům.", @@ -273,45 +294,52 @@ "compose_form.placeholder": "Co se vám honí hlavou?", "compose_form.poll.add_option": "Přidat volbu", "compose_form.poll.duration": "Délka ankety", + "compose_form.poll.multiselect": "Vícenásobný výběr", + "compose_form.poll.multiselect_detail": "Povolit uživatelům výběr více možností", "compose_form.poll.option_placeholder": "Volba {number}", - "compose_form.poll.remove_option": "Odstranit tuto volbu", - "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", - "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", + "compose_form.poll.remove": "Odstranit anketu", + "compose_form.poll.remove_option": "Smazat", + "compose_form.poll.switch_to_multiple": "Povolit výběr více možností", + "compose_form.poll.switch_to_single": "Povolit pouze jednu možnost", + "compose_form.poll_placeholder": "Zadejte téma ankety...", "compose_form.publish": "Publikovat", "compose_form.publish_loud": "{publish}!", + "compose_form.save_changes": "Save changes", "compose_form.schedule": "Schedule", "compose_form.scheduled_statuses.click_here": "Click here", "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.", - "compose_form.sensitive.hide": "Označit média jako citlivá", - "compose_form.sensitive.marked": "Média jsou označena jako citlivá", - "compose_form.sensitive.unmarked": "Média nejsou označena jako citlivá", "compose_form.spoiler.marked": "Text je skrytý za varováním", "compose_form.spoiler.unmarked": "Text není skrytý", "compose_form.spoiler_placeholder": "Sem napište vaše varování", + "compose_form.spoiler_remove": "Odstranit varování", + "compose_form.spoiler_title": "Citlivý obsah", "confirmation_modal.cancel": "Zrušit", - "confirmations.admin.deactivate_user.confirm": "Deactivate @{name}", - "confirmations.admin.deactivate_user.heading": "Deactivate @{acct}", - "confirmations.admin.deactivate_user.message": "You are about to deactivate @{acct}. Deactivating a user is a reversible action.", - "confirmations.admin.delete_local_user.checkbox": "I understand that I am about to delete a local user.", - "confirmations.admin.delete_status.confirm": "Delete post", - "confirmations.admin.delete_status.heading": "Delete post", - "confirmations.admin.delete_status.message": "You are about to delete a post by @{acct}. This action cannot be undone.", - "confirmations.admin.delete_user.confirm": "Delete @{name}", - "confirmations.admin.delete_user.heading": "Delete @{acct}", - "confirmations.admin.delete_user.message": "You are about to delete @{acct}. THIS IS A DESTRUCTIVE ACTION THAT CANNOT BE UNDONE.", + "confirmations.admin.deactivate_user.confirm": "Deaktivovat @{name}", + "confirmations.admin.deactivate_user.heading": "Deaktivovat @{acct}", + "confirmations.admin.deactivate_user.message": "Chystáte se deaktivovat účet @{acct}. Deaktivaci lze později zrušit.", + "confirmations.admin.delete_local_user.checkbox": "Chápu, že vymažu účet lokálního uživatele.", + "confirmations.admin.delete_status.confirm": "Smazat příspěvek", + "confirmations.admin.delete_status.heading": "Smazat příspěvek", + "confirmations.admin.delete_status.message": "Chystáte se smazat příspěvek uživatele @{acct}. Tato akce je nevratná.", + "confirmations.admin.delete_user.confirm": "Smazat @{name}", + "confirmations.admin.delete_user.heading": "Smazat @{acct}", + "confirmations.admin.delete_user.message": "Chastáte se smazat účet @{acct}. TATO AKCE JE DESTRUKTIVNÍ A NEVRATNÁ.", "confirmations.admin.mark_status_not_sensitive.confirm": "Mark post not sensitive", "confirmations.admin.mark_status_not_sensitive.heading": "Mark post not sensitive.", "confirmations.admin.mark_status_not_sensitive.message": "You are about to mark a post by @{acct} not sensitive.", - "confirmations.admin.mark_status_sensitive.confirm": "Mark post sensitive", - "confirmations.admin.mark_status_sensitive.heading": "Mark post sensitive", - "confirmations.admin.mark_status_sensitive.message": "You are about to mark a post by @{acct} sensitive.", + "confirmations.admin.mark_status_sensitive.confirm": "Označit za citlivý", + "confirmations.admin.mark_status_sensitive.heading": "Označit za citlivý", + "confirmations.admin.mark_status_sensitive.message": "Chystáte se označit obsah příspěvku od účtu @{acct} za citlivý.", "confirmations.admin.reject_user.confirm": "Reject @{name}", "confirmations.admin.reject_user.heading": "Reject @{acct}", "confirmations.admin.reject_user.message": "You are about to reject @{acct} registration request. This action cannot be undone.", - "confirmations.block.block_and_report": "Blokovat a nahlásit", - "confirmations.block.confirm": "Blokovat", - "confirmations.block.heading": "Block @{name}", - "confirmations.block.message": "Jste si jistý/á, že chcete zablokovat uživatele {name}?", + "confirmations.block.block_and_report": "Zablokovat a nahlásit", + "confirmations.block.confirm": "Zablokovat", + "confirmations.block.heading": "Zablokovat uživatele @{name}", + "confirmations.block.message": "Jste si jistí, že chcete zablokovat uživatele {name}?", + "confirmations.cancel_editing.confirm": "Cancel editing", + "confirmations.cancel_editing.heading": "Cancel post editing", + "confirmations.cancel_editing.message": "Are you sure you want to cancel editing this post? All changes will be lost.", "confirmations.delete.confirm": "Smazat", "confirmations.delete.heading": "Delete post", "confirmations.delete.message": "Jste si jistý/á, že chcete smazat tento příspěvek?", @@ -322,33 +350,41 @@ "confirmations.domain_block.heading": "Block {domain}", "confirmations.domain_block.message": "Jste si opravdu, opravdu jistý/á, že chcete blokovat celou doménu {domain}? Ve většině případů stačí zablokovat nebo skrýt pár konkrétních uživatelů, což se doporučuje. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.", "confirmations.mute.confirm": "Skrýt", - "confirmations.mute.heading": "Mute @{name}", + "confirmations.mute.heading": "Skrýt uživatele @{name}", "confirmations.mute.message": "Jste si jistý/á, že chcete skrýt uživatele {name}?", "confirmations.redraft.confirm": "Smazat a přepsat", "confirmations.redraft.heading": "Delete & redraft", "confirmations.redraft.message": "Jste si jistý/á, že chcete smazat a přepsat tento příspěvek? Oblíbení a boosty budou ztraceny a odpovědi na původní příspěvek budou opuštěny.", - "confirmations.register.needs_approval": "Your account will be manually approved by an admin. Please be patient while we review your details.", - "confirmations.register.needs_approval.header": "Approval needed", - "confirmations.register.needs_confirmation": "Please check your inbox at {email} for confirmation instructions. You will need to verify your email address to continue.", - "confirmations.register.needs_confirmation.header": "Confirmation needed", + "confirmations.register.needs_approval": "Vaši přihlášku musí schválit administrátor. Prosíme o trpělivost.", + "confirmations.register.needs_approval.header": "Čeká se na schválení", + "confirmations.register.needs_confirmation": "Ověrovací instrukce byly odeslány na vaši e-mailovou adresu ({email}). Nyní musíte svou adresu ověřit.", + "confirmations.register.needs_confirmation.header": "Ověřte svou adresu", + "confirmations.remove_from_followers.confirm": "Remove", + "confirmations.remove_from_followers.message": "Are you sure you want to remove {name} from your followers?", "confirmations.reply.confirm": "Odpovědět", "confirmations.reply.message": "Odpovězením nyní přepíšete zprávu, kterou aktuálně píšete. Jste si jistý/á, že chcete pokračovat?", - "confirmations.scheduled_status_delete.confirm": "Cancel", - "confirmations.scheduled_status_delete.heading": "Cancel scheduled post", - "confirmations.scheduled_status_delete.message": "Are you sure you want to cancel this scheduled post?", + "confirmations.revoke_session.confirm": "Revoke", + "confirmations.revoke_session.heading": "Revoke current session", + "confirmations.revoke_session.message": "You are about to revoke your current session. You will be signed out.", + "confirmations.scheduled_status_delete.confirm": "Zrušit", + "confirmations.scheduled_status_delete.heading": "Zrušit naplánovaný příspěvek", + "confirmations.scheduled_status_delete.message": "Určitě chcete tento naplánovaný příspěvěk zrušit?", "confirmations.unfollow.confirm": "Přestat sledovat", - "confirmations.unfollow.heading": "Unfollow {name}", + "confirmations.unfollow.heading": "Přestat selovat uživatele {name}", "confirmations.unfollow.message": "jste si jistý/á, že chcete přestat sledovat uživatele {name}?", "crypto_donate.explanation_box.message": "{siteTitle} accepts cryptocurrency donations. You may send a donation to any of the addresses below. Thank you for your support!", "crypto_donate.explanation_box.title": "Sending cryptocurrency donations", "crypto_donate_panel.actions.view": "Click to see {count} {count, plural, one {wallet} other {wallets}}", "crypto_donate_panel.heading": "Donate Cryptocurrency", "crypto_donate_panel.intro.message": "{siteTitle} accepts cryptocurrency donations to fund our service. Thank you for your support!", - "datepicker.hint": "Scheduled to post at…", - "datepicker.next_month": "Next month", - "datepicker.next_year": "Next year", - "datepicker.previous_month": "Previous month", - "datepicker.previous_year": "Previous year", + "datepicker.day": "Day", + "datepicker.hint": "Publikovat v tento čas:", + "datepicker.month": "Month", + "datepicker.next_month": "Další měsíc", + "datepicker.next_year": "Další rok", + "datepicker.previous_month": "Předchozí měsíc", + "datepicker.previous_year": "Předchozí rok", + "datepicker.year": "Year", "developers.challenge.answer_label": "Answer", "developers.challenge.answer_placeholder": "Your answer", "developers.challenge.fail": "Wrong answer", @@ -360,6 +396,7 @@ "developers.navigation.intentional_error_label": "Trigger an error", "developers.navigation.leave_developers_label": "Leave developers", "developers.navigation.network_error_label": "Network error", + "developers.navigation.service_worker_label": "Service Worker", "developers.navigation.settings_store_label": "Settings store", "developers.navigation.test_timeline_label": "Test timeline", "developers.settings_store.hint": "It is possible to directly edit your user settings here. BE CAREFUL! Editing this section can break your account, and you will only be able to recover through the API.", @@ -368,56 +405,70 @@ "directory.local": "From {domain} only", "directory.new_arrivals": "New arrivals", "directory.recently_active": "Recently active", + "edit_email.header": "Change Email", + "edit_email.placeholder": "me@example.com", "edit_federation.followers_only": "Hide posts except to followers", "edit_federation.force_nsfw": "Force attachments to be marked sensitive", "edit_federation.media_removal": "Strip media", "edit_federation.reject": "Reject all activities", - "edit_federation.save": "Save", + "edit_federation.save": "Uložit", "edit_federation.success": "{host} federation was updated", "edit_federation.unlisted": "Force posts unlisted", "edit_password.header": "Change Password", - "edit_profile.error": "Profile update failed", + "edit_profile.error": "Chyba při změně profilu", "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter", "edit_profile.fields.avatar_label": "Avatar", - "edit_profile.fields.bio_label": "Bio", - "edit_profile.fields.bio_placeholder": "Tell us about yourself.", + "edit_profile.fields.bio_label": "O vás", + "edit_profile.fields.bio_placeholder": "Řekněte nám o sobě něco.", "edit_profile.fields.birthday_label": "Birthday", "edit_profile.fields.birthday_placeholder": "Your birthday", - "edit_profile.fields.bot_label": "Toto je účet robot", + "edit_profile.fields.bot_label": "Tohle je účet robota", "edit_profile.fields.discoverable_label": "Allow account discovery", "edit_profile.fields.display_name_label": "Zobrazované jméno", - "edit_profile.fields.display_name_placeholder": "Name", - "edit_profile.fields.header_label": "Hlavička", - "edit_profile.fields.hide_network_label": "Hide network", - "edit_profile.fields.location_label": "Location", - "edit_profile.fields.location_placeholder": "Location", + "edit_profile.fields.display_name_placeholder": "Jméno", + "edit_profile.fields.header_label": "Záhlaví", + "edit_profile.fields.hide_network_label": "Skrýt mou síť", + "edit_profile.fields.location_label": "Poloha", + "edit_profile.fields.location_placeholder": "Poloha", "edit_profile.fields.locked_label": "Zamknout účet", "edit_profile.fields.meta_fields.content_placeholder": "Obsah", "edit_profile.fields.meta_fields.label_placeholder": "Štítek", - "edit_profile.fields.stranger_notifications_label": "Block notifications from strangers", + "edit_profile.fields.meta_fields_label": "Metadata profilu", + "edit_profile.fields.stranger_notifications_label": "Blokovat oznámení od neznámých uživatelů", "edit_profile.fields.website_label": "Website", "edit_profile.fields.website_placeholder": "Display a Link", - "edit_profile.header": "Edit Profile", + "edit_profile.header": "Upravit profil", "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.", - "edit_profile.hints.avatar": "PNG, GIF nebo JPG. Maximálně 2 MB. Bude zmenšen na 400x400px", - "edit_profile.hints.bot": "Tento účet provádí automatizované úkony a není aktivně monitorován.", + "edit_profile.hints.avatar": "PNG, GIF nebo JPG. Maximálně 2 MB. Bude zmenšen na {size}", + "edit_profile.hints.bot": "Tento účet funguje automaticky a není jisté, jestli ho někdo sleduje.", "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services", - "edit_profile.hints.header": "PNG, GIF nebo JPG. Maximálně 2 MB. Bude zmenšen na 1500x500px", - "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile", - "edit_profile.hints.locked": "Požaduje manuální schvalování sledujících.", - "edit_profile.hints.stranger_notifications": "Only show notifications from people you follow", + "edit_profile.hints.header": "PNG, GIF nebo JPG. Maximálně 2 MB. Bude zmenšen na {size}", + "edit_profile.hints.hide_network": "Koho sledujete a kdo sleduje vás bude na vašem profilu skryto", + "edit_profile.hints.locked": "Žádosti o sledování budete muset ručně schvalovat.", + "edit_profile.hints.meta_fields": "Ke svému profilu můžete přidat až {count, plural, one {# položku} few {# položky} other {# položek}}.", + "edit_profile.hints.stranger_notifications": "Zobrazovat pouze oznámení od lidí, které sledujete", "edit_profile.save": "Uložit", "edit_profile.success": "Profile saved!", + "email_confirmation.success": "Your email has been confirmed!", "email_passthru.confirmed.body": "Close this tab and continue the registration process on the {bold} from which you sent this email confirmation.", "email_passthru.confirmed.heading": "Email Confirmed!", + "email_passthru.fail.expired": "Your email token has expired", + "email_passthru.fail.generic": "Unable to confirm your email", + "email_passthru.fail.invalid_token": "Your token is invalid", + "email_passthru.fail.not_found": "Your email token is invalid.", "email_passthru.generic_fail.body": "Please request a new email confirmation.", "email_passthru.generic_fail.heading": "Something Went Wrong", + "email_passthru.success": "Your email has been verified!", "email_passthru.token_expired.body": "Your email token has expired. Please request a new email confirmation from the {bold} from which you sent this email confirmation.", "email_passthru.token_expired.heading": "Token Expired", "email_passthru.token_not_found.body": "Your email token was not found. Please request a new email confirmation from the {bold} from which you sent this email confirmation.", "email_passthru.token_not_found.heading": "Invalid Token", + "email_verification.fail": "Failed to request email verification.", + "email_verification.header": "Enter your email address", + "email_verification.success": "Verification email sent successfully.", + "email_verification.taken": "is taken", + "email_verifilcation.exists": "This email has already been taken.", "embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.", - "embed.preview": "Takhle to bude vypadat:", "emoji_button.activity": "Aktivita", "emoji_button.custom": "Vlastní", "emoji_button.flags": "Vlajky", @@ -434,34 +485,37 @@ "emoji_button.travel": "Cestování a místa", "empty_column.account_blocked": "You are blocked by @{accountUsername}.", "empty_column.account_favourited_statuses": "This user doesn't have any liked posts yet.", - "empty_column.account_timeline": "Tady nejsou žádné příspěvky!", + "empty_column.account_timeline": "Nejsou tu žádné příspěvky!", "empty_column.account_unavailable": "Profil nedostupný", - "empty_column.aliases": "You haven't created any account alias yet.", + "empty_column.aliases": "Zatím jste žádný alias nevytvořili.", "empty_column.aliases.suggestions": "There are no account suggestions available for the provided term.", - "empty_column.blocks": "Ještě jste nezablokoval/a žádného uživatele.", + "empty_column.blocks": "Ještě jste nezablokovali žádného uživatele.", "empty_column.bookmarks": "Nemáte ještě žádné záložky. Když nějaké přidáte, zobrazí se zde.", - "empty_column.community": "Místní zeď je prázdná. Napište něco veřejně a rozhýbejte to tu!", + "empty_column.community": "Místní časová osa je prázdná. Napište něco veřejně a rozhýbejte to tu!", "empty_column.direct": "Ještě nemáte žádné přímé zprávy. Pokud nějakou pošlete nebo dostanete, zobrazí se zde.", "empty_column.domain_blocks": "Ještě nejsou žádné skryté domény.", "empty_column.favourited_statuses": "Ještě nemáte žádné oblíbené příspěvky. Pokud si nějaký oblíbíte, zobrazí se zde.", "empty_column.favourites": "Tento příspěvek si ještě nikdo neoblíbil. Pokud to někdo udělá, zobrazí se zde.", "empty_column.filters": "Ještě jste nepřidal žádná filtrovaná slova.", - "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.", + "empty_column.follow_recommendations": "Zřejmě se nám žádná doporučení nepodařilo vygenerovat. Zkuste použít vyhledávání a najít někoho, koho znáte, nebo se podívejte na populární hashtagy.", "empty_column.follow_requests": "Ještě nemáte žádné požadavky o sledování. Pokud nějaký obdržíte, zobrazí se zde.", - "empty_column.group": "V této skupině ještě není žádný příspěvěk. Když členové této skupiny publikují příspěvky, objevý se zde.", "empty_column.hashtag": "Pod tímto hashtagem ještě nic není.", - "empty_column.home": "Vaše domovská zeď je prázdná! Začněte navštívením {public} nebo použijte hledání a seznamte se s dalšími uživateli.", - "empty_column.home.local_tab": "Zeď {site_title}", + "empty_column.home": "Vaše domovská časová osa je prázdná! Navštivte {public} nebo použijte hledání a seznamte se s dalšími uživateli.", + "empty_column.home.local_tab": "Časová osa {site_title}", + "empty_column.home.subtitle": "{siteTitle} bude zajímavější až začnete sledovat jiné uživatele.", + "empty_column.home.title": "Zatím nikoho nesledujete", "empty_column.list": "V tomto seznamu ještě nic není. Pokud budou členové tohoto seznamu psát nové příspěvky, objeví se zde.", "empty_column.lists": "Ještě nemáte žádný seznam. Pokud nějaký vytvoříte, zobrazí se zde.", - "empty_column.mutes": "Ještě jste neskryl/a žádné uživatele.", + "empty_column.mutes": "Ještě jste neskryli žádné uživatele.", "empty_column.notifications": "Ještě nemáte žádná oznámení. Začněte konverzaci komunikováním s ostatními.", + "empty_column.notifications_filtered": "Žádná oznámení tohoto typu zatím nemáte.", "empty_column.public": "Tady nic není! Napište něco veřejně, nebo začněte sledovat uživatele z jiných serverů, aby tu něco přibylo", "empty_column.remote": "There is nothing here! Manually follow users from {instance} to fill it up.", "empty_column.scheduled_statuses": "You don't have any scheduled statuses yet. When you add one, it will show up here.", "empty_column.search.accounts": "There are no people results for \"{term}\"", "empty_column.search.hashtags": "There are no hashtags results for \"{term}\"", "empty_column.search.statuses": "There are no posts results for \"{term}\"", + "empty_column.test": "The test timeline is empty.", "export_data.actions.export": "Export", "export_data.actions.export_blocks": "Export blocks", "export_data.actions.export_follows": "Export follows", @@ -484,12 +538,14 @@ "federation_restrictions.explanation_box.message": "Normally servers on the Fediverse can communicate freely. {siteTitle} has imposed restrictions on the following servers.", "federation_restrictions.explanation_box.title": "Instance-specific policies", "federation_restrictions.not_disclosed_message": "{siteTitle} does not disclose federation restrictions through the API.", - "fediverse_tab.explanation_box.dismiss": "Don't show again", - "fediverse_tab.explanation_box.explanation": "{site_title} je členem Fediverse, sociální sítě složené z tisíce nezávislých serverů. Příspěvky které zde vidíte pochází ze serverů třetí strany. Máte možnost se servery komunikovat či je blokovat. Dávejte si pozor na druhou část jména za druhým @, ta indikuje z jakého serveru uživatel pochází. Aby jste viděly pouze příspěvky z {site_title}, navštivte {local}.", + "fediverse_tab.explanation_box.dismiss": "Tuto informaci už neukazovat", + "fediverse_tab.explanation_box.explanation": "{site_title} je částí Fediversa, sociální sítě složené z tisíce nezávislých serverů. Příspěvky, které zde vidíte, pocházejí ze serverů třetích stran. Můžete na ně reagovat, či případně celý server zablokovat. Všímejte si části uživatelských jmén za druhým zavináčem, ta indikuje, ze kterého serveru který příspěvek pochází. Pokud chcete vidět pouze příspěvky ze serveru {site_title}, navštivte stránku {local}.", "fediverse_tab.explanation_box.title": "Co je to Fediverse?", + "feed_suggestions.heading": "Suggested Profiles", + "feed_suggestions.view_all": "Zobrazit všechny", "filters.added": "Filter added.", "filters.context_header": "Filtrovat obsah", - "filters.context_hint": "Jeden či více kontextů kde bude filtr aktivován", + "filters.context_hint": "Kde všude by měl být filtr aktivován", "filters.filters_list_context_label": "Kontexty filtru:", "filters.filters_list_delete": "Odstranit", "filters.filters_list_details_label": "Nastavení filtru:", @@ -498,56 +554,25 @@ "filters.filters_list_phrase_label": "Klíčové slovo či fráze:", "filters.filters_list_whole-word": "Celé slovo", "filters.removed": "Filter deleted.", - "follow_recommendation.subhead": "Let's get started!", - "follow_recommendations.done": "Done", - "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.", - "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!", + "followRecommendations.heading": "Suggested Profiles", "follow_request.authorize": "Autorizovat", "follow_request.reject": "Odmítnout", - "forms.copy": "Copy", - "forms.hide_password": "Hide password", - "forms.show_password": "Show password", + "gdpr.accept": "Accept", + "gdpr.learn_more": "Learn more", + "gdpr.message": "{siteTitle} uses session cookies, which are essential to the website's functioning.", + "gdpr.title": "{siteTitle} uses cookies", "getting_started.open_source_notice": "{code_name} je otevřený software. Na GitLabu k němu můžete přispět nebo nahlásit chyby: {code_link} (v{code_version}).", - "group.detail.archived_group": "Archived group", - "group.members.empty": "Tato skupina nemá členy.", - "group.removed_accounts.empty": "Tato skupina nemá žádné odstraněné členy.", - "groups.card.join": "Připojit se", - "groups.card.members": "Členové", - "groups.card.roles.admin": "Jsi admin", - "groups.card.roles.member": "Jsi admin", - "groups.card.view": "Zobrazit", - "groups.create": "Vytvořit skupinu", - "groups.detail.role_admin": "You're an admin", - "groups.edit": "Edit", - "groups.form.coverImage": "Nahrát nový banner (nepovinný)", - "groups.form.coverImageChange": "Banner vybrán", - "groups.form.create": "Vytvořit skupinu", - "groups.form.description": "Popis", - "groups.form.title": "Jméno", - "groups.form.update": "Upravit skupinu", - "groups.join": "Join group", - "groups.leave": "Leave group", - "groups.removed_accounts": "Odstranit účty", - "groups.sidebar-panel.item.no_recent_activity": "No recent activity", - "groups.sidebar-panel.item.view": "new posts", - "groups.sidebar-panel.show_all": "Show all", - "groups.sidebar-panel.title": "Groups You're In", - "groups.tab_admin": "Spravovat", - "groups.tab_featured": "Featured", - "groups.tab_member": "Člen", "hashtag.column_header.tag_mode.all": "a {additional}", "hashtag.column_header.tag_mode.any": "nebo {additional}", "hashtag.column_header.tag_mode.none": "bez {additional}", "header.home.label": "Domů", - "header.login.forgot_password": "Forgot password?", + "header.login.forgot_password": "Zapomněli jste heslo?", "header.login.label": "Přihlásit se", - "header.login.password.label": "Password", - "header.login.username.placeholder": "Email or username", + "header.login.password.label": "Heslo", + "header.login.username.placeholder": "E-mail nebo uživatelské jméno", "header.register.label": "Register", - "home.column_settings.show_direct": "Zobrazit přímé zprávy", "home.column_settings.show_reblogs": "Zobrazit boosty", "home.column_settings.show_replies": "Zobrazit odpovědi", - "home.column_settings.title": "Home settings", "icon_button.icons": "Icons", "icon_button.label": "Select icon", "icon_button.not_found": "No icons!! (╯°□°）╯︵ ┻━┻", @@ -564,24 +589,12 @@ "import_data.success.blocks": "Blocks imported successfully", "import_data.success.followers": "Followers imported successfully", "import_data.success.mutes": "Mutes imported successfully", + "input.copy": "Copy", "input.password.hide_password": "Hide password", "input.password.show_password": "Show password", "intervals.full.days": "{number, plural, one {# den} few {# dny} many {# dne} other {# dní}}", "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodiny} other {# hodin}}", "intervals.full.minutes": "{number, plural, one {# minuta} few {# minuty} many {# minuty} other {# minut}}", - "introduction.federation.action": "Next", - "introduction.federation.home.headline": "Home", - "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!", - "introduction.interactions.action": "Finish tutorial!", - "introduction.interactions.favourite.headline": "Favorite", - "introduction.interactions.favourite.text": "You can save a post for later, and let the author know that you liked it, by favoriting it.", - "introduction.interactions.reblog.headline": "Repost", - "introduction.interactions.reblog.text": "You can share other people's posts with your followers by reposting them.", - "introduction.interactions.reply.headline": "Reply", - "introduction.interactions.reply.text": "You can reply to other people's and your own posts, which will chain them together in a conversation.", - "introduction.welcome.action": "Let's go!", - "introduction.welcome.headline": "First steps", - "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.", "keyboard_shortcuts.back": "k návratu zpět", "keyboard_shortcuts.blocked": "k otevření seznamu blokovaných uživatelů", "keyboard_shortcuts.boost": "k boostnutí", @@ -632,62 +645,78 @@ "loading_indicator.label": "Načítám…", "login.fields.instance_label": "Instance", "login.fields.instance_placeholder": "example.com", - "login.fields.otp_code_hint": "Zadejte kód pro dvoufaktorové ověřování vygenerovaný Vaší mobilní aplikací nebo Váš obnovovací kód", + "login.fields.otp_code_hint": "Zadejte kód pro dvoufaktorové ověřování vygenerovaný vaší mobilní aplikací nebo váš obnovovací kód", "login.fields.otp_code_label": "Kód pro dvoufaktorové ověřování:", "login.fields.password_placeholder": "Heslo", - "login.fields.username_label": "Email or username", + "login.fields.username_label": "E-mail nebo uživatelské jméno", "login.log_in": "Přihlásit se", "login.otp_log_in": "OTP přihlášení", + "login.otp_log_in.fail": "Invalid code, please try again.", "login.reset_password_hint": "Problémy s přihlášením?", "login.sign_in": "Sign in", - "media_gallery.toggle_visible": "Přepínat viditelnost", + "login_external.errors.instance_fail": "The instance returned an error.", + "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?", + "login_form.header": "Sign In", "media_panel.empty_message": "No media found.", "media_panel.title": "Média", "mfa.confirm.success_message": "MFA confirmed", "mfa.disable.success_message": "MFA disabled", + "mfa.disabled": "Vypnuto", + "mfa.enabled": "Zapnuto", "mfa.mfa_disable_enter_password": "Zadejte svoje součastné heslo pro zrušení dvoufaktorového ověřování:", - "mfa.mfa_setup.code_hint": "Enter the code from your two-factor app.", - "mfa.mfa_setup.code_placeholder": "Code", - "mfa.mfa_setup.password_hint": "Enter your current password to confirm your identity.", - "mfa.mfa_setup.password_placeholder": "Password", - "mfa.mfa_setup_scan_description": "Požijte aplikaci pro dvoufaktorové ověřování na oskenování tohoto QR kódu nebo opište do ní tento klíč:", + "mfa.mfa_setup.code_hint": "Zadejte kód ze své ověřovací aplikace.", + "mfa.mfa_setup.code_placeholder": "Kód", + "mfa.mfa_setup.password_hint": "Potvrďte svou identity zadáním svého současného hesla.", + "mfa.mfa_setup.password_placeholder": "Heslo", + "mfa.mfa_setup_scan_description": "Naskenujte tento QR kód svou ověřovací aplikací nebo do ní opište tento klíč:", "mfa.mfa_setup_scan_title": "Skenovat", "mfa.mfa_setup_verify_title": "Ověřit", - "mfa.otp_enabled_description": "Povolil/a jste dvoufaktorové ověřování skrze OTP.", + "mfa.otp_enabled_description": "Povolili jste dvoufaktorové ověřování skrze OTP.", "mfa.otp_enabled_title": "OTP povoleno", "mfa.setup_recoverycodes": "Obnovovací kódy", - "mfa.setup_warning": "Zapiště si tyto kódy nebo si je uložte na bezpečné místo - už je znovu neuvidíte. Pokud ztratíte přístup ke svojí 2FA aplikaci a obnovovacím kódům, ztratíte navždy přístup ke svému účtu.", + "mfa.setup_warning": "Tyto kódy si zapiště nebo si je uložte na bezpečné místo - už je znovu neuvidíte. Pokud ztratíte přístup ke své ověřovací aplikaci i k obnovovacím kódům, ztratíte navždy přístup ke svému účtu.", "migration.fields.acct.label": "Handle of the new account", "migration.fields.acct.placeholder": "username@domain", "migration.fields.confirm_password.label": "Current password", "migration.hint": "This will move your followers to the new account. No other data will be moved. To perform migration, you need to {link} on your new account first.", + "migration.hint.cooldown_period": "If you migrate your account, you will not be able to migrate your account for {cooldownPeriod, plural, one {one day} other {the next # days}}.", "migration.hint.link": "create an account alias", "migration.move_account.fail": "Account migration failed.", + "migration.move_account.fail.cooldown_period": "You have moved your account too recently. Please try again later.", "migration.move_account.success": "Account successfully moved.", "migration.submit": "Move followers", - "missing_description_modal.cancel": "Cancel", - "missing_description_modal.continue": "Post", + "missing_description_modal.cancel": "Zrušit", + "missing_description_modal.continue": "Publikovat", "missing_description_modal.description": "Continue anyway?", "missing_description_modal.text": "You have not entered a description for all attachments. Continue anyway?", "missing_indicator.label": "Nenalezeno", "missing_indicator.sublabel": "Tento zdroj se nepodařilo najít", - "mobile.also_available": "Available in:", - "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.", - "morefollows.following_label": "…and {count} more {count, plural, one {follow} other {follows}} on remote sites.", + "moderation_overlay.contact": "Contact", + "moderation_overlay.hide": "Schovat obsah", + "moderation_overlay.show": "Ukázat obsah", + "moderation_overlay.subtitle": "This Post has been sent to Moderation for review and is only visible to you. If you believe this is an error please contact Support.", + "moderation_overlay.title": "Content Under Review", + "mute_modal.auto_expire": "Skrýt pouze na určitou dobu", + "mute_modal.duration": "Trvání", "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?", + "navbar.login.action": "Log in", + "navbar.login.forgot_password": "Forgot password?", + "navbar.login.password.label": "Password", + "navbar.login.username.placeholder": "E-mail nebo uživatelské jméno", "navigation.chats": "Chats", - "navigation.compose": "Compose", - "navigation.dashboard": "Dashboard", + "navigation.compose": "Nový příspěvek", + "navigation.dashboard": "Ovládací panel", "navigation.developers": "Developers", "navigation.direct_messages": "Messages", "navigation.home": "Home", - "navigation.invites": "Invites", "navigation.notifications": "Notifications", "navigation.search": "Search", + "navigation_bar.account_aliases": "Aliasy účtů", "navigation_bar.account_migration": "Move account", "navigation_bar.blocks": "Blokovaní uživatelé", "navigation_bar.compose": "Vytvořit nový příspěvek", "navigation_bar.compose_direct": "Direct message", + "navigation_bar.compose_edit": "Edit post", "navigation_bar.compose_quote": "Quote post", "navigation_bar.compose_reply": "Reply to post", "navigation_bar.domain_blocks": "Skryté domény", @@ -700,139 +729,161 @@ "navigation_bar.logout": "Odhlásit", "navigation_bar.mutes": "Skrytí uživatelé", "navigation_bar.preferences": "Předvolby", - "navigation_bar.profile_directory": "Profile directory", - "navigation_bar.security": "Zabezpečení", - "navigation_bar.soapbox_config": "Soapbox nastavení", - "notification.birthday": "{name} has a birthday today", - "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", - "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.pleroma:chat_mention": "{name} Vám poslal/a zprávu", + "navigation_bar.profile_directory": "Adresář profilů", + "navigation_bar.soapbox_config": "Nastavení Soapboxu", "notification.favourite": "{name} si oblíbil/a váš příspěvek", "notification.follow": "{name} vás začal/a sledovat", "notification.follow_request": "{name} has requested to follow you", "notification.mention": "{name} vás zmínil/a", + "notification.mentioned": "{name} mentioned you", "notification.move": "{name} moved to {targetName}", - "notification.pleroma:emoji_reaction": "{name} reagoval/a na Váš příspěvek", + "notification.name": "{link}{others}", + "notification.others": " + {count} {count, plural, one {other} other {others}}", + "notification.pleroma:chat_mention": "{name} vám poslal/a zprávu", + "notification.pleroma:emoji_reaction": "{name} reagoval/a na váš příspěvek", "notification.poll": "Anketa, ve které jste hlasoval/a, skončila", "notification.reblog": "{name} boostnul/a váš příspěvek", "notification.status": "{name} just posted", - "notifications.clear": "Vymazat oznámení", - "notifications.clear_confirmation": "Jste si jistý/á, že chcete trvale vymazat všechna vaše oznámení?", - "notifications.clear_heading": "Clear notifications", - "notifications.column_settings.alert": "Desktopová oznámení", - "notifications.column_settings.birthdays.category": "Birthdays", - "notifications.column_settings.birthdays.show": "Show birthday reminders", - "notifications.column_settings.emoji_react": "Emoji reacts:", - "notifications.column_settings.favourite": "Oblíbení:", - "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie", - "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování", - "notifications.column_settings.filter_bar.show": "Zobrazit", - "notifications.column_settings.follow": "Noví sledující:", - "notifications.column_settings.follow_request": "New follow requests:", - "notifications.column_settings.mention": "Zmínky:", - "notifications.column_settings.move": "Moves:", - "notifications.column_settings.poll": "Výsledky anket:", - "notifications.column_settings.push": "Push oznámení", - "notifications.column_settings.reblog": "Boosty:", - "notifications.column_settings.show": "Zobrazit ve sloupci", - "notifications.column_settings.sound": "Přehrát zvuk", - "notifications.column_settings.sounds": "Zvuky", - "notifications.column_settings.sounds.all_sounds": "Přehrávat zvuk ze všech notifikací", - "notifications.column_settings.title": "Notification settings", + "notification.update": "{name} edited a post you interacted with", + "notification.user_approved": "Welcome to {instance}!", "notifications.filter.all": "Vše", "notifications.filter.boosts": "Boosty", "notifications.filter.emoji_reacts": "Emoji reacts", "notifications.filter.favourites": "Oblíbení", "notifications.filter.follows": "Sledování", "notifications.filter.mentions": "Zmínky", - "notifications.filter.moves": "Moves", "notifications.filter.polls": "Výsledky anket", "notifications.filter.statuses": "Updates from people you follow", "notifications.group": "{count} oznámení", "notifications.queue_label": "Click to see {count} new {count, plural, one {notification} other {notifications}}", - "onboarding.avatar.subtitle": "Just have fun with it.", - "onboarding.avatar.title": "Choose a profile picture", - "onboarding.display_name.subtitle": "You can always edit this later.", - "onboarding.display_name.title": "Choose a display name", - "onboarding.done": "Done", - "onboarding.finished.message": "We are very excited to welcome you to our community! Tap the button below to get started.", - "onboarding.finished.title": "Onboarding complete", - "onboarding.header.subtitle": "This will be shown at the top of your profile.", - "onboarding.header.title": "Pick a cover image", - "onboarding.next": "Next", - "onboarding.note.subtitle": "You can always edit this later.", - "onboarding.note.title": "Write a short bio", + "oauth_consumer.tooltip": "Sign in with {provider}", + "oauth_consumers.title": "Other ways to sign in", + "onboarding.avatar.subtitle": "Kreativitě se meze nekladou.", + "onboarding.avatar.title": "Nastavte si profilový obrázek", + "onboarding.display_name.subtitle": "Později ho můžete změnit.", + "onboarding.display_name.title": "Nastavte si uživatelské jméno", + "onboarding.done": "Hotovo", + "onboarding.fediverse.its_you": "Tohle jste vy! Jiní lidí vás mohou sledovat z jiných serverů, stačí jim použít vaši plnou adresu s oběma zavináči.", + "onboarding.fediverse.message": "Fediverse je sociální síť složená z tisíců různorodých a nezávisle provozovaných serverů. Můžete sledovat uživatele - a lajkovat, sdílet a odpovídat na příspěvky - z většiny ostatních serverů Fediversa, protože {siteTitle} s nimi dokáže komunikovat.", + "onboarding.fediverse.next": "Next", + "onboarding.fediverse.other_instances": "Při procházení příspěvků si všímejte plných uživatelských jmen - podle části za druhým zavináčem zjistíte, ze kterého serveru daný příspěvek pochází.", + "onboarding.fediverse.title": "{siteTitle} je jen jedna část Fediversa", + "onboarding.fediverse.trailer": "Díky své distribuované povaze a tomu, že svůj server může provozovat kdokoliv, je Fediverse odolný a otevřený. Pokud se zaregistrujete k jinému serveru, nebo si spustíte vlastní, můžete nadále interagovat se stejnými lidmi o nepřerušovat své existující sociální vazby.", + "onboarding.finished.message": "Vítejte v naší komunitě! Pro začátek stiskněte tlačítko pod tímto textem.", + "onboarding.finished.title": "Účet je založen", + "onboarding.header.subtitle": "Bude zobrazen na vršku vašeho profilu.", + "onboarding.header.title": "Nastavte si obrázek do záhlaví účtu", + "onboarding.next": "Další", + "onboarding.note.subtitle": "Později to můžete změnit.", + "onboarding.note.title": "Napište něco krátkého o sobě", "onboarding.saving": "Saving…", - "onboarding.skip": "Skip for now", - "onboarding.suggestions.subtitle": "Here are a few of the most popular accounts you might like.", - "onboarding.suggestions.title": "Suggested accounts", - "onboarding.view_feed": "View Feed", + "onboarding.skip": "Prozatím přeskočit", + "onboarding.suggestions.subtitle": "Tohle je pár našich populárních účtů, které by se vám mohly líbit.", + "onboarding.suggestions.title": "Doporučené účty", + "onboarding.view_feed": "Zobrazit časovou osu", "password_reset.confirmation": "Check your email for confirmation.", - "password_reset.fields.username_placeholder": "Email or username", - "password_reset.reset": "Reset password", + "password_reset.fields.username_placeholder": "E-mail nebo uživatelské jméno", + "password_reset.header": "Resetovat heslo", + "password_reset.reset": "Resetovat heslo", "patron.donate": "Donate", "patron.title": "Funding Goal", "pinned_accounts.title": "{name}’s choices", "pinned_statuses.none": "Žádné připnuté příspěvky.", + "poll.choose_multiple": "Choose as many as you'd like.", "poll.closed": "Uzavřena", + "poll.non_anonymous": "Public poll", + "poll.non_anonymous.label": "Other instances may display the options you voted for", "poll.refresh": "Obnovit", + "poll.total_people": "{count, plural, one {# person} other {# people}}", "poll.total_votes": "{count, plural, one {# hlas} few {# hlasy} many {# hlasu} other {# hlasů}}", "poll.vote": "Hlasovat", "poll.voted": "You voted for this answer", "poll.votes": "{votes, plural, one {# vote} other {# votes}}", "poll_button.add_poll": "Přidat anketu", "poll_button.remove_poll": "Odstranit anketu", - "pre_header.close": "Close", "preferences.fields.auto_play_gif_label": "Automaticky přehrávat GIFy", - "preferences.fields.autoload_more_label": "Automatically load more items when scrolled to the bottom of the page", - "preferences.fields.autoload_timelines_label": "Automatically load new posts when scrolled to the top of the page", + "preferences.fields.auto_play_video_label": "Automaticky přehrávat videa", + "preferences.fields.autoload_more_label": "Při dosažení spodku stránky automaticky nahrát další příspěvky", + "preferences.fields.autoload_timelines_label": "Při dosažení vršku stránky automaticky nahrát další příspěvky", "preferences.fields.boost_modal_label": "Zobrazit potvrzovací dialog před boostnutím", + "preferences.fields.content_type_label": "Formát příspěvků", "preferences.fields.delete_modal_label": "Zobrazit potvrzovací dialog před smazáním příspěvku", - "preferences.fields.display_media.default": "Hide media marked as sensitive", - "preferences.fields.display_media.hide_all": "Always hide media", - "preferences.fields.display_media.show_all": "Always show media", + "preferences.fields.demetricator_label": "Use Demetricator", + "preferences.fields.display_media.default": "Skrývat média označená jako citlivá", + "preferences.fields.display_media.hide_all": "Vždy skrývat média", + "preferences.fields.display_media.show_all": "Vždy zobrazovat média", + "preferences.fields.dyslexic_font_label": "Dyslexic mode", "preferences.fields.expand_spoilers_label": "Vždy rozbalit příspěvky označené varováním", "preferences.fields.language_label": "Jazyk", - "preferences.fields.media_display_label": "Media display", - "preferences.hints.feed": "In your home feed", + "preferences.fields.media_display_label": "Zobrazování médií", + "preferences.fields.missing_description_modal_label": "Show confirmation dialog before sending a post without media descriptions", + "preferences.fields.privacy_label": "Soukromí příspěvků", + "preferences.fields.reduce_motion_label": "Reduce motion in animations", + "preferences.fields.system_font_label": "Use system's default font", + "preferences.fields.theme": "Styl", + "preferences.fields.underline_links_label": "Always underline links in posts", + "preferences.fields.unfollow_modal_label": "Show confirmation dialog before unfollowing someone", + "preferences.hints.demetricator": "Decrease social media anxiety by hiding all numbers from the site.", + "preferences.hints.feed": "Ve vaší časové ose", + "preferences.notifications.advanced": "Show all notification categories", + "preferences.options.content_type_markdown": "Markdown", + "preferences.options.content_type_plaintext": "Prostý text", + "preferences.options.privacy_followers_only": "Pouze pro sledující", + "preferences.options.privacy_public": "Veřejný", + "preferences.options.privacy_unlisted": "Neuvedený", "privacy.change": "Změnit soukromí příspěvku", - "privacy.direct.long": "Odeslat pouze zmíněným uživatelům", + "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele", "privacy.direct.short": "Přímý", - "privacy.private.long": "Odeslat pouze sledujícím", + "privacy.private.long": "Viditelný pouze pro sledující", "privacy.private.short": "Pouze pro sledující", - "privacy.public.long": "Odeslat na veřejné časové osy", + "privacy.public.long": "Viditelný pro všechny", "privacy.public.short": "Veřejný", - "privacy.unlisted.long": "Neodeslat na veřejné časové osy", + "privacy.unlisted.long": "Nezobrazovat na veřejných časových osách", "privacy.unlisted.short": "Neuvedený", "profile_dropdown.add_account": "Add an existing account", "profile_dropdown.logout": "Log out @{acct}", - "profile_fields_panel.title": "Profile fields", - "public.column_settings.title": "Fediverse timeline settings", + "profile_dropdown.switch_account": "Switch accounts", + "profile_dropdown.theme": "Styl", + "profile_fields_panel.title": "Profilové položky", "reactions.all": "All", "regeneration_indicator.label": "Načítám…", "regeneration_indicator.sublabel": "Váš domovský proud se připravuje!", "register_invite.lead": "Complete the form below to create an account.", "register_invite.title": "You've been invited to join {siteTitle}!", - "registration.agreement": "Souhlasím s {tos}.", - "registration.captcha.hint": "Klikněte na tento obrázek pro vygenerovaní nové captchy", + "registration.acceptance": "By registering, you agree to the {terms} and {privacy}.", + "registration.agreement": "Přečetl/a jsem si {tos} a souhlasím s nimi.", + "registration.captcha.hint": "Klikněte na tento obrázek pro vygenerovaní nového obrázku", + "registration.captcha.placeholder": "Opište text z obrázku", "registration.closed_message": "{instance} nepříjmá nové uživatele", "registration.closed_title": "Registrace uzavřeny", - "registration.confirmation_modal.close": "Close", + "registration.confirmation_modal.close": "Zavřít", "registration.fields.confirm_placeholder": "Heslo (znovu)", - "registration.fields.email_placeholder": "Emailová adresa", + "registration.fields.email_placeholder": "E-mailová adresa", "registration.fields.password_placeholder": "Heslo", - "registration.fields.username_hint": "Pouze písmena, čísla a podtržítka jsou povoleny.", - "registration.fields.username_placeholder": "Jméno", - "registration.newsletter": "Subscribe to newsletter.", - "registration.password_mismatch": "Passwords don't match.", - "registration.reason": "Proč se chcete připojit?", - "registration.reason_hint": "Toto nám pomůže posoudit Vaši přihlášku", + "registration.fields.username_hint": "Povolena jsou pouze písmena, čísla a podtržítka.", + "registration.fields.username_placeholder": "Uživatelské jméno", + "registration.header": "Register your account", + "registration.newsletter": "Přihlásit se k odběru novinek.", + "registration.password_mismatch": "Hesla se neshodují.", + "registration.privacy": "Privacy Policy", + "registration.reason": "Proč se u nás chcete registrovat?", + "registration.reason_hint": "Pomůže nám to posoudit vaši přihlášku", "registration.sign_up": "Registrovat", "registration.tos": "Podmínky služby", - "registration.username_unavailable": "Username is already taken.", + "registration.username_unavailable": "Toto uživatelské jméno je už zabrané.", + "registration.validation.capital_letter": "1 capital letter", + "registration.validation.lowercase_letter": "1 lowercase letter", + "registration.validation.minimum_characters": "8 characters", + "registrations.create_account": "Create an account", + "registrations.error": "Failed to register your account.", + "registrations.get_started": "Let's get started!", + "registrations.success": "Welcome to {siteTitle}!", + "registrations.tagline": "Social Media Without Discrimination", + "registrations.unprocessable_entity": "This username has already been taken.", + "registrations.username.hint": "May only contain A-Z, 0-9, and underscores", "relative_time.days": "{number} d", "relative_time.hours": "{number} h", - "relative_time.just_now": "teď", + "relative_time.just_now": "právě teď", "relative_time.minutes": "{number} m", "relative_time.seconds": "{number} s", "remote_instance.edit_federation": "Edit federation", @@ -859,121 +910,152 @@ "reply_indicator.cancel": "Zrušit", "reply_mentions.account.add": "Add to mentions", "reply_mentions.account.remove": "Remove from mentions", + "reply_mentions.more": "{count} more", + "reply_mentions.reply": "Replying to {accounts}", + "reply_mentions.reply.hoverable": "Replying to {accounts}", "reply_mentions.reply_empty": "Replying to post", "report.block": "Zablokovat {target}", "report.block_hint": "Chcete zablokovat tento účet?", + "report.confirmation.content": "If we find that this account is violating the {link} we will take further action on the matter.", + "report.confirmation.title": "Thanks for submitting your report.", + "report.done": "Done", "report.forward": "Přeposlat na {target}", "report.forward_hint": "Tento účet je z jiného serveru. Chcete na něj také poslat anonymizovanou kopii?", - "report.hint": "Nahlášení bude zasláno moderátorům vašeho serveru. Níže můžete uvést, proč tento účet nahlašujete:", + "report.next": "Pokračovat", + "report.otherActions.addAdditional": "Would you like to add additional statuses to this report?", + "report.otherActions.addMore": "Add more", + "report.otherActions.furtherActions": "Further actions:", + "report.otherActions.hideAdditional": "Hide additional statuses", + "report.otherActions.otherStatuses": "Include other statuses?", "report.placeholder": "Dodatečné komentáře", + "report.reason.blankslate": "You have removed all statuses from being selected.", + "report.reason.title": "Reason for reporting", "report.submit": "Odeslat", "report.target": "Nahlášení uživatele {target}", + "reset_password.fail": "Expired token, please try again.", "reset_password.header": "Set New Password", + "save": "Uložit", "schedule.post_time": "Post Date/Time", "schedule.remove": "Remove schedule", - "schedule_button.add_schedule": "Schedule post for later", - "schedule_button.remove_schedule": "Post immediately", - "scheduled_status.cancel": "Cancel", + "schedule_button.add_schedule": "Naplánovat na později", + "schedule_button.remove_schedule": "Publikovat ihned", + "scheduled_status.cancel": "Zrušit", "search.action": "Search for “{query}”", "search.placeholder": "Hledat", "search_results.accounts": "Lidé", + "search_results.filter_message": "You are searching for posts from @{acct}.", "search_results.hashtags": "Hashtagy", "search_results.statuses": "Příspěvky", - "search_results.top": "Top", "security.codes.fail": "Selhalo načítání záložních kódů", "security.confirm.fail": "Špatný kód nebo heslo. Zkuste to znova.", "security.delete_account.fail": "Smazání účtu selhalo.", "security.delete_account.success": "Smazání účtu bylo úspěšné.", "security.disable.fail": "Špatné heslo. Zkuste to znova.", - "security.disable_mfa": "Vypnout", "security.fields.email.label": "Emailová addresa", "security.fields.new_password.label": "Nové heslo", "security.fields.old_password.label": "Současné heslo", "security.fields.password.label": "Heslo", "security.fields.password_confirmation.label": "Nové heslo (znova)", - "security.headers.delete": "Odstranit účet", - "security.headers.tokens": "Sessions", - "security.headers.update_email": "Změnit email", - "security.headers.update_password": "Změnit heslo", - "security.mfa": "Set up 2-Factor Auth", - "security.mfa_enabled": "You have multi-factor authentication set up with OTP.", - "security.mfa_header": "Authorizační metody", - "security.mfa_setup_hint": "Configure multi-factor authentication with OTP", + "security.headers.delete": "Smazat účet", + "security.headers.tokens": "Autorizované aplikace", "security.qr.fail": "Failed to fetch setup key", "security.submit": "Uložit změny", "security.submit.delete": "Smazat účet", - "security.text.delete": "Pro smazání účtu vložte své heslo a poté klikněte Smazat účet. Tuto akci poté nelze zvrátit. Váš účet bude smazán z tohoto serveru a žádost o smazání bude poslán všem známým serverům. Nelze garantovat, že všechny servery Váš účet smažou.", - "security.tokens.revoke": "Anulovat", + "security.text.delete": "Smazání účtu potvrdíte zadáním svého hesla a kliknutím na Smazat účet. Toto je nevratná akce. Váš účet bude z tohoto serveru vymazán a žádost o smazání bude zaslána i ostatním serverům. Nelze garantovat, že všechny cizí servery data související s vaším účtem skutečně smažou.", + "security.text.delete.local": "Smazání účtu potvrdíte zadáním svého hesla a kliknutím na Smazat účet. Toto je nevratná akce.", + "security.tokens.revoke": "Odvolat", "security.update_email.fail": "Změna emailu se nezdařila.", "security.update_email.success": "Email úspěšně změněn.", "security.update_password.fail": "Změna hesla se nezdařila.", "security.update_password.success": "Heslo úspěšně změněno.", - "settings.change_email": "Change Email", - "settings.change_password": "Change Password", - "settings.configure_mfa": "Configure MFA", - "settings.delete_account": "Delete Account", - "settings.edit_profile": "Edit Profile", - "settings.preferences": "Preferences", - "settings.profile": "Profile", - "settings.save.success": "Your preferences have been saved!", - "settings.security": "Security", - "settings.settings": "Settings", - "signup_panel.subtitle": "Registrujte se pro diskuzi.", - "signup_panel.title": "Nový na {site_title}?", + "settings.account_migration": "Move Account", + "settings.change_email": "Změnit email", + "settings.change_password": "Změnit heslo", + "settings.configure_mfa": "Nastavit dvoufaktorové ověření", + "settings.delete_account": "Smazat účet", + "settings.edit_profile": "Upravit profil", + "settings.other": "Další možnosti", + "settings.preferences": "Předvolby", + "settings.profile": "Profil", + "settings.save.success": "Vaše předvolby byly uloženy!", + "settings.security": "Zabezpečení", + "settings.sessions": "Autorizované aplikace", + "settings.settings": "Nastavení", + "shared.tos": "Podmínky služby", + "signup_panel.subtitle": "Zaregistrujte se a zúčastněte se diskuse.", + "signup_panel.title": "Jste na serveru {site_title} noví?", + "site_preview.preview": "Náhled", + "sms_verification.expired": "Your SMS token has expired.", + "sms_verification.fail": "Failed to send SMS message to your phone number.", + "sms_verification.header": "Enter your phone number", + "sms_verification.invalid": "Please enter a valid phone number.", + "sms_verification.modal.enter_code": "We sent you a 6-digit code via SMS. Enter it below.", + "sms_verification.modal.resend_code": "Resend verification code?", + "sms_verification.modal.verify_code": "Verify code", + "sms_verification.modal.verify_help_text": "Verify your phone number to start using {instance}.", + "sms_verification.modal.verify_number": "Verify phone number", + "sms_verification.modal.verify_sms": "Verify SMS", + "sms_verification.modal.verify_title": "Verify your phone number", + "sms_verification.sent.header": "Verification code", + "sms_verification.success": "A verification code has been sent to your phone number.", "snackbar.view": "View", - "soapbox_config.authenticated_profile_hint": "Users must be logged-in to view replies and media on user profiles.", - "soapbox_config.authenticated_profile_label": "Profiles require authentication", - "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Copyright zápatí", - "soapbox_config.crypto_address.meta_fields.address_placeholder": "Address", - "soapbox_config.crypto_address.meta_fields.note_placeholder": "Note (optional)", - "soapbox_config.crypto_address.meta_fields.ticker_placeholder": "Ticker", - "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Number of items to display in the crypto homepage widget", + "soapbox_config.authenticated_profile_hint": "Pouze přihlášení uživatelé mohou prohlížet odpovědi a média na uživatelských profilech.", + "soapbox_config.authenticated_profile_label": "Profily vyžadují přihlášení", + "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Copyright v zápatí", + "soapbox_config.crypto_address.meta_fields.address_placeholder": "Adresa", + "soapbox_config.crypto_address.meta_fields.note_placeholder": "Poznámka (nepovinná)", + "soapbox_config.crypto_address.meta_fields.ticker_placeholder": "Symbol", + "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Počet položek k zobrazení v panelu kryptoměn na domovské obrazovce", + "soapbox_config.cta_label": "Zobrazit panely s výzvami k akci i nepřihlášeným uživatelům", "soapbox_config.custom_css.meta_fields.url_placeholder": "URL", - "soapbox_config.display_fqn_label": "Display domain (eg @user@domain) for local accounts.", - "soapbox_config.fields.accent_color_label": "Accent color", - "soapbox_config.fields.brand_color_label": "Barva značky", - "soapbox_config.fields.crypto_address.add": "Add new crypto address", - "soapbox_config.fields.crypto_addresses_label": "Cryptocurrency addresses", - "soapbox_config.fields.home_footer.add": "Přidat položku do Domácího zápatí", - "soapbox_config.fields.home_footer_fields_label": "Položky Domácího zápatí", + "soapbox_config.display_fqn_label": "Zobrazit doménu (např @uzivatel@domena) u místních účtů.", + "soapbox_config.fields.accent_color_label": "Vedlejší barva", + "soapbox_config.fields.brand_color_label": "Hlavní barva", + "soapbox_config.fields.crypto_addresses_label": "Adresy kryptoměn", + "soapbox_config.fields.home_footer_fields_label": "Zápatí časové osy", "soapbox_config.fields.logo_label": "Logo", - "soapbox_config.fields.promo_panel.add": "Přidat položku do Promo panelu", "soapbox_config.fields.promo_panel_fields_label": "Položky Promo panelu", "soapbox_config.fields.theme_label": "Výchozí motiv", - "soapbox_config.greentext_label": "Enable greentext support", - "soapbox_config.hints.crypto_addresses": "Add cryptocurrency addresses so users of your site can donate to you. Order matters, and you must use lowercase ticker values.", + "soapbox_config.greentext_label": "Povolit greentext", + "soapbox_config.headings.advanced": "Pokročilé", + "soapbox_config.headings.cryptocurrency": "Kryptoměny", + "soapbox_config.headings.navigation": "Navigace", + "soapbox_config.headings.options": "Nastavení", + "soapbox_config.headings.theme": "Styl", + "soapbox_config.hints.crypto_addresses": "Zadejte adresy kryptoměn, aby vám uživatelé vašeho severu mohli přispívat. Na pořadí záleží a burzovní symboly musejí být malými písmeny.", "soapbox_config.hints.home_footer_fields": "Můžete mít vlastní odkazy zobrazené v zápatí", "soapbox_config.hints.logo": "SVG. Maximálně 2 MB. Bude zobrazeno 50 pixelů vysoké se zachovaným poměrem stran", - "soapbox_config.hints.promo_panel_fields": "Můžete mít vlastní odkazy zobrazené nalevo od zdi.", - "soapbox_config.hints.promo_panel_icons": "{ link }", + "soapbox_config.hints.promo_panel_fields": "Můžete mít vlastní odkazy zobrazené vpravo od časové osy.", "soapbox_config.hints.promo_panel_icons.link": "Soapbox Icons List", "soapbox_config.home_footer.meta_fields.label_placeholder": "Štítek", "soapbox_config.home_footer.meta_fields.url_placeholder": "URL", "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Ikona", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Štítek", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Upravte data nastavení přímo. Změny udělané přímo do JSON přepíše předchozí formulář. Zmáčkněte Uložit pro aplikaci změn.", + "soapbox_config.raw_json_hint": "Upravte data nastavení přímo. Změny v souboru přepíší předchozí formulář. Tlačítkem Uložit změny aplikujete.", "soapbox_config.raw_json_label": "Pokročilé: Upravit JSON data", "soapbox_config.save": "Uložit", - "soapbox_config.saved": "Soapbox config saved!", - "soapbox_config.single_user_mode_hint": "Front page will redirect to a given user profile.", - "soapbox_config.single_user_mode_label": "Single user mode", + "soapbox_config.saved": "Nastavení Soapboxu uložena!", + "soapbox_config.single_user_mode_hint": "Domovská stránka zobrazí zadaný uživatelský profil.", + "soapbox_config.single_user_mode_label": "Režim jednoho uživatele", "soapbox_config.single_user_mode_profile_hint": "@handle", "soapbox_config.single_user_mode_profile_label": "Main user handle", - "soapbox_config.verified_can_edit_name_label": "Allow verified users to edit their own display name.", - "status.actions.more": "More", - "status.admin_account": "Otevřít moderátorské rozhraní pro uživatele @{name}", - "status.admin_status": "Otevřít tento příspěvek v moderátorském rozhraní", - "status.block": "Zablokovat uživatele @{name}", + "soapbox_config.verified_can_edit_name_label": "Povolit ověřeným uživatelům měnit jméno svého účtu.", + "sponsored.info.message": "{siteTitle} displays ads to help fund our service.", + "sponsored.info.title": "Why am I seeing this ad?", + "sponsored.subtitle": "Sponsored post", + "status.admin_account": "Moderovat uživatele @{name}", + "status.admin_status": "Moderovat příspěvek", "status.bookmark": "Záložka", "status.bookmarked": "Bookmark added.", "status.cancel_reblog_private": "Zrušit boost", "status.cannot_reblog": "Tento příspěvek nemůže být boostnutý", - "status.chat": "Chat with @{name}", + "status.chat": "Chatovat s @{name}", "status.copy": "Kopírovat odkaz příspěvku", "status.delete": "Smazat", "status.detailed_status": "Detailní zobrazení konverzace", "status.direct": "Poslat přímou zprávu uživateli @{name}", + "status.edit": "Edit", "status.embed": "Vložit na web", "status.favourite": "Oblíbit", "status.filtered": "Filtrováno", @@ -981,7 +1063,6 @@ "status.media_hidden": "Média skryta", "status.mention": "Zmínit uživatele @{name}", "status.more": "Více", - "status.mute": "Skrýt uživatele @{name}", "status.mute_conversation": "Skrýt konverzaci", "status.open": "Otevřít tento příspěvek", "status.pin": "Připnout na profil", @@ -994,7 +1075,6 @@ "status.reactions.like": "Like", "status.reactions.open_mouth": "Wow", "status.reactions.weary": "Weary", - "status.reactions_expand": "Select emoji", "status.read_more": "Číst více", "status.reblog": "Boostnout", "status.reblog_private": "Boostnout původnímu publiku", @@ -1007,34 +1087,52 @@ "status.replyAll": "Odpovědět na vlákno", "status.report": "Nahlásit uživatele @{name}", "status.sensitive_warning": "Citlivý obsah", + "status.sensitive_warning.subtitle": "Tento obsah nemusí být pro některé osoby vhodný.", "status.share": "Sdílet", - "status.show_less": "Zobrazit méně", "status.show_less_all": "Zobrazit méně pro všechny", - "status.show_more": "Zobrazit více", "status.show_more_all": "Zobrazit více pro všechny", - "status.title": "Post", + "status.show_original": "Show original", + "status.title": "Příspěvek uživatele @{username}", "status.title_direct": "Direct message", + "status.translate": "Translate", + "status.translated_from_with": "Translated from {lang} using {provider}", "status.unbookmark": "Odstranit záložku", - "status.unbookmarked": "Bookmark removed.", + "status.unbookmarked": "Záložka odstraněna.", "status.unmute_conversation": "Odkrýt konverzaci", "status.unpin": "Odepnout z profilu", "status_list.queue_label": "Klikněte aby pro zobrazení {count} nových {count, plural, one {post} other {posts}}", - "statuses.quote_tombstone": "Post is unavailable.", - "statuses.tombstone": "One or more posts are unavailable.", + "statuses.quote_tombstone": "Příspěvek není dostupný.", + "statuses.tombstone": "Jeden nebo více příspěvků je nedostupných.", + "streamfield.add": "Přidat", + "streamfield.remove": "Odebrat", "suggestions.dismiss": "Odmítnout návrh", + "sw.restart": "Restart", + "sw.state.active": "Active", + "sw.state.loading": "Loading…", + "sw.state.unavailable": "Unavailable", + "sw.state.unknown": "Unknown", + "sw.state.waiting": "Waiting", + "sw.status": "Status", + "sw.update": "Aktualizovat", + "sw.update_text": "Je dostupná nová verze.", + "sw.url": "Script URL", "tabs_bar.all": "All", "tabs_bar.chats": "Chaty", - "tabs_bar.dashboard": "Dashboard", + "tabs_bar.dashboard": "Ovládací panel", "tabs_bar.fediverse": "Fediverse", "tabs_bar.home": "Domů", - "tabs_bar.more": "More", + "tabs_bar.more": "Více", "tabs_bar.notifications": "Oznámení", - "tabs_bar.post": "Příspěvek", - "tabs_bar.profile": "Profile", + "tabs_bar.profile": "Profil", "tabs_bar.search": "Hledat", - "tabs_bar.settings": "Settings", - "tabs_bar.theme_toggle_dark": "Přepnout na tmavý režim", - "tabs_bar.theme_toggle_light": "Přepnout na světlý režim", + "tabs_bar.settings": "Nastavení", + "theme_toggle.dark": "Tmavý", + "theme_toggle.light": "Světlý", + "theme_toggle.system": "Systémový", + "thread_login.login": "Log in", + "thread_login.message": "Join {siteTitle} to get the full story and details.", + "thread_login.signup": "Sign up", + "thread_login.title": "Continue the conversation", "time_remaining.days": "{number, plural, one {Zbývá # den} few {Zbývají # dny} many {Zbývá # dne} other {Zbývá # dní}}", "time_remaining.hours": "{number, plural, one {Zbývá # hodina} few {Zbývají # hodiny} many {Zbývá # hodiny} other {Zbývá # hodin}}", "time_remaining.minutes": "{number, plural, one {Zbývá # minuta} few {Zbývají # minuty} many {Zbývá # minuty} other {Zbývá # minut}}", @@ -1042,21 +1140,23 @@ "time_remaining.seconds": "{number, plural, one {Zbývá # sekunda} few {Zbývají # sekundy} many {Zbývá # sekundy} other {Zbývá # sekund}}", "trends.count_by_accounts": "{count} {rawCount, plural, one {člověk} few {lidé} many {lidí} other {lidí}} hovoří", "trends.title": "Trendy", + "trendsPanel.viewAll": "View all", "ui.beforeunload": "Váš koncept se ztratí, pokud Soapbox opustíte.", - "unauthorized_modal.text": "Pro toto musíte být přihlášen/a.", + "unauthorized_modal.text": "Nejprve se přihlašte.", "unauthorized_modal.title": "Registrovat se na {site_title}", "upload_area.title": "Přetažením nahrajete", "upload_button.label": "Přidat média (JPEG, PNG, GIF, WebM, MP4, MOV)", "upload_error.image_size_limit": "Image exceeds the current file size limit ({limit})", "upload_error.limit": "Byl překročen limit nahraných souborů.", "upload_error.poll": "Nahrávání souborů není povoleno u anket.", + "upload_error.video_duration_limit": "Video exceeds the current duration limit ({limit} seconds)", "upload_error.video_size_limit": "Video exceeds the current file size limit ({limit})", "upload_form.description": "Popis pro zrakově postižené", - "upload_form.preview": "Preview", + "upload_form.preview": "Náhled", "upload_form.undo": "Smazat", "upload_progress.label": "Nahrávám…", "video.close": "Zavřít video", - "video.download": "Download file", + "video.download": "Stáhnout soubor", "video.exit_fullscreen": "Ukončit celou obrazovku", "video.expand": "Otevřít video", "video.fullscreen": "Celá obrazovka", diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json index dea27e5af..debb5b07d 100644 --- a/app/soapbox/locales/de.json +++ b/app/soapbox/locales/de.json @@ -55,7 +55,7 @@ "account.welcome": "Willkommen", "account_gallery.none": "Keine Medien vorhanden.", "account_note.hint": "You can keep notes about this user for yourself (this will not be shared with them):", - "account_note.placeholder": "No comment provided", + "account_note.placeholder": "Kein Kommentar hinterlegt", "account_note.save": "Speichern", "account_note.target": "Note for @{target}", "account_search.placeholder": "Nach einem Account suchen", @@ -362,12 +362,12 @@ "developers.navigation.network_error_label": "Network error", "developers.navigation.settings_store_label": "Settings store", "developers.navigation.test_timeline_label": "Test timeline", - "developers.settings_store.hint": "It is possible to directly edit your user settings here. BE CAREFUL! Editing this section can break your account, and you will only be able to recover through the API.", + "developers.settings_store.hint": "Hier können die Benutzereinstellungen direkt bearbeitet werden. VORSICHT! Die Bearbeitung dieses Abschnitts kann das Konto zerstören - eine Wiederherstellung ist ausschließlich per API möglich", "direct.search_placeholder": "Nachricht senden an…", "directory.federated": "From known fediverse", - "directory.local": "From {domain} only", + "directory.local": "Ausschließlich von {domain}", "directory.new_arrivals": "New arrivals", - "directory.recently_active": "Recently active", + "directory.recently_active": "Zuletzt aktiv", "edit_federation.followers_only": "Beitrag nur für Follower anzeigen", "edit_federation.force_nsfw": "Markierung aller Anhänge als heikel erzwingen", "edit_federation.media_removal": "Alle Medien entfernen", @@ -375,7 +375,7 @@ "edit_federation.save": "Speichern", "edit_federation.success": "{host} federation was updated", "edit_federation.unlisted": "Ungelistete Beiträge erzwingen", - "edit_password.header": "Change Password", + "edit_password.header": "Passwort ändern", "edit_profile.error": "Profil konnte nicht geändert werden", "edit_profile.fields.accepts_email_list_label": "Newsletter abonnieren", "edit_profile.fields.avatar_label": "Profilbild", @@ -384,24 +384,24 @@ "edit_profile.fields.birthday_label": "Geburtstag", "edit_profile.fields.birthday_placeholder": "Dein Geburtstag", "edit_profile.fields.bot_label": "Dieses Konto wird für einen Bot genutzt", - "edit_profile.fields.discoverable_label": "Allow account discovery", + "edit_profile.fields.discoverable_label": "Konto im Instanz-Verzeichnis eintragen", "edit_profile.fields.display_name_label": "Angezeigter Nutzername", "edit_profile.fields.display_name_placeholder": "Name", "edit_profile.fields.header_label": "Profilbanner", "edit_profile.fields.hide_network_label": "Follower und Nutzer, denen du folgst, nicht öffentlich anzeigen", - "edit_profile.fields.location_label": "Location", - "edit_profile.fields.location_placeholder": "Location", + "edit_profile.fields.location_label": "Wohnort", + "edit_profile.fields.location_placeholder": "Wohnort", "edit_profile.fields.locked_label": "Profil auf privat stellen", "edit_profile.fields.meta_fields.content_placeholder": "Content", "edit_profile.fields.meta_fields.label_placeholder": "Label", "edit_profile.fields.stranger_notifications_label": "Benachrichtigungen von Fremden blockieren", "edit_profile.fields.website_label": "Website", - "edit_profile.fields.website_placeholder": "Display a Link", - "edit_profile.header": "Edit Profile", - "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.", + "edit_profile.fields.website_placeholder": "Link anzeigen", + "edit_profile.header": "Profile bearbeiten", + "edit_profile.hints.accepts_email_list": "Status- und Werbenachrichten abonnieren.", "edit_profile.hints.avatar": "Erlaubte Formate sind PNG, GIF oder JPG. Die Datei darf nicht größer als 2 MB sein. Das Bild wird automatisch auf 400x400px verkleinert.", - "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored", - "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services", + "edit_profile.hints.bot": "Dieses Konto ist ein Bot. Aktivitäten werden möglicherweise nicht moderiert.", + "edit_profile.hints.discoverable": "Konto im Verzeichnis listen und Indexierung durch externe Dienste ermöglichen", "edit_profile.hints.header": "Erlaubte Formate sind PNG, GIF oder JPG. Die Datei darf nicht größer als 2 MB sein. Das Bild wird automatisch auf 1500x500px verkleinert.", "edit_profile.hints.hide_network": "Deine Follower und wem du folgst wird nicht in deinem Profil angezeit.", "edit_profile.hints.locked": "Follower müssen einzeln bestätigt werden.", @@ -409,13 +409,13 @@ "edit_profile.save": "Speichern", "edit_profile.success": "Profil gespeichert", "email_passthru.confirmed.body": "Close this tab and continue the registration process on the {bold} from which you sent this email confirmation.", - "email_passthru.confirmed.heading": "Email Confirmed!", + "email_passthru.confirmed.heading": "E-Mail bestätigt!", "email_passthru.generic_fail.body": "Please request a new email confirmation.", - "email_passthru.generic_fail.heading": "Something Went Wrong", - "email_passthru.token_expired.body": "Your email token has expired. Please request a new email confirmation from the {bold} from which you sent this email confirmation.", - "email_passthru.token_expired.heading": "Token Expired", - "email_passthru.token_not_found.body": "Your email token was not found. Please request a new email confirmation from the {bold} from which you sent this email confirmation.", - "email_passthru.token_not_found.heading": "Invalid Token", + "email_passthru.generic_fail.heading": "Etwas ging schief", + "email_passthru.token_expired.body": "Die Bestätigungsnachricht ist abgelaufen. Bitte eine neue Bestätigung von {bold} beantragen, von wo du diese Nachricht erhalten hast.", + "email_passthru.token_expired.heading": "Token abgelaufen", + "email_passthru.token_not_found.body": "Bestätigungstoken nicht erkannt. Bitte beantrage ein neues Token von {bold} wo du diese Nachricht her hast.", + "email_passthru.token_not_found.heading": "Ungültiges Token", "embed.instructions": "Du kannst diesen Beitrag auf deiner Webseite einbetten, indem du den folgenden Code einfügst.", "embed.preview": "Vorschau:", "emoji_button.activity": "Aktivitäten", @@ -446,7 +446,7 @@ "empty_column.favourited_statuses": "Du hast noch keine Beiträge favorisiert. Favorisierte Beiträge erscheinen hier.", "empty_column.favourites": "Diesen Beitrag hat noch niemand favorisiert. Sobald es jemand tut, wird das hier angezeigt.", "empty_column.filters": "Du hast keine Wörter stummgeschaltet.", - "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.", + "empty_column.follow_recommendations": "Sieht so aus, als gibt es gerade keine Vorschläge für dich. Versuche, über die Suche bekannte Personen zu finden oder schaue dich in aktuellen Hashtags um.", "empty_column.follow_requests": "Du hast noch keine Folgeanfragen. Sobald du eine erhältst, wird sie hier angezeigt.", "empty_column.group": "Diese Gruppe hat noch keine Beiträge. Sobald ein Gruppenmitglied einen Beitrag erstellt, wird er hier angezeigt.", "empty_column.hashtag": "Unter diesem Hashtag gibt es noch nichts.", @@ -459,9 +459,9 @@ "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Zeitleiste aufzufüllen", "empty_column.remote": "There is nothing here! Manually follow users from {instance} to fill it up.", "empty_column.scheduled_statuses": "Bisher wurden keine vorbereiteten Beiträge erstellt. Vorbereitete Beiträge werden hier angezeigt.", - "empty_column.search.accounts": "There are no people results for \"{term}\"", - "empty_column.search.hashtags": "There are no hashtags results for \"{term}\"", - "empty_column.search.statuses": "There are no posts results for \"{term}\"", + "empty_column.search.accounts": "Es wurden keine Nutzer unter \"{term}\" gefunden", + "empty_column.search.hashtags": "Es wurden keine Hashtags unter \"{term}\" gefunden", + "empty_column.search.statuses": "Es wurden keine Posts unter \"{term}\" gefunden", "export_data.actions.export": "Exportieren", "export_data.actions.export_blocks": "Liste geblockter Nutzer expotieren", "export_data.actions.export_follows": "Liste der Nutzer, denen du folgst, exportieren", @@ -481,10 +481,10 @@ "federation_restriction.media_nsfw": "Anhänge als NSFW markiert", "federation_restriction.partial_media_removal": "Partial media removal", "federation_restrictions.empty_message": "{siteTitle} has not restricted any instances.", - "federation_restrictions.explanation_box.message": "Normally servers on the Fediverse can communicate freely. {siteTitle} has imposed restrictions on the following servers.", + "federation_restrictions.explanation_box.message": "Üblicherweise föderieren Dienste im Fediverse. {siteTitle} hat die Föderation für die nachfolgenden Instanzen beschränkt.", "federation_restrictions.explanation_box.title": "Instance-specific policies", "federation_restrictions.not_disclosed_message": "{siteTitle} does not disclose federation restrictions through the API.", - "fediverse_tab.explanation_box.dismiss": "Don't show again", + "fediverse_tab.explanation_box.dismiss": "Nicht mehr anzeigen", "fediverse_tab.explanation_box.explanation": "{site_title} ist Teil des Fediverse, einem Sozialen Netzwerk, das aus tausenden unabhängigen Instanzen (aka \"Servern\") besteht. Die Beiträge, die du hier siehst, stammen überwiegend von anderen Servern. Du kannst auf alle Einträge reagieren oder jeden Server blockieren, der dir nicht gefällt. Die Bezeichnung hinter dem zweiten @-Symbol ist der Name des entsprechenden Servers. Um nur Beiträge von {site_title} zu sehen, wähle {local} aus.", "fediverse_tab.explanation_box.title": "Was ist das Fediverse?", "filters.added": "Filter hinzugefügt.", @@ -492,16 +492,16 @@ "filters.context_hint": "One or multiple contexts where the filter should apply", "filters.filters_list_context_label": "Filter contexts:", "filters.filters_list_delete": "Löschen", - "filters.filters_list_details_label": "Filter settings:", + "filters.filters_list_details_label": "Filtereinstellungen:", "filters.filters_list_drop": "Drop", - "filters.filters_list_hide": "Hide", + "filters.filters_list_hide": "Verstecken", "filters.filters_list_phrase_label": "Stichwort oder Wortfolge:", "filters.filters_list_whole-word": "Whole word", "filters.removed": "Filter gelöscht.", "follow_recommendation.subhead": "Let's get started!", "follow_recommendations.done": "Done", "follow_recommendations.heading": "Folge Nutzern, deren Beiträge du sehen möchtest. Hier sind einige Vorschläge:", - "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!", + "follow_recommendations.lead": "Posts von Usern, denen du folgst, werden in deinem Home-Feed in chronologischer Reihenfolge angezeigt. Los geht's - du kannst anderen später jederzeit wieder entfolgen.", "follow_request.authorize": "Bestätigen", "follow_request.reject": "Ablehnen", "forms.copy": "Kopieren", @@ -528,7 +528,7 @@ "groups.join": "Gruppe beitreten", "groups.leave": "Gruppe verlassen", "groups.removed_accounts": "Entfernte Accounts", - "groups.sidebar-panel.item.no_recent_activity": "No recent activity", + "groups.sidebar-panel.item.no_recent_activity": "Keine kürzliche Aktivität", "groups.sidebar-panel.item.view": "Neue Beiträge", "groups.sidebar-panel.show_all": "Alle anzeigen", "groups.sidebar-panel.title": "Gruppenmitgliedschaften", @@ -543,7 +543,7 @@ "header.login.label": "Anmelden", "header.login.password.label": "Password", "header.login.username.placeholder": "Email oder Nutzername", - "header.register.label": "Anmelden", + "header.register.label": "Registrieren", "home.column_settings.show_direct": "Direktnachricht anzeigen", "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen", "home.column_settings.show_replies": "Antworten anzeigen", @@ -571,10 +571,10 @@ "intervals.full.minutes": "{number, plural, one {# Minute} other {# Minuten}}", "introduction.federation.action": "Weiter", "introduction.federation.home.headline": "Home", - "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!", + "introduction.federation.home.text": "Posts von Konten, denen du folgst, werden in deinem Home-Feed erscheinen. Du kannst jedem auf deiner Instanz folgen!!", "introduction.interactions.action": "Finish tutorial!", - "introduction.interactions.favourite.headline": "Favorite", - "introduction.interactions.favourite.text": "You can save a post for later, and let the author know that you liked it, by favoriting it.", + "introduction.interactions.favourite.headline": "Favorisieren", + "introduction.interactions.favourite.text": "Du kannst einen Beitrag für später speichern und den Autor wissen lassen, dass er Ihnen gefallen hat, indem du ihm ein Like hinterlässt.", "introduction.interactions.reblog.headline": "Teilen", "introduction.interactions.reblog.text": "You can share other people's posts with your followers by reposting them.", "introduction.interactions.reply.headline": "Antworten", @@ -633,37 +633,37 @@ "login.fields.instance_label": "Instance", "login.fields.instance_placeholder": "example.com", "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes", - "login.fields.otp_code_label": "Two-factor code:", + "login.fields.otp_code_label": "Zwei-Faktoren-Code:", "login.fields.password_placeholder": "Passwort", - "login.fields.username_label": "Email or username", + "login.fields.username_label": "E-Mail oder Nutzername", "login.log_in": "Anmelden", "login.otp_log_in": "OTP Login", "login.reset_password_hint": "Probleme beim Anmelden?", "login.sign_in": "Sign in", "media_gallery.toggle_visible": "Sichtbarkeit umschalten", - "media_panel.empty_message": "No media found.", + "media_panel.empty_message": "Keine Medien gefunden.", "media_panel.title": "Media", - "mfa.confirm.success_message": "MFA confirmed", - "mfa.disable.success_message": "MFA disabled", - "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:", - "mfa.mfa_setup.code_hint": "Enter the code from your two-factor app.", + "mfa.confirm.success_message": "MFA bestätigt", + "mfa.disable.success_message": "MFA abgeschaltet", + "mfa.mfa_disable_enter_password": "Aktuelles Passwort eingäben, um Zwei-Faktoren-Authentifizierung zu deaktivieren:", + "mfa.mfa_setup.code_hint": "Bitte den Code aus der 2FA-App eingeben.", "mfa.mfa_setup.code_placeholder": "Code", - "mfa.mfa_setup.password_hint": "Enter your current password to confirm your identity.", - "mfa.mfa_setup.password_placeholder": "Password", - "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:", + "mfa.mfa_setup.password_hint": "Aktuelles Passwort zur Bestätigung eingeben.", + "mfa.mfa_setup.password_placeholder": "Passwort", + "mfa.mfa_setup_scan_description": "Nutze eine 2FA-App, scanne den QR-Code oder gibt diesen Schlüsseltext ein:", "mfa.mfa_setup_scan_title": "Scan", - "mfa.mfa_setup_verify_title": "Verify", - "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.", - "mfa.otp_enabled_title": "OTP Enabled", - "mfa.setup_recoverycodes": "Recovery codes", - "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.", - "migration.fields.acct.label": "Handle of the new account", + "mfa.mfa_setup_verify_title": "Bestätigen", + "mfa.otp_enabled_description": "Du hast die Zwei-Faktoren-Authentifizierung per OTP aktiviert.", + "mfa.otp_enabled_title": "OTP eingeschaltet", + "mfa.setup_recoverycodes": "Sicherungs-Keys", + "mfa.setup_warning": "Notiere dir diese Codes an einem sicheren Platz - andernfalls wirst du sie nicht mehr auffinden und aus deinem Konto ausgesperrt.", + "migration.fields.acct.label": "Handle des neuen Kontos", "migration.fields.acct.placeholder": "username@domain", - "migration.fields.confirm_password.label": "Current password", - "migration.hint": "This will move your followers to the new account. No other data will be moved. To perform migration, you need to {link} on your new account first.", - "migration.hint.link": "create an account alias", - "migration.move_account.fail": "Account migration failed.", - "migration.move_account.success": "Account successfully moved.", + "migration.fields.confirm_password.label": "Aktuelles Passwort", + "migration.hint": "Damit werden deine Follower auf dein neues Konto übertragen - weitere Daten werden nicht migriert. Zur Bestätigung ist es nötig, {link} auf deinem neuen Konto zunächst zu bestätigen.", + "migration.hint.link": "Neues Alias erstellen", + "migration.move_account.fail": "Account-Übertragung fehlgeschlagen.", + "migration.move_account.success": "Account-Übertragung fehlgeschlagen.", "migration.submit": "Move followers", "missing_description_modal.cancel": "Abbrechen", "missing_description_modal.continue": "Senden", @@ -702,8 +702,8 @@ "navigation_bar.preferences": "Einstellungen", "navigation_bar.profile_directory": "Profilverzeichnis", "navigation_bar.security": "Sicherheit", - "navigation_bar.soapbox_config": "Soapbox config", - "notification.birthday": "{name} has a birthday today", + "navigation_bar.soapbox_config": "Soapbox Konfiguration", + "notification.birthday": "{name} hat Geburtstag!", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", "notification.pleroma:chat_mention": "{name} hat dir eine Nachricht gesendet", @@ -718,7 +718,7 @@ "notification.status": "{name} just posted", "notifications.clear": "Benachrichtigungen löschen", "notifications.clear_confirmation": "Bist du dir sicher, dass du alle Benachrichtigungen löschen möchtest?", - "notifications.clear_heading": "Clear notifications", + "notifications.clear_heading": "Benachrichtigungen löschen", "notifications.column_settings.alert": "Desktop-Benachrichtigungen", "notifications.column_settings.birthdays.category": "Geburtstage", "notifications.column_settings.birthdays.show": "Geburtstagserinnerungen anzeigen", @@ -786,12 +786,12 @@ "preferences.fields.auto_play_gif_label": "Animierte GIFs automatisch abspielen", "preferences.fields.autoload_more_label": "Automatically load more items when scrolled to the bottom of the page", "preferences.fields.autoload_timelines_label": "Automatically load new posts when scrolled to the top of the page", - "preferences.fields.boost_modal_label": "Show confirmation dialog before reposting", - "preferences.fields.delete_modal_label": "Show confirmation dialog before deleting a post", - "preferences.fields.display_media.default": "Hide media marked as sensitive", - "preferences.fields.display_media.hide_all": "Always hide media", - "preferences.fields.display_media.show_all": "Always show media", - "preferences.fields.expand_spoilers_label": "Always expand posts marked with content warnings", + "preferences.fields.boost_modal_label": "Bestätigungsdialog öffnen, bevor ein Beitrag geboostet wird", + "preferences.fields.delete_modal_label": "Bestätigungsdialog öffnen, bevor ein Beitrag gelöscht wird", + "preferences.fields.display_media.default": "Als verstörend gekennzeichnete Medien grundsätzlich anzeigen", + "preferences.fields.display_media.hide_all": "Medien grundsätzlich ausblenden", + "preferences.fields.display_media.show_all": "Medien grundsätzlich anzeigen", + "preferences.fields.expand_spoilers_label": "Als verstörend gekennzeichnete Posts grundsätzlich ausklappen", "preferences.fields.language_label": "Sprache", "preferences.fields.media_display_label": "Media display", "preferences.hints.feed": "In your home feed", @@ -804,29 +804,29 @@ "privacy.public.short": "Öffentlich", "privacy.unlisted.long": "Wird in öffentlichen Zeitleisten nicht gezeigt", "privacy.unlisted.short": "Nicht gelistet", - "profile_dropdown.add_account": "Add an existing account", - "profile_dropdown.logout": "Log out @{acct}", + "profile_dropdown.add_account": "Bestehendes Konto hinzufügen", + "profile_dropdown.logout": "Aus @{acct} abmelden", "profile_fields_panel.title": "Profile fields", - "public.column_settings.title": "Fediverse timeline settings", - "reactions.all": "All", + "public.column_settings.title": "Einstellungen der globalen Timeline", + "reactions.all": "Alle", "regeneration_indicator.label": "Laden…", "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!", - "register_invite.lead": "Complete the form below to create an account.", - "register_invite.title": "You've been invited to join {siteTitle}!", + "register_invite.lead": "Fülle folgendes Formular aus, bevor dein Konto erstellt wird.", + "register_invite.title": "Du wurdest zu {siteTitle} eingeladen!", "registration.agreement": "Ich akzeptiere die {tos}.", - "registration.captcha.hint": "Click the image to get a new captcha", - "registration.closed_message": "{instance} is not accepting new members", - "registration.closed_title": "Registrations Closed", - "registration.confirmation_modal.close": "Close", + "registration.captcha.hint": "Bild anklicken, um neues Captcha zu erhalten", + "registration.closed_message": "{instance} nimmt keine neuen Mitglieder auf", + "registration.closed_title": "Registrierungen geschlossen", + "registration.confirmation_modal.close": "Schließen", "registration.fields.confirm_placeholder": "Passwort (wiederholen)", "registration.fields.email_placeholder": "Emailadresse", "registration.fields.password_placeholder": "Passwort", "registration.fields.username_hint": "Only letters, numbers, and underscores are allowed.", - "registration.fields.username_placeholder": "Nutzername", + "registration.fields.username_placeholder": "Benutzername", "registration.newsletter": "Newsletter abonnieren.", "registration.password_mismatch": "Die eingegebenen Passwörter stimmen nicht überein", - "registration.reason": "Why do you want to join?", - "registration.reason_hint": "This will help us review your application", + "registration.reason": "Warum möchtest du ein Teil von uns werden?", + "registration.reason_hint": "Damit hilfst du uns, über deinen Antrag zu entscheiden", "registration.sign_up": "Registrieren", "registration.tos": "Nutzungsbedingungen", "registration.username_unavailable": "Der gewählte Nutzername ist bereits vorhanden.", @@ -846,15 +846,15 @@ "remote_interaction.divider": "or", "remote_interaction.favourite": "Proceed to like", "remote_interaction.favourite_title": "Like a post remotely", - "remote_interaction.follow": "Proceed to follow", + "remote_interaction.follow": "Fortsetzen, um zu folgen", "remote_interaction.follow_title": "Follow {user} remotely", "remote_interaction.poll_vote": "Proceed to vote", "remote_interaction.poll_vote_title": "Vote in a poll remotely", - "remote_interaction.reblog": "Proceed to repost", + "remote_interaction.reblog": "Boost bestätigen", "remote_interaction.reblog_title": "Reblog a post remotely", - "remote_interaction.reply": "Proceed to reply", + "remote_interaction.reply": "Antwort bestätigen", "remote_interaction.reply_title": "Reply to a post remotely", - "remote_interaction.user_not_found_error": "Couldn't find given user", + "remote_interaction.user_not_found_error": "Konto nicht gefunden", "remote_timeline.filter_message": "You are viewing the timeline of {instance}.", "reply_indicator.cancel": "Abbrechen", "reply_mentions.account.add": "Add to mentions", @@ -873,8 +873,8 @@ "reset_password.header": "Set New Password", "schedule.post_time": "Post Date/Time", "schedule.remove": "Remove schedule", - "schedule_button.add_schedule": "Schedule post for later", - "schedule_button.remove_schedule": "Post immediately", + "schedule_button.add_schedule": "Für späteres Absenden planen", + "schedule_button.remove_schedule": "Sofort posten", "scheduled_status.cancel": "Cancel", "search.action": "Search for “{query}”", "search.placeholder": "Suche", @@ -883,11 +883,11 @@ "search_results.statuses": "Beiträge", "search_results.top": "Top", "security.codes.fail": "Failed to fetch backup codes", - "security.confirm.fail": "Incorrect code or password. Try again.", + "security.confirm.fail": "Falscher Code oder falsches Passwort. Bitte erneut versuchen.", "security.delete_account.fail": "Account deletion failed.", "security.delete_account.success": "Das Konto wurde erfolgreich gelöscht.", - "security.disable.fail": "Incorrect password. Try again.", - "security.disable_mfa": "Disable", + "security.disable.fail": "Falsches Passwort. Versuche es erneut.", + "security.disable_mfa": "Abschalten", "security.fields.email.label": "Emailaddresse", "security.fields.new_password.label": "Neues Passwort", "security.fields.old_password.label": "Bisheriges Passwort", @@ -897,33 +897,33 @@ "security.headers.tokens": "Sessions", "security.headers.update_email": "Email ändern", "security.headers.update_password": "Passwort ändern", - "security.mfa": "Set up 2-Factor Auth", + "security.mfa": "Zwei-Faktoren-Authentifizierung einstellen", "security.mfa_enabled": "You have multi-factor authentication set up with OTP.", - "security.mfa_header": "Authorization Methods", - "security.mfa_setup_hint": "Configure multi-factor authentication with OTP", + "security.mfa_header": "Authentifizierungsmethoden", + "security.mfa_setup_hint": "OTP-Zwei-Faktoren-Authentifizierung konfigurieren", "security.qr.fail": "Failed to fetch setup key", "security.submit": "Änderungen speichern", "security.submit.delete": "Konto löschen", - "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", + "security.text.delete": "Gib dein Passwort ein, um dein Konto zu löschen. Diese Löschung ist dauerhaft und kann nicht rückgängig gemacht werden. Dein Konto wird von diesem Server aus gelöscht und eine Löschungsanfrage wird an andere Server gesendet. Es ist nicht garantiert, dass alle Instanzen dein Konto löschen..", "security.tokens.revoke": "Widerrufen", "security.update_email.fail": "Änderung der Emailadresse fehlgeschlagen.", "security.update_email.success": "Die neue Emailadresse wurde gespeichert.", "security.update_password.fail": "Änderung des Passwortes fehlgeschlagen.", "security.update_password.success": "Das Passwort wurde erfolgreich geändert.", - "settings.change_email": "Change Email", - "settings.change_password": "Change Password", - "settings.configure_mfa": "Configure MFA", - "settings.delete_account": "Delete Account", + "settings.change_email": "E-Mail ändern", + "settings.change_password": "Passwort ändern", + "settings.configure_mfa": "MFA konfigurieren", + "settings.delete_account": "Konto löschen", "settings.edit_profile": "Edit Profile", - "settings.preferences": "Preferences", - "settings.profile": "Profile", - "settings.save.success": "Your preferences have been saved!", - "settings.security": "Security", - "settings.settings": "Settings", + "settings.preferences": "Einstellungen", + "settings.profile": "Profil", + "settings.save.success": "Einstellungen wurden gespeichert!", + "settings.security": "Sicherheit", + "settings.settings": "Einstellungen", "signup_panel.subtitle": "Jetzt anmelden, um mitzureden.", "signup_panel.title": "Neu auf {site_title}?", - "snackbar.view": "View", - "soapbox_config.authenticated_profile_hint": "Users must be logged-in to view replies and media on user profiles.", + "snackbar.view": "Anzeigen", + "soapbox_config.authenticated_profile_hint": "Nur angemeldete Nutzer können Antworten und Medien auf Nutzerprofilen sehen.", "soapbox_config.authenticated_profile_label": "Profiles require authentication", "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Copyright footer", "soapbox_config.crypto_address.meta_fields.address_placeholder": "Address", @@ -934,21 +934,21 @@ "soapbox_config.display_fqn_label": "Display domain (eg @user@domain) for local accounts.", "soapbox_config.fields.accent_color_label": "Accent color", "soapbox_config.fields.brand_color_label": "Brand color", - "soapbox_config.fields.crypto_address.add": "Add new crypto address", - "soapbox_config.fields.crypto_addresses_label": "Cryptocurrency addresses", + "soapbox_config.fields.crypto_address.add": "Cryptocoin-Adresse hinzufügen", + "soapbox_config.fields.crypto_addresses_label": "Cryptocoin-Adresse", "soapbox_config.fields.home_footer.add": "Add new Home Footer Item", "soapbox_config.fields.home_footer_fields_label": "Home footer items", "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", - "soapbox_config.fields.theme_label": "Default theme", + "soapbox_config.fields.theme_label": "Standard-Theme", "soapbox_config.greentext_label": "Enable greentext support", "soapbox_config.hints.crypto_addresses": "Add cryptocurrency addresses so users of your site can donate to you. Order matters, and you must use lowercase ticker values.", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", - "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", + "soapbox_config.hints.logo": "SVG. Maximal 2 MB. Die Darstellung erfolgt mit 50px Höhe, das Seitenverhältnis wird beibehalten", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the right panel of the timelines page.", "soapbox_config.hints.promo_panel_icons": "{ link }", - "soapbox_config.hints.promo_panel_icons.link": "Soapbox Icons List", + "soapbox_config.hints.promo_panel_icons.link": "Soapbox Icon-Liste", "soapbox_config.home_footer.meta_fields.label_placeholder": "Label", "soapbox_config.home_footer.meta_fields.url_placeholder": "URL", "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", @@ -957,13 +957,13 @@ "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Speichern", - "soapbox_config.saved": "Soapbox config saved!", - "soapbox_config.single_user_mode_hint": "Front page will redirect to a given user profile.", + "soapbox_config.saved": "Soapbox-Konfiruation gespeichert!", + "soapbox_config.single_user_mode_hint": "Startseite leitet zum Nutzerprofil weiter.", "soapbox_config.single_user_mode_label": "Single user mode", "soapbox_config.single_user_mode_profile_hint": "@handle", "soapbox_config.single_user_mode_profile_label": "Main user handle", - "soapbox_config.verified_can_edit_name_label": "Allow verified users to edit their own display name.", - "status.actions.more": "More", + "soapbox_config.verified_can_edit_name_label": "Verifizierten Nutzern die Änderung des Anzeigenamens gestatten.", + "status.actions.more": "Weitere Einstellungen", "status.admin_account": "Öffne Moderationsoberfläche für @{name}", "status.admin_status": "Öffne Beitrag in der Moderationsoberfläche", "status.block": "@{name} blockieren", @@ -989,13 +989,13 @@ "status.pin": "Im Profil anheften", "status.pinned": "Angehefteter Beitrag", "status.quote": "Beitrag zitieren", - "status.reactions.cry": "Sad", + "status.reactions.cry": "Traurig", "status.reactions.empty": "No one has reacted to this post yet. When someone does, they will show up here.", - "status.reactions.heart": "Love", + "status.reactions.heart": "Liebe", "status.reactions.laughing": "Haha", "status.reactions.like": "Like", "status.reactions.open_mouth": "Wow", - "status.reactions.weary": "Weary", + "status.reactions.weary": "Überdrüssig", "status.reactions_expand": "Emoji auswählen", "status.read_more": "Mehr lesen", "status.reblog": "Teilen", diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index f2eaf32c8..b7c280137 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -790,6 +790,7 @@ "poll_button.remove_poll": "Remove poll", "pre_header.close": "Close", "preferences.fields.auto_play_gif_label": "Auto-play animated GIFs", + "preferences.fields.auto_play_video_label": "Auto-play videos", "preferences.fields.autoload_more_label": "Automatically load more items when scrolled to the bottom of the page", "preferences.fields.autoload_timelines_label": "Automatically load new posts when scrolled to the top of the page", "preferences.fields.boost_modal_label": "Show confirmation dialog before reposting", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index 49a8e0491..33a652392 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publish", diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json index 7b20f137a..63b242ee1 100644 --- a/app/soapbox/locales/he.json +++ b/app/soapbox/locales/he.json @@ -4,7 +4,7 @@ "accordion.expand": "הרחבה", "account.add_or_remove_from_list": "הוסף או הסר מהרשימות", "account.badges.bot": "בוט", - "account.birthday": "Born {date}", + "account.birthday": "נולד ב-{date}", "account.birthday_today": "Birthday is today!", "account.block": "חסימת @{name}", "account.block_domain": "להסתיר הכל מהקהילה {domain}", @@ -122,11 +122,11 @@ "admin_nav.dashboard": "לוח מחוונים", "admin_nav.reports": "דיווחים", "alert.unexpected.body": "We're sorry for the interruption. If the problem persists, please reach out to our support team. You may also try to {clearCookies} (this will log you out).", - "alert.unexpected.browser": "Browser", + "alert.unexpected.browser": "דפדפן", "alert.unexpected.clear_cookies": "נקה קובצי 'עוגיות' ונתוני דפדפן", "alert.unexpected.links.help": "Help Center", - "alert.unexpected.links.status": "Status", - "alert.unexpected.links.support": "Support", + "alert.unexpected.links.status": "סטטוס", + "alert.unexpected.links.support": "תמיכה", "alert.unexpected.message": "אירעה שגיאה בלתי צפויה.", "alert.unexpected.return_home": "חזור הביתה", "alert.unexpected.title": "אופס!", @@ -154,8 +154,8 @@ "backups.empty_message": "לא נמצאו גיבויים. {action}", "backups.empty_message.action": "האם ליצור אחד עכשיו?", "backups.pending": "בהמתנה", - "beta.also_available": "Available in:", - "birthday_panel.title": "Birthdays", + "beta.also_available": "זמין ב:", + "birthday_panel.title": "ימי הולדת", "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה", "bundle_column_error.body": "משהו השתבש בעת הצגת הרכיב הזה.", "bundle_column_error.retry": "לנסות שוב", @@ -257,7 +257,7 @@ "column_forbidden.body": "אין לך הרשאה לגשת לדף זה.", "column_forbidden.title": "אסור", "column_header.show_settings": "הצגת העדפות", - "common.cancel": "Cancel", + "common.cancel": "בטל", "community.column_settings.media_only": "רק מדיה", "community.column_settings.title": "הגדרות ציר זמן מקומי", "compose.character_counter.title": "השתמת ב{chars} מתוך {maxChars} תווים", @@ -345,21 +345,21 @@ "crypto_donate_panel.heading": "תרום מטבעות קריפטו", "crypto_donate_panel.intro.message": "{siteTitle} מקבל תרומות של מטבעות קריפטוגרפיים כדי לממן את השירות שלנו. תודה על תמיכתך!", "datepicker.hint": "מתוכנן לפרסם ב...", - "datepicker.next_month": "Next month", - "datepicker.next_year": "Next year", - "datepicker.previous_month": "Previous month", - "datepicker.previous_year": "Previous year", - "developers.challenge.answer_label": "Answer", - "developers.challenge.answer_placeholder": "Your answer", - "developers.challenge.fail": "Wrong answer", + "datepicker.next_month": "חודש הבא", + "datepicker.next_year": "שנה הבאה", + "datepicker.previous_month": "חודש קודם", + "datepicker.previous_year": "שנה קודמת", + "developers.challenge.answer_label": "תשובה", + "developers.challenge.answer_placeholder": "התשובה שלך", + "developers.challenge.fail": "תשובה שגויה", "developers.challenge.message": "What is the result of calling {function}?", "developers.challenge.submit": "Become a developer", - "developers.challenge.success": "You are now a developer", + "developers.challenge.success": "אתה עכשיו מפתח", "developers.leave": "You have left developers", "developers.navigation.app_create_label": "צור אפליקציה", "developers.navigation.intentional_error_label": "הפעלת שגיאה", "developers.navigation.leave_developers_label": "Leave developers", - "developers.navigation.network_error_label": "Network error", + "developers.navigation.network_error_label": "שגיאת רשת", "developers.navigation.settings_store_label": "Settings store", "developers.navigation.test_timeline_label": "Test timeline", "developers.settings_store.hint": "It is possible to directly edit your user settings here. BE CAREFUL! Editing this section can break your account, and you will only be able to recover through the API.", @@ -375,7 +375,7 @@ "edit_federation.save": "שמור", "edit_federation.success": "הפדרציה של {host} עודכנה", "edit_federation.unlisted": "לכפות פוסטים כלא רשומים", - "edit_password.header": "Change Password", + "edit_password.header": "שנה סיסמא", "edit_profile.error": "עדכון הפרופיל נכשל", "edit_profile.fields.accepts_email_list_label": "הירשם לעדכונים", "edit_profile.fields.avatar_label": "אווטאר", @@ -395,9 +395,9 @@ "edit_profile.fields.meta_fields.content_placeholder": "תוכן", "edit_profile.fields.meta_fields.label_placeholder": "תווית", "edit_profile.fields.stranger_notifications_label": "חסום התראות מזרים", - "edit_profile.fields.website_label": "Website", + "edit_profile.fields.website_label": "אתר", "edit_profile.fields.website_placeholder": "Display a Link", - "edit_profile.header": "Edit Profile", + "edit_profile.header": "ערוך פרופיל", "edit_profile.hints.accepts_email_list": "הצטרפו לעדכוני חדשות ועדכונים שיווקיים.", "edit_profile.hints.avatar": "PNG, GIF או JPG. יוקטן ל-{size}", "edit_profile.hints.bot": "חשבון זה מבצע בעיקר פעולות אוטומטיות וייתכן שלא יהיה פיקוח", @@ -409,13 +409,13 @@ "edit_profile.save": "שמירה", "edit_profile.success": "הפרופיל נשמר!", "email_passthru.confirmed.body": "Close this tab and continue the registration process on the {bold} from which you sent this email confirmation.", - "email_passthru.confirmed.heading": "Email Confirmed!", + "email_passthru.confirmed.heading": "אימייל אומת!", "email_passthru.generic_fail.body": "Please request a new email confirmation.", - "email_passthru.generic_fail.heading": "Something Went Wrong", + "email_passthru.generic_fail.heading": "משהו השתבש", "email_passthru.token_expired.body": "Your email token has expired. Please request a new email confirmation from the {bold} from which you sent this email confirmation.", - "email_passthru.token_expired.heading": "Token Expired", + "email_passthru.token_expired.heading": "טוקן פג תוקף", "email_passthru.token_not_found.body": "Your email token was not found. Please request a new email confirmation from the {bold} from which you sent this email confirmation.", - "email_passthru.token_not_found.heading": "Invalid Token", + "email_passthru.token_not_found.heading": "טוקן לא תקין", "embed.instructions": "ניתן להטמיע את ההודעה באתרך ע\"י העתקת הקוד שלהלן.", "embed.preview": "דוגמא כיצד זה יראה:", "emoji_button.activity": "פעילות", @@ -564,8 +564,8 @@ "import_data.success.blocks": "חסימות יובאו בהצלחה", "import_data.success.followers": "מעקבים יובאו בהצלחה", "import_data.success.mutes": "השתקות יובאו בהצלחה", - "input.password.hide_password": "Hide password", - "input.password.show_password": "Show password", + "input.password.hide_password": "הסתר סיסמא", + "input.password.show_password": "הצג סיסמא", "intervals.full.days": "{number, plural, one {# יום} other {# ימים}}", "intervals.full.hours": "{number, plural, one {# שעה} other {# שעות}}", "intervals.full.minutes": "{number, plural, one {# דקה} other {# דקות}}", @@ -635,7 +635,7 @@ "login.fields.otp_code_hint": "הזן את קוד שני הגורמים שנוצר על ידי אפליקציות הטלפון שלך או השתמש באחד מקודי השחזור שלך", "login.fields.otp_code_label": "קוד דו גורמי:", "login.fields.password_placeholder": "סיסמא", - "login.fields.username_label": "Email or username", + "login.fields.username_label": "שם משתמש או אימייל", "login.log_in": "התחברות", "login.otp_log_in": "התחברות OTP", "login.reset_password_hint": "בעיה בהתחברות?", @@ -659,12 +659,12 @@ "mfa.setup_warning": "רשום את הקודים האלה או שמור אותם במקום מאובטח - אחרת לא תראה אותם שוב. אם תאבד את הגישה לאפליקציית 2FA ולקודי השחזור שלך תינעל מחוץ לחשבון שלך.", "migration.fields.acct.label": "Handle of the new account", "migration.fields.acct.placeholder": "username@domain", - "migration.fields.confirm_password.label": "Current password", + "migration.fields.confirm_password.label": "סיסמא נוכחית", "migration.hint": "This will move your followers to the new account. No other data will be moved. To perform migration, you need to {link} on your new account first.", "migration.hint.link": "create an account alias", - "migration.move_account.fail": "Account migration failed.", - "migration.move_account.success": "Account successfully moved.", - "migration.submit": "Move followers", + "migration.move_account.fail": "העברת חשבון נכשלה.", + "migration.move_account.success": "חשבון הועבר בהצלחה.", + "migration.submit": "העבר עוקבים", "missing_description_modal.cancel": "בטל", "missing_description_modal.continue": "שלח", "missing_description_modal.description": "המשך בכל זאת?", @@ -720,8 +720,8 @@ "notifications.clear_confirmation": "להסיר את כל ההתראות? בטוח?", "notifications.clear_heading": "Clear notifications", "notifications.column_settings.alert": "התראות לשולחן העבודה", - "notifications.column_settings.birthdays.category": "Birthdays", - "notifications.column_settings.birthdays.show": "Show birthday reminders", + "notifications.column_settings.birthdays.category": "ימי הולדת", + "notifications.column_settings.birthdays.show": "הראה תזכורות לימי הולדת", "notifications.column_settings.emoji_react": "הגבות אימוג'י:", "notifications.column_settings.favourite": "מחובבים:", "notifications.column_settings.filter_bar.advanced": "הצג את כל הקטגוריות", @@ -891,7 +891,7 @@ "security.fields.email.label": "אימייל", "security.fields.new_password.label": "סיסמא חדשה", "security.fields.old_password.label": "סיסמא נוכחית", - "security.fields.password.label": "Password", + "security.fields.password.label": "סיסמא", "security.fields.password_confirmation.label": "סיסמא חדשה (שוב)", "security.headers.delete": "מחק חשבון", "security.headers.tokens": "הפעלות", @@ -910,16 +910,16 @@ "security.update_email.success": "האימייל עודכן בהצלחה.", "security.update_password.fail": "עדכון הסיסמא נכשל.", "security.update_password.success": "הסיסמה עודכנה בהצלחה.", - "settings.change_email": "Change Email", - "settings.change_password": "Change Password", + "settings.change_email": "שנה אימייל", + "settings.change_password": "שנה סיסמא", "settings.configure_mfa": "Configure MFA", - "settings.delete_account": "Delete Account", - "settings.edit_profile": "Edit Profile", + "settings.delete_account": "מחק חשבון", + "settings.edit_profile": "ערוך פרופיל", "settings.preferences": "Preferences", - "settings.profile": "Profile", + "settings.profile": "פרופיל", "settings.save.success": "Your preferences have been saved!", "settings.security": "Security", - "settings.settings": "Settings", + "settings.settings": "הגדרות", "signup_panel.subtitle": "הירשם כעת כדי לדון.", "signup_panel.title": "חדש ל{site_title}?", "snackbar.view": "View", @@ -1029,12 +1029,12 @@ "tabs_bar.dashboard": "לוח מחוונים", "tabs_bar.fediverse": "פדרציה", "tabs_bar.home": "בית", - "tabs_bar.more": "More", + "tabs_bar.more": "עוד", "tabs_bar.notifications": "התראות", "tabs_bar.post": "פוסט", - "tabs_bar.profile": "Profile", + "tabs_bar.profile": "פרופיל", "tabs_bar.search": "חיפוש", - "tabs_bar.settings": "Settings", + "tabs_bar.settings": "הגדרות", "tabs_bar.theme_toggle_dark": "עבור לערכת נושא כהה", "tabs_bar.theme_toggle_light": "עבור לערכת נושא בהירה", "time_remaining.days": "{number, plural, one {# יום} other {# ימים}} נותרו", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index 8c03d6c75..1d771918f 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publish", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index 35a0d7436..f621b06f1 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publish", diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json index 007915b13..6daeac5a4 100644 --- a/app/soapbox/locales/hy.json +++ b/app/soapbox/locales/hy.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Թթել", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index 36a86bc2c..603ec4ec4 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Siflar", diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json index 448f4cae9..a89db38fb 100644 --- a/app/soapbox/locales/ka.json +++ b/app/soapbox/locales/ka.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "ტუტი", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index 9fdc5d331..e5d095712 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publish", diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json index d1cb0d41c..9d288dc27 100644 --- a/app/soapbox/locales/lv.json +++ b/app/soapbox/locales/lv.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publicēt", diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json index 01e5ae407..a6a935132 100644 --- a/app/soapbox/locales/mk.json +++ b/app/soapbox/locales/mk.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publish", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index 790f63a45..83e85993b 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Publish", diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json index 69979e9ca..e055e3d3a 100644 --- a/app/soapbox/locales/no.json +++ b/app/soapbox/locales/no.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Tut", diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 9d4471af2..bc583c96c 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -42,6 +42,7 @@ "account.posts": "Wpisy", "account.posts_with_replies": "Wpisy i odpowiedzi", "account.profile": "Profil", + "account.profile_external": "Wyświetl profil na {domain}", "account.register": "Rejestracja", "account.remote_follow": "Obserwuj zdalnie", "account.remove_from_followers": "Usuń tego obserwującego", @@ -334,6 +335,8 @@ "compose_form.spoiler.marked": "Tekst jest ukryty za ostrzeżeniem", "compose_form.spoiler.unmarked": "Tekst nie jest ukryty", "compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości", + "compose_form.spoiler_remove": "Usuń zaznaczenie jako wrażliwe", + "compose_form.spoiler_title": "Treści wrażliwe", "confirmation_modal.cancel": "Anuluj", "confirmation_resend.fields.username_placeholder": "Adres e-mail", "confirmation_resend.request": "Wyślij ponownie instrukcje potwierdzania", @@ -386,6 +389,9 @@ "confirmations.remove_from_followers.message": "Czy na pewno chcesz usunąć {name} ze swoich obserwowanych?", "confirmations.reply.confirm": "Odpowiedz", "confirmations.reply.message": "W ten sposób utracisz wpis który obecnie tworzysz. Czy na pewno chcesz to zrobić?", + "confirmations.revoke_session.confirm": "Unieważnij", + "confirmations.revoke_session.heading": "Uniewaznij obecną sesję", + "confirmations.revoke_session.message": "Zaraz unieważnisz swoją obecną sesję. Zostaniesz wylogowywany(-a).", "confirmations.scheduled_status_delete.confirm": "Anuluj", "confirmations.scheduled_status_delete.heading": "Anuluj zaplanowany wpis", "confirmations.scheduled_status_delete.message": "Czy na pewno chcesz anulować ten zaplanowany wpis?", @@ -475,6 +481,7 @@ "email_passthru.fail.expired": "Token z maila wygasł.", "email_passthru.fail.generic": "Nie udało się potwierdzić adresu e-mail", "email_passthru.fail.not_found": "Token z maila jest nieprawidłowy.", + "email_passthru.fail.invalid_token": "Wprowadzony token jest nieprawidłowy", "email_passthru.generic_fail.body": "Poproś o nowe potwierdzenie adresu e-mail.", "email_passthru.generic_fail.heading": "Coś poszło nie tak", "email_passthru.success": "Twój adres e-mail został zweryfikowany", @@ -485,6 +492,8 @@ "email_verification.exists": "Ten adres e-mail już jest zajęty", "email_verification.fail": "Nie udało się zażądać weryfikacji e-mail", "email_verification.header": "Wprowadź adres e-mail", + "email_verification.success": "Pomyślnie wysłano weryfikacyjny e-mail.", + "email_verification.taken": "jest zajęty", "embed.instructions": "Osadź ten wpis na swojej stronie wklejając poniższy kod.", "embed.preview": "Tak będzie to wyglądać:", "emoji_button.activity": "Aktywność", @@ -903,6 +912,7 @@ "poll_button.remove_poll": "Usuń głosowanie", "pre_header.close": "Zamknij", "preferences.fields.auto_play_gif_label": "Automatycznie odtwarzaj anonimowe GIF-y", + "preferences.fields.auto_play_video_label": "Automatycznie odtwarzaj filmy", "preferences.fields.autoload_more_label": "Automatycznie ładuj więcej wpisów po przewinięciu na dół strony", "preferences.fields.autoload_timelines_label": "Automatycznie załaduj nowe wpisy po przewinięciu na szczyt strony", "preferences.fields.boost_modal_label": "Pokazuj prośbę o potwierdzenie przed podbiciem", @@ -981,6 +991,7 @@ "registrations.success": "Witamy na {siteTitle}!", "registrations.tagline": "Media społecznościowe, które nie wykluczają", "registrations.unprocessable_entity": "Ta nazwa użytkownika jest już zajęta.", + "registrations.username.hint": "Może zawierać wyłącznie A-Z, 0-9 i podkreślniki", "relative_time.days": "{number} dni", "relative_time.hours": "{number} godz.", "relative_time.just_now": "teraz", @@ -1012,6 +1023,7 @@ "reply_mentions.account.remove": "Usuń z wspomnianych", "reply_mentions.more": "{count} więcej", "reply_mentions.reply": "W odpowiedzi do {accounts}", + "reply_mentions.reply.hoverable": "W odpowiedzi do {accounts}", "reply_mentions.reply_empty": "W odpowiedzi na wpis", "report.block": "Zablokuj {target}", "report.block_hint": "Czy chcesz też zablokować to konto?", @@ -1092,8 +1104,9 @@ "signup_panel.subtitle": "Zarejestruj się, aby przyłączyć się do dyskusji.", "signup_panel.title": "Nowi na {site_title}?", "site_preview.preview": "Podgląd", - "sms_verification.header": "Wprowadź numer telefonu", + "sms_verification.expired": "Twój token SMS wygasł.", "sms_verification.fail": "Nie udało się wysłać kodu weryfikującego na Twój numer telefonu.", + "sms_verification.header": "Wprowadź numer telefonu", "sms_verification.invalid": "Twój token SMS wygasł.", "sms_verification.modal.enter_code": "Wysłaliśmy Ci 6-cyfrowy kod SMS-em. Wprowadź go poniżej.", "sms_verification.modal.resend_code": "Wysłać kod weryfikacyjny ponownie?", @@ -1213,10 +1226,10 @@ "status.show_more": "Rozwiń", "status.show_more_all": "Rozwiń wszystkie", "status.show_original": "Pokaż oryginalny wpis", - "status.title": "Wpis", + "status.title": "Wpis @{username}", "status.title_direct": "Wiadomość bezpośrednia", - "status.translated_from_with": "Przetłumaczono z {lang} z użyciem {provider}", "status.translate": "Przetłumacz wpis", + "status.translated_from_with": "Przetłumaczono z {lang} z użyciem {provider}", "status.unbookmark": "Usuń z zakładek", "status.unbookmarked": "Usunięto z zakładek.", "status.unmute_conversation": "Cofnij wyciszenie konwersacji", @@ -1227,8 +1240,16 @@ "streamfield.add": "Dodaj", "streamfield.remove": "Usuń", "suggestions.dismiss": "Odrzuć sugestię", + "sw.restart": "Restartuj", + "sw.state.active": "Aktywny", + "sw.state.loading": "Ładowanie…", + "sw.state.unavailable": "Niedostępny", + "sw.state.unknown": "Nieznany", + "sw.state.waiting": "Oczekiwanie", + "sw.status": "Stan", "sw.update": "Aktualizacja", "sw.update_text": "Dostępna jest aktualizacja.", + "sw.url": "Adres URL skryptu", "tabs_bar.all": "Wszystkie", "tabs_bar.apps": "Aplikacje", "tabs_bar.chats": "Rozmowy", diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json index 44f37a7d2..8376f6a95 100644 --- a/app/soapbox/locales/ro.json +++ b/app/soapbox/locales/ro.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Postează", diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json index 7100397a0..96587b3ae 100644 --- a/app/soapbox/locales/sq.json +++ b/app/soapbox/locales/sq.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Mesazh", diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json index fc494140f..2a1f3339a 100644 --- a/app/soapbox/locales/sr-Latn.json +++ b/app/soapbox/locales/sr-Latn.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Tutni", diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json index 975d58170..b739b3713 100644 --- a/app/soapbox/locales/sr.json +++ b/app/soapbox/locales/sr.json @@ -274,7 +274,7 @@ "compose_form.poll.add_option": "Add a choice", "compose_form.poll.duration": "Poll duration", "compose_form.poll.option_placeholder": "Choice {number}", - "compose_form.poll.remove_option": "Remove this choice", + "compose_form.poll.remove_option": "Delete", "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices", "compose_form.poll.switch_to_single": "Change poll to allow for a single choice", "compose_form.publish": "Труби", 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/middleware/sounds.ts b/app/soapbox/middleware/sounds.ts index 94ba15313..1d600306f 100644 --- a/app/soapbox/middleware/sounds.ts +++ b/app/soapbox/middleware/sounds.ts @@ -39,21 +39,21 @@ export default function soundsMiddleware(): ThunkMiddleware { const soundCache: Record
';
- expect(result.display_name_html).toBe(expected);
+ expect(result.display_name_html).toContain('emojione');
});
it('emojifies note as `note_emojified`', () => {
const account = require('soapbox/__fixtures__/account-with-emojis.json');
const result = normalizeAccount(account);
- const expected = 'I create Fediverse software that empowers people online.
I'm vegan btw
Note: If you have a question for me, please tag me publicly. This gives the opportunity for others to chime in, and bystanders to learn.'; - expect(result.note_emojified).toBe(expected); + expect(result.note_emojified).toContain('emojione'); }); it('unescapes HTML note as `note_plain`', () => { @@ -154,8 +152,8 @@ describe('normalizeAccount()', () => { const result = normalizeAccount(account); const field = result.fields.get(1); - expect(field?.name_emojified).toBe('Soapbox');
- expect(field?.value_emojified).toBe('https://soapbox.pub ');
+ expect(field?.name_emojified).toContain('emojione');
+ expect(field?.value_emojified).toContain('emojione');
expect(field?.value_plain).toBe('https://soapbox.pub :soapbox:');
});
diff --git a/app/soapbox/normalizers/__tests__/instance.test.ts b/app/soapbox/normalizers/__tests__/instance.test.ts
index 0df95fcb3..87088b30d 100644
--- a/app/soapbox/normalizers/__tests__/instance.test.ts
+++ b/app/soapbox/normalizers/__tests__/instance.test.ts
@@ -197,7 +197,7 @@ describe('normalizeInstance()', () => {
const instance = require('soapbox/__fixtures__/akkoma-instance.json');
const result = normalizeInstance(instance);
- expect(result.version).toEqual('2.7.2 (compatible; Pleroma 2.4.5+akkoma)');
+ expect(result.version).toEqual('2.7.2 (compatible; Pleroma 2.4.50+akkoma)');
});
});
diff --git a/app/soapbox/normalizers/__tests__/poll.test.ts b/app/soapbox/normalizers/__tests__/poll.test.ts
index b7ba0a46f..d5226e938 100644
--- a/app/soapbox/normalizers/__tests__/poll.test.ts
+++ b/app/soapbox/normalizers/__tests__/poll.test.ts
@@ -38,7 +38,7 @@ describe('normalizePoll()', () => {
// Emojifies poll options
expect(result.options.get(1)?.title_emojified)
- .toEqual('Custom emoji 
');
+ .toContain('emojione');
// Parses emojis as Immutable.Record's
expect(ImmutableRecord.isRecord(result.emojis.get(0))).toBe(true);
diff --git a/app/soapbox/normalizers/__tests__/status.test.ts b/app/soapbox/normalizers/__tests__/status.test.ts
index b60373975..5ad29d926 100644
--- a/app/soapbox/normalizers/__tests__/status.test.ts
+++ b/app/soapbox/normalizers/__tests__/status.test.ts
@@ -183,7 +183,7 @@ describe('normalizeStatus()', () => {
// Emojifies poll options
expect(poll.options.get(1)?.title_emojified)
- .toEqual('Custom emoji ');
+ .toContain('emojione');
// Parses emojis as Immutable.Record's
expect(ImmutableRecord.isRecord(poll.emojis.get(0))).toBe(true);
diff --git a/app/soapbox/normalizers/account.ts b/app/soapbox/normalizers/account.ts
index 97c640886..07d3ec1e6 100644
--- a/app/soapbox/normalizers/account.ts
+++ b/app/soapbox/normalizers/account.ts
@@ -98,7 +98,7 @@ const normalizePleromaLegacyFields = (account: ImmutableMap
world 
test 
';
+ const expected = 'Hello world test ';
const result = reducer(undefined, action).getIn(['AGm7uC9DaAIGUa4KYK', 'contentHtml']);
expect(result).toBe(expected);
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/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/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/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; +type NotificationRecord = ReturnType ; +type QueuedNotification = ReturnType ; + +const parseId = (id: string | number) => parseInt(id as string, 10); // For sorting the notifications -const comparator = (a, b) => { - const parse = m => parseId(m.get('id')); +const comparator = (a: NotificationRecord, b: NotificationRecord) => { + const parse = (m: NotificationRecord) => parseId(m.id); if (parse(a) < parse(b)) return 1; if (parse(a) > parse(b)) return -1; return 0; }; -const minifyNotification = notification => { +const minifyNotification = (notification: NotificationRecord) => { return notification.mergeWith((o, n) => n || o, { - account: notification.getIn(['account', 'id']), - target: notification.getIn(['target', 'id']), - status: notification.getIn(['status', 'id']), + account: notification.getIn(['account', 'id']) as string, + target: notification.getIn(['target', 'id']) as string, + status: notification.getIn(['status', 'id']) as string, }); }; -const fixNotification = notification => { +const fixNotification = (notification: APIEntity) => { return minifyNotification(normalizeNotification(notification)); }; -const isValid = notification => { +const isValid = (notification: APIEntity) => { try { // Ensure the notification is a known type if (!validType(notification.type)) { @@ -90,7 +104,7 @@ const isValid = notification => { }; // Count how many notifications appear after the given ID (for unread count) -const countFuture = (notifications, lastId) => { +const countFuture = (notifications: ImmutableOrderedMap , type?: string) => { + const helper = (list: ImmutableOrderedMap => { return promise; }; -export { getVideoDuration, formatBytes, truncateFilename }; +const domParser = new DOMParser(); + +enum VideoProviders { + RUMBLE = 'rumble.com' +} + +const addAutoPlay = (html: string): string => { + const document = domParser.parseFromString(html, 'text/html').documentElement; + const iframe = document.querySelector('iframe'); + + if (iframe) { + const url = new URL(iframe.src); + const provider = new URL(iframe.src).host; + + if (provider === VideoProviders.RUMBLE) { + url.searchParams.append('pub', '7a20'); + url.searchParams.append('autoplay', '2'); + } else { + url.searchParams.append('autoplay', '1'); + url.searchParams.append('auto_play', '1'); + iframe.allow = 'autoplay'; + } + + iframe.src = url.toString(); + + // DOM parser creates html/body elements around original HTML fragment, + // so we need to get innerHTML out of the body and not the entire document + return (document.querySelector('body') as HTMLBodyElement).innerHTML; + } + + return html; +}; + +export { getVideoDuration, formatBytes, truncateFilename, addAutoPlay }; 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/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 => { 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 diff --git a/app/styles/about.scss b/app/styles/about.scss deleted file mode 100644 index 038e34ec8..000000000 --- a/app/styles/about.scss +++ /dev/null @@ -1,1064 +0,0 @@ -$maximum-width: 1235px; -$fluid-breakpoint: $maximum-width + 20px; - -@keyframes upAndFadeIn { - 0% { - transform: rotate(-15deg) translateX(40%) translateY(20%) scale(1.15); - } - - 100% { - transform: rotate(-5deg) translateX(40%) translateY(0) scale(1.15); - } -} - -@keyframes upAndFadeInLeft { - 0% { - transform: rotate(30deg) translateX(30%) scale(1.15) translateY(30%); - } - - 100% { - transform: rotate(15deg) translateX(30%) scale(1.15) translateY(10%); - } -} - -@keyframes wave { - 0% { - transform: rotate(0); - } - - 25% { - transform: rotate(15deg); - } - - 50% { - transform: rotate(-10deg); - } - - 75% { - transform: rotate(15deg); - } - - 100% { - transform: rotate(0); - } -} - -.public-layout { - .app-store-button { - width: auto; - height: 80px; - display: inline-block; - } - - .container { - width: 100%; - max-width: 1280px; - - @media screen and (max-width: $no-gap-breakpoint) { - padding: 0; - } - } - - .content { - width: 100%; - display: block; - margin: 40px 0; - border-radius: 6px; - - @media screen and (max-width: 767px) { - margin-top: 0; - } - } - - .header { - height: 80px; - display: flex; - align-items: stretch; - justify-content: center; - flex-wrap: nowrap; - padding: 14px 20px; - box-sizing: border-box; - position: relative; - - .header-container { - display: flex; - width: 1280px; - align-items: stretch; - justify-content: center; - flex-wrap: nowrap; - - & > div { - flex: 1 1 33.3%; - min-height: 1px; - } - } - - .nav-left { - display: flex; - align-items: center; - justify-content: flex-start; - flex-wrap: nowrap; - } - - .nav-center { - display: flex; - align-items: stretch; - justify-content: center; - flex-wrap: nowrap; - } - - .nav-right { - display: flex; - align-items: center; - justify-content: flex-end; - flex-wrap: nowrap; - - .simple_form.new_user, - .simple_form--public { - display: flex; - flex-direction: row; - align-items: center; - - .fields-group { - display: flex; - flex-direction: row; - margin-bottom: 0; - position: relative; - - p.hint.subtle-hint { - position: absolute; - top: 30px; - left: 160px; - border-radius: 4px; - background: var(--foreground-color); - overflow: hidden; - - a { - padding: 4px; - background-color: var(--brand-color--med); - } - } - - .input { - flex: 1; - margin-bottom: 0; - margin-right: 10px; - - input { - min-width: 150px; - font-size: 14px; - } - } - } - - .actions { - display: flex; - margin-top: 0; - - .button { - margin-bottom: 0 !important; - line-height: 38px !important; - height: 38px !important; - box-sizing: border-box !important; - padding: 0 18px !important; - text-transform: none !important; - } - } - } - } - - .brand { - display: block; - - svg { - display: block; - height: 50px; - width: auto; - position: relative; - - @media screen and (max-width: $no-gap-breakpoint) { - height: 20px; - } - } - } - - .nav-link { - display: flex; - align-items: center; - padding: 12px 22px; - font-size: 14px; - font-weight: 600; - text-decoration: none; - color: var(--primary-text-color); - white-space: nowrap; - text-align: center; - - &:hover, - &:focus, - &:active { - text-decoration: underline; - color: var(--primary-text-color); - } - - &--hollow { - background-color: var(--brand-color--med); - - &:hover, - &:focus, - &:active { - color: var(--brand-color); - } - } - - @media screen and (max-width: 550px) { - &.optional { - display: none; - } - } - } - - .nav-button { - background: var(--brand-color); - color: #fff; - margin: 8px; - margin-left: 0; - border-radius: 4px; - - &:hover, - &:focus, - &:active { - opacity: 0.9; - color: #fff; - text-decoration: none; - } - } - } - - .faq { - margin-bottom: 80px; - - .subtext { - a { - color: $color-4; - } - } - - .lead { - font-weight: 600; - font-size: 32px; - line-height: 42px; - margin-bottom: 10px; - } - - .columns { - display: flex; - @media screen and (max-width: $fluid-breakpoint) { - display: block; - } - - .left-column { - flex: 2; - padding-right: 20px; - } - - .right-column { - flex: 4; - - span { - font-style: italic; - font-weight: 600; - color: $color-4-dark; - } - } - - .question { - font-size: 20px; - font-weight: 600; - } - } - } - - .mobile-page { - height: 100%; - - .rich-formatting, - .mobile-cta { - height: 100%; - } - - .rich-formatting { - padding: 10px 0; - } - - .flexed { - height: 100%; - display: flex; - - @media screen and (max-width: 768px) { - flex-direction: column; - } - - p { - font-size: 20px; - line-height: 1.4; - margin-bottom: 40px; - } - - h1 { - letter-spacing: -0.02em; - font-size: 80px; - font-weight: 400; - line-height: 80px; - margin: 0 0 20px 0; - -webkit-tap-highlight-color: lightblue !important; - - @media screen and (max-width: 768px) { - font-size: 60px; - line-height: 60px; - } - - .alt-gradient { - font-size: 70px; - line-height: 70px; - font-weight: 600; - background: -webkit-linear-gradient(135deg, $color-9, $color-4-light, $color-2-light); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - - @media screen and (max-width: 768px) { - font-size: 50px; - line-height: 50px; - } - } - - .big { - color: $color-4-dark; - display: block; - font-weight: 200; - } - } - - .column { - position: relative; - display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-start; - flex: 1; - - @media screen and (max-width: 768px) { - flex: 0; - width: 100%; - order: 1; - } - - &:nth-of-type(2) { - flex-direction: row; - align-items: center; - - @media screen and (max-width: 768px) { - padding-top: 80px; - order: 0; - } - } - } - } - - .nested-column { - flex: 1; - } - - .screenshot-1, - .screenshot-2 { - position: relative; - width: 100%; - z-index: 10; - } - - .screenshot-1 { - animation: 1s ease-in upAndFadeIn; - transform: rotate(-5deg) translateX(40%) scale(1.15); - - @media screen and (max-width: 768px) { - animation: none; - transform: rotate(-5deg) translateX(20%) scale(1.05); - } - } - - .screenshot-2 { - animation: 1s ease-in upAndFadeInLeft; - transform: rotate(15deg) translateX(30%) scale(1.15) translateY(10%); - z-index: 9; - - @media screen and (max-width: 768px) { - animation: none; - transform: rotate(15deg) translateX(-10%) scale(0.9) translateY(5%); - } - } - } - - .tips { - padding: 80px 40px; - border-radius: 10px; - margin-bottom: 80px; - - @media screen and (max-width: $fluid-breakpoint) { - padding: 20px; - } - - .app-icon { - width: 100px; - border-radius: 16px; - } - - .invite-icon { - width: 100px; - } - - .small-invite-icon { - width: 40px; - } - - span { - font-style: italic; - font-weight: 600; - color: $color-4-dark; - } - - .mb-40 { - margin-bottom: 40px; - } - - .tip { - font-size: 20px; - font-weight: 600; - } - - ol { - padding-left: 10px; - - li { - img { - width: 30px; - height: 30px; - display: inline; - margin-bottom: -5px; - } - } - } - - .columns { - display: flex; - @media screen and (max-width: $fluid-breakpoint) { - display: block; - } - - .left-column { - display: flex; - flex-direction: column; - align-items: center; - flex: 2; - padding-right: 20px; - - img { - width: 120px; - height: 120px; - } - - h2 { - font-size: 32px; - margin: 20px 0; - font-weight: 600; - color: $color-4; - text-align: center; - } - } - - .right-column { - flex: 4; - } - } - } - - .static-pages-header { - width: 100%; - padding: 40px 0; - border-bottom: 1px solid $color-6-dark; - margin-bottom: 40px; - - h1 { - font-size: 32px; - font-weight: 600; - color: $color-3-dark; - margin-bottom: 10px; - } - - p { - font-size: 22px; - } - } - - .static-list-wrapper { - display: grid; - grid-template-columns: 1fr 1fr 1fr; - grid-gap: 20px; - width: 100%; - list-style: none; - padding: 40px 0; - - @media screen and (max-width: $fluid-breakpoint) { - grid-template-columns: 100%; - } - - li { - .card { - border-radius: 10px; - background: linear-gradient(-45deg, $color-3-light, $color-3-dark); - - h4 { - color: white; - font-size: 24px; - font-weight: 500; - margin: 0 0 20px 0; - } - - a { - color: white; - } - - p { - color: transparentize($color-6-light, 0.1); - } - - .card-header { - padding: 20px; - height: 160px; - } - - .card-footer { - background: transparentize($color-6-light, 0.9); - text-align: right; - border-radius: 0 0 10px 10px; - padding: 10px 20px; - } - } - } - } -} - -.container { - position: relative; - z-index: 20; - box-sizing: border-box; - max-width: $maximum-width; - margin: 0 auto; - width: 100%; - padding: 0 10px; -} - -.rich-formatting { - @apply text-gray-900 dark:text-gray-100; - font-family: var(--font-sans-serif), sans-serif; - font-size: 16px; - font-weight: 400; - line-height: 30px; - padding: 15px 30px; - - .text-center { - text-align: center; - } - - & > :first-child { - margin-top: 0.5em; - } - - a { - color: var(--highlight-text-color); - text-decoration: underline; - } - - p { - margin: 1em 0; - } - - p, - li { - @apply text-gray-900 dark:text-gray-100; - font-family: var(--font-sans-serif), sans-serif; - font-size: 16px; - font-weight: 400; - line-height: 30px; - - a { - color: var(--highlight-text-color); - text-decoration: underline; - } - } - - strong, - em, - b { - font-weight: bold; - color: var(--primary-text-color); - } - - h1, - h2, - h3, - h4, - h5, - h6 { - @apply text-gray-900 dark:text-gray-100; - font-family: var(--font-display), sans-serif; - margin-top: 2em; - margin-bottom: 1.25em; - } - - hr + { - h1, - h2, - h3, - h4, - h5, - h6 { - margin-top: 1.25em; - } - } - - h1 { - font-size: 26px; - line-height: 30px; - - small { - font-family: var(--font-sans-serif), sans-serif; - display: block; - font-size: 18px; - font-weight: 400; - color: var(--primary-text-color); - } - } - - h2 { - font-weight: 600; - font-size: 28px; - line-height: 32px; - } - - h3 { - font-size: 18px; - line-height: 24px; - } - - h4 { - font-size: 16px; - line-height: 24px; - } - - h5 { - font-size: 14px; - line-height: 24px; - } - - h6 { - font-size: 12px; - line-height: 24px; - } - - ul, - ol { - padding: 0 0 0 2em; - margin: 0 0 0.85em; - - &[type="a"] { - list-style-type: lower-alpha; - } - - &[type="i"] { - list-style-type: lower-roman; - } - } - - ul { - list-style: disc; - } - - ol { - list-style: decimal; - } - - li > ol, - li > ul { - margin-top: 6px; - } - - li p { - margin-top: 0; - } - - hr { - width: 100%; - height: 0; - border: 0; - border-bottom: 1px solid hsla(var(--background-color_hsl), 0.6); - margin: 2em 0; - - &.spacer { - height: 1px; - border: 0; - } - } - - pre { - white-space: pre-wrap; - } -} - -.also-available { - padding-top: 0; - - ul { - display: inline; - padding-left: 0; - list-style: none; - - li { - display: inline; - - &::after { - content: " · "; - } - } - - li:last-child::after { - content: ""; - } - } -} - -.public-layout { - position: relative; - background-size: 100% auto; - background-repeat: no-repeat; - background-position: 0 -106px; - min-height: 100vh; - display: flex; - flex-direction: column; - - @media screen and (max-width: 767px) { - .wave { - display: none; - } - - .follow-truth { - margin-bottom: 20px; - } - - .header { - .nav-link { - color: #fff; - - &:hover, - &:focus, - &:active { - color: #fff; - opacity: 0.9; - } - } - - .nav-button { - background: var(--accent-color); - color: #fff; - transition: 0.2s; - - &:hover, - &:focus, - &:active { - background: var(--accent-color--bright); - } - } - } - } -} - -.app-holder > .public-layout { - align-items: normal; -} - -.landing { - height: auto; - min-height: 80vh; - - @media (min-width: 767px) { - min-height: 550px; - } - - .landing-columns { - display: flex; - flex-direction: row; - padding: 40px 0 20px; - - &--left { - margin-right: 80px; - } - - &--right { - margin-left: auto; - width: 395px; - background-color: var(--foreground-color); - border-radius: 6px; - height: 100%; - - .simple_form, - .registrations-closed { - padding: 20px; - background-color: var(--brand-color--faint); - border-radius: inherit; - } - } - - .registrations-closed { - display: flex; - flex-direction: column; - height: 100%; - align-items: center; - justify-content: center; - text-align: center; - font-size: 18px; - - h2 { - font-weight: bold; - font-size: 24px; - margin-bottom: 10px; - } - } - - @media (min-width: 767px) and (max-width: 1024px) { - padding: 40px 20px 20px; - - &--left { - margin-right: 40px; - } - - &--right { - width: 425px; - } - } - - @media screen and (max-width: 767px) { - height: auto; - padding: 20px 10px 30px; - flex-direction: column; - align-items: center; - - &--left { - margin-right: 0; - } - - &--right { - width: 100%; - margin-left: 0; - margin-top: 30px; - } - } - } - - &__brand { - display: flex; - justify-content: flex-start; - align-items: center; - flex-direction: column; - - .brand { - margin-right: auto !important; - line-height: normal; - } - - img { - height: 100px; - - @media (min-width: 767px) and (max-width: 1024px) { - height: 60px; - } - - @media screen and (max-width: 767px) { - display: none; - } - } - - h1 { - font-size: 40px; - } - } - - .directory { - margin-top: 30px; - background: transparent; - box-shadow: none; - border-radius: 0; - } - - .simple_form .user_agreement .label_input > label { - @apply text-gray-900 dark:text-gray-100 font-normal; - } - - .simple_form p.lead { - color: var(--primary-text-color); - font-size: 15px; - line-height: 20px; - font-weight: 400; - margin-bottom: 25px; - } - - &__grid { - max-width: 960px; - margin: 0 auto; - display: grid; - grid-template-columns: minmax(0, 50%) minmax(0, 50%); - grid-gap: 30px; - - @media screen and (max-width: 738px) { - grid-template-columns: minmax(0, 100%); - grid-gap: 10px; - - &__column-login { - grid-row: 1; - display: flex; - flex-direction: column; - } - - &__column-registration { - grid-row: 2; - } - - .directory { - margin-top: 10px; - } - } - - @media screen and (max-width: $no-gap-breakpoint) { - grid-gap: 0; - } - } -} - -.brand { - position: relative; - text-decoration: none; - margin-right: 15px; - - h1 { - color: var(--brand-color); - } -} - -.brand__tagline { - @apply text-black dark:text-white; - display: block; - width: 470px; - font-size: 24px; - line-height: 1.4; - margin-top: 25px; - font-weight: 400; - - @media (min-width: 767px) and (max-width: 1024px) { - width: 320px; - font-size: 20px; - } - - @media screen and (max-width: 767px) { - width: 100%; - font-size: 22px; - margin-top: 0; - } -} - -@media (min-width: 767px) { - .hidden-sm { - display: block; - } - - .visible-sm { - display: none; - } -} - -@media screen and (max-width: 767px) { - .hidden-sm { - display: none !important; - } - - .visible-sm { - display: block !important; - } -} - -.about-page { - background: var(--brand-color--faint); - border-radius: inherit; -} - -.public-layout__top { - position: relative; - flex: 1; - - .header, - .container { - position: relative; - } - - .otp-form-overlay__container { - z-index: 9998; - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - display: flex; - align-items: center; - justify-content: center; - background: rgba($base-overlay-background, 0.7); - - .otp-form-overlay__form { - @include standard-panel-shadow; - border-radius: 10px; - z-index: 9999; - margin: 0 auto; - max-width: 800px; - position: relative; - padding: 20px; - background-color: var(--background-color); - display: flex; - flex-direction: column; - - .simple_form { - padding: 30px 50px 50px; - } - - .otp-form-overlay__close { - align-self: flex-end; - - .svg-icon { - height: 20px; - width: 20px; - } - } - } - } -} - -.public-layout__top .wave { - position: absolute; - width: 100%; - height: 100%; - top: 0; - left: 0; - bottom: 0; - right: 0; -} - -h1.otp-login { - font-size: 16px; - line-height: 24px; - font-weight: 800; - padding: 10px 0; -} diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss index b0412298b..e4a0833c7 100644 --- a/app/styles/accounts.scss +++ b/app/styles/accounts.scss @@ -29,15 +29,6 @@ border-bottom: 1px solid var(--brand-color--med); } - &.compact { - padding: 0; - border-bottom: 0; - - .account__avatar-wrapper { - margin-left: 0; - } - } - .account__display-name { flex: 1 1 auto; display: block; @@ -50,13 +41,6 @@ display: flex; } } - - &__note { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - color: var(--primary-text-color--faint); - } } .account__wrapper { @@ -69,30 +53,6 @@ margin-right: 12px; } -.account__avatar { - @include avatar-radius; - position: relative; - background-color: var(--brand-color--faint); - - &-inline { - display: inline-block; - vertical-align: middle; - margin-right: 5px; - } - - &-composite { - @include avatar-radius; - overflow: hidden; - - & > div { - @include avatar-radius; - float: left; - position: relative; - box-sizing: border-box; - } - } -} - a .account__avatar { cursor: pointer; } @@ -136,16 +96,6 @@ a .account__avatar { } } -.account-authorize { - padding: 14px 10px; - - .detailed-status__display-name { - display: block; - margin-bottom: 15px; - overflow: hidden; - } -} - .account-authorize__avatar { float: left; margin-right: 10px; @@ -203,23 +153,6 @@ a .account__avatar { } } -.account__section-headline { - button, - a { - flex: none; - padding: 18px 15px; - font-size: 16px; - font-weight: 600; - - &.active { - &::before, - &::after { - border-color: transparent transparent var(--foreground-color); - } - } - } -} - .account__moved-note { padding: 14px 10px; padding-bottom: 16px; @@ -247,35 +180,6 @@ a .account__avatar { left: -26px; position: absolute; } - - .detailed-status__display-avatar { - position: relative; - } - - .detailed-status__display-name { - margin-bottom: 0; - } -} - -.relationship-tag { - color: var(--primary-text-color); - margin-bottom: 4px; - margin-left: 4px; - display: block; - vertical-align: top; - background-color: var(--background-color); - text-transform: uppercase; - font-size: 11px; - font-weight: 500; - padding: 4px; - border-radius: 4px; - opacity: 0.7; - white-space: nowrap; - transition: 0.2s; - - &:hover { - opacity: 1; - } } .account__joined-at { diff --git a/app/styles/application.scss b/app/styles/application.scss index 1b70c6982..da62ca314 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -11,21 +11,16 @@ @import 'themes'; @import 'variables'; @import 'fonts'; -@import 'reset'; @import 'basics'; -@import 'footer'; @import 'accounts'; @import 'boost'; @import 'loading'; @import 'ui'; // @import 'introduction'; -@import 'emoji_picker'; -@import 'about'; +@import 'emoji-picker'; @import 'rtl'; @import 'accessibility'; -@import 'donations'; @import 'dyslexic'; -@import 'demetricator'; @import 'chats'; @import 'navigation'; @import 'placeholder'; @@ -50,33 +45,17 @@ @import 'components/search'; @import 'components/react-toggle'; @import 'components/still-image'; -@import 'components/trends'; -@import 'components/wtf-panel'; -@import 'components/profile-media-panel'; -@import 'components/profile-info-panel'; -@import 'components/setting-toggle'; @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'; -@import 'components/server-info'; @import 'components/admin'; @import 'components/backups'; @import 'components/crypto-donate'; -@import 'components/remote-timeline'; @import 'components/aliases'; @import 'components/icon'; -@import 'components/radio-button'; -@import 'components/directory'; - -// Holiday -@import 'holiday/halloween'; - -// Truth custom styles -@import 'truth'; @tailwind base; @tailwind components; diff --git a/app/styles/chats.scss b/app/styles/chats.scss index fe3d2182a..7c98b11ff 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -18,10 +18,6 @@ .search--account { border-top: 1px solid hsla(var(--primary-text-color_hsl), 0.2); padding: 5px; - - input.search__input { - border-radius: 6px; - } } &__header { @@ -69,17 +65,6 @@ transform: translateY(2px); } } - - .icon-with-badge__badge { - position: static; - pointer-events: none; - width: 18px; - height: 18px; - display: flex; - align-items: center; - justify-content: center; - margin-right: 7px; - } } &__content { @@ -238,13 +223,6 @@ } } } - - .icon-with-badge__badge { - top: 0; - right: 0; - left: auto; - bottom: auto; - } } .chat-box { @@ -335,16 +313,6 @@ } } -.chatroom__back { - display: flex; - align-items: center; - background: var(--accent-color--faint); - - .column-back-button { - background: transparent; - } -} - .chat { &__attachment-icon { float: right; diff --git a/app/styles/components/accordion.scss b/app/styles/components/accordion.scss deleted file mode 100644 index 77c39ae1e..000000000 --- a/app/styles/components/accordion.scss +++ /dev/null @@ -1,71 +0,0 @@ -.explanation-box { - padding: 5px 20px; -} - -.accordion { - @apply text-black dark:text-white bg-gray-100 dark:bg-gray-900; - padding: 15px 20px; - font-size: 14px; - border-radius: 8px; - margin: 0; - position: relative; - - &__title { - font-weight: bold !important; - font-size: 16px !important; - background: transparent !important; - color: var(--primary-text-color) !important; - padding: 0 !important; - margin: 0 !important; - text-transform: none !important; - text-align: left !important; - display: flex !important; - align-items: center; - border: 0; - width: 100%; - - &::after { - @apply text-black dark:text-white; - content: ''; - display: block; - font-family: 'Font Awesome 5 Free'; - font-weight: 900; - font-size: 0.8em; - padding-left: 0.6em; - margin-left: auto; - } - } - - &__menu { - position: absolute; - top: 17px; - right: 40px; - } - - &__content { - height: 0; - overflow: hidden; - } - - &--expanded &__title { - margin-bottom: 10px !important; - - &::after { - @apply text-black dark:text-white; - content: ''; - } - } - - &--expanded &__content { - height: auto; - } - - a { - color: var(--brand-color--hicontrast); - text-decoration: underline; - - &:hover { - text-decoration: none; - } - } -} diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss index a9bdeea05..277f42f18 100644 --- a/app/styles/components/account-header.scss +++ b/app/styles/components/account-header.scss @@ -1,43 +1,4 @@ -.account__header__subscribe { - position: absolute; - top: 10px; - right: 10px; - right: max(10px, env(safe-area-inset-right)); - z-index: 1; - - .subscription-button { - color: var(--primary-text-color); - margin-bottom: 4px; - display: flex; - align-items: center; - justify-content: center; - background-color: var(--background-color); - text-transform: uppercase; - font-size: 13px; - font-weight: 500; - padding: 4px; - border-radius: 4px; - opacity: 0.7; - - &:active, - &:focus, - &:hover { - opacity: 1; - } - - &:not(.button-active) i.fa { - margin: 0; - } - - .svg-icon { - width: 20px; - height: 20px; - } - } -} - .account__header__content { - color: var(--primary-text-color--faint); font-size: 14px; font-weight: 400; overflow: hidden; diff --git a/app/styles/components/admin.scss b/app/styles/components/admin.scss index 6c6fb42fa..302baa4e1 100644 --- a/app/styles/components/admin.scss +++ b/app/styles/components/admin.scss @@ -111,17 +111,6 @@ } } - &__statuses .accordion { - padding: 10px; - margin-bottom: 6px; - - &__title { - font-size: 12px !important; - font-weight: normal !important; - margin-bottom: 0 !important; - } - } - &__status-content { overflow: hidden; } diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss index 5ac761946..a9e32d19e 100644 --- a/app/styles/components/columns.scss +++ b/app/styles/components/columns.scss @@ -1,53 +1,3 @@ -.columns-area { - display: flex; - flex: 1 1 auto; - flex-direction: row; - justify-content: flex-start; - position: relative; - - &__panels { - display: flex; - justify-content: center; - width: 100%; - height: 100%; - - &__pane { - height: 100%; - pointer-events: none; - display: flex; - justify-content: flex-end; - padding-top: 15px; - - &--start { - justify-content: flex-start; - } - - &__inner { - width: 265px; - pointer-events: auto; - height: 100%; - } - } - - &__main { - display: flex; - flex-direction: column; - box-sizing: border-box; - width: 100%; - max-width: 600px; - padding: 0 20px; - - @media screen and (max-width: 580px) { - padding: 0; - } - - @media screen and (min-width: 896px) { - margin: 0 20px; - padding: 0; - } - } - } -} .column { width: 350px; @@ -59,10 +9,6 @@ } @media screen and (min-width: 631px) { - .columns-area { - padding: 0; - } - .column { flex: 0 0 auto; padding: 10px; @@ -77,154 +23,6 @@ padding-right: 10px; } } - - .columns-area > div { - .column { - padding-left: 5px; - padding-right: 5px; - } - } -} - -.columns-area { - display: block; - flex-direction: column; - width: 100%; - margin: 0 auto; - padding-top: 15px; - - @media screen and (max-width: 580px) { - padding-top: 0; - } - - .column { - width: 100%; - padding: 0; - } - - .search__input { - line-height: 18px; - font-size: 16px; - padding: 15px; - padding-right: 30px; - border-radius: 0; - background-color: var(--foreground-color); - } - - .search__icon .fa { - top: 15px; - } - - @media (max-width: 580px) { - .timeline-compose-block { - border-radius: 0; - margin-top: 10px; - } - } - - @media screen and (min-width: 630px) { - .detailed-status { - padding: 15px; - - .media-gallery, - .video-player { - margin-top: 15px; - } - } - - .compose-form { - padding: 15px; - } - - .status { - padding: 15px 15px 15px (48px + 15px * 2); - min-height: 48px + 2px; - - &__avatar { - left: 15px; - top: 17px; - } - - &__content { - padding-top: 5px; - } - - &__prepend { - margin-left: 48px + 15px * 2; - padding-top: 15px; - } - - &__prepend-icon-wrapper { - left: -32px; - } - - .media-gallery, - .video-player { - margin-top: 10px; - } - } - - .account { - padding: 15px 10px; - } - - .notification { - &__message { - margin-left: 48px + 15px * 2; - padding-top: 15px; - } - - &__favourite-icon-wrapper { - left: -32px; - } - - .status { - padding-top: 8px; - } - - .account { - padding-top: 8px; - } - - .account__avatar-wrapper { - margin-left: 17px; - margin-right: 15px; - } - } - } -} - -// This controls where the left column breaks. -@media screen and (max-width: 600px + (285px * 1) + (10px * 1)) { - .columns-area__panels__pane--left { - display: none; - } -} - -@media screen and (max-width: 600px + (285px * 2) + (10px * 2)) { - .columns-area__panels__pane--right { - display: none; - } -} - -.column-back-button { - background: var(--accent-color--faint); - color: var(--highlight-text-color); - cursor: pointer; - flex: 0 0 auto; - font-size: 16px; - line-height: inherit; - border: 0; - text-align: unset; - padding: 15px; - margin: 0; - z-index: 3; - outline: 0; - - &:hover, - &:focus { - text-decoration: underline; - } } .column-link { @@ -289,24 +87,6 @@ cursor: default; } -.columns-area .column { - @include standard-panel; - - &--transparent { - background: transparent; - border-radius: 0; - box-shadow: none; - } - - @media screen and (max-width: 580px) { - border-radius: 0; - - .material-status__status { - border-radius: 0; - } - } -} - .column-header__wrapper { position: relative; flex: 0 0 auto; @@ -611,10 +391,6 @@ } } -.column-link--transparent .icon-with-badge__badge { - border-color: var(--background-color); -} - .column__switch .audio-toggle { position: absolute; z-index: 4; @@ -663,83 +439,3 @@ } } } - -.column-title { - text-align: center; - padding: 40px; - - .logo { - fill: var(--primary-text-color); - width: 50px; - margin: 0 auto; - margin-bottom: 40px; - } - - h3 { - font-size: 24px; - line-height: 1.5; - font-weight: 700; - margin-bottom: 10px; - } - - p { - font-size: 16px; - line-height: 24px; - font-weight: 400; - color: var(--primary-text-color--faint); - } -} - -.column-actions { - display: flex; - align-items: center; - justify-content: center; - padding: 40px; - padding-top: 40px; - - &__background { - position: absolute; - left: 0; - bottom: 0; - height: 220px; - width: auto; - } -} - -.column-list { - position: relative; - - &__empty-message { - padding: 0 20px; - } -} - -.follow_subhead { - margin: 50px 0; - font-size: 20px; -} - -.column .explanation-box { - background: var(--foreground-color); -} - -// Pull to refresh -.columns-area .column { - .ptr, - .ptr__children { - background: var(--foreground-color); - border-bottom-left-radius: 10px; - border-bottom-right-radius: 10px; - - @media screen and (max-width: 580px) { - border-radius: 0; - } - } - - &--transparent { - .ptr, - .ptr__children { - background: transparent; - } - } -} diff --git a/app/styles/components/compose-form.scss b/app/styles/components/compose-form.scss index 0d76263d3..d2297db4e 100644 --- a/app/styles/components/compose-form.scss +++ b/app/styles/components/compose-form.scss @@ -1,32 +1,4 @@ .compose-form { - &__sensitive-button { - padding: 10px; - padding-top: 0; - font-size: 14px; - font-weight: 500; - &.active { color: var(--highlight-text-color); } - input[type=checkbox] { display: none; } - - .checkbox { - display: inline-block; - position: relative; - border: 1px solid var(--brand-color); - box-sizing: border-box; - width: 18px; - height: 18px; - flex: 0 0 auto; - margin-right: 10px; - top: -1px; - border-radius: 4px; - vertical-align: middle; - - &.active { - border-color: var(--highlight-text-color); - background: var(--highlight-text-color); - } - } - } - &__warning { @apply text-xs mb-2.5 px-2.5 py-2 shadow-md rounded bg-accent-300 text-white; @@ -135,34 +107,16 @@ position: relative; &.video { - background-image: url('../images/video-placeholder.png'); + background-image: url('../assets/images/video-placeholder.png'); background-size: cover; } &.audio { - background-image: url('../images/audio-placeholder.png'); + background-image: url('../assets/images/audio-placeholder.png'); background-size: cover; } } } // end .compose-form .compose-form__modifiers - - &__publish { - display: flex; - justify-content: flex-end; - min-width: 0; - flex: 0 0 auto; - - .compose-form__publish-button-wrapper { - overflow: hidden; - } - } - - &__counter { - display: flex; - align-items: center; - align-self: center; - margin-left: auto; - } } // end .compose-form .privacy-dropdown__dropdown { diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss index 287838b2d..257ad8af6 100644 --- a/app/styles/components/detailed-status.scss +++ b/app/styles/components/detailed-status.scss @@ -1,96 +1,3 @@ -.detailed-status { - // padding: 14px 10px; - - &--flex { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - align-items: flex-start; - - .status__content { - flex: 100%; - } - } - - .status__content { - font-size: 19px; - line-height: 24px; - - .emojione { - width: 24px; - height: 24px; - margin: -1px 0 0; - } - - &--big { - img.emojione { - width: 56px; - height: 56px; - } - } - } - - .video-player, - .audio-player { - margin-top: 8px; - } -} - -.detailed-status__timestamp { - display: flex; - align-items: center; - - .svg-icon { - width: 20px; - height: 20px; - - svg { - stroke-width: 1.3px; - } - } - - .svg-icon { - margin-right: 5px; - } -} - -.detailed-status__wrapper { - position: relative; -} - -.detailed-status__display-name { - color: var(--primary-text-color--faint); - display: flex; - line-height: 24px; - margin-bottom: 15px; - overflow: hidden; - - strong, - span { - text-overflow: ellipsis; - overflow: hidden; - } - - strong { - font-size: 16px; - color: var(--primary-text-color); - } - - span.hover-ref-wrapper { - display: inline; - } - - .display-name__account { - display: block; - margin-top: -5px; - } -} - -.detailed-status__display-avatar { - float: left; - margin-right: 10px; -} - .thread { @apply bg-white dark:bg-primary-900 p-4 shadow-xl dark:shadow-none sm:p-6 sm:rounded-xl; diff --git a/app/styles/components/directory.scss b/app/styles/components/directory.scss deleted file mode 100644 index 7dc8e48cd..000000000 --- a/app/styles/components/directory.scss +++ /dev/null @@ -1,179 +0,0 @@ -.directory { - &__filter-form { - display: flex; - gap: 30px; - background: var(--foreground-color); - - &__column { - padding-bottom: 10px; - } - - .radio-button { - display: block; - } - } - - &__list { - display: grid; - grid-gap: 10px; - grid-template-columns: minmax(0, 50%) minmax(0, 50%); - width: 100%; - transition: opacity 100ms ease-in; - box-sizing: border-box; - - &.loading { - opacity: 0.7; - } - - @media screen and (max-width: 630px) { - grid-template-columns: minmax(0, 100%); - } - } - - &__card { - @apply rounded-lg bg-gray-100 dark:bg-primary-800; - box-sizing: border-box; - margin-bottom: 0; - box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.1); - overflow: hidden; - position: relative; - - &__info { - z-index: 1; - position: absolute; - top: 10px; - left: 10px; - } - - &__action-button { - z-index: 1; - position: absolute; - top: 78px; - right: 12px; - } - - &__img { - @apply bg-primary-200 dark:bg-gray-600; - height: 125px; - position: relative; - - img { - display: block; - width: 100%; - height: 100%; - margin: 0; - object-fit: cover; - } - } - - &__bar { - @apply bg-primary-200 dark:bg-primary-700; - display: flex; - align-items: center; - padding: 10px; - - &__name { - flex: 1 1 auto; - display: flex; - align-items: center; - text-decoration: none; - overflow: hidden; - } - - .account__avatar { - flex: 0 0 auto; - width: 48px; - min-width: 48px; - height: 48px; - padding-top: 2px; - - img { - width: 100%; - height: 100%; - display: block; - margin: 0; - border-radius: 4px; - background: var(--brand-color--faint); - object-fit: cover; - } - } - - .display-name { - margin-left: 15px; - text-align: left; - - strong { - @apply text-black dark:text-white; - font-size: 15px; - font-weight: 500; - overflow: hidden; - text-overflow: ellipsis; - } - - span:not(.verified-icon) { - @apply text-gray-500 dark:text-gray-400; - display: block; - font-size: 14px; - font-weight: 400; - overflow: hidden; - text-overflow: ellipsis; - } - - .verified-icon div, - .verified-icon svg { - @apply inline; - } - } - } - - &__extra { - background: var(--foreground-color); - display: flex; - align-items: center; - justify-content: center; - - .accounts-table__count { - padding: 15px 0; - text-align: center; - font-size: 15px; - font-weight: 500; - width: 33.33%; - flex: 0 0 auto; - - small { - display: block; - color: var(--primary-text-color--faint); - font-weight: 400; - font-size: 14px; - } - } - - .account__header__content { - @apply border-b border-solid border-gray-200 dark:border-primary-500; - box-sizing: border-box; - padding: 15px 10px; - width: 100%; - min-height: 50px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - - &.empty { - border-color: transparent; - } - - p { - display: none; - - &:first-child { - display: inline; - } - } - - br { - display: none; - } - } - } - } -} diff --git a/app/styles/components/display-name.scss b/app/styles/components/display-name.scss index c7976a056..e5625d109 100644 --- a/app/styles/components/display-name.scss +++ b/app/styles/components/display-name.scss @@ -1,10 +1,7 @@ -.status__display-name, -.detailed-status__display-name, .account__display-name { text-decoration: none; } -.status__display-name, .account__display-name { strong { @apply text-gray-800 dark:text-gray-200; @@ -17,8 +14,6 @@ } } -.status__display-name, -.detailed-status__display-name, a.account__display-name { &:hover strong { text-decoration: underline; diff --git a/app/styles/components/emoji-reacts.scss b/app/styles/components/emoji-reacts.scss index f21bf2fb1..12157969f 100644 --- a/app/styles/components/emoji-reacts.scss +++ b/app/styles/components/emoji-reacts.scss @@ -86,11 +86,6 @@ } } -.detailed-status__wrapper .emoji-react-selector { - bottom: 40px; - right: 10px; -} - .status .emoji-react-selector { bottom: 100%; left: -20px; diff --git a/app/styles/components/media-gallery.scss b/app/styles/components/media-gallery.scss index e9bb14425..664600893 100644 --- a/app/styles/components/media-gallery.scss +++ b/app/styles/components/media-gallery.scss @@ -92,8 +92,7 @@ } } -.status__wrapper, -.detailed-status__wrapper { +.status__wrapper { .media-gallery__item-thumbnail.letterboxed { &, .still-image { diff --git a/app/styles/components/modal.scss b/app/styles/components/modal.scss index 0ac611f91..7c27ad35c 100644 --- a/app/styles/components/modal.scss +++ b/app/styles/components/modal.scss @@ -6,18 +6,6 @@ overflow-y: hidden; } -.video-modal { - max-width: 100vw; - max-height: 100vh; - position: relative; -} - -.video-modal { - .video-player video { - height: auto; - } -} - .media-modal { width: 100%; height: 100%; @@ -176,7 +164,6 @@ } } -.onboarding-modal, .error-modal { background: var(--background-color); color: var(--primary-text-color); @@ -229,7 +216,6 @@ min-width: 33px; } - .onboarding-modal__nav, .error-modal__nav { color: var(--highlight-text-color); border: 0; @@ -266,12 +252,9 @@ position: relative; flex-direction: column; overflow: hidden; - width: 480px; - max-width: 90vw; border-radius: 10px; border: 1px solid var(--background-color); color: var(--primary-text-color--faint); - background: var(--foreground-color); .status__display-name { display: block; 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/components/profile-info-panel.scss b/app/styles/components/profile-info-panel.scss deleted file mode 100644 index 06f338804..000000000 --- a/app/styles/components/profile-info-panel.scss +++ /dev/null @@ -1,4 +0,0 @@ -.profile-info-panel-content__deactivated { - color: var(--primary-text-color--faint); - display: block; -} diff --git a/app/styles/components/profile-media-panel.scss b/app/styles/components/profile-media-panel.scss deleted file mode 100644 index e9169403c..000000000 --- a/app/styles/components/profile-media-panel.scss +++ /dev/null @@ -1,16 +0,0 @@ -.media-panel { - &__content { - width: 100%; - padding: 8px 0; - } - - &__list { - display: flex; - flex-wrap: wrap; - } - - &__empty { - font-size: 14px; - color: var(--primary-text-color--faint); - } -} diff --git a/app/styles/components/radio-button.scss b/app/styles/components/radio-button.scss deleted file mode 100644 index 77fb82846..000000000 --- a/app/styles/components/radio-button.scss +++ /dev/null @@ -1,38 +0,0 @@ -.radio-button { - @apply text-black dark:text-white; - font-size: 14px; - position: relative; - display: inline-block; - padding: 6px 0; - line-height: 18px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - cursor: pointer; - - input[type=radio], - input[type=checkbox] { - display: none; - } - - &__input { - @apply inline-block relative box-border border border-solid border-primary-600; - width: 18px; - height: 18px; - flex: 0 0 auto; - margin-right: 10px; - top: -1px; - border-radius: 50%; - vertical-align: middle; - - &.checked { - @apply bg-primary-600; - } - - &:active, - &:focus, - &:hover { - @apply border-4; - } - } -} diff --git a/app/styles/components/remote-timeline.scss b/app/styles/components/remote-timeline.scss deleted file mode 100644 index c59427a3f..000000000 --- a/app/styles/components/remote-timeline.scss +++ /dev/null @@ -1,4 +0,0 @@ -.federation-restriction { - display: flex; - padding: 15px 0; -} diff --git a/app/styles/components/reply-mentions.scss b/app/styles/components/reply-mentions.scss index e767e5a03..2a1ec75d7 100644 --- a/app/styles/components/reply-mentions.scss +++ b/app/styles/components/reply-mentions.scss @@ -6,8 +6,7 @@ } } -.status__wrapper, -.detailed-status { +.status__wrapper { .reply-mentions { display: block; diff --git a/app/styles/components/search.scss b/app/styles/components/search.scss index 7dcf461c1..e8a33a44e 100644 --- a/app/styles/components/search.scss +++ b/app/styles/components/search.scss @@ -2,12 +2,6 @@ position: relative; } -input.search__input { - @include search-input; - display: block; - padding: 7px 30px 6px 10px; -} - .search__icon { &::-moz-focus-inner { border: 0; @@ -55,52 +49,6 @@ input.search__input { } } -.search-header { - display: block; - width: 100%; - - &__text-container { - display: none; - padding: 25px 0; - background-color: var(--accent-color--med); - - @media (min-width: 896px) { - display: block; - } - } - - &__title-text { - color: var(--primary-text-color); - font-size: 27px; - font-weight: bold; - line-height: 32px; - overflow: hidden; - padding-left: 20px; - text-overflow: ellipsis; - white-space: nowrap; - max-width: 1200px; - margin: 0 auto; - } - - &__type-filters-tabs { - display: flex; - width: 100%; - max-width: 1200px; - margin: 0 auto; - - @media screen and (max-width: 895px) { - max-width: 580px; - } - } - - @media (min-width: 896px) and (max-width: 1190px) { - &__title-text, - &__type-filters-tabs { - max-width: 900px; - } - } -} - .column { .search { padding: 10px 15px; @@ -108,12 +56,6 @@ input.search__input { border-bottom: 1px solid hsla(var(--primary-text-color_hsl), 0.2); } - input.search__input { - background-color: var(--background-color); - border-radius: 8px; - padding: 12px 36px 12px 16px; - } - .search__icon .svg-icon { right: 24px; } diff --git a/app/styles/components/server-info.scss b/app/styles/components/server-info.scss deleted file mode 100644 index a24335eef..000000000 --- a/app/styles/components/server-info.scss +++ /dev/null @@ -1,21 +0,0 @@ -.columns-area { - .info_column_area { - padding: 15px; - - .wtf-panel { - border: 1px solid var(--brand-color--med); - } - } -} - -.info__brand { - .brand h1 { - @apply text-2xl text-black dark:text-white; - } - - .brand__tagline { - font-size: 20px; - line-height: 1.15; - margin-top: 15px; - } -} diff --git a/app/styles/components/setting-toggle.scss b/app/styles/components/setting-toggle.scss deleted file mode 100644 index 1acbcfffe..000000000 --- a/app/styles/components/setting-toggle.scss +++ /dev/null @@ -1,3 +0,0 @@ -.setting-toggle__label { - color: var(--gray-800); -} diff --git a/app/styles/components/sidebar-menu.scss b/app/styles/components/sidebar-menu.scss index 9c015badb..9d3625863 100644 --- a/app/styles/components/sidebar-menu.scss +++ b/app/styles/components/sidebar-menu.scss @@ -16,8 +16,3 @@ transform: translateX(0); } } - -.sidebar-menu .wtf-panel { - box-shadow: none !important; - margin: 0; -} diff --git a/app/styles/components/spoiler-button.scss b/app/styles/components/spoiler-button.scss index 5c6a77ae0..35498bef9 100644 --- a/app/styles/components/spoiler-button.scss +++ b/app/styles/components/spoiler-button.scss @@ -6,14 +6,6 @@ position: absolute; z-index: 40; - &--minified { - display: block; - left: 4px; - top: 4px; - width: auto; - height: auto; - } - &--hidden { display: none; } diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss index bdbdfa7a4..1b3a0872b 100644 --- a/app/styles/components/status.scss +++ b/app/styles/components/status.scss @@ -218,21 +218,6 @@ a.status-card { } } -@media screen and (min-width: 630px) { - .columns-area .material-status .status { - padding: 15px; - - &__avatar { - top: 0; - left: 0; - } - - &__content { - padding-top: 10px; - } - } -} - .attachment-thumbs { position: relative; diff --git a/app/styles/components/trends.scss b/app/styles/components/trends.scss deleted file mode 100644 index 7984aa873..000000000 --- a/app/styles/components/trends.scss +++ /dev/null @@ -1,78 +0,0 @@ -.trends { - &__header { - color: var(--primary-text-color); - background: var(--brand-color--faint); - border-bottom: 1px solid var(--brand-color--med); - font-weight: 500; - padding: 15px; - font-size: 16px; - cursor: default; - - .fa { - display: inline-block; - margin-right: 5px; - } - } - - &__item { - display: flex; - align-items: center; - padding: 15px; - border-bottom: 1px solid var(--brand-color--med); - - &:last-child { - border-bottom: 0; - } - - &__name { - flex: 1 1 auto; - color: var(--primary-text-color); - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: 13px; - - strong { - font-weight: bold; - } - - a { - color: var(--primary-text-color--faint); - text-decoration: none; - font-size: 14px; - font-weight: 500; - display: block; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - &:hover, - &:focus, - &:active { - span { - text-decoration: underline; - } - } - } - } - - &__current { - flex: 0 0 auto; - width: 100px; - font-size: 24px; - line-height: 36px; - font-weight: 500; - text-align: center; - color: var(--primary-text-color--faint); - } - - &__sparkline { - flex: 0 0 auto; - width: 50px; - - path { - stroke: var(--highlight-text-color) !important; - } - } - } -} diff --git a/app/styles/components/video-player.scss b/app/styles/components/video-player.scss index b4e87e9b6..1a81d167e 100644 --- a/app/styles/components/video-player.scss +++ b/app/styles/components/video-player.scss @@ -1,69 +1,3 @@ -.video-error-cover { - align-items: center; - background: var(--background-color); - color: var(--primary-text-color); - cursor: pointer; - display: flex; - flex-direction: column; - height: 100%; - justify-content: center; - position: relative; - text-align: center; - z-index: 100; -} - -.status__video-player { - background: var(--background-color); - box-sizing: border-box; - cursor: default; /* May not be needed */ - margin-top: 8px; - overflow: hidden; - position: relative; -} - -.status__video-player-video { - height: 100%; - object-fit: cover; - position: relative; - top: 50%; - transform: translateY(-50%); - width: 100%; - z-index: 1; -} - -.status__video-player-expand, -.status__video-player-mute { - color: var(--primary-text-color); - opacity: 0.8; - position: absolute; - right: 4px; - text-shadow: 0 1px 1px $base-shadow-color, 1px 0 1px $base-shadow-color; -} - -.status__video-player-spoiler { - display: none; - color: var(--primary-text-color); - left: 4px; - position: absolute; - text-shadow: 0 1px 1px $base-shadow-color, 1px 0 1px $base-shadow-color; - top: 4px; - z-index: 100; - - &.status__video-player-spoiler--visible { - display: block; - } -} - -.status__video-player-expand { - bottom: 4px; - z-index: 100; -} - -.status__video-player-mute { - top: 4px; - z-index: 5; -} - .detailed, .fullscreen { .video-player__volume__current, @@ -423,14 +357,3 @@ border: 0; display: block; } - -.media-spoiler-video-play-icon { - border-radius: 100px; - color: var(--primary-text-color--faint); - font-size: 36px; - left: 50%; - padding: 5px; - position: absolute; - top: 50%; - transform: translate(-50%, -50%); -} diff --git a/app/styles/components/wtf-panel.scss b/app/styles/components/wtf-panel.scss deleted file mode 100644 index 2d536e781..000000000 --- a/app/styles/components/wtf-panel.scss +++ /dev/null @@ -1,73 +0,0 @@ -.wtf-panel { - @include standard-panel; - display: flex; - width: 100%; - flex-direction: column; - height: auto; - box-sizing: border-box; - - @media screen and (max-width: 580px) { - border-radius: 0; - } - - &:first-child { - margin-top: 0; - } - - &:not(:last-of-type) { - margin-bottom: 10px; - } - - .wtf-panel-header { - display: flex; - align-items: center; - margin-bottom: 10px; - padding: 15px 15px 0; - - &__icon { - margin-right: 10px; - font-size: 20px; - - &.svg-icon { - width: 20px; - height: 20px; - } - } - - &__label { - flex: 1 1; - color: var(--primary-text-color); - font-size: 16px; - font-weight: bold; - line-height: 19px; - } - } - - &__content { - width: 100%; - padding-top: 8px; - } - - &__list { - padding: 0 5px; - } - - &__expand-btn { - @apply border-gray-300 dark:border-gray-600; - display: block; - width: 100%; - height: 100%; - max-height: 46px; - position: relative; - border-top: 1px solid; - transition: max-height 150ms ease; - overflow: hidden; - opacity: 1; - text-align: center; - line-height: 46px; - font-size: 14px; - cursor: pointer; - color: var(--primary-text-color); - text-decoration: none; - } -} diff --git a/app/styles/demetricator.scss b/app/styles/demetricator.scss deleted file mode 100644 index 8af4e8ce7..000000000 --- a/app/styles/demetricator.scss +++ /dev/null @@ -1,5 +0,0 @@ -body.demetricator { - .icon-with-badge__badge { - display: none; - } -} diff --git a/app/styles/donations.scss b/app/styles/donations.scss deleted file mode 100644 index 121e6fbc3..000000000 --- a/app/styles/donations.scss +++ /dev/null @@ -1,113 +0,0 @@ -.sub { - border: 1px solid hsla(var(--primary-text-color_hsl), 0.5); - padding: 20px; - position: relative; - border-radius: 4px; - - &__title { - text-transform: uppercase; - font-weight: bold; - font-size: 1.3rem; - margin-bottom: 4px; - } - - &__amount { - font-size: 2rem; - line-height: normal; - margin: 4px 0 12px; - } - - &__billing { - font-size: 14px; - } - - &__button { - margin-top: 20px; - } - - /* Status indicator */ - &::before { - content: ''; - display: block; - position: absolute; - top: 15px; - right: 13px; - border-radius: 100%; - background-color: transparent; - height: 13px; - width: 13px; - } - - &--trialing, - &--active { - &::before { - background-color: #0f0; - } - } - - &--cancelling::before { - background-color: #ff0; - } - - &--incomplete, - &--incomplete_expired, - &--past_due, - &--canceled, - &--unpaid { - &::before { - background-color: #f00; - } - } -} - -.subs { - .sub { - border-radius: 0; - - & + .sub { - border-top: 0; - } - - &:first-child { - border-top-left-radius: 4px; - border-top-right-radius: 4px; - } - - &:last-child { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - } - } -} - -body.admin { - .actions { - margin-top: 40px; - } -} - -.funding-panel { - margin-top: 15px; - - strong { - font-weight: bold; - } - - &__ratio { - font-size: 14px; - margin-bottom: 8px; - } - - &__description { - margin-top: 14px; - font-size: 15px; - } - - .button { - margin-top: 20px; - } - - &__reached { - color: var(--brand-color); - } -} 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/app/styles/fonts.scss b/app/styles/fonts.scss index bd8f1bec5..fbb21c381 100644 --- a/app/styles/fonts.scss +++ b/app/styles/fonts.scss @@ -3,26 +3,26 @@ // OpenDyslexic @font-face { font-family: 'OpenDyslexic'; - src: url('../fonts/OpenDyslexic/OpenDyslexic-Regular.woff2') format('woff2'); + src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2') format('woff2'); } @font-face { font-family: 'OpenDyslexic'; font-weight: bold; - src: url('../fonts/OpenDyslexic/OpenDyslexic-Bold.woff2') format('woff2'); + src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2') format('woff2'); } @font-face { font-family: 'OpenDyslexic'; font-weight: bold; font-style: italic; - src: url('../fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2') format('woff2'); + src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2') format('woff2'); } @font-face { font-family: 'OpenDyslexic'; font-style: italic; - src: url('../fonts/OpenDyslexic/OpenDyslexic-Italic.woff2') format('woff2'); + src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2') format('woff2'); } // TYPEOGRAPHY MIXINS @@ -62,11 +62,11 @@ // Soapbox icon font @font-face { font-family: 'soapbox'; - src: url('../fonts/soapbox/soapbox.eot?pryg6i'); - src: url('../fonts/soapbox/soapbox.eot?pryg6i#iefix') format('embedded-opentype'), - url('../fonts/soapbox/soapbox.ttf?pryg6i') format('truetype'), - url('../fonts/soapbox/soapbox.woff?pryg6i') format('woff'), - url('../fonts/soapbox/soapbox.svg?pryg6i#soapbox') format('svg'); + src: url('../assets/fonts/soapbox/soapbox.eot?pryg6i'); + src: url('../assets/fonts/soapbox/soapbox.eot?pryg6i#iefix') format('embedded-opentype'), + url('../assets/fonts/soapbox/soapbox.ttf?pryg6i') format('truetype'), + url('../assets/fonts/soapbox/soapbox.woff?pryg6i') format('woff'), + url('../assets/fonts/soapbox/soapbox.svg?pryg6i#soapbox') format('svg'); font-weight: normal; font-style: normal; } diff --git a/app/styles/footer.scss b/app/styles/footer.scss deleted file mode 100644 index 835d40061..000000000 --- a/app/styles/footer.scss +++ /dev/null @@ -1,74 +0,0 @@ -.public-layout { - .footer { - display: flex; - padding: 40px 0; - font-size: 12px; - justify-content: center; - align-items: center; - margin-top: auto; - color: #fff; - background-color: rgba(0, 0, 0, 0.15); - - @media screen and (max-width: 1024px) { - padding: 40px 20px; - } - - .footer-container { - display: flex; - width: 1280px; - align-items: center; - padding: 0 20px; - flex-direction: column-reverse; - justify-content: center; - } - - h4 { - text-transform: uppercase; - font-weight: 700; - margin-bottom: 8px; - color: var(--primary-text-color--faint); - font-size: 1.6rem; - line-height: 1.5; - - a { - color: inherit; - text-decoration: none; - } - } - - .copyright { - margin: 0 auto auto; - text-align: center; - - span { - font-size: 1.3rem; - font-weight: 500; - line-height: 1.5; - } - } - - ul { - display: flex; - flex-wrap: wrap; - margin: 0 auto 20px; - - li { - a { - text-decoration: none; - color: $color-5-dark; - font-size: 1.3rem; - font-weight: 500; - line-height: 1.5; - padding: 10px 4px; - margin-left: 10px; - - &:hover, - &:active, - &:focus { - text-decoration: underline; - } - } - } - } - } -} diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 50a59a1be..fc4b6a257 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -586,38 +586,6 @@ code { margin-bottom: 14px; font-weight: bold; } - - .showable-password { - position: relative; - - input { - padding-right: 36px; - } - - .icon-button { - @apply text-black dark:text-white; - position: absolute; - top: 0; - right: 0; - height: 38px; - width: 36px; - padding: 0; - margin: 0; - background: transparent; - - .svg-icon { - height: 20px; - width: 20px; - } - } - } -} - -.block-icon { - display: block; - margin: 0 auto; - margin-bottom: 10px; - font-size: 24px; } .simple_form { @@ -660,14 +628,6 @@ code { } } -.columns-area { - form.simple_form--public { - @include standard-panel; - margin-top: 20px; - padding: 60px 30px; - } -} - .captcha { background-color: #fff; border-radius: 4px; diff --git a/app/styles/holiday/halloween.scss b/app/styles/holiday/halloween.scss deleted file mode 100644 index 9fcf96ae5..000000000 --- a/app/styles/holiday/halloween.scss +++ /dev/null @@ -1,144 +0,0 @@ -.halloween, -.site-preview.halloween { - // Set brand color to orange - --brand-color_h: 29.727272727272727; - --brand-color_s: 100%; - --brand-color_l: 43.13725490196079%; - - // Stars BG - background-color: #904700; // Color matches twinkle.svg - background-image: url('../images/halloween/starfield.png'); - background-size: cover; - background-attachment: fixed; - background-position: center; - - // Full-screen pseudo-elements to hold BG graphics - &::before, - &::after, - > .app-holder::before, - > .app-holder::after { - content: ''; - display: block; - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-size: cover; - background-position: center; - width: 100%; - height: 100%; - z-index: -100; - } - - // Spiderweb BG - &::before { - background-image: url('../images/halloween/spiderweb.svg'); - } - - // Twinkle effect by masking with semi-transparent animated circles - &::after { - z-index: -101; - background: transparent url("../images/halloween/twinkle.svg") repeat top center; - animation: halloween-twinkle 200s linear infinite; - } - - > .app-holder { - // Vignette - &::before { - background-image: radial-gradient( - circle, - transparent 0%, - transparent 60%, - var(--vignette-color) 100% - ); - } - - // Floating clouds BG - &::after { - background: transparent url("../images/halloween/clouds.png") repeat top center; - animation: halloween-clouds 200s linear infinite; - } - - // Dangling spider - .ui .page__top::after, - .ui .page__columns::after { - content: ''; - display: block; - width: 100px; - height: 100px; - right: 20px; - background-image: url('../images/halloween/spider.svg'); - background-size: contain; - background-repeat: no-repeat; - background-position: top right; - z-index: -1; - pointer-events: none; - } - - .ui .page__columns::after { - position: fixed; - top: 50px; - } - - .ui .page__top::after { - position: absolute; - bottom: -100px; - } - - .ui .page__top + .page__columns::after { - display: none; - } - - .profile-info-panel { - color: #fff; - - &-content__name h1 { - span:first-of-type { - color: hsla(0, 0%, 100%, 0.6); - } - - small { - color: #fff; - } - } - - &-content__bio { - color: #fff; - } - - &-content__bio a, - &-content__fields a { - color: hsl( - var(--brand-color_h), - var(--brand-color_s), - calc(var(--brand-color_l) + 8%) - ); - } - } - } - - .column-header > button.grouped, - .column-header > .btn.grouped { - color: #fff; - - &:hover { - color: #fff; - } - - &::before { - background-color: var(--brand-color); - } - } -} - -// Animations -@keyframes halloween-twinkle { - from { background-position: 0 0; } - to { background-position: -10000px 5000px; } -} - -@keyframes halloween-clouds { - from { background-position: 0 0; } - to { background-position: 10000px 0; } -} diff --git a/app/styles/placeholder.scss b/app/styles/placeholder.scss index 72a69c155..709926650 100644 --- a/app/styles/placeholder.scss +++ b/app/styles/placeholder.scss @@ -1,4 +1,3 @@ -.placeholder-hashtag, .media-gallery--placeholder { position: relative; @@ -32,11 +31,6 @@ 100% { background-position-x: 0; } } -.placeholder-hashtag .trends__item__name { - color: var(--brand-color); - opacity: 0.1; -} - .chat-list-item--placeholder .chat__last-message { letter-spacing: -1px; color: var(--brand-color) !important; diff --git a/app/styles/reset.scss b/app/styles/reset.scss deleted file mode 100644 index 2906b3ac2..000000000 --- a/app/styles/reset.scss +++ /dev/null @@ -1,54 +0,0 @@ -/* http://meyerweb.com/eric/tools/css/reset/ - v2.0 | 20110126 - License: none (public domain) -*/ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} - -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; -} - -body { - line-height: 1; -} - -ol, ul { - list-style: none; -} - -blockquote, q { - quotes: none; -} - -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} \ No newline at end of file diff --git a/app/styles/rtl.scss b/app/styles/rtl.scss index 852cf3edd..dc17469e2 100644 --- a/app/styles/rtl.scss +++ b/app/styles/rtl.scss @@ -13,11 +13,6 @@ body.rtl { margin-left: 5px; } - .search__input { - padding-right: 10px; - padding-left: 30px; - } - .search__icon .fa { right: auto; left: 10px; @@ -69,16 +64,6 @@ body.rtl { margin-right: 0; } - .detailed-status__display-name .display-name { - text-align: right; - } - - .detailed-status__display-avatar { - margin-right: 0; - margin-left: 10px; - float: right; - } - .fa-ul { margin-left: 0; margin-left: 2.14285714em; @@ -134,13 +119,6 @@ body.rtl { padding-right: 10px; } } - - .columns-area > div { - .column { - padding-left: 5px; - padding-right: 5px; - } - } } .public-layout { diff --git a/app/styles/truth.scss b/app/styles/truth.scss deleted file mode 100644 index 5c7e1770f..000000000 --- a/app/styles/truth.scss +++ /dev/null @@ -1,339 +0,0 @@ -:root { - --tmg-green: #008000; -} - -.tabs-bar { - background: var(--foreground-color); - border-bottom: 1px solid hsla(var(--primary-text-color_hsl), 0.1); -} - -.tabs-bar__link { - &--logo { - padding: 9px 5px; - align-self: center; - justify-self: center; - filter: none; - } - - .svg-icon { - color: var(--brand-color); - transition: none; - } - - &:hover .svg-icon { - color: white; - } -} - -.tabs-bar .react-toggle-track { - background-color: var(--brand-color) !important; -} - -.theme-mode-dark .primary-navigation > button::before, -.theme-mode-dark .primary-navigation > .btn::before { - background-color: var(--brand-color) !important; -} - -@media screen and (max-width: 450px) { - .tabs-bar__link--logo { - margin: 0 auto; - padding: 12px 5px; - position: absolute; - left: 0; - right: 0; - text-align: center; - } - - .tabs-bar__split--right { - margin: 0; - order: -1; - } -} - -.account__section-headline .column-header__buttons, -.account__header__extra__links > div { - display: none; -} - -.account__header__extra__links { - justify-content: flex-start; - border-bottom: 1px solid #ccc; - - a { - display: flex; - align-items: center; - } - - span:first-of-type { - margin-right: 5px; - } -} - -.display-name__name { - display: inline-flex; - align-items: center; -} - -// .verified-icon { -// display: inline-flex; -// align-items: center; -// margin: 0 3px; -// padding-top: 2px; - -// svg { -// width: 18px; -// height: 18px; -// } -// } - -.theme-mode-light { - --background-color_h: 0; - --background-color_s: 0%; - --background-color_l: 96%; -} - -.status__action-bar__counter--reblog, -.detailed-status__button--reblog { - .icon-button.active { - color: var(--tmg-green); - - .svg-icon svg { - color: var(--tmg-green); - } - } -} - -.status__action-bar__counter--favourite, -.detailed-status__button--favourite { - .icon-button.active { - color: var(--accent-color); - fill: var(--accent-color); - - .svg-icon svg { - color: var(--accent-color); - fill: var(--accent-color); - } - } -} - -.emoji-react--reblogs { - .svg-icon { - color: var(--tmg-green); - } -} - -.sidebar-menu__close { - top: 20px; -} - -.primary-navigation__icon { - stroke: currentColor; -} - -.public-layout { - background: linear-gradient(135deg, #fff, #f5f5f5); - - .header { - .simple_form { - button { - background: $color-6-light; - color: $color-3; - font-size: 14px; - line-height: 14px; - padding: 10px 15px; - border: 1px solid $color-3 !important; - - &:hover, - &:active, - &:focus { - background: $color-6; - } - - &::selection { - background-color: transparent; - color: $color-3; - } - } - - input[type="text"], - input[type="password"] { - padding: 8px 15px; - font-size: 14px; - line-height: 14px; - background: $color-6-light; - border-color: $color-6-dark; - } - } - - .nav-right .simple_form.new_user .fields-group p.hint.subtle-hint a { - background-color: transparent; - } - } -} - -.landing { - .landing-columns--left { - display: flex; - align-items: center; - } - - .landing-columns--right { - display: flex; - align-items: center; - - .simple_form { - position: relative; - z-index: 10; - box-shadow: 0 0 30px 5px rgba(0, 0, 0, 0.05); - background-color: $color-6-light; - padding: 40px; - - h1 { - text-align: center; - font-size: 32px; - font-weight: 600; - color: $color-4-dark; - margin-bottom: 30px; - } - - input[type="text"], - input[type="password"], - input[type="email"] { - padding: 10 15px; - font-size: 14px; - line-height: 14px; - background: $color-6; - border-color: $color-6-dark; - margin-bottom: 10px; - } - - button { - background: $color-2; - font-size: 16px; - line-height: 16px; - padding: 15px; - border: none; - border-radius: 8px; - color: $color-6-light; - - &:hover, - &:active, - &:focus { - background: $color-1; - } - - &::selection { - background-color: transparent; - color: $color-3; - } - } - } - } -} - -.public-layout { - .brand__tagline { - width: auto; - max-width: 800px; - } - - .landing__brand { - align-items: flex-start; - } - - .public-layout__top { - display: flex; - flex-direction: column; - - .header-container { - position: relative; - padding-top: 10px; - } - - .nav-left, - .nav-right { - position: relative; - z-index: 10; - } - - .container { - display: flex; - flex: 1; - } - - .landing { - display: flex; - flex: 1; - align-items: center; - justify-content: space-between; - } - - .landing-columns { - width: 100%; - - .landing-columns--right { - margin-left: auto; - - form { - margin: 0 auto; - } - } - - .landing-columns--left { - position: relative; - z-index: 10; - margin-right: 0; - - svg { - width: 700px; - max-width: 100%; - fill: $color-3-dark; - - .cls-1 { - opacity: 0.33; - } - - .cls-2 { - opacity: 0.66; - } - } - } - } - } - - .footer { - display: flex; - padding: 40px 0; - font-size: 12px; - justify-content: center; - align-items: center; - margin-top: auto; - color: #fff; - background-color: transparent; - - ul { - justify-content: center; - } - - .copyright { - color: $color-5; - } - } -} - -.compose-form__publish--direct button { - background-color: var(--brand-color); -} - -.sub-navigation__cog { - display: none; -} - -.detailed-status__link { - pointer-events: none; -} - -// Pull to refresh -.ptr__pull-down { - transform: translateY(10px); -} diff --git a/app/styles/ui.scss b/app/styles/ui.scss index e11041089..80884e2b5 100644 --- a/app/styles/ui.scss +++ b/app/styles/ui.scss @@ -151,30 +151,6 @@ .ellipsis::after { content: "…"; } -.timeline-compose-block { - @include standard-panel; - display: flex; - align-items: flex-start; - padding: 20px; - margin-bottom: 10px; - - .compose-form { - flex: 1 1; - padding: 0 0 0 20px !important; - position: relative; - - @media (max-width: 405px) { - padding: 0 !important; - } - } - - &__avatar { - display: block; - border-radius: 50%; - @media (max-width: 405px) { display: none; } - } -} - .no-reduce-motion .spoiler-input { transition: height 0.4s ease, opacity 0.4s ease; } @@ -193,33 +169,6 @@ } } -.domain { - padding: 10px; - border-bottom: 1px solid var(--brand-color--med); - - .domain__domain-name { - flex: 1 1 auto; - display: block; - color: var(--primary-text-color); - text-decoration: none; - font-size: 14px; - font-weight: 500; - } - - &__buttons .svg-icon { - height: 18px; - width: 18px; - } -} - -article:last-child > .domain { - border-bottom: none; -} - -.domain__wrapper { - display: flex; -} - .image-loader { position: relative; width: 100%; @@ -232,7 +181,7 @@ article:last-child > .domain { .image-loader__preview-canvas { max-width: $media-modal-media-max-width; max-height: $media-modal-media-max-height; - background: url('../images/void.png') repeat; + background: url('../assets/images/void.png') repeat; object-fit: contain; } @@ -253,7 +202,6 @@ article:last-child > .domain { .react-swipeable-view-container { &, - .columns-area, .column { height: 100%; } @@ -320,26 +268,6 @@ article:last-child > .domain { } } -.icon-with-badge__badge { - @include font-size(14); - @include line-height(14); - position: absolute; - box-sizing: border-box; - left: -10px; - top: 3px; - min-width: 16px; - height: 16px; - padding: 1px 3px 0; - border-radius: 8px; - text-align: center; - color: #fff; - background: var(--accent-color); - - @media screen and (max-width: 895px) { - top: 0; - } -} - .slist { &--flex { display: flex; @@ -522,8 +450,7 @@ article:last-child > .domain { } } -.filter-bar, -.account__section-headline { +.filter-bar { cursor: default; display: flex; flex-shrink: 0; @@ -590,12 +517,6 @@ article:last-child > .domain { 100% { opacity: 1; } } -.page__top + .page__columns .columns-area { - @media screen and (max-width: 580px) { - padding-top: 10px; - } -} - .text-muted { color: var(--gray-500); } 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/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/package.json b/package.json index 576eec262..6faed0629 100644 --- a/package.json +++ b/package.json @@ -56,18 +56,19 @@ "@lcdp/offline-plugin": "^5.1.0", "@metamask/providers": "^9.0.0", "@popperjs/core": "^2.11.5", - "@reach/menu-button": "^0.16.2", - "@reach/popover": "^0.16.2", - "@reach/portal": "^0.16.2", - "@reach/rect": "^0.16.0", - "@reach/tabs": "^0.16.4", - "@reach/tooltip": "^0.16.2", + "@reach/menu-button": "^0.18.0", + "@reach/popover": "^0.18.0", + "@reach/portal": "^0.18.0", + "@reach/rect": "^0.18.0", + "@reach/tabs": "^0.18.0", + "@reach/tooltip": "^0.18.0", "@reduxjs/toolkit": "^1.8.1", "@sentry/browser": "^7.11.1", "@sentry/react": "^7.11.1", "@sentry/tracing": "^7.11.1", - "@tabler/icons": "^1.109.0", + "@tabler/icons": "^1.111.0", "@tailwindcss/forms": "^0.5.3", + "@tailwindcss/line-clamp": "^0.4.2", "@tailwindcss/typography": "^0.5.7", "@tanstack/react-query": "^4.0.10", "@testing-library/react": "^12.1.4", @@ -173,13 +174,13 @@ "react-redux": "^7.2.5", "react-router-dom": "^5.3.0", "react-router-scroll-4": "^1.0.0-beta.2", - "react-simple-pull-to-refresh": "^1.3.0", + "react-simple-pull-to-refresh": "^1.3.3", "react-sparklines": "^1.7.0", "react-sticky-box": "^1.0.2", "react-swipeable-views": "^0.14.0", "react-textarea-autosize": "^8.3.4", "react-toggle": "^4.1.2", - "react-virtuoso": "^2.16.2", + "react-virtuoso": "^3.1.3", "redux": "^4.1.1", "redux-immutable": "^4.0.0", "redux-thunk": "^2.2.0", diff --git a/soapbox-screenshot.png b/soapbox-screenshot.png index 19c19e2c4..61c57bb47 100644 Binary files a/soapbox-screenshot.png and b/soapbox-screenshot.png differ diff --git a/tailwind.config.js b/tailwind.config.js index ab0b64525..7d562327b 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -85,6 +85,7 @@ module.exports = { }, plugins: [ require('@tailwindcss/forms'), + require('@tailwindcss/line-clamp'), require('@tailwindcss/typography'), ], }; 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 08bab9732..3d388e106 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 = { @@ -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, }, diff --git a/webpack/rules/assets.ts b/webpack/rules/assets.ts index d8c8e3e18..e9dd0202a 100644 --- a/webpack/rules/assets.ts +++ b/webpack/rules/assets.ts @@ -11,7 +11,7 @@ const rules: RuleSetRule[] = [{ test: /\.(png|svg)/, type: 'asset/resource', include: [ - resolve('app', 'images'), + resolve('app', 'assets', 'images'), resolve('node_modules', 'emoji-datasource'), ], generator: { @@ -21,7 +21,7 @@ const rules: RuleSetRule[] = [{ test: /\.(ttf|eot|svg|woff|woff2)/, type: 'asset/resource', include: [ - resolve('app', 'fonts'), + resolve('app', 'assets', 'fonts'), resolve('node_modules', 'fork-awesome'), resolve('node_modules', 'line-awesome'), resolve('node_modules', '@fontsource'), @@ -32,7 +32,7 @@ const rules: RuleSetRule[] = [{ }, { test: /\.(ogg|oga|mp3)/, type: 'asset/resource', - include: resolve('app', 'sounds'), + include: resolve('app', 'assets', 'sounds'), generator: { filename: 'packs/sounds/[name]-[contenthash:8][ext]', }, @@ -46,7 +46,7 @@ const rules: RuleSetRule[] = [{ }, { test: /\.svg$/, type: 'asset/resource', - include: resolve('app', 'icons'), + include: resolve('app', 'assets', 'icons'), generator: { filename: 'packs/icons/[name]-[contenthash:8][ext]', }, 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 dfcf9b2aa..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) => { @@ -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 diff --git a/yarn.lock b/yarn.lock index 9c2729f93..a0ef339e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2048,121 +2048,110 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.1.tgz#728ecd95ab207aab8a9a4e421f0422db329232be" integrity sha512-HnUhk1Sy9IuKrxEMdIRCxpIqPw6BFsbYSEUO9p/hNw5sMld/+3OLMWQP80F8/db9qsv3qUjs7ZR5bS/R+iinXw== -"@reach/auto-id@0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@reach/auto-id/-/auto-id-0.16.0.tgz#dfabc3227844e8c04f8e6e45203a8e14a8edbaed" - integrity sha512-5ssbeP5bCkM39uVsfQCwBBL+KT8YColdnMN5/Eto6Rj7929ql95R3HZUOkKIvj7mgPtEb60BLQxd1P3o6cjbmg== +"@reach/auto-id@0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/auto-id/-/auto-id-0.18.0.tgz#4b97085cd1cf1360a9bedc6e9c78e97824014f0d" + integrity sha512-XwY1IwhM7mkHZFghhjiqjQ6dstbOdpbFLdggeke75u8/8icT8uEHLbovFUgzKjy9qPvYwZIB87rLiR8WdtOXCg== dependencies: - "@reach/utils" "0.16.0" - tslib "^2.3.0" + "@reach/utils" "0.18.0" -"@reach/descendants@0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@reach/descendants/-/descendants-0.16.1.tgz#fa3d89c0503565369707f32985d87eef61985d9f" - integrity sha512-3WZgRnD9O4EORKE31rrduJDiPFNMOjUkATx0zl192ZxMq3qITe4tUj70pS5IbJl/+v9zk78JwyQLvA1pL7XAPA== +"@reach/descendants@0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/descendants/-/descendants-0.18.0.tgz#16fe52a5154da262994b0b8768baff4f670922d1" + integrity sha512-GXUxnM6CfrX5URdnipPIl3Tlc6geuz4xb4n61y4tVWXQX1278Ra9Jz9DMRN8x4wheHAysvrYwnR/SzAlxQzwtA== dependencies: - "@reach/utils" "0.16.0" - tslib "^2.3.0" + "@reach/utils" "0.18.0" -"@reach/dropdown@0.16.2": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@reach/dropdown/-/dropdown-0.16.2.tgz#4aa7df0f716cb448d01bc020d54df595303d5fa6" - integrity sha512-l4nNiX6iUpMdHQNbZMhgW5APtw0AUwJuRnkqE93vkjvdtrYl/sNJy1Jr6cGG7TrZIABLSOsfwbXU3C+qwJ3ftQ== +"@reach/dropdown@0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/dropdown/-/dropdown-0.18.0.tgz#c2e2e99df682f2136558851b80dc05b4f9dd92a5" + integrity sha512-LriXdVgxJoUhIQfS2r2DHYv3X6fHyplYxa9FmSwQIMXdESpE/P9Zsb1pVEObcNf3ZQBrl0L1bl/5rk7SpK7qfA== dependencies: - "@reach/auto-id" "0.16.0" - "@reach/descendants" "0.16.1" - "@reach/popover" "0.16.2" - "@reach/utils" "0.16.0" - tslib "^2.3.0" + "@reach/auto-id" "0.18.0" + "@reach/descendants" "0.18.0" + "@reach/polymorphic" "0.18.0" + "@reach/popover" "0.18.0" + "@reach/utils" "0.18.0" -"@reach/menu-button@^0.16.2": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@reach/menu-button/-/menu-button-0.16.2.tgz#664e33e70de431f88abf1f8537c48b1b6ce87e88" - integrity sha512-p4n6tFVaJZHJZEznHWy0YH2Xr3I+W7tsQWAT72PqKGT+uryGRdtgEQqi76f/8cRaw/00ueazBk5lwLG7UKGFaA== +"@reach/menu-button@^0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/menu-button/-/menu-button-0.18.0.tgz#ae40dc86e47e7f925599ca720e3ba65263cc56f3" + integrity sha512-v1lj5rYSpavOKI4ipXj8OfvQmvVNAYXCv+UcltRkjOcWEKWADUUKkGX55wiUhsCsTGCJ7lGYz5LqOZrn3LP6PQ== dependencies: - "@reach/dropdown" "0.16.2" - "@reach/popover" "0.16.2" - "@reach/utils" "0.16.0" - prop-types "^15.7.2" - tiny-warning "^1.0.3" - tslib "^2.3.0" + "@reach/dropdown" "0.18.0" + "@reach/polymorphic" "0.18.0" + "@reach/popover" "0.18.0" + "@reach/utils" "0.18.0" "@reach/observe-rect@1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@reach/observe-rect/-/observe-rect-1.2.0.tgz#d7a6013b8aafcc64c778a0ccb83355a11204d3b2" integrity sha512-Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ== -"@reach/popover@0.16.2", "@reach/popover@^0.16.2": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@reach/popover/-/popover-0.16.2.tgz#71d7af3002ca49d791476b22dee1840dd1719c19" - integrity sha512-IwkRrHM7Vt33BEkSXneovymJv7oIToOfTDwRKpuYEB/BWYMAuNfbsRL7KVe6MjkgchDeQzAk24cYY1ztQj5HQQ== - dependencies: - "@reach/portal" "0.16.2" - "@reach/rect" "0.16.0" - "@reach/utils" "0.16.0" - tabbable "^4.0.0" - tslib "^2.3.0" +"@reach/polymorphic@0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/polymorphic/-/polymorphic-0.18.0.tgz#2fe42007a774e06cdbc8e13e0d46f2dc30f2f1ed" + integrity sha512-N9iAjdMbE//6rryZZxAPLRorzDcGBnluf7YQij6XDLiMtfCj1noa7KyLpEc/5XCIB/EwhX3zCluFAwloBKdblA== -"@reach/portal@0.16.2", "@reach/portal@^0.16.2": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.16.2.tgz#ca83696215ee03acc2bb25a5ae5d8793eaaf2f64" - integrity sha512-9ur/yxNkuVYTIjAcfi46LdKUvH0uYZPfEp4usWcpt6PIp+WDF57F/5deMe/uGi/B/nfDweQu8VVwuMVrCb97JQ== +"@reach/popover@0.18.0", "@reach/popover@^0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/popover/-/popover-0.18.0.tgz#1eba3e9ed826ac69dfdf3b01a1dab15ca889b5fc" + integrity sha512-mpnWWn4w74L2U7fcneVdA6Fz3yKWNdZIRMoK8s6H7F8U2dLM/qN7AjzjEBqi6LXKb3Uf1ge4KHSbMixW0BygJQ== dependencies: - "@reach/utils" "0.16.0" - tiny-warning "^1.0.3" - tslib "^2.3.0" + "@reach/polymorphic" "0.18.0" + "@reach/portal" "0.18.0" + "@reach/rect" "0.18.0" + "@reach/utils" "0.18.0" + tabbable "^5.3.3" -"@reach/rect@0.16.0", "@reach/rect@^0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@reach/rect/-/rect-0.16.0.tgz#78cf6acefe2e83d3957fa84f938f6e1fc5700f16" - integrity sha512-/qO9jQDzpOCdrSxVPR6l674mRHNTqfEjkaxZHluwJ/2qGUtYsA0GSZiF/+wX/yOWeBif1ycxJDa6HusAMJZC5Q== +"@reach/portal@0.18.0", "@reach/portal@^0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.18.0.tgz#dd466f5110689d14a0e7491b3aa8a449e8cefb40" + integrity sha512-TImozRapd576ofRk30Le2L3lRTFXF1p47B182wnp5eMTdZa74JX138BtNGEPJFOyrMaVmguVF8SSwZ6a0fon1Q== + dependencies: + "@reach/utils" "0.18.0" + +"@reach/rect@0.18.0", "@reach/rect@^0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/rect/-/rect-0.18.0.tgz#d1dc45adc92f80cc54b64498e19de909ced40722" + integrity sha512-Xk8urN4NLn3F70da/DtByMow83qO6DF6vOxpLjuDBqud+kjKgxAU9vZMBSZJyH37+F8mZinRnHyXtlLn5njQOg== dependencies: "@reach/observe-rect" "1.2.0" - "@reach/utils" "0.16.0" - prop-types "^15.7.2" - tiny-warning "^1.0.3" - tslib "^2.3.0" + "@reach/utils" "0.18.0" -"@reach/tabs@^0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@reach/tabs/-/tabs-0.16.4.tgz#7da85e46f64052bdd1c0f9582f900e379b098ac5" - integrity sha512-4EK+1U0OoLfg2tJ1BSZf6/tx0hF5vlXKxY7qB//bPWtlIh9Xfp/aSDIdspFf3xS8MjtKeb6IVmo5UAxDMq85ZA== +"@reach/tabs@^0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/tabs/-/tabs-0.18.0.tgz#f2e789d445d61a371eace9415841502729d099c9" + integrity sha512-gTRJzStWJJtgMhn9FDEmKogAJMcqNaGZx0i1SGoTdVM+D29DBhVeRdO8qEg+I2l2k32DkmuZxG/Mrh+GZTjczQ== dependencies: - "@reach/auto-id" "0.16.0" - "@reach/descendants" "0.16.1" - "@reach/utils" "0.16.0" - prop-types "^15.7.2" - tslib "^2.3.0" + "@reach/auto-id" "0.18.0" + "@reach/descendants" "0.18.0" + "@reach/polymorphic" "0.18.0" + "@reach/utils" "0.18.0" -"@reach/tooltip@^0.16.2": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@reach/tooltip/-/tooltip-0.16.2.tgz#8448cee341476e4f795fa7192f7a0864f06b8085" - integrity sha512-wtJPnbJ6l4pmudMpQHGU9v1NS4ncDgcwRNi9re9KsIdsM525zccZvHQLteBKYiaW4ib7k09t2dbwhyNU9oa0Iw== +"@reach/tooltip@^0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/tooltip/-/tooltip-0.18.0.tgz#6d416e77a82543af9a57d122962f9c0294fc2a5f" + integrity sha512-yugoTmTjB3qoMk/nUvcnw99MqpyE2TQMOXE29qnQhSqHriRwQhfftjXlTAGTSzsUJmbyms3A/1gQW0X61kjFZw== dependencies: - "@reach/auto-id" "0.16.0" - "@reach/portal" "0.16.2" - "@reach/rect" "0.16.0" - "@reach/utils" "0.16.0" - "@reach/visually-hidden" "0.16.0" - prop-types "^15.7.2" - tiny-warning "^1.0.3" - tslib "^2.3.0" + "@reach/auto-id" "0.18.0" + "@reach/polymorphic" "0.18.0" + "@reach/portal" "0.18.0" + "@reach/rect" "0.18.0" + "@reach/utils" "0.18.0" + "@reach/visually-hidden" "0.18.0" -"@reach/utils@0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.16.0.tgz#5b0777cf16a7cab1ddd4728d5d02762df0ba84ce" - integrity sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q== - dependencies: - tiny-warning "^1.0.3" - tslib "^2.3.0" +"@reach/utils@0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.18.0.tgz#4f3cebe093dd436eeaff633809bf0f68f4f9d2ee" + integrity sha512-KdVMdpTgDyK8FzdKO9SCpiibuy/kbv3pwgfXshTI6tEcQT1OOwj7BAksnzGC0rPz0UholwC+AgkqEl3EJX3M1A== -"@reach/visually-hidden@0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@reach/visually-hidden/-/visually-hidden-0.16.0.tgz#2a5e834af9e93c554065ff8cbb0907fbeb26ad02" - integrity sha512-IIayZ3jzJtI5KfcfRVtOMFkw2ef/1dMT8D9BUuFcU2ORZAWLNvnzj1oXNoIfABKl5wtsLjY6SGmkYQ+tMPN8TA== +"@reach/visually-hidden@0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@reach/visually-hidden/-/visually-hidden-0.18.0.tgz#17923c08acc5946624c2836b2b09d359b3aa8c27" + integrity sha512-NsJ3oeHJtPc6UOeV6MHMuzQ5sl1ouKhW85i3C0S7VM+klxVlYScBZ2J4UVnWB50A2c+evdVpCnld2YeuyYYwBw== dependencies: - prop-types "^15.7.2" - tslib "^2.3.0" + "@reach/polymorphic" "0.18.0" "@reduxjs/toolkit@^1.8.1": version "1.8.1" @@ -2271,10 +2260,10 @@ remark "^13.0.0" unist-util-find-all-after "^3.0.2" -"@tabler/icons@^1.109.0": - version "1.109.0" - resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-1.109.0.tgz#11626c3fc097f2f70c4c197e4b9909fb05380752" - integrity sha512-B0YetE4pB6HY2Wa57v/LJ3NgkJzKYPze4U0DurIqPoKSptatKv2ga76FZSkO6EUpkYfHMtGPM6QjpJljfuCmAQ== +"@tabler/icons@^1.111.0": + version "1.111.0" + resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-1.111.0.tgz#0538fdd8b5de7072ae60fc5d2f13a9a636d2d0e3" + integrity sha512-TZWYiMT5ccqfHxRE0Qtgvl+sGsMbNkrv7cJMt/tm8TN9l/CDXx/o7d8uAwUN+3PAlSFfF5e/rD1bi1WJs2xNIA== "@tailwindcss/forms@^0.5.3": version "0.5.3" @@ -2283,6 +2272,11 @@ dependencies: mini-svg-data-uri "^1.2.3" +"@tailwindcss/line-clamp@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@tailwindcss/line-clamp/-/line-clamp-0.4.2.tgz#f353c5a8ab2c939c6267ac5b907f012e5ee130f9" + integrity sha512-HFzAQuqYCjyy/SX9sLGB1lroPzmcnWv1FHkIpmypte10hptf4oPUfucryMKovZh2u0uiS9U5Ty3GghWfEJGwVw== + "@tailwindcss/typography@^0.5.7": version "0.5.7" resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.7.tgz#e0b95bea787ee14c5a34a74fc824e6fe86ea8855" @@ -10021,10 +10015,10 @@ react-side-effect@^2.1.0: resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ== -react-simple-pull-to-refresh@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/react-simple-pull-to-refresh/-/react-simple-pull-to-refresh-1.3.0.tgz#5f7bcd475ea5c33ecd505d097b14f56c3e5e3ce8" - integrity sha512-QPFGFsbroh2WoTcLCh3f6peMRfSettYJKCXMS9FNbFav7GWKD2whqACiNLx+Mi+VkP/I+aerB7kEirk+DQx41A== +react-simple-pull-to-refresh@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/react-simple-pull-to-refresh/-/react-simple-pull-to-refresh-1.3.3.tgz#118afe0d8ba6cade87094786b3889fb2ffd5b9bc" + integrity sha512-6qXsa5RtNVmKJhLWvDLIX8UK51HFtCEGjdqQGf+M1Qjrcc4qH4fki97sgVpGEFBRwbY7DiVDA5N5p97kF16DTw== react-sparklines@^1.7.0: version "1.7.0" @@ -10097,10 +10091,10 @@ react-transition-group@^2.2.1: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" -react-virtuoso@^2.16.2: - version "2.16.2" - resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-2.16.2.tgz#f0a290931ee358c40661d751df2d8b9f32496f0a" - integrity sha512-aH6XpizVYCpIkBm6td1q63Lqeu7KG1iAmpYVnzjThhm5tHEo9FJpeHAU73FJaMplFrfMKBrNfmO7a7jTOeM56g== +react-virtuoso@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-3.1.3.tgz#db811ff6fdd4749cfe9348f6d0b1333a348e65c4" + integrity sha512-sc4WICEZkyT+XdVc7gA/61UT43ZnMSX0ugh+xBG2cX+EDWs31wP1dSKQ2HSQ0YFLhZXRJ+Jqndqa8MTu4NE4CQ== dependencies: "@virtuoso.dev/react-urx" "^0.2.12" "@virtuoso.dev/urx" "^0.2.12" @@ -11329,10 +11323,10 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -tabbable@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-4.0.0.tgz#5bff1d1135df1482cf0f0206434f15eadbeb9261" - integrity sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ== +tabbable@^5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.3.3.tgz#aac0ff88c73b22d6c3c5a50b1586310006b47fbf" + integrity sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA== table@^6.0.9, table@^6.6.0: version "6.7.1" @@ -11608,7 +11602,7 @@ tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1: +tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==