| author | ymh <ymh.work@gmail.com> |
| Wed, 05 Sep 2018 12:27:52 +0200 | |
| changeset 155 | e55ae84508bf |
| parent 154 | a28361bda28c |
| child 161 | a642639dbc07 |
| permissions | -rw-r--r-- |
|
145
5d2bc8c877ea
Adding class for specific css in App, Navbar and SessionList components
Riwad Salim
parents:
143
diff
changeset
|
1 |
import '../index.css'; |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
2 |
import './Navbar.css'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
3 |
import PropTypes from 'prop-types'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
4 |
import React, { Component } from 'react'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
5 |
import { connect } from 'react-redux'; |
|
105
0a1d6560acac
Introduce authenticated routes.
Alexandre Segura <mex.zktk@gmail.com>
parents:
104
diff
changeset
|
6 |
import { withRouter } from 'react-router'; |
| 52 | 7 |
import { bindActionCreators } from 'redux'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
8 |
// import logo from './logo.svg'; |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
9 |
import Modal from 'react-modal'; |
| 52 | 10 |
import * as authActions from '../actions/authActions'; |
|
155
e55ae84508bf
Clean CreateSession component and remove trace of previous create session button
ymh <ymh.work@gmail.com>
parents:
154
diff
changeset
|
11 |
import * as sessionsActions from '../actions/sessionsActions'; |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
12 |
import { forceSync } from '../actions/networkActions'; |
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
13 |
import { groupSetCurrent } from '../actions/groupActions'; |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
14 |
import { isAuthenticated, getCurrentUser, getOnline, getCurrentGroup, getGroups } from '../selectors/authSelectors'; |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
15 |
import { isSynchronizing, isSynchronized } from '../selectors/syncSelectors'; |
| 151 | 16 |
import CreateSession from './CreateSession'; |
| 148 | 17 |
import NavbarLogin from './NavbarLogin'; |
18 |
import NavbarGroup from './NavbarGroup'; |
|
|
65
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
19 |
|
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
20 |
const Online = ({ online }) => { |
|
81
a6bd1aaddc34
Add online/offline indicator.
Alexandre Segura <mex.zktk@gmail.com>
parents:
65
diff
changeset
|
21 |
return ( |
| 151 | 22 |
<li className="nav-item"> |
23 |
<a className="nav-link"> |
|
24 |
<span className="material-icons" style={{ color: online ? '#2ECC71' : '#F95B5B' }}>signal_wifi_4_bar</span> |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
25 |
</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
26 |
</li> |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
27 |
) |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
28 |
} |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
29 |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
30 |
const SyncButton = ({ isAuthenticated, onSyncClick, isSynchronizing, isSynchronized, id }) => { |
|
130
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
31 |
const classnames = "material-icons" |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
32 |
+ ((!isSynchronized)?" sync-button-not-synchronized":"") |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
33 |
+ ((isSynchronizing)?" sync-button-synchronizing":""); |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
34 |
let title = "Synchronize"; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
35 |
let clickCb = onSyncClick; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
36 |
if(isSynchronizing) { |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
37 |
title = "Synchronizing..."; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
38 |
clickCb = () => {}; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
39 |
} else if (!isSynchronized) { |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
40 |
title += ": not synchronized"; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
41 |
} |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
42 |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
43 |
if (isAuthenticated) { |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
44 |
return ( |
| 151 | 45 |
<li className="nav-item"> |
46 |
<a className="nav-link" title={title} onClick={clickCb} id={id || null}> |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
47 |
<span className={classnames}></span> </a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
48 |
</li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
49 |
); |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
50 |
} |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
51 |
return ( |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
52 |
<li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
53 |
<a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
54 |
<span></span> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
55 |
</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
56 |
</li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
57 |
); |
|
81
a6bd1aaddc34
Add online/offline indicator.
Alexandre Segura <mex.zktk@gmail.com>
parents:
65
diff
changeset
|
58 |
} |
|
a6bd1aaddc34
Add online/offline indicator.
Alexandre Segura <mex.zktk@gmail.com>
parents:
65
diff
changeset
|
59 |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
60 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
61 |
class AppNavbar extends Component { |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
62 |
constructor(props) { |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
63 |
super(props); |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
64 |
this.state = { modalIsOpen: false }; |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
65 |
} |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
66 |
|
| 151 | 67 |
componentWillMount() { |
68 |
Modal.setAppElement('body'); |
|
69 |
} |
|
70 |
||
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
71 |
openModal = () => { |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
72 |
this.setState({modalIsOpen: true}); |
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
73 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
74 |
|
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
75 |
closeModal = () => { |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
76 |
this.setState({modalIsOpen: false}); |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
77 |
} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
78 |
|
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
79 |
handleModalCloseRequest = () => { |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
80 |
// 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
|
81 |
// requested to be closed |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
82 |
this.setState({modalIsOpen: false}); |
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
83 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
84 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
85 |
onClickHome = (e) => { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
86 |
e.preventDefault(); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
87 |
this.props.history.push('/'); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
88 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
89 |
|
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
90 |
isSynchronized = () => { |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
91 |
return this.props.isSynchronized; |
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
92 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
93 |
|
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
94 |
onClickLogout = (e) => { |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
95 |
e.preventDefault(); |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
96 |
const isSynchronized = this.isSynchronized(); |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
97 |
if (isSynchronized) { |
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
98 |
this.logout(); |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
99 |
} else { |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
100 |
this.openModal() |
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
101 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
102 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
103 |
|
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
104 |
confirmLogout = () => { |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
105 |
const isSynchronized = this.isSynchronized(); |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
106 |
if (!isSynchronized) { |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
107 |
this.props.authActions.resetAll(); |
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
108 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
109 |
this.logout(); |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
110 |
this.closeModal(); |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
111 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
112 |
|
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
113 |
logout = () => { |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
114 |
this.props.authActions.logout(); |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
115 |
this.props.history.push('/'); |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
116 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
117 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
118 |
onClickSessions = (e) => { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
119 |
e.preventDefault(); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
120 |
this.props.history.push('/sessions'); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
121 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
122 |
|
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
123 |
onSyncClick = (e) => { |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
124 |
e.preventDefault(); |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
125 |
this.props.networkActions.forceSync(); |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
126 |
} |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
127 |
|
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
128 |
onGroupSelect = (groupName) => { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
129 |
if(groupName === "__create_group__") { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
130 |
this.props.history.push('/create-group'); |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
131 |
} else { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
132 |
this.props.groupActions.groupSetCurrent(groupName); |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
133 |
} |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
134 |
} |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
135 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
136 |
render() { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
137 |
return ( |
| 151 | 138 |
<nav className="navbar navbar-expand-lg navbar-light bg-primary sticky-top"> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
139 |
<div className="container-fluid"> |
| 151 | 140 |
<div className="navbar-header"> |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
141 |
<a className="navbar-brand" onClick={this.onClickHome} href="/">IRI Notes</a> |
| 151 | 142 |
<button className="navbar-toggler mr-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> |
143 |
<span className="navbar-toggler-icon"></span> |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
144 |
<span className="icon-bar"></span> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
145 |
<span className="icon-bar"></span> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
146 |
<span className="icon-bar"></span> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
147 |
</button> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
148 |
</div> |
| 151 | 149 |
<div className="collapse navbar-collapse text-center" id="navbarSupportedContent"> |
150 |
<ul className="navbar-nav mr-auto"> |
|
151 |
<li className="nav-item"> |
|
152 |
<a className="nav-link " onClick={this.onClickSessions} href="/sessions">Accueil</a> |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
153 |
</li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
154 |
</ul> |
| 151 | 155 |
<ul className="navbar-nav navbar-center"> |
156 |
<li className="nav-item text-secondary"> |
|
|
155
e55ae84508bf
Clean CreateSession component and remove trace of previous create session button
ymh <ymh.work@gmail.com>
parents:
154
diff
changeset
|
157 |
<CreateSession |
|
e55ae84508bf
Clean CreateSession component and remove trace of previous create session button
ymh <ymh.work@gmail.com>
parents:
154
diff
changeset
|
158 |
history={this.props.history} |
|
e55ae84508bf
Clean CreateSession component and remove trace of previous create session button
ymh <ymh.work@gmail.com>
parents:
154
diff
changeset
|
159 |
group={this.props.currentGroup} |
|
e55ae84508bf
Clean CreateSession component and remove trace of previous create session button
ymh <ymh.work@gmail.com>
parents:
154
diff
changeset
|
160 |
createSession={this.props.sessionsActions.createSession} |
|
e55ae84508bf
Clean CreateSession component and remove trace of previous create session button
ymh <ymh.work@gmail.com>
parents:
154
diff
changeset
|
161 |
/> |
| 151 | 162 |
</li> |
163 |
</ul> |
|
164 |
<ul className="nav navbar-nav ml-auto"> |
|
| 148 | 165 |
<NavbarGroup currentGroup={this.props.currentGroup} groups={this.props.groups} onSelect={this.onGroupSelect}/> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
166 |
<SyncButton id='sync-button' isAuthenticated={this.props.isAuthenticated} onSyncClick={this.onSyncClick} isSynchronizing={this.props.isSynchronizing} isSynchronized={this.props.isSynchronized} /> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
167 |
<Online {...this.props} /> |
| 148 | 168 |
<NavbarLogin {...this.props} onLogout={this.onClickLogout} /> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
169 |
</ul> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
170 |
</div> |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
171 |
<Modal |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
172 |
className="Modal__Bootstrap modal-dialog mt-5 pt-5" |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
173 |
// closeTimeoutMS={150} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
174 |
isOpen={this.state.modalIsOpen} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
175 |
onRequestClose={this.handleModalCloseRequest} |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
176 |
> |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
177 |
<div id="logout-modal" className="modal-content"> |
|
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
178 |
<span id="logout-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
|
179 |
<div className="modal-body text-center"> |
|
150
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
180 |
<span className="material-icons modal-warning">warning</span> |
|
97536386b397
Improve Modals display and sessions list
salimr <riwad.salim@yahoo.fr>
parents:
148
diff
changeset
|
181 |
<p className="modal-text"> |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
182 |
Certaines données n'ont pas encore été sauvegardées. |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
183 |
<br /> |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
184 |
Si vous continuez, elles seront perdues. |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
185 |
</p> |
|
154
a28361bda28c
Adapt all css classes with Bootstrap 4 Utilities
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
186 |
<button type="button" className="btn btn-primary text-secondary font-weight-bold py-1 px-2 mb-3" id="logout-modal-button" onClick={ this.confirmLogout }>Confirmer</button> |
|
146
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
187 |
</div> |
|
4f4bb2b3ef39
Removing Modal from react-bootstrap and adding react-modal
salimr <riwad.salim@yahoo.fr>
parents:
145
diff
changeset
|
188 |
</div> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
189 |
</Modal> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
190 |
</div> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
191 |
</nav> |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
192 |
); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
193 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
194 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
195 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
196 |
AppNavbar.propTypes = { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
197 |
isAuthenticated: PropTypes.bool.isRequired |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
198 |
}; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
199 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
200 |
function mapStateToProps(state, props) { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
201 |
return { |
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
202 |
isAuthenticated: isAuthenticated(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
203 |
currentUser: getCurrentUser(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
204 |
online: getOnline(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
205 |
isSynchronizing: isSynchronizing(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
206 |
isSynchronized: isSynchronized(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
207 |
currentGroup: getCurrentGroup(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
208 |
groups: getGroups(state) |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
209 |
}; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
210 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
211 |
|
| 52 | 212 |
function mapDispatchToProps(dispatch) { |
213 |
return { |
|
214 |
authActions: bindActionCreators(authActions, dispatch), |
|
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
215 |
networkActions: bindActionCreators({ forceSync }, dispatch), |
|
155
e55ae84508bf
Clean CreateSession component and remove trace of previous create session button
ymh <ymh.work@gmail.com>
parents:
154
diff
changeset
|
216 |
groupActions: bindActionCreators({ groupSetCurrent }, dispatch), |
|
e55ae84508bf
Clean CreateSession component and remove trace of previous create session button
ymh <ymh.work@gmail.com>
parents:
154
diff
changeset
|
217 |
sessionsActions: bindActionCreators(sessionsActions, dispatch), |
| 52 | 218 |
} |
219 |
} |
|
220 |
||
|
105
0a1d6560acac
Introduce authenticated routes.
Alexandre Segura <mex.zktk@gmail.com>
parents:
104
diff
changeset
|
221 |
export default connect(mapStateToProps, mapDispatchToProps)(withRouter(AppNavbar)); |