From b56d0a4e778f2cb6e5fbf7f36df8056afccfb305 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Mon, 14 Nov 2022 10:33:53 +0800 Subject: [PATCH] :truck: Feat: move `assets/data/emoji` to `assets/lib/valine/emoji/` --- CHANGELOG.md | 1 + assets/{data => lib/valine}/emoji/apple.yml | 0 assets/{data => lib/valine}/emoji/facebook.yml | 0 assets/{data => lib/valine}/emoji/google.yml | 0 assets/{data => lib/valine}/emoji/twitter.yml | 0 config.toml | 4 ++-- docs | 2 +- layouts/partials/single/comment.html | 2 +- 8 files changed, 5 insertions(+), 4 deletions(-) rename assets/{data => lib/valine}/emoji/apple.yml (100%) rename assets/{data => lib/valine}/emoji/facebook.yml (100%) rename assets/{data => lib/valine}/emoji/google.yml (100%) rename assets/{data => lib/valine}/emoji/twitter.yml (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index af12d728..2539f1cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file. - :sparkles: Feat: add params to close wordcount and readingTime in post ([#209](https://github.com/hugo-fixit/FixIt/issues/209)) - :sparkles: Feat: add parameter `params.home.profile.avatarMenu` - :truck: Feat: migrate parameter `params.autoBookmark` to `params.page.autoBookmark` ([#55](https://github.com/hugo-fixit/FixIt/issues/55)) +- :truck: Feat: move `assets/data/emoji` to `assets/lib/valine/emoji/` - :zap: Perf: optimize close comment feature when the post has expired ([#204](https://github.com/hugo-fixit/FixIt/issues/204)) - :zap: Perf: optimize sub menu position calculation in desktop header with css replace of javascript - :bug: Fix: remove the leading and trailing whitespace of the code string ([#205](https://github.com/hugo-fixit/FixIt/issues/205)) diff --git a/assets/data/emoji/apple.yml b/assets/lib/valine/emoji/apple.yml similarity index 100% rename from assets/data/emoji/apple.yml rename to assets/lib/valine/emoji/apple.yml diff --git a/assets/data/emoji/facebook.yml b/assets/lib/valine/emoji/facebook.yml similarity index 100% rename from assets/data/emoji/facebook.yml rename to assets/lib/valine/emoji/facebook.yml diff --git a/assets/data/emoji/google.yml b/assets/lib/valine/emoji/google.yml similarity index 100% rename from assets/data/emoji/google.yml rename to assets/lib/valine/emoji/google.yml diff --git a/assets/data/emoji/twitter.yml b/assets/lib/valine/emoji/twitter.yml similarity index 100% rename from assets/data/emoji/twitter.yml rename to assets/lib/valine/emoji/twitter.yml diff --git a/config.toml b/config.toml index 3ffb26ec..a4adfdf9 100644 --- a/config.toml +++ b/config.toml @@ -508,9 +508,9 @@ serverURLs = "" # FixIt 0.2.6 | NEW emoji data file name, default is "google.yml" # ["apple.yml", "google.yml", "facebook.yml", "twitter.yml"] - # located in "themes/FixIt/assets/data/emoji/" directory + # located in "themes/FixIt/assets/lib/valine/emoji/" directory # you can store your own data files in the same path under your project: - # "assets/data/emoji/" + # "assets/lib/valine/emoji/" emoji = "" commentCount = true # FixIt 0.2.13 | NEW # FixIt 0.2.16 | CHANGED Waline comment config (https://waline.js.org) diff --git a/docs b/docs index 88ffea0b..133d1edb 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 88ffea0b8e8895de6783687dec97189967493fe1 +Subproject commit 133d1edb92e378e5a1269df91f3d614beca18363 diff --git a/layouts/partials/single/comment.html b/layouts/partials/single/comment.html index 8700148d..ab98f311 100644 --- a/layouts/partials/single/comment.html +++ b/layouts/partials/single/comment.html @@ -100,7 +100,7 @@ {{- with $valine.serverURLs -}} {{- $commentConfig = dict "serverURLs" . | dict "valine" | merge $commentConfig -}} {{- end -}} - {{- $commentConfig = $valine.emoji | default "google.yml" | printf "data/emoji/%v" | resources.Get | transform.Unmarshal | dict "valine" | merge $commentConfig -}} + {{- $commentConfig = $valine.emoji | default "google.yml" | printf "lib/valine/emoji/%v" | resources.Get | transform.Unmarshal | dict "valine" | merge $commentConfig -}}