diff --git a/app/javascript/mastodon/features/ui/components/messaging/contacts-list.js b/app/javascript/mastodon/features/ui/components/messaging/contacts-list.js
index e023089bc..8ae7aead9 100644
--- a/app/javascript/mastodon/features/ui/components/messaging/contacts-list.js
+++ b/app/javascript/mastodon/features/ui/components/messaging/contacts-list.js
@@ -14,7 +14,8 @@ export default class ContactsList extends React.PureComponent {
// liste de contacts
//
// );
- const contactlist = null;
+ const contactlist = ['machin', 'bidule', 'chuck norris'];
+ const conversationList = ['machin', 'bidule', 'chuck norris'];
return (
@@ -32,71 +33,29 @@ export default class ContactsList extends React.PureComponent {
}
-
User list
-
- {contactlist &&
-
- la liste de contacts
-
- }
+ la liste de contacts
+
+ {contactlist.forEach(elem => {
+ return (
+ -
+ {elem}
+
+ );
+ })}
diff --git a/app/javascript/mastodon/features/ui/components/messaging/conversation-item.js b/app/javascript/mastodon/features/ui/components/messaging/conversation-item.js
new file mode 100644
index 000000000..834b7ac3d
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/messaging/conversation-item.js
@@ -0,0 +1,67 @@
+import React from 'react';
+
+export default class ConversationItem extends React.PureComponent {
+
+ following = [];
+
+ render() {
+
+ const list = (
+
+
+
+ Un Gens
+
+ (3)
+
+
+
+
+
oh hello there! 😋
+
+
+
+
+
we just achieved comedy
+
+
+
+
+
+
+
+ );
+ return list;
+
+ }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/messaging/conversation-stream.js b/app/javascript/mastodon/features/ui/components/messaging/conversation-stream.js
index 50b2868b3..90d74de37 100644
--- a/app/javascript/mastodon/features/ui/components/messaging/conversation-stream.js
+++ b/app/javascript/mastodon/features/ui/components/messaging/conversation-stream.js
@@ -4,7 +4,7 @@ export default class ConversationStream extends React.PureComponent {
render() {
return (
-
+
ConversationStream todo
diff --git a/app/javascript/mastodon/features/ui/components/messaging/messaging.js b/app/javascript/mastodon/features/ui/components/messaging/messaging.js
index 692e1268f..4e1bdea68 100644
--- a/app/javascript/mastodon/features/ui/components/messaging/messaging.js
+++ b/app/javascript/mastodon/features/ui/components/messaging/messaging.js
@@ -1,5 +1,6 @@
import React from 'react';
import ContactsList from './contacts-list';
+import Conversation from './conversations';
export default class Messaging extends React.PureComponent {
@@ -52,8 +53,8 @@ export default class Messaging extends React.PureComponent {
messagerie todo
- {/**/}
+
);
}
diff --git a/app/javascript/styles/bliss/messaging.scss b/app/javascript/styles/bliss/messaging.scss
index 987b5be57..bd7cc53ef 100644
--- a/app/javascript/styles/bliss/messaging.scss
+++ b/app/javascript/styles/bliss/messaging.scss
@@ -21,7 +21,12 @@ $messagingBoxHeight: 20em;
}
.conversations_list {
-
+ right: 1em;
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ padding: 0.5em;
+ background: gray;
}