Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted
continuous-integration/drone/push Build is failing Details

ServeurDeTest
Noé GARNIER 2 years ago
commit 89bb5e8c24

@ -18,7 +18,7 @@ steps:
host: sancy.iut.uca.fr host: sancy.iut.uca.fr
username: lafourcade username: lafourcade
target: public_html/Scripted target: public_html/Scripted
source: index.php ./View ./Model source: View/* index.php
key: key:
from_secret: DEPLOY_KEY from_secret: DEPLOY_KEY
secrets: secrets:

@ -1,113 +1,106 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="UTF-8" /> <head>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta charset="UTF-8" />
<title>Scripted</title> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link <title>Scripted</title>
rel="stylesheet" <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous" />
href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" <script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js" integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" crossorigin="anonymous"></script>
crossorigin="anonymous" <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" />
/> <link rel="stylesheet" href="./View/src/CSS/Main2.css" />
<script <link rel="stylesheet" href="./View/src/CSS/FirstTest.css">
src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" </head>
integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
crossorigin="anonymous" <body>
></script> <div id="imgMain" style="background: #050E15;">
<script <div class="container-fluid">
src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js"
integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" <div class="row p-3">
crossorigin="anonymous" <a class="btn" href="index.php?action=quitQueue">
></script> <span>Quitter</span>
<link </a>
rel="stylesheet" </div>
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0"
/> <div class="row m-0">
<link rel="stylesheet" href="./View/src/CSS/Main2.css" /> <h2 class="text-center mt-3 pr-5" style="color: #00CCFF; font-weight: 1000;font-style: italic;">SCRIPT</h2>
<link rel="stylesheet" href="./View/src/CSS/FirstTest.css"> <h2 class="text-center pl-5" style="color: #D400D4; font-weight:bold ; font-size:4em;font-style: italic;">RUSH</h2>
</head> </div>
<body>
<div> <div class="row py-5 m-0">
<div id="imgMain" style="background: #050E15;"> <h3 class="text-center" id="waiting">Waiting for Coders...</h3>
<div class="grid"> </div>
<div class="m-3">
<a class="btn" href="index.php?action=quitQueue"> <div class="row py-5 d-flex m-0">
<span>Quitter</span> <div class="col d-flex flex-column align-items-center">
</a> <div style="background-color: red; height: 75px; width: 75px;"></div>
</div> <p class="pt-3" id="player1">Player 1</p>
<div class="row"> </div>
<h2 class="text-center mt-3 mr-5" style="color: #00CCFF; font-weight: 1000;font-style: italic;">SCRIPT</h2> <div class="col d-flex flex-column align-items-center">
<h2 class="text-center ml-5" style="color: #D400D4; font-weight:bold ; font-size:4em;font-style: italic;">RUSH</h2> <div style="background-color: blue; height: 75px; width: 75px;"></div>
</div> <p class="pt-3" id="player2">Player 2</p>
<div class="row pt-5"> </div>
<h3 class="text-center" id="waiting">Waiting for Coders...</h3> <div class="col d-flex flex-column align-items-center">
</div> <div style="background-color: yellow; height: 75px; width: 75px;"></div>
<div class="row d-flex "> <p class="pt-3" id="player3">Player 3</p>
<div class="col d-flex flex-column align-items-center"> </div>
<div style="background-color: red; height: 75px; width: 75px;"></div> <div class="col d-flex flex-column align-items-center">
<p class="pt-3" id="player1">Player 1</p> <div style="background-color: green; height: 75px; width: 75px;"></div>
</div> <p class="pt-3" id="player4">Player 4</p>
<div class="col d-flex flex-column align-items-center">
<div style="background-color: blue; height: 75px; width: 75px;"></div>
<p class="pt-3" id="player2">Player 2</p>
</div>
<div class="col d-flex flex-column align-items-center">
<div style="background-color: yellow; height: 75px; width: 75px;"></div>
<p class="pt-3" id="player3">Player 3</p>
</div>
<div class="col d-flex flex-column align-items-center">
<div style="background-color: green; height: 75px; width: 75px;"></div>
<p class="pt-3" id="player4">Player 4</p>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</body>
<script> </div>
function checkIsReady() { </body>
console.log("checkIsReady");
var xhr = new XMLHttpRequest(); <script>
xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=waiting', true); function checkIsReady() {
xhr.responseType = 'text'; console.log("checkIsReady");
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); var xhr = new XMLHttpRequest();
xhr.onload = function () { xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=waiting', true);
console.log(xhr.responseText); xhr.responseType = 'text';
if (xhr.responseText == "1") { xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
window.location.href = 'http://82.165.180.114/Scripted/index.php?action=goToGame&idPartie=' + <?php echo $_SESSION['idPartie'] ?> + '&index=1' xhr.onload = function() {
} console.log(xhr.responseText);
}; if (xhr.responseText == "1") {
xhr.send(null); window.location.href = 'http://82.165.180.114/Scripted/index.php?action=goToGame&idPartie=' + <?php echo $_SESSION['idPartie'] ?> + '&index=1'
} }
function getPlayer() { };
console.log("getPlayer"); xhr.send(null);
var xhr = new XMLHttpRequest(); }
xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=getPlayersPseudo', true);
xhr.responseType = 'text'; function getPlayer() {
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); console.log("getPlayer");
xhr.onload = function () { var xhr = new XMLHttpRequest();
var players = JSON.parse(xhr.responseText); xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=getPlayersPseudo', true);
if (players[0] != null) { xhr.responseType = 'text';
document.getElementById("player1").innerHTML = players[0]; xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
} xhr.onload = function() {
if (players[1] != null) { var players = JSON.parse(xhr.responseText);
document.getElementById("player2").innerHTML = players[1]; if (players[0] != null) {
} document.getElementById("player1").innerHTML = players[0];
if (players[2] != null) { }
document.getElementById("player3").innerHTML = players[2]; if (players[1] != null) {
} document.getElementById("player2").innerHTML = players[1];
if (players[3] != null) { }
document.getElementById("player4").innerHTML = players[3]; if (players[2] != null) {
} document.getElementById("player3").innerHTML = players[2];
}; }
xhr.send(null); if (players[3] != null) {
} document.getElementById("player4").innerHTML = players[3];
window.addEventListener("load", waiting); }
function waiting(){ };
var countdownTimer = setInterval('checkIsReady()', 1000); xhr.send(null);
setInterval('getPlayer()', 500); }
} window.addEventListener("load", waiting);
</script>
</html> function waiting() {
var countdownTimer = setInterval('checkIsReady()', 1000);
setInterval('getPlayer()', 500);
}
</script>
</html>

@ -1,67 +1,52 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="UTF-8" /> <head>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta charset="UTF-8" />
<title>Scripted</title> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link <title>Scripted</title>
rel="stylesheet" <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous" />
href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" <script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js" integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" crossorigin="anonymous"></script>
crossorigin="anonymous" <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" />
/> <link rel="stylesheet" href="./View/src/CSS/Main2.css" />
<script <link rel="stylesheet" href="./View/src/CSS/FirstTest.css">
src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" </head>
integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
crossorigin="anonymous" <body>
></script> <div id="imgMain" style="background: #050E15;">
<script <div class="container-fluid">
src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js" <div class="row m-0">
integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" <h2 class="text-center mt-3 pr-5" style="color: #00CCFF; font-weight: 1000; font-style: italic;">SCRIPT</h2>
crossorigin="anonymous" <h2 class="text-center pl-5" style="color: #D400D4; font-weight:bold; font-size:4em; font-style: italic;">RUSH</h2>
></script> </div>
<link <div class="row pt-5 px-3 m-0">
rel="stylesheet" <p class="text-center">Bienvenue dans le mode <b>ScriptRush</b> ! Tu es ici dans le mode multijoueur de <b>Scripted</b>.
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" Dans ce mode, tu vas pouvoir affronter d'autres joueurs et tenter de gagner le plus de points possible.
/> Pour cela, tu vas devoir résoudre le plus d'énigme de possible en un temps imparti.
<link rel="stylesheet" href="./View/src/CSS/Main2.css" /> Si c'est ta première venue, je te conseille de jeter un œil au mode <b>CodeQuest</b> avant d'aller plus loin.
<link rel="stylesheet" href="./View/src/CSS/FirstTest.css"> Pour les plus téméraires, je vous laisse cliquer sur <b>Lancer</b> pour trouver des adversaires.
</head> Bonne chance et que le meilleur gagne !</p>
<body> </div>
<div> <div class="row pt-5 m-0">
<div id="imgMain" style="background: #050E15;"> <h3 class="text-center" id="waiting">Ready ?</h3>
<div class="grid"> </div>
<div class="row"> <div class="row m-0">
<h2 class="text-center mt-3 mr-5" style="color: #00CCFF; font-weight: 1000;font-style: italic;">SCRIPT</h2> <div class="d-flex justify-content-center ltext-center" style="cursor: pointer; height: 20%">
<h2 class="text-center ml-5" style="color: #D400D4; font-weight:bold ; font-size:4em;font-style: italic;">RUSH</h2> <div class="m-3">
</div> <a class="btn" href="index.php?action=addToQueue">
<div class="row pt-5"> <span>LANCER</span>
<p class="text-center">Bienvenue dans le mode <b>ScriptRush</b> ! Tu es ici dans le mode multijoeur de <b>Scripted</b>. </a>
Dans ce mode tu vas pouvoir affronter d'autres joueur et tenter de gagner le plus de points possible. Pour cela tu vas devoir </div>
résoudre le plus d'énigme de possible en un temps imparti. <div class="m-3">
Si c'est ta première venue je te conseile de jeter un oeil au mode <b>CodeQuest</b> avant d'aller plus loin. <a class="btn" href="index.php?action=goToHome">
Pour les plus témaire je vous laisse cliquer sur <b>Lancer</b> pour trouver des adversaire. <span>RETOUR</span>
Bonne chance et que le meilleur gagne !</p> </a>
</div> </div>
<div class="row pt-5"> </div>
<h3 class="text-center" id="waiting">Ready ?</h3>
</div>
<div class="row">
<div class="d-flex justify-content-center ltext-center" style="cursor: pointer; height: 20%">
<div class="m-3">
<a class="btn" href="index.php?action=addToQueue">
<span>LANCER</span>
</a>
</div>
<div class="m-3">
<a class="btn" href="index.php?action=goToHome">
<span>RETOUR</span>
</a>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</body> </div>
</html> </body>
</html>

@ -5,8 +5,7 @@
<title>Scripted</title> <title>Scripted</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
</head> </head>
<body> <body>
@ -22,10 +21,10 @@
<p>Votre score est de : <?php echo $points ?> points.</p> <p>Votre score est de : <?php echo $points ?> points.</p>
<p>Temps restant avant la fin de la partie :</p> <p>Temps restant avant la fin de la partie :</p>
<?php <?php
$end_time = $dateDebut->modify('+'. $_SESSION['tpsMaxPartie'] .'seconds'); $end_time = $dateDebut->modify('+' . $_SESSION['tpsMaxPartie'] . 'seconds');
$now = new DateTime(); $now = new DateTime();
$interval = $now->diff($end_time); $interval = $now->diff($end_time);
$remaining_seconds = $interval->days * 24 * 60 * 60 + $interval->h * 60 * 60 + $interval->i * 60 + $interval->s; $remaining_seconds = $interval->days * 24 * 60 * 60 + $interval->h * 60 * 60 + $interval->i * 60 + $interval->s;
?> ?>
<div id="countdown"></div> <div id="countdown"></div>
</div> </div>
@ -37,7 +36,7 @@
xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=getGameEtat', true); xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=getGameEtat', true);
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xhr.onload = function () { xhr.onload = function() {
if (xhr.responseText == "2") { if (xhr.responseText == "2") {
window.location.href = 'http://82.165.180.114/Scripted/index.php?action=endGame' window.location.href = 'http://82.165.180.114/Scripted/index.php?action=endGame'
} }
@ -45,16 +44,17 @@
xhr.send(null); xhr.send(null);
} }
var seconds = <?php echo $remaining_seconds; ?>; var seconds = <?php echo $remaining_seconds; ?>;
function countdown() { function countdown() {
checkIsEnd(); checkIsEnd();
var days = Math.floor(seconds/24/60/60); var days = Math.floor(seconds / 24 / 60 / 60);
var hoursLeft = Math.floor((seconds) - (days*86400)); var hoursLeft = Math.floor((seconds) - (days * 86400));
var hours = Math.floor(hoursLeft/3600); var hours = Math.floor(hoursLeft / 3600);
var minutesLeft = Math.floor((hoursLeft) - (hours*3600)); var minutesLeft = Math.floor((hoursLeft) - (hours * 3600));
var minutes = Math.floor(minutesLeft/60); var minutes = Math.floor(minutesLeft / 60);
var remainingSeconds = seconds % 60; var remainingSeconds = seconds % 60;
if (remainingSeconds < 10) { if (remainingSeconds < 10) {
remainingSeconds = "0" + remainingSeconds; remainingSeconds = "0" + remainingSeconds;
} }
document.getElementById('countdown').innerHTML = hours + " heures " + minutes + " minutes " + remainingSeconds + " secondes"; document.getElementById('countdown').innerHTML = hours + " heures " + minutes + " minutes " + remainingSeconds + " secondes";
if (seconds == 0) { if (seconds == 0) {
@ -67,13 +67,11 @@
var countdownTimer = setInterval('countdown()', 1000); var countdownTimer = setInterval('countdown()', 1000);
</script> </script>
<!-- Bootstrap JavaScript Libraries --> <!-- Bootstrap JavaScript Libraries -->
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js" <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js" integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3" crossorigin="anonymous">
integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3" crossorigin="anonymous"> </script>
</script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/js/bootstrap.min.js" <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/js/bootstrap.min.js" integrity="sha384-7VPbUDkoPSGFnVtYi0QogXtr74QeVeeIs99Qfg5YCF+TidwNdjvaKZX19NZ/e6oz" crossorigin="anonymous">
integrity="sha384-7VPbUDkoPSGFnVtYi0QogXtr74QeVeeIs99Qfg5YCF+TidwNdjvaKZX19NZ/e6oz" crossorigin="anonymous"> </script>
</script>
</body> </body>
</html> </html>
Loading…
Cancel
Save