jeawin-astro 1.0.13 → 1.0.15

package/index.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="astro/client" />
 
-declare module 'src/scripts/cms';
-declare module 'src/scripts/util';
-declare module 'src/scripts/aos';
-declare module 'src/scripts/lightbox';
-declare module 'src/scripts/smartmenus';
-declare module 'src/scripts/swiper';
+/// <reference path="./src/scripts/cms.d.ts" />
+/// <reference path="./src/scripts/util.d.ts" />
+/// <reference path="./src/scripts/aos.d.ts" />
+/// <reference path="./src/scripts/lightbox.d.ts" />
+/// <reference path="./src/scripts/smartmenus.d.ts" />
+/// <reference path="./src/scripts/swiper.d.ts" />
+
 
 declare namespace App {
     interface Locals {

package/index.ts

@@ -1,11 +1,4 @@
 // Do not write code directly here, instead use the `src` folder!
 // Then, use this file to export everything you want your user to access.
 
-export * from './src/scripts/cms';
-export * from './src/scripts/util';
-export * from './src/scripts/aos';
-export * from './src/scripts/lightbox';
-export * from './src/scripts/smartmenus';
-export * from './src/scripts/swiper';
-
 export default {}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jeawin-astro",
-    "version": "1.0.13",
+    "version": "1.0.15",
     "author": "chaegumi <chaegumi@qq.com>",
     "description": "",
     "license": "MIT",
@@ -10,6 +10,8 @@
     },
     "homepage": "https://www.jeawin.com/",
     "type": "module",
+    "types": "index.d.ts",
+    "main": "index.ts",
     "scripts": {
         "test": "mocha test"
     },

package/src/components/formitem/country.astro

@@ -1,6 +1,6 @@
 ---
-import { get_country } from "../../scripts/cms";
-import { render_value } from "../../scripts/util";
+import { get_country } from "../../scripts/cms.js";
+import { render_value } from "../../scripts/util.js";
 const { field } = Astro.props;
 const { all_langs } = Astro.locals;
 

package/src/components/subcomponents/author_info.astro

@@ -1,5 +1,5 @@
 ---
-import { get_author_info } from "../../scripts/cms";
+import { get_author_info } from "../../scripts/cms.js";
 const { node_id } = Astro.props;
 const author_info_html = await get_author_info({ node_id });
 ---

package/src/components/subcomponents/banner_swiper.astro

@@ -1,6 +1,6 @@
 ---
-import { img_change_attrs, render_value } from "../../scripts/util";
-import { get_nodes } from "../../scripts/cms";
+import { img_change_attrs, render_value } from "../../scripts/util.js";
+import { get_nodes } from "../../scripts/cms.js";
 const banners = await get_nodes({ channel_id: 5 });
 ---
 
@@ -55,7 +55,7 @@ const banners = await get_nodes({ channel_id: 5 });
   }
 </style>
 <script>
-  import { initSwiper } from "../../scripts/swiper";
+  import { initSwiper } from "../../scripts/swiper.js";
 
   initSwiper(".banner_swiper");
 

package/src/components/subcomponents/block.astro

@@ -1,5 +1,5 @@
 ---
-import { get_block } from "../../scripts/cms";
+import { get_block } from "../../scripts/cms.js";
 const { block_id } = Astro.props;
 
 const block = await get_block({block_id});

package/src/components/subcomponents/breadcrumbs.astro

@@ -1,6 +1,6 @@
 ---
 import { Icon } from "astro-icon/components";
