From 97bb8313d0af8ee53066f163711b0686a0138b4d Mon Sep 17 00:00:00 2001 From: Jerry Date: Sun, 13 Sep 2020 16:58:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9C=80=E6=96=B0=E8=A9=95?= =?UTF-8?q?=E8=AB=96=20leancloud=E5=91=BC=E5=8F=AB=E7=94=B1js=20sdk=20?= =?UTF-8?q?=E6=94=B9=E7=82=BA=20rest=20api=20=E5=91=BC=E5=8F=AB=E3=80=82?= =?UTF-8?q?=E6=87=89=E7=94=A8=E5=8F=AF=E4=BB=A5=E4=B8=8D=E8=88=87valine?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=80=8B=20feat:=20=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E8=A9=95=E8=AB=96=E5=A2=9E=E5=8A=A0=E9=8C=AF=E8=AA=A4=E8=BC=B8?= =?UTF-8?q?=E5=87=BA=20style:=20=E5=88=AA=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E8=AA=9E=E8=A8=80=E6=AA=94=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/default.yml | 3 +- languages/en.yml | 3 +- languages/zh-CN.yml | 3 +- languages/zh-TW.yml | 3 +- .../newest-comments/disqus-comment.pug | 7 ++- .../newest-comments/github-issues.pug | 7 ++- .../third-party/newest-comments/leancloud.pug | 61 ++++++++++--------- .../includes/widget/card_newest_comment.pug | 2 +- package.json | 2 +- source/css/_tags/note.styl | 2 +- 10 files changed, 48 insertions(+), 45 deletions(-) diff --git a/languages/default.yml b/languages/default.yml index 198b40a..b8ba13a 100644 --- a/languages/default.yml +++ b/languages/default.yml @@ -77,8 +77,7 @@ aside: card_newest_comments: heading: Newest Comments loading_text: loading... - zero_day: Today - day: days ago + error: Unable to get the data, please make sure the settings are correct. date_suffix: just: Just diff --git a/languages/en.yml b/languages/en.yml index 198b40a..b8ba13a 100644 --- a/languages/en.yml +++ b/languages/en.yml @@ -77,8 +77,7 @@ aside: card_newest_comments: heading: Newest Comments loading_text: loading... - zero_day: Today - day: days ago + error: Unable to get the data, please make sure the settings are correct. date_suffix: just: Just diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index 7211bba..9ea8cd1 100644 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -79,8 +79,7 @@ aside: card_newest_comments: heading: 最新评论 loading_text: 正在加载中... - zero_day: 今天 - day: 天前 + error: 无法获取资料，请确认相关配置是否正确 date_suffix: just: 刚刚 diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index 95b80e1..b7b0124 100644 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -79,8 +79,7 @@ aside: card_newest_comments: heading: 最新評論 loading_text: 正在加載中... - zero_day: 今天 - day: 天前 + error: 無法獲取資料，請確認相關配置是否正確 date_suffix: just: 剛剛 diff --git a/layout/includes/third-party/newest-comments/disqus-comment.pug b/layout/includes/third-party/newest-comments/disqus-comment.pug index e1d192a..5ed18db 100644 --- a/layout/includes/third-party/newest-comments/disqus-comment.pug +++ b/layout/includes/third-party/newest-comments/disqus-comment.pug @@ -28,6 +28,9 @@ script. // set expiry to 10 min saveToLocal.set('disqus-newest-comments', JSON.stringify(disqusArray), 10/(60*24)) generateHtml(disqusArray) + }).fail(()=>{ + const $dom = document.querySelector('#card-newest-comments .aside-list') + $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}" }) } @@ -47,13 +50,13 @@ script. ` } - let $dom = document.querySelector('.card-newest-comments .aside-list') + let $dom = document.querySelector('#card-newest-comments .aside-list') $dom.innerHTML= result window.pjax && window.pjax.refresh($dom) } const newestCommentInit = () => { - if (document.querySelector('.card-newest-comments .aside-list')) { + if (document.querySelector('#card-newest-comments .aside-list')) { const data = saveToLocal.get('disqus-newest-comments') if (data) { generateHtml(JSON.parse(data)) diff --git a/layout/includes/third-party/newest-comments/github-issues.pug b/layout/includes/third-party/newest-comments/github-issues.pug index 84b13f2..e7e7bbc 100644 --- a/layout/includes/third-party/newest-comments/github-issues.pug +++ b/layout/includes/third-party/newest-comments/github-issues.pug @@ -27,6 +27,9 @@ script. }) saveToLocal.set('github-newest-comments', JSON.stringify(githubArray), 10/(60*24)) generateHtml(githubArray) + }).fail(()=>{ + const $dom = document.querySelector('#card-newest-comments .aside-list') + $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}" }) } @@ -46,13 +49,13 @@ script. ` } - let $dom = document.querySelector('.card-newest-comments .aside-list') + let $dom = document.querySelector('#card-newest-comments .aside-list') $dom.innerHTML= result window.pjax && window.pjax.refresh($dom) } const newestCommentInit = () => { - if (document.querySelector('.card-newest-comments .aside-list')) { + if (document.querySelector('#card-newest-comments .aside-list')) { const data = saveToLocal.get('github-newest-comments') if (data) { generateHtml(JSON.parse(data)) diff --git a/layout/includes/third-party/newest-comments/leancloud.pug b/layout/includes/third-party/newest-comments/leancloud.pug index 968ac1e..2e6910a 100644 --- a/layout/includes/third-party/newest-comments/leancloud.pug +++ b/layout/includes/third-party/newest-comments/leancloud.pug @@ -37,58 +37,59 @@ script. ` } - let $dom = document.querySelector('.card-newest-comments .aside-list') + let $dom = document.querySelector('#card-newest-comments .aside-list') $dom.innerHTML= result window.pjax && window.pjax.refresh($dom) } const getValineData = () => { - - if (!(AV.applicationId && (AV.applicationKey || AV.masterKey))) { - const dataInit = { - appId: '!{theme.newest_comments.leancloud.appId}', - appKey: '!{theme.newest_comments.leancloud.appKey}' + let serverURL = '' + if (!{Boolean(theme.newest_comments.leancloud.serverURL)}) { + serverURL = '!{theme.newest_comments.leancloud.serverURL}' + } else { + serverURL = 'https://!{theme.newest_comments.leancloud.appId.substring(0,8)}.api.lncldglobal.com' } - if (!{theme.newest_comments.leancloud.serverURL ? true : false}) { - dataInit.serverURL= '!{theme.newest_comments.leancloud.serverURL}' - } - - AV.init(dataInit) + var settings = { + "url": `${serverURL}/1.1/classes/Comment?limit=!{theme.newest_comments.limit}&order=-createdAt`, + "method": "GET", + "timeout": 0, + "headers": { + "X-LC-Id": '!{theme.newest_comments.leancloud.appId}', + "X-LC-Key": '!{theme.newest_comments.leancloud.appKey}', + "Content-Type": "application/json" + }, } - const query = new AV.Query('Comment'); - query.descending('createdAt').limit(!{theme.newest_comments.limit}) - - var valineArray = [] - query.find().then(comments => { - comments.forEach(comment => { + $.ajax(settings).done((response) => { + var valineArray = [] + response.results.forEach((e)=>{ valineArray.push({ - 'avatar': comment.get('QQAvatar'), - 'content': changeContent(comment.get('comment')), - 'mail': comment.get('mail'), - 'nick': comment.get('nick'), - 'url': comment.get('url'), - 'date': comment.createdAt, + 'avatar': e.QQAvatar, + 'content': changeContent(e.comment), + 'mail': e.mail, + 'nick': e.nick, + 'url': e.url, + 'date': e.createdAt, }) }) - }).then(function() { + saveToLocal.set('leancloud-newest-comments', JSON.stringify(valineArray), 10/(60*24)) generateHtml(valineArray) + + }).fail(()=>{ + const $dom = document.querySelector('#card-newest-comments .aside-list') + $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}" }) } const newestCommentInit = () => { - if (document.querySelector('.card-newest-comments .aside-list')) { + if (document.querySelector('#card-newest-comments .aside-list')) { const data = saveToLocal.get('leancloud-newest-comments') if (data) { generateHtml(JSON.parse(data)) } else { - if (typeof window.AV === 'object') { - getValineData() - } else { - $.getScript('https://cdn.jsdelivr.net/npm/leancloud-storage@4.6.1/dist/av-min.js', getValineData) - } + getValineData() } } } diff --git a/layout/includes/widget/card_newest_comment.pug b/layout/includes/widget/card_newest_comment.pug index 350d1c2..1338338 100644 --- a/layout/includes/widget/card_newest_comment.pug +++ b/layout/includes/widget/card_newest_comment.pug @@ -1,4 +1,4 @@ -.card-widget.card-newest-comments +.card-widget#card-newest-comments .card-content .item-headline i.fas.fa-bolt diff --git a/package.json b/package.json index d66d9a5..3cca2fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-butterfly", - "version": "3.2.0-b2", + "version": "3.2.0-b3", "description": "A Simple and Card UI Design theme for Hexo", "main": "package.json", "scripts": { diff --git a/source/css/_tags/note.styl b/source/css/_tags/note.styl index a9f46b1..cb5d899 100644 --- a/source/css/_tags/note.styl +++ b/source/css/_tags/note.styl @@ -26,7 +26,7 @@ color: lookup('$tagsP-' + $type + '-color') &:not(.simple) - background: lighten(lookup('$tagsP-' + $type + '-color'), 80%) !important + background: lighten(lookup('$tagsP-' + $type + '-color'), 85%) !important & > .note-icon color: lookup('$tagsP-' + $type + '-color')