From 80589ba76a7e9718ecec5bf5cf5a10b995ba0bdc Mon Sep 17 00:00:00 2001 From: AmorimDSJM Date: Thu, 14 Dec 2023 15:56:28 +0100 Subject: [PATCH] Fixing Listing requests : not fixed, Rendering Leaderboard : done --- css/style.css | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/m42.TTF | Bin 0 -> 16552 bytes index.html | 11 +++++++- js/main.js | 40 +++++++++++++++++++---------- 4 files changed, 105 insertions(+), 14 deletions(-) create mode 100644 css/style.css create mode 100644 fonts/m42.TTF diff --git a/css/style.css b/css/style.css new file mode 100644 index 0000000..8feb55a --- /dev/null +++ b/css/style.css @@ -0,0 +1,68 @@ +@font-face { + font-family: M42; + src: url(/fonts/m42.TTF); +} +*{ + font-family: M42; + font-size: 10px; +} +.head-board { + display: flex; + margin:auto; + justify-content: space-between; + flex-direction: row; + width: 50%; + border: 2px solid black; + border-bottom-color: white; + border-bottom-width: 1px; + border-bottom-left-radius: 0px; + border-bottom-right-radius: 0px; + border-top-left-radius: 10px; + border-top-right-radius: 10px; + background-color: black; + +} + +.leaderboard { + display: flex; + margin: auto; + align-items: center; + flex-direction: column; + width: 50%; + height: 50vh; + overflow-y: scroll; + border: 2px solid black; + border-bottom-left-radius: 10px; + border-bottom-right-radius: 10px; + border-top-left-radius: 0px; + border-top-right-radius: 0px; + background-color: black; + scrollbar-width: none; /* Firefox */ +} +article{ + width: 99.9%; + display: flex; + justify-content: space-between; + border-bottom: 1px solid rgb(255, 255, 255); +} +p{ + padding: 5px; + text-align: start; +} +.num{ + font-size: larger; + color: rgb(255, 255, 255); +} +.faction{ + color:rgb(0, 255, 115); +} +.headquarters{ + color:rgb(86, 187, 255); +} +.symbol{ + color:red; + text-decoration: underline; +} +.credits{ + color: rgb(250, 204, 88); +} \ No newline at end of file diff --git a/fonts/m42.TTF b/fonts/m42.TTF new file mode 100644 index 0000000000000000000000000000000000000000..36094772b1eb996ee3afa4e9e094846d01f7b1a7 GIT binary patch literal 16552 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 j!Sk4I=ULI+exsO9Z1s66X0M$ruSOv{s7|y|v + + + +
+

rank

+

name

+

credits

+

headquaters

+

faction

+
-
\ No newline at end of file diff --git a/js/main.js b/js/main.js index 4fec37c..5877c3d 100644 --- a/js/main.js +++ b/js/main.js @@ -40,7 +40,7 @@ function sortAgentByCredits(a1, a2) { } var meta = null -function listAgent(page, limit = 20){ +function listAgent(page, limit = 20, totalPg = 1){ const settings = { async: true, crossDomain: true, @@ -56,16 +56,26 @@ function listAgent(page, limit = 20){ success: function(response) { meta = response.meta agents = agents.concat(response.data); + console.log(agents) console.log("Actioni") - if (response.meta.page == page) drawAgents(); - else setTimeout(10000, listAgent(page, limit)); + console.log(meta) + + if (response.meta.page == totalPg) drawAgents(); + else { + page++ + sleep(10000, page); + } + }, + error: function(response) { + drawAgents(); } }; $.ajax(settings); } -function sleep(ms) { - return new Promise(resolve => setTimeout(resolve, ms)); +function sleep(ms, page) { + console.log(page, "Page Sleep :") + return new Promise(() => setTimeout(listAgent(page), ms)); } async function getAllAgents() { @@ -83,9 +93,8 @@ async function getAllAgents() { limit: limit }, success: function(response) { - meta = response.meta - const total = Math.ceil(meta.total / limit); - listAgent(1, limit) + const totalPg = Math.ceil(response.meta.total / limit); + listAgent(1, limit, totalPg) } }; $.ajax(settings); @@ -95,14 +104,19 @@ function drawAgents() { $(".leaderboard").html(""); agents.sort(sortAgentByCredits); agents.reverse(); + let i = 1; agents.forEach(agent => { $(".leaderboard").append(` -

${agent.credits}

-

${agent.symbol}

-

${agent.headquarters}

-

${agent.startingFaction}

-

${agent.shipCount}

+
+

${i}.

+

${agent.symbol} :

+

${agent.credits}

+

${agent.headquarters}

+

${agent.startingFaction}

+