Skip to content

Commit c280592

Browse files
committed
journalform: switch to date pakcer
Not sure this is worht the effort!!
1 parent b461919 commit c280592

File tree

2 files changed

+51
-10
lines changed

2 files changed

+51
-10
lines changed

src/components/journal.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import {compareJournals} from '../utils/utils.js'
1111
import {mapJournalToProps as mapStateToProps} from '../utils/stateMaps.js'
1212
import store from '../store.js'
1313
import { filterEntries} from '../utils/filters.jsx'
14-
14+
import MomentUtils from '@date-io/moment';
15+
import SessionTimePicker from './picker.jsx'
16+
import { MuiPickersUtilsProvider } from '@material-ui/pickers';
1517

1618
export class Journal extends React.Component {
1719

@@ -30,6 +32,8 @@ export class Journal extends React.Component {
3032
// console.log('MAINJOURNALENTRIES', this.props.entries)
3133

3234
return (
35+
<MuiPickersUtilsProvider utils={MomentUtils}>
36+
<SessionTimePicker/>
3337
<div className="journal">
3438
<JournalForm submit="add"/>
3539
<JournalFilter/>
@@ -38,6 +42,8 @@ export class Journal extends React.Component {
3842
uid={this.props.uid}
3943
entries={this.props.entries}/>
4044
</div>
45+
</MuiPickersUtilsProvider>
46+
4147
)
4248
}
4349
}

src/components/journalForm.js

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,26 @@ import firebase from '../firebase.js'
99
import moment from 'moment'
1010
import {mapJournalToProps as mapStateToProps} from '../utils/stateMaps.js'
1111
import StarRating from './star-rating.jsx'
12+
import {
13+
DatePicker,
14+
TimePicker,
15+
DateTimePicker,
16+
KeyboardDateTimePicker,
17+
MuiPickersUtilsProvider,
18+
} from '@material-ui/pickers';
19+
import green from "@material-ui/core/colors/green";
20+
import { createMuiTheme } from "@material-ui/core";
21+
import { ThemeProvider } from "@material-ui/styles";
1222

23+
const defaultMaterialTheme = createMuiTheme({
24+
palette: {
25+
primary: green,
26+
},
27+
typography: {
28+
// Tell Material-UI what's the font-size on the html element is.
29+
htmlFontSize: 10,
30+
},
31+
});
1332

1433
export class SelectSpot extends React.Component {
1534

@@ -22,8 +41,7 @@ export class SelectSpot extends React.Component {
2241
handleChange = (event) => {
2342
const target = event.target;
2443
const value = target.type ==='checkbox' ? target.checked : target.value;
25-
const name = target.name;
26-
44+
const name = target.name;
2745
this.setState({[name]: value})
2846
}
2947
render () {
@@ -56,12 +74,13 @@ export class JournalForm extends React.Component {
5674
const {spot, date, entry, id, rating} = this.props
5775
this.state = {
5876
spot: spot || "grand",
59-
date: date || moment().format('YYYY-MM-DD'),
60-
entry: entry,
61-
rating: rating,
77+
date: date || moment().subtract(2, 'hours').minutes(0).valueOf(),
78+
entry: entry || '',
79+
rating: rating || false,
6280
id : id || uuid()
6381
}
6482
}
83+
6584
handleSubmit = (entry) => {
6685
// const uid = this.props.uid || 'anonymous'
6786
// console.log('FORMUPDATE', entry);
@@ -87,6 +106,9 @@ export class JournalForm extends React.Component {
87106
this.setState({[name]: value})
88107
}
89108

109+
handleDateChange = (value) => {
110+
this.setState({date: moment(value).valueOf()})
111+
}
90112
onSubmit = (event) => {
91113
const {spot, date,entry,id, rating} = this.state;
92114
const info = {
@@ -111,11 +133,24 @@ export class JournalForm extends React.Component {
111133
render() {
112134
return (
113135
<form onSubmit={this.onSubmit}>
114-
<fieldset>
136+
<fieldset className="details">
115137
<SelectSpot onChange={this.handleChange} current={this.state.spot}/>
116-
<label >
117-
date:
118-
<input name="date" type="text" value={this.state.date} onChange={this.handleChange}/>
138+
{/* <label > */}
139+
{/* date: */}
140+
141+
{/* <input name="date" type="text" value={this.state.date} onChange={this.handleChange}/> */}
142+
{/* </label> */}
143+
<label>
144+
date2:
145+
<ThemeProvider theme={defaultMaterialTheme}>
146+
<KeyboardDateTimePicker name="date" value={this.state.date}
147+
onChange={this.handleDateChange}
148+
autoOk={false}
149+
format="YYYY/MM/DD HH:mm"
150+
className="full-width"
151+
minutesStep={15}
152+
/>
153+
</ThemeProvider>
119154
</label>
120155
<label>
121156
Quality:

0 commit comments

Comments
 (0)