Render chats in panes layout
This commit is contained in:
parent
b98f06e3d3
commit
d6b3268da4
5 changed files with 75 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
||||||
import { debounce } from 'lodash';
|
import { debounce } from 'lodash';
|
||||||
import { showAlertForError } from './alerts';
|
import { showAlertForError } from './alerts';
|
||||||
import { patchMe } from 'soapbox/actions/me';
|
import { patchMe } from 'soapbox/actions/me';
|
||||||
import { Map as ImmutableMap } from 'immutable';
|
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
||||||
|
|
||||||
export const SETTING_CHANGE = 'SETTING_CHANGE';
|
export const SETTING_CHANGE = 'SETTING_CHANGE';
|
||||||
export const SETTING_SAVE = 'SETTING_SAVE';
|
export const SETTING_SAVE = 'SETTING_SAVE';
|
||||||
|
@ -29,6 +29,11 @@ const defaultSettings = ImmutableMap({
|
||||||
dyslexicFont: false,
|
dyslexicFont: false,
|
||||||
demetricator: false,
|
demetricator: false,
|
||||||
|
|
||||||
|
chats: ImmutableMap({
|
||||||
|
panes: ImmutableList(),
|
||||||
|
mainWindow: 'minimized',
|
||||||
|
}),
|
||||||
|
|
||||||
home: ImmutableMap({
|
home: ImmutableMap({
|
||||||
shows: ImmutableMap({
|
shows: ImmutableMap({
|
||||||
reblog: true,
|
reblog: true,
|
||||||
|
|
|
@ -36,9 +36,6 @@ class ChatList extends ImmutablePureComponent {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='chat-list'>
|
<div className='chat-list'>
|
||||||
<div className='chat-list__header'>
|
|
||||||
<FormattedMessage id='chat_list.title' defaultMessage='Chats' />
|
|
||||||
</div>
|
|
||||||
<div className='chat-list__content'>
|
<div className='chat-list__content'>
|
||||||
{chats.toList().map(chat => (
|
{chats.toList().map(chat => (
|
||||||
<div key={chat.get('id')} className='chat-list-item'>
|
<div key={chat.get('id')} className='chat-list-item'>
|
||||||
|
|
66
app/soapbox/features/chats/components/chat_panes.js
Normal file
66
app/soapbox/features/chats/components/chat_panes.js
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
|
import { injectIntl } from 'react-intl';
|
||||||
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
import { getSettings } from 'soapbox/actions/settings';
|
||||||
|
import ChatList from './chat_list';
|
||||||
|
import { FormattedMessage } from 'react-intl';
|
||||||
|
|
||||||
|
const mapStateToProps = state => ({
|
||||||
|
panesData: getSettings(state).get('chats'),
|
||||||
|
});
|
||||||
|
|
||||||
|
export default @connect(mapStateToProps)
|
||||||
|
@injectIntl
|
||||||
|
class ChatPanes extends ImmutablePureComponent {
|
||||||
|
|
||||||
|
static propTypes = {
|
||||||
|
dispatch: PropTypes.func.isRequired,
|
||||||
|
intl: PropTypes.object.isRequired,
|
||||||
|
panesData: ImmutablePropTypes.map,
|
||||||
|
}
|
||||||
|
|
||||||
|
renderChatPane = (pane, i) => {
|
||||||
|
// const chat = getChat(pane.get('chat_id'))
|
||||||
|
return (
|
||||||
|
<div key={i} className='pane'>
|
||||||
|
<div className='pane__header'>
|
||||||
|
// {chat.getIn(['account', 'acct'])}
|
||||||
|
</div>
|
||||||
|
<div className='pane__content'>
|
||||||
|
// TODO: Show the chat messages
|
||||||
|
<div className='pane__actions'>
|
||||||
|
<input type='text' />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderChatPanes = (panes) => (
|
||||||
|
panes.map((pane, i) =>
|
||||||
|
this.renderChatPane(pane, i)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const panes = this.props.panesData.get('panes');
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className='chat-panes'>
|
||||||
|
<div className='pane pane--main'>
|
||||||
|
<div className='pane__header'>
|
||||||
|
<FormattedMessage id='chat_panels.main_window.title' defaultMessage='Chats' />
|
||||||
|
</div>
|
||||||
|
<div className='pane__content'>
|
||||||
|
<ChatList />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{this.renderChatPanes(panes)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -36,7 +36,7 @@ import { connectUserStream } from '../../actions/streaming';
|
||||||
import { Redirect } from 'react-router-dom';
|
import { Redirect } from 'react-router-dom';
|
||||||
import Icon from 'soapbox/components/icon';
|
import Icon from 'soapbox/components/icon';
|
||||||
import { isStaff } from 'soapbox/utils/accounts';
|
import { isStaff } from 'soapbox/utils/accounts';
|
||||||
import ChatList from 'soapbox/features/chats/components/chat_list';
|
import ChatPanes from 'soapbox/features/chats/components/chat_panes';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Status,
|
Status,
|
||||||
|
@ -605,7 +605,7 @@ class UI extends React.PureComponent {
|
||||||
<ModalContainer />
|
<ModalContainer />
|
||||||
<UploadArea active={draggingOver} onClose={this.closeUploadModal} />
|
<UploadArea active={draggingOver} onClose={this.closeUploadModal} />
|
||||||
{me && <SidebarMenu />}
|
{me && <SidebarMenu />}
|
||||||
{me && <ChatList />}
|
{me && <ChatPanes />}
|
||||||
</div>
|
</div>
|
||||||
</HotKeys>
|
</HotKeys>
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
.chat-list {
|
.pane {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
right: 20px;
|
right: 20px;
|
||||||
|
|
Loading…
Reference in a new issue