commit 5e1ab6d648e269f08f733960db15e17cf183e4d1
parent 35c29a1f65db120ec54f0874d714fb02deb27990
Author: MoiBaguette <[email protected]>
Date: Sun, 25 Jun 2023 17:01:59 +0200
dashboard
Diffstat:
12 files changed, 64 insertions(+), 504 deletions(-)
diff --git a/Controller/Templates.php b/Controller/Templates.php
@@ -105,7 +105,7 @@ namespace Controller{
}
$table .= "<th>Alter</th> <th>Delete</th>";
if($permissionUser != null){
- $table .= "<th>Permissions</th>";
+ $table .= "<th>user permissions</th>";
}
$table .= "</tr> </thead>";
@@ -138,5 +138,34 @@ namespace Controller{
</table>";
return $table;
}
+
+ function links():string{
+ $links = '<div class ="links">';
+ if(isset($_SESSION['user_permissions'])){
+ if(in_array(1, $_SESSION['user_permissions']) || in_array(2, $_SESSION['user_permissions'])|| in_array(3, $_SESSION['user_permissions'])){
+ $links .= '<a href="/userpage/'.$_SESSION["email"].'/page">My info</a>';
+ }
+ if(in_array(2, $_SESSION['user_permissions']) || in_array(3, $_SESSION['user_permissions'])){
+ $links .= '<a href="/course">Courses</a>';
+ $links .= '<a href="/exam">Exams</a>';
+ $links .= '<a href="/grade">Grades</a>';
+ }
+ if(in_array(3, $_SESSION['user_permissions'])){
+ $links .= '<a href="/user">Users</a>';
+ }
+ }
+ $links .= "</div>";
+ return $links;
+ }
+
+ function header():string{
+ $header = "";
+ $header .= "<div class='header'>
+ <h1>Lollipop</h1>";
+ if(isset($_SESSION['user_permissions']))
+ $header .= '<a href="/logout">logout</a>';
+ $header .= "</div>";
+ return $header;
+ }
}
}
\ No newline at end of file
diff --git a/Model/User.php b/Model/User.php
@@ -82,7 +82,7 @@ namespace Model {
}
}
//get permissions form db and set sessions_permissions
- $p = $this->db->all_where(PermissionUser::class, [$this->get_primary(), $this->{$this->get_primary()}]);
+ $p = $this->db->all_where(PermissionUser::class, [$this->get_primary() => $this->{$this->get_primary()}]);
foreach($p as $permission){
$user_permissions[] = $permission->id;
}
diff --git a/index.php b/index.php
@@ -40,7 +40,7 @@ $router->addRoute(["GET"], "/user/:primary_key/delete", $user_delete);
$router->addRoute(["GET"], "/user/:primary_key/page", $user_page);
-$router->addRoute(["POST"], "/logout", $logout);
+$router->addRoute(["GET"], "/logout", $logout);
$router->addRoute(["GET"], "/course", $course_get);
diff --git a/routing/index.php b/routing/index.php
@@ -2,6 +2,8 @@
$index_get = function(&$vars){
global $db;
+ $templates = new Controller\Templates($db, $db->get(\Model\User::class));
+ $vars["header"] = $templates->header();
$vars["login-fields"] = $db->get(Model\User::class)->login_fields();
return "views/login.html";
};
@@ -23,8 +25,10 @@ $dashboard = function(&$vars){
global $db;
$vars += $_SESSION;
$templates = new Controller\Templates($db, $db->get(\Model\Course::class));
+ $vars["header"] = $templates->header();
$course = $db->get(Model\Course::class);
-
+ var_dump($_SESSION);
+ $vars['links'] = $templates->links();
$enrolled = [];
foreach($db->all_where(Model\CourseUser::class, [ "email" => $_SESSION['email'] ]) as $data) {
@@ -35,7 +39,7 @@ $dashboard = function(&$vars){
foreach($course->get_column_names() as $column){
$table .= "<th>$column</th>";
}
- $table .= "</tr> </thead>";
+ $table .= "<th>registered</tr> </thead>";
$objs = $db->all(Model\Course::class);
$table .= "<tbody>";
diff --git a/views/alter_user.php b/views/alter_user.php
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html lang="eng">
-
-<head>
- <title>User toevoegen</title>
- <!-- Bootstrap CSS -->
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-</head>
-<?php
-
-include "navbar.php";
-include "utils/autoloader.php";
-if (!in_array(0, $_SESSION['permissions'])) {
- header('Location: /dashboard');
- exit;
-}
-$db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
-
-//select the available permissions from the database
-$all_p = $db->all(Model\Permission::class);
-$available_permissions = [];
-foreach ($all_p as $tmp) {
- $available_permissions[] = ['id' => $tmp->id, 'name' => $tmp->name];
-}
-//if not found set to empty if not GET
-$fname = "";
-$lname = "";
-$email = "";
-$user_permissions = [];
-
-if ($_SERVER["REQUEST_METHOD"] == "GET") {
- //if the get var isset and user is found in the database load data into forms
- $get_email = $_PARAM['email'];
- $u = $db->get(Model\User::class);
- if ($u->load($get_email)) {
- $fname = $u->fname;
- $lname = $u->lname;
- $email = $u->email;
- $p = $db->where(Model\PermissionUser::class, array('email' => $email));
- foreach ($p as $permission) {
- $user_permissions[] = $permission->id;
- }
- }
-}
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
- $errors = array(); // initialize an empty array to store errors
-
- // Check if voornaam is set and not empty
- if (isset($_POST['voornaam']) && !empty($_POST['voornaam'])) {
- $fname = $_POST['voornaam'];
- } else {
- $errors[] = "Voornaam is required";
- }
-
- // Check if achternaam is set and not empty
- if (isset($_POST['achternaam']) && !empty($_POST['achternaam'])) {
- $lname = $_POST['achternaam'];
- } else {
- $errors[] = "Achternaam is required";
- }
-
- // Check if email is set and not empty
- if (isset($_POST['email']) && !empty($_POST['email'])) {
- $email = $_POST['email'];
- } else {
- $errors[] = "E-mail is required";
- }
-
- // Check if permissions is set
- if (isset($_POST['permissions'])) {
- $permissions = $_POST['permissions'];
- } else {
- $errors[] = "Permissies zijn vereist";
- }
-
- // Check if there are any errors
- if (count($errors) > 0) {
- // Print out the errors
- foreach ($errors as $error) {
- echo $error . "<br>";
- }
- } else {
- //create a database object with table user
- $u = $db->get(Model\User::class);
-
- //check if email already exists
- if (!$u->load($email)) {
- echo "this user does not exist " . $email;
- } else {
- $succes = false;
- //set new user data
- $u->email = $email;
- $u->fname = $fname;
- $u->lname = $lname;
- echo $u->save();
- //add user with the add function
- if (true) {
- $succes = true;
- }
-
- $p = $db->get(Model\PermissionUser::class);
- //delete all permissions
- foreach ($available_permissions as $available) {
- $p->email = $email;
- $p->id = $available['id'];
- $p->delete();
- }
-
- //add permissions
- foreach ($permissions as $keep) {
- $p->email = $email;
- $p->id = (int) $keep;
- $p->insert();
- }
- if ($succes) {
- echo "succes!";
- }
- }
- }
- //if the get var isset and user is found in the database load data into forms
-
- $get_email = $_PARAMS['email'];
- $u = $db->get(Model\User::class);
- if ($u->load($get_email)) {
- $fname = $u->fname;
- $lname = $u->lname;
- $email = $u->email;
- $p = $db->where(Model\PermissionUser::class, array('email' => $email));
- foreach ($p as $permission) {
- $user_permissions[] = $permission->id;
- }
- }
-}
-?>
-
-<body>
- <div class="container">
- <h1>Alter user</h1>
- <form action="/user/<?= $email ?>/update" method="post">
- <div class="mb-3">
- <label for="voornaam" class="form-label"><b>Voornaam:</b></label>
- <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="Voornaam" value=<?php echo $fname ?>>
- </div>
- <div class="mb-3">
- <label for="achternaam" class="form-label"><b>Achternaam:</b></label>
- <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Achternaam"
- value=<?php echo $lname ?>>
- </div>
- <div class="mb-3">
- <label for="email" class="form-label"><b>Email:</b></label>
- <input type="text" class="form-control" name="email" id="email" placeholder="Email" value=<?php echo $email ?>>
- </div>
- <p>Please select the user permissions:</p>
- <?php
- foreach ($available_permissions as $db_permission) {
- echo "<div class=\"mb-3 form-check\">" .
- "<input type=\"checkbox\" class=\"form-check-input\" name=\"permissions[]\" value=" . $db_permission['id'] . "\"";
- if ($user_permissions != null && in_array($db_permission['id'], $user_permissions)) {
- echo " checked";
- }
- echo "><label class=\"form-check-label\" for=" . $db_permission['name'] . ">" . $db_permission['name'] . "</label>" .
- "</div>";
- }
- ?>
- <button type="submit" class="btn btn-primary" name="submit">Alter user</button>
- </form>
- </div>
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/views/crud_user.php b/views/crud_user.php
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<html lang="nl">
-
-<head>
- <title>User toevoegen</title>
- <!-- Bootstrap CSS -->
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-</head>
-<?php
-include "navbar.php";
-include 'utils/autoloader.php';
-
-$permissions = $_SESSION['permissions'];
-if (!isset($_SESSION['email'])) {
- if (!in_array(0, $permissions)) {
- header('Location: /dashboard');
- exit;
- }
-}
-?>
-
-<body>
- <div class="container">
- <h1>User toevoegen</h1>
-
- <form action="/user/:/crud" method="post">
- <div class="mb-3">
- <label for="voornaam" class="form-label"><b>Voornaam:</b></label>
- <input type="text" class="form-control" name="voornaam" id="voornaam" placeholder="Voornaam">
- </div>
- <div class="mb-3">
- <label for="achternaam" class="form-label"><b>Achternaam:</b></label>
- <input type="text" class="form-control" name="achternaam" id="achternaam" placeholder="Achternaam">
- </div>
- <div class="mb-3">
- <label for="email" class="form-label"><b>Email:</b></label>
- <input type="text" class="form-control" name="email" id="email" placeholder="Email">
- </div>
- <div class="mb-3">
- <label for="password" class="form-label"><b>Wachtwoord:</b></label>
- <input type="password" class="form-control" name="password" id="password" placeholder="******">
- </div>
- <p>Please select the user permissions:</p>
- <div class="mb-3 form-check">
- <input type="checkbox" class="form-check-input" id="Admin" name="permissions[]" value="1">
- <label class="form-check-label" for="Admin">Admin</label>
- </div>
- <div class="mb-3 form-check">
- <input type="checkbox" class="form-check-input" id="Administratief medewerker" name="permissions[]"
- value="2">
- <label class="form-check-label" for="Administratief medewerker">Administratief medewerker</label>
- </div>
- <div class="mb-3 form-check">
- <input type="checkbox" class="form-check-input" id="Wetenschappelijk medewerker" name="permissions[]"
- value="3">
- <label class="form-check-label" for="Wetenschappelijk medewerker">Wetenschappelijk medewerker</label>
- </div>
- <button type="submit" class="btn btn-primary" name="submit">Voeg toe</button>
- </form>
- </div>
- <?php
- if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
- $errors = array(); // initialize an empty array to store errors
-
- // Check if voornaam is set and not empty
- if (isset($_POST['voornaam']) && !empty($_POST['voornaam'])) {
- $fname = $_POST['voornaam'];
- } else {
- $errors[] = "Voornaam is required";
- }
-
- // Check if achternaam is set and not empty
- if (isset($_POST['achternaam']) && !empty($_POST['achternaam'])) {
- $lname = $_POST['achternaam'];
- } else {
- $errors[] = "Achternaam is required";
- }
-
- // Check if email is set and not empty
- if (isset($_POST['email']) && !empty($_POST['email'])) {
- $email = $_POST['email'];
- } else {
- $errors[] = "E-mail is required";
- }
-
- // Check if password is set and not empty
- if (isset($_POST['password']) && !empty($_POST['password'])) {
- $pwd = $_POST['password'];
- } else {
- $errors[] = "Wachtwoord is required";
- }
-
- // Check if permissions is set
- if (isset($_POST['permissions'])) {
- $permissions = $_POST['permissions'];
- } else {
- $errors[] = "Permissies zijn vereist";
- }
-
- // Check if there are any errors
- if (count($errors) > 0) {
- // Print out the errors
- foreach ($errors as $error) {
- echo $error . "<br>";
- }
- } else {
- // Pass the password through a hashing function
- $hashed_pwd = password_hash($pwd, PASSWORD_DEFAULT);
-
- // Making a sql statement to add user to the database, preparing it and excuting
- $db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
-
- $u = $db->get(Model\User::class);
-
-
- }
- }
- ?>
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/views/css/login.css b/views/css/login.css
@@ -1,21 +1,3 @@
-* {
- box-sizing: border-box;
- font-family: Verdana,sans-serif;
- font-size: 15px;
- line-height: 1.5;
-
-}
-
-.header{
- padding: 40px;
- background: #33b3b6;
- color: white;
- text-align: center;
-}
-
-.header h1{
- font-size: 40px;
-}
.flex-row{
margin-top:150px;
display: flex;
diff --git a/views/css/theme.css b/views/css/theme.css
@@ -4,8 +4,30 @@
font-size: 15px;
line-height: 1.5;
}
+
body{
padding: 0;
margin: 0;
background: #52dff2;
}
+
+.header{
+ display: flex;
+ padding: 40px;
+ background: #33b3b6;
+ color: white;
+ text-align: center;
+}
+
+.header h1{
+ font-size: 40px;
+}
+
+.header a{
+ align-items: center;
+ align-self: center;
+ margin-left: auto;
+ height: 40px;
+ padding-top: 9px;
+ width: 140px;
+}
+\ No newline at end of file
diff --git a/views/dashboard.html b/views/dashboard.html
@@ -7,11 +7,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
</head>
<body>
+ {{ $header }}
<div class="flex_container">
<div class ="side_bar">
<div class ="form_card">
<h1>Dashboard</h1>
Welcome {{ $first_name }}!
+ {{ $links }}
</div>
</div>
<div class = "courses">
diff --git a/views/login.html b/views/login.html
@@ -8,9 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
</head>
<body>
- <div class="header">
- <h1>Lollipop</h1>
- </div>
+ {{ $header }}
<div class="flex-row">
<div class="flex-side"></div>
diff --git a/views/search_course.php b/views/search_course.php
@@ -1,97 +0,0 @@
-<?php
-include "utils/autoloader.php";
-
-session_start();
-
-$db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
-// if (!isset($_SESSION['permissions']) || !in_array(1, $_SESSION['permissions'])) {
-// header('Location: /dashboard');
-// exit;
-// }
-
-if (isset($_PARAM['enroll'])) {
- $c = $db->get(Model\CourseUser::class);
- $c->email = $_SESSION['email'];
- $c->id = $_PARAM['enroll'];
- $c->insert();
-} else if (isset($_PARAM['unsubscribe'])) {
- $c = $db->get(Model\CourseUser::class);
- $c->email = $_SESSION['email'];
- $c->id = $_PARAM['unsubscribe'];
- $c->delete();
-}
-
-$query = '';
-if (isset($_GET['query'])) {
- $query = $_GET['query'];
- $results = $db->where(Model\Course::class, ['name' => "%$query%"], true);
-} else {
- $results = $db->all(Model\Course::class);
-}
-
-$enrolled = [];
-foreach ($db->where(Model\CourseUser::class, ['email' => $_SESSION['email']]) as $r) {
- $enrolled[] = $r->id;
-}
-
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
- <meta charset="UTF-8">
- <title>Course Search</title>
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-</head>
-
-<body>
- <?= include "navbar.php"; ?>
- <form class="d-flex" action="/course/search" method="get">
- <input class="form-control me-2" type="search" name="query" placeholder="Email" aria-label="Search">
- <button class="btn btn-outline-success" type="submit">Search</button>
- </form>
- <?php
- if (!empty($results)) {
- ?>
- <table class='table table-striped'>
- <thead>
- <tr>
- <th>Cursus</th>
- <th>Year</th>
- <th>Semester</th>
- <th>Lecturer</th>
- </tr>
- </thead>
- <tbody>
- <?php
- foreach ($results as $data) { ?>
- <tr>
- <td>
- <?= $data->name ?>
- </td>
- <td>
- <?= $data->year ?>
- </td>
- <td>
- <?= $data->semester ?>
- </td>
- <td>
- <?= $data->lecturer ?>
- </td>
- <?php if (!in_array($data->id, $enrolled)) { ?>
- <td><a href='/course/<?= $data->id ?>/enroll'>Enroll</a></td>
- <?php } else { ?>
- <td><a href='/course/<?= $data->id ?>/unsubscribe'>Unsubscribe</a></td>
- <?php } ?>
- </tr>
- <?php
- }
- echo "</tbody></table>";
- } else {
- echo "No courses found.";
- }
- ?>
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/views/search_user.php b/views/search_user.php
@@ -1,85 +0,0 @@
-<?php
-include "utils/autoloader.php";
-
-session_start();
-
-$db = new Lollipop\SQLDatabase("86.92.67.21", "friedel", "hailiwa", "lollipop");
-if (!isset($_SESSION['permissions']) || !in_array(0, $_SESSION['permissions'])) {
- header('Location: /dashboard');
- exit;
-}
-
-if (isset($_GET['delete'])) {
- $u = $db->get(Model\User::class);
- $u->load($_GET['delete']);
- $u->delete();
-}
-
-$query = '';
-if (isset($_GET['query'])) {
- $query = $_GET['query'];
- $results = $db->where(Model\User::class, ['email' => "%$query%"], true);
-} else {
- $results = $db->all(Model\User::class);
-}
-
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
- <meta charset="UTF-8">
- <title>User Search</title>
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-</head>
-
-<body>
- <?= include "navbar.php"; ?>
- <form class="d-flex" action="/user/search" method="get">
- <input class="form-control me-2" type="search" name="query" placeholder="Email" aria-label="Search">
- <button class="btn btn-outline-success" type="submit">Search</button>
- </form>
- <?php
- if (!empty($results)) {
- ?>
- <table class='table table-striped'>
- <thead>
- <tr>
- <th>Email</th>
- <th>First Name</th>
- <th>Last Name</th>
-
- </tr>
- </thead>
- <tbody>
- <?php
- foreach ($results as $data) { ?>
- <tr>
- <td>
- <?= $data->email ?>
- </td>
- <td>
- <?= $data->fname ?>
- </td>
- <td>
- <?= $data->lname ?>
- </td>
- <td><a href='/user/<?= $data->email ?>/update'>Edit</a></td>
- <td>
- <form method='get' action='/user/search'>
- <input type='hidden' name='query' value='<?= $query ?>'>
- <button type='submit' name='delete' value='<?= $data->email ?>' class='btn btn-primary'>Delete</button>
- </form>
- </td>
- </tr>
- <?php
- }
- echo "</tbody></table>";
- } else {
- echo "No users with this email address were found.";
- }
- ?>
-</body>
-
-</html>
-\ No newline at end of file
