Rename LoginPage, Header, Footer views to Auth*

This commit is contained in:
J. Ryan Stinnett 2019-01-21 18:33:17 -06:00
parent c7354f483b
commit 3bd765f63f
12 changed files with 126 additions and 73 deletions

View file

@ -183,9 +183,9 @@ module.exports = React.createClass({
},
render: function() {
const LoginPage = sdk.getComponent("auth.LoginPage");
const LoginHeader = sdk.getComponent("auth.LoginHeader");
const LoginFooter = sdk.getComponent("auth.LoginFooter");
const AuthPage = sdk.getComponent("auth.AuthPage");
const AuthHeader = sdk.getComponent("auth.AuthHeader");
const AuthFooter = sdk.getComponent("auth.AuthFooter");
const ServerConfig = sdk.getComponent("auth.ServerConfig");
const Spinner = sdk.getComponent("elements.Spinner");
@ -272,7 +272,7 @@ module.exports = React.createClass({
{ _t('Create an account') }
</a>
<LanguageSelector />
<LoginFooter />
<AuthFooter />
</div>
</div>
);
@ -280,12 +280,12 @@ module.exports = React.createClass({
return (
<LoginPage>
<AuthPage>
<div className="mx_Login_box">
<LoginHeader />
<AuthHeader />
{ resetPasswordJsx }
</div>
</LoginPage>
</AuthPage>
);
},
});

View file

@ -515,9 +515,9 @@ module.exports = React.createClass({
render: function() {
const Loader = sdk.getComponent("elements.Spinner");
const LoginPage = sdk.getComponent("auth.LoginPage");
const LoginHeader = sdk.getComponent("auth.LoginHeader");
const LoginFooter = sdk.getComponent("auth.LoginFooter");
const AuthPage = sdk.getComponent("auth.AuthPage");
const AuthHeader = sdk.getComponent("auth.AuthHeader");
const AuthFooter = sdk.getComponent("auth.AuthFooter");
const ServerConfig = sdk.getComponent("auth.ServerConfig");
const loader = this.state.busy ? <div className="mx_Login_loader"><Loader /></div> : null;
@ -558,9 +558,9 @@ module.exports = React.createClass({
const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector');
return (
<LoginPage>
<AuthPage>
<div className="mx_Login_box">
<LoginHeader />
<AuthHeader />
<div>
{ header }
{ errorTextSection }
@ -571,10 +571,10 @@ module.exports = React.createClass({
</a>
{ loginAsGuestJsx }
<LanguageSelector />
<LoginFooter />
<AuthFooter />
</div>
</div>
</LoginPage>
</AuthPage>
);
},
});

View file

@ -60,12 +60,12 @@ module.exports = React.createClass({
render: function() {
const ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
const ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
const LoginPage = sdk.getComponent('auth.LoginPage');
const LoginHeader = sdk.getComponent('auth.LoginHeader');
const AuthPage = sdk.getComponent('auth.AuthPage');
const AuthHeader = sdk.getComponent('auth.AuthHeader');
return (
<LoginPage>
<AuthPage>
<div className="mx_Login_box">
<LoginHeader />
<AuthHeader />
<div className="mx_Login_profile">
{ _t('Set a display name:') }
<ChangeDisplayName />
@ -76,7 +76,7 @@ module.exports = React.createClass({
{ this.state.errorString }
</div>
</div>
</LoginPage>
</AuthPage>
);
},
});

View file

@ -396,9 +396,9 @@ module.exports = React.createClass({
},
render: function() {
const LoginHeader = sdk.getComponent('auth.LoginHeader');
const LoginFooter = sdk.getComponent('auth.LoginFooter');
const LoginPage = sdk.getComponent('auth.LoginPage');
const AuthHeader = sdk.getComponent('auth.AuthHeader');
const AuthFooter = sdk.getComponent('auth.AuthFooter');
const AuthPage = sdk.getComponent('auth.AuthPage');
const InteractiveAuth = sdk.getComponent('structures.InteractiveAuth');
const Spinner = sdk.getComponent("elements.Spinner");
const ServerConfig = sdk.getComponent('views.auth.ServerConfig');
@ -474,9 +474,9 @@ module.exports = React.createClass({
const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector');
return (
<LoginPage>
<AuthPage>
<div className="mx_Login_box">
<LoginHeader
<AuthHeader
icon={this.state.teamSelected ?
this.props.teamServerConfig.teamServerURL + "/static/common/" +
this.state.teamSelected.domain + "/icon.png" :
@ -487,9 +487,9 @@ module.exports = React.createClass({
{ signIn }
{ errorText }
<LanguageSelector />
<LoginFooter />
<AuthFooter />
</div>
</LoginPage>
</AuthPage>
);
},
});

View file

@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2019 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -20,11 +21,11 @@ import { _t } from '../../../languageHandler';
import React from 'react';
module.exports = React.createClass({
displayName: 'LoginFooter',
displayName: 'AuthFooter',
render: function() {
return (
<div className="mx_Login_links">
<div className="mx_AuthFooter">
<a href="https://matrix.org">{ _t("powered by Matrix") }</a>
</div>
);

View file

@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2019 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -19,12 +20,14 @@ limitations under the License.
const React = require('react');
module.exports = React.createClass({
displayName: 'LoginHeader',
displayName: 'AuthHeader',
render: function() {
return (
<div className="mx_Login_logo">
Matrix
<div className="mx_AuthHeader">
<div className="mx_AuthHeader_logo">
Matrix
</div>
</div>
);
},

View file

@ -20,11 +20,11 @@ limitations under the License.
const React = require('react');
module.exports = React.createClass({
displayName: 'LoginPage',
displayName: 'AuthPage',
render: function() {
return (
<div className="mx_Login">
<div className="mx_AuthPage">
{ this.props.children }
</div>
);