From 6298b9dc601462280bc80477b12e65f8094d9451 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:22:30 +0530 Subject: [PATCH 1/2] working charts --- dev-dist/sw.js | 2 +- src/components/ChartsTabs.jsx | 32 ++++++++++++--------------- src/components/Doughnut/LineChart.jsx | 12 +++++++++- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dev-dist/sw.js b/dev-dist/sw.js index 15aeba9..092a0e4 100644 --- a/dev-dist/sw.js +++ b/dev-dist/sw.js @@ -82,7 +82,7 @@ define(['./workbox-b5f7729d'], (function (workbox) { 'use strict'; "revision": "3ca0b8505b4bec776b69afdba2768812" }, { "url": "index.html", - "revision": "0.0iof9eg3rjg" + "revision": "0.ts550h453d" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/src/components/ChartsTabs.jsx b/src/components/ChartsTabs.jsx index e2c3c8f..28c5a2d 100644 --- a/src/components/ChartsTabs.jsx +++ b/src/components/ChartsTabs.jsx @@ -61,34 +61,30 @@ function ChartsTabs({ selectedValue, setSelectedValue, days }) { const group = getRootProps(); return ( - - - - - - + Last - {/* */} + /> + {options.map((value) => { const radio = getRadioProps({ value }); return ( diff --git a/src/components/Doughnut/LineChart.jsx b/src/components/Doughnut/LineChart.jsx index c57a9fe..e521adc 100644 --- a/src/components/Doughnut/LineChart.jsx +++ b/src/components/Doughnut/LineChart.jsx @@ -142,6 +142,16 @@ const LineChart = () => { return value / 1000 + "k"; }, }, + grid: { + drawBorder: false, + borderColor: 'transparent' // Remove the border on the Y-axis + }, + }, + x: { + grid: { + drawBorder: false, + borderColor: 'transparent' // Optionally remove the border on the X-axis + }, }, }, }; @@ -164,7 +174,7 @@ const LineChart = () => { > Transaction History - Date: Tue, 22 Oct 2024 13:33:25 +0530 Subject: [PATCH 2/2] =?UTF-8?q?update=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Theme/Theme.js | 14 ++++++- src/components/ChartsTabs.jsx | 8 ++-- src/components/Doughnut/LineChart.jsx | 13 ++++++- .../LatestTransactions/LatestTransactions.jsx | 39 +++++++++++-------- src/pages/MainNet.jsx | 3 +- src/pages/Transaction/TransactionDetails.jsx | 2 +- 6 files changed, 53 insertions(+), 26 deletions(-) diff --git a/src/Theme/Theme.js b/src/Theme/Theme.js index 153f3d8..0267111 100644 --- a/src/Theme/Theme.js +++ b/src/Theme/Theme.js @@ -53,7 +53,19 @@ const customTheme = extendTheme({ 700: "#666666", // Dark gray 800: "#4d4d4d", // Very dark gray 900: "#333333", // Almost black - } + }, + whiteScheme: { + 50: "#ffffff", + 100: "#ffffff", + 200: "#ffffff", + 300: "#ffffff", + 400: "#ffffff", + 500: "#ffffff", + 600: "#ffffff", + 700: "#ffffff", + 800: "#ffffff", + 900: "#ffffff", + }, }, components: { diff --git a/src/components/ChartsTabs.jsx b/src/components/ChartsTabs.jsx index 28c5a2d..4fe6edf 100644 --- a/src/components/ChartsTabs.jsx +++ b/src/components/ChartsTabs.jsx @@ -40,8 +40,8 @@ function ChartsTabs({ selectedValue, setSelectedValue, days }) { boxShadow: "outline", }} fontWeight={500} - py={1} - px={2} + py={{base:"3px",md: 1 }} + px={{base:"6px",md: 2 }} > {props.children} @@ -61,7 +61,7 @@ function ChartsTabs({ selectedValue, setSelectedValue, days }) { const group = getRootProps(); return ( - + { titleColor: "#4B4B4B", bodyColor: "#4B4B4B", displayColors: false, + padding: 12, + bodyFont: { + size: 14, // Increase the font size here + lineHeight: 1.3, + boxShadow:"3px 3px 3px #000" + }, + boxShadow: "0px 4px 12px rgba(0, 0, 0, 0.1)", // Box shadow CSS + borderColor: "#ccc", // Optional: adding border to complement the shadow + borderWidth: 1, }, }, scales: { @@ -166,13 +175,13 @@ const LineChart = () => { }, }, grid: { - drawBorder: false, + border:false, borderColor: 'transparent' // Remove the border on the Y-axis }, }, x: { grid: { - drawBorder: false, + border:false, borderColor: 'transparent' // Optionally remove the border on the X-axis }, }, diff --git a/src/components/LatestTransactions/LatestTransactions.jsx b/src/components/LatestTransactions/LatestTransactions.jsx index 552feb0..4fcabca 100644 --- a/src/components/LatestTransactions/LatestTransactions.jsx +++ b/src/components/LatestTransactions/LatestTransactions.jsx @@ -50,8 +50,7 @@ const LatestTransactions = () => { const [pageSize, setPageSize] = useState(10); // Number of items per page const [totalItems, setTotalItems] = useState(null); // Total items in the dataset const [lastRefreshedTime, setLastRefreshedTime] = useState(new Date()); // Store the last refresh time - const [relativeRefreshTime, setRelativeRefreshTime] = useState("Just now"); - + const [relativeRefreshTime, setRelativeRefreshTime] = useState("Just now"); const { data: transCount, @@ -157,18 +156,23 @@ const LatestTransactions = () => { position={"absolute"} right={0} m={1.5} - display={'flex'} - alignItems={'center'} + display={"flex"} + alignItems={"center"} gap={2} onClick={handleRefreshClick} // Trigger the rotation when clicked > - Last refresh {relativeRefreshTime} + + Last refresh {relativeRefreshTime}{" "} + {transAll?.data?.items?.map( ( @@ -336,7 +344,7 @@ rounded={"full"} - - - + - {subNetworkId === "MainNet" ? "Main net" : "Subnet ID"} - : + {subNetworkId === "MainNet" ? "Main net" : "Subnet ID"}: { mb={0} rounded={6} > - + {data?.data?.amount && Amount