From 91806b2531782413e927c5352d949d1e9f56e50b Mon Sep 17 00:00:00 2001 From: evilpeach Date: Wed, 17 May 2023 17:20:50 +0700 Subject: [PATCH 1/8] chore: patch routes, patches all codes --- src/lib/components/ExplorerLink.tsx | 10 +++++----- src/lib/components/StickySidebar.tsx | 4 +++- src/lib/components/button/NewProposalButton.tsx | 7 +++---- src/lib/components/modal/list/EditListName.tsx | 2 +- src/lib/components/tx/modal/ButtonSection.tsx | 4 ++-- src/lib/hooks/useOpenTxTab.ts | 2 +- src/lib/layout/Searchbar.tsx | 10 +++++----- src/lib/layout/SubHeader.tsx | 2 +- src/lib/layout/navbar/index.tsx | 2 +- .../components/tables/AdminContractsTable.tsx | 2 +- .../components/tables/InstantiatedContractsTable.tsx | 2 +- .../components/tables/StoredCodesTable.tsx | 2 +- .../pages/block-details/components/BlockDetailsTop.tsx | 4 ++-- .../components/table/CodeContractsTable.tsx | 2 +- src/lib/pages/codes/index.tsx | 2 +- src/lib/pages/contract-list/slug.tsx | 2 +- src/lib/pages/instantiate/completed.tsx | 2 +- .../table/account/PublicProjectAccountRow.tsx | 4 ++-- .../components/table/code/PublicProjectCodeRow.tsx | 2 +- .../table/contract/PublicProjectContractRow.tsx | 2 +- src/lib/pages/recent-codes/index.tsx | 2 +- .../{account => accounts}/[accountAddress].tsx | 0 src/pages/[network]/{block => blocks}/[height].tsx | 0 src/pages/[network]/{blocks.tsx => blocks/index.tsx} | 0 src/pages/[network]/{code => codes}/[codeId].tsx | 0 .../[network]/{recent-codes.tsx => codes/index.tsx} | 0 .../{contract => contracts}/[contractAddress].tsx | 0 src/pages/[network]/{codes.tsx => my-codes.tsx} | 0 .../[network]/{proposals.tsx => proposals/index.tsx} | 0 .../[network]/{proposal => proposals}/whitelist.tsx | 0 src/pages/[network]/{tx => txs}/[txHash].tsx | 0 src/pages/[network]/{txs.tsx => txs/index.tsx} | 0 src/pages/{account => accounts}/[accountAddress].tsx | 0 src/pages/{block => blocks}/[height].tsx | 0 src/pages/{blocks.tsx => blocks/index.tsx} | 0 src/pages/{code => codes}/[codeId].tsx | 0 src/pages/{recent-codes.tsx => codes/index.tsx} | 0 .../{contract => contracts}/[contractAddress].tsx | 0 src/pages/{codes.tsx => my-codes.tsx} | 0 src/pages/{proposal => proposals}/whitelist.tsx | 0 src/pages/{tx => txs}/[txHash].tsx | 0 src/pages/{txs.tsx => txs/index.tsx} | 0 42 files changed, 36 insertions(+), 35 deletions(-) rename src/pages/[network]/{account => accounts}/[accountAddress].tsx (100%) rename src/pages/[network]/{block => blocks}/[height].tsx (100%) rename src/pages/[network]/{blocks.tsx => blocks/index.tsx} (100%) rename src/pages/[network]/{code => codes}/[codeId].tsx (100%) rename src/pages/[network]/{recent-codes.tsx => codes/index.tsx} (100%) rename src/pages/[network]/{contract => contracts}/[contractAddress].tsx (100%) rename src/pages/[network]/{codes.tsx => my-codes.tsx} (100%) rename src/pages/[network]/{proposals.tsx => proposals/index.tsx} (100%) rename src/pages/[network]/{proposal => proposals}/whitelist.tsx (100%) rename src/pages/[network]/{tx => txs}/[txHash].tsx (100%) rename src/pages/[network]/{txs.tsx => txs/index.tsx} (100%) rename src/pages/{account => accounts}/[accountAddress].tsx (100%) rename src/pages/{block => blocks}/[height].tsx (100%) rename src/pages/{blocks.tsx => blocks/index.tsx} (100%) rename src/pages/{code => codes}/[codeId].tsx (100%) rename src/pages/{recent-codes.tsx => codes/index.tsx} (100%) rename src/pages/{contract => contracts}/[contractAddress].tsx (100%) rename src/pages/{codes.tsx => my-codes.tsx} (100%) rename src/pages/{proposal => proposals}/whitelist.tsx (100%) rename src/pages/{tx => txs}/[txHash].tsx (100%) rename src/pages/{txs.tsx => txs/index.tsx} (100%) diff --git a/src/lib/components/ExplorerLink.tsx b/src/lib/components/ExplorerLink.tsx index d63d0c089..64064b1e4 100644 --- a/src/lib/components/ExplorerLink.tsx +++ b/src/lib/components/ExplorerLink.tsx @@ -43,22 +43,22 @@ const getNavigationUrl = ( let url = ""; switch (type) { case "tx_hash": - url = "/tx"; + url = "/txs"; break; case "contract_address": - url = "/contract"; + url = "/contracts"; break; case "user_address": - url = "/account"; + url = "/accounts"; break; case "validator_address": url = getExplorerValidatorUrl(currentChainName); break; case "code_id": - url = "/code"; + url = "/codes"; break; case "block_height": - url = "/block"; + url = "/blocks"; break; case "proposal_id": url = getExplorerProposalUrl(currentChainName); diff --git a/src/lib/components/StickySidebar.tsx b/src/lib/components/StickySidebar.tsx index 0558fe866..12cfb2c39 100644 --- a/src/lib/components/StickySidebar.tsx +++ b/src/lib/components/StickySidebar.tsx @@ -74,7 +74,9 @@ export const StickySidebar = ({ color: "lilac.light", bgColor: "lilac.background", }} - onClick={() => navigate({ pathname: "/proposal/store-code" })} + onClick={() => + navigate({ pathname: "/proposals/store-code" }) + } > Submit Proposal To Store Code diff --git a/src/lib/components/button/NewProposalButton.tsx b/src/lib/components/button/NewProposalButton.tsx index c2c3bcc65..f232db763 100644 --- a/src/lib/components/button/NewProposalButton.tsx +++ b/src/lib/components/button/NewProposalButton.tsx @@ -24,7 +24,7 @@ export const NewProposalButton = () => { icon={} onClick={() => { navigate({ - pathname: "/proposal/store-code", + pathname: "/proposals/store-code", }); }} > @@ -33,9 +33,8 @@ export const NewProposalButton = () => { {/* } onClick={() => { - // TODO - Change navigation path navigate({ - pathname: "/proposal-instantiate", + pathname: "/proposals/instantiate", }); }} > @@ -50,7 +49,7 @@ export const NewProposalButton = () => { icon={} onClick={() => { navigate({ - pathname: "/proposal/whitelist", + pathname: "/proposals/whitelist", }); }} > diff --git a/src/lib/components/modal/list/EditListName.tsx b/src/lib/components/modal/list/EditListName.tsx index 1c6be8db0..e2ffa144f 100644 --- a/src/lib/components/modal/list/EditListName.tsx +++ b/src/lib/components/modal/list/EditListName.tsx @@ -69,7 +69,7 @@ export function EditListNameModal({ } + trigger={} mainBtnTitle="Save" mainAction={() => { handleSave(); diff --git a/src/lib/components/tx/modal/ButtonSection.tsx b/src/lib/components/tx/modal/ButtonSection.tsx index f68082569..16a463e97 100644 --- a/src/lib/components/tx/modal/ButtonSection.tsx +++ b/src/lib/components/tx/modal/ButtonSection.tsx @@ -50,7 +50,7 @@ export const ButtonSection = ({