first commit

3 years ago · d6e041513d
7 changed files with 51 additions and 68 deletions
--- a/Thumbs.db
+++ b/Thumbs.db
--- a/app.js
+++ b/app.js
@ -40,7 +40,11 @@ function nbAlea() {
  function regles() {
    /* affiche les regles dans la page HTML */
      // console.log(toggle_rules);
+<<<<<<< HEAD
      let rules = document.getElementById('show_rules')
+=======
+      let rules = document.querySelector('.show_rules')
+>>>>>>> d1a4734fc13ee6f8aec91b3ddd2193fa2a9a3f74
      if (toggle_rules == true) {
          rules.style.display = "none"
      } else {
--- a/app_1.js
+++ b/app_1.js
--- a/idex.html
+++ b/idex.html
@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
-    <head>
-        <title>Machine  à sous NSI</title>
-        <meta charset="utf-8">
-        <link href="stylepagecss/menu.css" rel="stylesheet">
-        <link rel="icon" type="image/jpg" sizes="16x16" href="icon.jpg">
-        <script src="app.js"></script>
-    </head>
-    <body>
-        <div class="title">
-            <div class="title1">
-                <p>machine à sous nsi.</p>
-            </div>
-        </div>
-        <div id="container rouleaux">
-            <div class="wrapper">
-                <div class="board item1">
-                    <div class="digit">0</div>
-                    <div class="digit">1</div>
-                    <div class="digit">2</div>
-                    <div class="digit">3</div>
-                    <div class="digit">4</div>
-                    <div class="digit">5</div>
-                    <div class="digit">6</div>
-                    <div class="digit">7</div>
-                    <div class="digit">8</div>
-                    <div class="digit">9</div>
-                </div>
-                <div class="board item3">
-                    <div class="digit">0</div>
-                    <div class="digit">1</div>
-                    <div class="digit">2</div>
-                    <div class="digit">3</div>
-                    <div class="digit">4</div>
-                    <div class="digit">5</div>
-                    <div class="digit">6</div>
-                    <div class="digit">7</div>
-                    <div class="digit">8</div>
-                    <div class="digit">9</div>
-                </div>
-                <div class="board item3">
-                    <div class="digit">0</div>
-                    <div class="digit">1</div>
-                    <div class="digit">2</div>
-                    <div class="digit">3</div>
-                    <div class="digit">4</div>
-                    <div class="digit">5</div>
-                    <div class="digit">6</div>
-                    <div class="digit">7</div>
-                    <div class="digit">8</div>
-                    <div class="digit">9</div>
-                </div>
-            </div>
-        </div>
-        <div class="button">
-            <button class="btn btn_1">Regle</button>
-            <button class="btn btn_2" id="valider">Lancer</button>
-        </div>
-        <div id="jeton">
-            <h2>Jetons dans la machine : <h2 id="machine_coins"></h2>
-            </h2>
-            <h2>Jetons du joueur : <h2 id="player_coins"></h2>
-            </h2>
-        </div>
-        <input id="mise">
-    </body>
-</html>
--- a/index.html
+++ b/index.html
@ -8,5 +8,12 @@
 	</head>

 	<body>
+<<<<<<< HEAD
+=======
+        <div>
+            <a href="machine.html"><h2>MACHINE</h2></a>
+            <a href="machine.html"><h2>A SOUS NSI</h2></a>
+        </div>
+>>>>>>> d1a4734fc13ee6f8aec91b3ddd2193fa2a9a3f74
    </body>
 </html>
--- a/index.php
+++ b/index.php
@ -0,0 +1,32 @@
+<?php
+if (isset($_POST['submit'])) {
+	if (isset($_POST['username']) AND isset($_POST[username])) {
+		$username = htmlspecialchars($_POST['username'])
+		$password = htmlspecialchars($_POST['password'])
+
+		if ($password == "NSI") {
+			setcookie("logged", $username, 120)
+			header('location: google.fr')
+		}
+	}
+}		
+?>
+<!DOCTYPE html>
+<html lang="fr">
+	<head>
+		<title>M A C H I N E</title>
+		<meta charset="utf-8">
+		<link href="stylepagecss/style.css" rel="stylesheet">
+		<link rel="icon" type="image/jpg" sizes="16x16" href="icon.jpg">
+	</head>
+
+	<body>
+        <div>
+			<form method="post" action="">
+				<input type="text" name="username">
+				<input type="text" name="password">
+				<input type="submit" value="Valider" name="submit">
+			</form>
+        </div>
+    </body>
+</html>
--- a/machine.html
+++ b/machine.html
@ -38,6 +38,7 @@ etc...
            <h2>machine coins : <h2 id="machine_coins"> </h2></h2>
            <h2>player coins : <h2 id="player_coins"> </h2></h2>
            <input id="mise">
+<<<<<<< HEAD
            <p id="gain"></p>
        </div>
 		<div id="show_rules">
@ -53,6 +54,13 @@ etc...
              Bien évidemment, pour ne pas vous anarquer, si le bac possède moins de 500 jetons, alors le jeu s'arrêtera<br>
              Et puis il faut également pas oublier que si vous n'avez plus de jeton, alors vous ne pourrez plus jouer</p>
 		</div>
+=======
+            <p id="show_rules"></p>
+            <p id="gain"></p>
+        </div>
+
+        <img src="logo.png" alt="logo" class="logo">
+>>>>>>> d1a4734fc13ee6f8aec91b3ddd2193fa2a9a3f74

        <script src="app.js"></script>
    </body>