more components are functional now

This commit is contained in:
or-else
2018-10-27 20:01:20 +03:00
parent 92d4ba8a86
commit d7fb701983
12 changed files with 190 additions and 37 deletions
+2 -2
View File
@@ -192,12 +192,12 @@ export default class EditAccountView extends React.Component {
<div className="panel-form-row">
<label htmlFor="desktop-alerts">
{this.props.desktopAlertsEnabled ?
<FormattedMessage id="label_push_notifications" defaultMessage="Notification alerts"
<FormattedMessage id="label_push_notifications" defaultMessage="Notification alerts:"
description="Label for push notifications switch" />
:
<FormattedMessage id="label_push_notifications_disabled"
defaultMessage="Notification alerts (requires HTTPS)"
description="Label for push notifications switch (disabled)" />
description="Label for push notifications switch (disabled):" />
}
</label>
<CheckBox name="alert" id="desktop-alerts"
+6 -1
View File
@@ -1,6 +1,8 @@
import React from 'react';
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
import Tinode from 'tinode-sdk';
import ChatMessage from '../widgets/chat-message.jsx';
import ErrorPanel from '../widgets/error-panel.jsx';
import GroupSubs from '../widgets/group-subs.jsx';
@@ -10,6 +12,8 @@ import LoadSpinner from '../widgets/load-spinner.jsx';
import LogoView from './logo-view.jsx';
import SendMessage from '../widgets/send-message.jsx';
import { KEYPRESS_DELAY, MESSAGES_PAGE } from '../config.js';
import { makeImageUrl } from '../lib/blob-helpers.js';
import { shortDateFormat } from '../lib/strformat.js';
const messages = defineMessages({
@@ -378,6 +382,7 @@ class MessagesView extends React.Component {
let topic = this.props.tinode.getTopic(this.state.topic);
let groupTopic = topic.getType() == 'grp';
let previousFrom = null;
let chatBoxClass = null;
for (let i=0; i<this.state.messages.length; i++) {
let msg = this.state.messages[i];
let nextFrom = null;
@@ -401,7 +406,7 @@ class MessagesView extends React.Component {
let isReply = !(msg.from == this.props.myUserId);
let deliveryStatus = topic.msgStatus(msg);
let userName, userAvatar, userFrom, chatBoxClass;
let userName, userAvatar, userFrom;
if (groupTopic) {
let user = topic.userDesc(msg.from);
if (user && user.public) {
+4 -2
View File
@@ -1,5 +1,6 @@
// The top-level class to hold all functionality together.
import React from 'react';
import ReactDOM from 'react-dom';
import 'firebase/app';
import 'firebase/messaging';
@@ -12,14 +13,15 @@ import InfoView from './info-view.jsx';
import MessagesView from './messages-view.jsx';
import SidepanelView from './sidepanel-view.jsx';
import { API_KEY, APP_NAME, MEDIA_BREAKPOINT, RECEIVED_DELAY } from '../config.js';
import { API_KEY, APP_NAME, MEDIA_BREAKPOINT, READ_DELAY, RECEIVED_DELAY } from '../config.js';
import { makeImageUrl } from '../lib/blob-helpers.js';
import { isLocalHost, isSecureConnection } from '../lib/host-name.js';
import LocalStorageUtil from '../lib/local-storage.js';
import HashNavigation from '../lib/navigation.js';
import { updateFavicon } from '../lib/utils.js';
// Sound to play on message received.
export const POP_SOUND = new Audio('audio/msg.mp3');
const POP_SOUND = new Audio('audio/msg.mp3');
export default class TinodeWeb extends React.Component {
constructor(props) {