Skip to content
Snippets Groups Projects
Commit 38672311 authored by Rémi PAILHAREY's avatar Rémi PAILHAREY :fork_knife_plate:
Browse files

chore: moved from gorilla/mux to chi

parent b4474b37
No related branches found
No related tags found
2 merge requests!96Deploy OpenShift v2,!94Serve swagger documentation
......@@ -29,5 +29,6 @@
"sonarlint.connectedMode.project": {
"connectionId": "sonarqube-forge-grandlyon",
"projectKey": "web-et-numerique-llle-project-backoffice-client"
}
},
"cSpell.words": ["ecolyo"]
}
......@@ -21,8 +21,8 @@ server {
location /Logout {
proxy_pass https://backend:1443/Logout;
}
location /swagger {
proxy_pass https://backend:1443/swagger;
location /doc {
proxy_pass https://backend:1443/doc;
}
location /imageNames {
proxy_pass https://backend:1443/api/admin/imageNames;
......
......@@ -19,9 +19,6 @@ server {
location /Logout {
proxy_pass https://backend:1443/Logout;
}
location /swagger {
proxy_pass https://backend:1443/swagger;
}
location /imageNames {
proxy_pass https://backend:1443/api/admin/imageNames;
}
......
......@@ -10,19 +10,23 @@ import { Route } from '../../models/route.model'
const Menu: React.FC = () => {
const { user } = useContext(UserContext)
const { logoutUser } = useAuth()
return (
<nav className={'menu'}>
<div className="logo-container">
<img src={logo} alt="Ecolyo logo" className="logo" />
</div>
<div className="menu-list">
{routes.map((route: Route, index: number) => {
return (
<NavLink key={index} to={route.path} activeClassName="active">
{route.label}
</NavLink>
)
})}
{routes.map((route: Route) => (
<NavLink key={route.label} to={route.path} activeClassName="active">
{route.label}
</NavLink>
))}
{process.env.NODE_ENV === 'development' && (
<a href="/doc/" target="_blank">
Swagger doc
</a>
)}
</div>
<div className="administration">
{user ? (
......
......@@ -9,14 +9,20 @@ import './navbar.scss'
const Navbar: React.FC = () => {
const { user } = useContext(UserContext)
const { logoutUser } = useAuth()
return (
<div className="navbar">
<div className="menu-list">
{routes.map((route: Route, index: number) => (
<NavLink key={index} to={route.path} activeClassName="active">
{routes.map((route: Route) => (
<NavLink key={route.label} to={route.path} activeClassName="active">
{route.label}
</NavLink>
))}
{process.env.NODE_ENV === 'development' && (
<a href="/doc/" target="_blank">
Swagger doc
</a>
)}
</div>
{user && (
<button className="btnValid logButton" onClick={logoutUser}>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment