From 6f61852561bb45893c80061c1dfcf593b80487e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Focus=20Chen=20=E6=83=B6=E5=BF=83?= Date: Thu, 15 Jun 2023 12:14:44 +0800 Subject: [PATCH] update repository url --- .github/workflows/main.yml | 2 +- README-CN.md | 18 +++++++++--------- README.md | 18 +++++++++--------- assets/bundles/function.main.js | 2 +- assets/js/function.js | 6 +++--- assets/styles/style.css | 4 ++-- merger.html | 4 ++-- package.json | 4 ++-- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 81a2599..7eeb142 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,5 +8,5 @@ jobs: env: SSH_PRIVATE_KEY: ${{ secrets.GITEE_PRIVATE_KEY }} with: - source-repo: "git@github.com:hifocus/merger.git" + source-repo: "git@github.com:qr-merger/merger.git" destination-repo: "git@e.coding.net:justhx/demo-qrcdn-com.git" diff --git a/README-CN.md b/README-CN.md index 6bbbf37..1fa6909 100644 --- a/README-CN.md +++ b/README-CN.md @@ -15,14 +15,14 @@

-Version -Contributors -Stargazers -License -jsDelivr +Version +Contributors +Stargazers +License +jsDelivr

-在[这里](https://github.com/hifocus/merger/issues/4)提交你的 merger 站点以供[展示](https://merger.qrcdn.com/#/?id=%e5%85%b6%e4%bb%96%e6%bc%94%e7%a4%ba%e7%ab%99%e7%82%b9) +在[这里](https://github.com/qr-merger/merger/issues/4)提交你的 merger 站点以供[展示](https://merger.qrcdn.com/#/?id=%e5%85%b6%e4%bb%96%e6%bc%94%e7%a4%ba%e7%ab%99%e7%82%b9) ## 特性 @@ -42,10 +42,10 @@ - [部署](https://merger.qrcdn.com/docs/deploy) - [演示站点](https://demo.qrcdn.com) - [其他演示站点](https://merger.qrcdn.com/cn/docs/introduction#%E5%85%B6%E4%BB%96%E6%BC%94%E7%A4%BA%E7%AB%99%E7%82%B9) -- [提交问题](https://github.com/hifocus/merger/issues) -- [合并请求](https://github.com/hifocus/merger/pulls) +- [提交问题](https://github.com/qr-merger/merger/issues) +- [合并请求](https://github.com/qr-merger/merger/pulls) - [感谢](https://merger.qrcdn.com/cn/docs/introduction#%E6%84%9F%E8%B0%A2) ## 开源许可证 -[GNU General Public License v3.0](https://github.com/hifocus/merger/blob/master/LICENSE) +[GNU General Public License v3.0](https://github.com/qr-merger/merger/blob/master/LICENSE) diff --git a/README.md b/README.md index fc43a7e..2631ddc 100644 --- a/README.md +++ b/README.md @@ -15,14 +15,14 @@ Language: English / Chinese 中文

-Version -Contributors -Stargazers -License -jsDelivr +Version +Contributors +Stargazers +License +jsDelivr

-Submit your merger site [here](https://github.com/hifocus/merger/issues/4) for [presentation](https://merger.qrcdn.com/#/en-gb/?id=other-demo-sites) +Submit your merger site [here](https://github.com/qr-merger/merger/issues/4) for [presentation](https://merger.qrcdn.com/#/en-gb/?id=other-demo-sites) This project is sponsored by @@ -44,10 +44,10 @@ This project is sponsored by body { font-family: -apple-system,BlinkMacSystemFont,Open Sans,Roboto,Oxygen,Cantarell,Fira Sans,Liberation Sans,Droid Sans,PingFang SC,HarmonyOS Sans SC,MiSans,Hiragino Sans GB,WenQuanYi Micro Hei,Noto Sans CJK SC,Noto Sans SC,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;}"),"payment"===usage)var method="付款";if("donate"===usage)method="捐赠";document.title="向"+finalname+method+aftertitle;var trans_wx="微信";finaltitle="向"+finalname+method,finalsub="从下方选择"+method+"方式",presshold="长按识别二维码",payto=" 向"+finalname+method,notavail="🚫 目前没有可用的"+method+"方式",wechatscan=(trans_wx="微信")+(scan="扫一扫"),tenpayscan=(trans_tp="QQ手机版")+scan,alipayscan=(trans_ali="支付宝")+scan}else if(/zh-TW|zh-HK|zh-tw|zh-hk|zh-Hant|zh-hant|tw|hk/i.test(userLang)){if(document.write(""),"payment"===usage)method="付款";if("donate"===usage)method="捐贈";document.title="向"+finalname+method+aftertitle;finaltitle="向"+finalname+method,finalsub="從下方選擇"+method+"方式",notavail="🚫 目前沒有可用的"+method+"方式",wechatscan=(trans_wx="WeChat ")+(scan="掃一掃"),tenpayscan=(trans_tp="QQ手機版")+scan,alipayscan=(trans_ali="支付寶")+scan,presshold="長按識別二維碼",payto=" 向"+finalname+method}else{if("payment"===usage){method="Pay";var method_t="Payment"}if("donate"===usage)method="Donate",method_t="Donation";var method_lc=method.charAt(0).toLowerCase();document.title=method+" to"+finalname_eng+aftertitle,document.write("");trans_wx="WeChat";var trans_ali="AliPay",trans_tp="QQ Mobile",scanhint=(finaltitle=method+" to"+finalname_eng,finalsub="Select a "+method_t.replace(method_t.charAt(0),method_t.charAt(0).toLowerCase())+" method from below","Scan the QR Code to "+method+finalname_eng),scan=(presshold=method.replace(method.charAt(5),"")+method.charAt(5).replace("e","")+"ing to"+finalname_eng+":
Press and hold to recognise the QR Code","Scan the QR Code with ");payto="",notavail="🚫 Currently no "+method_t.replace(method_t.charAt(0),method_t.charAt(0).toLowerCase())+" method available",wechatscan=scan+trans_wx,tenpayscan=scan+trans_tp,alipayscan=scan+trans_ali}var error_num=0;if("undefined"==typeof tenpay||null===tenpay||""===tenpay){document.getElementById("depends").removeChild(document.getElementById("tenpaybtn")),error_num+=1;var notenpay=!0}if("undefined"==typeof wechat||null===wechat||""===wechat){document.getElementById("depends").removeChild(document.getElementById("toclick")),error_num+=1;var nowechat=!0}if("undefined"==typeof alipay||null===alipay||""===alipay){document.getElementById("depends").removeChild(document.getElementById("alipaybtn")),error_num+=1;var noalipay=!0}if("undefined"==typeof paypal||null===paypal||""===paypal)document.getElementById("depends").removeChild(document.getElementById("paypalbtn")),error_num+=1;else function openbox(){function e(e,n,t){var a=null!=window.screenLeft?window.screenLeft:window.screenX,o=null!=window.screenTop?window.screenTop:window.screenY,i=window.innerWidth?window.innerWidth:document.documentElement.clientWidth?document.documentElement.clientWidth:screen.width,l=window.innerHeight?window.innerHeight:document.documentElement.clientHeight?document.documentElement.clientHeight:screen.height,d=i/window.screen.availWidth,c=(i-n)/2/d+a,s=(l-t)/2/d+o,r=window.open(e,"_blank","width="+n/d+", height="+t/d+", top="+s+", left="+c);window.focus&&r.focus()}selected="yes",window.innerHeight.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}")}catch(n){console&&console.log(n)}}!function(n){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(n,0);else{var t=function(){document.removeEventListener("DOMContentLoaded",t,!1),n()};document.addEventListener("DOMContentLoaded",t,!1)}else document.attachEvent&&(o=n,i=e.document,l=!1,(d=function(){try{i.documentElement.doScroll("left")}catch(e){return void setTimeout(d,50)}a()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,a())});function a(){l||(l=!0,o())}var o,i,l,d}((function(){var e,n;(e=document.createElement("div")).innerHTML=t,t=null,(n=e.getElementsByTagName("svg")[0])&&(n.setAttribute("aria-hidden","true"),n.style.position="absolute",n.style.width=0,n.style.height=0,n.style.overflow="hidden",function(e,n){n.firstChild?function(e,n){n.parentNode.insertBefore(e,n)}(e,n.firstChild):n.appendChild(e)}(n,document.body))}))}(window); \ No newline at end of file +var client,selected,scale=window.devicePixelRatio;$("#favicon").attr("href",profile_url);var userLang=navigator.language||navigator.userLanguage;if(!1!==multilingual)if(/zh-CN|zh-cn|zh-Hans|zh-hans|cn/i.test(userLang)){if("string"==typeof myname_hans)var myname=myname_hans}else if(/zh-TW|zh-HK|zh-tw|zh-hk|zh-Hant|zh-hant|tw|hk/i.test(userLang)){if("string"==typeof myname_hant)myname=myname_hant}else if("string"==typeof myname_eng)myname=myname_eng;var firstchar=myname.charAt(0),lastchar=myname.charAt(myname.length-1),english=/^[A-Za-z0-9]*$/;if(english.test(firstchar)||english.test(lastchar))var finalname=" "+myname+" ",finalsub=subtitle.replace(myname,finalname),spacing=!0;else finalname=myname;var finalname_eng=" "+myname;if(null==usage||""===usage||"payment"!==usage&&"donate"!==usage){var usage="payment";console.log("%c The usage variable is not defined correctly","color: red")}if("undefined"==typeof branding||null===branding||""===branding||!0!==branding&&"true"!==branding)var aftertitle="";else if(!0===branding||"true"===branding)aftertitle=" | Merger";if(!1===multilingual)var finaltitle=title,wechatscan="微信扫一扫 向"+finalname+"支付",tenpayscan="手机QQ扫一扫 向"+finalname+"支付",alipayscan="支付宝扫一扫 向"+finalname+"支付",payto="",presshold="长按识别二维码 向"+finalname+"支付",notavail="🚫 目前没有可用的支付方式",myname_hant=myname,myname_hans=myname,myname_eng=myname;else if(/zh-CN|zh-cn|zh-Hans|zh-hans|cn/i.test(userLang)){if(document.write(""),"payment"===usage)var method="付款";if("donate"===usage)method="捐赠";document.title="向"+finalname+method+aftertitle;var trans_wx="微信";finaltitle="向"+finalname+method,finalsub="从下方选择"+method+"方式",presshold="长按识别二维码",payto=" 向"+finalname+method,notavail="🚫 目前没有可用的"+method+"方式",wechatscan=(trans_wx="微信")+(scan="扫一扫"),tenpayscan=(trans_tp="QQ手机版")+scan,alipayscan=(trans_ali="支付宝")+scan}else if(/zh-TW|zh-HK|zh-tw|zh-hk|zh-Hant|zh-hant|tw|hk/i.test(userLang)){if(document.write(""),"payment"===usage)method="付款";if("donate"===usage)method="捐贈";document.title="向"+finalname+method+aftertitle;finaltitle="向"+finalname+method,finalsub="從下方選擇"+method+"方式",notavail="🚫 目前沒有可用的"+method+"方式",wechatscan=(trans_wx="WeChat ")+(scan="掃一掃"),tenpayscan=(trans_tp="QQ手機版")+scan,alipayscan=(trans_ali="支付寶")+scan,presshold="長按識別二維碼",payto=" 向"+finalname+method}else{if("payment"===usage){method="Pay";var method_t="Payment"}if("donate"===usage)method="Donate",method_t="Donation";var method_lc=method.charAt(0).toLowerCase();document.title=method+" to"+finalname_eng+aftertitle,document.write("");trans_wx="WeChat";var trans_ali="AliPay",trans_tp="QQ Mobile",scanhint=(finaltitle=method+" to"+finalname_eng,finalsub="Select a "+method_t.replace(method_t.charAt(0),method_t.charAt(0).toLowerCase())+" method from below","Scan the QR Code to "+method+finalname_eng),scan=(presshold=method.replace(method.charAt(5),"")+method.charAt(5).replace("e","")+"ing to"+finalname_eng+":
Press and hold to recognise the QR Code","Scan the QR Code with ");payto="",notavail="🚫 Currently no "+method_t.replace(method_t.charAt(0),method_t.charAt(0).toLowerCase())+" method available",wechatscan=scan+trans_wx,tenpayscan=scan+trans_tp,alipayscan=scan+trans_ali}var error_num=0;if("undefined"==typeof tenpay||null===tenpay||""===tenpay){document.getElementById("depends").removeChild(document.getElementById("tenpaybtn")),error_num+=1;var notenpay=!0}if("undefined"==typeof wechat||null===wechat||""===wechat){document.getElementById("depends").removeChild(document.getElementById("toclick")),error_num+=1;var nowechat=!0}if("undefined"==typeof alipay||null===alipay||""===alipay){document.getElementById("depends").removeChild(document.getElementById("alipaybtn")),error_num+=1;var noalipay=!0}if("undefined"==typeof paypal||null===paypal||""===paypal)document.getElementById("depends").removeChild(document.getElementById("paypalbtn")),error_num+=1;else function openbox(){function e(e,n,t){var a=null!=window.screenLeft?window.screenLeft:window.screenX,o=null!=window.screenTop?window.screenTop:window.screenY,i=window.innerWidth?window.innerWidth:document.documentElement.clientWidth?document.documentElement.clientWidth:screen.width,l=window.innerHeight?window.innerHeight:document.documentElement.clientHeight?document.documentElement.clientHeight:screen.height,d=i/window.screen.availWidth,c=(i-n)/2/d+a,s=(l-t)/2/d+o,r=window.open(e,"_blank","width="+n/d+", height="+t/d+", top="+s+", left="+c);window.focus&&r.focus()}selected="yes",window.innerHeight.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}")}catch(n){console&&console.log(n)}}!function(n){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(n,0);else{var t=function(){document.removeEventListener("DOMContentLoaded",t,!1),n()};document.addEventListener("DOMContentLoaded",t,!1)}else document.attachEvent&&(o=n,i=e.document,l=!1,(d=function(){try{i.documentElement.doScroll("left")}catch(e){return void setTimeout(d,50)}a()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,a())});function a(){l||(l=!0,o())}var o,i,l,d}((function(){var e,n;(e=document.createElement("div")).innerHTML=t,t=null,(n=e.getElementsByTagName("svg")[0])&&(n.setAttribute("aria-hidden","true"),n.style.position="absolute",n.style.width=0,n.style.height=0,n.style.overflow="hidden",function(e,n){n.firstChild?function(e,n){n.parentNode.insertBefore(e,n)}(e,n.firstChild):n.appendChild(e)}(n,document.body))}))}(window); \ No newline at end of file diff --git a/assets/js/function.js b/assets/js/function.js index f84840f..063f737 100644 --- a/assets/js/function.js +++ b/assets/js/function.js @@ -1,8 +1,8 @@ // Merger - Merge Your Qrcode Together. Even Quicker. // User docs: https://merger.qrcdn.com -// Released under GNU General Public License v3.0. Open source at https://github.com/hifocus/merger. -// Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/hifocus/merger/graphs/contributors). +// Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger. +// Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/qr-merger/merger/graphs/contributors). // Copyright reservation is required. var client; @@ -283,7 +283,7 @@ document.getElementById("name").innerHTML = finaltitle; document.getElementById("description").innerHTML = finalsub; // Copyright console log copied from https://github.com/MoePlayer/APlayer/. Thank you. -console.log(`${'\n'} %c Merger 0.27.0 %c https://github.com/hifocus/merger ${'\n'}`, 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;'); +console.log(`${'\n'} %c Merger 0.27.0 %c https://github.com/qr-merger/merger ${'\n'}`, 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;'); function showqrcode() { if (location.href.substr(location.href.lastIndexOf('#') + 1) == "showqrcode" && selected == "yes") document.getElementById('showqrcode').style.display = "flex"; diff --git a/assets/styles/style.css b/assets/styles/style.css index 41e454b..4943d8d 100644 --- a/assets/styles/style.css +++ b/assets/styles/style.css @@ -1,8 +1,8 @@ /* Merger - Merge Your Qrcode Together. Even Quicker. User docs: https://merger.qrcdn.com -Released under GNU General Public License v3.0. Open source at https://github.com/hifocus/merger. -Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/hifocus/merger/graphs/contributors). +Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger. +Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/qr-merger/merger/graphs/contributors). Copyright reservation is required. */ diff --git a/merger.html b/merger.html index 5305677..8d1e81f 100644 --- a/merger.html +++ b/merger.html @@ -1,8 +1,8 @@ diff --git a/package.json b/package.json index 3b5345d..a1a52c2 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "git://github.com/hifocus/merger.git" + "url": "git://github.com/qr-merger/merger.git" }, "keywords": [ "qr", @@ -21,7 +21,7 @@ "author": "hifocus", "license": "GPL-3.0-or-later", "bugs": { - "url": "https://github.com/hifocus/merger/issues" + "url": "https://github.com/qr-merger/merger/issues" }, "homepage": "https://qrcdn.com", "dependencies": {