@@ -10,7 +10,7 @@ import { selectIsLoggedIn } from "../selectors";
10
10
import LocaleSelector from "./LocaleSelector" ;
11
11
import RequirePermission from "./RequirePermission" ;
12
12
13
- const NavBar = ( { isLoggedIn, login, logout } ) =>
13
+ const NavBar = ( { isLoggedIn, login, logout } ) => (
14
14
< Navbar >
15
15
< Navbar . Header >
16
16
< Navbar . Brand >
@@ -20,16 +20,6 @@ const NavBar = ({ isLoggedIn, login, logout }) =>
20
20
</ Navbar . Brand >
21
21
</ Navbar . Header >
22
22
< Nav className = "pull-right" >
23
- < li >
24
- < NavLink to = "/" >
25
- < FormattedMessage id = "ui.about" defaultMessage = "About" />
26
- </ NavLink >
27
- </ li >
28
- < li >
29
- < NavLink to = "/learn" >
30
- < FormattedMessage id = "ui.help" defaultMessage = "Learn" />
31
- </ NavLink >
32
- </ li >
33
23
< RequirePermission >
34
24
< li >
35
25
< NavLink to = "/exports/new" >
@@ -44,17 +34,14 @@ const NavBar = ({ isLoggedIn, login, logout }) =>
44
34
</ li >
45
35
< li >
46
36
< NavLink to = "/configurations" >
47
- < FormattedMessage
48
- id = "ui.configurations"
49
- defaultMessage = "Configs"
50
- />
37
+ < FormattedMessage id = "ui.configurations" defaultMessage = "Configs" />
51
38
</ NavLink >
52
39
</ li >
53
40
< RequirePermission
54
41
required = { [
55
42
"jobs.add_partnerexportregion" ,
56
43
"jobs.change_partnerexportregion" ,
57
- "jobs.delete_partnerexportregion"
44
+ "jobs.delete_partnerexportregion" ,
58
45
] }
59
46
>
60
47
< li >
@@ -67,7 +54,7 @@ const NavBar = ({ isLoggedIn, login, logout }) =>
67
54
required = { [
68
55
"jobs.add_hdxexportregion" ,
69
56
"jobs.change_hdxexportregion" ,
70
- "jobs.delete_hdxexportregion"
57
+ "jobs.delete_hdxexportregion" ,
71
58
] }
72
59
>
73
60
< li >
@@ -76,46 +63,64 @@ const NavBar = ({ isLoggedIn, login, logout }) =>
76
63
</ NavLink >
77
64
</ li >
78
65
</ RequirePermission >
79
- < RequirePermission
80
- required = { [
81
- "auth.add_user"
82
- ] }
83
- >
66
+ < RequirePermission required = { [ "auth.add_user" ] } >
84
67
< li >
85
68
< a href = "/admin" >
86
69
< FormattedMessage id = "ui.admin" defaultMessage = "Admin" />
87
70
</ a >
88
71
</ li >
89
72
</ RequirePermission >
90
- < RequirePermission
91
- required = { [
92
- "auth.add_user"
93
- ] }
94
- >
73
+ < RequirePermission required = { [ "auth.add_user" ] } >
95
74
< li >
96
75
< NavLink to = "/stats" >
97
76
< FormattedMessage id = "ui.stats" defaultMessage = "Stats" />
98
77
</ NavLink >
99
78
</ li >
100
79
</ RequirePermission >
80
+ < li >
81
+ < NavLink to = "/" >
82
+ < FormattedMessage id = "ui.about" defaultMessage = "About" />
83
+ </ NavLink >
84
+ </ li >
85
+ < li >
86
+ < NavLink to = "/learn" >
87
+ < FormattedMessage id = "ui.help" defaultMessage = "Learn" />
88
+ </ NavLink >
89
+ </ li >
90
+ < li >
91
+ < NavLink
92
+ to = { {
93
+ pathname :
94
+ "https://hotosm.atlassian.net/servicedesk/customer/portal/4" ,
95
+ } }
96
+ target = "_blank"
97
+ >
98
+ < span title = "For technical support click here" >
99
+ < FormattedMessage id = "ui.support" defaultMessage = "Support" />
100
+ </ span >
101
+ </ NavLink >
102
+ </ li >
101
103
< NavItem >
102
104
< LocaleSelector />
103
105
</ NavItem >
104
106
< NavItem >
105
- { ! isLoggedIn &&
106
- < Button bsStyle = "danger" onClick = { login } >
107
- < FormattedMessage id = "ui.log_in" defaultMessage = "Log In" />
108
- </ Button > }
109
- { isLoggedIn &&
110
- < Button bsStyle = "danger" onClick = { logout } >
111
- < FormattedMessage id = "ui.log_out" defaultMessage = "Log Out" />
112
- </ Button > }
107
+ { ! isLoggedIn && (
108
+ < Button bsStyle = "danger" onClick = { login } >
109
+ < FormattedMessage id = "ui.log_in" defaultMessage = "Log In" />
110
+ </ Button >
111
+ ) }
112
+ { isLoggedIn && (
113
+ < Button bsStyle = "danger" onClick = { logout } >
114
+ < FormattedMessage id = "ui.log_out" defaultMessage = "Log Out" />
115
+ </ Button >
116
+ ) }
113
117
</ NavItem >
114
118
</ Nav >
115
- </ Navbar > ;
119
+ </ Navbar >
120
+ ) ;
116
121
117
- const mapStateToProps = state => ( {
118
- isLoggedIn : selectIsLoggedIn ( state )
122
+ const mapStateToProps = ( state ) => ( {
123
+ isLoggedIn : selectIsLoggedIn ( state ) ,
119
124
} ) ;
120
125
121
126
export default connect ( mapStateToProps , { login, logout } ) ( NavBar ) ;
0 commit comments