mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2025-02-18 09:00:30 -05:00
updates design and fixes redux issues
This commit is contained in:
parent
73da26aa5d
commit
c276e006ff
3 changed files with 9 additions and 1 deletions
|
@ -158,6 +158,7 @@ module.exports.selectIsLoggedIn = state => !!get(state, ['session', 'session', '
|
||||||
module.exports.selectUsername = state => get(state, ['session', 'session', 'user', 'username'], null);
|
module.exports.selectUsername = state => get(state, ['session', 'session', 'user', 'username'], null);
|
||||||
module.exports.selectToken = state => get(state, ['session', 'session', 'user', 'token'], null);
|
module.exports.selectToken = state => get(state, ['session', 'session', 'user', 'token'], null);
|
||||||
module.exports.selectIsAdmin = state => get(state, ['session', 'session', 'permissions', 'admin'], false);
|
module.exports.selectIsAdmin = state => get(state, ['session', 'session', 'permissions', 'admin'], false);
|
||||||
|
module.exports.selectBannedUser = state => get(state, ['session', 'session', 'user'], false);
|
||||||
module.exports.selectIsSocial = state => get(state, ['session', 'session', 'permissions', 'social'], false);
|
module.exports.selectIsSocial = state => get(state, ['session', 'session', 'permissions', 'social'], false);
|
||||||
module.exports.selectIsEducator = state => get(state, ['session', 'session', 'permissions', 'educator'], false);
|
module.exports.selectIsEducator = state => get(state, ['session', 'session', 'permissions', 'educator'], false);
|
||||||
module.exports.selectProjectCommentsGloballyEnabled = state =>
|
module.exports.selectProjectCommentsGloballyEnabled = state =>
|
||||||
|
|
|
@ -148,10 +148,12 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
|
||||||
nextButton={<FormattedMessage id="renameAccount.change" />}
|
nextButton={<FormattedMessage id="renameAccount.change" />}
|
||||||
>
|
>
|
||||||
<div>
|
<div>
|
||||||
|
<b>Create a new username</b>
|
||||||
<FormikInput
|
<FormikInput
|
||||||
autoCapitalize="off"
|
autoCapitalize="off"
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
autoCorrect="off"
|
autoCorrect="off"
|
||||||
|
className={'join-flow-input mt5'}
|
||||||
error={errors.newUsername}
|
error={errors.newUsername}
|
||||||
id="newUsername"
|
id="newUsername"
|
||||||
name="newUsername"
|
name="newUsername"
|
||||||
|
@ -187,11 +189,12 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
|
||||||
setFieldValue('canValidate', true).then(validateForm());
|
setFieldValue('canValidate', true).then(validateForm());
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
<b>Password</b>
|
||||||
<FormikInput
|
<FormikInput
|
||||||
autoCapitalize="off"
|
autoCapitalize="off"
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
autoCorrect="off"
|
autoCorrect="off"
|
||||||
className={'join-flow-input'}
|
className={'join-flow-input mt5'}
|
||||||
id="password"
|
id="password"
|
||||||
name="password"
|
name="password"
|
||||||
placeholder={'Enter your password'}
|
placeholder={'Enter your password'}
|
||||||
|
|
|
@ -122,4 +122,8 @@
|
||||||
.join-flow-outer-content{
|
.join-flow-outer-content{
|
||||||
border: solid 4px #818698;
|
border: solid 4px #818698;
|
||||||
border-radius: 21px;
|
border-radius: 21px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mt5{
|
||||||
|
margin-top: 5px;
|
||||||
}
|
}
|
Loading…
Reference in a new issue