mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2025-02-17 08:31:23 -05:00
refactors and adds different messages for vad username vs pii username
This commit is contained in:
tomlum
parent
8868d00e23
commit
b64cdbac1f
2 changed files with 41 additions and 15 deletions
|
|
@ -442,12 +442,16 @@
|
|||
|
||||
"renameAccount.accountBlocked": "Account Blocked",
|
||||
"renameAccount.toRecover": "To recover a access to your account, change your username.",
|
||||
"renameAccount.yourScratchAccount": "Your scratch account has been temporarily blocked because your usernamed appears to contain personal information.",
|
||||
"renameAccount.yourScratchAccount": "Your scratch account has been temporarily blocked because your username appears to contain personal information.",
|
||||
"renameAccount.privacyIssue": "This is a serious privacy issue. When you share information like this, it is visible to everyone on the internet, so please be careful what you share",
|
||||
"renameAccount.thingsToAvoid": "When creating an username, please remember to avoid using last names, school names, or other private information in your username.",
|
||||
"renameAccount.thingsToAvoid": "When creating a username, please remember to avoid using last names, school names, or other private information in your username.",
|
||||
"renameAccount.yourScratchAccountInappropriate": "Your scratch account has been temporarily blocked because your username is not appropriate for Scratch.",
|
||||
"renameAccount.scratchIsForKids": "Scratch is for kids ages 8 and up, and it's important to us that the Scratch website is a safe and friendly educational resource for everyone, but that's hard to achieve if users are choosing disrespectful or inappropriate usernames.",
|
||||
"renameAccount.rememberToFollow": "When creating a username, please remember to follow the {communityGuidelinesLink}",
|
||||
"renameAccount.CommunityGuidelines": "Community Guidelines",
|
||||
"renameAccount.changeYourUsername": "Change your Username",
|
||||
"renameAccount.makeSure": "Make sure the username you chose is aligned with {communityGuidelinesLink}",
|
||||
"renameAccount.communityGuidelines": "Scratch's Community Guidelines",
|
||||
"renameAccount.scratchsCommunityGuidelines": "Scratch's Community Guidelines",
|
||||
"renameAccount.change": "Change",
|
||||
"renameAccount.pastNotifications": "Here are your past admin notifications"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,12 +27,17 @@ const validateNewUsernameForm = values => {
|
|||
return errors;
|
||||
};
|
||||
|
||||
const PIIUsernameMessage = 'username appears to contain personal information';
|
||||
const BadUsernameMessage = 'an inappropriate username';
|
||||
|
||||
const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
|
||||
|
||||
const [unauthorizedError, setUnauthorizedError] = React.useState(false);
|
||||
const [badUsernameError, setBadUsernameError] = React.useState(false);
|
||||
const [apiError, setAPIError] = React.useState(false);
|
||||
|
||||
const latestAdminMessage = adminMessages && adminMessages[0] && adminMessages[0].message;
|
||||
|
||||
React.useEffect(() => {
|
||||
if (user && user.username && user.token){
|
||||
getAdminMessages(user.username, user.token);
|
||||
|
|
@ -88,10 +93,26 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
|
|||
<h1 className="inline"><FormattedMessage id="renameAccount.accountBlocked" /></h1>
|
||||
</span>
|
||||
<h3><FormattedMessage id="renameAccount.toRecover" /></h3>
|
||||
<p><FormattedMessage id="renameAccount.yourScratchAccount" /></p>
|
||||
<p><FormattedMessage id="renameAccount.privacyIssue" /></p>
|
||||
<p><FormattedMessage id="renameAccount.thingsToAvoid" /></p>
|
||||
|
||||
{latestAdminMessage && latestAdminMessage.includes(PIIUsernameMessage) &&
|
||||
(<div>
|
||||
<p><FormattedMessage id="renameAccount.yourScratchAccount" /></p>
|
||||
<p><FormattedMessage id="renameAccount.privacyIssue" /></p>
|
||||
<p><FormattedMessage id="renameAccount.thingsToAvoid" /></p>
|
||||
</div>)
|
||||
}
|
||||
{latestAdminMessage && latestAdminMessage.includes(BadUsernameMessage) &&
|
||||
(<div>
|
||||
<p><FormattedMessage id="renameAccount.yourScratchAccountInappropriate" /></p>
|
||||
<p><FormattedMessage id="renameAccount.scratchIsForKids" /></p>
|
||||
<p><FormattedMessage
|
||||
id="renameAccount.rememberToFollow"
|
||||
values={{communityGuidelinesLink: (<a href="/community_guidelines"><FormattedMessage id="renameAccount.CommunityGuidelines" /></a>)}}
|
||||
/></p>
|
||||
</div>)
|
||||
}
|
||||
</div>
|
||||
|
||||
<div className="col">
|
||||
<Formik
|
||||
initialValues={{
|
||||
|
|
@ -117,13 +138,13 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
|
|||
validateForm
|
||||
}) => (
|
||||
<JoinFlowStep
|
||||
description={<FormattedMessage id="renameAccount.makeSure" />}
|
||||
description={<FormattedMessage
|
||||
id="renameAccount.makeSure"
|
||||
values={{communityGuidelinesLink: (<a href="/community_guidelines"><FormattedMessage id="renameAccount.scratchsCommunityGuidelines" /></a>)}}
|
||||
/>}
|
||||
innerClassName="change-username-inner"
|
||||
outerClassName="change-username-outer"
|
||||
title={<FormattedMessage
|
||||
id="renameAccount.changeYourUsername"
|
||||
values={{communityGuidelinesLink: (<a href="/community_guidelines"><FormattedMessage id="renameAccount.communityGuidelines" /></a>)}}
|
||||
/>}
|
||||
title={<FormattedMessage id="renameAccount.changeYourUsername" />}
|
||||
waiting={isSubmitting}
|
||||
onSubmit={handleSubmit}
|
||||
nextButton={<FormattedMessage id="renameAccount.change" />}
|
||||
|
|
@ -142,7 +163,6 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
|
|||
// this.props.intl.formatMessage({id: 'registration.usernameAdviceShort'})}
|
||||
validationClassName="validation-left validation-full-width-input"
|
||||
/* eslint-disable react/jsx-no-bind */
|
||||
validateOnChange={false}
|
||||
onChange={e => {
|
||||
setFieldValue('newUsername', e.target.value.substring(0, 30));
|
||||
setFieldValue('canValidate', false);
|
||||
|
|
@ -157,7 +177,6 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
|
|||
className={'join-flow-input'}
|
||||
error={errors.newUsernameConfirm || badUsernameError}
|
||||
id="newUsernameConfirm"
|
||||
validateOnChange={false}
|
||||
name="newUsernameConfirm"
|
||||
placeholder={'Type your new username again'}
|
||||
spellCheck={false}
|
||||
|
|
@ -199,7 +218,6 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
|
|||
<div id="admin-message-list-title">
|
||||
<b><FormattedMessage id="renameAccount.pastNotifications" /></b>
|
||||
</div>
|
||||
{console.log(adminMessages)}
|
||||
{adminMessages.map(message => (
|
||||
<div
|
||||
className="admin-message"
|
||||
|
|
@ -238,7 +256,11 @@ const ConnectedBannedSplash = connect(
|
|||
state => ({
|
||||
user: selectBannedUser(state),
|
||||
hasSession: selectHasFetchedSession(state),
|
||||
adminMessages: state.messages.messages && state.messages.messages.admin
|
||||
adminMessages: state.messages.messages &&
|
||||
state.messages.messages.admin &&
|
||||
state.messages.messages.admin.sort((a, b) =>
|
||||
(b.id - a.id)
|
||||
)
|
||||
}),
|
||||
dispatch => ({
|
||||
getAdminMessages: (username, token) => {
|
||||
|
|
|
|||
Loading…
Reference in a new issue