From 38672311497428c8e45e9e86d28522559834d8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Wed, 29 Mar 2023 07:08:40 +0000
Subject: [PATCH] chore: moved from gorilla/mux to chi
---
.vscode/settings.json | 3 ++-
nginx/site.conf | 4 ++--
nginx/site.prod.conf | 3 ---
src/components/Menu/Menu.tsx | 18 +++++++++++-------
src/components/Navbar/Navbar.tsx | 10 ++++++++--
5 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a434aa05..13c8a5c2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -29,5 +29,6 @@
"sonarlint.connectedMode.project": {
"connectionId": "sonarqube-forge-grandlyon",
"projectKey": "web-et-numerique-llle-project-backoffice-client"
- }
+ },
+ "cSpell.words": ["ecolyo"]
}
diff --git a/nginx/site.conf b/nginx/site.conf
index cf2467c3..998e42fa 100644
--- a/nginx/site.conf
+++ b/nginx/site.conf
@@ -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;
diff --git a/nginx/site.prod.conf b/nginx/site.prod.conf
index bd895ca5..b03177f1 100644
--- a/nginx/site.prod.conf
+++ b/nginx/site.prod.conf
@@ -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;
}
diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx
index 05b3b168..486a779d 100644
--- a/src/components/Menu/Menu.tsx
+++ b/src/components/Menu/Menu.tsx
@@ -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 ? (
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
index ad45dd3f..209515a3 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navbar/Navbar.tsx
@@ -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}>
--
GitLab