Skip to content

Commit 4588aed

Browse files
committed
delete confirm
1 parent cc73e0c commit 4588aed

File tree

8 files changed

+48
-10
lines changed

8 files changed

+48
-10
lines changed

src/App.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
padding: 5px;
6464
}
6565

66+
.raw-data-area{
67+
overflow-y: auto;
68+
}
6669
.add-div{
6770
bottom: 0;
6871
position: absolute;

src/components/Content/Add/Add.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import '../../../App.css';
33
import Fab from '@material-ui/core/Fab';
44
import AddIcon from '@material-ui/icons/Add';
55
import AddDialog from './AddDialog/AddDialog';
6-
import { getThemeProps } from '@material-ui/styles';
76

87
export default function Add(props){
98

src/components/Content/Add/AddDialog/AddDialog.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React from 'react';
22
import '../../../../App.css';
33
import Button from '@material-ui/core/Button';
44
import TextField from '@material-ui/core/TextField';
5-
import Autocomplete from '@material-ui/lab/Autocomplete';
65
import Dialog from '@material-ui/core/Dialog';
76
import DialogActions from '@material-ui/core/DialogActions';
87
import DialogContent from '@material-ui/core/DialogContent';
@@ -12,7 +11,6 @@ import 'date-fns';
1211
import DateFnsUtils from '@date-io/date-fns';
1312
import {
1413
MuiPickersUtilsProvider,
15-
KeyboardTimePicker,
1614
KeyboardDatePicker,
1715
} from '@material-ui/pickers';
1816

src/components/Content/Content.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import '../../App.css';
33
import Graph from './Graph/Graph';
44
import Stats from './Stats/Stats';
55
import Add from './Add/Add'
6-
import Divider from '@material-ui/core/Divider';
76
import Options from './Options/Options'
87

98
class Content extends React.Component {
@@ -25,7 +24,7 @@ class Content extends React.Component {
2524
<>
2625
<div className='content'>
2726
<Graph data={this.props.data} valueType={this.props.valueType} gym={ this.isGym() }/>
28-
<Options delete={this.props.delete}/>
27+
<Options delete={this.props.delete} title={this.props.title}/>
2928
{stats}
3029
</div>
3130
<Add title={this.props.title} newValue={this.props.newValue} category={this.props.category}
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,29 @@
11
import React from 'react';
22
import '../../../App.css';
33
import DeleteIcon from '@material-ui/icons/Delete';
4+
import Wtf from './Wtf/Wtf';
45

56
export default function Options(props) {
67

8+
const [open, setOpen] = React.useState(false);
9+
10+
const dialogClick = () => {
11+
setOpen(true);
12+
};
13+
14+
const dialogClose = () => {
15+
setOpen(false);
16+
};
17+
18+
const dialogDone = () => {
19+
props.delete();
20+
setOpen(false);
21+
};
22+
723
return (
824
<div className="options" dir="rtl">
9-
<DeleteIcon onClick={props.delete}/>
25+
<DeleteIcon onClick={dialogClick}/>
26+
<Wtf open={open} dialogClose={dialogClose} dialogDone={dialogDone} title={props.title}/>
1027
</div>
1128
)
1229
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import React from 'react';
2+
import '../../../../App.css';
3+
import Dialog from '@material-ui/core/Dialog';
4+
import DialogActions from '@material-ui/core/DialogActions';
5+
import DialogContent from '@material-ui/core/DialogContent';
6+
import DialogContentText from '@material-ui/core/DialogContentText';
7+
import DialogTitle from '@material-ui/core/DialogTitle';
8+
import Button from '@material-ui/core/Button';
9+
10+
export default function Wtf(props) {
11+
12+
return (
13+
<Dialog open={props.open} onClose={props.dialogClose} aria-labelledby="form-dialog-title">
14+
<DialogTitle>Delete {props.title}?</DialogTitle>
15+
<DialogActions>
16+
<Button onClick={props.dialogClose} color="primary" className="raw">No</Button>
17+
<Button onClick={props.dialogDone}
18+
color="primary">
19+
Delete
20+
</Button>
21+
</DialogActions>
22+
</Dialog>
23+
)
24+
}
25+

src/components/Content/Stats/DataDialog/DataDialog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function DataDialog(props) {
1717
return (
1818
<Dialog open={props.open} onClose={props.dialogClose} aria-labelledby="form-dialog-title">
1919
<DialogTitle>Raw data:</DialogTitle>
20-
<DialogContent>
20+
<DialogContent className="raw-data-area">
2121
{fields}
2222
</DialogContent>
2323
<DialogActions>

src/components/Header/Header.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import React from 'react';
22
import '../../App.css';
3-
import { makeStyles } from '@material-ui/core/styles';
43
import AppBar from '@material-ui/core/AppBar';
54
import Toolbar from '@material-ui/core/Toolbar';
65
import Typography from '@material-ui/core/Typography';
76
import Button from '@material-ui/core/Button';
8-
import IconButton from '@material-ui/core/IconButton';
9-
import MenuIcon from '@material-ui/icons/Menu';
107
import Menu from '@material-ui/core/Menu';
118
import MenuItem from '@material-ui/core/MenuItem';
129
import FormDialog from './Dialog/Dialog';

0 commit comments

Comments
 (0)