From c678841406fd3e0e788ff88580415cd410203aed Mon Sep 17 00:00:00 2001
From: YuukanOO <julien+github@leicher.me>
Date: Thu, 21 Jan 2021 09:11:41 +0100
Subject: [PATCH] add vue-router and detail page

---
 hn-vue/package-lock.json           |  5 +++
 hn-vue/package.json                |  3 +-
 hn-vue/src/Layout.vue              |  8 ++++
 hn-vue/src/api.js                  | 16 ++++++-
 hn-vue/src/components/Comment.vue  | 20 +++++++++
 hn-vue/src/components/Error.vue    |  2 +-
 hn-vue/src/components/LinkItem.vue |  6 ++-
 hn-vue/src/main.js                 |  8 +++-
 hn-vue/src/pages/LinkDetail.vue    | 69 ++++++++++++++++++++++++++++++
 hn-vue/src/{ => pages}/Links.vue   | 12 +++---
 hn-vue/src/router.js               | 23 ++++++++++
 vue2/src/components/Link.vue       | 20 +++++++++
 vue2/src/main.js                   |  9 ++++
 13 files changed, 189 insertions(+), 12 deletions(-)
 create mode 100644 hn-vue/src/Layout.vue
 create mode 100644 hn-vue/src/components/Comment.vue
 create mode 100644 hn-vue/src/pages/LinkDetail.vue
 rename hn-vue/src/{ => pages}/Links.vue (78%)
 create mode 100644 hn-vue/src/router.js
 create mode 100644 vue2/src/components/Link.vue

diff --git a/hn-vue/package-lock.json b/hn-vue/package-lock.json
index 7abfbb3..a9f0e76 100644
--- a/hn-vue/package-lock.json
+++ b/hn-vue/package-lock.json
@@ -10982,6 +10982,11 @@
         }
       }
     },
+    "vue-router": {
+      "version": "3.4.9",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.9.tgz",
+      "integrity": "sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA=="
+    },
     "vue-style-loader": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
diff --git a/hn-vue/package.json b/hn-vue/package.json
index 186cea0..715fbee 100644
--- a/hn-vue/package.json
+++ b/hn-vue/package.json
@@ -9,7 +9,8 @@
   },
   "dependencies": {
     "core-js": "^3.6.5",
-    "vue": "^2.6.11"
+    "vue": "^2.6.11",
+    "vue-router": "^3.4.9"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",
diff --git a/hn-vue/src/Layout.vue b/hn-vue/src/Layout.vue
new file mode 100644
index 0000000..a30285b
--- /dev/null
+++ b/hn-vue/src/Layout.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>
+    <nav>
+      <router-link :to="{ name: 'links' }">Derniers liens publiés</router-link>
+    </nav>
+    <router-view></router-view>
+  </div>
+</template>
diff --git a/hn-vue/src/api.js b/hn-vue/src/api.js
index 00ac1da..a362dc3 100644
--- a/hn-vue/src/api.js
+++ b/hn-vue/src/api.js
@@ -7,12 +7,26 @@ class Api {
     return this._get("/api/links");
   }
 
+  getLinkById(id) {
+    return this._get(`/api/links/${id}`);
+  }
+
+  getLinkComments(id) {
+    return this._get(`/api/links/${id}/comments`);
+  }
+
   _get(path) {
     return fetch(this.baseUrl + path, {
       headers: {
         Accept: "application/json",
       },
-    }).then((r) => r.json());
+    }).then((r) => {
+      if (!r.ok) {
+        return Promise.reject(new Error("Erreur dans la requête"));
+      }
+
+      return r.json();
+    });
   }
 }
 
