sherl/hermes
1
0
Fork 0
mirror of https://github.com/GCMatters/hermes.git synced 2026-02-04 05:30:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into DtoBuilders

Browse Source
This commit is contained in:
eee4
2025-06-02 00:38:24 +02:00
parent 271bf84467 fd97b2c2d9
commit 50a4c24660
2 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
WebApp/ts/eventView.ts
View File

@@ -59,14 +59,21 @@ document.addEventListener("DOMContentLoaded", async () => {
unhideElementById(document, "removeBtn"); unhideElementById(document, "removeBtn");
} else if (org_id == -1) { } else if (org_id == -1) {
// Użytkownik jest wolontariuszem // Użytkownik jest wolontariuszem
const registeredIds = await getMyRegisteredEventIds(); try {
const isRegistered = registeredIds.includes(Number(eventId)); const registeredIds = await getMyRegisteredEventIds();
const isRegistered = registeredIds.includes(Number(eventId));
if (isRegistered) { if (isRegistered) {
unhideElementById(document, "leaveBtn"); unhideElementById(document, "leaveBtn");
} else { } else {
unhideElementById(document, "applyBtn");
}
} catch {
unhideElementById(document, "applyBtn"); unhideElementById(document, "applyBtn");
(applyBtn as HTMLButtonElement).textContent = "log in to apply";
(applyBtn as HTMLButtonElement).disabled = true;
} }
} }
unhideElementById(document, "mainContainer"); unhideElementById(document, "mainContainer");

67
WebApp/wwwroot/js/eventView.js
View File

@@ -65,13 +65,20 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
} }
else if (org_id == -1) { else if (org_id == -1) {
// Użytkownik jest wolontariuszem // Użytkownik jest wolontariuszem
const registeredIds = yield getMyRegisteredEventIds(); try {
const isRegistered = registeredIds.includes(Number(eventId)); const registeredIds = yield getMyRegisteredEventIds();
if (isRegistered) { const isRegistered = registeredIds.includes(Number(eventId));
unhideElementById(document, "leaveBtn"); if (isRegistered) {
unhideElementById(document, "leaveBtn");
}
else {
unhideElementById(document, "applyBtn");
}
} }
else { catch (_b) {
unhideElementById(document, "applyBtn"); unhideElementById(document, "applyBtn");
applyBtn.textContent = "log in to apply";
applyBtn.disabled = true;
} }
} }
unhideElementById(document, "mainContainer"); unhideElementById(document, "mainContainer");
@@ -107,33 +114,9 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
} }
if (applyBtn) { if (applyBtn) {
applyBtn.addEventListener("click", (e) => __awaiter(void 0, void 0, void 0, function* () { applyBtn.addEventListener("click", (e) => __awaiter(void 0, void 0, void 0, function* () {
var _b;
try {
const response = yield fetch(`/api/events/join/${eventId}`, {
method: "POST",
headers: {
"Content-Type": "application/json"
},
});
const result = yield response.json();
if (result.success) {
window.location.href = `/view.html?event=${eventId}`;
}
else {
alert(`Error: ${(_b = result.error_msg) !== null && _b !== void 0 ? _b : "Unknown error occurred."}`);
}
}
catch (error) {
console.error("Failed to apply:", error);
alert("Failed to apply.");
}
}));
}
if (leaveBtn) {
leaveBtn.addEventListener("click", (e) => __awaiter(void 0, void 0, void 0, function* () {
var _c; var _c;
try { try {
const response = yield fetch(`/api/events/leave/${eventId}`, { const response = yield fetch(`/api/events/join/${eventId}`, {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json" "Content-Type": "application/json"
@@ -147,6 +130,30 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
alert(`Error: ${(_c = result.error_msg) !== null && _c !== void 0 ? _c : "Unknown error occurred."}`); alert(`Error: ${(_c = result.error_msg) !== null && _c !== void 0 ? _c : "Unknown error occurred."}`);
} }
} }
catch (error) {
console.error("Failed to apply:", error);
alert("Failed to apply.");
}
}));
}
if (leaveBtn) {
leaveBtn.addEventListener("click", (e) => __awaiter(void 0, void 0, void 0, function* () {
var _d;
try {
const response = yield fetch(`/api/events/leave/${eventId}`, {
method: "POST",
headers: {
"Content-Type": "application/json"
},
});
const result = yield response.json();
if (result.success) {
window.location.href = `/view.html?event=${eventId}`;
}
else {
alert(`Error: ${(_d = result.error_msg) !== null && _d !== void 0 ? _d : "Unknown error occurred."}`);
}
}
catch (error) { catch (error) {
console.error("Failed to leave:", error); console.error("Failed to leave:", error);
alert("Failed to leave."); alert("Failed to leave.");