From 451ec4ce4943bf52991389aeba04e196f00e8720 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <1152958806@qq.com> Date: Thu, 6 Jul 2023 23:20:30 +0800 Subject: [PATCH 1/3] 0 --- templates/modules/post-list.html | 5 +++-- templates/modules/widgets/top-group.html | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/templates/modules/post-list.html b/templates/modules/post-list.html index 90c93e14..e1e0ae9c 100644 --- a/templates/modules/post-list.html +++ b/templates/modules/post-list.html @@ -7,6 +7,7 @@
@@ -39,7 +40,7 @@ th:href="@{${post.status.permalink}}" th:text="${post.spec.title}"> -
+
diff --git a/templates/modules/widgets/top-group.html b/templates/modules/widgets/top-group.html index 0a85fb5b..5adbe3ea 100644 --- a/templates/modules/widgets/top-group.html +++ b/templates/modules/widgets/top-group.html @@ -11,7 +11,8 @@
- 荐 + 荐
- 荐 + 荐
+ th:attr="onclick='javascript:pjax.loadUrl(\''+ ${theme.config.top.todayRecommendContent.todayRecommendUrl} +'\')'">
From be3d15f36ac129a4d1e860554e1915b59b0ace6c Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <17683872107czx> Date: Fri, 7 Jul 2023 13:36:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 11 +- templates/about.html | 801 +----------------- templates/modules/about-widgets.html | 18 + .../widgets/about-widgets/authorCareers.html | 320 +++++++ .../widgets/about-widgets/content-idea.html | 28 + .../modules/widgets/about-widgets/game.html | 34 + .../widgets/about-widgets/hello-about.html | 150 ++++ .../widgets/about-widgets/like-music.html | 42 + .../about-widgets/personalities-photo.html | 208 +++++ .../widgets/about-widgets/statistics-map.html | 133 +++ .../widgets/about-widgets/textarea.html | 29 + 11 files changed, 1016 insertions(+), 758 deletions(-) create mode 100644 templates/modules/about-widgets.html create mode 100644 templates/modules/widgets/about-widgets/authorCareers.html create mode 100644 templates/modules/widgets/about-widgets/content-idea.html create mode 100644 templates/modules/widgets/about-widgets/game.html create mode 100644 templates/modules/widgets/about-widgets/hello-about.html create mode 100644 templates/modules/widgets/about-widgets/like-music.html create mode 100644 templates/modules/widgets/about-widgets/personalities-photo.html create mode 100644 templates/modules/widgets/about-widgets/statistics-map.html create mode 100644 templates/modules/widgets/about-widgets/textarea.html diff --git a/settings.yaml b/settings.yaml index 132cacd1..6aad58e9 100644 --- a/settings.yaml +++ b/settings.yaml @@ -856,6 +856,11 @@ spec: - $formkit: color name: background label: 背景色 + - $formkit: textarea + name: widgets + label: 小部件 + value: "content-idea,authorCareers,personalities-photo,textarea,game,like-music,statistics-map" + help: "content-idea（我的介绍&我的想法）, authorCareers（技能&职业生涯）, personalities-photo（性格&图片）, textarea（座右铭）, game（爱好）, like-music（关注偏好&音乐偏好）, statistics-map（数据统计&音乐偏好）。你可以随意组合或排序，以逗号隔开。" - $formkit: repeater name: authorInfoLeftTags label: 个人标签-左 @@ -886,6 +891,10 @@ spec: label: 我的想法 value:
一定

记得
修改这块代码
优秀的产品 出色的设计 高效的编程 人性化的用户体验

