{ _t('Sign in') } { loader }
; - } else { - if (!errorText) { - header ={ _t('Sign in to get started') } { loader }
; - } - } + const header ={ _t('Sign in') } { loader }
; let errorTextSection; if (errorText) { @@ -565,26 +555,24 @@ module.exports = React.createClass({ ); } - const LanguageSelector = sdk.getComponent('structures.login.LanguageSelector'); + const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector'); return ( -
-
+
);
},
});
diff --git a/src/components/structures/login/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
similarity index 73%
rename from src/components/structures/login/PostRegistration.js
rename to src/components/structures/auth/PostRegistration.js
index f6165348bd..fff326f6ac 100644
--- a/src/components/structures/login/PostRegistration.js
+++ b/src/components/structures/auth/PostRegistration.js
@@ -60,23 +60,21 @@ module.exports = React.createClass({
render: function() {
const ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
const ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
- const LoginPage = sdk.getComponent('login.LoginPage');
- const LoginHeader = sdk.getComponent('login.LoginHeader');
+ const AuthPage = sdk.getComponent('auth.AuthPage');
+ const AuthHeader = sdk.getComponent('auth.AuthHeader');
return (
-
-
- { header }
- { errorTextSection }
- { this.componentForStep(this.state.currentFlow) }
- { serverConfig }
-
- { _t('Create an account') }
-
- { loginAsGuestJsx }
-
+
+ { header }
+ { errorTextSection }
+ { this.componentForStep(this.state.currentFlow) }
+ { serverConfig }
+
+ { _t('Create an account') }
+
+ { loginAsGuestJsx }
+
-
+
-
+
);
},
});
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/auth/Registration.js
similarity index 91%
rename from src/components/structures/login/Registration.js
rename to src/components/structures/auth/Registration.js
index fa5a02e881..39f7964281 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -1,7 +1,7 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2018, 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.
@@ -24,11 +24,10 @@ import PropTypes from 'prop-types';
import sdk from '../../../index';
import MatrixClientPeg from '../../../MatrixClientPeg';
-import RegistrationForm from '../../views/login/RegistrationForm';
+import RegistrationForm from '../../views/auth/RegistrationForm';
import RtsClient from '../../../RtsClient';
import { _t, _td } from '../../../languageHandler';
import SdkConfig from '../../../SdkConfig';
-import SettingsStore from "../../../settings/SettingsStore";
import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
const MIN_PASSWORD_LENGTH = 6;
@@ -397,14 +396,12 @@ module.exports = React.createClass({
},
render: function() {
- const LoginHeader = sdk.getComponent('login.LoginHeader');
- const LoginFooter = sdk.getComponent('login.LoginFooter');
- const LoginPage = sdk.getComponent('login.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.login.ServerConfig');
-
- const theme = SettingsStore.getValue("theme");
+ const ServerConfig = sdk.getComponent('views.auth.ServerConfig');
let registerBody;
if (this.state.doingUIAuth) {
@@ -458,47 +455,39 @@ module.exports = React.createClass({
);
}
- let header;
let errorText;
- // FIXME: remove hardcoded Status team tweaks at some point
const err = this.state.errorText || this.props.defaultServerDiscoveryError;
- if (theme === 'status' && err) {
- header =
-
+
+
);
},
});
diff --git a/src/components/structures/LoginBox.js b/src/components/views/auth/AuthButtons.js
similarity index 67%
rename from src/components/structures/LoginBox.js
rename to src/components/views/auth/AuthButtons.js
index 168014daa5..35bfabbbca 100644
--- a/src/components/structures/LoginBox.js
+++ b/src/components/views/auth/AuthButtons.js
@@ -1,6 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2018, 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.
@@ -18,12 +18,12 @@ limitations under the License.
'use strict';
const React = require('react');
-import { _t } from '../../languageHandler';
-const dis = require('../../dispatcher');
-const AccessibleButton = require('../../components/views/elements/AccessibleButton');
+import { _t } from '../../../languageHandler';
+const dis = require('../../../dispatcher');
+const AccessibleButton = require('../elements/AccessibleButton');
module.exports = React.createClass({
- displayName: 'LoginBox',
+ displayName: 'AuthButtons',
propTypes: {
},
@@ -38,18 +38,18 @@ module.exports = React.createClass({
render: function() {
const loginButton = (
-
- { _t('Set a display name:') }
-
+
+ { _t('Set a display name:') }
+
-
+ { err }
;
- } else {
- header = { _t('Create an account') }
; - if (err) { - errorText ={ err }
;
- }
+ const header = { _t('Create an account') }
; + if (err) { + errorText ={ err }
;
}
let signIn;
if (!this.state.doingUIAuth) {
signIn = (
- { theme === 'status' ? _t('Sign in') : _t('I already have an account') }
+ { _t('I already have an account') }
);
}
- const LanguageSelector = sdk.getComponent('structures.login.LanguageSelector');
+ const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector');
return (
-
-
-
-
+
+
{ _t("Login") }
-
+
{ _t("Register") }
);
return (
-
+
{ loginButton }
);
diff --git a/src/components/views/login/LoginFooter.js b/src/components/views/auth/AuthFooter.js
similarity index 89%
rename from src/components/views/login/LoginFooter.js
rename to src/components/views/auth/AuthFooter.js
index 392d36e288..ea43bf322c 100644
--- a/src/components/views/login/LoginFooter.js
+++ b/src/components/views/auth/AuthFooter.js
@@ -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 (
-
+
);
diff --git a/src/components/views/login/LoginHeader.js b/src/components/views/auth/AuthHeader.js
similarity index 77%
rename from src/components/views/login/LoginHeader.js
rename to src/components/views/auth/AuthHeader.js
index cd1f9c6a28..08c9ad41c9 100644
--- a/src/components/views/login/LoginHeader.js
+++ b/src/components/views/auth/AuthHeader.js
@@ -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 (
-
- Matrix
+
+
);
},
diff --git a/src/components/views/auth/AuthPage.js b/src/components/views/auth/AuthPage.js
new file mode 100644
index 0000000000..d5f82f7264
--- /dev/null
+++ b/src/components/views/auth/AuthPage.js
@@ -0,0 +1,34 @@
+/*
+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.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+const React = require('react');
+
+module.exports = React.createClass({
+ displayName: 'AuthPage',
+
+ render: function() {
+ return (
+
+ Matrix
+
+
+ );
+ },
+});
diff --git a/src/components/views/login/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
similarity index 100%
rename from src/components/views/login/CaptchaForm.js
rename to src/components/views/auth/CaptchaForm.js
diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/auth/CountryDropdown.js
similarity index 100%
rename from src/components/views/login/CountryDropdown.js
rename to src/components/views/auth/CountryDropdown.js
diff --git a/src/components/views/login/CustomServerDialog.js b/src/components/views/auth/CustomServerDialog.js
similarity index 100%
rename from src/components/views/login/CustomServerDialog.js
rename to src/components/views/auth/CustomServerDialog.js
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
similarity index 99%
rename from src/components/views/login/InteractiveAuthEntryComponents.js
rename to src/components/views/auth/InteractiveAuthEntryComponents.js
index 73b46959b0..6a78898179 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -187,7 +187,7 @@ export const RecaptchaAuthEntry = React.createClass({
return
+ { this.props.children }
+
+
-
- );
- } else {
- return (
-
- 
-
-
-
-
-
-
- { this.props.children }
- Status Community Chat
-
- A safer, decentralised communication
- platform powered by Riot
-
-
-
- This channel is for our development community.
-Interested in SNT and discussions on the cryptocurrency market?
- -
- { this.props.children }
-
- );
- }
- },
-});
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 82169c9868..27164e6517 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -141,7 +141,7 @@ export default withMatrixClient(React.createClass({
return ;
}
- const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
+ const CountryDropdown = sdk.getComponent('views.auth.CountryDropdown');
// XXX: This CSS relies on the CSS surrounding it in UserSettings as its in
// a tabular format to align the submit buttons
return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 16c40460e2..cfd5168152 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1328,7 +1328,6 @@
"Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.",
"Sign in with single sign-on": "Sign in with single sign-on",
"Try the app first": "Try the app first",
- "Sign in to get started": "Sign in to get started",
"Failed to fetch avatar URL": "Failed to fetch avatar URL",
"Set a display name:": "Set a display name:",
"Upload an avatar:": "Upload an avatar:",
diff --git a/src/stores/LifecycleStore.js b/src/stores/LifecycleStore.js
index 2ce3be5a33..fcdfe93cf9 100644
--- a/src/stores/LifecycleStore.js
+++ b/src/stores/LifecycleStore.js
@@ -22,8 +22,8 @@ const INITIAL_STATE = {
};
/**
- * A class for storing application state to do with login/registration. This is a simple
- * flux store that listens for actions and updates its state accordingly, informing any
+ * A class for storing application state to do with authentication. This is a simple flux
+ * store that listens for actions and updates its state accordingly, informing any
* listeners (views) of state changes.
*/
class LifecycleStore extends Store {
diff --git a/test/components/structures/login/Registration-test.js b/test/components/structures/auth/Registration-test.js
similarity index 98%
rename from test/components/structures/login/Registration-test.js
rename to test/components/structures/auth/Registration-test.js
index 7287bb0d95..4827bf4c12 100644
--- a/test/components/structures/login/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -23,7 +23,7 @@ const expect = require('expect');
const testUtils = require('test-utils');
const sdk = require('matrix-react-sdk');
-const Registration = sdk.getComponent('structures.login.Registration');
+const Registration = sdk.getComponent('structures.auth.Registration');
let rtsClient;
let client;
diff --git a/test/components/views/login/RegistrationForm-test.js b/test/components/views/auth/RegistrationForm-test.js
similarity index 97%
rename from test/components/views/login/RegistrationForm-test.js
rename to test/components/views/auth/RegistrationForm-test.js
index 2d1c1be026..265f158bb9 100644
--- a/test/components/views/login/RegistrationForm-test.js
+++ b/test/components/views/auth/RegistrationForm-test.js
@@ -23,7 +23,7 @@ const expect = require('expect');
const testUtils = require('test-utils');
const sdk = require('matrix-react-sdk');
-const RegistrationForm = sdk.getComponent('views.login.RegistrationForm');
+const RegistrationForm = sdk.getComponent('views.auth.RegistrationForm');
const TEAM_CONFIG = {
supportEmail: "support@some.domain",