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

ServeurDeTest
johan 2 years ago
commit de51cf3ddb

@ -160,6 +160,7 @@ body {
background: linear-gradient(270deg, transparent, #6090d1); background: linear-gradient(270deg, transparent, #6090d1);
animation: btn-anim3 1s linear infinite; animation: btn-anim3 1s linear infinite;
animation-delay: 0.5s; animation-delay: 0.5s;
-webkit-animation: btn-anim3 1s linear infinite;
} }
@keyframes btn-anim3 { @keyframes btn-anim3 {

@ -1,36 +1,19 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="fr"> <html lang="fr">
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Login</title> <title>Login</title>
<link <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous" />
rel="stylesheet" <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" <script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js" integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" crossorigin="anonymous"></script>
integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" />
crossorigin="anonymous" <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" />
/> <link rel="stylesheet" href="./View/src/CSS/Login.css" />
<script </head>
src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" <body>
crossorigin="anonymous"
></script>
<script
src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js"
integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/"
crossorigin="anonymous"
></script>
<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="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
/>
<link rel="stylesheet" href="./View/src/CSS/LogSign.css" />
</head>
<body>
<div class="container user-select-none"> <div class="container user-select-none">
<div class="login-box col-12" id="form"> <div class="login-box col-12" id="form">
<div class="row mb-4"> <div class="row mb-4">
@ -64,5 +47,6 @@
</form> </form>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

@ -1,36 +1,19 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Scripted</title> <title>Scripted</title>
<link <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous" />
rel="stylesheet" <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css" <script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js" integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" crossorigin="anonymous"></script>
integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" />
crossorigin="anonymous" <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.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>
<script
src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js"
integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/"
crossorigin="anonymous"
></script>
<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="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
/>
<link rel="stylesheet" href="./View/src/CSS/Main.css" /> <link rel="stylesheet" href="./View/src/CSS/Main.css" />
</head> </head>
<body>
<body>
<script> <script>
function displayProfil() { function displayProfil() {
profil.classList.toggle("open"); profil.classList.toggle("open");
@ -44,29 +27,20 @@
<!-- Profile page --> <!-- Profile page -->
<div class="col-4 d-flex" id="profilContainer"> <div class="col-4 d-flex" id="profilContainer">
<button <button class="d-flex p-0 user-select-none" id="btnProfil" style="background: transparent; border: none; z-index: 10; height: fit-content;" onclick="displayProfil()">
class="d-flex p-0 user-select-none"
id="btnProfil"
style="background: transparent; border: none; z-index: 10; height: fit-content;"
onclick="displayProfil()"
>
<span class="material-symbols-outlined p-1 neonBg" id="profilIcon"> <span class="material-symbols-outlined p-1 neonBg" id="profilIcon">
clear_all clear_all
</span> </span>
</button> </button>
<div <div class="col-4" id="profil" style="
class="col-4"
id="profil"
style="
background-image: linear-gradient(15deg, #434343 0%, black 100%); background-image: linear-gradient(15deg, #434343 0%, black 100%);
border-radius: 10px; border-radius: 10px;
height: 100%; height: 100%;
z-index: 2; z-index: 2;
" ">
>
<div class="row py-5 d-flex justify-content-center mx-0"> <div class="row py-5 d-flex justify-content-center mx-0">
<?php <?php
if (isset($_SESSION['role']) && $_SESSION['role'] == 'user'){ if (isset($_SESSION['role']) && $_SESSION['role'] == 'user') {
echo '<img echo '<img
src="./View/assets/img/CyberpunkGirl4.png" src="./View/assets/img/CyberpunkGirl4.png"
alt="Profil" alt="Profil"
@ -79,7 +53,7 @@
border: 2px solid #44fff6; border: 2px solid #44fff6;
" "
/> />
<p class="d-flex justify-content-center m-0 p-0">' .$_SESSION['pseudo'].'</p> <p class="d-flex justify-content-center m-0 p-0">' . $_SESSION['pseudo'] . '</p>
<div <div
class="d-flex justify-content-center align-self-end p-0 m-0 user-select-none" class="d-flex justify-content-center align-self-end p-0 m-0 user-select-none"
@ -92,8 +66,7 @@
<span class="button-text">Logout</span> <span class="button-text">Logout</span>
</a> </a>
</div>'; </div>';
} } elseif (isset($_SESSION['role']) && $_SESSION['role'] == 'admin') {
elseif (isset($_SESSION['role']) && $_SESSION['role'] == 'admin'){
echo '<img echo '<img
src="./View/assets/img/CyberpunkGirl4.png" src="./View/assets/img/CyberpunkGirl4.png"
alt="Profil" alt="Profil"
@ -109,7 +82,7 @@
<p <p
class="d-flex justify-content-center m-0 p-0" class="d-flex justify-content-center m-0 p-0"
style="font-weight: bold; font-size: 18px" style="font-weight: bold; font-size: 18px"
>' .$_SESSION['pseudo'].'</p> >' . $_SESSION['pseudo'] . '</p>
<div <div
class="d-flex flex-column align-items-center align-self-end p-0 m-0 user-select-none" class="d-flex flex-column align-items-center align-self-end p-0 m-0 user-select-none"
@ -157,8 +130,7 @@
<span class="button-text">Logout</span> <span class="button-text">Logout</span>
</a> </a>
</div>'; </div>';
} } else {
else {
echo '<div class="d-flex justify-content-center align-self-center p-0 m-0" id="container">'; echo '<div class="d-flex justify-content-center align-self-center p-0 m-0" id="container">';
echo '<a class="logButton" href="index.php?action=goToLogin">'; echo '<a class="logButton" href="index.php?action=goToLogin">';
echo ' <span class="circle" aria-hidden="true">'; echo ' <span class="circle" aria-hidden="true">';
@ -183,26 +155,18 @@
<!-- Solo --> <!-- Solo -->
<div class="row m-0 pt-4 pb-5 d-flex justify-content-center text-center"> <div class="row m-0 pt-4 pb-5 d-flex justify-content-center text-center">
<a class="cssbuttons-io" <a class="cssbuttons-io" <?php
<?php if (isset($_SESSION['role']) && $_SESSION['role'] == 'user' || isset($_SESSION['role']) && $_SESSION['role'] == 'admin') {
if (isset($_SESSION['role']) && $_SESSION['role'] == 'user' || isset($_SESSION['role']) && $_SESSION['role'] == 'admin'){
echo 'href="index.php?action=goToPresentation"'; echo 'href="index.php?action=goToPresentation"';
} } else {
else{
echo 'href="index.php?action=goToLogin"'; echo 'href="index.php?action=goToLogin"';
} }
?> ?> id="btn-1">
id="btn-1"> <span><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<span
><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M0 0h24v24H0z" fill="none"></path> <path d="M0 0h24v24H0z" fill="none"></path>
<path <path d="M24 12l-5.657 5.657-1.414-1.414L21.172 12l-4.243-4.243 1.414-1.414L24 12zM2.828 12l4.243 4.243-1.414 1.414L0 12l5.657-5.657L7.07 7.757 2.828 12zm6.96 9H7.66l6.552-18h2.128L9.788 21z" fill="currentColor"></path>
d="M24 12l-5.657 5.657-1.414-1.414L21.172 12l-4.243-4.243 1.414-1.414L24 12zM2.828 12l4.243 4.243-1.414 1.414L0 12l5.657-5.657L7.07 7.757 2.828 12zm6.96 9H7.66l6.552-18h2.128L9.788 21z"
fill="currentColor"
></path>
</svg> </svg>
CodeQuest</span CodeQuest</span>
>
</a> </a>
</div> </div>

Loading…
Cancel
Save