Skip to content

Commit 77a288c

Browse files
committed
🚀 added support for avg charts and fixed UI across the board
1 parent 455a7ed commit 77a288c

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

admin/src/pages/Create/index.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,11 @@ function Create() {
196196

197197
{collection.uid && (
198198
<Box>
199-
<Box padding={6}>
199+
<Box paddingTop={6} paddingBottom={6}>
200200
<Divider />
201201
</Box>
202202

203-
<Box paddingTop={2}>
203+
<Box>
204204
<Typography variant="delta">{'Timestamp settings '}</Typography>
205205
</Box>
206206
<Box paddingTop={2}>
@@ -237,13 +237,13 @@ function Create() {
237237
<Box paddingTop={6}>
238238
<Typography variant="delta">{'Select the charts you want to create '}</Typography>
239239
<Box>
240-
<Typography>{'(More will be added later) '}</Typography>
240+
<Typography textColor="neutral600">{'(More will be added later) '}</Typography>
241241
</Box>
242242
</Box>
243-
<Box paddingTop={2}>
244-
<Grid gap={[3, 2, 2 ]}>
243+
<Box paddingTop={4}>
244+
<Grid gap={[4, 4, 4 ]}>
245245
{templateCharts.map((chart) => (
246-
<GridItem col={2} s={4} xs={6} key={chart.tid}>
246+
<GridItem col={3} s={4} xs={6} key={chart.tid}>
247247
<Checkbox
248248
checked={selectedCharts.indexOf(chart.tid) > -1}
249249
onClick={() => _onToggleChart(chart)}
@@ -255,14 +255,14 @@ function Create() {
255255
</Grid>
256256
</Box>
257257

258-
<Box padding={6}>
258+
<Box paddingTop={6} paddingBottom={6}>
259259
<Divider />
260260
</Box>
261261

262-
<Box paddingTop={6}>
262+
<Box>
263263
<Typography variant="delta">{'Choose a dashboard where to place the charts '}</Typography>
264264
<Box>
265-
<Typography>{'Or leave empty to create a new dashboard '}</Typography>
265+
<Typography textColor="neutral600">{'Or leave empty to create a new dashboard '}</Typography>
266266
</Box>
267267
</Box>
268268
<Box paddingTop={2}>

admin/src/pages/Dashboard/index.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ function Dashboard() {
178178
)}
179179

180180
{!pageLoading && store.defaultProject && user.id && projects.length > 0 && (
181-
<Box padding={4}>
181+
<Box>
182182
<Combobox
183183
label="Select a Chartbrew dashboard"
184184
placeholder="Select a dashboard"
@@ -239,11 +239,11 @@ function Dashboard() {
239239
hasRadius
240240
background="neutral0"
241241
shadow="tableShadow"
242-
col={(12 - (12 / chart.chartSize)) || 3}
242+
col={(12 - (12 / chart.chartSize)) || 4}
243243
s={12}
244244
style={{ height: 320 }}
245245
>
246-
<Typography>{chart.name}</Typography>
246+
<Typography variant="delta">{chart.name}</Typography>
247247
{chart.chartData && chart.type === 'line' && (
248248
<LineChart chart={chart} />
249249
)}
@@ -264,6 +264,9 @@ function Dashboard() {
264264
{chart.type === 'polar' && (
265265
<PolarChart chart={chart} />
266266
)}
267+
{chart.type === 'avg' && (
268+
<LineChart chart={chart} />
269+
)}
267270
</GridItem>
268271
))}
269272
</Grid>

0 commit comments

Comments
 (0)