Merge remote-tracking branch 'origin/php' into php

php
Patrick BRUGIERE 1 year ago
commit 8c513cbd78

@ -36,12 +36,13 @@ class StudentController extends UserController
echo $twig->render('manageVocabView.html', ['vocabularies' => $vocab]); echo $twig->render('manageVocabView.html', ['vocabularies' => $vocab]);
} }
public function memoryChoice(): void { public function ListVocChoice(): void {
global $twig; global $twig;
global $user; global $user;
$jeu = $_POST['jeu'];
$model = new MdlStudent(); $model = new MdlStudent();
$voc = $model->getAll(); $voc = $model->getAll();
echo $twig->render('vocabList.html', ['vocabularies' => $voc, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); echo $twig->render('vocabList.html', ['jeu' => $jeu, 'vocabularies' => $voc, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]);
} }
public function gameChoice(): void { public function gameChoice(): void {

@ -3,6 +3,7 @@
<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" />
<link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
<title>Erreur</title> <title>Erreur</title>
<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" />
<meta name="description" content="" /> <meta name="description" content="" />

@ -4,40 +4,49 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Users</title> <title>Users</title>
<link href="{{base}}/css/styles.css" rel="stylesheet" /> <link href="{{base}}/css/styles.css" rel="stylesheet" />
</head> <link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
<style> <style>
body { body {
margin-top: 5vh; margin-top: 5vh;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 100vh; height: 100vh;
} }
.content {
text-align: center;
}
table { table {
border-spacing: 5%; margin-top: 20px;
} }
</style> </style>
</head>
<body> <body>
{% include 'navBar.twig' %} {% include 'navBar.twig' %}
{% if vocabularies is defined %}
<div class="content"> <div class="content">
<section> <section>
<table> <table>
{% for row in vocabularies %}
<tr> <tr>
<td> <td>
<form action="{{base}}/student/{{userID}}/memory" method="post"> <form action="{{base}}/student/{{userID}}/listVocChoice" method="post">
<input type="hidden" name="idVoc" value="{{ row.id }}"> <input type="hidden" name="jeu" value="quiz">
<input class="btn-list" type="submit" value="{{ row.name }}" /> <input class="btn-list" type="submit" value="Quiz" />
</form>
</td>
</tr>
<tr>
<td>
<form action="{{base}}/student/{{userID}}/listVocChoice" method="post">
<input type="hidden" name="jeu" value="memory">
<input class="btn-list" type="submit" value="Memory" />
</form> </form>
</td> </td>
</tr> </tr>
{% endfor %}
</table> </table>
</section> </section>
</div> </div>
{% endif %}
</body> </body>
</html> </html>

@ -4,8 +4,10 @@
<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">
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.0/css/bootstrap.min.css" rel="stylesheet"/> <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.0/css/bootstrap.min.css" rel="stylesheet"/>
<link href="https://unicons.iconscout.com/release/v2.1.9/css/unicons.css" rel="stylesheet"/> <link href="https://unicons.iconscout.com/release/v2.1.9/css/unicons.css" rel="stylesheet"/>
<link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
<link href="{{base}}/css/login.css" rel="stylesheet" /> <link href="{{base}}/css/login.css" rel="stylesheet" />
<link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
<title>Login</title> <title>Login</title>
</head> </head>
<body> <body>

@ -6,7 +6,7 @@
<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" />
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="author" content="" /> <meta name="author" content="" />
<link rel="icon" type="image/x-icon" href="assets/favicon.ico" /> <link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
<!-- Font Awesome icons (free version)--> <!-- Font Awesome icons (free version)-->
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script> <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<!-- Google fonts--> <!-- Google fonts-->

@ -6,7 +6,6 @@
<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" />
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="author" content="" /> <meta name="author" content="" />
<link rel="icon" type="image/x-icon" href="assets/favicon.ico" />
<!-- Font Awesome icons (free version)--> <!-- Font Awesome icons (free version)-->
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script> <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<!-- Google fonts--> <!-- Google fonts-->
@ -16,7 +15,7 @@
rel="stylesheet" /> rel="stylesheet" />
<!-- Core theme CSS (includes Bootstrap)--> <!-- Core theme CSS (includes Bootstrap)-->
<link href="{{base}}/css/styles.css" rel="stylesheet" /> <link href="{{base}}/css/styles.css" rel="stylesheet" />
</head> <link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
</head> </head>
<style> <style>
section { section {

@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Memory Game</title> <title>Memory Game</title>
<link rel="stylesheet" href="{{base}}/css/memory.css"> <link rel="stylesheet" href="{{base}}/css/memory.css">
<link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
</head> </head>
<body> <body>
<div> <div>

@ -6,7 +6,7 @@
<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" />
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="author" content="" /> <meta name="author" content="" />
<link rel="icon" type="image/x-icon" href="assets/favicon.ico" /> <link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
<!-- Font Awesome icons (free version)--> <!-- Font Awesome icons (free version)-->
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script> <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<!-- Google fonts--> <!-- Google fonts-->

@ -15,12 +15,11 @@
<li class="nav-item"><a class="nav-link" href="{{ base }}/admin/{{ userID }}/showAccountInfos">My account</a></li> <li class="nav-item"><a class="nav-link" href="{{ base }}/admin/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %} {% endif %}
{% if 'student' in userRole%} {% if 'student' in userRole%}
<li class="nav-item"><a class="nav-link" href="{{ base }}/student/{{ userID }}/memoryChoice">Memory</a></li> <li class="nav-item"><a class="nav-link" href="{{ base }}/student/{{ userID }}/gameChoice">Play</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/student/{{ userID }}/showAccountInfos">My account</a></li> <li class="nav-item"><a class="nav-link" href="{{ base }}/student/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %} {% endif %}
{% if 'teacher' in userRole%} {% if 'teacher' in userRole%}
<li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/affAllVocab">Manage lessons</a></li> <li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/affAllVocab">Manage lessons</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/game">Play</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/showAccountInfos">My account</a></li> <li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %} {% endif %}
{% if userRole is empty %} {% if userRole is empty %}

@ -7,7 +7,7 @@
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="author" content="" /> <meta name="author" content="" />
<title>Quiz</title> <title>Quiz</title>
<link rel="icon" type="image/x-icon" href="assets/favicon.ico" /> <link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
<!-- Google fonts--> <!-- Google fonts-->
<link href="https://fonts.googleapis.com/css?family=Varela+Round" rel="stylesheet" /> <link href="https://fonts.googleapis.com/css?family=Varela+Round" rel="stylesheet" />
<link <link

@ -4,6 +4,7 @@
<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">
<link href="{{base}}/css/styles.css" rel="stylesheet" /> <link href="{{base}}/css/styles.css" rel="stylesheet" />
<link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
<title>Félicitations!</title> <title>Félicitations!</title>
<style> <style>
body { body {

@ -3,8 +3,8 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Users</title> <title>Users</title>
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<link href="{{base}}/css/styles.css" rel="stylesheet" /> <link href="{{base}}/css/styles.css" rel="stylesheet" />
<link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
</head> </head>
<body> <body>

@ -4,6 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Users</title> <title>Users</title>
<link href="{{base}}/css/styles.css" rel="stylesheet" /> <link href="{{base}}/css/styles.css" rel="stylesheet" />
<link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
</head> </head>
<style> <style>
body { body {
@ -14,8 +15,12 @@
height: 100vh; height: 100vh;
} }
.content {
text-align: center;
}
table { table {
border-spacing: 5%; margin-top: 20px;
} }
</style> </style>
@ -28,7 +33,7 @@
{% for row in vocabularies %} {% for row in vocabularies %}
<tr> <tr>
<td> <td>
<form action="{{base}}/student/{{userID}}/memory" method="post"> <form action="{{base}}/student/{{userID}}/{{jeu}}" method="post">
<input type="hidden" name="idVoc" value="{{ row.id }}"> <input type="hidden" name="idVoc" value="{{ row.id }}">
<input class="btn-list" type="submit" value="{{ row.name }}" /> <input class="btn-list" type="submit" value="{{ row.name }}" />
</form> </form>

Loading…
Cancel
Save