help: 支持 HTML 语法 + - $formkit: text + name: helloAbout + label: hello 文字 + value: Hello there! - $formkit: group name: authorCareers label: 职业生涯 @@ -960,7 +969,7 @@ spec: label: 文本块 min: 2 max: 2 - help: 左边的一行10字 右面一行19字 + help: 左边的一行10字 右面一行19字(设置两条数据，不然出不来) children: - $formkit: text name: tittle diff --git a/templates/about.html b/templates/about.html index 9ca4af3b..c42113a2 100644 --- a/templates/about.html +++ b/templates/about.html @@ -1,6 +1,6 @@ + xmlns:th="http://www.thymeleaf.org"> @@ -18,743 +18,27 @@
+ th:if="${not #lists.isEmpty(theme.config.about.authorInfoLeftTags)}" + th:with="authorTags = ${theme.config.about.authorInfoLeftTags}"> + th:text="${authorTag.tag}">
+ th:src="@{${#strings.isEmpty(site.logo) ? '/assets/images/hao-logo.jpg' : site.logo}}">
+ th:if="${not #lists.isEmpty(theme.config.about.authorInfoRightTags)}" + th:with="authorTags = ${theme.config.about.authorInfoRightTags}"> + th:text="${authorTag.tag}">
关于本站
-
-
-
-
-
- - -
- -
-
-
技能
- 开启创造力 -
-
-
-
- -
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
- - -
- -
-
- -
- -
- -
-
- -
-
-
-
- - -
- -
-
- -
-
AfterEffect
-
- -
-
- -
-
Sketch
-
- -
-
- -
-
Docker
-
- -
-
- -
-
Photoshop
-
- -
-
- -
-
FinalCutPro
-
- -
-
- -
-
Python
-
- -
-
- -
-
Swift
-
- -
-
- -
-
Principle
-
- -
-
- -
-
illustrator
-
- -
-
- -
-
CSS3
-
- -
-
- -
-
JS
-
- -
-
- -
-
HTML
-
- -
-
- -
-
Git
-
- -
-
- -
-
Apifox
-
- -
...
-
-
- -
-
- -
-
-
- -
-
-
-
- -
-
-
生涯
- 无限进步 -
-
-
-
-
-
- 生涯 -
-
-
- - -
-
-
性格
- - - 调停者 -
INFP
-
-
在 16personalities - 了解更多关于 调停者 -
- - - - 建筑师 -
INTJ
-
-
在 16personalities - 了解更多关于 建筑师 -
- - - - 逻辑学家 -
INTP
-
-
在 16personalities - 了解更多关于 逻辑学家 -
- - - - 指挥官 -
ENTJ
-
-
在 16personalities - 了解更多关于 指挥官 -
- - - - 辩论家 -
ENTP
-
-
在 16personalities - 了解更多关于 辩论家 -
- - - - 主人公 -
ENFJ
-
-
在 16personalities - 了解更多关于 主人公 -
- - - - 竞选者 -
ENFP
-
-
在 16personalities - 了解更多关于 竞选者 -
- - - - 总经理 -
ESTJ
-
-
在 16personalities - 了解更多关于 总经理 -
- - - - 企业家 -
ESTP
-
-
在 16personalities - 了解更多关于 企业家 -
- - - - 执政官 -
ESFJ
-
-
在 16personalities - 了解更多关于 执政官 -
- - - - 表演者 -
ESFP
-
-
在 16personalities - 了解更多关于 表演者 -
- - - - 提倡者 -
INFJ
-
-
在 16personalities - 了解更多关于 提倡者 -
- - - - 物流师 -
ISTJ
-
-
在 16personalities - 了解更多关于 物流师 -
- - - - 鉴赏家 -
ISTP
-
-
在 16personalities - 了解更多关于 鉴赏家 -
- - - - 守卫者 -
ISFJ
-
-
在 16personalities - 了解更多关于 守卫者 -
- - - - 探险家 -
ISFP
-
-
在 16personalities - 了解更多关于 探险家 -
- - -
-
自拍 -
-
- - -
-
-
座右铭
- - 生活原本沉闷， - 但跑起来就有风。 - -
- -
-
-
特长
- - 玄学流电脑疑难问题解决 - 专家 - - 软件学习能力 - -
-
-
-
-
-
-
- -
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
- - - - - -
- -
-
-
-
数据
- 访问统计 -
-
统计信息来自 51la网站统计
- -
-
- -
-
- 我现在住在 - [[${theme.config.about.map.StrengthenTitle}]] -
-
-
生于2000 -
-
太原理工大学计算机科学 -
-
现在职业BI工程师 -
-
- -
-
@@ -779,43 +63,43 @@
- - - - - - - - - - + + + + + + + + + +
- - - - - - - - - -
+ + + + + + + + + +
- - - - - - - - - -
+ + + + + + + + + +

共[[${theme.config.aboutReward.reward_list.size()}]]人

