-
-
+
);
}
diff --git a/app/javascript/gabsocial/components/popover/popover_root.js b/app/javascript/gabsocial/components/popover/popover_root.js
index 0a82d35c..95b3328d 100644
--- a/app/javascript/gabsocial/components/popover/popover_root.js
+++ b/app/javascript/gabsocial/components/popover/popover_root.js
@@ -5,6 +5,7 @@ import BundleModalError from '../bundle_modal_error'
import PopoverBase from './popover_base'
import ContentWarningPopover from './content_warning_popover'
import DatePickerPopover from './date_picker_popover'
+import EmojiPickerPopover from './emoji_picker_popover'
import GroupInfoPopover from './group_info_popover'
import ProfileOptionsPopover from './profile_options_popover'
import SearchPopover from './search_popover'
@@ -19,6 +20,7 @@ const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : fal
const POPOVER_COMPONENTS = {
CONTENT_WARNING: () => Promise.resolve({ default: ContentWarningPopover }),
DATE_PICKER: () => Promise.resolve({ default: DatePickerPopover }),
+ EMOJI_PICKER: () => Promise.resolve({ default: EmojiPickerPopover }),
GROUP_INFO: () => GroupInfoPopover,
PROFILE_OPTIONS: () => Promise.resolve({ default: ProfileOptionsPopover }),
SEARCH: () => Promise.resolve({ default: SearchPopover }),
diff --git a/app/javascript/gabsocial/components/popover/status_privacy_popover.js b/app/javascript/gabsocial/components/popover/status_privacy_popover.js
deleted file mode 100644
index ef78c638..00000000
--- a/app/javascript/gabsocial/components/popover/status_privacy_popover.js
+++ /dev/null
@@ -1,259 +0,0 @@
-import { injectIntl, defineMessages } from 'react-intl'
-import spring from 'react-motion/lib/spring'
-import detectPassiveEvents from 'detect-passive-events'
-import classNames from 'classnames'
-import Overlay from 'react-overlays/lib/Overlay'
-import { changeComposeVisibility } from '../../actions/compose'
-import { openModal, closeModal } from '../../actions/modal'
-import { isUserTouching } from '../../utils/is_mobile'
-import Motion from '../../features/ui/util/optional_motion'
-import Icon from '../icon'
-import ComposeExtraButton from '../../features/compose/components/compose_extra_button'
-
-const messages = defineMessages({
- public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
- public_long: { id: 'privacy.public.long', defaultMessage: 'Post to public timelines' },
- unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
- unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Do not show in public timelines' },
- private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
- private_long: { id: 'privacy.private.long', defaultMessage: 'Post to followers only' },
- change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
- visibility: { id: 'privacy.visibility', defaultMessage: 'Visibility' },
-})
-
-const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false
-
-class PrivacyDropdownMenu extends PureComponent {
-
- static propTypes = {
- style: PropTypes.object,
- items: PropTypes.array.isRequired,
- value: PropTypes.string.isRequired,
- placement: PropTypes.string.isRequired,
- onClose: PropTypes.func.isRequired,
- onChange: PropTypes.func.isRequired,
- }
-
- state = {
- mounted: false,
- }
-
- handleDocumentClick = e => {
- if (this.node && !this.node.contains(e.target)) {
- this.props.onClose()
- }
- }
-
- handleKeyDown = e => {
- const { items } = this.props
- const value = e.currentTarget.getAttribute('data-index')
- const index = items.findIndex(item => {
- return (item.value === value)
- })
- let element
-
- switch(e.key) {
- case 'Escape':
- this.props.onClose()
- break
- case 'Enter':
- this.handleClick(e)
- break
- case 'ArrowDown':
- element = this.node.childNodes[index + 1]
- if (element) {
- element.focus()
- this.props.onChange(element.getAttribute('data-index'))
- }
- break
- case 'ArrowUp':
- element = this.node.childNodes[index - 1]
- if (element) {
- element.focus()
- this.props.onChange(element.getAttribute('data-index'))
- }
- break
- case 'Home':
- element = this.node.firstChild
- if (element) {
- element.focus()
- this.props.onChange(element.getAttribute('data-index'))
- }
- break
- case 'End':
- element = this.node.lastChild
- if (element) {
- element.focus()
- this.props.onChange(element.getAttribute('data-index'))
- }
- break
- }
- }
-
- handleClick = e => {
- const value = e.currentTarget.getAttribute('data-index')
-
- e.preventDefault()
-
- this.props.onClose()
- this.props.onChange(value)
- }
-
- componentDidMount () {
- document.addEventListener('click', this.handleDocumentClick, false)
- document.addEventListener('touchend', this.handleDocumentClick, listenerOptions)
- if (this.focusedItem) this.focusedItem.focus()
- this.setState({ mounted: true })
- }
-
- componentWillUnmount () {
- document.removeEventListener('click', this.handleDocumentClick, false)
- document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions)
- }
-
- setRef = c => {
- this.node = c
- }
-
- setFocusRef = c => {
- this.focusedItem = c
- }
-
- render () {
- const { mounted } = this.state
- const { style, items, placement, value } = this.props
-
- return (
-
- 
-
-
-
-
- {items.map(item => (
-
- )}
-
-
- ))}
-
-
-
-
- {item.text}
- {item.meta}
-
-
- { /* */ }
-
+
+ {
+ this.options.map((option, i) => {
+ const isActive = option.value === value
+ const isLast = i === this.options.length - 1
+
+ const containerClasses = cx({
+ default: 1,
+ flexRow: 1,
+ py10: 1,
+ cursorPointer: 1,
+ borderBottom1PX: !isLast,
+ borderColorSecondary: !isLast,
+ backgroundSubtle_onHover: !isActive,
+ backgroundColorBrand: isActive,
+ })
+
+ const iconClasses = cx({
+ ml10: 1,
+ mt2: 1,
+ fillColorWhite: isActive,
+ })
+
+ return (
+
+ this.handleChange(option.value)}
+ className={containerClasses}
+ >
+
+ )
+ })
+ }
+
+
+ {option.title}
+
+
+ {option.subtitle}
+
+
+
diff --git a/app/javascript/gabsocial/components/sidebar_section_item.js b/app/javascript/gabsocial/components/sidebar_section_item.js
index 6581659c..3ea637b5 100644
--- a/app/javascript/gabsocial/components/sidebar_section_item.js
+++ b/app/javascript/gabsocial/components/sidebar_section_item.js
@@ -103,7 +103,7 @@ export default class SidebarSectionItem extends PureComponent {
buttonRef={buttonRef}
onMouseEnter={() => this.handleOnMouseEnter()}
onMouseLeave={() => this.handleOnMouseLeave()}
- className={[_s.default, _s.noUnderline, _s.cursorPointer, _s.width100PC, _s.alignItemsStart, _s.backgroundTransparent].join(' ')}
+ className={[_s.default, _s.noUnderline, _s.cursorPointer, _s.width100PC, _s.backgroundTransparent].join(' ')}
>
-
)
}
diff --git a/app/javascript/gabsocial/features/video/video.js b/app/javascript/gabsocial/components/video.js
similarity index 99%
rename from app/javascript/gabsocial/features/video/video.js
rename to app/javascript/gabsocial/components/video.js
index 1d34413b..ca6d8234 100644
--- a/app/javascript/gabsocial/features/video/video.js
+++ b/app/javascript/gabsocial/components/video.js
@@ -452,6 +452,8 @@ class Video extends PureComponent {
// fullscreen
// })}
+ // : todo spoiler :
+
const seekHandleClasses = cx({
default: 1,
positionAbsolute: 1,
diff --git a/app/javascript/gabsocial/features/account_timeline/account_timeline.js b/app/javascript/gabsocial/features/account_timeline.js
similarity index 95%
rename from app/javascript/gabsocial/features/account_timeline/account_timeline.js
rename to app/javascript/gabsocial/features/account_timeline.js
index f54305bc..707c0339 100644
--- a/app/javascript/gabsocial/features/account_timeline/account_timeline.js
+++ b/app/javascript/gabsocial/features/account_timeline.js
@@ -2,9 +2,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes'
import ImmutablePureComponent from 'react-immutable-pure-component'
import { List as ImmutableList } from 'immutable'
import { injectIntl, defineMessages } from 'react-intl'
-import { expandAccountFeaturedTimeline, expandAccountTimeline } from '../../actions/timelines'
-import { fetchAccountIdentityProofs } from '../../actions/identity_proofs'
-import StatusList from '../../components/status_list'
+import { expandAccountFeaturedTimeline, expandAccountTimeline } from '../actions/timelines'
+import { fetchAccountIdentityProofs } from '../actions/identity_proofs'
+import StatusList from '../components/status_list'
const messages = defineMessages({
empty: { id: 'empty_column.account_timeline', defaultMessage: 'No gabs here!' },
diff --git a/app/javascript/gabsocial/features/account_timeline/components/header/header.js b/app/javascript/gabsocial/features/account_timeline/components/header/header.js
deleted file mode 100644
index 5f210f5a..00000000
--- a/app/javascript/gabsocial/features/account_timeline/components/header/header.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import InnerHeader from '../inner_header';
-import MovedNote from '../moved_note';
-
-export default class Header extends ImmutablePureComponent {
-
- static propTypes = {
- account: ImmutablePropTypes.map,
- identity_proofs: ImmutablePropTypes.list,
- onFollow: PropTypes.func.isRequired,
- onBlock: PropTypes.func.isRequired,
- onMention: PropTypes.func.isRequired,
- onRepostToggle: PropTypes.func.isRequired,
- onReport: PropTypes.func.isRequired,
- onMute: PropTypes.func.isRequired,
- onBlockDomain: PropTypes.func.isRequired,
- onUnblockDomain: PropTypes.func.isRequired,
- onEndorseToggle: PropTypes.func.isRequired,
- onAddToList: PropTypes.func.isRequired,
- domain: PropTypes.string.isRequired,
- username: PropTypes.string,
- };
-
- static contextTypes = {
- router: PropTypes.object,
- };
-
- handleFollow = () => {
- this.props.onFollow(this.props.account);
- }
-
- handleBlock = () => {
- this.props.onBlock(this.props.account);
- }
-
- handleMention = () => {
- this.props.onMention(this.props.account, this.context.router.history);
- }
-
- handleReport = () => {
- this.props.onReport(this.props.account);
- }
-
- handleRepostToggle = () => {
- this.props.onRepostToggle(this.props.account);
- }
-
- handleMute = () => {
- this.props.onMute(this.props.account);
- }
-
- handleBlockDomain = () => {
- const domain = this.props.account.get('acct').split('@')[1];
-
- if (!domain) return;
-
- this.props.onBlockDomain(domain);
- }
-
- handleUnblockDomain = () => {
- const domain = this.props.account.get('acct').split('@')[1];
-
- if (!domain) return;
-
- this.props.onUnblockDomain(domain);
- }
-
- handleEndorseToggle = () => {
- this.props.onEndorseToggle(this.props.account);
- }
-
- handleAddToList = () => {
- this.props.onAddToList(this.props.account);
- }
-
- render () {
- const { account, identity_proofs } = this.props;
- const moved = (account) ? account.get('moved') : false;
-
- return (
-
diff --git a/app/javascript/gabsocial/features/status/components/card/card.js b/app/javascript/gabsocial/components/status_card.js
similarity index 99%
rename from app/javascript/gabsocial/features/status/components/card/card.js
rename to app/javascript/gabsocial/components/status_card.js
index 76f6c501..4d846903 100644
--- a/app/javascript/gabsocial/features/status/components/card/card.js
+++ b/app/javascript/gabsocial/components/status_card.js
@@ -3,7 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import punycode from 'punycode';
import classnames from 'classnames';
-import Icon from '../../../../components/icon';
+import Icon from './icon';
const IDNA_PREFIX = 'xn--';
diff --git a/app/javascript/gabsocial/components/status_content/status_content.js b/app/javascript/gabsocial/components/status_content/status_content.js
index b03aa7a1..737b16fc 100644
--- a/app/javascript/gabsocial/components/status_content/status_content.js
+++ b/app/javascript/gabsocial/components/status_content/status_content.js
@@ -285,12 +285,18 @@ class StatusContent extends ImmutablePureComponent {
/>
{
this.state.collapsed &&
-
+
+ {intl.formatMessage(messages.readMore)}
+
+
}
)
diff --git a/app/javascript/gabsocial/components/trends_panel_item.js b/app/javascript/gabsocial/components/trends_panel_item.js
index d31360ed..8ba5c3f4 100644
--- a/app/javascript/gabsocial/components/trends_panel_item.js
+++ b/app/javascript/gabsocial/components/trends_panel_item.js
@@ -15,6 +15,7 @@ const cx = classNames.bind(_s)
export default class TrendingItem extends ImmutablePureComponent {
static propTypes = {
+ index: PropTypes.number,
trend: ImmutablePropTypes.map.isRequired,
}
@@ -31,7 +32,7 @@ export default class TrendingItem extends ImmutablePureComponent {
}
render() {
- const { trend } = this.props
+ const { trend, index } = this.props
const { hovering } = this.state
const subtitleClasses = cx({
@@ -44,7 +45,7 @@ export default class TrendingItem extends ImmutablePureComponent {
underline: hovering,
})
- return null;
+ // return null;
// : todo :
@@ -56,7 +57,7 @@ export default class TrendingItem extends ImmutablePureComponent {
onMouseLeave={() => this.handleOnMouseLeave()}
>
- 1
+ {index}
Politics
diff --git a/app/javascript/gabsocial/components/trends_panel_item_card.js b/app/javascript/gabsocial/components/trends_panel_item_card.js
index 6aba9282..d9d44ff6 100644
--- a/app/javascript/gabsocial/components/trends_panel_item_card.js
+++ b/app/javascript/gabsocial/components/trends_panel_item_card.js
@@ -58,7 +58,7 @@ export default class TrendingItemCard extends ImmutablePureComponent {
The best flower subscription services: BloomsyBox, Bouqs...
- { moved &&
- );
- }
-
-}
diff --git a/app/javascript/gabsocial/features/account_timeline/components/header/header.scss b/app/javascript/gabsocial/features/account_timeline/components/header/header.scss
deleted file mode 100644
index d135b43b..00000000
--- a/app/javascript/gabsocial/features/account_timeline/components/header/header.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.account-timeline {
- &__header {
- display: block;
- width: 100%;
- }
-}
diff --git a/app/javascript/gabsocial/features/account_timeline/components/header/index.js b/app/javascript/gabsocial/features/account_timeline/components/header/index.js
deleted file mode 100644
index 08b400a2..00000000
--- a/app/javascript/gabsocial/features/account_timeline/components/header/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './header'
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/account_timeline/components/inner_header/index.js b/app/javascript/gabsocial/features/account_timeline/components/inner_header/index.js
deleted file mode 100644
index 052b8042..00000000
--- a/app/javascript/gabsocial/features/account_timeline/components/inner_header/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './inner_header'
diff --git a/app/javascript/gabsocial/features/account_timeline/components/inner_header/inner_header.js b/app/javascript/gabsocial/features/account_timeline/components/inner_header/inner_header.js
deleted file mode 100644
index 73940577..00000000
--- a/app/javascript/gabsocial/features/account_timeline/components/inner_header/inner_header.js
+++ /dev/null
@@ -1,337 +0,0 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import classNames from 'classnames';
-import { NavLink } from 'react-router-dom';
-import { debounce } from 'lodash';
-import Button from '../../../components/button';
-import { autoPlayGif, me, isStaff } from '../../../initial_state';
-import Avatar from '../../../components/avatar';
-import { shortNumberFormat } from '../../../utils/numbers';
-import ProfileInfoPanel from './profile_info_panel/profile_info_panel';
-
-const messages = defineMessages({
- unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
- follow: { id: 'account.follow', defaultMessage: 'Follow' },
- requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
- unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
- edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
- linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' },
- account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' },
- mention: { id: 'account.mention', defaultMessage: 'Mention' },
- unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
- block: { id: 'account.block', defaultMessage: 'Block @{name}' },
- mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
- report: { id: 'account.report', defaultMessage: 'Report @{name}' },
- share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' },
- media: { id: 'account.media', defaultMessage: 'Media' },
- blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
- unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
- hideReposts: { id: 'account.hide_reblogs', defaultMessage: 'Hide reposts from @{name}' },
- showReposts: { id: 'account.show_reblogs', defaultMessage: 'Show reposts from @{name}' },
- preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
- follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
- blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
- domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
- mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
- endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
- unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' },
- admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
- add_or_remove_from_list: { id: 'account.add_or_remove_from_list', defaultMessage: 'Add or Remove from lists' },
- accountFollowsYou: { id: 'account.follows_you', defaultMessage: 'Follows you' },
- accountBlocked: { id: 'account.blocked', defaultMessage: 'Blocked' },
- accountMuted: { id: 'account.muted', defaultMessage: 'Muted' },
- domainBlocked: { id: 'account.domain_blocked', defaultMessage: 'Domain hidden' },
-});
-
-export default
-@injectIntl
-class Header extends ImmutablePureComponent {
-
- static propTypes = {
- account: ImmutablePropTypes.map,
- identity_props: ImmutablePropTypes.list,
- onFollow: PropTypes.func.isRequired,
- onBlock: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- domain: PropTypes.string.isRequired,
- username: PropTypes.string,
- };
-
- state = {
- isSmallScreen: (window.innerWidth <= 895),
- }
-
- openEditProfile = () => {
- window.open('/settings/profile', '_blank');
- }
-
- isStatusesPageActive = (match, location) => {
- if (!match) {
- return false;
- }
-
- return !location.pathname.match(/\/(followers|following|favorites|pins)\/?$/);
- }
-
- componentWillMount () {
- window.addEventListener('resize', this.handleResize, { passive: true });
- }
-
- componentWillUnmount () {
- window.removeEventListener('resize', this.handleResize);
- }
-
- onChat = () => {
- const { account } = this.props;
-
- axios.post('https://chat.gab.com/private-message', {
- username: account.get('username'),
- })
- .then(function (response) {
- console.log(response);
- })
- .catch(function (error) {
- console.log(error);
- });
- }
-
- handleResize = debounce(() => {
- this.setState({ isSmallScreen: (window.innerWidth <= 895) });
- }, 5, {
- trailing: true,
- });
-
- makeMenu() {
- const { account, intl, domain } = this.props;
-
- let menu = [];
-
- if (!account || !me) {
- return [];
- }
-
- if ('share' in navigator) {
- menu.push({ text: intl.formatMessage(messages.share, { name: account.get('username') }), action: this.handleShare });
- menu.push(null);
- }
-
- if (account.get('id') === me) {
- menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
- menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
- menu.push(null);
- menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
- menu.push(null);
- menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
- menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
- menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
- } else {
- menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('acct') }), action: this.props.onMention });
-
- if (account.getIn(['relationship', 'following'])) {
- if (account.getIn(['relationship', 'showing_reblogs'])) {
- menu.push({ text: intl.formatMessage(messages.hideReposts, { name: account.get('username') }), action: this.props.onRepostToggle });
- } else {
- menu.push({ text: intl.formatMessage(messages.showReposts, { name: account.get('username') }), action: this.props.onRepostToggle });
- }
-
- menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
- menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle });
- menu.push(null);
- }
-
- if (account.getIn(['relationship', 'muting'])) {
- menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute });
- } else {
- menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.props.onMute });
- }
-
- if (account.getIn(['relationship', 'blocking'])) {
- menu.push({ text: intl.formatMessage(messages.unblock, { name: account.get('username') }), action: this.props.onBlock });
- } else {
- menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.props.onBlock });
- }
-
- menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport });
- }
-
- if (account.get('acct') !== account.get('username')) {
- const domain = account.get('acct').split('@')[1];
-
- menu.push(null);
-
- if (account.getIn(['relationship', 'domain_blocking'])) {
- menu.push({ text: intl.formatMessage(messages.unblockDomain, { domain }), action: this.props.onUnblockDomain });
- } else {
- menu.push({ text: intl.formatMessage(messages.blockDomain, { domain }), action: this.props.onBlockDomain });
- }
- }
-
- if (account.get('id') !== me && isStaff) {
- menu.push(null);
- menu.push({ text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), href: `/admin/accounts/${account.get('id')}` });
- }
-
- return menu;
- }
-
- makeInfo() {
- const { account, intl } = this.props;
-
- let info = [];
-
- if (!account || !me) return info;
-
- if (me !== account.get('id') && account.getIn(['relationship', 'followed_by'])) {
- info.push({intl.formatMessage(messages.accountFollowsYou)});
- } else if (me !== account.get('id') && account.getIn(['relationship', 'blocking'])) {
- info.push({intl.formatMessage(messages.accountBlocked)});
- }
-
- if (me !== account.get('id') && account.getIn(['relationship', 'muting'])) {
- info.push({intl.formatMessage(messages.accountMuted)});
- } else if (me !== account.get('id') && account.getIn(['relationship', 'domain_blocking'])) {
- info.push({intl.formatMessage(messages.domainBlocked)});
- }
-
- return info;
- };
-
- getActionBtn() {
- const { account, intl } = this.props;
-
- let actionBtn = null;
-
- if (!account || !me) return actionBtn;
-
- if (me !== account.get('id')) {
- if (!account.get('relationship')) { // Wait until the relationship is loaded
- //
- } else if (account.getIn(['relationship', 'requested'])) {
- actionBtn = ;
- } else if (!account.getIn(['relationship', 'blocking'])) {
- actionBtn = ;
- } else if (account.getIn(['relationship', 'blocking'])) {
- actionBtn = ;
- }
- }
-
- return actionBtn;
- };
-
- render () {
- const { account, intl, domain, username } = this.props;
- const { isSmallScreen } = this.state;
-
- if (!account) {
- return (
-
-
-
- );
- }
-
- const info = this.makeInfo();
- const actionBtn = this.getActionBtn();
- const menu = this.makeMenu();
-
- const content = { __html: account.get('note_emojified') };
- const fields = account.get('fields');
- const acct = account.get('acct').indexOf('@') === -1 && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
-
- const headerImgSrc = autoPlayGif ? account.get('header') : account.get('header_static');
- const headerMissing = (headerImgSrc.indexOf('/headers/original/missing.png') > -1);
-
- const avatarSize = isSmallScreen ? 90 : 200;
-
- return (
-
-
-
-
-
- {
- isSmallScreen &&
-
-
- }
-
-
- );
- }
-
-}
diff --git a/app/javascript/gabsocial/features/account_timeline/components/inner_header/inner_header.scss b/app/javascript/gabsocial/features/account_timeline/components/inner_header/inner_header.scss
deleted file mode 100644
index 45082120..00000000
--- a/app/javascript/gabsocial/features/account_timeline/components/inner_header/inner_header.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.relationship-tag {
- display: block;
- margin-bottom: 4px;
- vertical-align: top;
- color: $primary-text-color;
- background-color: $base-overlay-background;
- text-transform: uppercase;
- padding: 4px;
- border-radius: 4px;
- opacity: 0.7;
-
- @include text-sizing(11px, 500);
-
- &:hover {
- opacity: 1;
- }
-}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/account_timeline/components/moved_note/index.js b/app/javascript/gabsocial/features/account_timeline/components/moved_note/index.js
deleted file mode 100644
index 5173652d..00000000
--- a/app/javascript/gabsocial/features/account_timeline/components/moved_note/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './moved_note'
diff --git a/app/javascript/gabsocial/features/account_timeline/components/moved_note/moved_note.scss b/app/javascript/gabsocial/features/account_timeline/components/moved_note/moved_note.scss
deleted file mode 100644
index 6dda86be..00000000
--- a/app/javascript/gabsocial/features/account_timeline/components/moved_note/moved_note.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-.moved-note {
- padding: 14px 10px 16px 10px;
- background: lighten($ui-base-color, 4%);
- border-top: 1px solid lighten($ui-base-color, 8%);
- border-bottom: 1px solid lighten($ui-base-color, 8%);
-
- &__message {
- position: relative;
- margin-left: 58px;
- color: $dark-text-color;
- padding-bottom: 4px;
- font-size: 14px;
-
- >span {
- display: block;
-
- @include text-overflow;
- }
- }
-
- &__icon-wrapper {
- left: -26px;
- position: absolute;
- }
-
- &__display-name {
- display: block;
- color: $secondary-text-color;
- margin-bottom: 0;
- line-height: 24px;
- overflow: hidden;
-
- strong,
- span {
- display: block;
-
- @include text-overflow;
- }
-
- strong {
- font-size: 16px;
- color: $primary-text-color;
- }
-
- &:hover strong {
- text-decoration: underline;
- }
- }
-
- &__display-avatar {
- position: relative;
- float: left;
- margin-right: 10px;
- }
-}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/account_timeline/containers/header_container.js b/app/javascript/gabsocial/features/account_timeline/containers/header_container.js
deleted file mode 100644
index bea9a37e..00000000
--- a/app/javascript/gabsocial/features/account_timeline/containers/header_container.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { List as ImmutableList } from 'immutable';
-import {
- followAccount,
- unfollowAccount,
- blockAccount,
- unblockAccount,
- unmuteAccount,
- pinAccount,
- unpinAccount,
-} from '../../../actions/accounts';
-import {
- mentionCompose,
-} from '../../../actions/compose';
-import { initMuteModal } from '../../../actions/mutes';
-import { initReport } from '../../../actions/reports';
-import { openModal } from '../../../actions/modal';
-import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
-import { unfollowModal } from '../../../initial_state';
-import { makeGetAccount } from '../../../selectors';
-import Header from '../components/header';
-
-const messages = defineMessages({
- unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
- blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
- blockAndReport: { id: 'confirmations.block.block_and_report', defaultMessage: 'Block & Report' },
-});
-
-const makeMapStateToProps = () => {
- const getAccount = makeGetAccount();
-
- const mapStateToProps = (state, { accountId }) => ({
- account: getAccount(state, accountId),
- domain: state.getIn(['meta', 'domain']),
- identity_proofs: state.getIn(['identity_proofs', accountId], ImmutableList()),
- });
-
- return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-
- onFollow (account) {
- if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
- if (unfollowModal) {
- dispatch(openModal('UNFOLLOW', {
- accountId: account.get('id'),
- }))
- } else {
- dispatch(unfollowAccount(account.get('id')))
- }
- } else {
- dispatch(followAccount(account.get('id')))
- }
- },
-
- onBlock (account) {
- if (account.getIn(['relationship', 'blocking'])) {
- dispatch(unblockAccount(account.get('id')));
- } else {
- dispatch(openModal('BLOCK_ACCOUNT', {
- accountId: account.get('id'),
- }));
- }
- },
-
- onMention (account, router) {
- dispatch(mentionCompose(account, router));
- },
-
- onRepostToggle (account) {
- if (account.getIn(['relationship', 'showing_reblogs'])) {
- dispatch(followAccount(account.get('id'), false));
- } else {
- dispatch(followAccount(account.get('id'), true));
- }
- },
-
- onEndorseToggle (account) {
- if (account.getIn(['relationship', 'endorsed'])) {
- dispatch(unpinAccount(account.get('id')));
- } else {
- dispatch(pinAccount(account.get('id')));
- }
- },
-
- onReport (account) {
- dispatch(initReport(account));
- },
-
- onMute (account) {
- if (account.getIn(['relationship', 'muting'])) {
- dispatch(unmuteAccount(account.get('id')));
- } else {
- dispatch(initMuteModal(account));
- }
- },
-
- onBlockDomain (domain) {
- dispatch(openModal('BLOCK_DOMAIN', {
- domain,
- }));
- },
-
- onUnblockDomain (domain) {
- dispatch(unblockDomain(domain));
- },
-
- onAddToList(account){
- dispatch(openModal('LIST_ADDER', {
- accountId: account.get('id'),
- }));
- },
-
-});
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Header));
diff --git a/app/javascript/gabsocial/features/account_timeline/index.js b/app/javascript/gabsocial/features/account_timeline/index.js
deleted file mode 100644
index 48037c10..00000000
--- a/app/javascript/gabsocial/features/account_timeline/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './account_timeline'
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/blocks.js b/app/javascript/gabsocial/features/blocked_accounts.js
similarity index 100%
rename from app/javascript/gabsocial/features/blocks.js
rename to app/javascript/gabsocial/features/blocked_accounts.js
diff --git a/app/javascript/gabsocial/features/domain_blocks.js b/app/javascript/gabsocial/features/blocked_domains.js
similarity index 100%
rename from app/javascript/gabsocial/features/domain_blocks.js
rename to app/javascript/gabsocial/features/blocked_domains.js
diff --git a/app/javascript/gabsocial/features/compose/components/compose_extra_button.js b/app/javascript/gabsocial/features/compose/components/compose_extra_button.js
index 183bc0f1..d3eef03c 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_extra_button.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_extra_button.js
@@ -11,6 +11,7 @@ export default class ComposeExtraButton extends PureComponent {
icon: PropTypes.string,
small: PropTypes.bool,
active: PropTypes.bool,
+ buttonRef: PropTypes.func,
}
render() {
@@ -21,16 +22,12 @@ export default class ComposeExtraButton extends PureComponent {
icon,
children,
small,
- active
+ active,
+ buttonRef
} = this.props
- const containerClasses = cx({
- default: 1,
- mr10: !small,
- mr2: small,
- })
-
const btnClasses = cx({
+ backgroundSubtle_onHover: 1,
backgroundColorBrandLight: active,
py10: !small,
px10: !small,
@@ -43,16 +40,16 @@ export default class ComposeExtraButton extends PureComponent {
fillColorWhite: active,
})
- const iconSize = !!small ? '12px' : '18px'
+ const iconSize = !!small ? '12px' : '16px'
return (
-
- 
-
-
-
- {info}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {shortNumberFormat(account.get('statuses_count'))}
-
-
-
- {shortNumberFormat(account.get('following_count'))}
-
-
-
- {shortNumberFormat(account.get('followers_count'))}
-
-
- {
- account.get('id') === me &&
-
-
- {
- isSmallScreen &&
-
-
- { /* : TODO : shortNumberFormat(account.get('favourite_count')) */ }
- •
-
-
- { /* : TODO : shortNumberFormat(account.get('pinned_count')) */ }
- •
-
-
- }
-
-
- }
-
- {
- me &&
-
- {actionBtn}
- {account.get('id') !== me &&
-
- }
- {/*
- }
-
-
+
- { /*
-
-
*/ }
-
+
-
- {
- groupIds.map((groupId, i) => (
-
+ {
+ groupIds.map((groupId, i) => (
+
)
}
diff --git a/app/javascript/gabsocial/features/status/components/card/card.scss b/app/javascript/gabsocial/features/status/components/card/card.scss
deleted file mode 100644
index 0e9f1f0d..00000000
--- a/app/javascript/gabsocial/features/status/components/card/card.scss
+++ /dev/null
@@ -1,169 +0,0 @@
-.status-card {
- display: flex;
- font-size: 14px;
- color: $dark-text-color;
- margin-top: 14px;
- text-decoration: none;
- overflow: hidden;
-
- @include border-design(lighten($ui-base-color, 8%), 1px, 4px);
-
- &__actions {
- @include flex(center, center);
- @include abs-position(0, 0, 0, 0);
-
- &>div {
- background: rgba($base-shadow-color, 0.6);
- border-radius: 8px;
- padding: 12px 9px;
- flex: 0 0 auto;
-
- @include flex(center, center);
- }
-
- button,
- a {
- display: inline;
- color: $secondary-text-color;
- background: transparent;
- border: 0;
- padding: 0 8px;
- text-decoration: none;
- font-size: 18px;
- line-height: 18px;
-
- &:hover,
- &:active,
- &:focus {
- color: $primary-text-color;
- }
- }
-
- a {
- font-size: 19px;
- position: relative;
- bottom: -1px;
- }
- }
-
- &__title {
- display: block;
- font-weight: 500;
- margin-bottom: 5px;
- color: $darker-text-color;
- text-decoration: none;
-
- @include text-overflow(nowrap);
- }
-
- &__content {
- flex: 1 1 auto;
- overflow: hidden;
- padding: 14px 14px 14px 8px;
- }
-
- &__description {
- color: $darker-text-color;
- }
-
- &__host {
- display: block;
- margin-top: 5px;
- font-size: 13px;
-
- @include text-overflow(nowrap);
- }
-
- &__image {
- flex: 0 0 100px;
- background: lighten($ui-base-color, 8%);
- position: relative;
-
- &>.fa {
- font-size: 21px;
- position: absolute;
- transform-origin: 50% 50%;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- }
- }
-
- &__image-image {
- border-radius: 4px 0 0 4px;
- display: block;
- margin: 0;
- object-fit: cover;
- background-size: cover;
- background-position: center center;
-
- @include size(100%);
- }
-
- &.horizontal {
- display: block;
- }
-
- &.horizontal & {
- &__image {
- width: 100%;
- }
-
- &__image-image {
- border-radius: 4px 4px 0 0;
- }
-
- &__title {
- white-space: inherit;
- }
- }
-
- &.compact {
- border-color: lighten($ui-base-color, 4%);
-
- &.interactive {
- border: 0;
- }
- }
-
- &.compact & {
- &__content {
- padding: 10px 8px 8px 8px;
- }
-
- &__title {
- white-space: nowrap;
- }
-
- &__image {
- flex: 0 0 60px;
- }
- }
-}
-
-a.status-card {
- cursor: pointer;
-
- &:hover {
- background: lighten($ui-base-color, 8%);
- }
-
- &.compact:hover {
- background-color: lighten($ui-base-color, 4%);
- }
-}
-
-.status-card-photo {
- cursor: zoom-in;
- display: block;
- text-decoration: none;
- margin: 0;
-
- @include size(100%, auto);
-}
-
-.status-card-video {
- iframe {
- @include size(100%);
- }
-}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/status/components/card/index.js b/app/javascript/gabsocial/features/status/components/card/index.js
deleted file mode 100644
index 827e4fde..00000000
--- a/app/javascript/gabsocial/features/status/components/card/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './card'
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/ui/util/async_components.js b/app/javascript/gabsocial/features/ui/util/async_components.js
index 1aa9b154..42598188 100644
--- a/app/javascript/gabsocial/features/ui/util/async_components.js
+++ b/app/javascript/gabsocial/features/ui/util/async_components.js
@@ -7,7 +7,7 @@ export function AccountGallery() {
}
export function Blocks() {
- return import(/* webpackChunkName: "features/blocks" */'../../blocks')
+ return import(/* webpackChunkName: "features/blocks" */'../../blocked_accounts')
}
export function CommunityTimeline() {
@@ -19,7 +19,7 @@ export function Compose() {
}
export function DomainBlocks() {
- return import(/* webpackChunkName: "features/domain_blocks" */'../../domain_blocks')
+ return import(/* webpackChunkName: "features/domain_blocks" */'../../blocked_domains')
}
export function EmbedModal() {
diff --git a/app/javascript/gabsocial/features/video/index.js b/app/javascript/gabsocial/features/video/index.js
deleted file mode 100644
index 9d40f37a..00000000
--- a/app/javascript/gabsocial/features/video/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './video'
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/video/video.scss b/app/javascript/gabsocial/features/video/video.scss
deleted file mode 100644
index 6b39ad1f..00000000
--- a/app/javascript/gabsocial/features/video/video.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-.video-player {
- overflow: hidden;
- position: relative;
- background: $base-shadow-color;
- max-width: 100%;
- border-radius: 4px;
-
- &:focus {
- outline: 0;
- }
-
- video {
- z-index: 1;
-
- @include max-size(100vw, 80vh);
- }
-
- &.fullscreen {
- margin: 0;
-
- @include size(100% !important);
-
- video {
- @include max-size(100% !important);
- @include size(100% !important);
- }
- }
-
- &.inactive {
-
- video,
- .video-player__controls {
- visibility: hidden;
- }
- }
-
- &__spoiler {
- display: none;
- z-index: 4;
- border: 0;
- background: $base-overlay-background;
- color: $darker-text-color;
- transition: none;
- pointer-events: none;
-
- @include abs-position(0, auto, auto, 0);
- @include size(100%);
-
- &.active {
- display: block;
- pointer-events: auto;
-
- &:hover,
- &:active,
- &:focus {
- color: lighten($darker-text-color, 7%);
- }
- }
-
- &__title {
- display: block;
- font-size: 14px;
- }
-
- &__subtitle {
- display: block;
-
- @include text-sizing(11px, 500);
- }
- }
-}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/reducers/compose.js b/app/javascript/gabsocial/reducers/compose.js
index 3e4719ae..8692f3b4 100644
--- a/app/javascript/gabsocial/reducers/compose.js
+++ b/app/javascript/gabsocial/reducers/compose.js
@@ -176,7 +176,7 @@ const insertEmoji = (state, position, emojiData, needsSpace) => {
};
const privacyPreference = (a, b) => {
- const order = ['public', 'unlisted', 'private', 'direct'];
+ const order = ['public', 'unlisted', 'private'];
return order[Math.max(order.indexOf(a), order.indexOf(b), 0)];
};
diff --git a/app/javascript/styles/gabsocial/emoji_picker.scss b/app/javascript/styles/gabsocial/emoji_picker.scss
index 94ea5976..6d99c714 100644
--- a/app/javascript/styles/gabsocial/emoji_picker.scss
+++ b/app/javascript/styles/gabsocial/emoji_picker.scss
@@ -15,7 +15,7 @@
}
}
-.emoji-mart-bar {
+.emoji-mart-bar {{
border: 0 solid darken($ui-secondary-color, 8%);
&:first-child {