Commit graph

  • 1d207b56a6 Merge pull request 'Updated backend' (#15) from back_end into main main lucien 2024-12-06 06:00:07 +00:00
  • 6228e839d7 Updated backend back_end Lukian 2024-12-06 07:00:04 +01:00
  • 75c29c719a Hot Fix: Debug for build iMax 2024-12-06 06:57:50 +01:00
  • 2b71492587 Hot Fix: Ajout page chaos + Fix mystère iMax 2024-12-06 06:53:41 +01:00
  • c197e460fb Merge branch 'main' into chaos_page chaos_page Bucherond 2024-12-06 05:49:26 +00:00
  • 0508ddaa7f Merge branch 'main' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into chaos_page SwimJéjé 2024-12-06 06:47:59 +01:00
  • b2cb9ca5c8 Merge branch 'chaos_page' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into chaos_page SwimJéjé 2024-12-06 06:47:19 +01:00
  • 1e95438b2c Fin Chaos Page SwimJéjé 2024-12-06 06:44:06 +01:00
  • 0fa1a9b6f3 Hot Fix: Reactor routeur iMax 2024-12-06 06:34:45 +01:00
  • 6405c6db09 Merge branch 'main' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into chaos_page iMax 2024-12-06 06:09:06 +01:00
  • f8ffe3e16f HARRRRRRD HOT FIX: Remove all error and warning iMax 2024-12-06 06:08:00 +01:00
  • d685e00bc3 Merge branch 'main' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into main iMax 2024-12-06 05:59:59 +01:00
  • 3f9617549d Hot fix : NavBar ClassName iMax 2024-12-06 05:59:30 +01:00
  • 0e31e90af9 Création d'un formulaire basique iMax 2024-12-06 05:58:13 +01:00
  • 6e77233ac0 Merge branch 'chaos_page' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into chaos_page iMax 2024-12-06 05:51:53 +01:00
  • 1ec6b1b0da Merge pull request 'Updated docker-compose.yml' (#13) from back_end into main lucien 2024-12-06 04:47:59 +00:00
  • 4682f8a61e Hot fix - Marker.tsx iMax 2024-12-06 05:46:34 +01:00
  • b8fa053ca3 Updated docker-compose.yml Lukian 2024-12-06 05:43:21 +01:00
  • 53853dcce5 Merge branch 'main' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into chaos_page SwimJéjé 2024-12-06 05:40:57 +01:00
  • ea2bb7ac3c Second commit SwimJéjé 2024-12-06 05:38:08 +01:00
  • e1bcb4b022 Chaos Commit SwimJéjé 2024-12-06 05:35:47 +01:00
  • cbae2746fd Merge branch 'main_page' into main iMax 2024-12-06 05:07:10 +01:00
  • 12fa0684a8 Changement de nom d'application. main_page iMax 2024-12-06 05:04:36 +01:00
  • effd567fa5 force a toi lukian back_end_suicidal linlkin 2024-12-06 04:59:22 +01:00
  • 3794ccd70d Merge branch 'main_page' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into main_page iMax 2024-12-06 04:53:32 +01:00
  • b252122272 Merged nia Lukian 2024-12-06 04:44:34 +01:00
  • 5bb2ac3f9b - Mise à jour de la DA de la main page. - Ajout de data temporaire pour les articles. iMax 2024-12-06 04:43:17 +01:00
  • 467d560b15 Merge pull request 'back_end_docker' (#9) from back_end_docker into back_end lucien 2024-12-06 03:36:57 +00:00
  • ac3fc5c391 Updated ports Lukian 2024-12-06 04:34:40 +01:00
  • 71a829e726 Edit hero banner = 2024-12-06 04:06:07 +01:00
  • d6f2d6cc09 VALIDER PAR OLIVIER : Merge pull request 'better api and yyyy/mm/dd format for dates in the db' (#8) from back_end_id into main iMaxLaPince 2024-12-06 02:58:19 +00:00
  • e42b81539f Merge branch 'main' into back_end_id iMaxLaPince 2024-12-06 02:57:42 +00:00
  • ec2322f04c better api and yyyy/mm/dd format for dates in the db linlkin 2024-12-06 03:52:12 +01:00
  • 1de47f3fb8 Hot fix iMax 2024-12-06 03:51:26 +01:00
  • 17affb3297 Merge branch 'main' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into main_page iMax 2024-12-06 03:50:44 +01:00
  • 1e956a54d2 Merge pull request 'Game feature complete' (#7) from game into main linlkin 2024-12-06 02:41:27 +00:00
  • 9ee9ae8cb7 Merge branch 'main' into game iMaxLaPince 2024-12-06 02:40:26 +00:00
  • f8c4481c88 - Feature Complete -> Gray Boxing a faire. iMax 2024-12-06 03:37:26 +01:00
  • bf73ed1698 api proxy working :) = 2024-12-06 03:25:50 +01:00
  • e53fc84ac3 modifié : src/components/NavBar.tsx ChenNux 2024-12-06 03:24:12 +01:00
  • 5b812000b8 Merge branch 'main' into main_page = 2024-12-06 02:51:57 +01:00
  • e2261f829c Add api proxy = 2024-12-06 02:50:16 +01:00
  • ee692fec27 Actualiser back/src/main.rs linlkin 2024-12-06 01:50:00 +00:00
  • 2adacceac5 modifié : src/pages/MainPage.tsx + une petite correction ChenNux 2024-12-06 02:07:00 +01:00
  • de11f64cc3 nouveau fichier : public/pictures/sea.gif modifié : src/components/Button.tsx modifié : src/components/ClickableLink.tsx nouveau fichier : src/components/FstSection.tsx modifié : src/components/NavBar.tsx modifié : src/pages/MainPage.tsx ChenNux 2024-12-06 02:06:15 +01:00
  • ac20ecc932 Merge pull request 'back_end' (#6) from back_end into main lucien 2024-12-06 00:54:17 +00:00
  • 60a12d9cf9 - Ajout d'un océan. - Ajout d'un personnage manequin. --> *Modèle 3D du manequin inclus* - Ajout d'une représentation des axes x,y,z. - Ajout d'une entité Marker pour mettre des markers sur le manequin. - Maj du CSS de GamePage.tsx iMax 2024-12-06 01:51:30 +01:00
  • e2575b55b6 Actualiser back/Cargo.toml linlkin 2024-12-06 00:43:11 +00:00
  • 3688d031b4 Actualiser back/src/main.rs linlkin 2024-12-06 00:42:10 +00:00
  • 4e7259ae28 add react-router-dom to package.json = 2024-12-06 01:34:45 +01:00
  • 9b91a5acf3 Updated docker-compose.yml Lukian 2024-12-06 01:33:19 +01:00
  • 85ab4aba4f Fixed databse init function again Lukian 2024-12-06 01:31:27 +01:00
  • 8f8fc0c46e Fixed databse init function Lukian 2024-12-06 01:30:34 +01:00
  • e121090433 Make a better article section and add the article page. = 2024-12-06 01:28:36 +01:00
  • 902e96b205 Added database init function Lukian 2024-12-06 01:00:02 +01:00
  • 9562eb98dc Articles section of the main page = 2024-12-06 00:37:52 +01:00
  • f77b96db25 nouveau fichier : front/src/components/Footer.tsx ChenNux 2024-12-06 00:36:52 +01:00
  • 241a783092 Merge pull request 'Merged back_end to main branch' (#5) from back_end into main lucien 2024-12-05 23:29:13 +00:00
  • 6e67e1238b modifié : front/src/pages/MainPage.tsx front/src/components/Footer.tsx ChenNux 2024-12-06 00:29:09 +01:00
  • 6461ebc629 Merged back_end and back_end_json Lukian 2024-12-06 00:26:12 +01:00
  • 7d8dd263eb modifié : front/src/components/LogoButton.tsx modifié : front/src/components/NavBar.tsx modifié : front/src/index.css modifié : front/src/pages/MainPage.tsx front/src/components/Footer.tsx ChenNux 2024-12-06 00:23:24 +01:00
  • 8316a35e9e Added json usage Lukian 2024-12-05 23:38:43 +01:00
  • c3a7d0ee7b Merge pull request 'Actualiser back/src/main.rs' (#4) from back_end into main linlkin 2024-12-05 23:03:41 +00:00
  • c3888c61f9 Actualiser back/src/main.rs linlkin 2024-12-05 23:02:43 +00:00
  • a239d17697 modifié : front/src/components/ClickableLink.tsx modifié : front/src/components/LogoButton.tsx modifié : front/src/components/RoundButton.tsx ChenNux 2024-12-05 23:42:38 +01:00
  • 9fca283ab1 Merge pull request 'i added db and articles end points' (#1) from back_end into main lucien 2024-12-05 22:42:28 +00:00
  • efe0b6b410 Merge branch 'main' into back_end lucien 2024-12-05 22:42:15 +00:00
  • 669c710f89 Added json usage Lukian 2024-12-05 23:38:43 +01:00
  • b3d966e0ae nouveau fichier : front/src/components/RoundButton.tsx ChenNux 2024-12-05 23:28:56 +01:00
  • 2317a3683e modifié : front/src/components/ClickableLink.tsx modifié : front/src/components/LogoButton.tsx modifié : front/src/components/NavBar.tsx front/src/components/RoundButton.tsx ChenNux 2024-12-05 23:25:37 +01:00
  • 57d574d143 i added db and articles end points linlkin 2024-12-05 23:19:15 +01:00
  • 36dae30b4e Add first version of article section = 2024-12-05 22:59:11 +01:00
  • 5c4ac78dee add style inline for the button component and theme colors = 2024-12-05 22:25:56 +01:00
  • 5d156416c9 Recollage au main iMax 2024-12-05 22:15:23 +01:00
  • 358681da38 Merge branch 'main' into game iMax 2024-12-05 22:12:59 +01:00
  • f3dc0e99f8 Merge branch 'main' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into HEAD iMax 2024-12-05 21:57:00 +01:00
  • 3cdab2e303 modifié : front/src/components/ClickableLink.tsx modifié : front/src/components/NavBar.tsx ChenNux 2024-12-05 21:47:03 +01:00
  • 525ce0515c remove vanilla css iMax 2024-12-05 21:46:04 +01:00
  • 706d491236 - implémentation de threejs. - Création environnement 3D océan. iMax 2024-12-05 21:42:37 +01:00
  • 265157bbe1 nouveau fichier : front/src/components/ClickableLink.tsx nouveau fichier : front/src/components/LogoButton.tsx nouveau fichier : front/src/components/NavBar.tsx modifié : front/src/main.tsx modifié : front/src/pages/MainPage.tsx ChenNux 2024-12-05 21:34:24 +01:00
  • ebf4620640 New button component = 2024-12-05 21:19:41 +01:00
  • c992014d53 Mise en place du routeur iMax 2024-12-05 19:19:41 +01:00
  • 583b14ce0d add lock files to gitignore = 2024-12-05 19:18:15 +01:00
  • 2bd75babff [Front] Structuration des fichiers iMax 2024-12-05 19:10:01 +01:00
  • e7dbe84ea5 Initial commit RedCrab 2024-12-05 16:58:13 +00:00