mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
hop
This commit is contained in:
parent
e064b3eb15
commit
cc4e34e508
10
Gemfile.lock
10
Gemfile.lock
@ -134,7 +134,7 @@ GEM
|
||||
msgpack (~> 1.0)
|
||||
brakeman (4.7.2)
|
||||
browser (2.7.1)
|
||||
builder (3.2.3)
|
||||
builder (3.2.4)
|
||||
bullet (6.0.2)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.11)
|
||||
@ -356,7 +356,7 @@ GEM
|
||||
activesupport (>= 4)
|
||||
railties (>= 4)
|
||||
request_store (~> 1.0)
|
||||
loofah (2.3.1)
|
||||
loofah (2.4.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
@ -458,7 +458,7 @@ GEM
|
||||
pundit (2.1.0)
|
||||
activesupport (>= 3.0.0)
|
||||
raabro (1.1.6)
|
||||
rack (2.0.7)
|
||||
rack (2.0.8)
|
||||
rack-attack (6.2.1)
|
||||
rack (>= 1.0, < 3)
|
||||
rack-cors (1.1.0)
|
||||
@ -645,7 +645,7 @@ GEM
|
||||
tty-screen (0.7.0)
|
||||
twitter-text (1.14.7)
|
||||
unf (~> 0.1.0)
|
||||
tzinfo (1.2.5)
|
||||
tzinfo (1.2.6)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo-data (1.2019.3)
|
||||
tzinfo (>= 1.0.0)
|
||||
@ -660,7 +660,7 @@ GEM
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff (>= 0.4.0, < 2.0.0)
|
||||
webpacker (4.2.0)
|
||||
webpacker (4.2.2)
|
||||
activesupport (>= 4.2)
|
||||
rack-proxy (>= 0.6.1)
|
||||
railties (>= 4.2)
|
||||
|
@ -2,11 +2,11 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
export default class Messaging extends ImmutablePureComponent {
|
||||
|
||||
static propTypes = {
|
||||
// following : ImmutablePropTypes.list,
|
||||
// conversations: ImmutablePropTypes.list,
|
||||
// newMessage : ImmutablePropTypes.string,
|
||||
};
|
||||
// static propTypes = {
|
||||
// following : ImmutablePropTypes.list,
|
||||
// conversations: ImmutablePropTypes.list,
|
||||
// newMessage : ImmutablePropTypes.string,
|
||||
// };
|
||||
|
||||
// openConversationWith(account) {
|
||||
// let conversationFound = account;
|
||||
@ -50,9 +50,9 @@ export default class Messaging extends ImmutablePureComponent {
|
||||
render() {
|
||||
// const contactlist = null;
|
||||
return (
|
||||
<div >
|
||||
<div>
|
||||
messagerie todo
|
||||
</div >
|
||||
</div>
|
||||
);
|
||||
// const contactlist = this.props.following.foreEach(elem => (
|
||||
// <li className='user-item'>
|
||||
|
19
app/javascript/something/Something.js
Normal file
19
app/javascript/something/Something.js
Normal file
@ -0,0 +1,19 @@
|
||||
import React, {Component} from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
|
||||
class Something extends Component {
|
||||
constructor(props){
|
||||
super(props);
|
||||
}
|
||||
render(){
|
||||
return (
|
||||
<div className="Something">
|
||||
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
Something.propTypes = {
|
||||
}
|
||||
|
||||
export default Something;
|
@ -6200,3 +6200,7 @@ noscript {
|
||||
padding: 0.35rem;
|
||||
}
|
||||
}
|
||||
|
||||
.columns-area__panels__pane__inner{
|
||||
z-index: 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user