| author | salimr <riwad.salim@yahoo.fr> |
| Tue, 14 Aug 2018 20:34:50 +0200 | |
| changeset 143 | cfcbf4bc66f1 |
| parent 134 | be36eed5e6e0 |
| child 145 | 5d2bc8c877ea |
| permissions | -rw-r--r-- |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
1 |
import './Navbar.css'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
2 |
import PropTypes from 'prop-types'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
3 |
import React, { Component } from 'react'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
4 |
import { connect } from 'react-redux'; |
|
105
0a1d6560acac
Introduce authenticated routes.
Alexandre Segura <mex.zktk@gmail.com>
parents:
104
diff
changeset
|
5 |
import { withRouter } from 'react-router'; |
| 52 | 6 |
import { bindActionCreators } from 'redux'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
7 |
// import logo from './logo.svg'; |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
8 |
import { NavDropdown, MenuItem, Modal} from 'react-bootstrap'; |
| 52 | 9 |
import * as authActions from '../actions/authActions'; |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
10 |
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
|
11 |
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
|
12 |
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
|
13 |
import { isSynchronizing, isSynchronized } from '../selectors/syncSelectors'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
14 |
|
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
15 |
const LoginNav = ({isAuthenticated, currentUser, history, authActions, onLogout}) => { |
|
65
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
16 |
|
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
17 |
const onClickSettings = (e) => { |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
18 |
e.preventDefault(); |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
19 |
history.push('/settings'); |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
20 |
} |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
21 |
|
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
22 |
const onClickLogin = (e) => { |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
23 |
e.preventDefault(); |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
24 |
history.push('/login'); |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
25 |
} |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
26 |
|
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
27 |
if (isAuthenticated) { |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
28 |
return ( |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
29 |
<NavDropdown title={ currentUser.get('username') }> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
30 |
<li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
31 |
<a href="#settings" onClick={onClickSettings}>Paramètres</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
32 |
</li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
33 |
<li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
34 |
<a href="#logout" onClick={onLogout}>Se déconnecter</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
35 |
</li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
36 |
</NavDropdown> |
|
65
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
37 |
); |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
38 |
} |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
39 |
return ( |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
40 |
<li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
41 |
<a onClick={onClickLogin} href="/login">Se connecter</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
42 |
</li> |
|
65
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
43 |
); |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
44 |
} |
|
14989b339e5d
Use a fonctionnal component for the login part of the navbar
ymh <ymh.work@gmail.com>
parents:
62
diff
changeset
|
45 |
|
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
46 |
const Online = ({ online }) => { |
|
81
a6bd1aaddc34
Add online/offline indicator.
Alexandre Segura <mex.zktk@gmail.com>
parents:
65
diff
changeset
|
47 |
return ( |
|
143
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 |
<a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
50 |
<span className="material-icons" style={{ color: online ? '#2ECC71' : '#F95B5B' }}>signal_wifi_4_bar</span> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
51 |
</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
52 |
</li> |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
53 |
) |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
54 |
} |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
55 |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
56 |
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
|
57 |
const classnames = "material-icons" |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
58 |
+ ((!isSynchronized)?" sync-button-not-synchronized":"") |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
59 |
+ ((isSynchronizing)?" sync-button-synchronizing":""); |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
60 |
let title = "Synchronize"; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
61 |
let clickCb = onSyncClick; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
62 |
if(isSynchronizing) { |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
63 |
title = "Synchronizing..."; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
64 |
clickCb = () => {}; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
65 |
} else if (!isSynchronized) { |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
66 |
title += ": not synchronized"; |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
67 |
} |
|
78246db1cbac
make synchronization recurent, improve synchronization status display
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
68 |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
69 |
if (isAuthenticated) { |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
70 |
return ( |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
71 |
<li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
72 |
<a title={title} onClick={clickCb} id={id || null}> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
73 |
<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
|
74 |
</li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
75 |
); |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
76 |
} |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
77 |
return ( |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
78 |
<li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
79 |
<a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
80 |
<span></span> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
81 |
</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
82 |
</li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
83 |
); |
|
81
a6bd1aaddc34
Add online/offline indicator.
Alexandre Segura <mex.zktk@gmail.com>
parents:
65
diff
changeset
|
84 |
} |
|
a6bd1aaddc34
Add online/offline indicator.
Alexandre Segura <mex.zktk@gmail.com>
parents:
65
diff
changeset
|
85 |
|
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
86 |
|
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
87 |
const GroupStatus = ({currentGroup, groups, onSelect}) => { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
88 |
|
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
89 |
if(currentGroup) { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
90 |
const currentGroupName = currentGroup.get('name'); |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
91 |
return ( |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
92 |
<NavDropdown title={currentGroupName} onSelect={onSelect}> |
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
93 |
{ groups && groups.map((group, key) => { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
94 |
const groupName = group.get('name'); |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
95 |
const className = (groupName === currentGroupName)?'active':null; |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
96 |
return <MenuItem id="groups" className={className} key={key} eventKey={groupName}>{ groupName }</MenuItem> |
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
97 |
} |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
98 |
)} |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
99 |
<MenuItem key="-1" eventKey="__create_group__">Créer un groupe...</MenuItem> |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
100 |
</NavDropdown> |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
101 |
) |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
102 |
} else { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
103 |
return null; |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
104 |
} |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
105 |
|
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
106 |
} |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
107 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
108 |
class AppNavbar extends Component { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
109 |
|
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
110 |
state = { |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
111 |
showModal: false |
|
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 |
|
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
114 |
closeModal = () => { |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
115 |
this.setState({ showModal: false }); |
|
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 |
onClickHome = (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('/'); |
|
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 |
isSynchronized = () => { |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
124 |
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
|
125 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
126 |
|
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
127 |
onClickLogout = (e) => { |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
128 |
e.preventDefault(); |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
129 |
const isSynchronized = this.isSynchronized(); |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
130 |
if (isSynchronized) { |
|
107
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
131 |
this.logout(); |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
132 |
} else { |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
133 |
this.setState({ showModal: true }) |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
134 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
135 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
136 |
|
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
137 |
confirmLogout = () => { |
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
138 |
const isSynchronized = this.isSynchronized(); |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
139 |
if (!isSynchronized) { |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
140 |
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
|
141 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
142 |
this.logout(); |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
143 |
this.closeModal(); |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
144 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
145 |
|
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
146 |
logout = () => { |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
147 |
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
|
148 |
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
|
149 |
} |
|
e6f85e26b08c
Confirm logout when pending requests, try to purge offline.outbox
Alexandre Segura <mex.zktk@gmail.com>
parents:
105
diff
changeset
|
150 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
151 |
onClickSessions = (e) => { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
152 |
e.preventDefault(); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
153 |
this.props.history.push('/sessions'); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
154 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
155 |
|
|
129
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
156 |
onSyncClick = (e) => { |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
157 |
e.preventDefault(); |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
158 |
this.props.networkActions.forceSync(); |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
159 |
} |
|
d48946d164c6
Add a first version of synchronisation
ymh <ymh.work@gmail.com>
parents:
107
diff
changeset
|
160 |
|
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
161 |
onGroupSelect = (groupName) => { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
162 |
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
|
163 |
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
|
164 |
} else { |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
165 |
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
|
166 |
} |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
167 |
} |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
168 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
169 |
render() { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
170 |
return ( |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
171 |
<nav className="navbar navbar-inverse navbar-fixed-top"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
172 |
<div className="container-fluid"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
173 |
<div className="navbar-header"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
174 |
<a className="navbar-brand" onClick={this.onClickHome} href="/">IRI Notes</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
175 |
<button type="button" className="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
176 |
<span className="sr-only">Toggle navigation</span> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
177 |
<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
|
178 |
<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
|
179 |
<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
|
180 |
</button> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
181 |
</div> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
182 |
<div className="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
183 |
<ul className="nav navbar-nav"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
184 |
<li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
185 |
<a onClick={this.onClickSessions} href="/sessions">Accueil</a> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
186 |
</li> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
187 |
</ul> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
188 |
<ul className="nav navbar-nav navbar-right"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
189 |
<GroupStatus currentGroup={this.props.currentGroup} groups={this.props.groups} onSelect={this.onGroupSelect}/> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
190 |
<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
|
191 |
<Online {...this.props} /> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
192 |
<LoginNav {...this.props} onLogout={this.onClickLogout} /> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
193 |
</ul> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
194 |
</div> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
195 |
<Modal show={this.state.showModal} onHide={this.closeModal}> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
196 |
<Modal.Body> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
197 |
<p className="text-center"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
198 |
Certaines données n'ont pas encore été sauvegardées. |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
199 |
<br /> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
200 |
Si vous continuez, elles seront perdues. |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
201 |
</p> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
202 |
</Modal.Body> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
203 |
<Modal.Footer> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
204 |
<button type="submit" className="btn btn-primary btn-lg" onClick={this.confirmLogout}>Confirmer</button> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
205 |
<button type="submit" className="btn btn-default btn-lg" onClick={this.closeModal}>Fermer</button> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
206 |
</Modal.Footer> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
207 |
</Modal> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
208 |
</div> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
209 |
</nav> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
134
diff
changeset
|
210 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
211 |
); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
212 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
213 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
214 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
215 |
AppNavbar.propTypes = { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
216 |
isAuthenticated: PropTypes.bool.isRequired |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
217 |
}; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
218 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
219 |
function mapStateToProps(state, props) { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
220 |
return { |
|
134
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
221 |
isAuthenticated: isAuthenticated(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
222 |
currentUser: getCurrentUser(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
223 |
online: getOnline(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
224 |
isSynchronizing: isSynchronizing(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
225 |
isSynchronized: isSynchronized(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
226 |
currentGroup: getCurrentGroup(state), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
227 |
groups: getGroups(state) |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
228 |
}; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
229 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
230 |
|
| 52 | 231 |
function mapDispatchToProps(dispatch) { |
232 |
return { |
|
233 |
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
|
234 |
networkActions: bindActionCreators({ forceSync }, dispatch), |
|
be36eed5e6e0
add menu to change current group and create a new group
ymh <ymh.work@gmail.com>
parents:
130
diff
changeset
|
235 |
groupActions: bindActionCreators({ groupSetCurrent }, dispatch) |
| 52 | 236 |
} |
237 |
} |
|
238 |
||
|
105
0a1d6560acac
Introduce authenticated routes.
Alexandre Segura <mex.zktk@gmail.com>
parents:
104
diff
changeset
|
239 |
export default connect(mapStateToProps, mapDispatchToProps)(withRouter(AppNavbar)); |