From 759e63b6433defa32fe65b42ed55d5f50ee84490 Mon Sep 17 00:00:00 2001 From: kifuan Date: Sun, 14 May 2023 12:31:02 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E9=9A=8F?= =?UTF-8?q?=E6=9C=BA=E5=8F=8B=E9=93=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/flink.pug | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index 549b67a..0978312 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -2,6 +2,7 @@ .flink - let pageContent = page.content if page.flink_url + - let pageRandom = page.random script. (()=>{ const replaceSymbol = (str) => { @@ -19,6 +20,9 @@ let listResult = "" const lists = str[i].link_list + if (!{pageRandom}) { + lists.sort(() => Math.random() - 0.5) + } for(let j = 0; j < lists.length; j++){ listResult += `
@@ -48,8 +52,8 @@ - let classDesc = i.class_desc ? `
${i.class_desc}
` : "" - let listResult = "" - - each j in i.link_list + - let list = page.random ? i.link_list.slice().sort(() => Math.random() - 0.5) : i.link_list + each j in list - listResult += `
From 3e1fdf52d430e6f5ac84d9f072834dc7905ce7aa Mon Sep 17 00:00:00 2001 From: kifuan Date: Sun, 14 May 2023 12:36:49 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/flink.pug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index 0978312..6638bff 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -2,7 +2,6 @@ .flink - let pageContent = page.content if page.flink_url - - let pageRandom = page.random script. (()=>{ const replaceSymbol = (str) => { @@ -20,7 +19,7 @@ let listResult = "" const lists = str[i].link_list - if (!{pageRandom}) { + if (!{page.random}) { lists.sort(() => Math.random() - 0.5) } for(let j = 0; j < lists.length; j++){ From 7bef2fa7cd0124e5cf9cbf6ea366d6bc719819c4 Mon Sep 17 00:00:00 2001 From: kifuan Date: Sun, 14 May 2023 17:28:37 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E9=9D=99=E6=80=81=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E6=97=B6=E9=A1=BA=E5=BA=8F=E4=B9=9F=E8=A6=81=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/flink.pug | 101 +++++++++++++-------------------- 1 file changed, 39 insertions(+), 62 deletions(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index 6638bff..c9cbdfa 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -1,73 +1,50 @@ #article-container .flink - - let pageContent = page.content - if page.flink_url - script. - (()=>{ - const replaceSymbol = (str) => { - return str.replace(/[\p{P}\p{S}]/gu, "-") - } - - let result = "" - fetch("!{url_for(page.flink_url)}") - .then(response => response.json()) - .then(str => { - for(let i = 0; i < str.length; i++){ - const replaceClassName = replaceSymbol(str[i].class_name) - const className = str[i].class_name ? `

${str[i].class_name}

` : "" - const classDesc = str[i].class_desc ? `
${str[i].class_desc}
` : "" - - let listResult = "" - const lists = str[i].link_list - if (!{page.random}) { - lists.sort(() => Math.random() - 0.5) - } - for(let j = 0; j < lists.length; j++){ - listResult += ` -
- -
- ${lists[j].name} -
-
${lists[j].name}
-
${lists[j].descr}
- -
` - } - - result += `${className}${classDesc}
${listResult}
` - } - - document.querySelector(".flink").insertAdjacentHTML("afterbegin", result) - window.lazyLoadInstance && window.lazyLoadInstance.update() - }) - })() - - else - if site.data.link - - let result = "" - each i in site.data.link - - let className = i.class_name ? markdown(`## ${i.class_name}`) : "" - - let classDesc = i.class_desc ? `
${i.class_desc}
` : "" - - - let listResult = "" - - let list = page.random ? i.link_list.slice().sort(() => Math.random() - 0.5) : i.link_list - each j in list - - + script. + (()=>{ + const replaceSymbol = (str) => { + return str.replace(/[\p{P}\p{S}]/gu, "-") + } + + let result = "" + function add(str) { + for(let i = 0; i < str.length; i++){ + const replaceClassName = replaceSymbol(str[i].class_name) + const className = str[i].class_name ? `

${str[i].class_name}

` : "" + const classDesc = str[i].class_desc ? `
${str[i].class_desc}
` : "" + + let listResult = "" + const lists = str[i].link_list + if (!{page.random}) { + lists.sort(() => Math.random() - 0.5) + } + for(let j = 0; j < lists.length; j++){ listResult += `
- +
- ${j.name} + ${lists[j].name}
-
${j.name}
-
${j.descr}
+
${lists[j].name}
+
${lists[j].descr}
` - - + } - - result += `${className}${classDesc}
${listResult}
` + result += `${className}${classDesc}
${listResult}
` + } - - pageContent = result + pageContent - != pageContent + document.querySelector(".flink").insertAdjacentHTML("afterbegin", result) + window.lazyLoadInstance && window.lazyLoadInstance.update() + } + const linkData = !{JSON.stringify(site.data.link)} + if ("!{page.flink_url}") { + fetch("!{url_for(page.flink_url)}") + .then(response => response.json()) + .then(add) + } else if (linkData) { + add(linkData) + } + })() + != page.content From 16ae63d0c49966d18d15a794f29b925321f81d34 Mon Sep 17 00:00:00 2001 From: kifuan Date: Sun, 14 May 2023 17:37:01 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E7=BC=BA=E7=9C=81=20`random`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/flink.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index c9cbdfa..ee4e1a2 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -15,7 +15,7 @@ let listResult = "" const lists = str[i].link_list - if (!{page.random}) { + if (!{page.random === true}) { lists.sort(() => Math.random() - 0.5) } for(let j = 0; j < lists.length; j++){ From ed5ba1d5a91290d26aae672848c74f51078083f7 Mon Sep 17 00:00:00 2001 From: kifuan Date: Sun, 14 May 2023 17:56:24 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E9=9D=9E=20`random`=20=E6=97=B6?= =?UTF-8?q?=E9=9D=99=E6=80=81=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/flink.pug | 107 +++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 39 deletions(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index ee4e1a2..e34f158 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -1,50 +1,79 @@ #article-container .flink - script. - (()=>{ - const replaceSymbol = (str) => { - return str.replace(/[\p{P}\p{S}]/gu, "-") - } - - let result = "" - function add(str) { - for(let i = 0; i < str.length; i++){ - const replaceClassName = replaceSymbol(str[i].class_name) - const className = str[i].class_name ? `

${str[i].class_name}

` : "" - const classDesc = str[i].class_desc ? `
${str[i].class_desc}
` : "" - - let listResult = "" - const lists = str[i].link_list - if (!{page.random === true}) { - lists.sort(() => Math.random() - 0.5) + - let pageContent = page.content + if page.flink_url || page.random + script. + (()=>{ + const replaceSymbol = (str) => { + return str.replace(/[\p{P}\p{S}]/gu, "-") + } + + let result = "" + const add = (str) => { + for(let i = 0; i < str.length; i++){ + const replaceClassName = replaceSymbol(str[i].class_name) + const className = str[i].class_name ? `

${str[i].class_name}

` : "" + const classDesc = str[i].class_desc ? `
${str[i].class_desc}
` : "" + + let listResult = "" + const lists = str[i].link_list + if (!{page.random === true}) { + lists.sort(() => Math.random() - 0.5) + } + for(let j = 0; j < lists.length; j++){ + listResult += ` +
+ +
+ ${lists[j].name} +
+
${lists[j].name}
+
${lists[j].descr}
+ +
` + } + + result += `${className}${classDesc}
${listResult}
` } - for(let j = 0; j < lists.length; j++){ + + document.querySelector(".flink").insertAdjacentHTML("afterbegin", result) + window.lazyLoadInstance && window.lazyLoadInstance.update() + } + + const linkData = !{JSON.stringify(site.data.link)} + if ("!{page.flink_url}") { + fetch("!{url_for(page.flink_url)}") + .then(response => response.json()) + .then(add) + } else if (linkData) { + add(linkData) + } + })() + + else + if site.data.link + - let result = "" + each i in site.data.link + - let className = i.class_name ? markdown(`## ${i.class_name}`) : "" + - let classDesc = i.class_desc ? `
${i.class_desc}
` : "" + + - let listResult = "" + + each j in i.link_list + - listResult += `
- +
- ${lists[j].name} + ${j.name}
-
${lists[j].name}
-
${lists[j].descr}
+
${j.name}
+
${j.descr}
` - } + - - result += `${className}${classDesc}
${listResult}
` - } + - result += `${className}${classDesc}
${listResult}
` - document.querySelector(".flink").insertAdjacentHTML("afterbegin", result) - window.lazyLoadInstance && window.lazyLoadInstance.update() - } - - const linkData = !{JSON.stringify(site.data.link)} - if ("!{page.flink_url}") { - fetch("!{url_for(page.flink_url)}") - .then(response => response.json()) - .then(add) - } else if (linkData) { - add(linkData) - } - })() - != page.content + - pageContent = result + pageContent + != pageContent From 90a923eb4bd8bdd9bdce5b7084fbcce5c9a3c616 Mon Sep 17 00:00:00 2001 From: kifuan Date: Sun, 14 May 2023 17:57:18 +0800 Subject: [PATCH 6/9] =?UTF-8?q?chore:=20=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/flink.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index e34f158..5ad70f3 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -4,7 +4,7 @@ if page.flink_url || page.random script. (()=>{ - const replaceSymbol = (str) => { + const replaceSymbol = (str) => { return str.replace(/[\p{P}\p{S}]/gu, "-") } From f12ae8fbb3817c7ee430d85f5c60d470fcff4c68 Mon Sep 17 00:00:00 2001 From: kifuan Date: Sun, 14 May 2023 22:00:09 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E5=BD=93=20`site.data.link`=20?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/flink.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index 5ad70f3..8da174e 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -40,7 +40,7 @@ window.lazyLoadInstance && window.lazyLoadInstance.update() } - const linkData = !{JSON.stringify(site.data.link)} + const linkData = !{JSON.stringify(site.data.link || {})} if ("!{page.flink_url}") { fetch("!{url_for(page.flink_url)}") .then(response => response.json()) From 0066457cf0fb16c786715c20c4eff2a23de639d9 Mon Sep 17 00:00:00 2001 From: kifuan Date: Mon, 15 May 2023 00:38:30 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=20`null`=20?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E7=A9=BA=E5=AF=B9=E8=B1=A1=E6=9D=A5?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/flink.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index 8da174e..fe0cb61 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -40,7 +40,7 @@ window.lazyLoadInstance && window.lazyLoadInstance.update() } - const linkData = !{JSON.stringify(site.data.link || {})} + const linkData = !{JSON.stringify(site.data.link || null)} if ("!{page.flink_url}") { fetch("!{url_for(page.flink_url)}") .then(response => response.json()) From 5944ffd8112ae897901bfa944da4bd60a481bbd6 Mon Sep 17 00:00:00 2001 From: Jerry Wong Date: Mon, 22 May 2023 19:10:39 +0800 Subject: [PATCH 9/9] Update flink.pug --- layout/includes/page/flink.pug | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug index fe0cb61..10d3893 100644 --- a/layout/includes/page/flink.pug +++ b/layout/includes/page/flink.pug @@ -1,7 +1,10 @@ #article-container .flink - - let pageContent = page.content - if page.flink_url || page.random + - let { content, random, flink_url } = page + - let pageContent = content + + if flink_url || random + - const linkData = flink_url ? false : site.data.link || false script. (()=>{ const replaceSymbol = (str) => { @@ -17,7 +20,7 @@ let listResult = "" const lists = str[i].link_list - if (!{page.random === true}) { + if (!{random === true}) { lists.sort(() => Math.random() - 0.5) } for(let j = 0; j < lists.length; j++){ @@ -40,9 +43,9 @@ window.lazyLoadInstance && window.lazyLoadInstance.update() } - const linkData = !{JSON.stringify(site.data.link || null)} - if ("!{page.flink_url}") { - fetch("!{url_for(page.flink_url)}") + const linkData = !{JSON.stringify(linkData)} + if (!{Boolean(flink_url)}) { + fetch("!{url_for(flink_url)}") .then(response => response.json()) .then(add) } else if (linkData) {