+ th:with="authorRewardList = ${theme.config.aboutReward.reward_list}">
[[${authorReward.name}]]
@@ -823,7 +107,7 @@
¥ [[${authorReward.amount}]]
¥ [[${authorReward.amount}]] + style="background: var(--heo-vip);">¥ [[${authorReward.amount}]]
@@ -833,6 +117,9 @@
+ + + diff --git a/templates/modules/about-widgets.html b/templates/modules/about-widgets.html new file mode 100644 index 00000000..65093195 --- /dev/null +++ b/templates/modules/about-widgets.html @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/modules/widgets/about-widgets/authorCareers.html b/templates/modules/widgets/about-widgets/authorCareers.html new file mode 100644 index 00000000..75d4d71e --- /dev/null +++ b/templates/modules/widgets/about-widgets/authorCareers.html @@ -0,0 +1,320 @@ + + + +
+ +
+
+
技能
+ 开启创造力 +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+
+ + +
+ +
+
+ +
+
AfterEffect
+
+ +
+
+ +
+
Sketch
+
+ +
+
+ +
+
Docker
+
+ +
+
+ +
+
Photoshop
+
+ +
+
+ +
+
FinalCutPro
+
+ +
+
+ +
+
Python
+
+ +
+
+ +
+
Swift
+
+ +
+
+ +
+
Principle
+
+ +
+
+ +
+
illustrator
+
+ +
+
+ +
+
CSS3
+
+ +
+
+ +
+
JS
+
+ +
+
+ +
+
HTML
+
+ +
+
+ +
+
Git
+
+ +
+
+ +
+
Apifox
+
+ +
...
+
+
+ +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
生涯
+ 无限进步 +
+
+
+
+
+
+ 生涯 +
+
+
+ + diff --git a/templates/modules/widgets/about-widgets/content-idea.html b/templates/modules/widgets/about-widgets/content-idea.html new file mode 100644 index 00000000..08634bc4 --- /dev/null +++ b/templates/modules/widgets/about-widgets/content-idea.html @@ -0,0 +1,28 @@ + + + +
+
+
+
+ +
+ + diff --git a/templates/modules/widgets/about-widgets/game.html b/templates/modules/widgets/about-widgets/game.html new file mode 100644 index 00000000..1e33f2f6 --- /dev/null +++ b/templates/modules/widgets/about-widgets/game.html @@ -0,0 +1,34 @@ + + + +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + diff --git a/templates/modules/widgets/about-widgets/hello-about.html b/templates/modules/widgets/about-widgets/hello-about.html new file mode 100644 index 00000000..e52ce699 --- /dev/null +++ b/templates/modules/widgets/about-widgets/hello-about.html @@ -0,0 +1,150 @@ + + + +
+
+
+
+
+
+
+
+

[[${theme.config.about.helloAbout}]]

