Skip to content

Commit 97dfddb

Browse files
committed
web - checkin builder layout
1 parent ddfaf2d commit 97dfddb

File tree

10 files changed

+295
-395
lines changed

10 files changed

+295
-395
lines changed

Diff for: apps/web/src/app/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ const drawerWidth = 240;
4343
const useStyles = makeStyles((theme: Theme) =>
4444
createStyles({
4545
root: {
46-
display: 'flex'
46+
display: 'flex',
47+
height: '100%'
4748
},
4849
appBar: {
4950
width: `calc(100% - ${drawerWidth}px)`,

Diff for: apps/web/src/app/pages/achievement-categories.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import DeleteIcon from '@material-ui/icons/Delete';
88
import { DataGrid, GridColDef } from '@material-ui/data-grid';
99
import { IconButton } from '@material-ui/core';
1010
import db from '@act/data/web';
11+
import { GridContainer } from '../shared/components/TableContainer';
1112

1213
const columns: GridColDef[] = [
1314
{
@@ -75,7 +76,7 @@ const AchievementCategories = () => {
7576
return (
7677
<main className={classes.content}>
7778
<div className={classes.toolbar} />
78-
<div style={{ height: 400, width: '100%' }}>
79+
<GridContainer>
7980
<DataGrid
8081
editMode="client"
8182
rows={achievementCategories}
@@ -84,7 +85,7 @@ const AchievementCategories = () => {
8485
pageSize={5}
8586
checkboxSelection
8687
/>
87-
</div>
88+
</GridContainer>
8889
</main>
8990
);
9091
};

Diff for: apps/web/src/app/pages/achievement.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { IconButton, NativeSelect, Select } from '@material-ui/core';
1010
import MenuItem from '@material-ui/core/MenuItem';
1111
import db from '@act/data/web';
1212
import { Achievement, AchievementCategory } from '@act/data/core';
13+
import { GridContainer } from '../shared/components/TableContainer';
1314

1415
const useStyles = makeStyles((theme: Theme) =>
1516
createStyles({
@@ -138,7 +139,7 @@ const Achievements = () => {
138139
return (
139140
<main className={classes.content}>
140141
<div className={classes.toolbar} />
141-
<div style={{ height: 400, width: '100%' }}>
142+
<GridContainer>
142143
<DataGrid
143144
editMode="client"
144145
rows={achievements}
@@ -147,7 +148,7 @@ const Achievements = () => {
147148
pageSize={5}
148149
checkboxSelection
149150
/>
150-
</div>
151+
</GridContainer>
151152
</main>
152153
);
153154
};

Diff for: apps/web/src/app/pages/checkins.tsx

+33-29
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
import React, { useEffect } from 'react';
1+
import React, { useEffect, useState } from 'react';
22
import {
33
createStyles,
44
Theme,
55
makeStyles
66
} from '@material-ui/core/styles';
77
import { DataGrid, GridColDef } from '@material-ui/data-grid';
88
import db from '@act/data/web';
9-
import { Checkin } from '@act/data/core';
9+
import { AchievementCategory, Checkin } from '@act/data/core';
1010
import { CreateCheckin } from '../shared/components/CreateCheckin';
11+
import { GridContainer } from '../shared/components/TableContainer';
12+
import { IconButton, MenuItem, Select } from '@material-ui/core';
13+
import DeleteIcon from '@material-ui/icons/Delete';
1114

1215
const Checkins = ({ open, onDismiss }) => {
1316
const classes = useStyles();
@@ -35,30 +38,13 @@ const Checkins = ({ open, onDismiss }) => {
3538
[checkins]
3639
);
3740

38-
const [personName, setPersonName] = React.useState([]);
39-
const handleChange = (event) => {
40-
setPersonName(event.target.value);
41-
};
42-
43-
const names = [
44-
'Oliver Hansen',
45-
'Van Henry',
46-
'April Tucker',
47-
'Ralph Hubbard',
48-
'Omar Alexander',
49-
'Carlos Abbott',
50-
'Miriam Wagner',
51-
'Bradley Wilkerson',
52-
'Virginia Andrews',
53-
'Kelly Snyder'
54-
];
55-
5641
return (
57-
<>
58-
<CreateCheckin onDismiss={onDismiss} open={open} />
59-
<main className={classes.content}>
60-
<div className={classes.toolbar} />
61-
<div style={{ height: 1000, width: '100%' }}>
42+
<main className={classes.content}>
43+
<div className={classes.toolbar} />
44+
<GridContainer>
45+
{open ? (
46+
<CreateCheckin onDismiss={onDismiss} />
47+
) : (
6248
<DataGrid
6349
editMode="client"
6450
rows={checkins}
@@ -67,9 +53,9 @@ const Checkins = ({ open, onDismiss }) => {
6753
pageSize={100}
6854
checkboxSelection
6955
/>
70-
</div>
71-
</main>
72-
</>
56+
)}
57+
</GridContainer>
58+
</main>
7359
);
7460
};
7561

@@ -84,6 +70,25 @@ const columns: GridColDef[] = [
8470
field: 'created_at',
8571
headerName: 'Created',
8672
width: 200
73+
},
74+
{
75+
field: '',
76+
filterable: false,
77+
width: 200,
78+
disableColumnMenu: true,
79+
sortable: false,
80+
disableClickEventBubbling: true,
81+
renderCell: ({ id }) => {
82+
return (
83+
<IconButton
84+
onClick={() => db.models.communities.delete(id)}
85+
aria-label="delete"
86+
color="secondary"
87+
>
88+
<DeleteIcon />
89+
</IconButton>
90+
);
91+
}
8792
}
8893
];
8994

@@ -94,7 +99,6 @@ const useStyles = makeStyles((theme: Theme) =>
9499
backgroundColor: theme.palette.background.default,
95100
padding: theme.spacing(3)
96101
},
97-
98102
formControl: {
99103
margin: theme.spacing(1),
100104
minWidth: 120,

Diff for: apps/web/src/app/pages/communities.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import DeleteIcon from '@material-ui/icons/Delete';
88
import { DataGrid, GridColDef } from '@material-ui/data-grid';
99
import { IconButton } from '@material-ui/core';
1010
import db from '@act/data/web';
11+
import { GridContainer } from '../shared/components/TableContainer';
1112

1213
const columns: GridColDef[] = [
1314
{
@@ -67,7 +68,7 @@ const Communities = () => {
6768
return (
6869
<main className={classes.content}>
6970
<div className={classes.toolbar} />
70-
<div style={{ height: 400, width: '100%' }}>
71+
<GridContainer>
7172
<DataGrid
7273
editMode="client"
7374
rows={communities}
@@ -76,7 +77,7 @@ const Communities = () => {
7677
pageSize={5}
7778
checkboxSelection
7879
/>
79-
</div>
80+
</GridContainer>
8081
</main>
8182
);
8283
};

0 commit comments

Comments
 (0)