serg2-mirrors/GDBrowser
1
0
Fork 0
Code Issues 8 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix outdated credits #253

Open
hiimjustin000 wants to merge 6 commits from hiimjustin000/patch-1 into master
pull from: hiimjustin000/patch-1
merge into: serg2-mirrors:master
Conversation 0 Commits 6 Files changed 3 +22 -7
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
html/analyze.html
View file

@ -149,6 +149,7 @@ let blockList = Object.keys(res.blocks)
let colorList = Object.keys(res.colors)
let portals = res.portals.split(", ").map(x => x.split(" "))
let coins = res.coins.split(", ").map(x => x.split(" "))
function commafy(num) { return (+num || 0).toString().replace(/(\d)(?=(\d\d\d)+$)/g, "$1,") }
@ -196,6 +197,14 @@ function appendTriggerGroups() {
})
}
coins.forEach(x => {
if (!x || x[0] == "") {
$('#coinText').remove()
$('#coins').remove()
}
else $('#coins').append(`<div class="inline coinDiv"><img height="40%" src='../assets/${res.coinsVerified ? "silvercoin" : "browncoin"}.png'><h3>${x[1]}</h3></div>`)
})
triggerList.forEach(x => {
if (x == "total") $('#triggerText').text(`Triggers (${commafy(res.triggers[x])})`)
else $('#triggers').append(`<div class="inline triggerDiv"><img height="50%" src='../assets/objects/triggers/${x}.png'><h3 style="padding-top: 7%">x${commafy(res.triggers[x])}</h3></div>`)

8
html/home.html
View file

@ -134,6 +134,12 @@ function loadCredits() {
})
}
let creditsButtonTitles = {
github: "GitHub",
twitch: "Twitch",
demonButton: "Pointercrate",
ulButton: "Updated Leaderboard"
}
Fetch(`./api/credits`).then(async res => {
@ -149,7 +155,7 @@ Fetch(`./api/credits`).then(async res => {
<a target=_blank href="${x.youtube[0]}" title="YouTube"><img src="../assets/${x.youtube[1]}.png" width="11%" class="gdButton"></a>
<a target=_blank href="${x.twitter[0]}" title="Twitter"><img src="../assets/${x.twitter[1]}.png" width="11%" class="sideSpace gdButton"></a>
<a target=_blank href="${x.github[0]}" title="GitHub"><img src="../assets/${x.github[1]}.png" width="11%" class="sideSpace gdButton"></a>
<a target=_blank href="${x.github[0]}" title="${creditsButtonTitles[x.github[1]]}"><img src="../assets/${x.github[1]}.png" width="11%" class="sideSpace gdButton"></a>
<br>
</div>
<img class="gdButton" src="../assets/arrow-right.png" style="position: absolute; top: 45%; left: 75%; width: 4.5%" tabindex="0" onclick="page += 1; loadCredits()">

12
misc/credits.json
View file

@ -27,7 +27,7 @@
{
"header": "Demon List",
"name": "stadust",
"name": "Patrick",
"ign": "stardust1971",
"youtube": ["https://youtube.com/user/stardust19710", "youtube"],
"twitter": ["https://twitter.com/stadust1971", "twitter"],
@ -38,8 +38,8 @@
"header": "API Help",
"name": "SMJS",
"ign": "SMJSGaming",
"youtube": ["https://youtube.com/channel/UCwEsWDs9kGN2vvoiNTJKdaQ", "youtube"],
"twitter": ["https://twitter.com/SMJS90708001", "twitter"],
"youtube": ["https://www.youtube.com/c/SMJSProductions", "youtube"],
"twitter": ["https://twitter.com/SMJSGaming", "twitter"],
"github": ["https://github.com/SMJSGaming", "github"]
},
@ -54,10 +54,10 @@
{
"header": "Level Analyzing Help",
"name": "Alten",
"name": "Naoei",
"youtube": ["https://youtube.com/channel/UC9M8hLqh2yZIPSDvpyL7o8g", "youtube"],
"twitter": ["https://twitter.com/altenhh", "twitter"],
"github": ["https://github.com/Altenhh", "github"]
"twitter": ["https://twitter.com/___Laica", "twitter"],
"github": ["https://github.com/naoei", "github"]
},
{