From 6ac1259f7a8c2daba9c14e7cbc9f7da0b14321fc Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 10 Aug 2022 11:24:02 +0200 Subject: [PATCH 001/144] changing content --- explorer/src/components/UptimeChart.tsx | 6 +++--- explorer/src/pages/MixnodeDetail/index.tsx | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/explorer/src/components/UptimeChart.tsx b/explorer/src/components/UptimeChart.tsx index 8d6c934775..44490c1196 100644 --- a/explorer/src/components/UptimeChart.tsx +++ b/explorer/src/components/UptimeChart.tsx @@ -23,7 +23,7 @@ export const UptimeChart: React.FC = ({ title, xLabel, yLabel, uptim const color = theme.palette.text.primary; React.useEffect(() => { if (uptimeStory.data?.history) { - const allFormattedChartData: FormattedChartData = [['Date', 'Uptime']]; + const allFormattedChartData: FormattedChartData = [['Date', 'Routing Score']]; uptimeStory.data.history.forEach((eachDate) => { const formattedDateUptimeRecord: FormattedDateRecord = [ format(new Date(eachDate.date), 'MMM dd'), @@ -34,7 +34,7 @@ export const UptimeChart: React.FC = ({ title, xLabel, yLabel, uptim setFormattedChartData(allFormattedChartData); } else { const emptyData: any = [ - ['Date', 'Uptime'], + ['Date', 'Routing Score'], ['Jul 27', 10], ]; setFormattedChartData(emptyData); @@ -55,7 +55,7 @@ export const UptimeChart: React.FC = ({ title, xLabel, yLabel, uptim uptimeStory.data ? formattedChartData : [ - ['Date', 'Uptime'], + ['Date', 'Routing Score'], [format(new Date(Date.now()), 'MMM dd'), 0], ] } diff --git a/explorer/src/pages/MixnodeDetail/index.tsx b/explorer/src/pages/MixnodeDetail/index.tsx index 121f451a52..b04bac0535 100644 --- a/explorer/src/pages/MixnodeDetail/index.tsx +++ b/explorer/src/pages/MixnodeDetail/index.tsx @@ -137,9 +137,14 @@ const PageMixnodeDetailWithState: React.FC = () => { {uptimeStory && ( - - {uptimeStory.error && } - + + {uptimeStory.error && } + )} From bdabe31fc95c43c945b148f29fa105346982cbbe Mon Sep 17 00:00:00 2001 From: Gala Date: Thu, 11 Aug 2022 14:03:02 +0200 Subject: [PATCH 002/144] side navigation --- nym-wallet/src/components/Nav.tsx | 12 ++++++------ nym-wallet/src/layouts/AppLayout.tsx | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nym-wallet/src/components/Nav.tsx b/nym-wallet/src/components/Nav.tsx index ccb1dcd10d..8d28658443 100644 --- a/nym-wallet/src/components/Nav.tsx +++ b/nym-wallet/src/components/Nav.tsx @@ -28,18 +28,18 @@ export const Nav = () => { Icon: ArrowBack, onClick: handleShowReceiveModal, }, - { - label: 'Bonding', - route: '/bonding', - Icon: Bonding, - onClick: () => navigate('/bonding'), - }, { label: 'Delegation', route: '/delegation', Icon: Delegate, onClick: () => navigate('/delegation'), }, + { + label: 'Bonding', + route: '/bonding', + Icon: Bonding, + onClick: () => navigate('/bonding'), + }, { label: 'Docs', route: '/admin', diff --git a/nym-wallet/src/layouts/AppLayout.tsx b/nym-wallet/src/layouts/AppLayout.tsx index 481acd00ca..0f2b77a5cb 100644 --- a/nym-wallet/src/layouts/AppLayout.tsx +++ b/nym-wallet/src/layouts/AppLayout.tsx @@ -1,6 +1,6 @@ import React, { useContext } from 'react'; import { NymWordmark } from '@nymproject/react/logo/NymWordmark'; -import { Box, Container } from '@mui/material'; +import { Box, Container, Typography } from '@mui/material'; import { useTheme } from '@mui/material/styles'; import { AppContext } from 'src/context'; import { AppBar, LoadingPage, Nav } from '../components'; @@ -39,9 +39,9 @@ export const ApplicationLayout: React.FC = ({ children }) => {