diff --git a/frontend/public/index.html b/frontend/public/index.html index aa069f2..de628b2 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -24,7 +24,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + Mandala - Security tokens mediator diff --git a/frontend/public/mandala.png b/frontend/public/mandala.png new file mode 100644 index 0000000..4d3c6d7 Binary files /dev/null and b/frontend/public/mandala.png differ diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx index 8bece33..ad015c9 100644 --- a/frontend/src/components/Layout.tsx +++ b/frontend/src/components/Layout.tsx @@ -8,22 +8,29 @@ export const DashboardLayout = () => { - - {/* This is so that the sidebar stays here */} - + { {...props} sx={({ zIndex }) => ({ zIndex: zIndex.drawer + 1, + backgroundColor: "#39429b", })} > { loading={loading} variant="contained" onClick={form.handleSubmit(onLogin)} + sx={{ + backgroundColor: "#39429b", + '&:hover': { + backgroundColor: "#1976d2", + }, + }} > Login - + ); }; diff --git a/frontend/src/pages/account/pages/RegisterPage.tsx b/frontend/src/pages/account/pages/RegisterPage.tsx index a74f8bc..b2f4e46 100644 --- a/frontend/src/pages/account/pages/RegisterPage.tsx +++ b/frontend/src/pages/account/pages/RegisterPage.tsx @@ -75,6 +75,12 @@ export const RegisterPage: React.FC = () => { loading={loading} variant="contained" onClick={form.handleSubmit(onRegister)} + sx={{ + backgroundColor: "#39429b", + '&:hover': { + backgroundColor: "#1976d2", + }, + }} > Register diff --git a/frontend/src/pages/admin/pages/OrdersPage.tsx b/frontend/src/pages/admin/pages/OrdersPage.tsx index c432d11..db8bb26 100644 --- a/frontend/src/pages/admin/pages/OrdersPage.tsx +++ b/frontend/src/pages/admin/pages/OrdersPage.tsx @@ -108,23 +108,40 @@ export const OrdersPage: React.FC = () => { }} > {!signer && ( - + )} {signer && ( - setTokenDetails(null as any)} > {tokenDetails ? "Go back to asset selection" : "Select an asset"} - + {!tokenDetails && SUPPORTED_ASSETS.map((supportedToken) => ( @@ -136,6 +153,7 @@ export const OrdersPage: React.FC = () => { padding: "1rem", width: "400px", border: "1px solid #D9D9D9", + backgroundColor: "#82a8d9", }} onClick={loadToken( ASSETS[supportedToken as "LFT" | "LFN"].address! @@ -154,7 +172,7 @@ export const OrdersPage: React.FC = () => { sx={{ fontSize: "14px", fontWeight: "500", - opacity: ".5", + opacity: ".8", }} > {ASSETS[supportedToken as "LFT" | "LFN"].address} @@ -167,6 +185,8 @@ export const OrdersPage: React.FC = () => { sx={{ width: "100%", maxWidth: "1024px", + borderRadius: "1rem", + backgroundColor: "#D3D3D3", }} rows={tokenDetails.epochList} columns={[ diff --git a/frontend/src/pages/client/pages/HoldingsPage.tsx b/frontend/src/pages/client/pages/HoldingsPage.tsx index 5fddcee..b139c41 100644 --- a/frontend/src/pages/client/pages/HoldingsPage.tsx +++ b/frontend/src/pages/client/pages/HoldingsPage.tsx @@ -60,18 +60,26 @@ export const HoldingsPage: React.FC = () => { }} > {!signer && ( - )} {SUPPORTED_ASSETS.map((supportedToken) => ( { sx={{ fontSize: "14px", fontWeight: "500", - opacity: ".5", + opacity: ".8", }} > {ASSETS[supportedToken as "LFT" | "LFN"].address} @@ -96,8 +104,7 @@ export const HoldingsPage: React.FC = () => { Balance: {new Intl.NumberFormat('en-US').format(Number(balances[supportedToken]))} {supportedToken} diff --git a/frontend/src/pages/client/pages/PastTransactionsPage.tsx b/frontend/src/pages/client/pages/PastTransactionsPage.tsx index f3a0282..5d12983 100644 --- a/frontend/src/pages/client/pages/PastTransactionsPage.tsx +++ b/frontend/src/pages/client/pages/PastTransactionsPage.tsx @@ -44,7 +44,7 @@ export const PastTransactionsPage: React.FC = () => { token: asset }))) } - x = x.sort((a,b) => a.createdAt.getTime() - b.createdAt.getTime()) + x = x.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime()) setHistory(x); }; @@ -58,16 +58,18 @@ export const PastTransactionsPage: React.FC = () => { if (signer) { fetchHistory(); } - // eslint-disable-next-line + // eslint-disable-next-line }, [signer]); const columns: GridColDef[] = [ { field: 'createdAt', type: 'dateTime', headerName: 'Created at', width: 260 }, { field: 'token', headerName: 'For Token', width: 130 }, { field: 'side', headerName: 'Side', width: 130 }, - { field: 'amount', headerName: 'Traded with', width: 130, renderCell: (params) => { + { + field: 'amount', headerName: 'Traded with', width: 130, renderCell: (params) => { return <>{params.row.amount} {params.row.amountCurrency} - }, } + }, + } // { // field: 'fullName', // headerName: 'Full name', @@ -87,12 +89,34 @@ export const PastTransactionsPage: React.FC = () => { }} > {!signer && ( - )} {signer && history && ( - + )} diff --git a/frontend/src/pages/client/pages/components/InteractionsWidget.tsx b/frontend/src/pages/client/pages/components/InteractionsWidget.tsx index 4c5c425..887f212 100644 --- a/frontend/src/pages/client/pages/components/InteractionsWidget.tsx +++ b/frontend/src/pages/client/pages/components/InteractionsWidget.tsx @@ -157,7 +157,7 @@ export const InteractionsWidget: React.FC = () => { }, [web3Context]); return ( - + @@ -195,7 +195,14 @@ export const InteractionsWidget: React.FC = () => { {!signer && (