RedCrab/projet-nuitinfo-2024
8
0
Fork 0
generated from lucien/actix-react-template
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions
63 commits 5 branches 0 tags 27 MiB
Commit graph

63 commits

This branch
This branch
All branches
Author SHA1 Message Date
iMax
cbae2746fd Merge branch 'main_page' into main 2024-12-06 05:07:10 +01:00
iMax
12fa0684a8 Changement de nom d'application. 2024-12-06 05:04:36 +01:00
iMax
3794ccd70d Merge branch 'main_page' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into main_page 2024-12-06 04:53:32 +01:00
Lukian
b252122272 Merged nia 2024-12-06 04:44:34 +01:00
iMax
5bb2ac3f9b - Mise à jour de la DA de la main page. 
- Ajout de data temporaire pour les articles.
 2024-12-06 04:43:17 +01:00
lucien
467d560b15 Merge pull request 'back_end_docker' (#9) from back_end_docker into back_end 
Reviewed-on: #9
 2024-12-06 03:36:57 +00:00
Lukian
ac3fc5c391 Updated ports 2024-12-06 04:34:40 +01:00
=
71a829e726 Edit hero banner 2024-12-06 04:06:07 +01:00
iMaxLaPince
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 
Reviewed-on: #8
 2024-12-06 02:58:19 +00:00
iMaxLaPince
e42b81539f Merge branch 'main' into back_end_id 2024-12-06 02:57:42 +00:00
linlkin
ec2322f04c better api and yyyy/mm/dd format for dates in the db 2024-12-06 03:52:12 +01:00
iMax
1de47f3fb8 Hot fix 2024-12-06 03:51:26 +01:00
iMax
17affb3297 Merge branch 'main' of ssh://git.leizour.fr:222/RedCrab/projet-nuitinfo-2024 into main_page 2024-12-06 03:50:44 +01:00
linlkin
1e956a54d2 Merge pull request 'Game feature complete' (#7) from game into main 
Reviewed-on: #7
 2024-12-06 02:41:27 +00:00
iMaxLaPince
9ee9ae8cb7 Merge branch 'main' into game 2024-12-06 02:40:26 +00:00
iMax
f8c4481c88 - Feature Complete -> Gray Boxing a faire. 2024-12-06 03:37:26 +01:00
=
bf73ed1698 api proxy working :) 2024-12-06 03:25:50 +01:00
ChenNux
e53fc84ac3 modifié : src/components/NavBar.tsx 2024-12-06 03:24:53 +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
linlkin
ee692fec27 Actualiser back/src/main.rs 2024-12-06 01:50:00 +00:00
ChenNux
2adacceac5 modifié : src/pages/MainPage.tsx 
+ une petite correction
 2024-12-06 02:07:00 +01:00
ChenNux
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

ajout de la première section
 2024-12-06 02:06:15 +01:00
lucien
ac20ecc932 Merge pull request 'back_end' (#6) from back_end into main 
Reviewed-on: #6
 2024-12-06 00:54:17 +00:00
iMax
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
 2024-12-06 01:51:30 +01:00
linlkin
e2575b55b6 Actualiser back/Cargo.toml 2024-12-06 00:43:11 +00:00
linlkin
3688d031b4 Actualiser back/src/main.rs 
finito ?
 2024-12-06 00:42:10 +00:00
=
4e7259ae28 add react-router-dom to package.json 2024-12-06 01:34:45 +01:00
Lukian
9b91a5acf3 Updated docker-compose.yml 2024-12-06 01:33:19 +01:00
Lukian
85ab4aba4f Fixed databse init function again 2024-12-06 01:31:27 +01:00
Lukian
8f8fc0c46e Fixed databse init function 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
Lukian
902e96b205 Added database init function 2024-12-06 01:00:02 +01:00
=
9562eb98dc Articles section of the main page 2024-12-06 00:37:52 +01:00
ChenNux
f77b96db25 nouveau fichier : front/src/components/Footer.tsx 2024-12-06 00:36:52 +01:00
lucien
241a783092 Merge pull request 'Merged back_end to main branch' (#5) from back_end into main 
Reviewed-on: #5
 2024-12-05 23:29:13 +00:00
ChenNux
6e67e1238b modifié : front/src/pages/MainPage.tsx 
front/src/components/Footer.tsx
 2024-12-06 00:29:09 +01:00
Lukian
6461ebc629 Merged back_end and back_end_json 2024-12-06 00:26:12 +01:00
ChenNux
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

Ajout du footer
 2024-12-06 00:23:24 +01:00
Lukian
8316a35e9e Added json usage 2024-12-06 00:22:01 +01:00
linlkin
c3a7d0ee7b Merge pull request 'Actualiser back/src/main.rs' (#4) from back_end into main 
Reviewed-on: #4
 2024-12-05 23:03:41 +00:00
linlkin
c3888c61f9 Actualiser back/src/main.rs 
added the service bc i forgot oupsie

Signed-off-by: linlkin <ilyass.ajdira@hotmail.com>
 2024-12-05 23:02:43 +00:00
ChenNux
a239d17697 modifié : front/src/components/ClickableLink.tsx 
modifié :         front/src/components/LogoButton.tsx
	modifié :         front/src/components/RoundButton.tsx

Insertion des types pour les composants.
 2024-12-05 23:42:38 +01:00
lucien
9fca283ab1 Merge pull request 'i added db and articles end points' (#1) from back_end into main 
Reviewed-on: #1
 2024-12-05 22:42:28 +00:00
lucien
efe0b6b410 Merge branch 'main' into back_end 2024-12-05 22:42:15 +00:00
Lukian
669c710f89 Added json usage 2024-12-05 23:38:43 +01:00
ChenNux
b3d966e0ae nouveau fichier : front/src/components/RoundButton.tsx 2024-12-05 23:36:21 +01:00
ChenNux
2317a3683e modifié : front/src/components/ClickableLink.tsx 
modifié :         front/src/components/LogoButton.tsx
	modifié :         front/src/components/NavBar.tsx
	front/src/components/RoundButton.tsx
 2024-12-05 23:36:21 +01:00
linlkin
57d574d143 i added db and articles end points 2024-12-05 23:19:15 +01:00
=
36dae30b4e Add first version of article section 2024-12-05 22:59:11 +01:00