diff --git a/back/src/main.rs b/back/src/main.rs
index 141544d..23d9fc0 100644
--- a/back/src/main.rs
+++ b/back/src/main.rs
@@ -122,6 +122,8 @@ async fn main() -> Result<(), std::io::Error> {
.service(api)
.service(get_article)
.service(Files::new("/", "public").index_file("index.html"))
+ .service(Files::new("/game", "public").index_file("index.html"))
+ .service(Files::new("/chaos", "public").index_file("index.html"))
})
.bind(("0.0.0.0", 2486))?
.run()
diff --git a/front/src/components/NavBar.tsx b/front/src/components/NavBar.tsx
index d868b75..d6f6c87 100644
--- a/front/src/components/NavBar.tsx
+++ b/front/src/components/NavBar.tsx
@@ -11,9 +11,10 @@ export default function NavBar(){
Home
Game
Articles
+ Le Chaos
-
+
);
}
\ No newline at end of file
diff --git a/front/src/components/chaos/MonInput.tsx b/front/src/components/chaos/MonInput.tsx
index 184896e..ae96388 100644
--- a/front/src/components/chaos/MonInput.tsx
+++ b/front/src/components/chaos/MonInput.tsx
@@ -1,10 +1,16 @@
//import { useState } from "react";
-export default function MonInput({text, new_focus}) {
+interface MonInputProps {
+ text: string;
+ new_focus: () => void;
+ police: string;
+}
+
+export default function MonInput({text, new_focus, police}: MonInputProps) {
return (
-
+
)
}
\ No newline at end of file
diff --git a/front/src/components/chaos/monButton.tsx b/front/src/components/chaos/monButton.tsx
index 9951303..e06033f 100644
--- a/front/src/components/chaos/monButton.tsx
+++ b/front/src/components/chaos/monButton.tsx
@@ -1,8 +1,15 @@
-import { useState } from "react";
+
+interface MonButtonProps {
+ letter: string;
+ changetext: (arg0: string) => void;
+ sizeFrontw: number;
+ sizeFronth: number;
+ rdmFront: () => void;
+ color: string;
+}
-
-export default function MonButton({letter,changetext,sizeFrontw,sizeFronth,rdmFront,color}) {
+export default function MonButton({letter,changetext,sizeFrontw,sizeFronth,rdmFront,color}: MonButtonProps) {
diff --git a/front/src/components/chaos/style.css b/front/src/components/chaos/style.css
index 6e3a951..f0fbe2d 100644
--- a/front/src/components/chaos/style.css
+++ b/front/src/components/chaos/style.css
@@ -1,3 +1,4 @@
+
#keys {
display: grid;
grid-template-columns: auto auto 1fr;
diff --git a/front/src/pages/ChaosPage.tsx b/front/src/pages/ChaosPage.tsx
index d76ab29..9efc84b 100644
--- a/front/src/pages/ChaosPage.tsx
+++ b/front/src/pages/ChaosPage.tsx
@@ -6,18 +6,17 @@ import { useState } from "react";
export default function ChaosPage(){
- const array_input = [1,2,3,4];
const [array_letter,setArray_letter]=useState(["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"," ","!"]);
const [sizeFrontw,setSizeFrontw] = useState(16)
- const [sizeFronth,setSizeFronth] = useState(10)
+ const [sizeFronth,setSizeFronth] = useState(20)
const [color,setColor] = useState("#ffffff")
function randomFront(){setSizeFronth(Math.floor(Math.random() * (1000)));
setSizeFrontw(Math.floor(Math.random() * (1000)));
setColor(`#${Math.floor(Math.random() * 16777215).toString(16)}`)}
- function shuffleArray(arr) {
+ function shuffleArray(arr: string[]) {
for (let i = arr.length - 1; i > 0; i--) {
const j = Math.floor(Math.random() * (i + 1)); // Choisir un index aléatoire
[arr[i], arr[j]] = [arr[j], arr[i]]; // Échanger les éléments
@@ -25,28 +24,30 @@ export default function ChaosPage(){
return arr;
}
- const myArray = [1, 2, 3, 4, 5];
- const shuffledArray = shuffleArray(myArray);
// console.log(shuffledArray); // Affiche un tableau mélangé
- const [entry1,setEntry1] = useState("champ1")
+ const [entry1,setEntry1] = useState("")
function E1(ent:string) {
setEntry1(entry1+ent);
}
const [connarddefocus,setFocus] = useState(()=>E1)
- const [entry2,setEntry2] = useState("champ2")
+ const [entry2,setEntry2] = useState("")
function E2(ent:string) {
setEntry2(entry2+ent);
}
- function changeFocus(E) {
+ function changeFocus(E: (ent:string)=>void) {
setArray_letter(shuffleArray(array_letter));
setFocus(()=>E);
}
+ const [entry3,setEntry3] = useState("")
+ function E3(ent:string) {
+ setEntry3(entry3+ent);
+ }
const [tel,setTel] = useState(0)
@@ -54,8 +55,12 @@ export default function ChaosPage(){
return(
Chaos Page
-
changeFocus(E1)}/>
- changeFocus(E2)}/>
+ Quel est votre nom ?
+ changeFocus(E1)} police={""}/>
+ Quel adjectif désigne le mieux Xi Junpin ?
+ changeFocus(E2)} police={""}/>
+ Combien font 1+1 ?
+ changeFocus(E3)} police={"Wingdings"}/>
{array_letter.map((letter) => {return