matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Rename mx_Login_box to mx_AuthPage_modal and fold into AuthPage

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-01-21 18:49:28 -06:00
parent 3bd765f63f
commit 1d01ac398c
7 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/auth/ForgotPassword.js
View File

@@ -281,10 +281,8 @@ module.exports = React.createClass({
return (
<AuthPage>
<div className="mx_Login_box">
<AuthHeader />
{ resetPasswordJsx }
</div>
<AuthHeader />
{ resetPasswordJsx }
</AuthPage>
);
},

26
src/components/structures/auth/Login.js
View File

@@ -559,20 +559,18 @@ module.exports = React.createClass({
return (
<AuthPage>
<div className="mx_Login_box">
<AuthHeader />
<div>
{ header }
{ errorTextSection }
{ this.componentForStep(this.state.currentFlow) }
{ serverConfig }
<a className="mx_Login_create" onClick={this.onRegisterClick} href="#">
{ _t('Create an account') }
</a>
{ loginAsGuestJsx }
<LanguageSelector />
<AuthFooter />
</div>
<AuthHeader />
<div>
{ header }
{ errorTextSection }
{ this.componentForStep(this.state.currentFlow) }
{ serverConfig }
<a className="mx_Login_create" onClick={this.onRegisterClick} href="#">
{ _t('Create an account') }
</a>
{ loginAsGuestJsx }
<LanguageSelector />
<AuthFooter />
</div>
</AuthPage>
);

20
src/components/structures/auth/PostRegistration.js
View File

@@ -64,17 +64,15 @@ module.exports = React.createClass({
const AuthHeader = sdk.getComponent('auth.AuthHeader');
return (
<AuthPage>
<div className="mx_Login_box">
<AuthHeader />
<div className="mx_Login_profile">
{ _t('Set a display name:') }
<ChangeDisplayName />
{ _t('Upload an avatar:') }
<ChangeAvatar
initialAvatarUrl={this.state.avatarUrl} />
<button onClick={this.props.onComplete}>{ _t('Continue') }</button>
{ this.state.errorString }
</div>
<AuthHeader />
<div className="mx_Login_profile">
{ _t('Set a display name:') }
<ChangeDisplayName />
{ _t('Upload an avatar:') }
<ChangeAvatar
initialAvatarUrl={this.state.avatarUrl} />
<button onClick={this.props.onComplete}>{ _t('Continue') }</button>
{ this.state.errorString }
</div>
</AuthPage>
);

26
src/components/structures/auth/Registration.js
View File

@@ -475,20 +475,18 @@ module.exports = React.createClass({
return (
<AuthPage>
<div className="mx_Login_box">
<AuthHeader
icon={this.state.teamSelected ?
this.props.teamServerConfig.teamServerURL + "/static/common/" +
this.state.teamSelected.domain + "/icon.png" :
null}
/>
{ header }
{ registerBody }
{ signIn }
{ errorText }
<LanguageSelector />
<AuthFooter />
</div>
<AuthHeader
icon={this.state.teamSelected ?
this.props.teamServerConfig.teamServerURL + "/static/common/" +
this.state.teamSelected.domain + "/icon.png" :
null}
/>
{ header }
{ registerBody }
{ signIn }
{ errorText }
<LanguageSelector />
<AuthFooter />
</AuthPage>
);
},