From 81ef21a0c802f1d905f37a2a818544a8b400793c Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Sat, 25 Feb 2023 14:34:32 +0100 Subject: [Glitch] Rename JSX files with proper `.jsx` extension Port 44a7d87cb1f5df953b6c14c16c59e2e4ead1bcb9 to glitch-soc Signed-off-by: Claire --- .../features/account_timeline/components/header.js | 158 --------------------- .../account_timeline/components/header.jsx | 158 +++++++++++++++++++++ .../components/limited_account_hint.js | 36 ----- .../components/limited_account_hint.jsx | 36 +++++ .../account_timeline/components/moved_note.js | 51 ------- .../account_timeline/components/moved_note.jsx | 51 +++++++ 6 files changed, 245 insertions(+), 245 deletions(-) delete mode 100644 app/javascript/flavours/glitch/features/account_timeline/components/header.js create mode 100644 app/javascript/flavours/glitch/features/account_timeline/components/header.jsx delete mode 100644 app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.js create mode 100644 app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx delete mode 100644 app/javascript/flavours/glitch/features/account_timeline/components/moved_note.js create mode 100644 app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx (limited to 'app/javascript/flavours/glitch/features/account_timeline/components') diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.js b/app/javascript/flavours/glitch/features/account_timeline/components/header.js deleted file mode 100644 index eec065b43..000000000 --- a/app/javascript/flavours/glitch/features/account_timeline/components/header.js +++ /dev/null @@ -1,158 +0,0 @@ -import React from 'react'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import PropTypes from 'prop-types'; -import InnerHeader from 'flavours/glitch/features/account/components/header'; -import ActionBar from 'flavours/glitch/features/account/components/action_bar'; -import ImmutablePureComponent from 'react-immutable-pure-component'; -import { FormattedMessage } from 'react-intl'; -import { NavLink } from 'react-router-dom'; -import MovedNote from './moved_note'; - -export default class Header extends ImmutablePureComponent { - - static propTypes = { - account: ImmutablePropTypes.map, - onFollow: PropTypes.func.isRequired, - onBlock: PropTypes.func.isRequired, - onMention: PropTypes.func.isRequired, - onDirect: PropTypes.func.isRequired, - onReblogToggle: 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, - onChangeLanguages: PropTypes.func.isRequired, - onInteractionModal: PropTypes.func.isRequired, - onOpenAvatar: PropTypes.func.isRequired, - hideTabs: PropTypes.bool, - domain: PropTypes.string.isRequired, - hidden: PropTypes.bool, - }; - - 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); - }; - - handleDirect = () => { - this.props.onDirect(this.props.account, this.context.router.history); - }; - - handleReport = () => { - this.props.onReport(this.props.account); - }; - - handleReblogToggle = () => { - this.props.onReblogToggle(this.props.account); - }; - - handleNotifyToggle = () => { - this.props.onNotifyToggle(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); - }; - - handleEditAccountNote = () => { - this.props.onEditAccountNote(this.props.account); - }; - - handleChangeLanguages = () => { - this.props.onChangeLanguages(this.props.account); - }; - - handleInteractionModal = () => { - this.props.onInteractionModal(this.props.account); - }; - - handleOpenAvatar = () => { - this.props.onOpenAvatar(this.props.account); - }; - - render () { - const { account, hidden, hideTabs } = this.props; - - if (account === null) { - return null; - } - - return ( -
- {(!hidden && account.get('moved')) && } - -
- ); - } - -} diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx new file mode 100644 index 000000000..eec065b43 --- /dev/null +++ b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx @@ -0,0 +1,158 @@ +import React from 'react'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import PropTypes from 'prop-types'; +import InnerHeader from 'flavours/glitch/features/account/components/header'; +import ActionBar from 'flavours/glitch/features/account/components/action_bar'; +import ImmutablePureComponent from 'react-immutable-pure-component'; +import { FormattedMessage } from 'react-intl'; +import { NavLink } from 'react-router-dom'; +import MovedNote from './moved_note'; + +export default class Header extends ImmutablePureComponent { + + static propTypes = { + account: ImmutablePropTypes.map, + onFollow: PropTypes.func.isRequired, + onBlock: PropTypes.func.isRequired, + onMention: PropTypes.func.isRequired, + onDirect: PropTypes.func.isRequired, + onReblogToggle: 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, + onChangeLanguages: PropTypes.func.isRequired, + onInteractionModal: PropTypes.func.isRequired, + onOpenAvatar: PropTypes.func.isRequired, + hideTabs: PropTypes.bool, + domain: PropTypes.string.isRequired, + hidden: PropTypes.bool, + }; + + 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); + }; + + handleDirect = () => { + this.props.onDirect(this.props.account, this.context.router.history); + }; + + handleReport = () => { + this.props.onReport(this.props.account); + }; + + handleReblogToggle = () => { + this.props.onReblogToggle(this.props.account); + }; + + handleNotifyToggle = () => { + this.props.onNotifyToggle(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); + }; + + handleEditAccountNote = () => { + this.props.onEditAccountNote(this.props.account); + }; + + handleChangeLanguages = () => { + this.props.onChangeLanguages(this.props.account); + }; + + handleInteractionModal = () => { + this.props.onInteractionModal(this.props.account); + }; + + handleOpenAvatar = () => { + this.props.onOpenAvatar(this.props.account); + }; + + render () { + const { account, hidden, hideTabs } = this.props; + + if (account === null) { + return null; + } + + return ( +
+ {(!hidden && account.get('moved')) && } + +
+ ); + } + +} diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.js b/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.js deleted file mode 100644 index dc2b3e3e6..000000000 --- a/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.js +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import { connect } from 'react-redux'; -import { revealAccount } from 'flavours/glitch/actions/accounts'; -import { FormattedMessage } from 'react-intl'; -import Button from 'flavours/glitch/components/button'; -import { domain } from 'flavours/glitch/initial_state'; - -const mapDispatchToProps = (dispatch, { accountId }) => ({ - - reveal () { - dispatch(revealAccount(accountId)); - }, - -}); - -export default @connect(() => {}, mapDispatchToProps) -class LimitedAccountHint extends React.PureComponent { - - static propTypes = { - accountId: PropTypes.string.isRequired, - reveal: PropTypes.func, - }; - - render () { - const { reveal } = this.props; - - return ( -
-

- -
- ); - } - -} diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx new file mode 100644 index 000000000..dc2b3e3e6 --- /dev/null +++ b/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx @@ -0,0 +1,36 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { connect } from 'react-redux'; +import { revealAccount } from 'flavours/glitch/actions/accounts'; +import { FormattedMessage } from 'react-intl'; +import Button from 'flavours/glitch/components/button'; +import { domain } from 'flavours/glitch/initial_state'; + +const mapDispatchToProps = (dispatch, { accountId }) => ({ + + reveal () { + dispatch(revealAccount(accountId)); + }, + +}); + +export default @connect(() => {}, mapDispatchToProps) +class LimitedAccountHint extends React.PureComponent { + + static propTypes = { + accountId: PropTypes.string.isRequired, + reveal: PropTypes.func, + }; + + render () { + const { reveal } = this.props; + + return ( +
+

+ +
+ ); + } + +} diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.js b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.js deleted file mode 100644 index 40bdc4034..000000000 --- a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.js +++ /dev/null @@ -1,51 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import { FormattedMessage } from 'react-intl'; -import ImmutablePureComponent from 'react-immutable-pure-component'; -import AvatarOverlay from '../../../components/avatar_overlay'; -import DisplayName from '../../../components/display_name'; -import Icon from 'flavours/glitch/components/icon'; - -export default class MovedNote extends ImmutablePureComponent { - - static contextTypes = { - router: PropTypes.object, - }; - - static propTypes = { - from: ImmutablePropTypes.map.isRequired, - to: ImmutablePropTypes.map.isRequired, - }; - - handleAccountClick = e => { - if (e.button === 0) { - e.preventDefault(); - let state = { ...this.context.router.history.location.state }; - state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1; - this.context.router.history.push(`/@${this.props.to.get('acct')}`, state); - } - - e.stopPropagation(); - }; - - render () { - const { from, to } = this.props; - const displayNameHtml = { __html: from.get('display_name_html') }; - - return ( -
-
-
- }} /> -
- - -
- -
-
- ); - } - -} diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx new file mode 100644 index 000000000..40bdc4034 --- /dev/null +++ b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx @@ -0,0 +1,51 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import { FormattedMessage } from 'react-intl'; +import ImmutablePureComponent from 'react-immutable-pure-component'; +import AvatarOverlay from '../../../components/avatar_overlay'; +import DisplayName from '../../../components/display_name'; +import Icon from 'flavours/glitch/components/icon'; + +export default class MovedNote extends ImmutablePureComponent { + + static contextTypes = { + router: PropTypes.object, + }; + + static propTypes = { + from: ImmutablePropTypes.map.isRequired, + to: ImmutablePropTypes.map.isRequired, + }; + + handleAccountClick = e => { + if (e.button === 0) { + e.preventDefault(); + let state = { ...this.context.router.history.location.state }; + state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1; + this.context.router.history.push(`/@${this.props.to.get('acct')}`, state); + } + + e.stopPropagation(); + }; + + render () { + const { from, to } = this.props; + const displayNameHtml = { __html: from.get('display_name_html') }; + + return ( +
+
+
+ }} /> +
+ + +
+ +
+
+ ); + } + +} -- cgit