Merge pull request #81 from george-chou/main

add 2 contributors
duiqt · Jul 2, 2023 · 7d33399 · 7d33399
2 parents b508872 + 2a84dfe
commit 7d33399
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/static/credits/credits.rawiconurl.json b/static/credits/credits.rawiconurl.json
@@ -148,6 +148,27 @@
                 "github": "KawaiiShadowii"
             },
             "icon": "https://avatars.githubusercontent.com/u/33539431?v=4"
+        },
+        {
+            "username": "blacktunes",
+            "thing": "code-contributor",
+            "socialmedia": {
+                "github": "blacktunes",
+                "bilibili": {
+                    "uid": 1384118,
+                    "username": "单推黑猫白雪的咸鱼"
+                }
+            },
+            "icon": "https://avatars.githubusercontent.com/u/38934611?v=4"
+        },
+        {
+            "username": "Whitetiger0423",
+            "thing": "localization:Korean",
+            "socialmedia": {
+                "twitter": "__white_t__",
+                "github": "Whitetiger0423"
+            },
+            "icon": "https://avatars.githubusercontent.com/u/72282371?v=4"
         }
     ]
 }
diff --git a/static/credits/list.json b/static/credits/list.json
@@ -148,6 +148,27 @@
         "github": "KawaiiShadowii"
       },
       "icon": "images/b8f98a1e38b58b7d0e772b29969ce41dba8a2817.jpg"
+    },
+    {
+      "username": "blacktunes",
+      "thing": "code-contributor",
+      "socialmedia": {
+        "github": "blacktunes",
+        "bilibili": {
+          "uid": 1384118,
+          "username": "单推黑猫白雪的咸鱼"
+        }
+      },
+      "icon": "https://avatars.githubusercontent.com/u/38934611?v=4"
+    },
+    {
+      "username": "Whitetiger0423",
+      "thing": "localization:Korean",
+      "socialmedia": {
+        "twitter": "__white_t__",
+        "github": "Whitetiger0423"
+      },
+      "icon": "https://avatars.githubusercontent.com/u/72282371?v=4"
     }
   ]
 }
diff --git a/static/js/script.js b/static/js/script.js
@@ -441,7 +441,10 @@ const progress = [0, 1];
 
     // This func adds avatars for credits and with href for those having social link
     function addAvatar(socialLink, currentIcon) {
-        let avatar = `<img src="static/credits/${currentIcon}"/>`;
+        if (!currentIcon.includes('https://')) {
+            currentIcon = 'static/credits/' + currentIcon;
+        }
+        let avatar = `<img src="${currentIcon}"/>`;
         if (socialLink == '') return avatar;
         return `<a href="${socialLink}" target="_blank">${avatar}</a>`;
     }
@@ -471,13 +474,13 @@ const progress = [0, 1];
                             socialMediaIcons += `</a>`;
                             break;
 
-                        case "github":
-                            socialLink = "https://github.com/" + value;
-                            break;
-
                         case "twitter":
                             socialLink = "https://twitter.com/" + value;
                             break;
+
+                        case "github":
+                            socialLink = "https://github.com/" + value;
+                            break;
                     }
                 });
                 creditsHtmlContent += `<div class="mdui-collapse">