From 2d4e17abea150acae561c20767d5434a27fad634 Mon Sep 17 00:00:00 2001 From: manny404 Date: Fri, 22 Jul 2022 12:52:04 -0400 Subject: [PATCH 1/3] dont list user twice if theyre on leaderboard --- .../client/src/components/LeaderBoard.js | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/frontend/packages/client/src/components/LeaderBoard.js b/frontend/packages/client/src/components/LeaderBoard.js index 34105114f..90f52d27c 100644 --- a/frontend/packages/client/src/components/LeaderBoard.js +++ b/frontend/packages/client/src/components/LeaderBoard.js @@ -1,6 +1,7 @@ import { Web3Consumer } from 'contexts/Web3'; import React from 'react'; import Blockies from 'react-blockies'; +import classnames from 'classnames'; import { WrapperResponsive } from '../components'; import { useLeaderBoard } from '../hooks'; @@ -28,6 +29,9 @@ const LeaderBoard = ({ const { user } = web3; const { data, isLoading } = useLeaderBoard({ communityId, addr: user?.addr }); const style = {}; + const currentUserInTop10 = data?.users?.some( + (datum) => datum.addr === user?.addr + ); return (
@@ -43,17 +47,19 @@ const LeaderBoard = ({ {!isLoading && data?.users.map((datum, index) => { const userIndex = index + 1; - const styleIndex = - index === 0 - ? 'rounded-sm-tl has-background-white-ter index-cell' - : index === 4 - ? 'rounded-sm-bl has-background-white-ter index-cell' - : 'has-background-white-ter index-cell'; + const indexClasses = classnames({ + 'index-cell': index !== 0 && index !== 4, + 'rounded-sm-tl': index === 0, + 'rounded-sm-bl': index === 4, + 'has-background-white-ter': !currentUserInTop10, + 'has-background-black-bis': currentUserInTop10, + 'has-text-white': currentUserInTop10, + }); return ( {userIndex} @@ -80,7 +86,7 @@ const LeaderBoard = ({ })} - {!isLoading && data?.currentUser && ( + {!isLoading && data?.currentUser && !currentUserInTop10 && ( Date: Fri, 22 Jul 2022 14:16:10 -0400 Subject: [PATCH 2/3] more generic variable name --- frontend/packages/client/src/components/LeaderBoard.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/packages/client/src/components/LeaderBoard.js b/frontend/packages/client/src/components/LeaderBoard.js index 90f52d27c..f1a2137dc 100644 --- a/frontend/packages/client/src/components/LeaderBoard.js +++ b/frontend/packages/client/src/components/LeaderBoard.js @@ -29,7 +29,7 @@ const LeaderBoard = ({ const { user } = web3; const { data, isLoading } = useLeaderBoard({ communityId, addr: user?.addr }); const style = {}; - const currentUserInTop10 = data?.users?.some( + const currentUserInLeaderboard = data?.users?.some( (datum) => datum.addr === user?.addr ); @@ -51,9 +51,9 @@ const LeaderBoard = ({ 'index-cell': index !== 0 && index !== 4, 'rounded-sm-tl': index === 0, 'rounded-sm-bl': index === 4, - 'has-background-white-ter': !currentUserInTop10, - 'has-background-black-bis': currentUserInTop10, - 'has-text-white': currentUserInTop10, + 'has-background-white-ter': !currentUserInLeaderboard, + 'has-background-black-bis': currentUserInLeaderboard, + 'has-text-white': currentUserInLeaderboard, }); return ( @@ -86,7 +86,7 @@ const LeaderBoard = ({ })}
- {!isLoading && data?.currentUser && !currentUserInTop10 && ( + {!isLoading && data?.currentUser && !currentUserInLeaderboard && ( Date: Fri, 22 Jul 2022 17:13:12 -0400 Subject: [PATCH 3/3] correct index-cell logic --- frontend/packages/client/src/components/LeaderBoard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/packages/client/src/components/LeaderBoard.js b/frontend/packages/client/src/components/LeaderBoard.js index f1a2137dc..ebfdf148b 100644 --- a/frontend/packages/client/src/components/LeaderBoard.js +++ b/frontend/packages/client/src/components/LeaderBoard.js @@ -48,7 +48,7 @@ const LeaderBoard = ({ data?.users.map((datum, index) => { const userIndex = index + 1; const indexClasses = classnames({ - 'index-cell': index !== 0 && index !== 4, + 'index-cell': index === 0 || index === 4, 'rounded-sm-tl': index === 0, 'rounded-sm-bl': index === 4, 'has-background-white-ter': !currentUserInLeaderboard,