equal
deleted
inserted
replaced
1 import React, { Component } from 'react'; |
1 import React, { Component } from 'react'; |
2 import { connect } from 'react-redux'; |
2 import { connect } from 'react-redux'; |
3 import { bindActionCreators } from 'redux'; |
3 import { bindActionCreators } from 'redux'; |
4 import { Form, FormControl, Button, Label, Row, Col, Panel } from 'react-bootstrap'; |
4 import { Form, FormControl, Button, Label } from 'react-bootstrap'; |
5 import moment from 'moment'; |
5 import moment from 'moment'; |
6 |
6 |
7 import PropTypes from 'prop-types'; |
7 import PropTypes from 'prop-types'; |
8 import SlateEditor from './SlateEditor'; |
8 import SlateEditor from './SlateEditor'; |
9 import Clock from './Clock' |
|
10 import * as notesActions from '../actions/notesActions'; |
9 import * as notesActions from '../actions/notesActions'; |
11 |
10 |
12 class NoteInput extends Component { |
11 class NoteInput extends Component { |
13 |
12 |
14 state = { |
13 state = { |
65 } |
64 } |
66 |
65 |
67 render() { |
66 render() { |
68 return ( |
67 return ( |
69 <Form> |
68 <Form> |
70 <Panel> |
|
71 <Row> |
|
72 <Col md={6}> |
|
73 { this.renderTiming() } |
|
74 </Col> |
|
75 <Col md={6} className="text-right"> |
|
76 <Clock /> |
|
77 </Col> |
|
78 </Row> |
|
79 </Panel> |
|
80 <div className="editor"> |
69 <div className="editor"> |
81 <div className="editor-left"> |
70 <div className="editor-left"> |
82 <SlateEditor ref="editor" onChange={this.onEditorChange} /> |
71 <SlateEditor ref="editor" onChange={this.onEditorChange} onEnterKeyDown={this.onAddNoteClick} /> |
83 </div> |
72 </div> |
84 <div className="editor-right"> |
73 <div className="editor-right"> |
85 <FormControl |
74 <FormControl |
86 name="margin" |
75 name="margin" |
87 componentClass="textarea" |
76 componentClass="textarea" |