From bbdec39017336be07e96d7ffdfffa0fb6090ee8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Tue, 26 Mar 2019 16:09:26 +0100
Subject: [PATCH] Implement redirect on posts

---
 webapp/pages/post/_id.vue                     | 99 +++++++++++++++++++
 webapp/pages/post/{ => _id}/_slug/index.vue   |  0
 .../pages/post/{ => _id}/_slug/more-info.vue  |  0
 .../post/{ => _id}/_slug/take-action.vue      |  0
 webapp/pages/post/_slug.vue                   | 54 ----------
 webapp/pages/profile/_id.vue                  |  1 -
 6 files changed, 99 insertions(+), 55 deletions(-)
 create mode 100644 webapp/pages/post/_id.vue
 rename webapp/pages/post/{ => _id}/_slug/index.vue (100%)
 rename webapp/pages/post/{ => _id}/_slug/more-info.vue (100%)
 rename webapp/pages/post/{ => _id}/_slug/take-action.vue (100%)
 delete mode 100644 webapp/pages/post/_slug.vue

diff --git a/webapp/pages/post/_id.vue b/webapp/pages/post/_id.vue
new file mode 100644
index 000000000..6863e3ca6
--- /dev/null
+++ b/webapp/pages/post/_id.vue
@@ -0,0 +1,99 @@
+<template>
+  <div>
+    <ds-flex gutter="small">
+      <ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }">
+        <transition
+          name="slide-up"
+          appear
+        >
+          <nuxt-child />
+        </transition>
+      </ds-flex-item>
+      <ds-flex-item :width="{ base: '200px' }">
+        <ds-menu :routes="routes" />
+      </ds-flex-item>
+    </ds-flex>
+  </div>
+</template>
+
+<script>
+import gql from 'graphql-tag'
+
+const queryId = gql`
+  query($idOrSlug: ID) {
+    Post(id: $idOrSlug) {
+      id
+      slug
+    }
+  }
+`
+const querySlug = gql`
+  query($idOrSlug: String) {
+    Post(slug: $idOrSlug) {
+      id
+      slug
+    }
+  }
+`
+
+export default {
+  computed: {
+    routes() {
+      const { slug, id } = this.$route.params
+      return [
+        {
+          name: this.$t('common.post', null, 1),
+          path: `/post/${id}/${slug}`,
+          children: [
+            {
+              name: this.$t('common.comment', null, 2),
+              path: `/post/${id}/${slug}#comments`
+            },
+            {
+              name: this.$t('common.letsTalk'),
+              path: `/post/${id}/${slug}#lets-talk`
+            },
+            {
+              name: this.$t('common.versus'),
+              path: `/post/${id}/${slug}#versus`
+            }
+          ]
+        },
+        {
+          name: this.$t('common.moreInfo'),
+          path: `/post/${id}/${slug}/more-info`
+        },
+        {
+          name: this.$t('common.takeAction'),
+          path: `/post/${id}/${slug}/take-action`
+        }
+      ]
+    }
+  },
+  async asyncData(context) {
+    const {
+      params: { id, slug },
+      redirect,
+      error,
+      app: { apolloProvider }
+    } = context
+    const idOrSlug = id
+
+    const variables = { idOrSlug }
+    const client = apolloProvider.defaultClient
+
+    let response
+    let post
+    response = await client.query({ query: queryId, variables })
+    post = response.data.Post[0]
+    if (post && post.slug === slug) return // all good
+    if (post && post.slug !== slug) redirect(`/post/${post.id}/${post.slug}`)
+
+    response = await client.query({ query: querySlug, variables })
+    post = response.data.Post[0]
+    if (post) redirect(`/post/${post.id}/${post.slug}`)
+
+    return error({ statusCode: 404 })
+  }
+}
+</script>
diff --git a/webapp/pages/post/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
similarity index 100%
rename from webapp/pages/post/_slug/index.vue
rename to webapp/pages/post/_id/_slug/index.vue
diff --git a/webapp/pages/post/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
similarity index 100%
rename from webapp/pages/post/_slug/more-info.vue
rename to webapp/pages/post/_id/_slug/more-info.vue
diff --git a/webapp/pages/post/_slug/take-action.vue b/webapp/pages/post/_id/_slug/take-action.vue
similarity index 100%
rename from webapp/pages/post/_slug/take-action.vue
rename to webapp/pages/post/_id/_slug/take-action.vue
diff --git a/webapp/pages/post/_slug.vue b/webapp/pages/post/_slug.vue
deleted file mode 100644
index d4a233f0f..000000000
--- a/webapp/pages/post/_slug.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <div>
-    <ds-flex gutter="small">
-      <ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }">
-        <transition
-          name="slide-up"
-          appear
-        >
-          <nuxt-child />
-        </transition>
-      </ds-flex-item>
-      <ds-flex-item :width="{ base: '200px' }">
-        <ds-menu :routes="routes" />
-      </ds-flex-item>
-    </ds-flex>
-  </div>
-</template>
-
-<script>
-export default {
-  computed: {
-    routes() {
-      return [
-        {
-          name: this.$t('common.post', null, 1),
-          path: `/post/${this.$route.params.slug}`,
-          children: [
-            {
-              name: this.$t('common.comment', null, 2),
-              path: `/post/${this.$route.params.slug}#comments`
-            },
-            {
-              name: this.$t('common.letsTalk'),
-              path: `/post/${this.$route.params.slug}#lets-talk`
-            },
-            {
-              name: this.$t('common.versus'),
-              path: `/post/${this.$route.params.slug}#versus`
-            }
-          ]
-        },
-        {
-          name: this.$t('common.moreInfo'),
-          path: `/post/${this.$route.params.slug}/more-info`
-        },
-        {
-          name: this.$t('common.takeAction'),
-          path: `/post/${this.$route.params.slug}/take-action`
-        }
-      ]
-    }
-  }
-}
-</script>
diff --git a/webapp/pages/profile/_id.vue b/webapp/pages/profile/_id.vue
index eee8d610a..ad9772358 100644
--- a/webapp/pages/profile/_id.vue
+++ b/webapp/pages/profile/_id.vue
@@ -23,7 +23,6 @@ const querySlug = gql`
 `
 
 export default {
-  layout: 'blank',
   async asyncData(context) {
     const {
       params: { id, slug },