save stuff

This commit is contained in:
Baptiste Lemoine 2020-01-16 17:10:18 +01:00
parent 9bef612c35
commit 6a616a0c33
14 changed files with 154 additions and 105 deletions

View File

@ -236,7 +236,7 @@ class Conversation extends ImmutablePureComponent {
className='status__action-bar-button conversation_reply'
title={intl.formatMessage(messages.reply)}
icon='reply'
size='15em'
size={40}
onClick={this.handleReply}
/>
</div >

View File

@ -72,13 +72,13 @@ class Following extends ImmutablePureComponent {
);
}
const emptyMessage = blockedBy ? <FormattedMessage
const emptyMessage = blockedBy ? (<FormattedMessage
id='empty_column.account_unavailable'
defaultMessage='Profile unavailable'
/> : <FormattedMessage
/>) : (<FormattedMessage
id='account.follows.empty'
defaultMessage="This user doesn't follow anyone yet."
/>;
/>);
return (
<Column >
@ -98,11 +98,11 @@ class Following extends ImmutablePureComponent {
bindToDocument={!multiColumn}
>
{blockedBy ? [] : accountIds.map(id =>
<AccountContainer
(<AccountContainer
key={id}
id={id}
withNote={false}
/>,
/>),
)}
</ScrollableList >
</Column >

View File

@ -240,8 +240,11 @@ class ColumnsArea extends ImmutablePureComponent {
</div >
<LinkFooter withHotkeys />
{floatingActionButton}
<div className='hidden_nope'>
<InstantMessaging />
</div >
</div >
);
}

View File

@ -165,8 +165,15 @@ class LinkFooter extends React.PureComponent {
</div >
)}
{isStaff && (
<span >
<span className='staff-actions'>
<NavLink
exact
activeClassName='active'
to={'/tk-example/'}
title='tk example link'
>
example link
</NavLink >
<a
className='btn-warning'
href='/admin/tags?pending_review=1'

View File

@ -5,6 +5,7 @@ import api from '../../../../api';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { mockContactList } from './mocks/mockContactList';
import Contact from './Contact';
import classNames from 'classnames';
export default class ContactsList extends ImmutablePureComponent {
@ -79,11 +80,15 @@ export default class ContactsList extends ImmutablePureComponent {
}
const showListClass = (this.state.showList ? 'active' : 'inactive');
const classListContainer = 'messaging-box ' + showListClass;
const classList = 'btn btn-primary toggle-list ' + showListClass;
return (
<div className='messaging-container'>
<div className={classListContainer}>
<div
className={classNames('messaging-box ', {
'active' : this.state.showList,
'inactive': !this.state.showList,
})}
>
<div className='card-title '>
<i
role='img'

View File

@ -13,12 +13,11 @@ export default class ConversationItem extends React.PureComponent {
newMessages: PropTypes.number,
displayed : PropTypes.bool,
};
following = [];
static defaultProps = {
newMessages: 0,
displayed : true,
};
following = [];
constructor(props) {
super(props);

View File

@ -18,7 +18,10 @@ export default class ConversationStream extends React.PureComponent {
messagesLists = this.props.messages.map(message => {
return (
<li className={'message ' + message.who}>
<li
className={'message ' + message.who}
key={message.id}
>
<p >{message.text}</p >
<div className='arrow-down' />
</li >

View File

@ -1,16 +1,33 @@
import React from 'react';
import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ContactsList from './contacts-list';
import ConversationStack from './conversationStack';
const mapStateToProps = (state, props) => ({
isAccount : !!state.getIn(['accounts', props.params.accountId]),
accountIds: state.getIn(['user_lists', 'following', props.params.accountId, 'items']),
hasMore : !!state.getIn(['user_lists', 'following', props.params.accountId, 'next']),
blockedBy : state.getIn(['relationships', props.params.accountId, 'blocked_by'], false),
});
// @connect(mapStateToProps)
/**
* main component for IM, gathers contact list and list of conversations
*/
export default class InstantMessaging extends React.PureComponent {
export default class InstantMessaging extends ImmutablePureComponent {
// static propTypes = {
// following : PropTypes.array,
// conversations: PropTypes.array,
// };
static propTypes = {
// params : PropTypes.object.isRequired,
dispatch : PropTypes.func.isRequired,
shouldUpdateScroll: PropTypes.func,
accountIds : ImmutablePropTypes.list,
hasMore : PropTypes.bool,
blockedBy : PropTypes.bool,
isAccount : PropTypes.bool,
multiColumn : PropTypes.bool,
};
// static defaultProps = {
// threadsCompile: true,
// };
@ -30,6 +47,7 @@ export default class InstantMessaging extends React.PureComponent {
// };
render() {
return (
<div className='main-instant-messaging'>

View File

@ -1,14 +1,14 @@
export const mockMessages = [
{ text: 'oh hello there! 😋 ', who: 'theirs' },
{ text: 'General Emoji', who: 'ours' },
{ text: 'we just achieved comedy', who: 'theirs' },
{ id: 0, text: 'oh hello there! 😋 ', who: 'theirs' },
{ id: 1, text: 'General Emoji', who: 'ours' },
{ id: 2, text: 'we just achieved comedy', who: 'theirs' },
]
;
export const mockMessages2 = [
{ text: 'oh oh oh ', who: 'theirs' },
{ text: 'General Emoji', who: 'ours' },
{ text: 'DANGER!!', who: 'theirs' },
{ text: 'JUST KIDDING WILL ROBINSON.', who: 'theirs' },
{ id: 0, text: 'oh oh oh ', who: 'theirs' },
{ id: 1, text: 'General Emoji', who: 'ours' },
{ id: 2, text: 'DANGER!!', who: 'theirs' },
{ id: 3, text: 'JUST KIDDING WILL ROBINSON.', who: 'theirs' },
]
;

View File

@ -57,6 +57,7 @@ import { previewState as previewVideoState } from './components/video_modal';
// Dummy import, to make sure that <Status /> ends up in the application bundle.
// Without this it ends up in ~8 very commonly used bundles.
import '../../components/status';
import InstantMessaging from './components/messaging/instantMessaging';
const messages = defineMessages({
beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Mastodon.' },
@ -192,7 +193,7 @@ class SwitchingColumnsArea extends React.PureComponent {
{redirect}
<WrappedRoute
path='/tk-example'
component={GettingStarted}
component={InstantMessaging}
content={children}
/>
<WrappedRoute

View File

@ -72,3 +72,13 @@
color: $inverted-text-color;
}
}
.hidden {
display: none;
&:before {
content: "hidden div here";
background: yellow;
padding: 1em;
}
}

View File

@ -1,3 +1,4 @@
.main-instant-messaging {
.conversation {
@ -82,3 +83,5 @@
border: 0;
}
}
}

View File

@ -5,7 +5,7 @@
= render 'shared/error_messages', object: resource
.fields-group
= f.not-a-real-input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false
= f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false
.actions
= f.button :button, t('auth.reset_password'), type: :submit

View File

@ -7,11 +7,11 @@
= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
.fields-group
- if use_seamless_external_login?
= f.not-a-real-input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }, hint: false
= f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }, hint: false
- else
= f.not-a-real-input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false
= f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, hint: false
.fields-group
= f.not-a-real-input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }, hint: false
= f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }, hint: false
.actions
= f.button :button, t('auth.login'), type: :submit