Compare commits
5 Commits
59e0b9f111
...
loader
| Author | SHA1 | Date | |
|---|---|---|---|
| 09f8b11f36 | |||
| cc4cebdb45 | |||
| 96f38ce72e | |||
| b81f0c9e5c | |||
| f8aed4283e |
Generated
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="dataSourceStorageLocal" created-in="IU-261.24374.151">
|
<component name="dataSourceStorageLocal" created-in="IU-253.32098.101">
|
||||||
<data-source name="articles" uuid="315cb5c9-2b0f-435b-b602-59823b160908">
|
<data-source name="articles" uuid="315cb5c9-2b0f-435b-b602-59823b160908">
|
||||||
<database-info product="SQLite" version="3.51.1" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.51.1.0" dbms="SQLITE" exact-version="3.51.1" exact-driver-version="3.51">
|
<database-info product="SQLite" version="3.51.1" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.51.1.0" dbms="SQLITE" exact-version="3.51.1" exact-driver-version="3.51">
|
||||||
<identifier-quote-string>"</identifier-quote-string>
|
<identifier-quote-string>"</identifier-quote-string>
|
||||||
|
|||||||
@@ -137,6 +137,17 @@ $categories = [
|
|||||||
<p class="s-res-meta"><span id="s-res-result-count"><?php echo $totalResultsCount; ?></span> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
|
<p class="s-res-meta"><span id="s-res-result-count"><?php echo $totalResultsCount; ?></span> Treffer für Ihre Suchanfrage "<?php echo htmlspecialchars($query); ?>"</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p
|
||||||
|
id="results-loading"
|
||||||
|
class="results-loading"
|
||||||
|
role="status"
|
||||||
|
aria-live="polite"
|
||||||
|
hidden
|
||||||
|
>
|
||||||
|
<span class="results-spinner" aria-hidden="true"></span>
|
||||||
|
Suchergebnisse werden geladen …
|
||||||
|
</p>
|
||||||
|
|
||||||
<!-- Ergebnisliste -->
|
<!-- Ergebnisliste -->
|
||||||
<div class="s-res-list">
|
<div class="s-res-list">
|
||||||
<?php if (!empty($results)): ?>
|
<?php if (!empty($results)): ?>
|
||||||
|
|||||||
@@ -457,6 +457,18 @@ if ($replyAuthor === null) {
|
|||||||
<button type="submit" class="button">
|
<button type="submit" class="button">
|
||||||
Kommentar senden
|
Kommentar senden
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
<p
|
||||||
|
id="comment-loading"
|
||||||
|
class="comment-loading"
|
||||||
|
role="status"
|
||||||
|
aria-live="polite"
|
||||||
|
hidden
|
||||||
|
>
|
||||||
|
<span class="comment-spinner" aria-hidden="true"></span>
|
||||||
|
Kommentar wird gesendet …
|
||||||
|
</p>
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
<div class="comment-login-hint">
|
<div class="comment-login-hint">
|
||||||
|
|||||||
@@ -113,6 +113,17 @@ $resultCount = count($results);
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p
|
||||||
|
id="results-loading"
|
||||||
|
class="results-loading"
|
||||||
|
role="status"
|
||||||
|
aria-live="polite"
|
||||||
|
hidden
|
||||||
|
>
|
||||||
|
<span class="results-spinner" aria-hidden="true"></span>
|
||||||
|
Kategoriebeiträge werden geladen …
|
||||||
|
</p>
|
||||||
|
|
||||||
<!-- Ergebnisliste -->
|
<!-- Ergebnisliste -->
|
||||||
<div class="s-res-list">
|
<div class="s-res-list">
|
||||||
<?php if (!empty($results)): ?>
|
<?php if (!empty($results)): ?>
|
||||||
|
|||||||
@@ -226,3 +226,33 @@ h1 {
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
.comment-loading {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-loading[hidden] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.comment-spinner {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
border: 2px solid #cbd5e1;
|
||||||
|
border-top-color: #1f2937;
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: comment-spinner-rotation 0.8s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes comment-spinner-rotation {
|
||||||
|
to {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#comment-form button[type="submit"]:disabled {
|
||||||
|
cursor: wait;
|
||||||
|
opacity: 0.65;
|
||||||
|
}
|
||||||
@@ -271,4 +271,33 @@ CSS für die Suchergebnis-Seite
|
|||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* Ladeanzeige beim Nachladen von Such- und Kategorieergebnissen */
|
||||||
|
.results-loading {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin: 15px 0;
|
||||||
|
color: #4a5568;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.results-loading[hidden] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.results-spinner {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
border: 2px solid #cbd5e1;
|
||||||
|
border-top-color: #3182ce;
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: results-spinner-rotation 0.8s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes results-spinner-rotation {
|
||||||
|
to {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
+38
-1
@@ -11,7 +11,19 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
const parentCommentInput = document.getElementById("parent-comment-id");
|
const parentCommentInput = document.getElementById("parent-comment-id");
|
||||||
const replyInfo = document.getElementById("reply-info");
|
const replyInfo = document.getElementById("reply-info");
|
||||||
|
|
||||||
if (!form || !commentsList || !commentContent || !parentCommentInput) {
|
const submitButton = form
|
||||||
|
? form.querySelector('button[type="submit"]')
|
||||||
|
: null;
|
||||||
|
|
||||||
|
const loadingMessage = document.getElementById("comment-loading");
|
||||||
|
|
||||||
|
if (
|
||||||
|
!form
|
||||||
|
|| !commentsList
|
||||||
|
|| !commentContent
|
||||||
|
|| !parentCommentInput
|
||||||
|
|| !submitButton
|
||||||
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,6 +65,23 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
form.addEventListener("submit", function (event) {
|
form.addEventListener("submit", function (event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Verhindert einen erneuten Submit, während der vorherige
|
||||||
|
* Kommentar noch gespeichert wird.
|
||||||
|
*/
|
||||||
|
if (submitButton.disabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const originalButtonText = submitButton.textContent;
|
||||||
|
|
||||||
|
submitButton.disabled = true;
|
||||||
|
submitButton.textContent = "Wird gesendet …";
|
||||||
|
|
||||||
|
if (loadingMessage) {
|
||||||
|
loadingMessage.hidden = false;
|
||||||
|
}
|
||||||
|
|
||||||
const formData = new FormData(form);
|
const formData = new FormData(form);
|
||||||
const parentCommentId = parentCommentInput.value;
|
const parentCommentId = parentCommentInput.value;
|
||||||
|
|
||||||
@@ -269,6 +298,14 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
.catch(function (error) {
|
.catch(function (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
alert("Kommentar konnte nicht gesendet werden.");
|
alert("Kommentar konnte nicht gesendet werden.");
|
||||||
|
})
|
||||||
|
.finally(function () {
|
||||||
|
submitButton.disabled = false;
|
||||||
|
submitButton.textContent = originalButtonText;
|
||||||
|
|
||||||
|
if (loadingMessage) {
|
||||||
|
loadingMessage.hidden = true;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+23
-4
@@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
let listContainer, sortRadios, categorySelect, limitSelect;
|
let listContainer, sortRadios, categorySelect, limitSelect;
|
||||||
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
||||||
|
let loadingElement;
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
listContainer = document.querySelector('.s-res-list');
|
listContainer = document.querySelector('.s-res-list');
|
||||||
@@ -38,23 +39,41 @@
|
|||||||
numbersContainer = document.getElementById('dynamic-page-numbers');
|
numbersContainer = document.getElementById('dynamic-page-numbers');
|
||||||
jsNav = document.getElementById('js-page-navigation');
|
jsNav = document.getElementById('js-page-navigation');
|
||||||
resultCountEl = document.getElementById('s-res-result-count');
|
resultCountEl = document.getElementById('s-res-result-count');
|
||||||
|
loadingElement = document.getElementById('results-loading');
|
||||||
|
|
||||||
const checkedRadio = document.querySelector('.sort-radio:checked');
|
const checkedRadio = document.querySelector('.sort-radio:checked');
|
||||||
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
||||||
state.category = categorySelect ? categorySelect.value : 'all';
|
state.category = categorySelect ? categorySelect.value : 'all';
|
||||||
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
||||||
|
|
||||||
|
if (loadingElement) {
|
||||||
|
loadingElement.hidden = false;
|
||||||
|
}
|
||||||
|
|
||||||
fetchFullDataset()
|
fetchFullDataset()
|
||||||
.then(function (data) {
|
.then(function (data) {
|
||||||
state.allItems = data.results || [];
|
state.allItems = data.results || [];
|
||||||
attachEvents();
|
attachEvents();
|
||||||
render();
|
render();
|
||||||
if (jsNav) jsNav.style.display = 'flex';
|
|
||||||
|
if (jsNav) {
|
||||||
|
jsNav.style.display = 'flex';
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
// JSON-Endpoint nicht erreichbar: die serverseitig gerenderte
|
/*
|
||||||
// (No-JS-)Ansicht bleibt sichtbar und funktioniert weiter.
|
* Falls das Nachladen nicht funktioniert, bleibt die bereits
|
||||||
console.error('Suchergebnisse konnten nicht nachgeladen werden:', err);
|
* serverseitig ausgegebene Ergebnisliste sichtbar.
|
||||||
|
*/
|
||||||
|
console.error(
|
||||||
|
'Suchergebnisse konnten nicht nachgeladen werden:',
|
||||||
|
err
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.finally(function () {
|
||||||
|
if (loadingElement) {
|
||||||
|
loadingElement.hidden = true;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+23
-4
@@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
let listContainer, sortRadios, searchInput, limitSelect;
|
let listContainer, sortRadios, searchInput, limitSelect;
|
||||||
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
let prevBtn, nextBtn, numbersContainer, jsNav, resultCountEl;
|
||||||
|
let loadingElement;
|
||||||
let searchDebounceTimer;
|
let searchDebounceTimer;
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
@@ -35,23 +36,41 @@
|
|||||||
numbersContainer = document.getElementById('dynamic-page-numbers');
|
numbersContainer = document.getElementById('dynamic-page-numbers');
|
||||||
jsNav = document.getElementById('js-page-navigation');
|
jsNav = document.getElementById('js-page-navigation');
|
||||||
resultCountEl = document.getElementById('s-res-result-count');
|
resultCountEl = document.getElementById('s-res-result-count');
|
||||||
|
loadingElement = document.getElementById('results-loading');
|
||||||
|
|
||||||
const checkedRadio = document.querySelector('.sort-radio:checked');
|
const checkedRadio = document.querySelector('.sort-radio:checked');
|
||||||
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
state.sort = checkedRadio ? checkedRadio.value : 'alphabet';
|
||||||
state.query = searchInput ? searchInput.value : '';
|
state.query = searchInput ? searchInput.value : '';
|
||||||
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
state.itemsPerPage = limitSelect ? (parseInt(limitSelect.value, 10) || 10) : 10;
|
||||||
|
|
||||||
|
if (loadingElement) {
|
||||||
|
loadingElement.hidden = false;
|
||||||
|
}
|
||||||
|
|
||||||
fetchFullDataset()
|
fetchFullDataset()
|
||||||
.then(function (data) {
|
.then(function (data) {
|
||||||
state.allItems = data.results || [];
|
state.allItems = data.results || [];
|
||||||
attachEvents();
|
attachEvents();
|
||||||
render();
|
render();
|
||||||
if (jsNav) jsNav.style.display = 'flex';
|
|
||||||
|
if (jsNav) {
|
||||||
|
jsNav.style.display = 'flex';
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
// JSON-Endpoint nicht erreichbar: die serverseitig gerenderte
|
/*
|
||||||
// (No-JS-)Ansicht bleibt sichtbar und funktioniert weiter.
|
* Falls das Nachladen nicht funktioniert, bleibt die bereits
|
||||||
console.error('Kategorie-Beiträge konnten nicht nachgeladen werden:', err);
|
* serverseitig ausgegebene Kategorieansicht sichtbar.
|
||||||
|
*/
|
||||||
|
console.error(
|
||||||
|
'Kategorie-Beiträge konnten nicht nachgeladen werden:',
|
||||||
|
err
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.finally(function () {
|
||||||
|
if (loadingElement) {
|
||||||
|
loadingElement.hidden = true;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -315,16 +315,15 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
FROM articles
|
FROM articles
|
||||||
WHERE title LIKE :keyword
|
WHERE title LIKE :keyword
|
||||||
OR content LIKE :keyword
|
OR content LIKE :keyword
|
||||||
OR tags LIKE :keyword";
|
OR tags LIKE :keyword;";
|
||||||
|
|
||||||
$command = $db->prepare($sql);
|
$command = $db->prepare($sql);
|
||||||
if (!$command) {
|
if (!$command) {
|
||||||
throw new InternalServerErrorException("internal_error");
|
throw new InternalServerErrorException("internal_error");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wildcards für die Suche hinzufügen
|
// Wildcards für die SQL-Suche hinzufügen
|
||||||
$searchParam = '%' . $cleankeyword . '%';
|
$searchParam = '%' . $cleankeyword . '%';
|
||||||
|
|
||||||
$success = $command->execute([
|
$success = $command->execute([
|
||||||
":keyword" => $searchParam
|
":keyword" => $searchParam
|
||||||
]);
|
]);
|
||||||
@@ -337,10 +336,11 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
$filteredArticles = [];
|
$filteredArticles = [];
|
||||||
|
|
||||||
foreach ($rows as $row) {
|
foreach ($rows as $row) {
|
||||||
$likes = $this->getLikesForArticle(intval($row['id']));
|
$articleId = intval($row['id']);
|
||||||
|
$likes = $this->getLikesForArticle($articleId);
|
||||||
|
|
||||||
$filteredArticles[] = new Article(
|
$filteredArticles[] = new Article(
|
||||||
intval($row['id']),
|
$articleId,
|
||||||
$row['title'] ?? '',
|
$row['title'] ?? '',
|
||||||
$row['content'] ?? '',
|
$row['content'] ?? '',
|
||||||
$row['author'] ?? '',
|
$row['author'] ?? '',
|
||||||
@@ -358,6 +358,7 @@ class DatabaseArticleManager implements ArticleManagerDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holt alle User-IDs, die einen bestimmten Beitrag geliked haben.
|
* Holt alle User-IDs, die einen bestimmten Beitrag geliked haben.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user