jeawin-astro 3.0.21 → 3.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jeawin-astro",
-    "version": "3.0.21",
+    "version": "3.0.22",
     "author": "chaegumi <chaegumi@qq.com>",
     "description": "",
     "license": "MIT",
@@ -35,21 +35,21 @@
         "@rollup/plugin-strip": "^3.0.4",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.1.2",
-        "@types/lodash": "^4.17.15",
+        "@types/lodash": "^4.17.16",
         "@types/sprintf-js": "^1.1.4",
         "autoprefixer": "^10.4.20",
         "chai": "^5.2.0",
         "mocha": "^10.8.2",
         "postcss": "^8.5.3",
-        "rollup": "^4.34.8",
+        "rollup": "^4.34.9",
         "rollup-plugin-node-externals": "^7.1.3",
         "rollup-plugin-postcss": "^4.0.2",
-        "typescript": "^5.7.3"
+        "typescript": "^5.8.2"
     },
     "dependencies": {
         "@astrojs/alpinejs": "^0.4.3",
         "@astrojs/check": "^0.9.4",
-        "@astrojs/cloudflare": "^12.2.2",
+        "@astrojs/cloudflare": "^12.2.3",
         "@astrojs/rss": "^4.0.11",
         "@astrojs/sitemap": "3.2.1",
         "@astrojs/ts-plugin": "^1.10.4",
@@ -61,11 +61,11 @@
         "@pagefind/default-ui": "^1.3.0",
         "@tailwindcss/forms": "^0.5.10",
         "@tailwindcss/typography": "^0.5.16",
-        "@tailwindcss/vite": "^4.0.8",
+        "@tailwindcss/vite": "^4.0.9",
         "@types/alpinejs": "^3.13.11",
         "alpinejs": "^3.14.8",
         "aos": "3.0.0-beta.6",
-        "astro": "^5.3.1",
+        "astro": "^5.4.1",
         "astro-color-scheme": "^1.1.5",
         "astro-embed": "^0.9.0",
         "astro-icon": "^1.1.5",
@@ -75,7 +75,7 @@
         "dayjs": "^1.11.13",
         "fetch-jsonp": "^1.3.0",
         "glob": "^11.0.1",
-        "keyv": "^5.2.3",
+        "keyv": "^5.3.1",
         "keyv-lru": "^3.0.4",
         "lodash": "^4.17.21",
         "pagefind": "^1.3.0",
@@ -83,10 +83,10 @@
         "sirv": "^3.0.1",
         "smartmenus": "2.0.0-alpha.1",
         "sprintf-js": "^1.1.3",
-        "string-strip-html": "^13.4.8",
+        "string-strip-html": "^13.4.12",
         "swiper": "^11.2.4",
         "tailwind-scrollbar": "^4.0.1",
-        "tailwindcss": "^4.0.8",
+        "tailwindcss": "^4.0.9",
         "tslib": "^2.8.1",
         "zod": "^3.24.2"
     }

package/src/components/blocks/block1.astro

