Skip to content

Commit 0710f66

Browse files
committed
Fix dashbpard cards layout
1 parent 676be88 commit 0710f66

File tree

1 file changed

+44
-43
lines changed

1 file changed

+44
-43
lines changed

src/pages/dashboard/Dashboard.js

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const Dashboard = ({ classes, theme, ...props }) => {
8282
<React.Fragment>
8383
<PageTitle title="Dashboard" button="Latest Reports" />
8484
<Grid container spacing={32}>
85-
<Grid item md={3} sm={6} xs={12}>
85+
<Grid item lg={3} md={4} sm={6} xs={12}>
8686
<Widget
8787
title="Visits Today"
8888
upperTitle
@@ -135,47 +135,7 @@ const Dashboard = ({ classes, theme, ...props }) => {
135135
</Grid>
136136
</Widget>
137137
</Grid>
138-
<Grid item md={3} sm={6} xs={12}>
139-
<Widget title="Revenue Breakdown" upperTitle className={classes.card}>
140-
<Grid container spacing={16}>
141-
<Grid item sm={6}>
142-
<PieChart
143-
width={160}
144-
height={144}
145-
margin={{ left: theme.spacing.unit * 2 }}
146-
>
147-
<Pie
148-
data={PieChartData}
149-
innerRadius={45}
150-
outerRadius={60}
151-
dataKey="value"
152-
>
153-
{PieChartData.map((entry, index) => (
154-
<Cell
155-
key={`cell-${index}`}
156-
fill={theme.palette[entry.color].main}
157-
/>
158-
))}
159-
</Pie>
160-
</PieChart>
161-
</Grid>
162-
<Grid item sm={6}>
163-
<div className={classes.pieChartLegendWrapper}>
164-
{PieChartData.map(({ name, value, color }, index) => (
165-
<div key={color} className={classes.legendItemContainer}>
166-
<Dot color={color} />
167-
<Typography>&nbsp;{name}&nbsp;</Typography>
168-
<Typography color="textSecondary">
169-
&nbsp;{value}
170-
</Typography>
171-
</div>
172-
))}
173-
</div>
174-
</Grid>
175-
</Grid>
176-
</Widget>
177-
</Grid>
178-
<Grid item md={3} sm={6} xs={12}>
138+
<Grid item lg={3} md={8} sm={6} xs={12}>
179139
<Widget
180140
title="App Performance"
181141
upperTitle
@@ -234,7 +194,7 @@ const Dashboard = ({ classes, theme, ...props }) => {
234194
</div>
235195
</Widget>
236196
</Grid>
237-
<Grid item md={3} sm={6} xs={12}>
197+
<Grid item lg={3} md={8} sm={6} xs={12}>
238198
<Widget
239199
title="Server Overview"
240200
upperTitle
@@ -309,6 +269,46 @@ const Dashboard = ({ classes, theme, ...props }) => {
309269
</div>
310270
</Widget>
311271
</Grid>
272+
<Grid item lg={3} md={4} sm={6} xs={12}>
273+
<Widget title="Revenue Breakdown" upperTitle className={classes.card}>
274+
<Grid container spacing={16}>
275+
<Grid item sm={6}>
276+
<PieChart
277+
width={160}
278+
height={144}
279+
margin={{ left: theme.spacing.unit * 2 }}
280+
>
281+
<Pie
282+
data={PieChartData}
283+
innerRadius={45}
284+
outerRadius={60}
285+
dataKey="value"
286+
>
287+
{PieChartData.map((entry, index) => (
288+
<Cell
289+
key={`cell-${index}`}
290+
fill={theme.palette[entry.color].main}
291+
/>
292+
))}
293+
</Pie>
294+
</PieChart>
295+
</Grid>
296+
<Grid item sm={6}>
297+
<div className={classes.pieChartLegendWrapper}>
298+
{PieChartData.map(({ name, value, color }, index) => (
299+
<div key={color} className={classes.legendItemContainer}>
300+
<Dot color={color} />
301+
<Typography>&nbsp;{name}&nbsp;</Typography>
302+
<Typography color="textSecondary">
303+
&nbsp;{value}
304+
</Typography>
305+
</div>
306+
))}
307+
</div>
308+
</Grid>
309+
</Grid>
310+
</Widget>
311+
</Grid>
312312
<Grid item xs={12}>
313313
<Widget
314314
header={
@@ -471,6 +471,7 @@ const styles = theme => ({
471471
legendElement: {
472472
display: "flex",
473473
alignItems: "center",
474+
marginRight: theme.spacing.unit * 2,
474475
},
475476
legendElementText: {
476477
marginLeft: theme.spacing.unit

0 commit comments

Comments
 (0)