From 3bc97b26ff361bf6007cd78e65ef1c195b651590 Mon Sep 17 00:00:00 2001
From: mst <oivan2401@gmail.com>
Date: Tue, 26 Nov 2024 14:53:48 +0300
Subject: [PATCH] some logic improvements

---
 templates/snippets/layout/question_card.html | 21 +++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/templates/snippets/layout/question_card.html b/templates/snippets/layout/question_card.html
index 64e4293..5232fc5 100644
--- a/templates/snippets/layout/question_card.html
+++ b/templates/snippets/layout/question_card.html
@@ -29,7 +29,7 @@
 			<span class="text-body-secondary cw-btn-chars">({{ len(answer.content) }} characters)</span>
 		</button>
 		{% else %}
-		<div class="markdown-content">{{ answer.content | render_markdown }}</div>
+		<div class="markdown-content" id="a-{{ question.id }}-content">{{ answer.content | render_markdown }}</div>
 		{% endif %}
 	</div>
 	<div class="card-footer pt-0 pb-0 ps-3 pe-1 text-body-secondary d-flex justify-content-between align-items-center{% if question.pinned %} border-2{% endif %}">
@@ -48,7 +48,7 @@
 				<ul class="dropdown-menu">
 					<li><button class="dropdown-item" onclick="copyFull(`{{ trimContent(question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter) }} {{ cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=question.id) }}`)"><i class="bi bi-copy me-1"></i> Copy to clipboard</button></li>
 					<li>
-						<button class="dropdown-item d-flex align-items-center gap-1" data-bs-toggle="modal" data-bs-target="#question-{{ question.id }}-modal">
+						<button class="dropdown-item d-flex align-items-center gap-1" data-bs-toggle="modal" data-q-id="{{ question.id }}" data-bs-target="#question-modal">
 							<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 64 64" class="me-1">
 								<path fill="currentColor" d="M12.088 23.868a6.734 6.732 0 0 1-2.88 2.866L25.02 42.602l3.812-1.93Zm20.857 20.93-3.812 1.932 8.012 8.04a6.734 6.732 0 0 1 2.88-2.866z"/>
 								<path fill="currentColor" d="m51.24 30.147-8.952 4.535.66 4.22 10.128-5.131a6.734 6.732 0 0 1-1.837-3.624Zm-14.15 7.168L15.926 48.038a6.734 6.732 0 0 1 1.837 3.624l19.989-10.127z"/>
@@ -93,6 +93,7 @@
 				<button class="btn btn-basic pt-2 pb-2 no-arrow text-body-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Miscellaneous menu"><i class="bi bi-three-dots"></i></button>
 				<ul class="dropdown-menu">
 					<li><button class="dropdown-item" onclick="copy({{ question.id }})"><i class="bi bi-copy me-1"></i> Copy link</button></li>
+					{% if not noManageBtns %}
 					{% if logged_in %}
 					{% if not question.pinned %}
 					<li><button class="dropdown-item" hx-post="{{ url_for('api.pinQuestion', question_id=question.id) }}" hx-target="#top-response-container" hx-swap="none"><i class="bi bi-pin me-1"></i> Pin</button></li>
@@ -100,6 +101,14 @@
 					<li><button class="dropdown-item" hx-post="{{ url_for('api.unpinQuestion', question_id=question.id) }}" hx-target="#top-response-container" hx-swap="none"><i class="bi bi-pin-angle me-1"></i> Unpin</button></li>
 					{% endif %}
 					<li><button class="bg-hover-danger text-danger dropdown-item" hx-post="{{ url_for('api.returnToInbox', question_id=question.id) }}" hx-target="#top-response-container" hx-swap="none" data-deletetarget data-target="question-{{ question.id }}"><i class="bi bi-arrow-return-left me-1"></i> Return to inbox</button></li>
+					{# will implement later
+					{% if not cfg.noDeleteConfirm %}
+					<button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#question-modal"><i class="bi bi-trash me-1"></i> Delete</button>
+					{% else %}
+					<button type="button" class="btn btn-outline-danger" hx-delete="{{ url_for('api.deleteQuestion', question_id=question.id) }}" hx-target="#question-{{ question.id }}" hx-swap="none"><i class="bi bi-trash me-1"></i> Delete</button>
+					{% endif %}
+					#}
+					{% endif %}
 					{% endif %}
 				</ul>
 			</div>
@@ -137,7 +146,7 @@
 			<span class="text-body-secondary cw-btn-chars">({{ len(answer.content) }} characters)</span>
 		</button>
 		{% else %}
-		<div class="markdown-content">{{ answer.content | render_markdown }}</div>
+		<div class="markdown-content" id="a-{{ question.id }}-content">{{ answer.content | render_markdown }}</div>
 		{% endif %}
 	</div>
 	<div class="card-footer pt-0 pb-0 ps-3 pe-1 text-body-secondary d-flex justify-content-between align-items-center{% if question.pinned %} border-2{% endif %}">
@@ -156,7 +165,7 @@
 				<ul class="dropdown-menu">
 					<li><button class="dropdown-item" onclick="copyFull(`{{ trimContent(question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter) }} {{ cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=question.id) }}`)"><i class="bi bi-copy me-1"></i> Copy to clipboard</button></li>
 					<li>
-						<button class="dropdown-item d-flex align-items-center gap-1" data-bs-toggle="modal" data-bs-target="#question-{{ question.id }}-modal">
+						<button class="dropdown-item d-flex align-items-center gap-1" data-bs-toggle="modal" data-q-id="{{ question.id }}" data-bs-target="#question-modal">
 							<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 64 64" class="me-1">
 								<path fill="currentColor" d="M12.088 23.868a6.734 6.732 0 0 1-2.88 2.866L25.02 42.602l3.812-1.93Zm20.857 20.93-3.812 1.932 8.012 8.04a6.734 6.732 0 0 1 2.88-2.866z"/>
 								<path fill="currentColor" d="m51.24 30.147-8.952 4.535.66 4.22 10.128-5.131a6.734 6.732 0 0 1-1.837-3.624Zm-14.15 7.168L15.926 48.038a6.734 6.732 0 0 1 1.837 3.624l19.989-10.127z"/>
@@ -201,6 +210,7 @@
 				<button class="btn btn-basic pt-2 pb-2 no-arrow text-body-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Miscellaneous menu"><i class="bi bi-three-dots"></i></button>
 				<ul class="dropdown-menu">
 					<li><button class="dropdown-item" onclick="copy({{ question.id }})"><i class="bi bi-copy me-1"></i> Copy link</button></li>
+					{% if not noManageBtns %}
 					{% if logged_in %}
 					{% if not question.pinned %}
 					<li><button class="dropdown-item" hx-post="{{ url_for('api.pinQuestion', question_id=question.id) }}" hx-target="#top-response-container" hx-swap="none"><i class="bi bi-pin me-1"></i> Pin</button></li>
@@ -209,9 +219,10 @@
 					{% endif %}
 					<li><button class="bg-hover-danger text-danger dropdown-item" hx-post="{{ url_for('api.returnToInbox', question_id=question.id) }}" hx-target="#top-response-container" hx-swap="none" data-deletetarget data-target="question-{{ question.id }}"><i class="bi bi-arrow-return-left me-1"></i> Return to inbox</button></li>
 					{% endif %}
+					{% endif %}
 				</ul>
 			</div>
 		</div>
 	</div>
 </div>
-{% endif %}
\ No newline at end of file
+{% endif %}