From 0c9d5df30b5b4ca49d36d82da536d28ca8ee243e Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Mon, 20 Jul 2020 15:18:37 +0100
Subject: [PATCH] not displaying hidden lb positions

---
 public/index.html         | 22 +++++++++++-----------
 public/js/leaderboards.js | 14 ++++++++++----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/public/index.html b/public/index.html
index ae7d136c6..f6f62bbb7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
   <title>Monkey Type</title>
   <link rel="stylesheet" href="css/fa.css">
   <link rel="stylesheet" href="css/balloon.css">
-  <link rel="stylesheet" href="css/style.css?v=37">
+  <link rel="stylesheet" href="css/style.css?v=38">
   <link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme">
   <link id="favicon" rel="shortcut icon" href="fav.png">
   <link rel="shortcut icon" href="fav.png">
@@ -1353,17 +1353,17 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script>
 <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.3/Chart.min.js"></script> -->
 <script src="js/chart.js"></script>
-<script src="js/chartjs-plugin-trendline.js?v=37"></script>
+<script src="js/chartjs-plugin-trendline.js?v=38"></script>
 <script src="js/chartjs-plugin-annotation.js"></script>
 <script src="js/html2canvas.js"></script>
-<script src="js/words.js?v=37"></script>
-<script src="js/layouts.js?v=37"></script>
-<script src="js/db.js?v=37"></script>
-<script src="js/userconfig.js?v=37"></script>
-<script src="js/commandline.js?v=37"></script>
-<script src="js/leaderboards.js?v=37"></script>
-<script src="js/settings.js?v=37"></script>
-<script src="js/account.js?v=37"></script>
-<script src="js/script.js?v=37"></script>
+<script src="js/words.js?v=38"></script>
+<script src="js/layouts.js?v=38"></script>
+<script src="js/db.js?v=38"></script>
+<script src="js/userconfig.js?v=38"></script>
+<script src="js/commandline.js?v=38"></script>
+<script src="js/leaderboards.js?v=38"></script>
+<script src="js/settings.js?v=38"></script>
+<script src="js/account.js?v=38"></script>
+<script src="js/script.js?v=38"></script>
 
 </html>
\ No newline at end of file
diff --git a/public/js/leaderboards.js b/public/js/leaderboards.js
index cd34a3634..d4dbcee9a 100644
--- a/public/js/leaderboards.js
+++ b/public/js/leaderboards.js
@@ -134,14 +134,16 @@ function updateLeaderboards() {
       `);
       //daily
       $("#leaderboardsWrapper table.daily tbody").empty();
+      let dindex = 0;
       if (dailyData.board !== undefined) {
-        dailyData.board.forEach((entry, index) => {
+        dailyData.board.forEach((entry) => {
+          if (entry.hidden) return;
           let meClassString = "";
           if (entry.currentUser) {
             meClassString = ' class="me"';
             $("#leaderboardsWrapper table.daily tfoot").html(`
             <tr>
-            <td>${index + 1}</td>
+            <td>${dindex + 1}</td>
             <td>You</td>
             <td>${entry.wpm}</td>
             <td>${entry.raw}</td>
@@ -154,7 +156,7 @@ function updateLeaderboards() {
           $("#leaderboardsWrapper table.daily tbody").append(`
           <tr>
           <td>${
-            index === 0 ? '<i class="fas fa-fw fa-crown"></i>' : index + 1
+            dindex === 0 ? '<i class="fas fa-fw fa-crown"></i>' : dindex + 1
           }</td>
           <td ${meClassString}>${entry.name}</td>
           <td>${entry.wpm}</td>
@@ -164,6 +166,7 @@ function updateLeaderboards() {
           <td>${moment(entry.timestamp).format("DD MMM YYYY<br>HH:mm")}</td>
         </tr>
         `);
+          dindex++;
         });
       }
       let lenDaily = 0;
@@ -197,8 +200,10 @@ function updateLeaderboards() {
       `);
       //global
       $("#leaderboardsWrapper table.global tbody").empty();
+      let index = 0;
       if (globalData.board !== undefined) {
-        globalData.board.forEach((entry, index) => {
+        globalData.board.forEach((entry) => {
+          if (entry.hidden) return;
           let meClassString = "";
           if (entry.currentUser) {
             meClassString = ' class="me"';
@@ -227,6 +232,7 @@ function updateLeaderboards() {
           <td>${moment(entry.timestamp).format("DD MMM YYYY<br>HH:mm")}</td>
         </tr>
         `);
+          index++;
         });
       }
       let lenGlobal = 0;