+
+ + + + +
+ + \ No newline at end of file diff --git a/templates/modules/widgets/about-widgets/like-music.html b/templates/modules/widgets/about-widgets/like-music.html new file mode 100644 index 00000000..7ee957ef --- /dev/null +++ b/templates/modules/widgets/about-widgets/like-music.html @@ -0,0 +1,42 @@ + + + +
+ + + + + +
+ diff --git a/templates/modules/widgets/about-widgets/personalities-photo.html b/templates/modules/widgets/about-widgets/personalities-photo.html new file mode 100644 index 00000000..7fa2160e --- /dev/null +++ b/templates/modules/widgets/about-widgets/personalities-photo.html @@ -0,0 +1,208 @@ + + + + + +
+
+
性格
+ + + 调停者 +
INFP
+
+
+
在 16personalities + 了解更多关于 调停者 +
+ + + + 建筑师 +
INTJ
+
+
+
在 16personalities + 了解更多关于 建筑师 +
+ + + + 逻辑学家 +
INTP
+
+
+
在 16personalities + 了解更多关于 逻辑学家 +
+ + + + 指挥官 +
ENTJ
+
+
+
在 16personalities + 了解更多关于 指挥官 +
+ + + + 辩论家 +
ENTP
+
+
+
在 16personalities + 了解更多关于 辩论家 +
+ + + + 主人公 +
ENFJ
+
+
+
在 16personalities + 了解更多关于 主人公 +
+ + + + 竞选者 +
ENFP
+
+
+
在 16personalities + 了解更多关于 竞选者 +
+ + + + 总经理 +
ESTJ
+
+
+
在 16personalities + 了解更多关于 总经理 +
+ + + + 企业家 +
ESTP
+
+
+
在 16personalities + 了解更多关于 企业家 +
+ + + + 执政官 +
ESFJ
+
+
+
在 16personalities + 了解更多关于 执政官 +
+ + + + 表演者 +
ESFP
+
+
+
在 16personalities + 了解更多关于 表演者 +
+ + + + 提倡者 +
INFJ
+
+
+
在 16personalities + 了解更多关于 提倡者 +
+ + + + 物流师 +
ISTJ
+
+
+
在 16personalities + 了解更多关于 物流师 +
+ + + + 鉴赏家 +
ISTP
+
+
+
在 16personalities + 了解更多关于 鉴赏家 +
+ + + + 守卫者 +
ISFJ
+
+
+
在 16personalities + 了解更多关于 守卫者 +
+ + + + 探险家 +
ISFP
+
+
+
在 16personalities + 了解更多关于 探险家 +
+ + +
+
自拍 +
+
+ + \ No newline at end of file diff --git a/templates/modules/widgets/about-widgets/statistics-map.html b/templates/modules/widgets/about-widgets/statistics-map.html new file mode 100644 index 00000000..42be2e96 --- /dev/null +++ b/templates/modules/widgets/about-widgets/statistics-map.html @@ -0,0 +1,133 @@ + + + +
+
+
+
数据
+ 访问统计 +
+
统计信息来自 51la网站统计
+ +
+
+ + +
+
+ 我现在住在 + [[${theme.config.about.map.StrengthenTitle}]] +
+
+
生于2000 +
+
太原理工大学计算机科学 +
+
现在职业BI工程师 +
+
+ +
+ + +
+ + \ No newline at end of file diff --git a/templates/modules/widgets/about-widgets/textarea.html b/templates/modules/widgets/about-widgets/textarea.html new file mode 100644 index 00000000..f335c3be --- /dev/null +++ b/templates/modules/widgets/about-widgets/textarea.html @@ -0,0 +1,29 @@ + + + + +
+
+
座右铭
+ + 生活原本沉闷， + 但跑起来就有风。 + +
+ +
+
+
特长
+ + 玄学流电脑疑难问题解决 + 专家 + + 软件学习能力 + +
+
+
+ + From 5e38f139e873e1e796c4af8b7fcae17224d1c3a5 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <17683872107czx> Date: Fri, 7 Jul 2023 13:42:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/assets/libs/countup/countup.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 templates/assets/libs/countup/countup.js diff --git a/templates/assets/libs/countup/countup.js b/templates/assets/libs/countup/countup.js new file mode 100644 index 00000000..043fc5e0 --- /dev/null +++ b/templates/assets/libs/countup/countup.js @@ -0,0 +1 @@ +var CountUp=function(target,startVal,endVal,decimals,duration,options){var self=this;self.version=function(){return"1.9.2"};self.options={useEasing:true,useGrouping:true,separator:",",decimal:".",easingFn:easeOutExpo,formattingFn:formatNumber,prefix:"",suffix:"",numerals:[]};if(options&&typeof options==="object"){for(var key in self.options){if(options.hasOwnProperty(key)&&options[key]!==null){self.options[key]=options[key]}}}if(self.options.separator===""){self.options.useGrouping=false}else{self.options.separator=""+self.options.separator}var lastTime=0;var vendors=["webkit","moz","ms","o"];for(var x=0;x1?self.options.decimal+x[1]:"";if(self.options.useGrouping){x3="";for(i=0,l=x1.length;iself.endVal);self.frameVal=self.startVal;self.initialized=true;return true}else{self.error="[CountUp] startVal ("+startVal+") or endVal ("+endVal+") is not a number";return false}};self.printValue=function(value){var result=self.options.formattingFn(value);if(self.d.tagName==="INPUT"){this.d.value=result}else{if(self.d.tagName==="text"||self.d.tagName==="tspan"){this.d.textContent=result}else{this.d.innerHTML=result}}};self.count=function(timestamp){if(!self.startTime){self.startTime=timestamp}self.timestamp=timestamp;var progress=timestamp-self.startTime;self.remaining=self.duration-progress;if(self.options.useEasing){if(self.countDown){self.frameVal=self.startVal-self.options.easingFn(progress,0,self.startVal-self.endVal,self.duration)}else{self.frameVal=self.options.easingFn(progress,self.startVal,self.endVal-self.startVal,self.duration)}}else{if(self.countDown){self.frameVal=self.startVal-((self.startVal-self.endVal)*(progress/self.duration))}else{self.frameVal=self.startVal+(self.endVal-self.startVal)*(progress/self.duration)}}if(self.countDown){self.frameVal=(self.frameValself.endVal)?self.endVal:self.frameVal}self.frameVal=Math.round(self.frameVal*self.dec)/self.dec;self.printValue(self.frameVal);if(progressself.endVal);self.rAF=requestAnimationFrame(self.count)};if(self.initialize()){self.printValue(self.startVal)}};