@@ -117,7 +117,7 @@ if (Astro.slots.has("default")) {
 
 <custom-carousel-section>
   <SectionContainer bgcolor={bgcolor} max_width_screen={max_width_screen}>
-    <div class:list={["flex", { "flex-col": layout != "two-column" }, "gap-4"]}>
+    <div class:list={["flex", "flex-col", { "md:flex-row": layout == "two-column" }, "gap-4"]}>
       <div
         class:list={[
           "flex items-center justify-evenly gap-2",

package/src/components/category_list.astro

@@ -1,138 +1,138 @@
----
-/**
- * 内容类别列表展示组件
- *
- * jeawin-astro/src/components/category_list.astro
- *
- * @package jeawin-astro
- * @author		Chaegumi
- * @copyright	Copyright (c) 2024-2099 jeawin.com
- * @email		chaegumi@jeawin.com
- * @filesource
- */
-import _ from "lodash";
-import { render_url } from "../scripts/util.js";
-import CommonCard from "./common_card.astro";
-import NodesList from "./nodes_list.astro";
-interface Props {
-  channel_id: any;
-  category_id?: any;
-  uri?: any;
-  page?: any;
-  limit?: any;
-  include_children_category_nodes?: any;
-  no_fields?: any;
-  show_category_nodes?: boolean;
-  has_sider?: boolean;
-  layout?: any;
-  node_item_component?: any;
-}
-
-const {
-  channel_id,
-  category_id,
-  uri,
-  page,
-  limit,
-  include_children_category_nodes,
-  no_fields,
-  show_category_nodes = false,
-  has_sider = false,
-  layout = "grid gap-4 grid-cols-2 md:grid-cols-4",
-  node_item_component,
-} = Astro.props;
-
-const { btn_class, all_categories, base, url_suffix } = Astro.locals;
-
-const categories: any[] = _.filter(all_categories, (o: any) => {
-  return (
-    Number(o.channel_id) === Number(channel_id) &&
-    Number(o.parent_id) === Number(category_id)
-  );
-});
-
-let Component = Fragment;
-switch (node_item_component) {
-  default:
-    Component = CommonCard;
-    break;
-}
----
-
-{
-  categories.length > 0 ? (
-    categories.map((category, idx) => (
-      <section
-        class:list={[
-          "py-12",
-          { "bg-[#ffffff]": idx % 2 === 1, "bg-slate-50": idx % 2 === 0 },
-        ]}
-        data-aos="fade-up"
-        data-aos-once="false"
-      >
-        <div class={has_sider ? "w-full" : "max-w-screen-2xl mx-auto"}>
-          <div class="px-4">
-            <h2 class="text-2xl mb-7 text-center font-bold text-neutral-800  md:text-4xl md:leading-tight">
-              {category.category_name}
-            </h2>
-            <div class="mx-auto text-center break-words mb-12 prose !max-w-none">
-              <Fragment set:html={category.category_content} />
-            </div>
-            {show_category_nodes ? (
-              <NodesList
-                channel_id={category.channel_id}
-                category_id={category.id}
-                limit_type="limit"
-                limit="4"
-                include_children_category_nodes={
-                  include_children_category_nodes
-                }
-                no_fields={no_fields}
-              >
-                {(nodes: any[]) => (
-                  <div class:list={[layout]}>
-                    {nodes.map((node: any) => (
-                      <Component node={node} title_tag="h3" />
-                    ))}
-                  </div>
-                )}
-              </NodesList>
-            ) : null}
-
-            <div class="text-center mt-6">
-              <a
-                href={render_url(category.category_url, base, null, url_suffix)}
-                class:list={btn_class}
-                title="SEE ALL "
-              >SEE ALL {category.category_name} ({category.nodecount})</a>
-            </div>
-          </div>
-        </div>
-      </section>
-    ))
-  ) : (
-    <section class="py-12 bg-slate-50" data-aos="fade-up" data-aos-once="false">
-      <div class={has_sider ? "w-full" : "max-w-screen-2xl mx-auto"}>
-        <div class="px-4">
-          <NodesList
-            channel_id={channel_id}
-            category_id={category_id}
-            uri={uri}
-            page={page}
-            limit={limit}
-            include_children_category_nodes={include_children_category_nodes}
-            no_fields={no_fields}
-          >
-            {(nodes: any[]) => (
-              <div class:list={[layout]}>
-                {nodes.map((node: any) => (
-                  <Component node={node} title_tag="h2" />
-                ))}
-              </div>
-            )}
-          </NodesList>
-        </div>
-      </div>
-    </section>
-  )
-}
+---
+/**
+ * 内容类别列表展示组件
+ *
+ * jeawin-astro/src/components/category_list.astro
+ *
+ * @package jeawin-astro
+ * @author		Chaegumi
+ * @copyright	Copyright (c) 2024-2099 jeawin.com
+ * @email		chaegumi@jeawin.com
+ * @filesource
+ */
+import _ from "lodash";
+import { render_url } from "../scripts/util.js";
+import CommonCard from "./common_card.astro";
+import NodesList from "./nodes_list.astro";
+interface Props {
+  channel_id: any;
+  category_id?: any;
+  uri?: any;
+  page?: any;
+  limit?: any;
+  include_children_category_nodes?: any;
+  no_fields?: any;
+  show_category_nodes?: boolean;
+  has_sider?: boolean;
+  layout?: any;
+  node_item_component?: any;
+}
+
+const {
+  channel_id,
+  category_id,
+  uri,
+  page,
+  limit,
+  include_children_category_nodes,
+  no_fields,
+  show_category_nodes = false,
+  has_sider = false,
+  layout = "grid gap-4 grid-cols-2 md:grid-cols-4",
+  node_item_component,
+} = Astro.props;
+
+const { btn_class, all_categories, base, url_suffix } = Astro.locals;
+
+const categories: any[] = _.filter(all_categories, (o: any) => {
+  return (
+    Number(o.channel_id) === Number(channel_id) &&
+    Number(o.parent_id) === Number(category_id)
+  );
+});
+
+let Component = Fragment;
+switch (node_item_component) {
+  default:
+    Component = CommonCard;
+    break;
+}
+---
+
+{
+  categories.length > 0 ? (
+    categories.map((category, idx) => (
+      <section
+        class:list={[
+          "py-12",
+          { "bg-[#ffffff]": idx % 2 === 1, "bg-slate-50": idx % 2 === 0 },
+        ]}
+        data-aos="fade-up"
+        data-aos-once="false"
+      >
+        <div class={has_sider ? "w-full" : "max-w-screen-2xl mx-auto"}>
+          <div class="px-4">
+            <h2 class="text-2xl mb-7 text-center font-bold text-neutral-800  md:text-4xl md:leading-tight">
+              {category.category_name}
+            </h2>
+            <div class="mx-auto text-center break-words mb-12 prose !max-w-none">
+              <Fragment set:html={category.category_content} />
+            </div>
+            {show_category_nodes ? (
+              <NodesList
+                channel_id={category.channel_id}
+                category_id={category.id}
+                limit_type="limit"
+                limit="4"
+                include_children_category_nodes={
+                  include_children_category_nodes
+                }
+                no_fields={no_fields}
+              >
+                {(nodes: any[]) => (
+                  <div class:list={[layout]}>
+                    {nodes.map((node: any) => (
+                      <Component node={node} title_tag="h3" />
+                    ))}
+                  </div>
+                )}
+              </NodesList>
+            ) : null}
+
+            <div class="text-center mt-6">
+              <a
+                href={render_url(category.category_url, base, null, url_suffix)}
+                class:list={btn_class}
+                title="SEE ALL "
+              >SEE ALL {category.category_name} ({category.nodecount})</a>
+            </div>
+          </div>
+        </div>
+      </section>
+    ))
+  ) : (
+    <section class="py-12 bg-slate-50" data-aos="fade-up" data-aos-once="false">
+      <div class={has_sider ? "w-full" : "max-w-screen-2xl mx-auto"}>
+        <div class="px-4">
+          <NodesList
+            channel_id={channel_id}
+            category_id={category_id}
+            uri={uri}
+            page={page}
+            limit={limit}
+            include_children_category_nodes={include_children_category_nodes}
+            no_fields={no_fields}
+          >
+            {(nodes: any[]) => (
+              <div class:list={[layout]}>
+                {nodes.map((node: any) => (
+                  <Component node={node} title_tag="h2" />
+                ))}
+              </div>
+            )}
+          </NodesList>
+        </div>
+      </div>
+    </section>
+  )
+}

package/src/components/comment_form.astro

@@ -1,126 +1,126 @@
----
-/**
- * 评论表单组件
- *
- * jeawin-astro/src/components/comment_form.astro
- *
- * @package jeawin-astro
- * @author		Chaegumi
- * @copyright	Copyright (c) 2024-2099 jeawin.com
- * @email		chaegumi@jeawin.com
- * @filesource
- */
-import { render_value } from "../scripts/util.js";
-interface Props {
-  canonical: string;
-  channel_id: string;
-  category_id?: string;
-  node_id?: string;
-}
-const { canonical, channel_id, category_id, node_id } = Astro.props;
-
-const { siteinfo, all_langs, jeawin_form_api_domain } = Astro.locals;
----
-
-<style>
-  .error {
-    color: red;
-  }
-</style>
-<div style="padding:10px;clear:both;" data-aos="fade-up" data-aos-once="false">
-  <form
-    action={`${jeawin_form_api_domain}/api/comment/save_captcha`}
-    id="jeawin-comment-form"
-  >
-    <input type="hidden" name="captchaId" id="commentFormCaptchaId" value="" />
-    <input
-      type="hidden"
-      name="captcha_code"
-      id="commentFormCaptchaCode"
-      value=""
-    />
-
-    <input type="hidden" name="site_id" value={siteinfo.id} />
-    <input type="hidden" name="channel_id" value={channel_id} />
-    <input type="hidden" name="category_id" value={category_id} />
-    <input type="hidden" name="node_id" value={node_id} />
-    <input type="hidden" name="fromurl" value={canonical} />
-
-    <div style="margin-top:10px;">
-      {render_value(all_langs, "Nickname")}<span style="color:red;">*</span>:
-    </div>
-    <div>
-      <input
-        type="text"
-        name="nickname"
-        id="comment_nickname"
-        autocomplete="off"
-        placeholder={render_value(all_langs, "Enter your nickname")}
-        required="required"
-        class="form-control"
-        style="width:100%;"
-      />
-    </div>
-
-    <div style="margin-top:10px;">
-      {render_value(all_langs, "E-mail")}<span style="color:red;">*</span>:
-    </div>
-    <div>
-      <input
-        type="email"
-        name="email"
-        id="comment_email"
-        autocomplete="off"
-        placeholder={render_value(all_langs, "Enter your email")}
-        required="required"
-        class="form-control"
-        style="width:100%;"
-      />
-    </div>
-
-    <div style="margin-top:10px;">
-      {render_value(all_langs, "Rate")}<span style="color:red;">*</span>:
-    </div>
-    <div>
-      <label><input type="radio" name="score" value="1" /> 1</label>
-      <label><input type="radio" name="score" value="2" /> 2</label>
-      <label><input type="radio" name="score" value="3" /> 3</label>
-      <label><input type="radio" name="score" value="4" /> 4</label>
-      <label
-        ><input type="radio" name="score" value="5" checked="checked" /> 5</label
-      >
-    </div>
-
-    <div style="margin-top:10px;">
-      {render_value(all_langs, "Comments")}<span style="color:red;">*</span>:
-    </div>
-    <div>
-      <textarea
-        name="comment"
-        id="comment_content"
-        placeholder={render_value(all_langs, "Enter your comment")}
-        required="required"
-        style="width:100%;"
-        class="form-control"
-        rows="6"></textarea>
-    </div>
-    <div style="margin-top:10px;">
-      <button
-        type="submit"
-        class="btn btn-primary ampstart-btn"
-        id="commentFormSubmitBtn">{render_value(all_langs, "Send")}</button
-      >
-    </div>
-  </form>
-</div>
-<style is:inline>
-  .btn {
-    display: inline-block;
-    padding: 6px 12px;
-  }
-  .btn-primary {
-    color: white;
-    background-color: var(--themeColor);
-    border-color: var(--themeColor);
-  }
-</style>
+---
+/**
+ * 评论表单组件
+ *
+ * jeawin-astro/src/components/comment_form.astro
+ *
+ * @package jeawin-astro
+ * @author		Chaegumi
+ * @copyright	Copyright (c) 2024-2099 jeawin.com
+ * @email		chaegumi@jeawin.com
+ * @filesource
+ */
+import { render_value } from "../scripts/util.js";
+interface Props {
+  canonical: string;
+  channel_id: string;
+  category_id?: string;
+  node_id?: string;
+}
+const { canonical, channel_id, category_id, node_id } = Astro.props;
+
+const { siteinfo, all_langs, jeawin_form_api_domain } = Astro.locals;
+---
+
+<style>
+  .error {
+    color: red;
+  }
+</style>
+<div style="padding:10px;clear:both;" data-aos="fade-up" data-aos-once="false">
+  <form
+    action={`${jeawin_form_api_domain}/api/comment/save_captcha`}
+    id="jeawin-comment-form"
+  >
+    <input type="hidden" name="captchaId" id="commentFormCaptchaId" value="" />
+    <input
+      type="hidden"
+      name="captcha_code"
+      id="commentFormCaptchaCode"
+      value=""
+    />
+
+    <input type="hidden" name="site_id" value={siteinfo.id} />
+    <input type="hidden" name="channel_id" value={channel_id} />
+    <input type="hidden" name="category_id" value={category_id} />
+    <input type="hidden" name="node_id" value={node_id} />
+    <input type="hidden" name="fromurl" value={canonical} />
+
+    <div style="margin-top:10px;">
+      {render_value(all_langs, "Nickname")}<span style="color:red;">*</span>:
+    </div>
+    <div>
+      <input
+        type="text"
+        name="nickname"
+        id="comment_nickname"
+        autocomplete="off"
+        placeholder={render_value(all_langs, "Enter your nickname")}
+        required="required"
+        class="form-control"
+        style="width:100%;"
+      />
+    </div>
+
+    <div style="margin-top:10px;">
+      {render_value(all_langs, "E-mail")}<span style="color:red;">*</span>:
+    </div>
+    <div>
+      <input
+        type="email"
+        name="email"
+        id="comment_email"
+        autocomplete="off"
+        placeholder={render_value(all_langs, "Enter your email")}
+        required="required"
+        class="form-control"
+        style="width:100%;"
+      />
+    </div>
+
+    <div style="margin-top:10px;">
+      {render_value(all_langs, "Rate")}<span style="color:red;">*</span>:
+    </div>
+    <div>
+      <label><input type="radio" name="score" value="1" /> 1</label>
+      <label><input type="radio" name="score" value="2" /> 2</label>
+      <label><input type="radio" name="score" value="3" /> 3</label>
+      <label><input type="radio" name="score" value="4" /> 4</label>
+      <label
+        ><input type="radio" name="score" value="5" checked="checked" /> 5</label
+      >
+    </div>
+
+    <div style="margin-top:10px;">
+      {render_value(all_langs, "Comments")}<span style="color:red;">*</span>:
+    </div>
+    <div>
+      <textarea
+        name="comment"
+        id="comment_content"
+        placeholder={render_value(all_langs, "Enter your comment")}
+        required="required"
+        style="width:100%;"
+        class="form-control"
+        rows="6"></textarea>
+    </div>
+    <div style="margin-top:10px;">
+      <button
+        type="submit"
+        class="btn btn-primary ampstart-btn"
+        id="commentFormSubmitBtn">{render_value(all_langs, "Send")}</button
+      >
+    </div>
+  </form>
+</div>
+<style is:inline>
+  .btn {
+    display: inline-block;
+    padding: 6px 12px;
+  }
+  .btn-primary {
+    color: white;
+    background-color: var(--themeColor);
+    border-color: var(--themeColor);
+  }
+</style>