-import { render_url } from "../../scripts/util";
+import { render_url } from "../../scripts/util.js";
 interface Props {
   breadcrumbs_arr: any[];
   align?: string;

package/src/components/subcomponents/category_list.astro

@@ -1,6 +1,6 @@
 ---
 import _ from "lodash";
-import { render_url } from "../../scripts/util";
+import { render_url } from "../../scripts/util.js";
 import CommonCard from "./common_card.astro";
 import NodesList from "./nodes_list.astro";
 

package/src/components/subcomponents/children_categories_list.astro

@@ -3,7 +3,7 @@ import {
   get_children_categories,
   render_url,
   render_value,
-} from "../../scripts/util";
+} from "../../scripts/util.js";
 interface Props {
   all_categories: any[];
   channel_id: any;

package/src/components/subcomponents/choose_language.astro

@@ -1,5 +1,5 @@
 ---
-import { get_choose_language } from "../../scripts/cms";
+import { get_choose_language } from "../../scripts/cms.js";
 const { canonical, render_type } = Astro.props;
 
 const choose_language_html = await get_choose_language({

package/src/components/subcomponents/comment_form.astro

@@ -1,5 +1,5 @@
 ---
-import { render_value } from "../../scripts/util";
+import { render_value } from "../../scripts/util.js";
 interface Props {
   canonical: string;
   channel_id: string;

package/src/components/subcomponents/common_card.astro

@@ -1,5 +1,5 @@
 ---
-import { render_url } from "../../scripts/util";
+import { render_url } from "../../scripts/util.js";
 import DefaultImage from "./default_image.astro";
 import RenderImage from './image.astro';
 

package/src/components/subcomponents/detail_images.astro

@@ -1,5 +1,5 @@
 ---
-import { img_add_link } from "../../scripts/util";
+import { img_add_link } from "../../scripts/util.js";
 const { nodepics } = Astro.props;
 ---
 
@@ -90,8 +90,8 @@ const { nodepics } = Astro.props;
 </style>
 
 <script>
-  import { initSwiper } from "../../scripts/swiper";
-  import { initPhotoSwipeLightbox } from "../../scripts/lightbox";
+  import { initSwiper } from "../../scripts/swiper.js";
+  import { initPhotoSwipeLightbox } from "../../scripts/lightbox.js";
 
   initSwiper(".mainSwiper");
   initSwiper(".thumbSwiper");

package/src/components/subcomponents/filter_links.astro

@@ -1,5 +1,5 @@
 ---
-import { get_filter_links } from "../../scripts/cms";
+import { get_filter_links } from "../../scripts/cms.js";
 
 const {
   channel_id,

package/src/components/subcomponents/form.astro

@@ -1,6 +1,6 @@
 ---
-import { get_form } from "../../scripts/cms";
-import { render_value } from "../../scripts/util";
+import { get_form } from "../../scripts/cms.js";
+import { render_value } from "../../scripts/util.js";
 import Input from "../formitem/input.astro";
 import Textarea from "../formitem/textarea.astro";
 import Radio from "../formitem/radio.astro";

package/src/components/subcomponents/friendlinks.astro

@@ -1,14 +1,14 @@
 ---
 import _ from "lodash";
-import { get_friendlinks } from "../../scripts/cms";
-import { render_url, render_value } from "../../scripts/util";
+import { get_friendlinks } from "../../scripts/cms.js";
+import { render_url, render_value } from "../../scripts/util.js";
 
 const { canonical, is_home, channel_id, category_id, url, uri } = Astro.props;
 const { all_langs, siteinfo } = Astro.locals;
 
 const friendlinksLang = await render_value(all_langs, "friendlinks");
 
-const obj = await get_friendlinks();
+const obj = await get_friendlinks({});
 const friendlinks = _.get(obj, [0], []);
 const channeluriarr = _.get(obj, [1], []);
 const categoryuriarr = _.get(obj, [2], []);

package/src/components/subcomponents/index_children_categories_list.astro

@@ -1,5 +1,5 @@
 ---
-import { get_children_categories, render_url, render_value } from "../../scripts/util";
+import { get_children_categories, render_url, render_value } from "../../scripts/util.js";
 interface Props{
     all_categories: any[];
     channel_id: any;

package/src/components/subcomponents/news_card.astro

@@ -1,5 +1,5 @@
 ---
-import { render_url, render_date } from "../../scripts/util";
+import { render_url, render_date } from "../../scripts/util.js";
 import { Icon } from "astro-icon/components";
 import DefaultImage from "./default_image.astro";
 import RenderImage from "./image.astro";

package/src/components/subcomponents/news_category_list.astro

@@ -1,6 +1,6 @@
 ---
 import _ from "lodash";
-import { render_url } from "../../scripts/util";
+import { render_url } from "../../scripts/util.js";
 import NodesList from "./nodes_list.astro";
 import NewsCard from "./news_card.astro";
 

package/src/components/subcomponents/nodes_list.astro

@@ -1,5 +1,5 @@
 ---
-import { get_nodes } from "../../scripts/cms";
+import { get_nodes } from "../../scripts/cms.js";
 import Pagination from "./pagination.astro";
 const { channel_id, category_id, uri, page, limit, limit_type, include_children_category_nodes, no_fields, no_images_html, field_array } = Astro.props;
 // console.log(channel_id);

package/src/components/subcomponents/pagination.astro

@@ -1,5 +1,5 @@
 ---
-import { render_url } from "../../scripts/util";
+import { render_url } from "../../scripts/util.js";
 const { uri, total, per_page, current_page, total_pages } = Astro.props;
 
 // const {siteinfo} = Astro.locals;
@@ -7,194 +7,177 @@ const { uri, total, per_page, current_page, total_pages } = Astro.props;
 let centerSize = 5;
 let centerPage = current_page;
 if (current_page > total_pages - 3) {
-    centerPage = total_pages - 3;
+  centerPage = total_pages - 3;
 }
 if (current_page < 4) {
-    centerPage = 4;
+  centerPage = 4;
 }
 let centerArr = [];
 if (total_pages <= centerSize + 2) {
-    // 总页码较小时，全部显示出来
+  // 总页码较小时，全部显示出来
 
-    for (let i = 2; i < total_pages; i++) {
-        centerArr.push(i);
-    }
+  for (let i = 2; i < total_pages; i++) {
+    centerArr.push(i);
+  }
 } else {
-    // 总页码较大时，只显示中间centerSize个页码
+  // 总页码较大时，只显示中间centerSize个页码
 
-    for (let i = centerPage - 2; i <= centerPage + 2; i++) {
-        // console.log(i);
-        centerArr.push(i);
-    }
+  for (let i = centerPage - 2; i <= centerPage + 2; i++) {
+    // console.log(i);
+    centerArr.push(i);
+  }
 }
 // console.log(uri);
 
 let more_right =
-    total_pages > centerSize + 2 &&
-    current_page <= total_pages - centerSize + 1;
+  total_pages > centerSize + 2 && current_page <= total_pages - centerSize + 1;
 
 let nav_wrapper_class = "isolate inline-flex -space-x-px rounded-md shadow-sm";
 
 let btn_class =
-    "relative inline-flex items-center px-4 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0".split(' ');
+  "relative inline-flex items-center px-4 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0".split(
+    " "
+  );
 let btn_active_class =
-    `relative z-10 inline-flex items-center bg-[--themeColor] px-4 py-2 text-sm font-semibold text-white focus:z-20 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[--themeColor]`.split(' ');
+  `relative z-10 inline-flex items-center bg-[--themeColor] px-4 py-2 text-sm font-semibold text-white focus:z-20 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[--themeColor]`.split(
+    " "
+  );
 
 let simple_btn =
-    "relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50".split(' ');
+  "relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50".split(
+    " "
+  );
 let simple_btn_disable =
-    "relative inline-flex items-center rounded-md border border-gray-100 bg-white px-4 py-2 text-sm text-gray-500 hover:bg-gray-50".split(' ');
+  "relative inline-flex items-center rounded-md border border-gray-100 bg-white px-4 py-2 text-sm text-gray-500 hover:bg-gray-50".split(
+    " "
+  );
 ---
 
 {
-    total > 0 && (
-        <div class="flex items-center justify-between border-t border-gray-200  py-3 my-7">
-            <div class="flex flex-1 items-center justify-between sm:hidden">
-                {current_page == 1 ? (
-                    <span class:list={simple_btn_disable}>Previous</span>
-                ) : (
-                    <a
-                        href={render_url(
-                            `${uri}${
-                                current_page - 1 == 1
-                                    ? ""
-                                    : `/P${current_page - 1}`
-                            }`,
-                        )}
-                        class:list={simple_btn}
-                    >
-                        Previous
-                    </a>
-                )}
+  total > 0 && (
+    <div class="flex items-center justify-between border-t border-gray-200  py-3 my-7">
+      <div class="flex flex-1 items-center justify-between sm:hidden">
+        {current_page == 1 ? (
+          <span class:list={simple_btn_disable}>Previous</span>
+        ) : (
+          <a
+            href={render_url(
+              `${uri}${current_page - 1 == 1 ? "" : `/P${current_page - 1}`}`
+            )}
+            class:list={simple_btn}
+          >
+            Previous
+          </a>
+        )}
 
-                <span>
-                    {current_page} / {total_pages}
-                </span>
-                {current_page == total_pages ? (
-                    <span class:list={simple_btn_disable}>Next</span>
-                ) : (
-                    <a
-                        href={render_url(`${uri}/P${current_page + 1}`)}
-                        class:list={simple_btn}
-                    >
-                        Next
-                    </a>
-                )}
-            </div>
-            <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-                <div>
-                    <p class="text-sm text-gray-700">
-                        Total <span class="font-medium">{total}</span>
-                        results, {per_page} records per page
-                    </p>
-                </div>
-                <div>
-                    {total_pages > 1 ? (
-                        <nav class={nav_wrapper_class} aria-label="Pagination">
-                            {total_pages > 7 && current_page >= 5 ? (
-                                <a
-                                    href={render_url(
-                                        `${uri}/P${current_page - 1}`,
-                                    )}
-                                    class:list={btn_class}
-                                >
-                                    <span class="sr-only">Previous</span>
-                                    <svg
-                                        class="h-5 w-5"
-                                        viewBox="0 0 20 20"
-                                        fill="currentColor"
-                                        aria-hidden="true"
-                                    >
-                                        <path
-                                            fill-rule="evenodd"
-                                            d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z"
-                                            clip-rule="evenodd"
-                                        />
-                                    </svg>
-                                </a>
-                            ) : (
-                                ""
-                            )}
+        <span>
+          {current_page} / {total_pages}
+        </span>
+        {current_page == total_pages ? (
+          <span class:list={simple_btn_disable}>Next</span>
+        ) : (
+          <a
+            href={render_url(`${uri}/P${current_page + 1}`)}
+            class:list={simple_btn}
+          >
+            Next
+          </a>
+        )}
+      </div>
+      <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
+        <div>
+          <p class="text-sm text-gray-700">
+            Total <span class="font-medium">{total}</span>
+            results, {per_page} records per page
+          </p>
+        </div>
+        <div>
+          {total_pages > 1 ? (
+            <nav class={nav_wrapper_class} aria-label="Pagination">
+              {total_pages > 7 && current_page >= 5 ? (
+                <a
+                  href={render_url(`${uri}/P${current_page - 1}`)}
+                  class:list={btn_class}
+                >
+                  <span class="sr-only">Previous</span>
+                  <svg
+                    class="h-5 w-5"
+                    viewBox="0 0 20 20"
+                    fill="currentColor"
+                    aria-hidden="true"
+                  >
+                    <path
+                      fill-rule="evenodd"
+                      d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z"
+                      clip-rule="evenodd"
+                    />
+                  </svg>
+                </a>
+              ) : (
+                ""
+              )}
 
-                            <a
-                                href={render_url(uri)}
-                                aria-current="page"
-                                class:list={
-                                    current_page == 1
-                                        ? btn_active_class
-                                        : btn_class
-                                }
-                            >
-                                1
-                            </a>
-                            {total_pages > centerSize + 2 &&
-                            current_page >= centerSize ? (
-                                <span class:list={btn_class}>...</span>
-                            ) : (
-                                ""
-                            )}
+              <a
+                href={render_url(uri)}
+                aria-current="page"
+                class:list={current_page == 1 ? btn_active_class : btn_class}
+              >
+                1
+              </a>
+              {total_pages > centerSize + 2 && current_page >= centerSize ? (
+                <span class:list={btn_class}>...</span>
+              ) : (
+                ""
+              )}
 
-                            {centerArr.map((i) => (
-                                <a
-                                    href={render_url(`${uri}/P${i}`)}
-                                    class:list={
-                                        i == current_page
-                                            ? btn_active_class
-                                            : btn_class
-                                    }
-                                >
-                                    {i}
-                                </a>
-                            ))}
+              {centerArr.map((i) => (
+                <a
+                  href={render_url(`${uri}/P${i}`)}
+                  class:list={i == current_page ? btn_active_class : btn_class}
+                >
+                  {i}
+                </a>
+              ))}
 
-                            {more_right ? (
-                                <span class:list={btn_class}>...</span>
-                            ) : (
-                                ""
-                            )}
+              {more_right ? <span class:list={btn_class}>...</span> : ""}
 
-                            {total_pages > 1 ? (
-                                <a
-                                    href={render_url(`${uri}/P${total_pages}`)}
-                                    class:list={
-                                        current_page == total_pages
-                                            ? btn_active_class
-                                            : btn_class
-                                    }
-                                >
-                                    {total_pages}
-                                </a>
-                            ) : null}
+              {total_pages > 1 ? (
+                <a
+                  href={render_url(`${uri}/P${total_pages}`)}
+                  class:list={
+                    current_page == total_pages ? btn_active_class : btn_class
+                  }
+                >
+                  {total_pages}
+                </a>
+              ) : null}
 
-                            {total_pages > 7 &&
-                            current_page < total_pages - 4 ? (
-                                <a
-                                    href={render_url(
-                                        `${uri}/P${current_page + 1}`,
-                                    )}
-                                    class:list={btn_class}
-                                >
-                                    <span class="sr-only">Next</span>
-                                    <svg
-                                        class="h-5 w-5"
-                                        viewBox="0 0 20 20"
-                                        fill="currentColor"
-                                        aria-hidden="true"
-                                    >
-                                        <path
-                                            fill-rule="evenodd"
-                                            d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z"
-                                            clip-rule="evenodd"
-                                        />
-                                    </svg>
-                                </a>
-                            ) : (
-                                ""
-                            )}
-                        </nav>
-                    ) : null}
-                </div>
-            </div>
+              {total_pages > 7 && current_page < total_pages - 4 ? (
+                <a
+                  href={render_url(`${uri}/P${current_page + 1}`)}
+                  class:list={btn_class}
+                >
+                  <span class="sr-only">Next</span>
+                  <svg
+                    class="h-5 w-5"
+                    viewBox="0 0 20 20"
+                    fill="currentColor"
+                    aria-hidden="true"
+                  >
+                    <path
+                      fill-rule="evenodd"
+                      d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z"
+                      clip-rule="evenodd"
+                    />
+                  </svg>
+                </a>
+              ) : (
+                ""
+              )}
+            </nav>
+          ) : null}
         </div>
-    )
+      </div>
+    </div>
+  )
 }

package/src/components/subcomponents/prevnext.astro

@@ -1,6 +1,6 @@
 ---
-import { get_prevnext_node } from "../../scripts/cms";
-import { render_url, render_value } from "../../scripts/util";
+import { get_prevnext_node } from "../../scripts/cms.js";
+import { render_url, render_value } from "../../scripts/util.js";
 const { nodeinfo, node_id, channel_id, category_id } = Astro.props;
 const { all_langs } = Astro.locals;
 
@@ -10,133 +10,132 @@ const nextLang = await render_value(all_langs, "next");
 let prevnode = null;
 let nextnode = null;
 let prevnodeurl = "";
-let nextnodeurl = '';
+let nextnodeurl = "";
 
-if(render_value(nodeinfo, 'prevnode')){
-    prevnodeurl = render_value(nodeinfo, ['prevnode', 'node_url']);
-    prevnode = nodeinfo.prevnode;
-}else{
-    const prevnode1 = await get_prevnext_node({
-        node_id:node_id,
-        direction:"prev",
-        channel_id,
-        category_id,
-        no_fields: 1
-    });
+if (render_value(nodeinfo, "prevnode")) {
+  prevnodeurl = render_value(nodeinfo, ["prevnode", "node_url"]);
+  prevnode = nodeinfo.prevnode;
+} else {
+  const prevnode1 = await get_prevnext_node({
+    node_id: node_id,
+    direction: "prev",
+    channel_id,
+    category_id,
+    no_fields: 1,
+  });
 
-    if (prevnode1) {
-        prevnodeurl = prevnode1.node_url;
-    }
+  if (prevnode1) {
+    prevnodeurl = prevnode1.node_url;
+  }
 }
 
-if(render_value(nodeinfo, 'nextnode')){
-    nextnodeurl = render_value(nodeinfo, ['nextnode', 'node_url']);
-    nextnode = nodeinfo.nextnode;
-}else{
-    const nextnode1 = await get_prevnext_node({
-        node_id,
-        direction:"next",
-        channel_id,
-        category_id,
-        no_fields:1
-    });
-    if (nextnode1) {
-        nextnodeurl = nextnode1.node_url;
-    }
+if (render_value(nodeinfo, "nextnode")) {
+  nextnodeurl = render_value(nodeinfo, ["nextnode", "node_url"]);
+  nextnode = nodeinfo.nextnode;
+} else {
+  const nextnode1 = await get_prevnext_node({
+    node_id,
+    direction: "next",
+    channel_id,
+    category_id,
+    no_fields: 1,
+  });
+  if (nextnode1) {
+    nextnodeurl = nextnode1.node_url;
+  }
 }
 
-
 let backtolisturl = "";
 if (Number(nodeinfo.category_id)) {
-    // 类别列表
-    backtolisturl = nodeinfo.category_url;
+  // 类别列表
+  backtolisturl = nodeinfo.category_url;
 } else {
-    // 栏目列表
-    backtolisturl = nodeinfo.channel_url;
+  // 栏目列表
+  backtolisturl = nodeinfo.channel_url;
 }
 // console.log(nodeinfo);
 ---
 
 <hr class="my-7" />
 <div
-    class="my-7 mx-auto px-4 sm:px-6 lg:px-8 grid items-center grid-cols-[1fr,auto,1fr] gap-6"
+  class="my-7 mx-auto px-4 sm:px-6 lg:px-8 grid items-center grid-cols-[1fr,auto,1fr] gap-6"
 >
-    <div class="text-center">
-        <p class="leading-6 font-semibold text-sky-500">
-            <a href={render_url(backtolisturl)} title="Back to List"
-                >{nodeinfo.channel_name}</a
-            >
-        </p>
-        <div
-            class="mt-1 text-xl leading-8 tracking-tight font-semibold text-slate-900 dark:text-white"
-        >
-            {nodeinfo.category_name}
-        </div>
-    </div>
-    <div class="order-first flex">
-        {
-            prevnode ? (
-                <a
-                    aria-label={`${previousLang}: ${prevnode.node_title}`}
-                    class="relative"
-                    href={render_url(prevnodeurl)}
-                    title={prevnode.node_title}
-                >
-                    <div class="hidden md:block text-[0.8125rem] leading-6 text-slate-500">
-                        <span aria-hidden="true">←</span>
-                        {previousLang}
-                    </div>
-                    <div class="hidden md:block mt-2 text-sm leading-6 font-semibold text-slate-900 dark:text-white">
-                        {prevnode.node_title}
-                    </div>
-                    <div class="absolute -inset-1 md:hidden" />
-                    <svg
-                        class="md:hidden w-6 h-6 stroke-slate-900 dark:stroke-white"
-                        fill="none"
-                        aria-hidden="true"
-                    >
-                        <path
-                            d="M13.25 8.75 9.75 12l3.5 3.25"
-                            stroke-width="1.5"
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
-                        />
-                    </svg>
-                </a>
-            ) : null
-        }
-    </div>
-    <div class="flex text-right justify-end">
-        {
-            nextnode ? (
-                <a
-                    aria-label={`${nextLang}: ${nextnode.node_title}`}
-                    class="relative"
-                    href={render_url(nextnodeurl)}
-                    title={nextnode.node_title}
-                >
-                    <div class="hidden md:block text-[0.8125rem] leading-6 text-slate-500">
-                        {nextLang}
-                        <span aria-hidden="true"> →</span>
-                    </div>
-                    <div class="hidden md:block mt-2 text-sm leading-6 font-semibold text-slate-900 dark:text-white">
-                        {nextnode.node_title}
-                    </div>
-                    <div class="absolute -inset-1 md:hidden" />
-                    <svg
-                        class="md:hidden w-6 h-6 stroke-slate-900 dark:stroke-white"
-                        fill="none"
-                        aria-hidden="true"
-                    >
-                        <path
-                            d="m10.75 8.75 3.5 3.25-3.5 3.25"
-                            stroke-width="1.5"
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
-                        />
-                    </svg>
-                </a>
-            ) : null
-        }
+  <div class="text-center">
+    <p class="leading-6 font-semibold text-sky-500">
+      <a href={render_url(backtolisturl)} title="Back to List"
+        >{nodeinfo.channel_name}</a
+      >
+    </p>
+    <div
+      class="mt-1 text-xl leading-8 tracking-tight font-semibold text-slate-900 dark:text-white"
+    >
+      {nodeinfo.category_name}
     </div>
+  </div>
+  <div class="order-first flex">
+    {
+      prevnode ? (
+        <a
+          aria-label={`${previousLang}: ${prevnode.node_title}`}
+          class="relative"
+          href={render_url(prevnodeurl)}
+          title={prevnode.node_title}
+        >
+          <div class="hidden md:block text-[0.8125rem] leading-6 text-slate-500">
+            <span aria-hidden="true">←</span>
+            {previousLang}
+          </div>
+          <div class="hidden md:block mt-2 text-sm leading-6 font-semibold text-slate-900 dark:text-white">
+            {prevnode.node_title}
+          </div>
+          <div class="absolute -inset-1 md:hidden" />
+          <svg
+            class="md:hidden w-6 h-6 stroke-slate-900 dark:stroke-white"
+            fill="none"
+            aria-hidden="true"
+          >
+            <path
+              d="M13.25 8.75 9.75 12l3.5 3.25"
+              stroke-width="1.5"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+            />
+          </svg>
+        </a>
+      ) : null
+    }
+  </div>
+  <div class="flex text-right justify-end">
+    {
+      nextnode ? (
+        <a
+          aria-label={`${nextLang}: ${nextnode.node_title}`}
+          class="relative"
+          href={render_url(nextnodeurl)}
+          title={nextnode.node_title}
+        >
+          <div class="hidden md:block text-[0.8125rem] leading-6 text-slate-500">
+            {nextLang}
+            <span aria-hidden="true"> →</span>
+          </div>
+          <div class="hidden md:block mt-2 text-sm leading-6 font-semibold text-slate-900 dark:text-white">
+            {nextnode.node_title}
+          </div>
+          <div class="absolute -inset-1 md:hidden" />
+          <svg
+            class="md:hidden w-6 h-6 stroke-slate-900 dark:stroke-white"
+            fill="none"
+            aria-hidden="true"
+          >
+            <path
+              d="m10.75 8.75 3.5 3.25-3.5 3.25"
+              stroke-width="1.5"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+            />
+          </svg>
+        </a>
+      ) : null
+    }
+  </div>
 </div>

package/src/components/subcomponents/product_card.astro

@@ -1,5 +1,5 @@
 ---
-import { render_url, render_value } from "../../scripts/util";
+import { render_url, render_value } from "../../scripts/util.js";
 
 import DefaultImage from "./default_image.astro";
 import RenderImage from "./image.astro";

package/src/components/subcomponents/product_category_list.astro

@@ -1,6 +1,6 @@
 ---
 import _ from "lodash";
-import { render_url, get_children_categories } from "../../scripts/util";
+import { render_url, get_children_categories } from "../../scripts/util.js";
 import ProductCard from "./product_card.astro";
 import NodesList from "./nodes_list.astro";
 import ChildrenCategoriesList from "./children_categories_list.astro";

package/src/components/subcomponents/rel_nodes_list.astro

@@ -1,5 +1,5 @@
 ---
-import { get_rel_nodes } from "../../scripts/cms";
+import { get_rel_nodes } from "../../scripts/cms.js";
 import Pagination from "./pagination.astro";
 const { field_id, rel_id, uri, page, limit, no_fields } = Astro.props;
 // console.log(channel_id);

package/src/components/subcomponents/remote_image.astro

@@ -1,5 +1,5 @@
 ---
-import { get_theme_render_image } from "../../scripts/cms";
+import { get_theme_render_image } from "../../scripts/cms.js";
 const { remote_url, alt, class_str } = Astro.props;
 
 const html = await get_theme_render_image({

package/src/components/subcomponents/share_button.astro

@@ -1,5 +1,5 @@
 ---
-import { render_value } from "../../scripts/util";
+import { render_value } from "../../scripts/util.js";
 const { canonical, seo_title, seo_description } = Astro.props;
 
 const { all_langs } = Astro.locals;

package/src/components/subcomponents/sidebar.astro

@@ -1,5 +1,5 @@
 ---
-import { render_url } from "../../scripts/util";
+import { render_url } from "../../scripts/util.js";
 import DropdownMenu from "./smartmenus/dropdown_menu.astro";
 
 const menus: any[] = [
@@ -149,7 +149,7 @@ const menus: any[] = [
   </div>
 </nav>
 <script>
-  import { smartmenusSidebarInit } from "../../scripts/smartmenus";
+  import { smartmenusSidebarInit } from "../../scripts/smartmenus.js";
 
   smartmenusSidebarInit();
 

package/src/components/subcomponents/site_options.astro

@@ -1,7 +1,7 @@
 ---
 import _ from "lodash";
-import { get_site_options } from "../../scripts/cms";
-import { render_value } from "../../scripts/util";
+import { get_site_options } from "../../scripts/cms.js";
+import { render_value } from "../../scripts/util.js";
 const { option_name } = Astro.props;
 
 let option_value = "";

package/src/components/subcomponents/smartmenus/dropdown_menu.astro

@@ -1,5 +1,5 @@
 ---
-import { render_url } from "../../../scripts/util";
+import { render_url } from "../../../scripts/util.js";
 const { menu, is_sub, menu_root_link_id } = Astro.props;
 
 let liClass = "sm-nav-item";

package/src/components/subcomponents/smartmenus.astro

@@ -5,9 +5,9 @@ import { Icon } from "astro-icon/components";
 import DropdownMenu from "./smartmenus/dropdown_menu.astro";
 import RemoteImage from "./remote_image.astro";
 import "smartmenus/dist/css/smartmenus.css";
-import { render_url, render_value } from "../../scripts/util";
+import { render_url, render_value } from "../../scripts/util.js";
 
-import { get_menu_tree } from "../../scripts/cms";
+import { get_menu_tree } from "../../scripts/cms.js";
 import SiteOptions from "./site_options.astro";
 
 import defaultImg from "../../assets/images/default.png";
@@ -247,7 +247,7 @@ const { siteinfo } = Astro.locals;
   }
 </style>
 <script>
-  import { smartmenusHeaderInit } from "../../scripts/smartmenus";
+  import { smartmenusHeaderInit } from "../../scripts/smartmenus.js";
   // import { isOpen } from "../store";
 
   smartmenusHeaderInit();

package/src/components/subcomponents/swiper.astro

@@ -1,6 +1,5 @@
 ---
 import CommonCard from "./common_card.astro";
-import { img_change_attrs, render_url } from "../../scripts/util";
 interface Props {
   swiperID: string;
   items: any[];
@@ -55,7 +54,7 @@ const {
   }
 </style>
 <script>
-  import { initSwiper } from "../../scripts/swiper";
+  import { initSwiper } from "../../scripts/swiper.js";
   class AstroSwiper extends HTMLElement {
     constructor() {
       super();

package/src/components/subcomponents/tags_category_list.astro

@@ -1,5 +1,5 @@
 ---
-import { render_url } from "../../scripts/util";
+import { render_url } from "../../scripts/util.js";
 import _ from "lodash";
 import NodesList from "./nodes_list.astro";
 

package/src/env.d.ts

@@ -0,0 +1,38 @@
+/// <reference types="astro/client" />
+
+declare module 'lodash';
+
+declare namespace App {
+    interface Locals {
+        cache(seconds: number): void,
+        base_url: string,
+        title: string,
+        all_categories: any,
+        all_langs: any,
+        site_options: {
+            copyright: string,
+            tel: string,
+            sitelogo: string,
+            logo_title: string,
+            sitename: string,
+            seo_title: string,
+            seo_keywords: string,
+            seo_description: string
+        },
+        siteinfo: any,
+        btn_class: string[]
+    }
+}
+
+interface ImportMetaEnv{
+    readonly JEAWIN_API_DOMAIN: string;
+    readonly JEAWIN_PREVIEW_DOMAIN: string;
+    readonly JEAWIN_FORM_API_DOMAIN: string;
+    readonly JEAWIN_API_PATH: string;
+    readonly JEAWIN_SITE_ID: number;
+    readonly PUBLIC_JEAWIN_API_DOMAIN: string;
+}
+
+interface ImportMeta{
+    readonly env: ImportMetaEnv;
+}

package/src/scripts/aos.d.ts

@@ -0,0 +1 @@
+export function aosInit(): void;

package/src/scripts/cms.d.ts

@@ -0,0 +1,113 @@
+export function consolelog(...items: any[]): void;
+export function delete_cache(): Promise<void>;
+/**
+ * 首页数据
+ */
+export function get_index(): Promise<any>;
+/**
+ * 分享按钮
+ */
+export function get_share_button(params: any): Promise<any>;
+/**
+ * 评论表单
+ */
+export function get_comment_form(params: any): Promise<any>;
+/**
+ * 统计代码
+ */
+export function get_stats(params: any): Promise<any>;
+/**
+ * 作者信息
+ */
+export function get_author_info(params: any): Promise<any>;
+/**
+ * 国家列表
+ */
+export function get_country(): Promise<any>;
+/**
+ * 获取glossary
+ */
+export function get_glossary(): Promise<any>;
+/**
+ * 获取表单
+ */
+export function get_form(params: any): Promise<any>;
+export function get_all_langs(): Promise<any>;
+/**
+ * 获取多语言
+ */
+export function get_lang(params: any): Promise<any>;
+/**
+ * 所有的uri
+ */
+export function get_all_uri(): Promise<any>;
+/**
+ * 全部site_option
+ */
+export function get_site_options(): Promise<{
+    data: any;
+    siteinfo: any;
+    base_url: any;
+}>;
+/**
+ * 单个site_option
+ */
+export function get_site_option(params: any): Promise<any>;
+/**
+ * 菜单
+ */
+export function get_menus(params: any): Promise<any>;
+/**
+ * 树形菜单
+ */
+export function get_menu_tree(params: any): Promise<any>;
+/**
+ * 区块列表
+ */
+export function get_blocks(): Promise<void>;
+/**
+ * 单个区块
+ */
+export function get_block(params: any): Promise<any>;
+/**
+ * 单个栏目
+ */
+export function get_channel(params: any): Promise<any>;
+/**
+ * 全部类别
+ */
+export function get_all_categories(params: any): Promise<any>;
+/**
+ * 类别
+ */
+export function get_categories(params: any): Promise<any>;
+/**
+ * 类别树形
+ */
+export function get_category_tree(params: any): Promise<any>;
+/**
+ * 单个类别
+ */
+export function get_category(params: any): Promise<any>;
+/**
+ * 内容列表
+ */
+export function get_nodes(params: any): Promise<any>;
+/**
+ * 相关内容列表
+ */
+export function get_rel_nodes(params: any): Promise<any>;
+/**
+ * 单个内容
+ */
+export function get_node(params: any): Promise<any>;
+export function get_prevnext_node(params: any): Promise<any>;
+export function get_channel_url(params: any): Promise<any>;
+export function get_category_url(params: any): Promise<any>;
+export function get_node_url(params: any): Promise<any>;
+export function get_friendlinks(params: any): Promise<any[]>;
+export function get_choose_language(params: any): Promise<any>;
+export function get_theme_render_image(params: any): Promise<any>;
+export function get_theme_image_url(params: any): Promise<any>;
+export function get_sitemap(): Promise<any>;
+export function get_filter_links(params: any): Promise<any>;

package/src/scripts/lightbox.d.ts

@@ -0,0 +1 @@
+export function initPhotoSwipeLightbox(gallery: any): void;

package/src/scripts/smartmenus.d.ts

@@ -0,0 +1,2 @@
+export function smartmenusHeaderInit(): void;
+export function smartmenusSidebarInit(): void;

package/src/scripts/swiper.d.ts

@@ -0,0 +1 @@
+export function initSwiper(selectors: any, params?: {}): void;

package/src/scripts/util.d.ts

@@ -0,0 +1,29 @@
+/**
+ * 判断是不是默认图片
+ */
+export function is_default_image(img_url: any): boolean;
+/**
+ * 输出发布时间
+ */
+export function render_date(t: any): any;
+/**
+ * 安全输出数据
+ */
+export function render_value(obj: any, prop: any, def?: string): any;
+/**
+ * 输出url
+ */
+export function render_url(url: any): string;
+/**
+ * 输出url
+ */
+export function get_url(page_type: any, id: any): Promise<string>;
+/**
+ * 图片添加链接
+ */
+export function img_add_link(img_html: any): any;
+/**
+ * 图片修改属性
+ */
+export function img_change_attrs(img_html: any, add_attrs: any, remove_attrs: any): any;
+export function get_children_categories(all_categories: any, channel_id: any, category_id: any): any;

package/src/service/jeawin.ts

@@ -1,6 +1,6 @@
 import type { LocalImageService, AstroConfig, ImageTransform, ImageOutputFormat } from "astro";
 import {baseService} from 'astro/assets';
-function isESMImportedImage(src) {
+function isESMImportedImage(src: any) {
     return typeof src === "object";
 }
 function parseQuality(quality: any) {
@@ -10,7 +10,7 @@ function parseQuality(quality: any) {
     }
     return result;
 }
-function getTargetDimensions(options) {
+function getTargetDimensions(options: any) {
     let targetWidth = options.width;
     let targetHeight = options.height;
     if (isESMImportedImage(options.src)) {

package/tsconfig.json

@@ -1,38 +1,29 @@
 {
     "extends": "astro/tsconfigs/strict",
     "compilerOptions": {
-        "target": "es5",
-        "lib": [
-            "dom",
-            "dom.iterable",
-            "esnext",
-        ],
-        "declaration": true,
-        "allowJs": true,
-        "skipLibCheck": true,
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "strict": true,
-        "forceConsistentCasingInFileNames": false,
-        "noFallthroughCasesInSwitch": true,
-        "module": "esnext",
-        "moduleResolution": "node",
-        "resolveJsonModule": true,
-        "isolatedModules": true,
-        "noEmit": true,
-        "jsx": "preserve",
-        "plugins": [
+        "plugins":[
             {
-                "name": "@astrojs/ts-plugin"
-            },
+                "name":"@astrojs/ts-plugin"
+            }
         ],
-    },
-    "include": [
-        "src"
-    ],
-    "exclude": [
-        "src/**/stories.*",
-        "src/**/.spec.*",
-        "src/**/.mdx"
-    ]
+        "module": "ESNext",
+        "moduleResolution": "node16",
+        "resolveJsonModule": true,
+        "esModuleInterop": true,
+        "baseUrl": ".",
+        "paths": {
+            "@components/*": [
+                "src/components/*"
+            ],
+            "@assets/*": [
+                "src/assets/*"
+            ],
+            "@layouts/*": [
+                "src/layouts/*"
+            ],
+            "@scripts/*":[
+                "src/scripts/*"
+            ]
+        }
+    }
 }