Skip to content

updated wrappers to <Box> from <Paper> to provide a cleaner UI #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
10d9e wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

updated wrappers to <Box> from <Paper> to provide a cleaner UI #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions components/Overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {OverviewTimeSeriesRawData, TimeSeriesRawData} from "@/components/TimeSer
import StackedApacheEchart from "./ApacheStackedBar";
import PercentStackedApacheEchart from "./ApacheStackedBarPercent";
import Alert from '@mui/material/Alert';
import Box from '@mui/material/Box'

interface OverviewProps {
requester: string;
Expand Down Expand Up @@ -115,14 +116,14 @@ export default function Overview({requester, clients, providers, dateRange}: Ove
<Grid container spacing={10} key={0} p={3}>
{rawDataList.map(({name, percentage}, index) => (
<Grid item md={2} key={index}>
<Paper elevation={12} >
<Box>
<Typography variant="subtitle1" align={'center'}>
{name.toUpperCase()} Total Success Rate
</Typography>
<Typography variant="h4" align={'center'}>
{(percentage * 100).toFixed(2)} %
</Typography>
</Paper>
</Box>
</Grid>))
}
</Grid>
Expand All @@ -132,36 +133,36 @@ export default function Overview({requester, clients, providers, dateRange}: Ove
<Typography variant="h6">
{name.toUpperCase()} Retrieval Success Ratio Per Client
</Typography>
<Paper elevation={12}>
<Box>
<div style={{height: 400}}>
<LazyTimeSeries
rawData={timeSeries}
type={'client'}/>
</div>
</Paper>
</Box>
</Grid>
<Grid item md={4}>
<Typography variant="h6">
{name.toUpperCase()} Retrieval Success Ratio Per Provider
</Typography>
<Paper elevation={12}>
<Box>
<div style={{height: 400}}>
<LazyTimeSeries
rawData={timeSeries}
type={'provider'}/>
</div>
</Paper>
</Box>
</Grid>
<Grid item md={4}>
<Typography variant="h6">
{name.toUpperCase()} Provider Leaderboard
</Typography>
<Paper elevation={12}>
<Box>
<div style={{height: 400}}>
<LazyRankBar
rawData={rankEntries}/>
</div>
</Paper>
</Box>
</Grid>
</Grid>
))}
Expand Down Expand Up @@ -231,44 +232,40 @@ function overviewInfoView(overviewDataList: { overviewTimeSeries: OverviewTimeSe
Data has been collected from several Retrieval Bot instances run by <strong>Protocol Labs, Filecoin Foundation, Slingshot, Gravity Assist, New Web Group, </strong> and <strong>Triton</strong>.
</Alert>
</Grid>
<Grid container spacing={12} key={0} p={3}>
<Grid container spacing={3} key={0} p={3}>
{totalCallsData.map(({ id, value }, index) => (
<Grid item md={4} key={index}>
<Paper elevation={12}>
<Box>
<Typography variant="subtitle1" align={'center'}>
{id.toUpperCase()} Total Call Count Last 30 days
</Typography>
<Typography variant="h4" align={'center'}>
{value}
</Typography>
</Paper>
</Box>
</Grid>))}
</Grid>
<Grid container spacing={12} p={3} key={0}>
<Grid container spacing={5} p={3} key={0}>
{overviewInfoPercentData.map(({ title, data }, index) => (
<Grid item md={12} key={index}>
<Typography variant="h6">
{title}
</Typography>
<Paper elevation={12}>
<div>
<PercentStackedApacheEchart data={data}/>
</div>
</Paper>
<Box>
<PercentStackedApacheEchart data={data}/>
</Box>
</Grid>
))}
</Grid>
<Grid container spacing={12} p={3}>
<Grid container spacing={5} p={3}>
{overviewInfoData.map(({ title, data }, index) => (
<Grid item md={12} key={index}>
<Typography variant="h6">
{title}
</Typography>
<Paper elevation={12}>
<div>
<StackedApacheEchart data={data}/>
</div>
</Paper>
<Box>
<StackedApacheEchart data={data}/>
</Box>
</Grid>
))}
</Grid>
Expand Down
29 changes: 15 additions & 14 deletions components/ProtocolView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {OverviewTimeSeriesRawData, TimeSeriesRawData} from "@/components/TimeSer
import { totalErrorBreakdownByDayOverViewInfo, totalSuccessVsFailureOverViewInfo } from "./Overview";
import StackedApacheEchart from "./ApacheStackedBar";
import PercentStackedApacheEchart from "./ApacheStackedBarPercent";
import Box from '@mui/material/Box';

interface ProtocolViewProps {
requester: string;
Expand Down Expand Up @@ -98,25 +99,25 @@ export default function ProtocolView({requester, clients, providers, dateRange,
<Typography variant="h6">
Provider {provider} Status Breakdown (Count)
</Typography>
<Paper elevation={12}>
<Box>
<div style={{height: 400}}>
<LazyTimeSeries
rawData={rawDataPerProvider.find(([providerName, _]) => providerName === provider)?.[1] ?? ['14d', []]}
type={'status-count'}/>
</div>
</Paper>
</Box>
</Grid>
<Grid item md={5}>
<Typography variant="h6">
Provider {provider} Status Breakdown (Ratio)
</Typography>
<Paper elevation={12}>
<Box>
<div style={{height: 400}}>
<LazyTimeSeries
rawData={rawDataPerProvider.find(([providerName, _]) => providerName === provider)?.[1] ?? ['14d', []]}
type={'status'}/>
</div>
</Paper>
</Box>
</Grid>
</Grid>
<Grid container spacing={10} p={3}>
Expand All @@ -138,25 +139,25 @@ export default function ProtocolView({requester, clients, providers, dateRange,
<Typography variant="h6">
Client {client} Status Breakdown (Count)
</Typography>
<Paper elevation={12}>
<Box>
<div style={{height: 400}}>
<LazyTimeSeries
rawData={rawDataPerClient.find(([clientName, _]) => clientName === client)?.[1] ?? ['14d', []]}
type={'status-count'}/>
</div>
</Paper>
</Box>
</Grid>
<Grid item md={5}>
<Typography variant="h6">
Client {client} Status Breakdown (Ratio)
</Typography>
<Paper elevation={12}>
<Box>
<div style={{height: 400}}>
<LazyTimeSeries
rawData={rawDataPerClient.find(([clientName, _]) => clientName === client)?.[1] ?? ['14d', []]}
type={'status'}/>
</div>
</Paper>
</Box>
</Grid>
</Grid>
</div>
Expand Down Expand Up @@ -216,14 +217,14 @@ function overviewInfoView(overviewDataList: { overviewTimeSeries: OverviewTimeSe
<Grid container spacing={10} key={0} p={3}>
{totalCallsData.map(({ id, value }, index) => (
<Grid item md={4} key={index}>
<Paper elevation={12}>
<Box>
<Typography variant="subtitle1" align={'center'}>
{id.toUpperCase()} Total Call Count Last 30 days
</Typography>
<Typography variant="h4" align={'center'}>
{value}
</Typography>
</Paper>
</Box>
</Grid>))}
</Grid>
<Grid container spacing={12} p={3} key={0}>
Expand All @@ -232,11 +233,11 @@ function overviewInfoView(overviewDataList: { overviewTimeSeries: OverviewTimeSe
<Typography variant="h6">
{title}
</Typography>
<Paper elevation={12}>
<Box>
<div>
<PercentStackedApacheEchart data={data}/>
</div>
</Paper>
</Box>
</Grid>
))}
</Grid>
Expand All @@ -246,11 +247,11 @@ function overviewInfoView(overviewDataList: { overviewTimeSeries: OverviewTimeSe
<Typography variant="h6">
{title}
</Typography>
<Paper elevation={12}>
<Box>
<div>
<StackedApacheEchart data={data}/>
</div>
</Paper>
</Box>
</Grid>
))}
</Grid>
Expand Down