more fixes

This commit is contained in:
or-else
2018-10-25 18:57:13 +03:00
parent cbc89617dc
commit 00a54ac0ee
11 changed files with 142 additions and 47 deletions
+6 -7
View File
@@ -1,5 +1,4 @@
// Login form
// Login form.
import React from 'react';
import { FormattedMessage } from 'react-intl';
@@ -50,7 +49,7 @@ export default class LoginView extends React.Component {
return (
<form id="login-form" onSubmit={this.handleSubmit}>
<FormattedMessage id="login.login_prompt" defaultMessage="Login">
<FormattedMessage id="login_prompt" defaultMessage="Login">
{
(login_prompt) => <input type="text" id="inputLogin"
placeholder={login_prompt}
@@ -60,7 +59,7 @@ export default class LoginView extends React.Component {
required autoFocus />
}
</FormattedMessage>
<FormattedMessage id="login.password_prompt" defaultMessage="Password">
<FormattedMessage id="password_prompt" defaultMessage="Password">
{
(password_prompt) => <VisiblePassword type="password" id="inputPassword"
placeholder={password_prompt}
@@ -74,15 +73,15 @@ export default class LoginView extends React.Component {
<CheckBox id="save-token" name="save-token" checked={this.state.saveToken}
onChange={this.handleToggleSaveToken} />
<label htmlFor="save-token">&nbsp;
<FormattedMessage id="login.stay_logged_in" defaultMessage="Stay logged in" />
<FormattedMessage id="stay_logged_in" defaultMessage="Stay logged in" />
</label>
<a href="#reset">
<FormattedMessage id="login.forgot_password_link" defaultMessage="Forgot password?" />
<FormattedMessage id="forgot_password_link" defaultMessage="Forgot password?" />
</a>
</div>
<div className="dialog-buttons">
<button className={submitClasses} type="submit">
<FormattedMessage id="login.sign_in_button" defaultMessage="Sign in" />
<FormattedMessage id="sign_in_button" defaultMessage="Sign in" />
</button>
</div>
</form>
+4 -2
View File
@@ -1,5 +1,6 @@
/* This is just a static page to display when no conversation is selected. */
import React from 'react';
import { FormattedMessage } from 'react-intl';
import Tinode from 'tinode-sdk';
@@ -15,8 +16,9 @@ export default class LogoView extends React.PureComponent {
<img id="logo" alt="logo" src="img/logo.svg" />
<h2>Tinode Web</h2>
</a>
<p>Client: {version}</p>
<p>Server: {this.props.serverVersion} ({this.props.serverAddress})</p>
<p><FormattedMessage id="label_client" defaultMessage="Client:" /> {version}</p>
<p><FormattedMessage id="label_server" defaultMessage="Server:" /> {this.props.serverVersion}
({this.props.serverAddress})</p>
</div>
</div>
);
+3 -1
View File
@@ -3,7 +3,7 @@ import React from 'react';
import 'firebase/app';
import 'firebase/messaging';
import { FIREBASE_INIT } from '../firebase-init.js'
import { FIREBASE_INIT } from '../firebase-init.json';
import Tinode from 'tinode-sdk';
@@ -21,6 +21,8 @@ import HashNavigation from '../lib/navigation.js';
// Sound to play on message received.
export const POP_SOUND = new Audio('audio/msg.mp3');
console.log(FIREBASE_INIT);
export default class TinodeWeb extends React.Component {
constructor(props) {
super(props);