mirror_maker
/
soapbox
mirror of https://gitlab.com/soapbox-pub/soapbox
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

EditProfile: convert to React.FC+TSX (mostly)

Browse Source
next
Alex Gleason 2 years ago
parent e6a797d712
commit 858740ad47
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
6 changed files with 433 additions and 440 deletions
Show Stats Download Patch File Download Diff File

4
app/soapbox/components/ui/form-group/form-group.tsx
Unescape View File

@ -2,8 +2,8 @@ import React, { useMemo } from 'react';
import { v4 as uuidv4 } from 'uuid';
interface IFormGroup {
hintText?: string | React.ReactNode,
labelText: string,
hintText?: React.ReactNode,
labelText: React.ReactNode,
errors?: string[]
}

1
app/soapbox/components/ui/textarea/textarea.tsx
Unescape View File

@ -8,6 +8,7 @@ interface ITextarea extends Pick<React.TextareaHTMLAttributes<HTMLTextAreaElemen
isCodeEditor?: boolean,
placeholder?: string,
value?: string,
autoComplete?: string,
}
const Textarea = React.forwardRef(

436
app/soapbox/features/edit_profile/index.js
Unescape View File

@ -1,436 +0,0 @@
import {
Map as ImmutableMap,
List as ImmutableList,
} from 'immutable';
import { unescape } from 'lodash';
import PropTypes from 'prop-types';
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
// import { updateNotificationSettings } from 'soapbox/actions/accounts';
import { patchMe } from 'soapbox/actions/me';
import snackbar from 'soapbox/actions/snackbar';
import { getSoapboxConfig } from 'soapbox/actions/soapbox';
// import Icon from 'soapbox/components/icon';
import {
Checkbox,
} from 'soapbox/features/forms';
import { makeGetAccount } from 'soapbox/selectors';
import { getFeatures } from 'soapbox/utils/features';
import resizeImage from 'soapbox/utils/resize_image';
import { Button, Column, Form, FormActions, FormGroup, Input, Textarea } from '../../components/ui';
import ProfilePreview from './components/profile_preview';
const hidesNetwork = account => {
const pleroma = account.get('pleroma');
if (!pleroma) return false;
const { hide_followers, hide_follows, hide_followers_count, hide_follows_count } = pleroma.toJS();
return hide_followers && hide_follows && hide_followers_count && hide_follows_count;
};
const messages = defineMessages({
heading: { id: 'column.edit_profile', defaultMessage: 'Edit profile' },
header: { id: 'edit_profile.header', defaultMessage: 'Edit Profile' },
metaFieldLabel: { id: 'edit_profile.fields.meta_fields.label_placeholder', defaultMessage: 'Label' },
metaFieldContent: { id: 'edit_profile.fields.meta_fields.content_placeholder', defaultMessage: 'Content' },
verified: { id: 'edit_profile.fields.verified_display_name', defaultMessage: 'Verified users may not update their display name' },
success: { id: 'edit_profile.success', defaultMessage: 'Profile saved!' },
error: { id: 'edit_profile.error', defaultMessage: 'Profile update failed' },
bioPlaceholder: { id: 'edit_profile.fields.bio_placeholder', defaultMessage: 'Tell us about yourself.' },
displayNamePlaceholder: { id: 'edit_profile.fields.display_name_placeholder', defaultMessage: 'Name' },
websitePlaceholder: { id: 'edit_profile.fields.website_placeholder', defaultMessage: 'Display a Link' },
locationPlaceholder: { id: 'edit_profile.fields.location_placeholder', defaultMessage: 'Location' },
cancel: { id: 'common.cancel', defaultMessage: 'Cancel' },
});
const makeMapStateToProps = () => {
const getAccount = makeGetAccount();
const mapStateToProps = state => {
const me = state.get('me');
const account = getAccount(state, me);
const soapbox = getSoapboxConfig(state);
const features = getFeatures(state.instance);
return {
account,
features,
maxFields: state.getIn(['instance', 'pleroma', 'metadata', 'fields_limits', 'max_fields'], 4),
verifiedCanEditName: soapbox.get('verifiedCanEditName'),
};
};
return mapStateToProps;
};
// Forces fields to be maxFields size, filling empty values
const normalizeFields = (fields, maxFields) => (
ImmutableList(fields).setSize(Math.max(fields.size, maxFields)).map(field =>
field ? field : ImmutableMap({ name: '', value: '' }),
)
);
// HTML unescape for special chars, eg <br>
const unescapeParams = (map, params) => (
params.reduce((map, param) => (
map.set(param, unescape(map.get(param)))
), map)
);
export default @connect(makeMapStateToProps)
@injectIntl
class EditProfile extends ImmutablePureComponent {
static propTypes = {
dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
account: ImmutablePropTypes.record,
maxFields: PropTypes.number,
verifiedCanEditName: PropTypes.bool,
};
state = {
isLoading: false,
}
constructor(props) {
super(props);
const { account, maxFields } = this.props;
const strangerNotifications = account.getIn(['pleroma', 'notification_settings', 'block_from_strangers']);
const acceptsEmailList = account.getIn(['pleroma', 'accepts_email_list']);
const discoverable = account.getIn(['source', 'pleroma', 'discoverable']);
const initialState = ImmutableMap(account).withMutations(map => {
map.merge(map.get('source'));
map.delete('source');
map.set('fields', normalizeFields(map.get('fields'), Math.min(maxFields, 4)));
map.set('stranger_notifications', strangerNotifications);
map.set('accepts_email_list', acceptsEmailList);
map.set('hide_network', hidesNetwork(account));
map.set('discoverable', discoverable);
unescapeParams(map, ['display_name', 'bio']);
});
this.state = initialState.toObject();
}
makePreviewAccount = () => {
const { account } = this.props;
return account.merge(ImmutableMap({
header: this.state.header,
avatar: this.state.avatar,
display_name: this.state.display_name || account.get('username'),
website: this.state.website || account.get('website'),
location: this.state.location || account.get('location'),
}));
}
getFieldParams = () => {
let params = ImmutableMap();
this.state.fields.forEach((f, i) =>
params = params
.set(`fields_attributes[${i}][name]`, f.get('name'))
.set(`fields_attributes[${i}][value]`, f.get('value')),
);
return params;
}
getParams = () => {
const { state } = this;
return Object.assign({
discoverable: state.discoverable,
bot: state.bot,
display_name: state.display_name,
website: state.website,
location: state.location,
birthday: state.birthday,
note: state.note,
avatar: state.avatar_file,
header: state.header_file,
locked: state.locked,
accepts_email_list: state.accepts_email_list,
hide_followers: state.hide_network,
hide_follows: state.hide_network,
hide_followers_count: state.hide_network,
hide_follows_count: state.hide_network,
}, this.getFieldParams().toJS());
}
getFormdata = () => {
const data = this.getParams();
const formData = new FormData();
for (const key in data) {
const hasValue = data[key] !== null && data[key] !== undefined;
// Compact the submission. This should probably be done better.
const shouldAppend = Boolean(hasValue || key.startsWith('fields_attributes'));
if (shouldAppend) formData.append(key, hasValue ? data[key] : '');
}
return formData;
}
handleSubmit = (event) => {
const { dispatch, intl } = this.props;
const credentials = dispatch(patchMe(this.getFormdata()));
/* Bad API url, was causing errors in the promise call below blocking the success message after making edits. */
/* const notifications = dispatch(updateNotificationSettings({
block_from_strangers: this.state.stranger_notifications || false,
})); */
this.setState({ isLoading: true });
Promise.all([credentials /*notifications*/]).then(() => {
this.setState({ isLoading: false });
dispatch(snackbar.success(intl.formatMessage(messages.success)));
}).catch((error) => {
this.setState({ isLoading: false });
dispatch(snackbar.error(intl.formatMessage(messages.error)));
});
event.preventDefault();
}
handleCheckboxChange = e => {
this.setState({ [e.target.name]: e.target.checked });
}
handleTextChange = e => {
this.setState({ [e.target.name]: e.target.value });
}
handleFieldChange = (i, key) => {
return (e) => {
this.setState({
fields: this.state.fields.setIn([i, key], e.target.value),
});
};
}
handleFileChange = maxPixels => {
return e => {
const { name } = e.target;
const [f] = e.target.files || [];
resizeImage(f, maxPixels).then(file => {
const url = file ? URL.createObjectURL(file) : this.state[name];
this.setState({
[name]: url,
[`${name}_file`]: file,
});
}).catch(console.error);
};
}
handleAddField = () => {
this.setState({
fields: this.state.fields.push(ImmutableMap({ name: '', value: '' })),
});
}
handleDeleteField = i => {
return () => {
this.setState({
fields: normalizeFields(this.state.fields.delete(i), Math.min(this.props.maxFields, 4)),
});
};
}
render() {
const { intl, account, verifiedCanEditName, features /* maxFields */ } = this.props;
const verified = account.get('verified');
const canEditName = verifiedCanEditName || !verified;
return (
<Column label={intl.formatMessage(messages.header)}>
<Form onSubmit={this.handleSubmit}>
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.display_name_label' defaultMessage='Display name' />}
hintText={!canEditName && intl.formatMessage(messages.verified)}
>
<Input
name='display_name'
value={this.state.display_name}
onChange={this.handleTextChange}
placeholder={intl.formatMessage(messages.displayNamePlaceholder)}
disabled={!canEditName}
/>
</FormGroup>
{features.birthdays && (
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.birthday_label' defaultMessage='Birthday' />}
>
<Input
name='birthday'
value={this.state.birthday}
onChange={this.handleTextChange}
/>
</FormGroup>
)}
{features.accountLocation && (
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.location_label' defaultMessage='Location' />}
>
<Input
name='location'
value={this.state.location}
onChange={this.handleTextChange}
placeholder={intl.formatMessage(messages.locationPlaceholder)}
/>
</FormGroup>
)}
{features.accountWebsite && (
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.website_label' defaultMessage='Website' />}
>
<Input
name='website'
value={this.state.website}
onChange={this.handleTextChange}
placeholder={intl.formatMessage(messages.websitePlaceholder)}
/>
</FormGroup>
)}
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.bio_label' defaultMessage='Bio' />}
>
<Textarea
name='note'
value={this.state.note}
onChange={this.handleTextChange}
autoComplete='off'
placeholder={intl.formatMessage(messages.bioPlaceholder)}
/>
</FormGroup>
<div className='grid grid-cols-2 gap-4'>
<ProfilePreview account={this.makePreviewAccount()} />
<div className='space-y-4'>
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.header_label' defaultMessage='Choose Background Picture' />}
hintText={<FormattedMessage id='edit_profile.hints.header' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '1920x1080px' }} />}
>
<input type='file' name='header' onChange={this.handleFileChange(1920 * 1080)} className='text-sm' />
</FormGroup>
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.avatar_label' defaultMessage='Choose Profile Picture' />}
hintText={<FormattedMessage id='edit_profile.hints.avatar' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '400x400px' }} />}
>
<input type='file' name='avatar' onChange={this.handleFileChange(400 * 400)} className='text-sm' />
</FormGroup>
</div>
</div>
{/*<Checkbox
label={<FormattedMessage id='edit_profile.fields.locked_label' defaultMessage='Lock account' />}
hint={<FormattedMessage id='edit_profile.hints.locked' defaultMessage='Requires you to manually approve followers' />}
name='locked'
checked={this.state.locked}
onChange={this.handleCheckboxChange}
/>
<Checkbox
label={<FormattedMessage id='edit_profile.fields.hide_network_label' defaultMessage='Hide network' />}
hint={<FormattedMessage id='edit_profile.hints.hide_network' defaultMessage='Who you follow and who follows you will not be shown on your profile' />}
name='hide_network'
checked={this.state.hide_network}
onChange={this.handleCheckboxChange}
/>
<Checkbox
label={<FormattedMessage id='edit_profile.fields.bot_label' defaultMessage='This is a bot account' />}
hint={<FormattedMessage id='edit_profile.hints.bot' defaultMessage='This account mainly performs automated actions and might not be monitored' />}
name='bot'
checked={this.state.bot}
onChange={this.handleCheckboxChange}
/>
<Checkbox
label={<FormattedMessage id='edit_profile.fields.stranger_notifications_label' defaultMessage='Block notifications from strangers' />}
hint={<FormattedMessage id='edit_profile.hints.stranger_notifications' defaultMessage='Only show notifications from people you follow' />}
name='stranger_notifications'
checked={this.state.stranger_notifications}
onChange={this.handleCheckboxChange}
/>
<Checkbox
label={<FormattedMessage id='edit_profile.fields.discoverable_label' defaultMessage='Allow account discovery' />}
hint={<FormattedMessage id='edit_profile.hints.discoverable' defaultMessage='Display account in profile directory and allow indexing by external services' />}
name='discoverable'
checked={this.state.discoverable}
onChange={this.handleCheckboxChange}
/>*/}
{features.emailList && (
<Checkbox
label={<FormattedMessage id='edit_profile.fields.accepts_email_list_label' defaultMessage='Subscribe to newsletter' />}
hint={<FormattedMessage id='edit_profile.hints.accepts_email_list' defaultMessage='Opt-in to news and marketing updates.' />}
name='accepts_email_list'
checked={this.state.accepts_email_list}
onChange={this.handleCheckboxChange}
/>
)}
{/* </FieldsGroup> */}
{/*<FieldsGroup>
<div className='fields-row__column fields-group'>
<div className='input with_block_label'>
<label><FormattedMessage id='edit_profile.fields.meta_fields_label' defaultMessage='Profile metadata' /></label>
<span className='hint'>
<FormattedMessage id='edit_profile.hints.meta_fields' defaultMessage='You can have up to {count, plural, one {# item} other {# items}} displayed as a table on your profile' values={{ count: maxFields }} />
</span>
{
this.state.fields.map((field, i) => (
<div className='row' key={i}>
<TextInput
placeholder={intl.formatMessage(messages.metaFieldLabel)}
value={field.get('name')}
onChange={this.handleFieldChange(i, 'name')}
/>
<TextInput
placeholder={intl.formatMessage(messages.metaFieldContent)}
value={field.get('value')}
onChange={this.handleFieldChange(i, 'value')}
/>
{
this.state.fields.size > 4 && <Icon className='delete-field' src={require('@tabler/icons/icons/circle-x.svg')} onClick={this.handleDeleteField(i)} />
}
</div>
))
}
{
this.state.fields.size < maxFields && (
<div className='actions add-row'>
<div name='button' type='button' role='presentation' className='btn button button-secondary' onClick={this.handleAddField}>
<Icon src={require('@tabler/icons/icons/circle-plus.svg')} />
<FormattedMessage id='edit_profile.meta_fields.add' defaultMessage='Add new item' />
</div>
</div>
)
}
</div>
</div>
</FieldsGroup>*/}
{/* </fieldset> */}
<FormActions>
<Button to='/settings' theme='ghost'>
{intl.formatMessage(messages.cancel)}
</Button>
<Button theme='primary' type='submit' disabled={this.state.isLoading}>
<FormattedMessage id='edit_profile.save' defaultMessage='Save' />
</Button>
</FormActions>
</Form>
</Column>
);
}
}

