| author | ymh <ymh.work@gmail.com> |
| Wed, 05 Sep 2018 12:27:52 +0200 | |
| changeset 155 | e55ae84508bf |
| parent 154 | a28361bda28c |
| child 156 | 384f4539b76a |
| permissions | -rw-r--r-- |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
1 |
import React, { Component } from 'react'; |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
2 |
import { connect } from 'react-redux'; |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
3 |
import { bindActionCreators } from 'redux'; |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
4 |
import Modal from 'react-modal'; |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
5 |
import moment from 'moment'; |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
6 |
import '../App.css'; |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
137
diff
changeset
|
7 |
import './SessionList.css'; |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
8 |
import Navbar from './Navbar'; |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
9 |
import * as sessionsActions from '../actions/sessionsActions'; |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
10 |
import uuidV1 from 'uuid/v1'; |
|
137
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
133
diff
changeset
|
11 |
import { getActiveSessions } from '../selectors/coreSelectors'; |
|
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
133
diff
changeset
|
12 |
import { getCurrentUser, getGroups, getCurrentGroup } from '../selectors/authSelectors'; |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
13 |
|
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
14 |
class SessionList extends Component { |
| 148 | 15 |
|
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
16 |
state = { |
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
17 |
show: false, |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
18 |
modalIsOpen: false, |
|
147
a2e61192db50
Adapt session list display in css
salimr <riwad.salim@yahoo.fr>
parents:
146
diff
changeset
|
19 |
sessionToDelete: null, |
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
20 |
} |
|
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
21 |
|
| 151 | 22 |
componentWillMount() { |
23 |
Modal.setAppElement('body'); |
|
24 |
} |
|
25 |
||
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
26 |
doSomething(e){ |
|
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
27 |
e.preventDefault(); |
|
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
28 |
console.log(e.target.innerHTML); |
|
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
29 |
} |
|
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
30 |
|
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
31 |
openModal = () => { |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
32 |
this.setState({modalIsOpen: true}); |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
33 |
} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
34 |
|
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
35 |
closeModal = () => { |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
36 |
this.setState({modalIsOpen: false}); |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
37 |
} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
38 |
|
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
39 |
handleModalCloseRequest = () => { |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
40 |
// opportunity to validate something and keep the modal open even if it |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
41 |
// requested to be closed |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
42 |
this.setState({modalIsOpen: false}); |
|
95
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
43 |
} |
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
44 |
|
|
93
469da13402e2
Allow to delete session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
45 |
onClickDelete(session, e) { |
|
469da13402e2
Allow to delete session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
46 |
e.preventDefault(); |
|
469da13402e2
Allow to delete session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
47 |
e.stopPropagation(); |
|
469da13402e2
Allow to delete session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
48 |
|
|
147
a2e61192db50
Adapt session list display in css
salimr <riwad.salim@yahoo.fr>
parents:
146
diff
changeset
|
49 |
|
|
95
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
50 |
this.setState({ |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
51 |
modalIsOpen: true, |
|
95
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
52 |
sessionToDelete: session |
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
53 |
}) |
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
54 |
} |
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
55 |
|
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
56 |
deleteSession = () => { |
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
57 |
const { sessionToDelete } = this.state; |
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
58 |
|
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
59 |
this.props.sessionsActions.deleteSession(sessionToDelete); |
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
60 |
|
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
61 |
this.setState({ |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
62 |
modalIsOpen: false, |
|
95
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
63 |
sessionToDelete: null |
|
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
64 |
}) |
|
93
469da13402e2
Allow to delete session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
65 |
} |
|
469da13402e2
Allow to delete session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
66 |
|
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
67 |
render() { |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
68 |
return ( |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
69 |
<div> |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
70 |
<Navbar history={this.props.history} /> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
137
diff
changeset
|
71 |
<div className="container-fluid"> |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
72 |
<div className="row mt-5 pt-5"> |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
73 |
{this.props.sessions.map((session) => |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
74 |
<div className="col-lg-4" id="session"> |
|
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
75 |
<div className="col-md-auto m-4 p-4 session" key={session.get('_id')}> |
| 151 | 76 |
<a className="sessions" onClick={() => this.props.history.push('/sessions/' + session.get('_id'))}> |
77 |
<span className="session-title text-primary">{session.title || 'Session sans titre'}<br /></span> |
|
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
78 |
<span className="session-date text-muted">{moment(session.get('date')).format('DD/MM/YYYY')}<br /></span> |
| 151 | 79 |
<span className="session-description text-dark">{session.description}<br /></span> |
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
80 |
</a> |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
81 |
<button type="button" id="delete" className="btn btn-link float-left" onClick={ this.onClickDelete.bind(this, session) }> |
|
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
82 |
<span className="material-icons delete text-dark">delete</span> |
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
83 |
</button> |
|
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
84 |
</div> |
|
147
a2e61192db50
Adapt session list display in css
salimr <riwad.salim@yahoo.fr>
parents:
146
diff
changeset
|
85 |
</div> |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
86 |
)} |
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
87 |
</div> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
137
diff
changeset
|
88 |
</div> |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
89 |
<Modal |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
90 |
className="Modal__Bootstrap modal-dialog mt-5 pt-5 justify-content-lg-center" |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
91 |
// closeTimeoutMS={150} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
92 |
isOpen={this.state.modalIsOpen} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
93 |
onRequestClose={this.handleModalCloseRequest} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
94 |
> |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
95 |
<div id="delete-session-modal" className="modal-content"> |
|
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
96 |
<span id="delete-session-close-modal-button" className="material-icons p-0 text-right" onClick={ this.handleModalCloseRequest }>close</span> |
|
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
97 |
<div className="modal-body text-center"> |
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
98 |
<span className="modal-text">Êtes-vous sûr(e) de vouloir supprimer cette session ?</span> |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
99 |
<button type="button" className="btn btn-primary text-secondary font-weight-bold py-1 px-2 mt-3" id="delete-session-modal-button" onClick={ this.deleteSession }>Confirmer</button> |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
100 |
</div> |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
101 |
</div> |
|
95
7bc08467c726
Add confirmation when deleting session.
Alexandre Segura <mex.zktk@gmail.com>
parents:
93
diff
changeset
|
102 |
</Modal> |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
103 |
</div> |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
104 |
); |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
105 |
} |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
106 |
} |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
107 |
|
|
147
a2e61192db50
Adapt session list display in css
salimr <riwad.salim@yahoo.fr>
parents:
146
diff
changeset
|
108 |
|
|
a2e61192db50
Adapt session list display in css
salimr <riwad.salim@yahoo.fr>
parents:
146
diff
changeset
|
109 |
|
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
110 |
function mapStateToProps(state, props) { |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
111 |
return { |
|
137
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
133
diff
changeset
|
112 |
sessions: getActiveSessions(state), |
|
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
133
diff
changeset
|
113 |
currentUser: getCurrentUser(state), |
|
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
133
diff
changeset
|
114 |
groups: getGroups(state), |
|
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
133
diff
changeset
|
115 |
currentGroup: getCurrentGroup(state) |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
116 |
}; |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
117 |
} |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
118 |
|
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
119 |
function mapDispatchToProps(dispatch) { |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
120 |
return { |
|
133
6f3078f7fd47
Work on correct protocol propagation
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
121 |
sessionsActions: bindActionCreators(sessionsActions, dispatch), |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
122 |
} |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
123 |
} |
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
124 |
|
|
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
diff
changeset
|
125 |
export default connect(mapStateToProps, mapDispatchToProps)(SessionList); |