From b8fa053ca3e41c63612efdc5ea2da5ca40c1ec6a Mon Sep 17 00:00:00 2001 From: Lukian Date: Fri, 6 Dec 2024 05:43:21 +0100 Subject: [PATCH 1/5] Updated docker-compose.yml --- docker-compose.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9bcaab9..f689f10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,10 +3,22 @@ services: build: context: . dockerfile: dockerfile - container_name: web + network: host + container_name: nuitdelinfo restart: always - ports: - - 8080:2486 volumes: - ./back/data:/app/data + networks: + - traefik + labels: + - "traefik.enable=true" + - "traefik.http.routers.nuitdelinfo.rule=Host(`nuitdelinfo.leizour.fr`)" + - "traefik.http.routers.nuitdelinfo.entrypoints=websecure" + - "traefik.http.routers.nuitdelinfo.tls=true" + - "traefik.http.routers.nuitdelinfo.tls.certresolver=myresolver" + - "traefik.http.services.nuitdelinfo.loadbalancer.server.port=2486" + +networks: + traefik: + external: true From 4682f8a61ed8ba3c37b3f5044f08526c2983b93e Mon Sep 17 00:00:00 2001 From: iMax Date: Fri, 6 Dec 2024 05:46:34 +0100 Subject: [PATCH 2/5] Hot fix - Marker.tsx --- front/src/components/3d/Marker.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/front/src/components/3d/Marker.tsx b/front/src/components/3d/Marker.tsx index 893f4f1..e38fe3e 100644 --- a/front/src/components/3d/Marker.tsx +++ b/front/src/components/3d/Marker.tsx @@ -3,21 +3,21 @@ import { Group } from 'three' import * as THREE from 'three' interface MarkerProps { - position: [number, number, number], + position: number[], color: string, onClick?: () => void } export default function Marker({ position, color, onClick }: MarkerProps) { - const [positionState, setPositionState] = React.useState(position) + const [positionState, setPositionState] = React.useState(new THREE.Vector3(...position)) // Return the marker object // return return ( - setPositionState([positionState[0], positionState[1], positionState[2] + 0.1])} onPointerOut={(e) => setPositionState(position)}> + setPositionState(positionState.clone().setZ(positionState.z + 0.1))} onPointerOut={(e) => setPositionState(new THREE.Vector3(...position))}> - ) + ) } From 0e31e90af982fa9c615a85a0cd26e074cd63a55e Mon Sep 17 00:00:00 2001 From: iMax Date: Fri, 6 Dec 2024 05:58:13 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Cr=C3=A9ation=20d'un=20formulaire=20basique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/components/NavBar.tsx | 2 +- front/src/pages/ChaosPage.tsx | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/front/src/components/NavBar.tsx b/front/src/components/NavBar.tsx index b5ebe21..cf2b130 100644 --- a/front/src/components/NavBar.tsx +++ b/front/src/components/NavBar.tsx @@ -7,7 +7,7 @@ export default function NavBar(){