Merge branch 'dev' of github.com:BinaryStudioAcademy/thread-php into feature/users-page

Author: nemoipaha

frontend/src/components/view/feed/FeedContainer.vue

@@ -44,9 +44,9 @@ export default {
     },
 
     computed: {
-        ...mapGetters('tweet', [
-            'tweets'
-        ]),
+        ...mapGetters('tweet', {
+            tweets: 'tweetsSortedByCreatedDate'
+        }),
     },
 
     methods: {

frontend/src/store/modules/tweet/actions.js

@@ -1,6 +1,5 @@
 import {
     SET_TWEETS,
-    NEW_TWEET,
     SET_TWEET_IMAGE,
     SET_TWEET,
     DELETE_TWEET
@@ -68,7 +67,7 @@ export default {
         try {
             const tweet = await api.post('/tweets', { text });
 
-            commit(NEW_TWEET, tweet);
+            commit(SET_TWEET, tweet);
             commit(SET_LOADING, false, { root: true });
 
             return Promise.resolve(tweetMapper(tweet));

frontend/src/store/modules/tweet/getters.js

@@ -1,5 +1,10 @@
+import moment from 'moment';
+
 export default {
-    // @todo sort data by created date
-    tweets: state => Object.values(state.tweets),
+    tweetsSortedByCreatedDate: state => Object.values(state.tweets).sort(
+        (a, b) => (
+            moment(a.created).isBefore(moment(b.created)) ? 1 : -1
+        )
+    ),
     getTweetById: state => id => state.tweets[id]
 };

frontend/src/store/modules/tweet/mutationTypes.js

@@ -1,5 +1,4 @@
 export const SET_TWEETS = 'setTweets';
-export const NEW_TWEET = 'newTweet';
 export const SET_TWEET_IMAGE = 'setTweetImage';
 export const SET_TWEET = 'editTweet';
 export const DELETE_TWEET = 'deleteTweet';

frontend/src/store/modules/tweet/mutations.js

@@ -1,6 +1,5 @@
 import {
     SET_TWEETS,
-    NEW_TWEET,
     SET_TWEET_IMAGE,
     SET_TWEET,
     DELETE_TWEET
@@ -17,10 +16,6 @@ export default {
         });
     },
 
-    [NEW_TWEET]: (state, tweet) => {
-        state.tweets[tweet.id] = tweetMapper(tweet);
-    },
-
     [SET_TWEET_IMAGE]: (state, { id, imageUrl }) => {
         state.tweets[id].imageUrl = imageUrl;
     },