Merge branch 'master' of https://paul-constans.ac-clermont.fr/gitea/saulnier.j/MSJS_clochard_saulnier into master

3 years ago · 6dbabe3a57
3 changed files with 56 additions and 15 deletions
--- a/Index.html
+++ b/Index.html
@ -12,7 +12,11 @@
 	</head>
 	<body>
 	
+<<<<<<< HEAD
+	<img src="logo.jpeg">
+=======
 	<img class=logo src="image/logo.png">
+>>>>>>> 3383835b05463931dd62f7429baf70f24d275ae5
 	

    <div class="cards-fan-container">
@ -31,11 +35,13 @@
        <span class="lettre">7</span>

        <span class="lettre">7</span>
-
 	</div>
 	
+<<<<<<< HEAD
+=======


+>>>>>>> 3383835b05463931dd62f7429baf70f24d275ae5
  <script src="loading.js"></script>
  <script src="main.js"></script>

--- a/main.js
+++ b/main.js
@ -1,19 +1,28 @@
-let machine_sous = new Object();
-//machine_sous.argent = int(input("Saississez votre somme de départ: "))
-machine_sous.nombres = []
-machine_sous.bank = 1000
-machine_sous.mise = -1
-machine_sous.gains = 0
+//let machine_sous = new Object();
+let argent 
+let nombres = []
+let bank = 1000
+let mise 
+let gains = 0

-function controle(){
-	var saisie = document.getElementById("input").value;
-	alert("Vous avez saisi : "+ saisie);
+function start(){
+	argent = document.getElementById("input").value;
+	regle();
+	test();
 }

-function test(taille){
-	for(let i=0; i<taille; i++){
-		console.log(i)
-	}
+function test(){
+	console.log(argent)
 }

-test(15);
+function regle(){
+	console.log("les règles sont ..............");
+	console.log("Mais aussi ça .............");
+}
+
+function saisie(){
+	mise = document.getElementById("argent").value;
+	bank += mise;
+	argent -= mise;
+	console.log(bank)
+}
--- a/test.html
+++ b/test.html
@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+<html>
+
+	<head>
+
+		<meta charset="utf-8">
+
+		<title></title>
+
+		<link rel="stylesheet" type="text/css" href="styles.css">
+	</head>
+	<body>
+	
+	<img src="logo.jpeg">
+	
+	<input type="text" id="input" name="input" value=""><br>
+	<input type="button" id="bouton" value="Contrôler" onclick="start()"><br><br>
+	
+	<input type="text" id="argent" name="argent" value=""><br>
+	<input type="button" id="bouton" value="Contrôler" onclick="saisie()">
+	
+	<script src="main.js"></script>
+
+  </body>
+</html>