Merge branch 'master' into 236-list-social-media-accounts

backend/package.json

@@ -92,7 +92,7 @@
     "eslint-plugin-standard": "~4.0.0",
     "graphql-request": "~1.8.2",
     "jest": "~24.7.1",
-    "nodemon": "~1.18.10",
+    "nodemon": "~1.18.11",
     "supertest": "~4.0.2"
   }
 }

backend/yarn.lock

@@ -2144,10 +2144,10 @@ cheerio@~1.0.0-rc.3:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@^2.0.3, chokidar@^2.1.0:
+chokidar@^2.0.3, chokidar@^2.1.5:
-  version "2.1.0"
+  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
-  integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -2159,7 +2159,7 @@ chokidar@^2.0.3, chokidar@^2.1.0:
     normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.2.1"
-    upath "^1.1.0"
+    upath "^1.1.1"
   optionalDependencies:
     fsevents "^1.2.7"
 
@@ -5672,12 +5672,12 @@ node-releases@^1.1.13:
   dependencies:
     semver "^5.3.0"
 
-nodemon@~1.18.10:
+nodemon@~1.18.11:
-  version "1.18.10"
+  version "1.18.11"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.10.tgz#3ba63f64eb4c283cf3e4f75f30817e9d4f393afe"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.11.tgz#d836ab663776e7995570b963da5bfc807e53f6b8"
-  integrity sha512-we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ==
+  integrity sha512-KdN3tm1zkarlqNo4+W9raU3ihM4H15MVMSE/f9rYDZmFgDHAfAJsomYrHhApAkuUemYjFyEeXlpCOQ2v5gtBEw==
   dependencies:
-    chokidar "^2.1.0"
+    chokidar "^2.1.5"
     debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"
@@ -7638,10 +7638,10 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.1.0:
+upath@^1.1.1:
-  version "1.1.0"
+  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
 update-notifier@^2.5.0:
   version "2.5.0"

webapp/components/PostCard.vue

@@ -8,9 +8,7 @@
       v-router-link
       class="post-link"
       :href="href(post)"
-    >
+    >{{ post.title }}</a>
-      {{ post.title }}
-    </a>
     <!-- eslint-disable vue/no-v-html -->
     <!-- TODO: replace editor content with tiptap render view -->
     <ds-space margin-bottom="large">
@@ -32,7 +30,7 @@
     </ds-space>
     <ds-space
       margin="small"
-      style="position: absolute; bottom: 44px; z-index: 1;"
+      style="position: absolute; bottom: 44px;"
     >
       <!-- TODO: find better solution for rendering errors -->
       <no-ssr>
@@ -53,11 +51,13 @@
       </div>
       <div style="display: inline-block; float: right">
         <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
-          <ds-icon name="bullhorn" /> <small>{{ post.shoutedCount }}</small>
+          <ds-icon name="bullhorn" />
+          <small>{{ post.shoutedCount }}</small>
         </span>
         &nbsp;
         <span :style="{ opacity: post.commentsCount ? 1 : .5 }">
-          <ds-icon name="comments" /> <small>{{ post.commentsCount }}</small>
+          <ds-icon name="comments" />
+          <small>{{ post.commentsCount }}</small>
         </span>
         <no-ssr>
           <content-menu
@@ -118,27 +118,25 @@ export default {
 .post-card {
   cursor: pointer;
   position: relative;
-
-  .ds-card-footer {
   z-index: 1;
-  }
+
+  /*.ds-card-footer {
+  }*/
 
   .content-menu {
     display: inline-block;
     margin-left: $space-xx-small;
     margin-right: -$space-x-small;
-    z-index: 1;
-  }
   }
 
   .post-link {
     display: block;
     position: absolute;
-  z-index: 1;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
     text-indent: -999999px;
   }
+}
 </style>

webapp/pages/post/_id.vue

@@ -10,7 +10,10 @@
         </transition>
       </ds-flex-item>
       <ds-flex-item :width="{ base: '200px' }">
-        <ds-menu :routes="routes" />
+        <ds-menu
+          :routes="routes"
+          class="post-side-navigation"
+        />
       </ds-flex-item>
     </ds-flex>
   </div>
@@ -79,3 +82,11 @@ export default {
   }
 }
 </script>
+
+<style lang="scss">
+.post-side-navigation {
+  position: sticky;
+  top: 65px;
+  z-index: 2;
+}
+</style>