Change route post-slug to post-id-slug

And query `slug` and `id` everywhere

webapp/components/ContributionForm.vue

@@ -111,8 +111,8 @@ export default {
           const result = res.data[this.id ? 'UpdatePost' : 'CreatePost']
 
           this.$router.push({
-            name: 'post-slug',
+            name: 'post-id-slug',
-            params: { slug: result.slug }
+            params: { id: result.id, slug: result.slug }
           })
         })
         .catch(err => {

webapp/components/PostCard.vue

@@ -106,8 +106,8 @@ export default {
   methods: {
     href(post) {
       return this.$router.resolve({
-        name: 'post-slug',
+        name: 'post-id-slug',
-        params: { slug: post.slug }
+        params: { id: post.id, slug: post.slug }
       }).href
     }
   }

webapp/graphql/ModerationListQuery.js

@@ -9,43 +9,52 @@ export default app => {
         type
         createdAt
         submitter {
+          id
           disabled
           deleted
           name
           slug
         }
         user {
+          id
           name
           slug
           disabled
           deleted
           disabledBy {
+            id
             slug
             name
+            disabled
+            deleted
           }
         }
         comment {
           contentExcerpt
           author {
+            id
             name
             slug
             disabled
             deleted
           }
           post {
+            id
             disabled
             deleted
             title
             slug
           }
           disabledBy {
+            id
+            slug
             disabled
             deleted
-            slug
             name
           }
         }
         post {
+          id
           title
           slug
           disabled
@@ -57,9 +66,10 @@ export default app => {
             slug
           }
           disabledBy {
+            id
+            slug
             disabled
             deleted
-            slug
             name
           }
         }

webapp/graphql/UserProfileQuery.js

@@ -6,6 +6,7 @@ export default app => {
     query User($slug: String!, $first: Int, $offset: Int) {
       User(slug: $slug) {
         id
+        slug
         name
         avatar
         about
@@ -27,8 +28,8 @@ export default app => {
         followingCount
         following(first: 7) {
           id
-          name
           slug
+          name
           avatar
           disabled
           deleted
@@ -49,10 +50,10 @@ export default app => {
         followedByCurrentUser
         followedBy(first: 7)  {
           id
+          slug
           name
           disabled
           deleted
-          slug
           avatar
           followedByCount
           followedByCurrentUser
@@ -87,6 +88,7 @@ export default app => {
           }
           author {
             id
+            slug
             avatar
             name
             disabled

webapp/layouts/default.vue

@@ -182,8 +182,8 @@ export default {
     goToPost(item) {
       this.$nextTick(() => {
         this.$router.push({
-          name: 'post-slug',
+          name: 'post-id-slug',
-          params: { slug: item.slug }
+          params: { id: item.id, slug: item.slug }
         })
       })
     },

webapp/pages/index.vue

@@ -64,8 +64,8 @@ export default {
     },
     href(post) {
       return this.$router.resolve({
-        name: 'post-slug',
+        name: 'post-id-slug',
-        params: { slug: post.slug }
+        params: { id: post.id, slug: post.slug }
       }).href
     },
     showMoreContributions() {

webapp/pages/moderation/index.vue

@@ -14,7 +14,7 @@
         slot-scope="scope"
       >
         <div v-if="scope.row.type === 'Post'">
-          <nuxt-link :to="{ name: 'post-slug', params: { slug: scope.row.post.slug } }">
+          <nuxt-link :to="{ name: 'post-id-slug', params: { id: scope.row.post.id, slug: scope.row.post.slug } }">
             <b>{{ scope.row.post.title | truncate(50) }}</b>
           </nuxt-link><br>
           <ds-text
@@ -25,7 +25,7 @@
           </ds-text>
         </div>
         <div v-else-if="scope.row.type === 'Comment'">
-          <nuxt-link :to="{ name: 'post-slug', params: { slug: scope.row.comment.post.slug } }">
+          <nuxt-link :to="{ name: 'post-id-slug', params: { id: scope.row.comment.post.id, slug: scope.row.comment.post.slug } }">
             <b>{{ scope.row.comment.contentExcerpt | truncate(50) }}</b>
           </nuxt-link><br>
           <ds-text

webapp/pages/post/_id/_slug/index.vue

@@ -263,7 +263,7 @@ export default {
 </script>
 
 <style lang="scss">
-.page-name-post-slug {
+.page-name-post-id-slug {
   .content-menu {
     float: right;
     margin-right: -$space-x-small;