diff --git a/hn-vue/src/components/Comment.vue b/hn-vue/src/components/Comment.vue
new file mode 100644
index 0000000..0a542ad
--- /dev/null
+++ b/hn-vue/src/components/Comment.vue
@@ -0,0 +1,20 @@
+<template>
+  <article>
+    <p>{{ comment.content }}</p>
+    <p>
+      Publié le {{ comment.createdAt }} par {{ comment.createdBy.username }}
+    </p>
+    <p>👍 {{ comment.upvotesCount }} / 👎 {{ comment.downvotesCount }}</p>
+  </article>
+</template>
+
+<script>
+export default {
+  props: {
+    comment: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+</script>
diff --git a/hn-vue/src/components/Error.vue b/hn-vue/src/components/Error.vue
index 95d36e7..cf7bcbd 100644
--- a/hn-vue/src/components/Error.vue
+++ b/hn-vue/src/components/Error.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="error">{{ err.message }}</div>
+  <div class="error">{{ error.message }}</div>
 </template>
 
 <script>
diff --git a/hn-vue/src/components/LinkItem.vue b/hn-vue/src/components/LinkItem.vue
index 690c42f..38aaac4 100644
--- a/hn-vue/src/components/LinkItem.vue
+++ b/hn-vue/src/components/LinkItem.vue
@@ -1,6 +1,10 @@
 <template>
   <article>
-    <h2>{{ link.url }}</h2>
+    <h2>
+      <router-link :to="{ name: 'link', params: { id: link.id } }">{{
+        link.url
+      }}</router-link>
+    </h2>
     <p>Publié le {{ link.createdAt }} par {{ link.createdBy.username }}</p>
     <p>👍 {{ link.upvotesCount }} / 👎 {{ link.downvotesCount }}</p>
   </article>
diff --git a/hn-vue/src/main.js b/hn-vue/src/main.js
index df21dc7..f4ab2c3 100644
--- a/hn-vue/src/main.js
+++ b/hn-vue/src/main.js
@@ -1,8 +1,12 @@
 import Vue from "vue";
-import Links from "./Links.vue";
+import Layout from "./Layout.vue";
+import createRouter from "./router";
 
 Vue.config.productionTip = false;
 
+const router = createRouter();
+
 new Vue({
-  render: (h) => h(Links),
+  router,
+  render: (h) => h(Layout),
 }).$mount("#app");
diff --git a/hn-vue/src/pages/LinkDetail.vue b/hn-vue/src/pages/LinkDetail.vue
new file mode 100644
index 0000000..fb2aff2
--- /dev/null
+++ b/hn-vue/src/pages/LinkDetail.vue
@@ -0,0 +1,69 @@
+<template>
+  <div>
+    <h1>Détail du lien</h1>
+    <error v-if="err" :error="err" />
+    <loading
+      v-else-if="link === null"
+      message="Chargement du lien en cours ..."
+    />
+    <div v-else>
+      <link-item :link="link" />
+      <loading v-if="comments === null" message="Chargement des commentaires" />
+      <p v-else-if="comments.length === 0">Aucun commentaire pour ce lien</p>
+      <ul v-else>
+        <li v-for="comment in comments" :key="comment.id">
+          <comment :comment="comment" />
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import LinkItem from "../components/LinkItem.vue";
+import Comment from "../components/Comment.vue";
+import Error from "../components/Error.vue";
+import Loading from "../components/Loading.vue";
+import api from "../api";
+
+export default {
+  props: {
+    id: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      link: null,
+      comments: null,
+      err: null,
+    };
+  },
+  components: { LinkItem, Error, Loading, Comment },
+  mounted() {
+    this.fetchLinkDetail();
+  },
+  watch: {
+    // id: 'fetchLinkDetail'
+    id() {
+      this.fetchLinkDetail();
+    },
+    // '$route': 'fetchLinkDetail'
+  },
+  methods: {
+    async fetchLinkDetail() {
+      this.link = null;
+      this.comments = null;
+      this.err = null;
+
+      try {
+        this.link = await api.getLinkById(this.id);
+        this.comments = await api.getLinkComments(this.id);
+      } catch (e) {
+        this.err = e;
+      }
+    },
+  },
+};
+</script>
diff --git a/hn-vue/src/Links.vue b/hn-vue/src/pages/Links.vue
similarity index 78%
rename from hn-vue/src/Links.vue
rename to hn-vue/src/pages/Links.vue
index 415b95b..eea77d1 100644
--- a/hn-vue/src/Links.vue
+++ b/hn-vue/src/pages/Links.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <h1>Derniers liens publiés</h1>
+    <error v-if="err" :error="err" />
     <loading
-      v-if="links === null"
+      v-else-if="links === null"
       message="Chargement des liens en cours ..."
     />
-    <error v-else-if="err" :error="err" />
     <ul v-else>
       <li v-for="link in links" :key="link.id">
         <link-item :link="link" />
@@ -15,10 +15,10 @@
 </template>
 
 <script>
-import Error from "./components/Error.vue";
-import Loading from "./components/Loading.vue";
-import LinkItem from "./components/LinkItem.vue";
-import api from "./api";
+import Error from "../components/Error.vue";
+import Loading from "../components/Loading.vue";
+import LinkItem from "../components/LinkItem.vue";
+import api from "../api";
 
 export default {
   components: { Loading, Error, LinkItem },
diff --git a/hn-vue/src/router.js b/hn-vue/src/router.js
new file mode 100644
index 0000000..8e93150
--- /dev/null
+++ b/hn-vue/src/router.js
@@ -0,0 +1,23 @@
+import Vue from "vue";
+import VueRouter from "vue-router";
+import Links from "./pages/Links.vue";
+import LinkDetail from "./pages/LinkDetail.vue";
+
+Vue.use(VueRouter);
+
+export default function createRouter() {
+  const router = new VueRouter({
+    routes: [
+      { path: "/", name: "links", component: Links },
+      {
+        path: "/links/:id",
+        name: "link",
+        component: LinkDetail,
+        props: true,
+      },
+      { path: "*", redirect: "/" },
+    ],
+  });
+
+  return router;
+}
diff --git a/vue2/src/components/Link.vue b/vue2/src/components/Link.vue
new file mode 100644
index 0000000..8d42222
--- /dev/null
+++ b/vue2/src/components/Link.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>
+    <p v-if="link">{{ link.url }}</p>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return { link: null };
+  },
+  async beforeRouteEnter(to, from, next) {
+    const link = await fetch(
+      `https://hn-dotnet.herokuapp.com/api/links/${to.params.id}`
+    ).then((r) => r.json());
+    to.meta.title = "Visualisation de " + link.url;
+    next((vm) => (vm.link = link));
+  },
+};
+</script>
diff --git a/vue2/src/main.js b/vue2/src/main.js
index a098323..56baa30 100644
--- a/vue2/src/main.js
+++ b/vue2/src/main.js
@@ -18,6 +18,8 @@ const AForm = () =>
   import(/* webpackChunkName: "aform" */ "./components/AForm.vue");
 const Counter = () =>
   import(/* webpackChunkName: "counter" */ "./components/Counter.vue");
+const Link = () =>
+  import(/* webpackChunkName: "link" */ "./components/Link.vue");
 
 Vue.use(VueRouter);
 
@@ -74,6 +76,12 @@ const router = new VueRouter({
         },
       ],
     },
+    {
+      path: "/link/:id",
+      component: Link,
+      name: "link",
+      meta: {},
+    },
     {
       path: "/card/:a/:b",
       component: Card,
@@ -98,6 +106,7 @@ router.beforeEach((to, from, next) => {
 });
 
 router.afterEach((to) => {
+  console.log(to.matched);
   document.title = to.meta.title;
 });