jeawin-astro 5.0.21 → 5.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jeawin-astro",
3
- "version": "5.0.21",
3
+ "version": "5.0.23",
4
4
  "author": "chaegumi <chaegumi@qq.com>",
5
5
  "description": "Astro components for Jeawin CMS",
6
6
  "license": "MIT",
@@ -30,8 +30,8 @@ const channeluriarr = _.get(obj, [1], []);
30
30
  const categoryuriarr = _.get(obj, [2], []);
31
31
  let friendlinksHtml = "";
32
32
 
33
- const preview_url =
34
- jeawin_preview_domain + render_value(siteinfo, "site_uri") + "/";
33
+ // const preview_url =
34
+ // jeawin_preview_domain + render_value(siteinfo, "site_uri") + "/";
35
35
 
36
36
  const current_channel_id = channel_id || 0;
37
37
  const current_category_id = category_id || 0;
@@ -46,8 +46,21 @@ for (const link of friendlinks) {
46
46
 
47
47
  if (render_value(link, "link_limit")) {
48
48
  const link_limit1 = render_value(link, "link_limit").split("\n");
49
+ const preview_domains = [
50
+ "http://127.0.0.1:4321",
51
+ "https://admin.jeawin.com",
52
+ "http://admin.jeawin.local",
53
+ "https://generatehtml.jeawin.com",
54
+ "http://generatehtml.jeawin.local",
55
+ "https://preview.jeawin.com",
56
+ "http://preview.jeawin.local"
57
+ ];
49
58
  for (let limit1 of link_limit1) {
50
- uri_array.push(limit1.replace(preview_url, "").replace(".html", ""));
59
+ for(let domain of preview_domains){
60
+ limit1 = limit1.replace(domain+"/"+render_value(siteinfo, 'site_uri')+"/", "")
61
+ }
62
+ limit1 = limit1.replace(".html", "")
63
+ uri_array.push(limit1);
51
64
  }
52
65
  }
53
66
 
@@ -293,11 +293,11 @@ if (page_type == "category") {
293
293
  />
294
294
  </slot>
295
295
 
296
- <slot name="inner-header" />
297
-
298
296
  <main>
297
+ <slot name="inner-header" />
299
298
  <slot />
300
- </main>
299
+ <slot name="inner-footer" />
300
+ </main>
301
301
 
302
302
  <slot name="page-footer">
303
303
  <Footer
@@ -91,6 +91,11 @@ if (Astro.slots.has("inner-header")) {
91
91
  ]);
92
92
  }
93
93
 
94
+ let innerFooterHtml = "";
95
+ if (Astro.slots.has("inner-footer")) {
96
+ innerFooterHtml = await Astro.slots.render("inner-footer", [categoryinfo]);
97
+ }
98
+
94
99
  let pageFooterHtml = '';
95
100
  if(Astro.slots.has('page-footer')){
96
101
  pageFooterHtml = await Astro.slots.render("page-footer", [
@@ -176,6 +181,13 @@ if(Astro.slots.has('page-footer')){
176
181
  </div>
177
182
  ) : null
178
183
  }
184
+
185
+ {
186
+ Astro.slots.has("inner-footer") ? (
187
+ <Fragment set:html={innerFooterHtml} />
188
+ ) : null
189
+ }
190
+
179
191
  {
180
192
  Astro.slots.has("page-footer") ? (
181
193
  <slot name="page-footer" slot="page-footer" />
@@ -86,6 +86,11 @@ if (Astro.slots.has("inner-header")) {
86
86
  ]);
87
87
  }
88
88
 
89
+ let innerFooterHtml = "";
90
+ if (Astro.slots.has("inner-footer")) {
91
+ innerFooterHtml = await Astro.slots.render("inner-footer", [channelinfo]);
92
+ }
93
+
89
94
  let pageFooterHtml = '';
90
95
  if(Astro.slots.has('page-footer')){
91
96
  pageFooterHtml = await Astro.slots.render("page-footer", [
@@ -172,6 +177,12 @@ if(Astro.slots.has('page-footer')){
172
177
  ) : null
173
178
  }
174
179
 
180
+ {
181
+ Astro.slots.has("inner-footer") ? (
182
+ <Fragment set:html={innerFooterHtml} />
183
+ ) : null
184
+ }
185
+
175
186
  {
176
187
  Astro.slots.has("page-footer") ? (
177
188
  <slot name="page-footer" slot="page-footer" />