From 89704bb7e6748a657129f6746677cfe43f0e7c4d Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 27 Nov 2020 16:00:59 +0200
Subject: [PATCH 1/3] Fix post button color

---
 packages/concordia-app/src/components/PostCreate/styles.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/concordia-app/src/components/PostCreate/styles.css b/packages/concordia-app/src/components/PostCreate/styles.css
index 3006cee..f13e984 100644
--- a/packages/concordia-app/src/components/PostCreate/styles.css
+++ b/packages/concordia-app/src/components/PostCreate/styles.css
@@ -15,3 +15,7 @@
 .subject-input {
     min-width: 300px;
 }
+
+.like:hover .icon {
+    color: #fff !important;
+}

From 2d5bfa4850f1ae2be0e0c149628216ace074b774 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 27 Nov 2020 20:52:35 +0200
Subject: [PATCH 2/3] PostList improvements

---
 .../public/locales/en/translation.json        |  3 +--
 .../src/components/PostCreate/index.jsx       | 27 +++----------------
 .../src/components/PostCreate/styles.css      |  8 ------
 .../components/PostList/PostListRow/index.jsx | 11 ++------
 .../PostList/PostListRow/styles.css           |  4 ---
 .../src/constants/PostsDatabaseKeys.js        |  2 --
 .../src/redux/sagas/peerDbReplicationSaga.js  |  3 +--
 .../src/views/Topic/TopicCreate/index.jsx     |  3 +--
 8 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/packages/concordia-app/public/locales/en/translation.json b/packages/concordia-app/public/locales/en/translation.json
index a6cb0b5..e8681d5 100644
--- a/packages/concordia-app/public/locales/en/translation.json
+++ b/packages/concordia-app/public/locales/en/translation.json
@@ -6,7 +6,6 @@
   "post.create.form.send.button": "Post",
   "post.form.content.field.placeholder": "Message",
   "post.form.subject.field.placeholder": "Subject",
-  "post.list.row.author.pre": "Post by",
   "post.list.row.post.id": "#{{id}}",
   "profile.general.tab.address.row.title": "Account address:",
   "profile.general.tab.location.row.title": "Location:",
@@ -55,4 +54,4 @@
   "topic.list.row.author.date": "Created by {{author}}, {{timeAgo}}",
   "topic.list.row.number.of.replies": "{{numberOfReplies}} replies",
   "topic.list.row.topic.id": "#{{id}}"
-}
\ No newline at end of file
+}
diff --git a/packages/concordia-app/src/components/PostCreate/index.jsx b/packages/concordia-app/src/components/PostCreate/index.jsx
index fcaec71..b6322ea 100644
--- a/packages/concordia-app/src/components/PostCreate/index.jsx
+++ b/packages/concordia-app/src/components/PostCreate/index.jsx
@@ -14,7 +14,7 @@ import { USER_PROFILE_PICTURE } from '../../constants/UserDatabaseKeys';
 import { breeze, drizzle } from '../../redux/store';
 import './styles.css';
 import { TRANSACTION_ERROR, TRANSACTION_SUCCESS } from '../../constants/TransactionStatus';
-import { POST_CONTENT, POST_SUBJECT } from '../../constants/PostsDatabaseKeys';
+import { POST_CONTENT } from '../../constants/PostsDatabaseKeys';
 import { FORUM_CONTRACT } from '../../constants/ContractNames';
 import { POST_CREATED_EVENT } from '../../constants/ForumContractEvents';
 
@@ -27,7 +27,7 @@ const PostCreate = (props) => {
   } = props;
   const transactionStack = useSelector((state) => state.transactionStack);
   const transactions = useSelector((state) => state.transactions);
-  const [postSubject, setPostSubject] = useState(initialPostSubject);
+  const [postSubject] = useState(initialPostSubject);
   const [postContent, setPostContent] = useState('');
   const [userProfilePictureUrl, setUserProfilePictureUrl] = useState();
   const [createPostCacheSendStackId, setCreatePostCacheSendStackId] = useState('');
