diff --git a/.gitignore b/.gitignore index 63f5575..d0bb205 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ # Ew extra package-lock.json -icons/cache misc/secretStuff.json # Logs diff --git a/assets/compact-off.png b/assets/compact-off.png new file mode 100644 index 0000000..2d620c7 Binary files /dev/null and b/assets/compact-off.png differ diff --git a/assets/compact-on.png b/assets/compact-on.png new file mode 100644 index 0000000..2d0e4c5 Binary files /dev/null and b/assets/compact-on.png differ diff --git a/assets/css/level.css b/assets/css/browser.css similarity index 96% rename from assets/css/level.css rename to assets/css/browser.css index 6b442fe..d95d708 100644 --- a/assets/css/level.css +++ b/assets/css/browser.css @@ -529,6 +529,10 @@ input::-webkit-inner-spin-button { border-bottom: 0.18vh rgba(0, 0, 0, 0.4) solid; } +.compactBG { + height: 14vh; +} + .commentBG:nth-child(odd) { background-color: rgb(185, 108, 57); } @@ -537,7 +541,7 @@ input::-webkit-inner-spin-button { margin: 1.5vh auto 0 auto; width: 96%; height: 18.5vh; - background-color: #934E27; + background-color: rgba(147, 79, 39, 0.8); border-radius: 1.5vh; text-align: left; padding-top: 1.5vh; @@ -546,6 +550,13 @@ input::-webkit-inner-spin-button { user-select: none; } +.compact { + background-color: transparent; + padding-left: 0vh; + margin-top: 0.5vh; + transform: scale(0.8) translate(-13%, -12.5%) +} + .comment h2, .smallGold { width: fit-content; vertical-align: top; @@ -574,6 +585,10 @@ input::-webkit-inner-spin-button { color: rgba(0, 0, 0, 0.5) } +.compactDate { + transform: translate(-3vh, -11.5vh); +} + .commentPercent { vertical-align: top; margin: 0 0 0 1vh; @@ -816,16 +831,16 @@ input::-webkit-inner-spin-button { } } @keyframes bounceButton { - 0% { - transform: scale(1); - } - 50% { - transform: scale(1.2); - } - 75% { - transform: scale(1.15); - } - 100% { - transform: scale(1.2); - } + 0% { + transform: scale(1); + } + 50% { + transform: scale(1.2); + } + 75% { + transform: scale(1.15); + } + 100% { + transform: scale(1.2); + } } \ No newline at end of file diff --git a/html/analyze.html b/html/analyze.html index 8bb75f8..66c7189 100644 --- a/html/analyze.html +++ b/html/analyze.html @@ -5,7 +5,7 @@ - + diff --git a/html/comments.html b/html/comments.html index 413f41e..f6c3f4e 100644 --- a/html/comments.html +++ b/html/comments.html @@ -1,7 +1,7 @@ Comments - + @@ -29,14 +29,18 @@ -
+
-
+
+
+ +
+ @@ -71,6 +75,8 @@ let lvlID = window.location.pathname.split('/')[2] let history = false; +let compact = false; + let target = `../api/level/${lvlID}` if (lvlID > 99999999 || lvlID < -99999999) window.location.href = window.location.href.replace("comments", "search") @@ -103,17 +109,19 @@ fetch(target).then(res => res.json()).then(lvl => { } } -function appendComments() { +function appendComments(dontClear, bump) { + +let p = compact ? ((page + 1) * 2) - 2 + (bump||0) : page if (loadingComments) return; else loadingComments = true; -$('#commentBox').html(`
`) +if (!dontClear) $('#commentBox').html(`
`) if (page == 0) $('#pageDown').hide() else $('#pageDown').show() -fetch(`../api${!history ? window.location.pathname : "/comments/" + lvl.playerID}?page=${page}${history ? "&type=commentHistory" : ""}${mode == "top" ? "&top" : ""}`).then(res => res.json()).then(res => { +fetch(`../api${!history ? window.location.pathname : "/comments/" + lvl.playerID}?page=${p}${history ? "&type=commentHistory" : ""}${mode == "top" ? "&top" : ""}`).then(res => res.json()).then(res => { if (res.length < 9 || (history && lvl.commentHistory == "off")) $('#pageUp').hide() else $('#pageUp').show() @@ -123,6 +131,10 @@ fetch(`../api${!history ? window.location.pathname : "/comments/" + lvl.playerID } res.forEach(x => { + + if (!compact) { + ////// NORMAL MODE ////// + $('#commentBox').append(`
@@ -141,7 +153,31 @@ fetch(`../api${!history ? window.location.pathname : "/comments/" + lvl.playerID

${x.likes}

-
`) +
`) } + + else { + ////// COMPACT MODE ////// + + $('#commentBox').append(` +
+
+ +

${!history ? x.username : lvl.username}

 + ${x.modColor || lvl.moderator == "2" ? `` : ""} +

${x.percent ? x.percent + "%" : ""}

+ +
+

${x.content}

+
+
+

${x.date}

+
+ ${history ? `

(${x.levelID})

` : ""} + +

${x.likes}

+
+
`) } + }) $('.commentText').each(function() { @@ -149,10 +185,18 @@ fetch(`../api${!history ? window.location.pathname : "/comments/" + lvl.playerID let overflow = ($(this).text().length - 100) * 0.01 $(this).css('font-size', (3.5 - (overflow)) + 'vh') } -}); -$('#loading').hide() -}) -loadingComments = false; + + }); + + if (compact && p % 2 == 0) { + return appendComments(true, 1) + } + + $('#loading').hide() + }) + + return loadingComments = false; + } let mode = "time" @@ -181,6 +225,13 @@ $('#timeSort').click(function() { appendComments() }) +$('#compactMode').click(function() { + compact = !compact + page = 0; + $('#compactMode').attr('src', `../assets/compact-${compact ? "on" : "off"}.png`) + appendComments() +}) + $('#refresh').click(function() { page = 0; appendComments() diff --git a/html/filters.html b/html/filters.html index 9c6ef79..fd57005 100644 --- a/html/filters.html +++ b/html/filters.html @@ -1,7 +1,7 @@ Level Search - + diff --git a/html/gauntlets.html b/html/gauntlets.html index b01467b..347b844 100644 --- a/html/gauntlets.html +++ b/html/gauntlets.html @@ -1,7 +1,7 @@ Gauntlets - + diff --git a/html/home.html b/html/home.html index 4a27a73..febc89c 100644 --- a/html/home.html +++ b/html/home.html @@ -1,7 +1,7 @@ Geometry Dash Browser! - + diff --git a/html/leaderboard.html b/html/leaderboard.html index abea4d6..6af3666 100644 --- a/html/leaderboard.html +++ b/html/leaderboard.html @@ -1,7 +1,7 @@ Leaderboard - + diff --git a/html/level.html b/html/level.html index 926d6a2..ecd1eaf 100644 --- a/html/level.html +++ b/html/level.html @@ -1,7 +1,7 @@ [[NAME]] ([[ID]]) - + diff --git a/html/mappacks.html b/html/mappacks.html index 1aeb66d..824428f 100644 --- a/html/mappacks.html +++ b/html/mappacks.html @@ -1,7 +1,7 @@ Map Packs - + diff --git a/html/profile.html b/html/profile.html index 6e5dc40..e635206 100644 --- a/html/profile.html +++ b/html/profile.html @@ -1,7 +1,7 @@ [[USERNAME]]'s Profile - + diff --git a/html/search.html b/html/search.html index d98ff9d..2a78e9c 100644 --- a/html/search.html +++ b/html/search.html @@ -1,7 +1,7 @@ Level Search - +