From 99139f619dd170d6c391b1d720fe48bb74e69e96 Mon Sep 17 00:00:00 2001 From: Baccari Nour Date: Thu, 21 Nov 2024 11:36:25 +0100 Subject: [PATCH 1/4] base du main html --- main.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/main.html b/main.html index 6c70bcf..7cd1cab 100644 --- a/main.html +++ b/main.html @@ -1 +1,8 @@ - \ No newline at end of file + + + + + +
+ + \ No newline at end of file From 66296c36ac7e9ab2a3f74699351d84b0fb1cdeca Mon Sep 17 00:00:00 2001 From: Bezza Younes Date: Thu, 5 Dec 2024 20:20:52 +0100 Subject: [PATCH 2/4] =?UTF-8?q?timer=20ajout=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO.txt | 1 + demineur.html | 13 +++++++++---- demineur.js | 30 ++++++++++++++++++++++++++++++ style.css | 19 ++++++++++++++----- 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 TODO.txt diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 0000000..858d9ac --- /dev/null +++ b/TODO.txt @@ -0,0 +1 @@ +younes: final chrono , pop up cookie , centrer ligne , animation pop up diff --git a/demineur.html b/demineur.html index ac25e47..859c424 100644 --- a/demineur.html +++ b/demineur.html @@ -5,6 +5,7 @@ Démineur + @@ -15,17 +16,21 @@ +
Temps: -
+ + +
Mines restantes:10
ICI se retourve le jeu
+ + - - + - \ No newline at end of file + diff --git a/demineur.js b/demineur.js index 2c431da..707faf1 100644 --- a/demineur.js +++ b/demineur.js @@ -7,3 +7,33 @@ class Case { } } +function sleep(ms){ + return new Promise(resolve => setTimeout(resolve, ms)); +} +async function chrono(){ + let k=document.getElementById("temps").value; + const myButton = document.getElementById("fin_game"); + let arret=0; + + while(arret==!1) { + + await sleep(1000); + document.getElementById("temps").value=document.getElementById("temps").value*1+1; + myButton.addEventListener("click",() =>{arret=1;}) +} +} +async function reset(){ + await sleep(500); + document.getElementById("temps").value=0; + +} + +function Cookies() { + var accept = confirm("Tu veux des cookies ?"); + if (accept === true) { + alert("Bon jeu!"); + } else { + Cookies(); + } + } +Cookies(); \ No newline at end of file diff --git a/style.css b/style.css index 4375b34..f94e073 100644 --- a/style.css +++ b/style.css @@ -1,6 +1,6 @@ #nav_demineur{ width: 100%; - background-position:0cm; + background-color: #2bd7d484; border-width: 2px; border-style: double; @@ -18,13 +18,22 @@ } #jeu{ + display: flex; - justify-content: center; - /* border-width: 2px; - border-style: double; */ + justify-content: left; + border-width: 2px; + border-style: double; + width: 49%; } .item_nav{ margin-top: 3px; padding-right: 10px; -} \ No newline at end of file +} +.vertical-line{ + border-left: 4px solid #000; + display: inline-block; + height: 400px; + margin: 0 50% ; + padding-top: 0; + } \ No newline at end of file From 0b5cc81150273d5ad2cd093ca6c8acbb24fc02a5 Mon Sep 17 00:00:00 2001 From: Bezza Younes Date: Thu, 5 Dec 2024 21:35:50 +0100 Subject: [PATCH 3/4] correction timer , enlever barre vertical --- demineur.html | 3 ++- demineur.js | 19 +++++++++---------- style.css | 11 ++++------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/demineur.html b/demineur.html index 859c424..88a32dc 100644 --- a/demineur.html +++ b/demineur.html @@ -31,6 +31,7 @@ - + + diff --git a/demineur.js b/demineur.js index 7f53e08..cb8753e 100644 --- a/demineur.js +++ b/demineur.js @@ -12,7 +12,6 @@ class Case { } } -<<<<<<< HEAD function sleep(ms){ return new Promise(resolve => setTimeout(resolve, ms)); } @@ -20,16 +19,18 @@ async function chrono(){ let k=document.getElementById("temps").value; const myButton = document.getElementById("fin_game"); let arret=0; - - while(arret==!1) { - - await sleep(1000); - document.getElementById("temps").value=document.getElementById("temps").value*1+1; myButton.addEventListener("click",() =>{arret=1;}) + + while(arret==!1) { + await sleep(1000); + if (arret==!1){ + document.getElementById("temps").value=document.getElementById("temps").value*1+1; + +} } } async function reset(){ - await sleep(500); + document.getElementById("temps").value=0; } @@ -42,8 +43,7 @@ function Cookies() { Cookies(); } } -Cookies(); -======= +//Cookies(); let grille = []; @@ -63,4 +63,3 @@ function creerGrille(haut, larg) { } ->>>>>>> c1749f127de61663f2681184e2809c5310ee00a5 diff --git a/style.css b/style.css index f94e073..4003752 100644 --- a/style.css +++ b/style.css @@ -24,16 +24,13 @@ border-width: 2px; border-style: double; width: 49%; + } .item_nav{ margin-top: 3px; padding-right: 10px; + } -.vertical-line{ - border-left: 4px solid #000; - display: inline-block; - height: 400px; - margin: 0 50% ; - padding-top: 0; - } \ No newline at end of file + + From 17299865533f2706149aa66eadaa148bad42e63c Mon Sep 17 00:00:00 2001 From: Baccari Nour Date: Tue, 10 Dec 2024 14:25:02 +0100 Subject: [PATCH 4/4] creation main --- main.css | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.html | 37 +++++++++++++++++++++++------ 2 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 main.css diff --git a/main.css b/main.css new file mode 100644 index 0000000..6f8bff1 --- /dev/null +++ b/main.css @@ -0,0 +1,69 @@ + +body { + font-family: Arial, sans-serif; + margin: 0; + padding: 0; + background: linear-gradient(135deg, #007BFF, #00C6FF); + color: #007BFF; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + text-align: center; +} + + + + +.container { + text-align: center; + max-width: 600px; + padding: 20px; + background: #ffffff; + border-radius: 12px; + box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1); +} + + +header .logo { + width: 100px; + margin-bottom: 20px; +} + +header h1 { + font-size: 2rem; + color: #007BFF; + margin-bottom: 10px; +} + + +.welcome-image { + width: 80%; + max-width: 400px; + margin: 20px auto; + display: block; + border-radius: 8px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); +} + + +button { + padding: 15px 30px; + font-size: 18px; + font-weight: bold; + color: #ffffff; + background-color: #007BFF; + border: none; + border-radius: 8px; + cursor: pointer; + transition: background-color 0.3s, transform 0.2s; +} + transform: scale(1.05); +} + + +footer { + margin-top: 20px; + font-size: 14px; + color: #888; +} diff --git a/main.html b/main.html index 7cd1cab..be55fcd 100644 --- a/main.html +++ b/main.html @@ -1,8 +1,31 @@ - - + + + + + + Démineur - Accueil + + + +
+
+ +

Bienvenue dans le Monde du Démineur !

+
+
+

Préparez-vous à une expérience de jeu inoubliable ! Cliquez sur le bouton ci-dessous pour commencer votre aventure.

+ Image de bienvenue + +
+
+

© 2024 Démineur. Tous droits réservés.

+
+
- - -
- - \ No newline at end of file + + +