From de2776a56478c2005ab64bada49b25f158a0e3c9 Mon Sep 17 00:00:00 2001 From: Ashutosh Date: Tue, 2 Apr 2024 20:38:10 +0530 Subject: [PATCH 1/2] Fix for Locked Token count on DAO Page --- src/modules/explorer/components/DAOStatsRow.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/explorer/components/DAOStatsRow.tsx b/src/modules/explorer/components/DAOStatsRow.tsx index 0543c3e7..971d72b5 100644 --- a/src/modules/explorer/components/DAOStatsRow.tsx +++ b/src/modules/explorer/components/DAOStatsRow.tsx @@ -116,7 +116,7 @@ export const DAOStatsRow: React.FC = () => { {symbol} Locked - {numbro(amountLockedWithoutDecimals).format(formatConfig)} + {numbro(amountLocked).format(formatConfig)} {numbro(amountLockedPercentage).format(formatConfig)}% From 10f51958cb340afb6ebcb549512cc38fb4265d9e Mon Sep 17 00:00:00 2001 From: fabiolalombardim Date: Mon, 13 May 2024 22:01:35 +0200 Subject: [PATCH 2/2] implemented new design --- .../explorer/components/ProposalsList.tsx | 2 ++ src/modules/explorer/components/UsersTable.tsx | 4 ++++ src/modules/explorer/components/VotesTable.tsx | 2 ++ .../pages/DAOList/components/DAOItem.tsx | 10 +++++----- src/modules/explorer/pages/DAOList/index.tsx | 7 ++++++- src/modules/explorer/pages/DAOList/styles.css | 16 ++++++++++++++-- src/modules/explorer/pages/NFTs/index.tsx | 2 ++ .../pages/Treasury/components/BalancesTable.tsx | 2 ++ .../pages/Treasury/components/TransfersTable.tsx | 4 ++++ .../pages/User/components/UserMovements.tsx | 6 ++++++ 10 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/modules/explorer/components/ProposalsList.tsx b/src/modules/explorer/components/ProposalsList.tsx index d0b72119..71d3e643 100644 --- a/src/modules/explorer/components/ProposalsList.tsx +++ b/src/modules/explorer/components/ProposalsList.tsx @@ -122,7 +122,9 @@ export const ProposalsList: React.FC = ({ renderOnZeroPageCount={null} containerClassName={"pagination"} activeClassName={"active"} + nextClassName="nextButton" forcePage={currentPage} + previousClassName="nextButton" /> diff --git a/src/modules/explorer/components/UsersTable.tsx b/src/modules/explorer/components/UsersTable.tsx index de191ceb..b3acd442 100644 --- a/src/modules/explorer/components/UsersTable.tsx +++ b/src/modules/explorer/components/UsersTable.tsx @@ -126,6 +126,8 @@ const MobileUsersTable: React.FC = ({ data, symbol, handlePageClick, containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> @@ -203,6 +205,8 @@ const DesktopUsersTable: React.FC = ({ data, symbol, handlePageClick, containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> diff --git a/src/modules/explorer/components/VotesTable.tsx b/src/modules/explorer/components/VotesTable.tsx index 812067fc..dae7c757 100644 --- a/src/modules/explorer/components/VotesTable.tsx +++ b/src/modules/explorer/components/VotesTable.tsx @@ -124,6 +124,8 @@ export const VotesTable: React.FC<{ data: RowData[] }> = ({ data }) => { containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> diff --git a/src/modules/explorer/pages/DAOList/components/DAOItem.tsx b/src/modules/explorer/pages/DAOList/components/DAOItem.tsx index a0715948..c7b9145e 100644 --- a/src/modules/explorer/pages/DAOList/components/DAOItem.tsx +++ b/src/modules/explorer/pages/DAOList/components/DAOItem.tsx @@ -13,10 +13,10 @@ const Container = styled(Grid)(({ theme }: { theme: Theme }) => ({ "boxSizing": "border-box", "cursor": "pointer", "transition": "0.15s ease-out", - "padding": "42px 48px", + "padding": "40px 48px", "minWidth": "340px", "alignContent": "baseline", - "gap": 30, + "gap": 24, // "maxHeight": 282, ["@media (max-width:760px)"]: { @@ -64,7 +64,7 @@ const NameText = styled(Typography)(({ theme }) => ({ textOverflow: "ellipsis", color: theme.palette.text.primary, overflow: "hidden", - fontSize: 36, + fontSize: 24, maxWidth: 245, fontWeight: 600, @@ -90,13 +90,13 @@ const DescriptionText = styled(Typography)({ }) const ItemTextSmall = styled(Typography)({ - fontWeight: 600, + fontWeight: 500, fontSize: 16 }) const Badge = styled(Grid)(({ theme, dao_type }: { theme: Theme; dao_type: string }) => ({ "borderRadius": "50px", - "padding": "8px 16px", + "padding": "7px 14px", "height": "auto", "boxSizing": "border-box", "width": "fit-content", diff --git a/src/modules/explorer/pages/DAOList/index.tsx b/src/modules/explorer/pages/DAOList/index.tsx index 27d123ed..bfee2f7c 100644 --- a/src/modules/explorer/pages/DAOList/index.tsx +++ b/src/modules/explorer/pages/DAOList/index.tsx @@ -230,7 +230,10 @@ export const DAOList: React.FC = () => { - + {daos?.length || 0} DAOs @@ -299,6 +302,8 @@ export const DAOList: React.FC = () => { containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> diff --git a/src/modules/explorer/pages/DAOList/styles.css b/src/modules/explorer/pages/DAOList/styles.css index fc9da373..c5cb91b3 100644 --- a/src/modules/explorer/pages/DAOList/styles.css +++ b/src/modules/explorer/pages/DAOList/styles.css @@ -3,11 +3,18 @@ list-style: none; outline: none; font-family: "Roboto Flex"; + + next { + color: red !important; + } } .pagination > .active > a { - background-color: rgba(129, 254, 183, 0.2); + background-color: #24282D; color: rgba(129, 254, 183, 1); } +.pagination > .next > li > a { + color: red !important; +} .pagination > li > a { border: none; padding: 5px 10px; @@ -31,7 +38,7 @@ .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus { - background-color: rgba(129, 254, 183, 0.2); + background-color: #24282D; border-color: none; outline: none; } @@ -39,6 +46,11 @@ .pagination > li > span { color: #fff; } + +.pagination > .nextButton > a { + font-weight: 600; +} + .pagination > li:first-child > a, .pagination > li:first-child > span, .pagination > li:last-child > a, diff --git a/src/modules/explorer/pages/NFTs/index.tsx b/src/modules/explorer/pages/NFTs/index.tsx index 742b8eeb..b27385f8 100644 --- a/src/modules/explorer/pages/NFTs/index.tsx +++ b/src/modules/explorer/pages/NFTs/index.tsx @@ -209,6 +209,8 @@ export const NFTs: React.FC = () => { containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> diff --git a/src/modules/explorer/pages/Treasury/components/BalancesTable.tsx b/src/modules/explorer/pages/Treasury/components/BalancesTable.tsx index 548a779f..d81dd3f1 100644 --- a/src/modules/explorer/pages/Treasury/components/BalancesTable.tsx +++ b/src/modules/explorer/pages/Treasury/components/BalancesTable.tsx @@ -183,6 +183,8 @@ const BalancesList: React.FC = ({ containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> diff --git a/src/modules/explorer/pages/Treasury/components/TransfersTable.tsx b/src/modules/explorer/pages/Treasury/components/TransfersTable.tsx index c1cb074e..6b598071 100644 --- a/src/modules/explorer/pages/Treasury/components/TransfersTable.tsx +++ b/src/modules/explorer/pages/Treasury/components/TransfersTable.tsx @@ -175,6 +175,8 @@ const MobileTransfersTable: React.FC<{ data: RowData[]; network: Network }> = ({ containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> @@ -247,6 +249,8 @@ const DesktopTransfersTable: React.FC<{ data: RowData[]; network: Network }> = ( containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> diff --git a/src/modules/explorer/pages/User/components/UserMovements.tsx b/src/modules/explorer/pages/User/components/UserMovements.tsx index 8cb6a02e..07e69237 100644 --- a/src/modules/explorer/pages/User/components/UserMovements.tsx +++ b/src/modules/explorer/pages/User/components/UserMovements.tsx @@ -505,6 +505,8 @@ export const UserMovements: React.FC<{ containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> @@ -537,6 +539,8 @@ export const UserMovements: React.FC<{ containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" /> @@ -569,6 +573,8 @@ export const UserMovements: React.FC<{ containerClassName={"pagination"} activeClassName={"active"} forcePage={currentPage} + nextClassName="nextButton" + previousClassName="nextButton" />