antoine.jourdain
/
sae_2a_anglais
1
0
Fork 0
Code Issues 17 Pull Requests 1 Packages Projects 1 Releases Wiki Activity

Fix nav bar

Browse Source 
Manque des fonctionnalités à régler avec l'altorouteur + gérer Front
php
Antoine JOURDAIN 1 year ago
parent 32043c5f8c
commit 945263d1f0
14 changed files with 139 additions and 168 deletions
Show Stats Download Patch File Download Diff File

2
Project/php/config/config.php
Unescape View File

@ -18,4 +18,4 @@ global $password;
$password = 'achanger';
global $altorouterPath;
$altorouterPath = "/~lugoigoux1/SAE_2A_Anglais/Project/php";
$altorouterPath = "/SAE_2A_Anglais/Project/php";

8
Project/php/controller/FrontController.php
Unescape View File

@ -88,6 +88,12 @@ class FrontController
public static function home(): void {
global $twig;
echo $twig->render('home.html');
global $user;
if(isset($user)){
echo $twig->render('home.html', ['userID' => $user->getId(), 'userRole' => $user->getRoles()]);
}
else{
echo $twig->render('home.html', );
}
}
}

1
Project/php/controller/VisitorController.php
Unescape View File

@ -87,6 +87,7 @@ class VisitorController
}
public function confirmLogin(): void {
global $user;
$model = new MdlUser();
if($_POST['logemail']!=null && $_POST['logpass']!=null) {
$login = strip_tags($_POST['logemail']);

9
Project/php/css/memory.css
Unescape View File

@ -2,10 +2,9 @@ body {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
height: 90vh;
background-color: #f0f0f0;
margin-left: 15vh;
margin-right: 15vh;
margin: 2vh 15vh;
overflow: hidden;
}
@ -31,8 +30,8 @@ body {
cursor: pointer;
transition: transform 0.6s ease;
transform-style: preserve-3d;
min-height: 10vh;
min-width: 20vh;
min-height: 5vh;
max-width: 100%;
aspect-ratio: 1/1;
}

12
Project/php/css/styles.css
Unescape View File

@ -616,7 +616,7 @@ progress {
.logo {
margin-top: 10%;
height: 10vh;
max-height: 8vh;
}
.figure-caption {
@ -11070,7 +11070,7 @@ body {
padding: 0.9rem 0;
}
#secondNav .navbar-nav .nav-item:hover {
color: fade(#fff, 80%);
color: #7464a1;
outline: none;
background-color: transparent;
}
@ -11101,13 +11101,13 @@ body {
color: #fff;
}
#secondNav.navbar-shrink {
background-color: #fff;
background-color: #7464a1;
}
#secondNav.navbar-shrink .navbar-brand {
color: #000;
}
#secondNav.navbar-shrink .nav-link {
color: #000;
color: #fff;
padding: 1.5rem 1.5rem 1.25rem;
border-bottom: 0.25rem solid transparent;
}
@ -11338,4 +11338,8 @@ body {
.app-badge {
height: 3rem;
}
.content{
padding : 12vh;
}

6
Project/php/js/scripts.js
Unescape View File

@ -11,7 +11,7 @@ window.addEventListener('DOMContentLoaded', event => {
// Navbar shrink function
var navbarShrink = function () {
const navbarCollapsible = document.body.querySelector('#mainNav');
const navbarCollapsible = document.body.querySelector('#secondNav');
if (!navbarCollapsible) {
return;
}
@ -30,10 +30,10 @@ window.addEventListener('DOMContentLoaded', event => {
document.addEventListener('scroll', navbarShrink);
// Activate Bootstrap scrollspy on the main nav element
const mainNav = document.body.querySelector('#mainNav');
const mainNav = document.body.querySelector('#secondNav');
if (mainNav) {
new bootstrap.ScrollSpy(document.body, {
target: '#mainNav',
target: '#secondNav',
rootMargin: '0px 0px -40%',
});
};

49
Project/php/templates/addVocabList.html
Unescape View File

@ -17,29 +17,30 @@
<!-- Core theme CSS (includes Bootstrap)-->
<link href="css/styles.css" rel="stylesheet" />
</head>
<section>
<h1>Add words</h1>
{% if user is defined %}
<form action="{{base}}/teacher/addVocabList" method="GET">
<table>
<tr>
<td colspan="2">
<input type="hidden" name="userID" value="{{user}}">
<input type="text" name="listName" placeholder="list name" required>
</td>
</tr>
{% for i in 0..1 %}
<tr>
<td><input type="text" name="frenchWord{{i}}" placeholder="french word"></td>
<td><input type="text" name="englishWord{{i}}" placeholder="english word"></td>
</tr>
{% endfor %}
<tr><td colspan="2"><input type="submit" value="Add"></td></tr>
</table>
</form>
{% endif %}
</section>
{% include 'navbar.twig' %}
<div class="content">
<section>
<h1>Add words</h1>
{% if user is defined %}
<form action="{{base}}/teacher/addVocabList" method="GET">
<table>
<tr>
<td colspan="2">
<input type="hidden" name="userID" value="{{user}}">
<input type="text" name="listName" placeholder="list name" required>
</td>
</tr>
{% for i in 0..1 %}
<tr>
<td><input type="text" name="frenchWord{{i}}" placeholder="french word"></td>
<td><input type="text" name="englishWord{{i}}" placeholder="english word"></td>
</tr>
{% endfor %}
<tr><td colspan="2"><input type="submit" value="Add"></td></tr>
</table>
</form>
{% endif %}
</section>
</div>
</body>
</html>

19
Project/php/templates/home.html
Unescape View File

@ -21,24 +21,7 @@
<body id="page-top">
<!-- Navigation-->
<nav class="navbar navbar-expand-lg navbar-light fixed-top" id="mainNav">
<div class="container">
<a class="navbar-brand" href="#page-top"><img class="logo" src="{{base}}/assets/img/logo.png"/></a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
aria-label="Toggle navigation">
Menu
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto">
<li class="nav-item"><a class="nav-link" href="#game">Game</a></li>
<li class="nav-item"><a class="nav-link" href="#download">Download</a></li>
<li class="nav-item"><a class="nav-link" href="{{base}}/visitor/login">My account</a></li>
</ul>
</div>
</div>
</nav>
{% include 'navbar.twig' %}
<!-- Masthead-->
<header class="masthead">
<div class="container px-4 px-lg-5 d-flex h-100 align-items-center justify-content-center">

39
Project/php/templates/manageGroupView.html
Unescape View File

@ -15,7 +15,7 @@
href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"
rel="stylesheet" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="css/styles.css" rel="stylesheet" />
<link href="{{base}}/css/styles.css" rel="stylesheet" />
</head>
<style>
section {
@ -24,21 +24,26 @@
}
</style>
<body>
<section class="groupList">
<h2>Group list</h2>
{% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %}
</section>
<section class="users">
<h2>Users of the group</h2>
{% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUserFromGroup'} %}
</section>
<section class="addGroupForm">
<h2>Add group</h2>
{% include 'addGroupForm.twig' %}
</section>
<section class="unassignedUsers">
<h1>Unassigned users</h1>
{% include 'userContainer.twig' with {'users' : unassignedUsers, 'action' : 'addUserToGroup'} %}
</section>
{% include 'navbar.twig' %}
<div class="content">
<section class="groupList">
<h2>Group list</h2>
{% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %}
</section>
<section class="users">
<h2>Users of the group</h2>
{% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUserFromGroup'} %}
</section>
<section class="addGroupForm">
<h2>Add group</h2>
{% include 'addGroupForm.twig' %}
</section>
<section class="unassignedUsers">
<h1>Unassigned users</h1>
{% include 'userContainer.twig' with {'users' : unassignedUsers, 'action' : 'addUserToGroup'} %}
</section>
</div>
<script src="{{base}}/js/scripts.js"></script>
</body>
</html>

37
Project/php/templates/manageVocabListView.html
Unescape View File

@ -25,26 +25,29 @@
}
</style>
<body>
<div class="section">
<section class="VocabularyList">
<h2>Vocab list</h2>
{% include 'vocabularyContainer.twig' with {'actions' : 'affAllVocab', 'vocabularies' : vocabularies , 'userId' : userId } %}
</section>
{% include 'navbar.twig' %}
<div class="content">
<div class="section">
<section class="VocabularyList">
<h2>Vocab list</h2>
{% include 'vocabularyContainer.twig' with {'actions' : 'affAllVocab', 'vocabularies' : vocabularies , 'userId' : userId } %}
</section>
<section class="Vocabulaire">
<h2>Vocab of the user</h2>
{% include 'vocabularyContainer.twig' with {'vocabularies' : vocabularies , 'actions' : 'getByName', 'selectedName' : 'selectedName', 'userId' : userId } %}
</section>
<section class="Vocabulaire">
<h2>Vocab of the user</h2>
{% include 'vocabularyContainer.twig' with {'vocabularies' : vocabularies , 'actions' : 'getByName', 'selectedName' : 'selectedName', 'userId' : userId } %}
</section>
<section class="addGroupForm">
<h2>Add Vocabb</h2>
{% include 'vocabularyContainer.twig' with { 'actions' : 'addVocabList' , 'userId' : userId } %}
</section>
<section class="addGroupForm">
<h2>Add Vocabb</h2>
{% include 'vocabularyContainer.twig' with { 'actions' : 'addVocabList' , 'userId' : userId } %}
</section>
<section class="unassignedUsers">
<h1>Unassigned vocab</h1>
{% include 'vocabularyContainer.twig' with {'vocabularies' : vocabularies , 'actions' : 'delById', 'userId' : userId } %}
</section>
<section class="unassignedUsers">
<h1>Unassigned vocab</h1>
{% include 'vocabularyContainer.twig' with {'vocabularies' : vocabularies , 'actions' : 'delById', 'userId' : userId } %}
</section>
</div>
</div>
</body>
</html>

43
Project/php/templates/navBar.html
Unescape View File

@ -1,43 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="" />
<meta name="author" content="" />
<title>In English Please !</title>
<link rel="icon" type="image/x-icon" href="assets/favicon.ico" />
<!-- Google fonts-->
<link href="https://fonts.googleapis.com/css?family=Varela+Round" rel="stylesheet" />
<link
href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"
rel="stylesheet" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="../css/styles.css" rel="stylesheet" />
</head>
<body id="navBar">
<!-- Navigation-->
<nav class="navbar navbar-expand-lg navbar-light fixed-top" id="secondNav">
<div class="container px-4 px-lg-5">
<a class="navbar-brand" href="index.html">Logo</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
aria-label="Toggle navigation">
Menu
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto">
<li class="nav-item"><a class="nav-link" href="#game">Game</a></li>
<li class="nav-item"><a class="nav-link" href="#download">Download</a></li>
<li class="nav-item"><a class="nav-link" href="login.html">My account</a></li>
</ul>
</div>
</div>
</nav>
</body>
</html>

70
Project/php/templates/navBar.twig
Unescape View File

@ -1,36 +1,36 @@
<nav class="navbar navbar-expand-lg navbar-light fixed-top" id="secondNav">
<div class="container px-4 px-lg-5">
<a class="navbar-brand" href="index.html">Logo</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
aria-label="Toggle navigation">
Menu
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto">
{% if 'admin' in userRole %}
<li class="nav-item"><a class="nav-link" href="{{ base }}/admin/{{ userID }}/showAllGroups">Groups</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/admin/{{ userID }}/showAllUsers">Users</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/admin/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %}
{% if 'student' in userRole%}
<li class="nav-item"><a class="nav-link" href="{{ base }}/user/memory">Learn a lesson</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/user/game">Play</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/student/{{ userID }}/createFC}}">Create flashcards</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/student/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %}
{% if 'teacher' in userRole%}
<li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/addVocabList">Vocabulary</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 }}/createFC">Create flashcards</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %}
{% if userRole is empty %}
<li class="nav-item"><a class="nav-link" href="{{base}}/user/login">Login</a></li>
{% endif %}
<li class="nav-item"><a class="nav-link" href="{{ base }}/user/disconnect">Log out</a></li>
</ul>
<nav class="navbar navbar-expand-lg navbar-light fixed-top" id="secondNav">
<div class="container px-4 px-lg-5">
<a class="navbar-brand" href="{{base}}"><img class="logo" src="{{base}}/assets/img/logo.png"/></a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
aria-label="Toggle navigation">
Menu
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto">
{% if 'admin' in userRole %}
<li class="nav-item"><a class="nav-link" href="{{ base }}/admin/{{ userID }}/showAllGroups">Groups</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/admin/{{ userID }}/showAllUsers">Users</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/admin/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %}
{% if 'student' in userRole%}
<li class="nav-item"><a class="nav-link" href="{{ base }}/visitor/memory">Learn a lesson</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/visitor/game">Play</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/student/{{ userID }}/createFC}}">Create flashcards</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/student/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %}
{% if 'teacher' in userRole%}
<li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/addVocabList">Vocabulary</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 }}/createFC">Create flashcards</a></li>
<li class="nav-item"><a class="nav-link" href="{{ base }}/teacher/{{ userID }}/showAccountInfos">My account</a></li>
{% endif %}
{% if userRole is empty %}
<li class="nav-item"><a class="nav-link" href="{{base}}/visitor/login">Login</a></li>
{% endif %}
<li class="nav-item"><a class="nav-link" href="{{ base }}/visitor/disconnect">Log out</a></li>
</ul>
</div>
</div>
</div>
</nav>
</nav>

3
Project/php/templates/resultatsJeux.html
Unescape View File

@ -43,11 +43,14 @@
</head>
<body>
{% include 'navbar.twig' %}
<div class="content">
<div class="container">
<div class="message">
Bravo ! Vous avez gagné 125 points !!
</div>
<img class="celebration-image" src="../assets/img/celeb.png" alt="Célébration">
</div>
</div>
</body>
</html>

9
Project/php/templates/usersView.html
Unescape View File

@ -3,11 +3,20 @@
<head>
<meta charset="UTF-8">
<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" />
</head>
<body>
{% include 'navbar.twig' %}
<div class="content">
<section>
{% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUser'} %}
</section>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
<script src="{{base}}/js/scripts.js"></script>
</body>
</html>
Write Preview
Loading…
Cancel
Save