From 0525803b4daa0be5539b1c1d86dbcb0ec8cacc67 Mon Sep 17 00:00:00 2001 From: NataliaCichonska Date: Sun, 2 Jan 2022 18:56:53 +0100 Subject: [PATCH 1/2] bug, eslint and responsivity fixes --- src/views/Leaderboard/Leaderboard.css | 10 ++++++++++ src/views/Leaderboard/Leaderboard.js | 28 +++++++++++++++++---------- src/views/ScorePage/ScorePage.js | 1 + 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/views/Leaderboard/Leaderboard.css b/src/views/Leaderboard/Leaderboard.css index ef13fd4..716313b 100644 --- a/src/views/Leaderboard/Leaderboard.css +++ b/src/views/Leaderboard/Leaderboard.css @@ -53,6 +53,7 @@ td.step div:first-of-type { } #gold { height: 250px; + margin: 20px auto; } #silver { height: 200px; @@ -119,3 +120,12 @@ button.resetButton { width: min-content; } } +@media only screen and (min-device-width: 280px) and (max-device-width: 480px) { + td.step div:first-of-type { + margin: 20px 0px; + width: 75px; + } + #scorePageTitle { + font-size: 2rem; + } +} diff --git a/src/views/Leaderboard/Leaderboard.js b/src/views/Leaderboard/Leaderboard.js index 6fa64ba..0619fcf 100644 --- a/src/views/Leaderboard/Leaderboard.js +++ b/src/views/Leaderboard/Leaderboard.js @@ -1,5 +1,4 @@ import './Leaderboard.css'; - import Button from '../../components/Button/Button'; import '../../components/Button/Button.css'; @@ -56,15 +55,24 @@ function getScoreFromLocalStorage() { const highScores = JSON.parse(localStorage.getItem('quizScores')) || []; highScores.sort((a, b) => b.SCORE - a.SCORE); function showScore() { - nick1.innerText = `${highScores[0].NAME} Pts:${highScores[0].SCORE}`; - nick2.innerText = `${highScores[1].NAME} Pts:${highScores[1].SCORE}`; - nick3.innerText = `${highScores[2].NAME} Pts:${highScores[2].SCORE}`; - nick4.innerText = `${highScores[3].NAME} Pts:${highScores[3].SCORE}`; - nick5.innerText = `${highScores[4].NAME} Pts:${highScores[4].SCORE}`; - nick6.innerText = `${highScores[5].NAME} Pts:${highScores[5].SCORE}`; - nick7.innerText = `${highScores[6].NAME} Pts:${highScores[6].SCORE}`; - nick8.innerText = `${highScores[7].NAME} Pts:${highScores[7].SCORE}`; - nick9.innerText = `${highScores[8].NAME} Pts:${highScores[8].SCORE}`; + if (highScores.length >= 1) + document.getElementById('nick1').innerText = `${highScores[0].NAME} Pts:${highScores[0].SCORE}`; + if (highScores.length >= 2) + document.getElementById('nick2').innerText = `${highScores[1].NAME} Pts:${highScores[1].SCORE}`; + if (highScores.length >= 3) + document.getElementById('nick3').innerText = `${highScores[2].NAME} Pts:${highScores[2].SCORE}`; + if (highScores.length >= 4) + document.getElementById('nick4').innerText = `${highScores[3].NAME} Pts:${highScores[3].SCORE}`; + if (highScores.length >= 5) + document.getElementById('nick5').innerText = `${highScores[4].NAME} Pts:${highScores[4].SCORE}`; + if (highScores.length >= 6) + document.getElementById('nick6').innerText = `${highScores[5].NAME} Pts:${highScores[5].SCORE}`; + if (highScores.length >= 7) + document.getElementById('nick7').innerText = `${highScores[6].NAME} Pts:${highScores[6].SCORE}`; + if (highScores.length >= 8) + document.getElementById('nick8').innerText = `${highScores[7].NAME} Pts:${highScores[7].SCORE}`; + if (highScores.length >= 9) + document.getElementById('nick9').innerText = `${highScores[8].NAME} Pts:${highScores[8].SCORE}`; } return showScore(); } diff --git a/src/views/ScorePage/ScorePage.js b/src/views/ScorePage/ScorePage.js index 0a927cf..49570f3 100644 --- a/src/views/ScorePage/ScorePage.js +++ b/src/views/ScorePage/ScorePage.js @@ -93,6 +93,7 @@ function nicknameValidation() { } function saveQuizScore() { + alert('YOUR SCORE HAS BEEN SAVED'); const quizScores = JSON.parse(localStorage.getItem('quizScores')) || []; const recentUserScore = getCurrentScore(userAnswers); const nickName = document.getElementById('nickname'); From d4aec86ffa7acb82f350638b987a58f494b9bd80 Mon Sep 17 00:00:00 2001 From: NataliaCichonska Date: Sun, 2 Jan 2022 19:10:16 +0100 Subject: [PATCH 2/2] simplified --- src/views/Leaderboard/Leaderboard.js | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/views/Leaderboard/Leaderboard.js b/src/views/Leaderboard/Leaderboard.js index 0619fcf..fdf4864 100644 --- a/src/views/Leaderboard/Leaderboard.js +++ b/src/views/Leaderboard/Leaderboard.js @@ -55,24 +55,13 @@ function getScoreFromLocalStorage() { const highScores = JSON.parse(localStorage.getItem('quizScores')) || []; highScores.sort((a, b) => b.SCORE - a.SCORE); function showScore() { - if (highScores.length >= 1) - document.getElementById('nick1').innerText = `${highScores[0].NAME} Pts:${highScores[0].SCORE}`; - if (highScores.length >= 2) - document.getElementById('nick2').innerText = `${highScores[1].NAME} Pts:${highScores[1].SCORE}`; - if (highScores.length >= 3) - document.getElementById('nick3').innerText = `${highScores[2].NAME} Pts:${highScores[2].SCORE}`; - if (highScores.length >= 4) - document.getElementById('nick4').innerText = `${highScores[3].NAME} Pts:${highScores[3].SCORE}`; - if (highScores.length >= 5) - document.getElementById('nick5').innerText = `${highScores[4].NAME} Pts:${highScores[4].SCORE}`; - if (highScores.length >= 6) - document.getElementById('nick6').innerText = `${highScores[5].NAME} Pts:${highScores[5].SCORE}`; - if (highScores.length >= 7) - document.getElementById('nick7').innerText = `${highScores[6].NAME} Pts:${highScores[6].SCORE}`; - if (highScores.length >= 8) - document.getElementById('nick8').innerText = `${highScores[7].NAME} Pts:${highScores[7].SCORE}`; - if (highScores.length >= 9) - document.getElementById('nick9').innerText = `${highScores[8].NAME} Pts:${highScores[8].SCORE}`; + for (let i = 1; i <= highScores.length; i++) { + if (i > 9) { + break; + } + const nick = `nick${i}`; + document.getElementById(nick).innerText = `${highScores[i - 1].NAME} Pts:${highScores[i - 1].SCORE}`; + } } return showScore(); }