Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 caroline.slt
|
ef3699d5f5 | ||
|
caroline.slt
|
fedb6f59f5 | ||
|
caroline.slt
|
5eca2f162b | ||
|
caroline.slt
|
d7d121b541 |
+12
-10
@@ -81,10 +81,12 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
|
||||
<br>
|
||||
|
||||
<form action="php/controller/deleteAccount-controller.php" method="POST">
|
||||
<form action="php/controller/deleteAccount-controller.php"
|
||||
method="POST"
|
||||
class="confirm-delete-account">
|
||||
|
||||
<button type="submit"
|
||||
class="button"
|
||||
onclick="return confirm('Möchtest du deinen Account und alle deine Beiträge wirklich unwiderruflich löschen?');">
|
||||
class="button">
|
||||
Account löschen
|
||||
</button>
|
||||
</form>
|
||||
@@ -154,14 +156,16 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
Bearbeiten
|
||||
</a>
|
||||
|
||||
<form action="php/controller/deleteArticle-controller.php" method="POST">
|
||||
<form action="php/controller/deleteArticle-controller.php"
|
||||
method="POST"
|
||||
class="confirm-delete-article">
|
||||
|
||||
<input type="hidden"
|
||||
name="id"
|
||||
value="<?php echo htmlspecialchars($userArticle->getID()); ?>">
|
||||
|
||||
<button type="submit"
|
||||
class="button"
|
||||
onclick="return confirm('Möchtest du diesen Artikel wirklich löschen?');">
|
||||
class="button">
|
||||
Löschen
|
||||
</button>
|
||||
</form>
|
||||
@@ -172,11 +176,9 @@ $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
|
||||
<p>Du hast noch keine Beiträge erstellt.</p>
|
||||
|
||||
<button type="button"
|
||||
class="button"
|
||||
onclick="window.location.href='index.php?pfad=createArticle';">
|
||||
<a href="index.php?pfad=createArticle" class="button">
|
||||
Beitrag erstellen!
|
||||
</button>
|
||||
</a>
|
||||
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
@@ -124,7 +124,9 @@ $categories = [
|
||||
</div>
|
||||
|
||||
<noscript>
|
||||
<button type="submit" class="nav__search-button">Filter anwenden</button>
|
||||
<button type="submit" class="nav__search-button">
|
||||
Filter anwenden
|
||||
</button>
|
||||
</noscript>
|
||||
</form>
|
||||
|
||||
@@ -193,17 +195,34 @@ $categories = [
|
||||
</div>
|
||||
|
||||
<nav class="s-res-page-navigation" aria-label="Seitennavigation">
|
||||
<!-- No-JS-Fallback: -->
|
||||
|
||||
<noscript>
|
||||
<?php echo renderNoJsPagination($currentPage, $totalPages, $query, $currentSort, $currentCategory, $limit); ?>
|
||||
<?php echo renderNoJsPagination(
|
||||
$currentPage,
|
||||
$totalPages,
|
||||
$query,
|
||||
$currentSort,
|
||||
$currentCategory,
|
||||
$limit
|
||||
); ?>
|
||||
</noscript>
|
||||
|
||||
<!-- JS-Version: wird per search-results.js befüllt/eingeblendet: -->
|
||||
<div id="js-page-navigation" style="display: none;">
|
||||
<button type="button" class="s-res-page-btn" id="prev-page-btn">«</button>
|
||||
<button type="button"
|
||||
class="s-res-page-btn"
|
||||
id="prev-page-btn">
|
||||
«
|
||||
</button>
|
||||
|
||||
<span id="dynamic-page-numbers"></span>
|
||||
<button type="button" class="s-res-page-btn" id="next-page-btn">»</button>
|
||||
|
||||
<button type="button"
|
||||
class="s-res-page-btn"
|
||||
id="next-page-btn">
|
||||
»
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</nav>
|
||||
|
||||
</div>
|
||||
|
||||
+7
-47
@@ -5,30 +5,6 @@ $repliesByParent = [];
|
||||
$articleObj = null;
|
||||
|
||||
include_once 'php/controller/showArticle-controller.php';
|
||||
require_once 'php/model/UserManager.php';
|
||||
|
||||
$userManager = UserManager::getInstance();
|
||||
|
||||
/**
|
||||
* Liefert den vollständigen Namen zu einer gespeicherten E-Mail-Adresse.
|
||||
* Falls kein Benutzer gefunden wird, wird die E-Mail als Ersatz angezeigt.
|
||||
*/
|
||||
function getCommentAuthorName($email, $userManager)
|
||||
{
|
||||
$email = trim($email);
|
||||
$user = $userManager->findUser($email);
|
||||
|
||||
if ($user === null) {
|
||||
return $email;
|
||||
}
|
||||
|
||||
$vorname = trim($user["vorname"] ?? "");
|
||||
$nachname = trim($user["nachname"] ?? "");
|
||||
|
||||
$fullName = trim($vorname . " " . $nachname);
|
||||
|
||||
return $fullName !== "" ? $fullName : $email;
|
||||
}
|
||||
/*
|
||||
* Ermittelt, ob ohne JavaScript auf einen Kommentar
|
||||
* geantwortet werden soll.
|
||||
@@ -197,14 +173,7 @@ if ($replyAuthor === null) {
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
<?php
|
||||
echo htmlspecialchars(
|
||||
getCommentAuthorName(
|
||||
$comment->getAuthor(),
|
||||
$userManager
|
||||
)
|
||||
);
|
||||
?>
|
||||
<?php echo htmlspecialchars($comment->getAuthor()); ?>
|
||||
</strong>
|
||||
|
||||
<span>
|
||||
@@ -268,7 +237,7 @@ if ($replyAuthor === null) {
|
||||
|
||||
<form method="post"
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form">
|
||||
class="delete-comment-form confirm-delete-comment">
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
@@ -283,8 +252,7 @@ if ($replyAuthor === null) {
|
||||
); ?>">
|
||||
|
||||
<button type="submit"
|
||||
class="delete-comment-button"
|
||||
onclick="return confirm('Möchtest du diesen Kommentar wirklich löschen?');">
|
||||
class="delete-comment-button">
|
||||
Kommentar löschen
|
||||
</button>
|
||||
</form>
|
||||
@@ -335,14 +303,7 @@ if ($replyAuthor === null) {
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
<?php
|
||||
echo htmlspecialchars(
|
||||
getCommentAuthorName(
|
||||
$reply->getAuthor(),
|
||||
$userManager
|
||||
)
|
||||
);
|
||||
?>
|
||||
<?php echo htmlspecialchars($reply->getAuthor()); ?>
|
||||
</strong>
|
||||
|
||||
<span>
|
||||
@@ -407,7 +368,7 @@ if ($replyAuthor === null) {
|
||||
|
||||
<form method="post"
|
||||
action="index.php?pfad=deleteComment"
|
||||
class="delete-comment-form">
|
||||
class="delete-comment-form confirm-delete-comment">
|
||||
|
||||
<input type="hidden"
|
||||
name="comment_id"
|
||||
@@ -422,9 +383,8 @@ if ($replyAuthor === null) {
|
||||
); ?>">
|
||||
|
||||
<button type="submit"
|
||||
class="delete-comment-button"
|
||||
onclick="return confirm('Möchtest du diesen Kommentar wirklich löschen?');">
|
||||
Kommentar löschen
|
||||
class="delete-comment-button">
|
||||
Antwort löschen
|
||||
</button>
|
||||
</form>
|
||||
|
||||
|
||||
+5
-194
@@ -154,32 +154,21 @@ h1 {
|
||||
|
||||
.button {
|
||||
width: 100%;
|
||||
padding: 14px;
|
||||
padding: 12px;
|
||||
background-color: #2563eb;
|
||||
color: white;
|
||||
border: 2px solid transparent;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
font-size: 1rem;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
transition:
|
||||
background-color 0.2s ease,
|
||||
transform 0.2s ease,
|
||||
box-shadow 0.2s ease,
|
||||
border-color 0.2s ease;
|
||||
transition: background-color 0.2s, transform 0.2s, box-shadow 0.2s;
|
||||
}
|
||||
|
||||
.button:hover {
|
||||
background-color: #1e40af;
|
||||
border-color: #93c5fd;
|
||||
transform: translateY(-3px) scale(1.01);
|
||||
box-shadow: 0 8px 18px rgba(37, 99, 235, 0.35);
|
||||
}
|
||||
|
||||
.button:active {
|
||||
background-color: #1d4ed8;
|
||||
transform: translateY(1px) scale(0.99);
|
||||
box-shadow: 0 2px 5px rgba(37, 99, 235, 0.25);
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 10px rgba(0,0,0,0.15);
|
||||
}
|
||||
|
||||
.register-link {
|
||||
@@ -237,181 +226,3 @@ h1 {
|
||||
text-decoration: none;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* Deutlichere Klickreaktion für Kategorien */
|
||||
.category-link:active {
|
||||
transform: translateY(1px);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
/* Sichtbare Tastatur-Markierung */
|
||||
.button:focus-visible,
|
||||
.category-link:focus-visible,
|
||||
.article-link a:focus-visible,
|
||||
.register-link a:focus-visible {
|
||||
outline: 3px solid #fbbf24;
|
||||
outline-offset: 3px;
|
||||
}
|
||||
/* Kommentarbereich */
|
||||
|
||||
#comments-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 20px;
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
#comments-list > div,
|
||||
.comment {
|
||||
background-color: #ffffff;
|
||||
border: 1px solid #dbe3ec;
|
||||
border-radius: 12px;
|
||||
padding: 24px;
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.06);
|
||||
transition:
|
||||
transform 0.2s ease,
|
||||
box-shadow 0.2s ease,
|
||||
border-color 0.2s ease;
|
||||
}
|
||||
|
||||
#comments-list > div:hover,
|
||||
.comment:hover {
|
||||
transform: translateY(-3px);
|
||||
border-color: #93c5fd;
|
||||
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
|
||||
#comments-list textarea,
|
||||
#comment-content {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 14px;
|
||||
border: 1px solid #cbd5e1;
|
||||
border-radius: 8px;
|
||||
font-size: 1rem;
|
||||
resize: vertical;
|
||||
transition:
|
||||
border-color 0.2s ease,
|
||||
box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
#comments-list textarea:focus,
|
||||
#comment-content:focus {
|
||||
outline: none;
|
||||
border-color: #2563eb;
|
||||
box-shadow: 0 0 0 4px rgba(37, 99, 235, 0.18);
|
||||
}
|
||||
|
||||
#comments-list a {
|
||||
color: #2563eb;
|
||||
font-weight: bold;
|
||||
text-decoration: none;
|
||||
border-radius: 4px;
|
||||
transition:
|
||||
color 0.2s ease,
|
||||
background-color 0.2s ease;
|
||||
}
|
||||
|
||||
#comments-list a:hover {
|
||||
color: #1e40af;
|
||||
background-color: #dbeafe;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
#comments-list button {
|
||||
cursor: pointer;
|
||||
}
|
||||
.delete-comment-button {
|
||||
display: inline-block;
|
||||
background: #ffffff;
|
||||
color: #dc2626;
|
||||
border: 2px solid #dc2626;
|
||||
border-radius: 8px;
|
||||
padding: 10px 18px;
|
||||
font-size: 0.95rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
transition:
|
||||
background-color 0.25s ease,
|
||||
color 0.25s ease,
|
||||
transform 0.2s ease,
|
||||
box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
.delete-comment-button:hover {
|
||||
background: #dc2626;
|
||||
color: #ffffff;
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 6px 14px rgba(220,38,38,0.25);
|
||||
}
|
||||
|
||||
.delete-comment-button:active {
|
||||
transform: translateY(1px);
|
||||
box-shadow: none;
|
||||
}
|
||||
.delete-comment-form {
|
||||
margin-top: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
/* Button zum Öffnen der Kommentarbearbeitung */
|
||||
.edit-comment-button {
|
||||
display: inline-block;
|
||||
width: auto;
|
||||
padding: 10px 18px;
|
||||
background-color: #2563eb;
|
||||
color: #ffffff;
|
||||
border: 2px solid #2563eb;
|
||||
border-radius: 8px;
|
||||
font-size: 0.95rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
list-style: none;
|
||||
transition:
|
||||
background-color 0.2s ease,
|
||||
border-color 0.2s ease,
|
||||
transform 0.2s ease,
|
||||
box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
/* Entfernt das normale Dreieck in einigen Browsern */
|
||||
.edit-comment-button::-webkit-details-marker {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Eigenes Symbol vor dem Text */
|
||||
.edit-comment-button::before {
|
||||
content: "✏ ";
|
||||
}
|
||||
|
||||
.edit-comment-button:hover {
|
||||
background-color: #1e40af;
|
||||
border-color: #1e40af;
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 5px 12px rgba(37, 99, 235, 0.3);
|
||||
}
|
||||
|
||||
.edit-comment-button:active {
|
||||
transform: translateY(1px);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.edit-comment-button:focus-visible {
|
||||
outline: 3px solid #fbbf24;
|
||||
outline-offset: 3px;
|
||||
}
|
||||
|
||||
/* Abstand zwischen Bearbeiten und Löschen */
|
||||
.edit-comment-details {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
/* Geöffneter Bearbeitungsbereich */
|
||||
.edit-comment-details[open] .edit-comment-button {
|
||||
margin-bottom: 12px;
|
||||
background-color: #1e40af;
|
||||
}
|
||||
|
||||
/* Geändertes Symbol, wenn der Bereich geöffnet ist */
|
||||
.edit-comment-details[open] .edit-comment-button::before {
|
||||
content: "▲ ";
|
||||
}
|
||||
@@ -302,89 +302,5 @@ CSS für die navbar
|
||||
padding: 0.8rem 1rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
/* Deutlichere Hover-Effekte für die Navigation */
|
||||
|
||||
.nav__dropdown-toggle,
|
||||
.nav__link {
|
||||
border-radius: 6px;
|
||||
transition:
|
||||
background-color 0.2s ease,
|
||||
color 0.2s ease,
|
||||
transform 0.2s ease;
|
||||
}
|
||||
|
||||
.nav__dropdown-toggle:hover,
|
||||
.nav__link:hover {
|
||||
background-color: #ffffff;
|
||||
color: #1d4ed8;
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
/* Sichtbare Reaktion beim Anklicken */
|
||||
.nav__dropdown-toggle:active,
|
||||
.nav__link:active {
|
||||
transform: translateY(1px);
|
||||
}
|
||||
|
||||
/* Deutlichere Effekte für Anmelden, Registrieren usw. */
|
||||
.nav__button {
|
||||
transition:
|
||||
background-color 0.2s ease,
|
||||
color 0.2s ease,
|
||||
transform 0.2s ease,
|
||||
box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
.nav__button:hover {
|
||||
background-color: #2563eb;
|
||||
color: #ffffff;
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
.nav__button:active {
|
||||
transform: translateY(1px);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
/* Deutlichere Hervorhebung der Einträge im Dropdown-Menü */
|
||||
.nav__dropdown-menu a {
|
||||
display: block;
|
||||
transition:
|
||||
background-color 0.2s ease,
|
||||
color 0.2s ease,
|
||||
padding-left 0.2s ease;
|
||||
}
|
||||
|
||||
.nav__dropdown-menu a:hover {
|
||||
background-color: #dbeafe;
|
||||
color: #1d4ed8;
|
||||
padding-left: 1.4rem;
|
||||
}
|
||||
|
||||
/* Effekt für den Suchbutton */
|
||||
.nav__search-button {
|
||||
transition:
|
||||
background-color 0.2s ease,
|
||||
color 0.2s ease,
|
||||
transform 0.2s ease;
|
||||
}
|
||||
|
||||
.nav__search-button:hover {
|
||||
background-color: #2563eb;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.nav__search-button:active {
|
||||
transform: scale(0.95);
|
||||
}
|
||||
|
||||
/* Sichtbare Markierung bei Tastaturbedienung */
|
||||
.nav a:focus-visible,
|
||||
.nav button:focus-visible,
|
||||
.nav input:focus-visible,
|
||||
.nav label:focus-visible {
|
||||
outline: 3px solid #fbbf24;
|
||||
outline-offset: 3px;
|
||||
}
|
||||
@@ -24,9 +24,10 @@ include_once "php/controller/index-controller.php";
|
||||
<link rel="stylesheet" href="css/showCategory.css">
|
||||
|
||||
<script src="js/comments.js" defer></script>
|
||||
<script src="js/profile.js" defer></script>
|
||||
<script src="js/editor.js" async></script>
|
||||
<script src="js/search-results.js" async></script>
|
||||
<script src="js/showCategory.js" async></script>
|
||||
<script src="js/search.js" async></script>
|
||||
|
||||
|
||||
<title>EduForge</title>
|
||||
|
||||
+20
-2
@@ -11,6 +11,26 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
const parentCommentInput = document.getElementById("parent-comment-id");
|
||||
const replyInfo = document.getElementById("reply-info");
|
||||
|
||||
/**
|
||||
* Fragt vor dem Löschen eines Kommentars nach einer Bestätigung.
|
||||
*
|
||||
* Der Listener funktioniert auch für Kommentare,
|
||||
* die später per AJAX eingefügt werden.
|
||||
*/
|
||||
document.addEventListener("submit", function (event) {
|
||||
if (!event.target.classList.contains("delete-comment-form")) {
|
||||
return;
|
||||
}
|
||||
|
||||
const confirmed = confirm(
|
||||
"Möchtest du diesen Kommentar wirklich löschen?"
|
||||
);
|
||||
|
||||
if (!confirmed) {
|
||||
event.preventDefault();
|
||||
}
|
||||
});
|
||||
|
||||
if (!form || !commentsList || !commentContent || !parentCommentInput) {
|
||||
return;
|
||||
}
|
||||
@@ -152,7 +172,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
<button
|
||||
type="submit"
|
||||
class="delete-comment-button"
|
||||
onclick="return confirm('Möchtest du diesen Kommentar wirklich löschen?');"
|
||||
>
|
||||
Kommentar löschen
|
||||
</button>
|
||||
@@ -230,7 +249,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
<button
|
||||
type="submit"
|
||||
class="delete-comment-button"
|
||||
onclick="return confirm('Möchtest du diesen Kommentar wirklich löschen?');"
|
||||
>
|
||||
Kommentar löschen
|
||||
</button>
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
document.addEventListener("DOMContentLoaded", function () {
|
||||
|
||||
const deleteAccountForm = document.querySelector(".confirm-delete-account");
|
||||
|
||||
if (deleteAccountForm) {
|
||||
deleteAccountForm.addEventListener("submit", function (event) {
|
||||
|
||||
if (!confirm("Möchtest du deinen Account und alle deine Beiträge wirklich unwiderruflich löschen?")) {
|
||||
event.preventDefault();
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
const deleteArticleForms = document.querySelectorAll(".confirm-delete-article");
|
||||
|
||||
deleteArticleForms.forEach(function (form) {
|
||||
|
||||
form.addEventListener("submit", function (event) {
|
||||
|
||||
if (!confirm("Möchtest du diesen Artikel wirklich löschen?")) {
|
||||
event.preventDefault();
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
@@ -4,7 +4,6 @@ if (session_status() === PHP_SESSION_NONE) {
|
||||
}
|
||||
|
||||
require_once "../model/CommentManager.php";
|
||||
require_once "../model/UserManager.php";
|
||||
|
||||
/**
|
||||
* Prüft, ob die Anfrage durch JavaScript per AJAX gesendet wurde.
|
||||
@@ -41,6 +40,7 @@ function sendCommentResponse(
|
||||
$additionalData
|
||||
)
|
||||
);
|
||||
|
||||
exit();
|
||||
}
|
||||
|
||||
@@ -162,29 +162,13 @@ try {
|
||||
$parentCommentId
|
||||
);
|
||||
|
||||
$userManager = UserManager::getInstance();
|
||||
$user = $userManager->findUser($_SESSION["user_email"]);
|
||||
|
||||
$authorName = $_SESSION["user_email"];
|
||||
|
||||
if ($user !== null) {
|
||||
$vorname = trim($user["vorname"] ?? "");
|
||||
$nachname = trim($user["nachname"] ?? "");
|
||||
|
||||
$fullName = trim($vorname . " " . $nachname);
|
||||
|
||||
if ($fullName !== "") {
|
||||
$authorName = $fullName;
|
||||
}
|
||||
}
|
||||
|
||||
sendCommentResponse(
|
||||
true,
|
||||
"Der Kommentar wurde erfolgreich gespeichert.",
|
||||
$articleId,
|
||||
[
|
||||
"commentId" => $commentId,
|
||||
"author" => $authorName,
|
||||
"author" => $_SESSION["user_email"],
|
||||
"content" => $content,
|
||||
"created" => date("Y-m-d H:i:s"),
|
||||
"parentCommentId" => $parentCommentId
|
||||
|
||||
Reference in New Issue
Block a user