Merge pull request #10 from HeskeyBaozi/feature/comments-system

Feature/comments system
HeskeyBaozi · Dec 18, 2017 · e9ecf55 · e9ecf55
2 parents d00fdbc + db35711
commit e9ecf55
Show file tree

Hide file tree

Showing 23 changed files with 29 additions and 16 deletions.
diff --git a/layout/index.html b/layout/index.html
@@ -1 +1 @@
-<!doctype html><html lang=en><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><meta http-equiv=X-UA-Compatible content="ie=edge"><title>Hexo Loading...</title><link href=/static/css/app.4c89f359b7b6846f7870cbe7154f0929.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.54c7610a313165ba246e.js></script><script type=text/javascript src=/static/js/vendor.2df5b9938da73af6279b.js></script><script type=text/javascript src=/static/js/app.cf32999819ff5a4b775c.js></script></body></html>
+<!doctype html><html lang=en><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><meta http-equiv=X-UA-Compatible content="ie=edge"><title>Hexo Loading...</title><link href=/static/css/app.4c89f359b7b6846f7870cbe7154f0929.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a73019bf2614e9d8f4ce.js></script><script type=text/javascript src=/static/js/vendor.2df5b9938da73af6279b.js></script><script type=text/javascript src=/static/js/app.0ada4a90073757b7c4f5.js></script></body></html>
diff --git a/source/static/js/1.1116ce6832ae657291ab.js b/source/static/js/1.1116ce6832ae657291ab.js
diff --git a/source/static/js/1.1116ce6832ae657291ab.js.gz b/source/static/js/1.1116ce6832ae657291ab.js.gz
diff --git a/source/static/js/1.1116ce6832ae657291ab.js.map b/source/static/js/1.1116ce6832ae657291ab.js.map
diff --git a/source/static/js/1.d365f195291d92ebdf09.js b/source/static/js/1.d365f195291d92ebdf09.js
diff --git a/source/static/js/1.d365f195291d92ebdf09.js.gz b/source/static/js/1.d365f195291d92ebdf09.js.gz
diff --git a/source/static/js/1.d365f195291d92ebdf09.js.map b/source/static/js/1.d365f195291d92ebdf09.js.map
diff --git a/source/static/js/2.d3df9d748e4d63c9bdff.js b/source/static/js/2.d3df9d748e4d63c9bdff.js
diff --git a/source/static/js/2.d3df9d748e4d63c9bdff.js.gz b/source/static/js/2.d3df9d748e4d63c9bdff.js.gz
diff --git a/source/static/js/2.d3df9d748e4d63c9bdff.js.map b/source/static/js/2.d3df9d748e4d63c9bdff.js.map
diff --git a/source/static/js/2.f7fdf29c3ea9564a1e20.js b/source/static/js/2.f7fdf29c3ea9564a1e20.js
diff --git a/source/static/js/2.f7fdf29c3ea9564a1e20.js.gz b/source/static/js/2.f7fdf29c3ea9564a1e20.js.gz
diff --git a/source/static/js/2.f7fdf29c3ea9564a1e20.js.map b/source/static/js/2.f7fdf29c3ea9564a1e20.js.map
diff --git a/source/static/js/app.0ada4a90073757b7c4f5.js b/source/static/js/app.0ada4a90073757b7c4f5.js
diff --git a/source/static/js/app.0ada4a90073757b7c4f5.js.gz b/source/static/js/app.0ada4a90073757b7c4f5.js.gz
diff --git a/...static/js/app.cf32999819ff5a4b775c.js.map → ...static/js/app.0ada4a90073757b7c4f5.js.map b/...static/js/app.cf32999819ff5a4b775c.js.map → ...static/js/app.0ada4a90073757b7c4f5.js.map
diff --git a/source/static/js/app.cf32999819ff5a4b775c.js b/source/static/js/app.cf32999819ff5a4b775c.js
diff --git a/source/static/js/app.cf32999819ff5a4b775c.js.gz b/source/static/js/app.cf32999819ff5a4b775c.js.gz
diff --git a/...tatic/js/manifest.54c7610a313165ba246e.js → ...tatic/js/manifest.a73019bf2614e9d8f4ce.js b/...tatic/js/manifest.54c7610a313165ba246e.js → ...tatic/js/manifest.a73019bf2614e9d8f4ce.js
diff --git a/...c/js/manifest.54c7610a313165ba246e.js.map → ...c/js/manifest.a73019bf2614e9d8f4ce.js.map b/...c/js/manifest.54c7610a313165ba246e.js.map → ...c/js/manifest.a73019bf2614e9d8f4ce.js.map
diff --git a/src/router/index.ts b/src/router/index.ts
@@ -5,7 +5,7 @@ Vue.use(Router);
 
 
 export const router = new Router({
-  mode: 'history',
+  mode: 'hash',
   routes: [
     {
       path: '/',

diff --git a/src/views/components/detailable-page/DetailablePage.vue b/src/views/components/detailable-page/DetailablePage.vue
@@ -50,7 +50,7 @@
     <!--comment-->
     <div class="comments" v-if="target.comments">
       <div class="gitment">
-        <gitment-comment></gitment-comment>
+        <gitment-comment :isImplicit="isImplicit" :slugOrSource="isImplicit ? $route.path : `posts/${target.slug}`"></gitment-comment>
       </div>
     </div>
 

diff --git a/src/views/components/gitment-comment/gitment-comment.component.ts b/src/views/components/gitment-comment/gitment-comment.component.ts
@@ -3,9 +3,21 @@ import { mapState } from "vuex";
 import { RootState } from "@/store";
 import Gitment from 'gitment';
 
+declare const location: Location;
+
 
 export default Vue.extend({
   name: 'gitment-comment',
+  props: {
+    isImplicit: {
+      required: true,
+      type: Boolean
+    },
+    slugOrSource: {
+      required: true,
+      type: String
+    }
+  },
   computed: {
     ...mapState({
       gitmentOptions: (state: RootState) => state.meta.hexoConfig.theme.gitment
@@ -18,13 +30,14 @@ export default Vue.extend({
 
     // https://github.com/imsun/gitment#3-render-gitment
     const gitment = new Gitment({
-      id: this.$route.path,
+      id: this.slugOrSource,
       owner: this.gitmentOptions.github_id,
       repo: this.gitmentOptions.repository_name,
       oauth: {
         client_id: this.gitmentOptions.client_id,
         client_secret: this.gitmentOptions.client_secret,
       },
+      title: this.$route.path,
       perPage: this.gitmentOptions.per_page,
       maxCommentHeight: this.gitmentOptions.max_comment_height
     });
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang=en><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><meta http-equiv=X-UA-Compatible content="ie=edge"><title>Hexo Loading...</title><link href=/static/css/app.4c89f359b7b6846f7870cbe7154f0929.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.54c7610a313165ba246e.js></script><script type=text/javascript src=/static/js/vendor.2df5b9938da73af6279b.js></script><script type=text/javascript src=/static/js/app.cf32999819ff5a4b775c.js></script></body></html>
		<!doctype html><html lang=en><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><meta http-equiv=X-UA-Compatible content="ie=edge"><title>Hexo Loading...</title><link href=/static/css/app.4c89f359b7b6846f7870cbe7154f0929.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a73019bf2614e9d8f4ce.js></script><script type=text/javascript src=/static/js/vendor.2df5b9938da73af6279b.js></script><script type=text/javascript src=/static/js/app.0ada4a90073757b7c4f5.js></script></body></html>