diff --git a/http/http-client.env.json b/http/http-client.env.json index 60960bb7..c331818a 100644 --- a/http/http-client.env.json +++ b/http/http-client.env.json @@ -1,5 +1,6 @@ { "dev": { - "cookie": "Idea-b3bcefb1=28a94d07-f033-473f-aaff-bce5a96ae38b; Hm_lvt_828db1fd637f3717a876af84bf0678bd=1664877624,1664884710; mozi-assist={\"show\":false,\"audio\":false,\"speed\":\"middle\",\"zomm\":1,\"cursor\":false,\"pointer\":false,\"bigtext\":false,\"overead\":false}; Hm_lpvt_828db1fd637f3717a876af84bf0678bd=1665275924; XSRF-TOKEN=b761100c-0fd3-4851-9499-ef79b2b881a5; SESSION=4f6dc3c4-67e6-4e47-bd5a-6bb631ec7efc" + "cookie": "mozi-assist={\"show\":false,\"audio\":false,\"speed\":\"middle\",\"zomm\":1,\"cursor\":false,\"pointer\":false,\"bigtext\":false,\"overead\":false}; SESSION=dc56cf1a-7f74-4148-af2f-d8bde7dec653; XSRF-TOKEN=acab263c-7605-4765-873e-d0810c6d6973s", + "token": "acab263c-7605-4765-873e-d0810c6d6973" } } \ No newline at end of file diff --git a/http/settings.http b/http/settings.http index 86e67838..4a59d0c7 100644 --- a/http/settings.http +++ b/http/settings.http @@ -2,6 +2,8 @@ ### 删除 settings 配置, Cookit 可以从 Console 后台 F12 获取 DELETE http://localhost:8090/api/v1alpha1/settings/theme-hao-setting Content-Type: application/json +Sec-Fetch-Mode: cors +X-XSRF-TOKEN: {{$uuid}} Cookie: {{cookie}} @@ -9,7 +11,9 @@ Cookie: {{cookie}} POST http://localhost:8090/api/v1alpha1/settings Content-Type: application/json +Sec-Fetch-Mode: cors Cookie: {{cookie}} +X-XSRF-TOKEN: {{$uuid}} { "apiVersion": "v1alpha1", @@ -19,6 +23,26 @@ Cookie: {{cookie}} }, "spec": { "forms": [ + { + "group": "nav", + "label": "导航栏", + "formSchema": [ + { + "$formkit": "text", + "name": "left_menu", + "label": "导航栏左侧相关链接", + "placeholder": "请填写 metadata name", + "help": "需要通过开发者模式获取菜单对应的 metadata name" + }, + { + "$formkit": "text", + "name": "site_title", + "label": "标题", + "placeholder": "请输入标题", + "help": "支持 HTML 语法,比如 Hao,默认为站点名称" + } + ] + }, { "group": "layout", "label": "布局", @@ -146,13 +170,6 @@ Cookie: {{cookie}} "group": "menu", "label": "菜单映射", "formSchema": [ - { - "$formkit": "text", - "name": "header_left_menu", - "label": "菜单栏左侧相关链接", - "placeholder": "请填写 metadata name", - "help": "需要通过开发者模式获取菜单对应的 metadata name" - }, { "$formkit": "text", "name": "footer_menu", diff --git a/settings.yaml b/settings.yaml index 3bb3480d..c3c56ec4 100644 --- a/settings.yaml +++ b/settings.yaml @@ -4,6 +4,19 @@ metadata: name: theme-hao-setting spec: forms: + - group: nav + label: 导航栏 + formSchema: + - $formkit: text + name: left_menu + label: 导航栏左侧相关链接 + placeholder: 请填写 metadata name + help: "需要通过开发者模式获取菜单对应的 metadata name" + - $formkit: text + name: site_title + label: 标题 + placeholder: 请输入标题 + help: 支持 HTML 语法,比如 Hao,默认为站点名称 - group: layout label: 布局 formSchema: @@ -75,16 +88,11 @@ spec: name: profile_desc placeholder: 请填写个人卡片描述信息 help: "支持使用 HTML 标签" - - group: menu + - group: footer label: 菜单映射 formSchema: - $formkit: text - name: header_left_menu - label: 菜单栏左侧相关链接 - placeholder: 请填写 metadata name - help: "需要通过开发者模式获取菜单对应的 metadata name" - - $formkit: text - name: footer_menu + name: menu label: 底部相关链接 placeholder: 请填写 metadata name - help: "需要通过开发者模式获取菜单对应的 metadata name" \ No newline at end of file + help: "需要通过开发者模式获取菜单对应的 metadata name" diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css index e60ed809..e1454742 100644 --- a/templates/assets/zhheo/zhheoblog.css +++ b/templates/assets/zhheo/zhheoblog.css @@ -2652,7 +2652,7 @@ blockquote footer cite::before { } #page-header.nav-fixed #nav #site-name:hover, #page-header.nav-fixed #nav #toggle-menu:hover, #page-header.nav-fixed #nav a:hover { - color: #307af6 + color: #307af6; } #page-header.nav-visible #nav { @@ -6668,11 +6668,11 @@ a.console_switchbutton { #nav #site-name { color: var(--heo-fontcolor); - padding: 0; + padding: 0px 5px; transition: .3s; display: flex; height: 35px; - width: 75px; + /*width: 75px;*/ justify-content: center; align-items: center; text-shadow: none; diff --git a/templates/modules/nav.html b/templates/modules/nav.html index 34d27597..52352d92 100644 --- a/templates/modules/nav.html +++ b/templates/modules/nav.html @@ -3,97 +3,19 @@ diff --git a/templates/modules/widgets/nav-left.html b/templates/modules/widgets/nav-left.html new file mode 100644 index 00000000..930721aa --- /dev/null +++ b/templates/modules/widgets/nav-left.html @@ -0,0 +1,42 @@ + + + + +
+ + +
+ + +
+
+ + +
+
+ + + + + + + +
+
+ +
+
+
+ + + + + +
+ + + \ No newline at end of file diff --git a/templates/modules/widgets/nav-menu.html b/templates/modules/widgets/nav-menu.html new file mode 100644 index 00000000..f62a206b --- /dev/null +++ b/templates/modules/widgets/nav-menu.html @@ -0,0 +1,37 @@ + + + + + + + + \ No newline at end of file diff --git a/templates/modules/widgets/nav-right.html b/templates/modules/widgets/nav-right.html new file mode 100644 index 00000000..dc3803bb --- /dev/null +++ b/templates/modules/widgets/nav-right.html @@ -0,0 +1,50 @@ + + + + + + + + \ No newline at end of file diff --git a/templates/post.html b/templates/post.html index 2332460d..23bbda83 100644 --- a/templates/post.html +++ b/templates/post.html @@ -473,7 +473,7 @@
你无需删除空行,直接评论以获取最佳展示效果
- 这里放着评论模块 +