@@ -68,9 +68,6 @@ const PostCreate = (props) => {
     }
 
     switch (event.target.name) {
-      case 'postSubject':
-        setPostSubject(event.target.value);
-        break;
       case 'postContent':
         setPostContent(event.target.value);
         break;
@@ -94,11 +91,9 @@ const PostCreate = (props) => {
 
         postsDb
           .put(contractPostId, {
-            [POST_SUBJECT]: postSubject,
             [POST_CONTENT]: postContent,
           }, { pin: true })
           .then(() => {
-            setPostSubject(initialPostSubject);
             setPostContent('');
             setPosting(false);
             setStoringPost(false);
@@ -147,21 +142,6 @@ const PostCreate = (props) => {
               </Feed.Label>
               <Feed.Content>
                   <Feed.Summary>
-                      <div>
-                          <Input
-                            placeholder={t('post.form.subject.field.placeholder')}
-                            name="postSubject"
-                            className="subject-input"
-                            size="mini"
-                            value={postSubject}
-                            onChange={handleInputChange}
-                          />
-                          <span className="post-summary-meta-index">
-                              {t('post.list.row.post.id', { id: postIndexInTopic })}
-                          </span>
-                      </div>
-                  </Feed.Summary>
-                  <Feed.Extra>
                       <Form>
                           <TextArea
                             placeholder={t('post.form.content.field.placeholder')}
@@ -172,8 +152,7 @@ const PostCreate = (props) => {
                             onChange={handleInputChange}
                           />
                       </Form>
-                  </Feed.Extra>
-
+                  </Feed.Summary>
                   <Feed.Meta>
                       <Feed.Like>
                           <Form.Button
diff --git a/packages/concordia-app/src/components/PostCreate/styles.css b/packages/concordia-app/src/components/PostCreate/styles.css
index f13e984..0bf8ac6 100644
--- a/packages/concordia-app/src/components/PostCreate/styles.css
+++ b/packages/concordia-app/src/components/PostCreate/styles.css
@@ -8,14 +8,6 @@
     opacity: 0.4;
 }
 
-.post-summary-meta-date {
-    float: right !important;
-}
-
-.subject-input {
-    min-width: 300px;
-}
-
 .like:hover .icon {
     color: #fff !important;
 }
diff --git a/packages/concordia-app/src/components/PostList/PostListRow/index.jsx b/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
index 085c217..b107d87 100644
--- a/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
+++ b/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
@@ -15,7 +15,7 @@ import './styles.css';
 import { POSTS_DATABASE, USER_DATABASE } from '../../../constants/OrbitDatabases';
 import determineKVAddress from '../../../utils/orbitUtils';
 import { USER_PROFILE_PICTURE } from '../../../constants/UserDatabaseKeys';
-import { POST_CONTENT, POST_SUBJECT } from '../../../constants/PostsDatabaseKeys';
+import { POST_CONTENT } from '../../../constants/PostsDatabaseKeys';
 import { FORUM_CONTRACT } from '../../../constants/ContractNames';
 
 const { orbit } = breeze;
@@ -28,7 +28,6 @@ const PostListRow = (props) => {
   const [postAuthorAddress, setPostAuthorAddress] = useState(null);
   const [postAuthor, setPostAuthor] = useState(null);
   const [timeAgo, setTimeAgo] = useState(null);
-  const [postSubject, setPostSubject] = useState(null);
   const [postContent, setPostContent] = useState(null);
   const [postAuthorMeta, setPostAuthorMeta] = useState(null);
   const userAddress = useSelector((state) => state.user.address);
@@ -68,7 +67,6 @@ const PostListRow = (props) => {
       .find((post) => post.id === postId);
 
     if (postFound) {
-      setPostSubject(postFound[POST_SUBJECT]);
       setPostContent(postFound[POST_CONTENT]);
     }
   }, [postId, posts]);
@@ -126,9 +124,6 @@ const PostListRow = (props) => {
           <Feed.Content>
               <Feed.Summary>
                   <div>
-                      {postSubject !== null
-                        ? postSubject
-                        : <Placeholder><Placeholder.Line length="very long" /></Placeholder>}
                       <span className="post-summary-meta-index">
                           {t('post.list.row.post.id', { id: postIndexInTopic })}
                       </span>
@@ -136,8 +131,6 @@ const PostListRow = (props) => {
                   {postAuthor !== null && setPostAuthorAddress !== null && timeAgo !== null
                     ? (
                         <>
-                            {t('post.list.row.author.pre')}
-                            &nbsp;
                             <Feed.User as={Link} to={`/users/${postAuthorAddress}`}>{postAuthor}</Feed.User>
                             <Feed.Date className="post-summary-meta-date">{timeAgo}</Feed.Date>
                         </>
@@ -150,7 +143,7 @@ const PostListRow = (props) => {
           </Feed.Content>
       </Dimmer.Dimmable>
   ), [
-    authorAvatarLink, loading, postAuthor, postAuthorAddress, postContent, postIndexInTopic, postSubject, t, timeAgo,
+    authorAvatarLink, loading, postAuthor, postAuthorAddress, postContent, postIndexInTopic, t, timeAgo,
   ]);
 };
 
diff --git a/packages/concordia-app/src/components/PostList/PostListRow/styles.css b/packages/concordia-app/src/components/PostList/PostListRow/styles.css
index d74bc71..f6760c2 100644
--- a/packages/concordia-app/src/components/PostList/PostListRow/styles.css
+++ b/packages/concordia-app/src/components/PostList/PostListRow/styles.css
@@ -7,7 +7,3 @@
     font-size: 12px;
     opacity: 0.4;
 }
-
-.post-summary-meta-date {
-    float: right !important;
-}
\ No newline at end of file
diff --git a/packages/concordia-app/src/constants/PostsDatabaseKeys.js b/packages/concordia-app/src/constants/PostsDatabaseKeys.js
index 8a6a148..416f530 100644
--- a/packages/concordia-app/src/constants/PostsDatabaseKeys.js
+++ b/packages/concordia-app/src/constants/PostsDatabaseKeys.js
@@ -1,8 +1,6 @@
-export const POST_SUBJECT = 'subject';
 export const POST_CONTENT = 'content';
 
 const postsDatabaseKeys = [
-  POST_SUBJECT,
   POST_CONTENT,
 ];
 
diff --git a/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js b/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js
index 5e30042..bc1672c 100644
--- a/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js
+++ b/packages/concordia-app/src/redux/sagas/peerDbReplicationSaga.js
@@ -12,7 +12,7 @@ import { FETCH_USER_DATABASE, UPDATE_ORBIT_DATA } from '../actions/peerDbReplica
 import { POSTS_DATABASE, TOPICS_DATABASE, USER_DATABASE } from '../../constants/OrbitDatabases';
 import userDatabaseKeys from '../../constants/UserDatabaseKeys';
 import { TOPIC_SUBJECT } from '../../constants/TopicsDatabaseKeys';
-import { POST_CONTENT, POST_SUBJECT } from '../../constants/PostsDatabaseKeys';
+import { POST_CONTENT } from '../../constants/PostsDatabaseKeys';
 
 function* fetchUserDb({ orbit, userAddress, dbName }) {
   const peerDbAddress = yield call(determineKVAddress, {
@@ -94,7 +94,6 @@ function* updateReduxState({ database }) {
         ...oldPostsUnchanged,
         ...Object.entries(database.all).map(([key, value]) => ({
           id: parseInt(key, 10),
-          [POST_SUBJECT]: value[POST_SUBJECT],
           [POST_CONTENT]: value[POST_CONTENT],
         })),
       ],
diff --git a/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx b/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx
index a801b5a..2af825c 100644
--- a/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx
+++ b/packages/concordia-app/src/views/Topic/TopicCreate/index.jsx
@@ -12,7 +12,7 @@ import { drizzle, breeze } from '../../../redux/store';
 import { TRANSACTION_ERROR, TRANSACTION_SUCCESS } from '../../../constants/TransactionStatus';
 import { POSTS_DATABASE, TOPICS_DATABASE } from '../../../constants/OrbitDatabases';
 import { TOPIC_SUBJECT } from '../../../constants/TopicsDatabaseKeys';
-import { POST_CONTENT, POST_SUBJECT } from '../../../constants/PostsDatabaseKeys';
+import { POST_CONTENT } from '../../../constants/PostsDatabaseKeys';
 import { FORUM_CONTRACT } from '../../../constants/ContractNames';
 import { TOPIC_CREATED_EVENT } from '../../../constants/ForumContractEvents';
 
@@ -74,7 +74,6 @@ const TopicCreate = (props) => {
           .put(topicId, { [TOPIC_SUBJECT]: subjectInput }, { pin: true })
           .then(() => postsDb
             .put(postId, {
-              [POST_SUBJECT]: subjectInput,
               [POST_CONTENT]: contentInput,
             }, { pin: true }))
           .then(() => {

From 13b0224d365dece07f059359b5bfea21ad426322 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Fri, 27 Nov 2020 21:30:27 +0200
Subject: [PATCH 3/3] Added react-timeago

---
 packages/concordia-app/package.json                  |  1 +
 .../concordia-app/public/locales/en/translation.json |  2 +-
 .../src/components/PostList/PostListRow/index.jsx    |  8 +++++---
 .../src/components/TopicList/TopicListRow/index.jsx  | 12 +++++++++---
 yarn.lock                                            |  5 +++++
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/concordia-app/package.json b/packages/concordia-app/package.json
index f233e96..6b597ea 100644
--- a/packages/concordia-app/package.json
+++ b/packages/concordia-app/package.json
@@ -45,6 +45,7 @@
     "react-router-dom": "^5.2.0",
     "react-scripts": "~3.4.3",
     "redux-saga": "~1.1.3",
+    "react-timeago": "~5.2.0",
     "semantic-ui-css": "~2.4.1",
     "semantic-ui-react": "~1.2.1",
     "web3": "1.3.0"
diff --git a/packages/concordia-app/public/locales/en/translation.json b/packages/concordia-app/public/locales/en/translation.json
index e8681d5..809fb50 100644
--- a/packages/concordia-app/public/locales/en/translation.json
+++ b/packages/concordia-app/public/locales/en/translation.json
@@ -51,7 +51,7 @@
   "topic.create.form.post.button": "Post",
   "topic.create.form.subject.field.label": "Topic subject",
   "topic.create.form.subject.field.placeholder": "Subject",
-  "topic.list.row.author.date": "Created by {{author}}, {{timeAgo}}",
+  "topic.list.row.author": "by {{author}}",
   "topic.list.row.number.of.replies": "{{numberOfReplies}} replies",
   "topic.list.row.topic.id": "#{{id}}"
 }
diff --git a/packages/concordia-app/src/components/PostList/PostListRow/index.jsx b/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
index b107d87..d7c0674 100644
--- a/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
+++ b/packages/concordia-app/src/components/PostList/PostListRow/index.jsx
@@ -6,7 +6,7 @@ import {
 } from 'semantic-ui-react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
-import moment from 'moment';
+import TimeAgo from 'react-timeago';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { FETCH_USER_DATABASE } from '../../../redux/actions/peerDbReplicationActions';
@@ -40,7 +40,7 @@ const PostListRow = (props) => {
     if (!loading && postCallHash && getPostResults[postCallHash] !== undefined) {
       setPostAuthorAddress(getPostResults[postCallHash].value[0]);
       setPostAuthor(getPostResults[postCallHash].value[1]);
-      setTimeAgo(moment(getPostResults[postCallHash].value[2] * 1000).fromNow());
+      setTimeAgo(getPostResults[postCallHash].value[2] * 1000);
     }
   }, [getPostResults, loading, postCallHash]);
 
@@ -132,7 +132,9 @@ const PostListRow = (props) => {
                     ? (
                         <>
                             <Feed.User as={Link} to={`/users/${postAuthorAddress}`}>{postAuthor}</Feed.User>
-                            <Feed.Date className="post-summary-meta-date">{timeAgo}</Feed.Date>
+                            <Feed.Date className="post-summary-meta-date">
+                                <TimeAgo date={timeAgo} />
+                            </Feed.Date>
                         </>
                     )
                     : <Placeholder><Placeholder.Line length="medium" /></Placeholder>}
diff --git a/packages/concordia-app/src/components/TopicList/TopicListRow/index.jsx b/packages/concordia-app/src/components/TopicList/TopicListRow/index.jsx
index 4d25f91..ef59aa9 100644
--- a/packages/concordia-app/src/components/TopicList/TopicListRow/index.jsx
+++ b/packages/concordia-app/src/components/TopicList/TopicListRow/index.jsx
@@ -6,7 +6,7 @@ import {
 } from 'semantic-ui-react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
-import moment from 'moment';
+import TimeAgo from 'react-timeago';
 import { useHistory } from 'react-router';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
@@ -41,7 +41,7 @@ const TopicListRow = (props) => {
     if (!loading && topicCallHash && getTopicResults[topicCallHash] !== undefined) {
       setTopicAuthorAddress(getTopicResults[topicCallHash].value[0]);
       setTopicAuthor(getTopicResults[topicCallHash].value[1]);
-      setTimeAgo(moment(getTopicResults[topicCallHash].value[2] * 1000).fromNow());
+      setTimeAgo(getTopicResults[topicCallHash].value[2] * 1000);
       setNumberOfReplies(getTopicResults[topicCallHash].value[3].length);
     }
   }, [getTopicResults, loading, topicCallHash]);
@@ -151,7 +151,13 @@ const TopicListRow = (props) => {
                     <Grid verticalAlign="middle">
                         <Grid.Column floated="left" width={14}>
                             {topicAuthor !== null && timeAgo !== null
-                              ? t('topic.list.row.author.date', { author: topicAuthor, timeAgo })
+                              ? (
+                                  <div>
+                                      {t('topic.list.row.author', { author: topicAuthor })}
+                                      ,&nbsp;
+                                      <TimeAgo date={timeAgo} />
+                                  </div>
+                              )
                               : <Placeholder><Placeholder.Line length="long" /></Placeholder>}
                         </Grid.Column>
                         <Grid.Column floated="right" width={2} textAlign="right">
diff --git a/yarn.lock b/yarn.lock
index 90e1b9d..434fb31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14404,6 +14404,11 @@ react-scripts@~3.4.3:
   optionalDependencies:
     fsevents "2.1.2"
 
+react-timeago@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/react-timeago/-/react-timeago-5.2.0.tgz#d655d40aa55e4fe08a92234481a6aea7f656ab5d"
+  integrity sha512-wCEEDGQHMdFh/PLp+Hj5vk9ZoC4KjQ5u0u6+KrrY9rny5LqJ2gZvNNEAS4mhSZDV1i7JLgQI5VQTAux7f+vj2w==
+
 react@~16.13.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"