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

Implement design and copy for errors

Browse Source
This commit is contained in:
Travis Ralston
2019-06-05 11:32:02 -06:00
parent 10f4d6b419
commit ace1bde238
8 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/GenericErrorPage.js
View File

@@ -16,22 +16,18 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import {_t} from "../../languageHandler";
export default class GenericErrorPage extends React.PureComponent {
static propTypes = {
title: PropTypes.object.isRequired, // jsx for title
message: PropTypes.object.isRequired, // jsx to display
};
render() {
return <div className='mx_GenericErrorPage'>
<div className='mx_GenericErrorPage_box'>
<h1>{_t("Error loading Riot")}</h1>
<h1>{this.props.title}</h1>
<p>{this.props.message}</p>
<p>{_t(
"If this is unexpected, please contact your system administrator " +
"or technical support representative.",
)}</p>
</div>
</div>;
}

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

@@ -213,9 +213,8 @@ module.exports = React.createClass({
let serverDeadSection;
if (!this.state.serverIsAlive) {
// TODO: TravisR - Design from Nad
serverDeadSection = (
<div className="mx_Login_error">
<div className="mx_Login_error mx_Login_serverError">
{this.state.serverDeadError}
</div>
);

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

@@ -568,9 +568,8 @@ module.exports = React.createClass({
let serverDeadSection;
if (!this.state.serverIsAlive) {
// TODO: TravisR - Design from Nad
serverDeadSection = (
<div className="mx_Login_error">
<div className="mx_Login_error mx_Login_serverError">
{this.state.serverDeadError}
</div>
);

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

@@ -485,9 +485,8 @@ module.exports = React.createClass({
let serverDeadSection;
if (!this.state.serverIsAlive) {
// TODO: TravisR - Design from Nad
serverDeadSection = (
<div className="mx_Login_error">
<div className="mx_Login_error mx_Login_serverError">
{this.state.serverDeadError}
</div>
);