From 2d346ab9b66b0ea5793a8a050841c723ae79e2f0 Mon Sep 17 00:00:00 2001 From: kuroppoi <68156848+kuroppoi@users.noreply.github.com> Date: Thu, 29 Jun 2023 03:18:41 +0200 Subject: [PATCH] Add visual item list to dashboard --- src/main/resources/dashboard/items.html | 16 ++++++ src/main/resources/dashboard/profile.html | 2 +- src/main/resources/dashboard/scripts/list.js | 53 +++++++++++++++++++ .../resources/dashboard/scripts/species.js | 34 ------------ src/main/resources/dashboard/species.html | 10 ++-- .../styles/{species.css => list.css} | 5 +- 6 files changed, 77 insertions(+), 43 deletions(-) create mode 100644 src/main/resources/dashboard/items.html create mode 100644 src/main/resources/dashboard/scripts/list.js delete mode 100644 src/main/resources/dashboard/scripts/species.js rename src/main/resources/dashboard/styles/{species.css => list.css} (88%) diff --git a/src/main/resources/dashboard/items.html b/src/main/resources/dashboard/items.html new file mode 100644 index 0000000..53dbbb7 --- /dev/null +++ b/src/main/resources/dashboard/items.html @@ -0,0 +1,16 @@ + + + + + + +
+ + + + +
+
+ + + diff --git a/src/main/resources/dashboard/profile.html b/src/main/resources/dashboard/profile.html index 347aade..01ad7db 100644 --- a/src/main/resources/dashboard/profile.html +++ b/src/main/resources/dashboard/profile.html @@ -165,7 +165,7 @@
- + View list diff --git a/src/main/resources/dashboard/scripts/list.js b/src/main/resources/dashboard/scripts/list.js new file mode 100644 index 0000000..42c18ea --- /dev/null +++ b/src/main/resources/dashboard/scripts/list.js @@ -0,0 +1,53 @@ +const AVAILABLE_GENERATION_V_POKEMON = new Array( + 505, 507, 510, 511, 513, 515, 519, 523, 525, 527, 529, 531, 533, 535, 538, 539, 542, 545, 546, 548, + 550, 553, 556, 558, 559, 561, 564, 569, 572, 575, 578, 580, 583, 587, 588, 594, 596, 600, 605, 607, + 610, 613, 616, 618, 619, 621, 622, 624, 626, 628, 630, 631, 632); + +function fillTable(tableId, rowSize, elementCount, htmlAppender) { + let tableHTML = ""; + let index = 0; + + for(let value = 1; value <= elementCount; value++) { + // Call the provided HTML appender to see what should be appended to the table + let toAppend = htmlAppender(value); + + // If there is nothing to append (that is, the function has decided this element should be skipped) + // then continue to the next loop. + if(!toAppend) { + continue; + } + + // Open a new table row if it should + if(index % rowSize == 0) { + tableHTML += ""; + } + + // Append the HTML data + tableHTML += toAppend; + + // Close the table row if it has reached the maximum number of elements + if(index % rowSize == rowSize) { + tableHTML += ""; + } + + index++; + } + + // Set the inner HTML + document.getElementById(tableId).innerHTML = tableHTML; +} + +function fillTableWithSpecies() { + fillTable("species-table", 10, 649, (species) => { + // Skip this element if species is from Generation V and cannot be downloaded + if(species > 493 && !AVAILABLE_GENERATION_V_POKEMON.includes(species)) { + return false; + } + + return "
#" + species + ""; + }); +} + +function fillTableWithItems() { + fillTable("item-table", 20, 638, (item) => "
#" + item + ""); +} diff --git a/src/main/resources/dashboard/scripts/species.js b/src/main/resources/dashboard/scripts/species.js deleted file mode 100644 index 6108770..0000000 --- a/src/main/resources/dashboard/scripts/species.js +++ /dev/null @@ -1,34 +0,0 @@ -const ELEMENT_SPECIES_TABLE = document.getElementById("species-table"); -const AVAILABLE_GENERATION_V_POKEMON = new Array( - 505, 507, 510, 511, 513, 515, 519, 523, 525, 527, 529, 531, 533, 535, 538, 539, 542, 545, 546, 548, - 550, 553, 556, 558, 559, 561, 564, 569, 572, 575, 578, 580, 583, 587, 588, 594, 596, 600, 605, 607, - 610, 613, 616, 618, 619, 621, 622, 624, 626, 628, 630, 631, 632); - -function fillSpeciesTable() { - let tableHTML = ""; - let index = 0; - - for(let species = 1; species <= 649; species++) { - // Skip if this species is not available - if(species > 493 && !AVAILABLE_GENERATION_V_POKEMON.includes(species)) { - continue; - } - - // Open new row if it should - if(index % 10 == 0) { - tableHTML += ""; - } - - tableHTML += "
#" + species + ""; - - // Close current row if limit of 10 has been reached - if(index % 10 == 10) { - tableHTML += ""; - } - - index++; - } - - ELEMENT_SPECIES_TABLE.innerHTML = tableHTML; - document.getElementById("main-container").style.display = "grid"; -} diff --git a/src/main/resources/dashboard/species.html b/src/main/resources/dashboard/species.html index 34665e1..70a94a8 100644 --- a/src/main/resources/dashboard/species.html +++ b/src/main/resources/dashboard/species.html @@ -1,16 +1,16 @@ - + - -