Merge branch 'main' of https://git.bib.de/PBBFA23AHR/kurs-app
This commit is contained in:
commit
e7b3a062b7
@ -1,3 +1,10 @@
|
||||
.buttons-container{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.btn{
|
||||
padding: 5px 10px;
|
||||
font-weight: var(--font-weight-semibold);
|
||||
@ -7,6 +14,7 @@
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
@ -27,6 +35,18 @@
|
||||
aspect-ratio: 1/1;
|
||||
}
|
||||
|
||||
.btn-form{
|
||||
padding: 10px 20px;
|
||||
}
|
||||
|
||||
.btn-login{
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.btn-user > span {
|
||||
font-size: 28px;
|
||||
}
|
||||
|
||||
.btn-logout{
|
||||
background-color: red;
|
||||
}
|
||||
|
@ -1,4 +1,5 @@
|
||||
@import url(variables.css);
|
||||
@import url(style_columns.css);
|
||||
@import url(Block/header.css);
|
||||
@import url(Block/footer.css);
|
||||
@import url(Element/logo.css);
|
||||
@ -36,7 +37,6 @@ h2 {
|
||||
|
||||
main {
|
||||
margin-top: 190px;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.msg {
|
||||
|
@ -6,6 +6,12 @@
|
||||
/*** 12 spaltiges Grid mit Flexboxen ***/
|
||||
|
||||
/*** Container ***/
|
||||
|
||||
.container{
|
||||
max-width: 90%;
|
||||
padding: 24px 42px 24px 42px;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
flex-flow: row;
|
||||
|
@ -10,13 +10,32 @@ class UserController{
|
||||
private $validData = array();
|
||||
private $errors = array();
|
||||
|
||||
private $labels = [
|
||||
"name" => "Vorname*",
|
||||
"lastname" => "Nachname*",
|
||||
"email" => "E-Mail*",
|
||||
"password" => "Passwort*",
|
||||
"role" => "Rolle*"
|
||||
];
|
||||
|
||||
private $validLoginData = array();
|
||||
private $loginErrors = array();
|
||||
private $loginLabels = [
|
||||
"email" => "E-Mail*",
|
||||
"password" => "Passwort*",
|
||||
];
|
||||
|
||||
public function __construct($view){
|
||||
$this->db = new UserModel();
|
||||
$this->view = $view;
|
||||
}
|
||||
|
||||
public function showUserRegisterForm(){
|
||||
|
||||
$this->view->setVars([
|
||||
'labels' => $this->labels,
|
||||
'errors' => $this->errors,
|
||||
'validData' => $this->validData
|
||||
]);
|
||||
}
|
||||
|
||||
public function showUserRegisterConfirmation(){
|
||||
@ -24,7 +43,45 @@ class UserController{
|
||||
}
|
||||
|
||||
public function showUserLoginForm(){
|
||||
$this->view->setVars([
|
||||
'labels' => $this->loginLabels,
|
||||
'errors' => $this->loginErrors,
|
||||
'validData' => $this->validLoginData
|
||||
]);
|
||||
}
|
||||
|
||||
private function validateForm() {
|
||||
foreach ($this->labels as $key => $label) {
|
||||
if (!isset($_POST[$key]) || trim($_POST[$key]) === '') {
|
||||
$this->errors[$key] = "Bitte $label angeben";
|
||||
} else {
|
||||
$this->validData[$key] = trim($_POST[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($this->validData['password'])) {
|
||||
if (strlen($this->validData['password']) < 6) {
|
||||
$this->errors['password'] = "Das Passwort muss mindestens 6 Zeichen lang sein.";
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($this->validData['email']) && !filter_var($this->validData['email'], FILTER_VALIDATE_EMAIL)) {
|
||||
$this->errors['email'] = "Bitte eine gültige E-Mail-Adresse eingeben.";
|
||||
}
|
||||
}
|
||||
|
||||
public function validateLoginForm(){
|
||||
foreach ($this->loginLabels as $key => $label) {
|
||||
if (isset($this->validData['password'])) {
|
||||
if (strlen($this->validData['password']) < 6) {
|
||||
$this->errors['password'] = "Das Passwort muss mindestens 6 Zeichen lang sein.";
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($this->validData['email']) && !filter_var($this->validData['email'], FILTER_VALIDATE_EMAIL)) {
|
||||
$this->errors['email'] = "Bitte eine gültige E-Mail-Adresse eingeben.";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function showUserLoginConfirmation(){
|
||||
@ -73,7 +130,8 @@ class UserController{
|
||||
|
||||
public function logout(){
|
||||
$this->clearUserSession();
|
||||
echo "Erfolgreich ausgeloggt";
|
||||
header("Location: index.php?controller=user&do=showUserLoginForm");
|
||||
exit();
|
||||
}
|
||||
|
||||
public function isUserLoggenIn(){
|
||||
@ -83,4 +141,8 @@ class UserController{
|
||||
public function getCurrentUserId(){
|
||||
return $_SESSION["user_id"] ?? null;
|
||||
}
|
||||
|
||||
public function showUserAccountPage (){
|
||||
|
||||
}
|
||||
}
|
@ -29,6 +29,7 @@ foreach ($labels as $key => $value) {
|
||||
|
||||
<input type="hidden" name="controller" value="admin">
|
||||
<input type="hidden" name="do" value="showForm">
|
||||
<input type="submit" name="submit" value="Absenden"></form>
|
||||
<button type="submit" class="btn">Absenden</button>
|
||||
|
||||
|
||||
<?php include dirname(__DIR__).'/footer.phtml'; ?>
|
17
Views/User/showUserAccountPage.phtml
Normal file
17
Views/User/showUserAccountPage.phtml
Normal file
@ -0,0 +1,17 @@
|
||||
<?php
|
||||
include dirname(__DIR__).'/header.phtml';
|
||||
?>
|
||||
|
||||
<article>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<form method="post">
|
||||
<input type="hidden" name="controller" value="user">
|
||||
<input type="hidden" name="do" value="logout">
|
||||
<button type="submit" class="btn btn-logout">Ausloggen</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
@ -4,20 +4,30 @@
|
||||
|
||||
<h1>Als Benutzer anmelden</h1>
|
||||
|
||||
<form method="post">
|
||||
<form method="post" class="form-grid">
|
||||
|
||||
<label for="reg_email">Email:</label>
|
||||
<input type="email" name="email" id="reg_email" required>
|
||||
<?php foreach ($labels as $key => $label): ?>
|
||||
<div class="input">
|
||||
<label for="reg_<?= $key ?>"><?= $label ?></label>
|
||||
<?php if ($key === 'password'): ?>
|
||||
<input type="password" name="<?= $key ?>" id="reg_<?= $key ?>" required>
|
||||
<?php elseif($key === 'email'): ?>
|
||||
<input type="email" name="<?= $key ?>" id="reg_<?= $key ?>" required>
|
||||
<?php else: ?>
|
||||
<input type="text" name="<?= $key ?>" id="reg_<?= $key ?>" value="<?= htmlspecialchars($validData[$key] ?? '') ?>" required>
|
||||
<?php endif; ?>
|
||||
|
||||
<label for="reg_password">Passwort:</label>
|
||||
<input type="password" name="password" id="reg_password" required>
|
||||
<?php if (!empty($errors[$key])): ?>
|
||||
<div class="error"><?= $errors[$key] ?></div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
|
||||
|
||||
|
||||
<input type="hidden" name="controller" value="user">
|
||||
<input type="hidden" name="do" value="login">
|
||||
<button type="submit" class="btn" style="display: block">Login</button>
|
||||
<button type="submit" class="btn btn-primary btn-form" style="display: block">Login</button>
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
<?php
|
||||
include dirname(__DIR__).'/footer.phtml';
|
||||
?>
|
||||
|
@ -4,35 +4,33 @@
|
||||
|
||||
<h1>Benutzer erstellen</h1>
|
||||
|
||||
<form method="post">
|
||||
<h2>Registrieren</h2>
|
||||
<form method="post" class="form-grid">
|
||||
|
||||
<label for="reg_name">Vorname:</label>
|
||||
<input type="text" name="name" id="reg_name" required>
|
||||
<?php foreach ($labels as $key => $label): ?>
|
||||
<div class="input">
|
||||
<label for="reg_<?= $key ?>"><?= $label ?></label>
|
||||
<?php if ($key === 'password'): ?>
|
||||
<input type="password" name="<?= $key ?>" id="reg_<?= $key ?>" required>
|
||||
<?php elseif ($key === 'role'): ?>
|
||||
<label><input type="radio" name="role" value="user" <?= (isset($validData['role']) && $validData['role'] === 'user') ? 'checked' : '' ?>> User</label>
|
||||
<label><input type="radio" name="role" value="leiter" <?= (isset($validData['role']) && $validData['role'] === 'leiter') ? 'checked' : '' ?>> Leiter</label>
|
||||
<?php else: ?>
|
||||
<input type="text" name="<?= $key ?>" id="reg_<?= $key ?>" value="<?= htmlspecialchars($validData[$key] ?? '') ?>" required>
|
||||
<?php endif; ?>
|
||||
|
||||
<label for="reg_lastname">Nachname:</label>
|
||||
<input type="text" name="lastname" id="reg_lastname" required>
|
||||
<?php if (!empty($errors[$key])): ?>
|
||||
<div class="error"><?= $errors[$key] ?></div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
|
||||
<label for="reg_email">Email:</label>
|
||||
<input type="email" name="email" id="reg_email" required>
|
||||
|
||||
<label for="reg_password">Passwort:</label>
|
||||
<input type="password" name="password" id="reg_password" required>
|
||||
|
||||
<p>Wähle deine Rolle:</p>
|
||||
<label>
|
||||
<input type="radio" name="role" value="user" required> User
|
||||
</label>
|
||||
<label>
|
||||
<input type="radio" name="role" value="leiter"> Leiter
|
||||
</label>
|
||||
|
||||
<input type="hidden" name="controller" value="user">
|
||||
<input type="hidden" name="do" value="register">
|
||||
<button type="submit" class="btn" style="display: block">Registrieren</button>
|
||||
|
||||
<button type="submit" class="btn">Registrieren</button>
|
||||
</form>
|
||||
|
||||
<a href="?controller=User&do=showUserLoginForm">Haben Sie schon ein Benutzer Konto?</a>
|
||||
|
||||
|
||||
<?php
|
||||
include dirname(__DIR__).'/footer.phtml';
|
||||
|
@ -16,16 +16,25 @@
|
||||
<body>
|
||||
<header>
|
||||
<nav class="d-flex-between">
|
||||
<a id="logo" href="/">bib<span>course</span></a>
|
||||
<a id="logo" href="index.php">bib<span>course</span></a>
|
||||
<div style="column-gap: 8px;" class="d-flex-between">
|
||||
<div style="column-gap: 8px;" class="d-flex-between">
|
||||
<?php if (isset($_SESSION['user_id']) && $_SESSION['user_id'] !== null): ?>
|
||||
<?php if($_SESSION['user_role'] == 'admin'): ?>
|
||||
<a style="column-gap: 16px;" class="btn" href="?controller=Admin&do=showForm">
|
||||
<?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") ?>
|
||||
<?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") . ", " . ($_SESSION['user_role']) ?>
|
||||
<span class="btn btn-user">
|
||||
<span class="material-icons">person</span>
|
||||
</span>
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<a style="column-gap: 16px;" class="btn" href="?controller=User&do=showUserAccountPage">
|
||||
<?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") . ", " . ($_SESSION['user_role']) ?>
|
||||
<span class="btn btn-user">
|
||||
<span class="material-icons">person</span>
|
||||
</span>
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
<?php else: ?>
|
||||
<a class="btn" href="?controller=User&do=showUserLoginForm">Anmeldung</a>
|
||||
<a class="btn btn-primary" href="?controller=User&do=showUserRegisterForm">Registration</a>
|
||||
|
Loading…
x
Reference in New Issue
Block a user