421
app/soapbox/features/edit_profile/index.tsx
Unescape View File

@ -0,0 +1,421 @@
import {
Map as ImmutableMap,
List as ImmutableList,
} from 'immutable';
import { unescape } from 'lodash';
import React, { useState, useEffect } from 'react';
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 Icon from 'soapbox/components/icon';
import {
Checkbox,
} from 'soapbox/features/forms';
import { useAppSelector, useAppDispatch, useOwnAccount, useFeatures } from 'soapbox/hooks';
import { normalizeAccount } from 'soapbox/normalizers';
import resizeImage from 'soapbox/utils/resize_image';
import { Button, Column, Form, FormActions, FormGroup, Input, Textarea } from '../../components/ui';
import ProfilePreview from './components/profile_preview';
import type { Account } from 'soapbox/types/entities';
/**
* Whether the user is hiding their follows and/or followers.
* Pleroma's config is granular, but we simplify it into one setting.
*/
const hidesNetwork = (account: Account): boolean => {
const { hide_followers, hide_follows, hide_followers_count, hide_follows_count } = account.pleroma.toJS();
return Boolean(hide_followers && hide_follows && hide_followers_count && hide_follows_count);
};
const messages = defineMessages({
heading: { id: 'column.edit_profile', defaultMessage: 'Edit profile' },
header: { id: 'edit_profile.header', defaultMessage: 'Edit Profile' },
metaFieldLabel: { id: 'edit_profile.fields.meta_fields.label_placeholder', defaultMessage: 'Label' },
metaFieldContent: { id: 'edit_profile.fields.meta_fields.content_placeholder', defaultMessage: 'Content' },
success: { id: 'edit_profile.success', defaultMessage: 'Profile saved!' },
error: { id: 'edit_profile.error', defaultMessage: 'Profile update failed' },
bioPlaceholder: { id: 'edit_profile.fields.bio_placeholder', defaultMessage: 'Tell us about yourself.' },
displayNamePlaceholder: { id: 'edit_profile.fields.display_name_placeholder', defaultMessage: 'Name' },
websitePlaceholder: { id: 'edit_profile.fields.website_placeholder', defaultMessage: 'Display a Link' },
locationPlaceholder: { id: 'edit_profile.fields.location_placeholder', defaultMessage: 'Location' },
cancel: { id: 'common.cancel', defaultMessage: 'Cancel' },
});
// /** Forces fields to be maxFields size, filling empty values. */
// const normalizeFields = (fields, maxFields: number) => (
// ImmutableList(fields).setSize(Math.max(fields.size, maxFields)).map(field =>
// field ? field : ImmutableMap({ name: '', value: '' }),
// )
// );
//
// /** HTML unescape for special chars, eg <br> */
// const unescapeParams = (map, params) => (
// params.reduce((map, param) => (
// map.set(param, unescape(map.get(param)))
// ), map)
// );
/**
* Profile metadata `name` and `value`.
* (By default, max 4 fields and 255 characters per property/value)
*/
interface AccountCredentialsField {
name: string,
value: string,
}
/** Private information (settings) for the account. */
interface AccountCredentialsSource {
/** Default post privacy for authored statuses. */
privacy?: string,
/** Whether to mark authored statuses as sensitive by default. */
sensitive?: boolean,
/** Default language to use for authored statuses. (ISO 6391) */
language?: string,
}
/**
* Params to submit when updating an account.
* @see PATCH /api/v1/accounts/update_credentials
*/
interface AccountCredentials {
/** Whether the account should be shown in the profile directory. */
discoverable?: boolean,
/** Whether the account has a bot flag. */
bot?: boolean,
/** The display name to use for the profile. */
display_name?: string,
/** The account bio. */
note?: string,
/** Avatar image encoded using multipart/form-data */
avatar?: string,
/** Header image encoded using multipart/form-data */
header?: string,
/** Whether manual approval of follow requests is required. */
locked?: boolean,
/** Private information (settings) about the account. */
source?: AccountCredentialsSource,
/** Custom profile fields. */
fields_attributes?: AccountCredentialsField[],
// Non-Mastodon fields
/** Pleroma: whether to accept notifications from people you don't follow. */
stranger_notifications?: boolean,
/** Soapbox BE: whether the user opts-in to email communications. */
accepts_email_list?: boolean,
/** Pleroma: whether to publicly display followers. */
hide_followers?: boolean,
/** Pleroma: whether to publicly display follows. */
hide_follows?: boolean,
/** Pleroma: whether to publicly display follower count. */
hide_followers_count?: boolean,
/** Pleroma: whether to publicly display follows count. */
hide_follows_count?: boolean,
/** User's website URL. */
website?: string,
/** User's location. */
location?: string,
/** User's birthday. */
birthday?: string,
}
/** Convert an account into an update_credentials request object. */
const accountToCredentials = (account: Account): AccountCredentials => {
const hideNetwork = hidesNetwork(account);
return {
discoverable: account.discoverable,
bot: account.bot,
display_name: unescape(account.display_name),
note: account.source.get('note') || unescape(account.note),
locked: account.locked,
fields_attributes: [...account.source.get<Iterable<AccountCredentialsField>>('fields', [])],
stranger_notifications: account.getIn(['pleroma', 'notification_settings', 'block_from_strangers']) === true,
accepts_email_list: account.getIn(['pleroma', 'accepts_email_list']) === true,
hide_followers: hideNetwork,
hide_follows: hideNetwork,
hide_followers_count: hideNetwork,
hide_follows_count: hideNetwork,
website: account.website,
location: account.location,
birthday: account.birthday,
};
};
/** Edit profile page. */
const EditProfile: React.FC = () => {
const intl = useIntl();
const dispatch = useAppDispatch();
const account = useOwnAccount();
const features = useFeatures();
// const maxFields = useAppSelector(state => state.instance.pleroma.getIn(['metadata', 'fields_limits', 'max_fields'], 4) as number);
const [isLoading, setLoading] = useState(false);
const [data, setData] = useState<AccountCredentials>({});
useEffect(() => {
if (account) {
const credentials = accountToCredentials(account);
setData(credentials);
}
}, [account?.id]);
/** Set a single key in the request data. */
const updateData = (key: string, value: any) => {
setData(prevData => {
return { ...prevData, [key]: value };
});
};
const handleSubmit: React.FormEventHandler = (event) => {
const credentials = dispatch(patchMe(data));
/* Bad API url, was causing errors in the promise call below blocking the success message after making edits. */
/* const notifications = dispatch(updateNotificationSettings({
block_from_strangers: this.state.stranger_notifications || false,
})); */
setLoading(true);
Promise.all([credentials /*notifications*/]).then(() => {
setLoading(false);
dispatch(snackbar.success(intl.formatMessage(messages.success)));
}).catch(() => {
setLoading(false);
dispatch(snackbar.error(intl.formatMessage(messages.error)));
});
event.preventDefault();
};
const handleCheckboxChange = (key: keyof AccountCredentials): React.ChangeEventHandler<HTMLInputElement> => {
return e => {
updateData(key, e.target.checked);
};
};
const handleTextChange = (key: keyof AccountCredentials): React.ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement> => {
return e => {
updateData(key, e.target.value);
};
};
const handleFileChange = (
name: keyof AccountCredentials,
maxPixels: number,
): React.ChangeEventHandler<HTMLInputElement> => {
return e => {
const f = e.target.files?.item(0);
if (!f) return;
resizeImage(f, maxPixels).then(file => {
// const url = file ? URL.createObjectURL(file) : data[name];
updateData(name, file);
}).catch(console.error);
};
};
// handleFieldChange = (i, key) => {
// return (e) => {
// this.setState({
// fields: this.state.fields.setIn([i, key], e.target.value),
// });
// };
// };
//
// handleAddField = () => {
// this.setState({
// fields: this.state.fields.push(ImmutableMap({ name: '', value: '' })),
// });
// };
//
// handleDeleteField = i => {
// return () => {
// this.setState({
// fields: normalizeFields(this.state.fields.delete(i), Math.min(this.props.maxFields, 4)),
// });
// };
// };
return (
<Column label={intl.formatMessage(messages.header)}>
<Form onSubmit={handleSubmit}>
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.display_name_label' defaultMessage='Display name' />}
>
<Input
type='text'
value={data.display_name}
onChange={handleTextChange('display_name')}
placeholder={intl.formatMessage(messages.displayNamePlaceholder)}
/>
</FormGroup>
{features.birthdays && (
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.birthday_label' defaultMessage='Birthday' />}
>
<Input
type='text'
value={data.birthday}
onChange={handleTextChange('birthday')}
/>
</FormGroup>
)}
{features.accountLocation && (
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.location_label' defaultMessage='Location' />}
>
<Input
type='text'
value={data.location}
onChange={handleTextChange('location')}
placeholder={intl.formatMessage(messages.locationPlaceholder)}
/>
</FormGroup>
)}
{features.accountWebsite && (
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.website_label' defaultMessage='Website' />}
>
<Input
type='text'
value={data.website}
onChange={handleTextChange('website')}
placeholder={intl.formatMessage(messages.websitePlaceholder)}
/>
</FormGroup>
)}
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.bio_label' defaultMessage='Bio' />}
>
<Textarea
value={data.note}
onChange={handleTextChange('note')}
autoComplete='off'
placeholder={intl.formatMessage(messages.bioPlaceholder)}
/>
</FormGroup>
<div className='grid grid-cols-2 gap-4'>
<ProfilePreview account={normalizeAccount(data) as Account} />
<div className='space-y-4'>
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.header_label' defaultMessage='Choose Background Picture' />}
hintText={<FormattedMessage id='edit_profile.hints.header' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '1920x1080px' }} />}
>
<input type='file' onChange={handleFileChange('header', 1920 * 1080)} className='text-sm' />
</FormGroup>
<FormGroup
labelText={<FormattedMessage id='edit_profile.fields.avatar_label' defaultMessage='Choose Profile Picture' />}
hintText={<FormattedMessage id='edit_profile.hints.avatar' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '400x400px' }} />}
>
<input type='file' onChange={handleFileChange('avatar', 400 * 400)} className='text-sm' />
</FormGroup>
</div>
</div>
{/*<Checkbox
label={<FormattedMessage id='edit_profile.fields.locked_label' defaultMessage='Lock account' />}
hint={<FormattedMessage id='edit_profile.hints.locked' defaultMessage='Requires you to manually approve followers' />}
checked={this.state.locked}
onChange={this.handleCheckboxChange('locked')}
/>
<Checkbox
label={<FormattedMessage id='edit_profile.fields.hide_network_label' defaultMessage='Hide network' />}
hint={<FormattedMessage id='edit_profile.hints.hide_network' defaultMessage='Who you follow and who follows you will not be shown on your profile' />}
checked={this.state.hide_network}
onChange={this.handleCheckboxChange('hide_network')}
/>
<Checkbox
label={<FormattedMessage id='edit_profile.fields.bot_label' defaultMessage='This is a bot account' />}
hint={<FormattedMessage id='edit_profile.hints.bot' defaultMessage='This account mainly performs automated actions and might not be monitored' />}
checked={this.state.bot}
onChange={this.handleCheckboxChange('bot')}
/>
<Checkbox
label={<FormattedMessage id='edit_profile.fields.stranger_notifications_label' defaultMessage='Block notifications from strangers' />}
hint={<FormattedMessage id='edit_profile.hints.stranger_notifications' defaultMessage='Only show notifications from people you follow' />}
checked={this.state.stranger_notifications}
onChange={this.handleCheckboxChange('stranger_notifications')}
/>
<Checkbox
label={<FormattedMessage id='edit_profile.fields.discoverable_label' defaultMessage='Allow account discovery' />}
hint={<FormattedMessage id='edit_profile.hints.discoverable' defaultMessage='Display account in profile directory and allow indexing by external services' />}
checked={this.state.discoverable}
onChange={this.handleCheckboxChange('discoverable')}
/>*/}
{features.emailList && (
<Checkbox
label={<FormattedMessage id='edit_profile.fields.accepts_email_list_label' defaultMessage='Subscribe to newsletter' />}
hint={<FormattedMessage id='edit_profile.hints.accepts_email_list' defaultMessage='Opt-in to news and marketing updates.' />}
checked={data.accepts_email_list}
onChange={handleCheckboxChange('accepts_email_list')}
/>
)}
{/* </FieldsGroup> */}
{/*<FieldsGroup>
<div className='fields-row__column fields-group'>
<div className='input with_block_label'>
<label><FormattedMessage id='edit_profile.fields.meta_fields_label' defaultMessage='Profile metadata' /></label>
<span className='hint'>
<FormattedMessage id='edit_profile.hints.meta_fields' defaultMessage='You can have up to {count, plural, one {# item} other {# items}} displayed as a table on your profile' values={{ count: maxFields }} />
</span>
{
this.state.fields.map((field, i) => (
<div className='row' key={i}>
<TextInput
placeholder={intl.formatMessage(messages.metaFieldLabel)}
value={field.get('name')}
onChange={this.handleFieldChange(i, 'name')}
/>
<TextInput
placeholder={intl.formatMessage(messages.metaFieldContent)}
value={field.get('value')}
onChange={this.handleFieldChange(i, 'value')}
/>
{
this.state.fields.size > 4 && <Icon className='delete-field' src={require('@tabler/icons/icons/circle-x.svg')} onClick={this.handleDeleteField(i)} />
}
</div>
))
}
{
this.state.fields.size < maxFields && (
<div className='actions add-row'>
<div name='button' type='button' role='presentation' className='btn button button-secondary' onClick={this.handleAddField}>
<Icon src={require('@tabler/icons/icons/circle-plus.svg')} />
<FormattedMessage id='edit_profile.meta_fields.add' defaultMessage='Add new item' />
</div>
</div>
)
}
</div>
</div>
</FieldsGroup>*/}
{/* </fieldset> */}
<FormActions>
<Button to='/settings' theme='ghost'>
{intl.formatMessage(messages.cancel)}
</Button>
<Button theme='primary' type='submit' disabled={isLoading}>
<FormattedMessage id='edit_profile.save' defaultMessage='Save' />
</Button>
</FormActions>
</Form>
</Column>
);
};
export default EditProfile;

9
app/soapbox/features/forms/index.tsx
Unescape View File

@ -146,7 +146,14 @@ export const FieldsGroup: React.FC = ({ children }) => (
<div className='fields-group'>{children}</div>
);
export const Checkbox: React.FC = (props) => (
interface ICheckbox {
label?: React.ReactNode,
hint?: React.ReactNode,
checked?: boolean,
onChange?: React.ChangeEventHandler<HTMLInputElement>,
}
export const Checkbox: React.FC<ICheckbox> = (props) => (
<SimpleInput type='checkbox' {...props} />
);

2
app/soapbox/normalizers/account.ts
Unescape View File

@ -24,7 +24,7 @@ export const AccountRecord = ImmutableRecord({
acct: '',
avatar: '',
avatar_static: '',
birthday: undefined as Date | undefined,
birthday: undefined as string | undefined,
bot: false,
created_at: new Date(),
discoverable: false,

Write Preview
Loading…
Cancel
Save