From c546964ce49a21e7d908ff7cbfe2e15b6b30d162 Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Tue, 8 Sep 2020 23:30:15 +0200 Subject: [PATCH] feat(comments): prepare for more third party comments system integration --- assets/scss/partials/comments/base.scss | 6 ++++++ assets/scss/style.scss | 2 ++ exampleSite/config.toml | 4 ++++ layouts/_default/single.html | 2 +- layouts/page/single.html | 2 +- layouts/partials/comments/include.html | 5 +++++ .../comment.html => comments/provider/disqus.html} | 0 7 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 assets/scss/partials/comments/base.scss create mode 100644 layouts/partials/comments/include.html rename layouts/partials/{article/components/comment.html => comments/provider/disqus.html} (100%) diff --git a/assets/scss/partials/comments/base.scss b/assets/scss/partials/comments/base.scss new file mode 100644 index 0000000..77232a2 --- /dev/null +++ b/assets/scss/partials/comments/base.scss @@ -0,0 +1,6 @@ +.comments-container { + background-color: var(--card-background); + border-radius: var(--card-border-radius); + @include box_shadow(1); + padding: var(--content-padding); +} diff --git a/assets/scss/style.scss b/assets/scss/style.scss index 3c9c1cd..7aea03b 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -15,6 +15,8 @@ @import "partials/layout/taxonomy.scss"; @import "partials/layout/404.scss"; +@import "partials/comments/base.scss"; + a { text-decoration: none; color: var(--accent-color); diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 49be3c8..8ae05e3 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -19,6 +19,10 @@ title = "Example Site" [params.article.license] enabled = true default = "Licenced under CC BY-NC-SA 4.0" + [params.comments] + enabled = true + # Only Disqus is available so far + provider = "disqus" [params.widgets] enabled = ['archive', 'tag-cloud'] [params.widgets.archive] diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 5a5a3f2..e540d63 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -17,7 +17,7 @@ {{ partial "article/components/related-contents" . }} {{ if or (not (isset .Params "comments")) (eq .Params.comments "true")}} - {{ partial "article/components/comment" . }} + {{ partial "comments/include" . }} {{ end }} {{ partialCached "footer" . }} diff --git a/layouts/page/single.html b/layouts/page/single.html index 1af0b4e..569c77f 100644 --- a/layouts/page/single.html +++ b/layouts/page/single.html @@ -8,7 +8,7 @@ {{ partial "article/article.html" . }} {{ if or (not (isset .Params "comments")) (eq .Params.comments "true")}} - {{ partial "article/components/comment" . }} + {{ partial "comments/include" . }} {{ end }} {{ partialCached "footer" . }} diff --git a/layouts/partials/comments/include.html b/layouts/partials/comments/include.html new file mode 100644 index 0000000..76bc700 --- /dev/null +++ b/layouts/partials/comments/include.html @@ -0,0 +1,5 @@ +{{ if .Site.Params.comments.enabled }} +
+ {{ partial (printf "comments/provider/%s" .Site.Params.comments.provider) . }} +
+{{ end }} \ No newline at end of file diff --git a/layouts/partials/article/components/comment.html b/layouts/partials/comments/provider/disqus.html similarity index 100% rename from layouts/partials/article/components/comment.html rename to layouts/partials/comments/provider/disqus.html