From c49faca15b5f9430d28f2ec89247e232bcf70b11 Mon Sep 17 00:00:00 2001 From: GringoElPepito Date: Fri, 8 Dec 2023 03:52:15 +0100 Subject: [PATCH] Following game --- .../src/components/content/game/ammo/index.jsx | 12 ++++++++++++ .../components/content/game/ammobox/index.jsx | 16 ++++++++++++++++ .../content/game/cardmission/index.jsx | 7 +------ .../components/content/game/gamescene/index.jsx | 11 +++++++++++ .../components/content/game/mainmenu/index.jsx | 2 +- .../components/content/game/poseimg/index.jsx | 8 ++++++++ webapp/src/pages/gametheme/index.jsx | 6 +++--- webapp/tailwind.config.js | 1 + 8 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 webapp/src/components/content/game/ammo/index.jsx create mode 100644 webapp/src/components/content/game/ammobox/index.jsx create mode 100644 webapp/src/components/content/game/poseimg/index.jsx diff --git a/webapp/src/components/content/game/ammo/index.jsx b/webapp/src/components/content/game/ammo/index.jsx new file mode 100644 index 0000000..bf14798 --- /dev/null +++ b/webapp/src/components/content/game/ammo/index.jsx @@ -0,0 +1,12 @@ +function Ammo({arg}) { + return( +
+

{arg}

+
+ +
+
+ ); +} + +export default Ammo; \ No newline at end of file diff --git a/webapp/src/components/content/game/ammobox/index.jsx b/webapp/src/components/content/game/ammobox/index.jsx new file mode 100644 index 0000000..ad6a4d1 --- /dev/null +++ b/webapp/src/components/content/game/ammobox/index.jsx @@ -0,0 +1,16 @@ +import Ammo from "../ammo"; +import { get } from "../../../../modules/fetcher"; +import { useEffect, useState } from "react"; + +function AmmoBox() { + return( +
+ + + + +
+ ); +} + +export default AmmoBox; \ No newline at end of file diff --git a/webapp/src/components/content/game/cardmission/index.jsx b/webapp/src/components/content/game/cardmission/index.jsx index ae6745f..3b0e5dd 100644 --- a/webapp/src/components/content/game/cardmission/index.jsx +++ b/webapp/src/components/content/game/cardmission/index.jsx @@ -1,12 +1,7 @@ import {useState} from "react"; import { useNavigate } from "react-router-dom"; -import Pose1 from "../../../../assets/perso/perso-1/pose-1.png"; -import Pose2 from "../../../../assets/perso/perso-2/pose-1.png"; -import Pose3 from "../../../../assets/perso/perso-3/pose-1.png"; -import Pose4 from "../../../../assets/perso/perso-4/pose-1.png"; -// import Pose5 from "../../../../assets/perso/perso-5/pose-1.png"; +import img from "../poseimg"; -const img = ["",Pose1,Pose2,Pose3,Pose4]; function CardMission({theme}) { diff --git a/webapp/src/components/content/game/gamescene/index.jsx b/webapp/src/components/content/game/gamescene/index.jsx index e69de29..831c52a 100644 --- a/webapp/src/components/content/game/gamescene/index.jsx +++ b/webapp/src/components/content/game/gamescene/index.jsx @@ -0,0 +1,11 @@ +import AmmoBox from "../ammobox"; + +function GameScene() { + return( +
+ +
+ ); +} + +export default GameScene; \ No newline at end of file diff --git a/webapp/src/components/content/game/mainmenu/index.jsx b/webapp/src/components/content/game/mainmenu/index.jsx index c3242bb..bae42cf 100644 --- a/webapp/src/components/content/game/mainmenu/index.jsx +++ b/webapp/src/components/content/game/mainmenu/index.jsx @@ -18,7 +18,7 @@ function MainMenu() { },[]); return( -
+
{themes.map((theme) => { return( diff --git a/webapp/src/components/content/game/poseimg/index.jsx b/webapp/src/components/content/game/poseimg/index.jsx new file mode 100644 index 0000000..5777414 --- /dev/null +++ b/webapp/src/components/content/game/poseimg/index.jsx @@ -0,0 +1,8 @@ +import Pose1 from "../../../../assets/perso/perso-1/pose-1.png"; +import Pose2 from "../../../../assets/perso/perso-2/pose-1.png"; +import Pose3 from "../../../../assets/perso/perso-3/pose-1.png"; +import Pose4 from "../../../../assets/perso/perso-4/pose-1.png"; + +const img = ["",Pose1,Pose2,Pose3,Pose4]; + +export default img; \ No newline at end of file diff --git a/webapp/src/pages/gametheme/index.jsx b/webapp/src/pages/gametheme/index.jsx index e30dc5d..928dd4b 100644 --- a/webapp/src/pages/gametheme/index.jsx +++ b/webapp/src/pages/gametheme/index.jsx @@ -2,6 +2,7 @@ import { useEffect, useState } from "react"; import { useParams } from "react-router-dom"; import { get } from "../../modules/fetcher"; import NavbarreGame from "../../components/navbarre/game"; +import GameScene from "../../components/content/game/gamescene"; function GameTheme() { @@ -12,9 +13,7 @@ function GameTheme() { useEffect(() => { get('https://saucisson.justw.tf/api/themes/'+id, token) .then(res => { - console.log(res.JSON.theme); - setTheme(res.JSON.theme); - console.log(theme); + setTheme(res.JSON.themes); }) .catch(err => console.log(err)); },[]); @@ -22,6 +21,7 @@ function GameTheme() { return(
+
); } diff --git a/webapp/tailwind.config.js b/webapp/tailwind.config.js index d67f7e8..d59fd26 100644 --- a/webapp/tailwind.config.js +++ b/webapp/tailwind.config.js @@ -8,6 +8,7 @@ module.exports = { extend: { spacing: { 'dfull' : '-100vw', + 'd24': '-24px', }, colors: { 'darkGreen': '#4dab7f',