Fix normalizer, include likes count

Fix tweet preview styles

Author: nemoipaha

frontend/src/components/common/TweetPreview.vue

@@ -31,14 +31,14 @@
                 </div>
 
                 <nav class="level is-mobile">
-                    <div class="level-left">
-                        <a class="level-item">
+                    <div class="level-left auto-cursor">
+                        <a class="level-item auto-cursor">
                             <span class="icon is-medium has-text-info">
                                 <font-awesome-icon icon="comments" />
                             </span>
                             {{ tweet.commentsCount }}
                         </a>
-                        <a class="level-item">
+                        <a class="level-item auto-cursor">
                             <span class="icon is-medium has-text-info">
                                 <font-awesome-icon icon="heart" />
                             </span>

frontend/src/components/view/tweet/TweetContainer.vue

@@ -34,9 +34,9 @@
                                 <br>
                             </p>
 
-                            <nav class="level is-mobile">
+                            <nav class="level is-mobile activity">
                                 <div class="level-left">
-                                    <a class="level-item">
+                                    <a class="level-item auto-cursor">
                                         <span
                                             class="icon is-medium has-text-info"
                                             :class="{ 'has-text-danger': tweetIsCommentedByUser(tweet.id, user.id) }"
@@ -49,7 +49,7 @@
                                         <span class="icon is-medium has-text-info">
                                             <font-awesome-icon icon="heart" />
                                         </span>
-                                        {{ tweet.likes_count || 0 }}
+                                        {{ tweet.likesCount }}
                                     </a>
                                 </div>
                             </nav>
@@ -194,6 +194,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "~bulma/sass/utilities/initial-variables";
+@import "../../../styles/common";
 
 .tweet-image {
     margin: 12px 0 0 0;
@@ -215,4 +216,14 @@ export default {
 .tweet-text {
     max-width: 100%;
 }
+
+.activity {
+    margin-bottom: 16px;
+}
+
+.content {
+    figure {
+        margin-top: 0;
+    }
+}
 </style>

frontend/src/services/Normalizer.js

@@ -14,13 +14,13 @@ export const commentMapper = comment => ({
     created: comment.created_at,
     updated: comment.updated_at,
     author: userMapper(comment.author),
-    likesCount: comment.likes_count
 });
 
 export const tweetMapper = tweet => ({
     ...tweet,
     imageUrl: tweet.image_url,
     created: tweet.created_at,
     author: userMapper(tweet.author),
-    commentsCount: tweet.comments_count
+    commentsCount: tweet.comments_count,
+    likesCount: tweet.likes_count
 });

frontend/src/styles/common.scss

@@ -45,3 +45,7 @@ html, body {
     padding-right: 10px;
     padding-bottom: 20px;
 }
+
+.auto-cursor {
+    cursor: auto;
+}