From e0e6fa057306d414dda25cd2cf99ffac89f1f31e Mon Sep 17 00:00:00 2001
From: eee4 <41441600+eee4@users.noreply.github.com>
Date: Sun, 18 May 2025 20:39:47 +0200
Subject: [PATCH] feat: make sorting by date work

---
 WebApp/Endpoints/EventsEndpoints.cs | 32 +++++++++++----
 WebApp/ts/eventList.ts              | 20 +++++++++-
 WebApp/wwwroot/index.html           |  2 +-
 WebApp/wwwroot/js/eventList.js      | 61 ++++++++++++++++++-----------
 4 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/WebApp/Endpoints/EventsEndpoints.cs b/WebApp/Endpoints/EventsEndpoints.cs
index 55f3e96..7e03578 100644
--- a/WebApp/Endpoints/EventsEndpoints.cs
+++ b/WebApp/Endpoints/EventsEndpoints.cs
@@ -17,14 +17,30 @@ namespace WebApp.Endpoints
                                     .WithParameterValidation();
 
             // GET /events
-            group.MapGet("/", 
-                async (ApplicationDbContext dbContext, HttpContext httpContext) => 
-                await dbContext.Events
-                               .Include(Eve => Eve.Organisation)
-                               .OrderByDescending(Eve => Eve.EventId)
-                               .Select(Eve => Eve.ToEventSummaryDto()) //EventSummaryDto
-                               .AsNoTracking()
-                               .ToListAsync());
+            group.MapGet("/",
+                async (ApplicationDbContext dbContext, HttpContext httpContext) =>
+            {
+
+                var sort = httpContext.Request.Query["sort"].ToString();
+                IOrderedQueryable<Event> res;
+                var r = dbContext.Events
+                           .Include(Eve => Eve.Organisation);
+
+                if (sort is not null && sort.ToUpper() == "ASC")
+                {
+                    res = r.OrderBy(Eve => Eve.EventId);
+                }
+                else
+                {
+                    res = r.OrderByDescending(Eve => Eve.EventId);
+                }
+
+                    return await res
+                           .Select(Eve => Eve.ToEventSummaryDto()) //EventSummaryDto
+                           .AsNoTracking()
+                           .ToListAsync();
+            });
+                
 
             // GET /events/1
             group.MapGet("/{id}", 
diff --git a/WebApp/ts/eventList.ts b/WebApp/ts/eventList.ts
index d5cd6a3..e3ab9b2 100644
--- a/WebApp/ts/eventList.ts
+++ b/WebApp/ts/eventList.ts
@@ -1,9 +1,16 @@
-document.addEventListener("DOMContentLoaded", async () => {
+var isAscending: boolean = false;
+
+function toggleListSortOrder() {
+    isAscending = !isAscending;
+    loadEvents();
+}
+
+async function loadEvents() {
     const container = document.getElementById("eventList");
     if (!container) return;
 
     try {
-        const res = await fetch("/api/events");
+        const res = await fetch("/api/events" + (isAscending ? "?sort=asc" : ""));
         if (!res.ok) throw new Error("Błąd pobierania wydarzeń");
 
         const events = await res.json();
@@ -31,4 +38,13 @@
         container.innerHTML = `<p class="text-danger">Błąd ładowania danych.</p>`;
         console.error(err);
     }
+}
+
+document.addEventListener("DOMContentLoaded", async () => {
+    loadEvents();
+    // listen for clicks
+    const listSortToggleButton = document.getElementById("list-sort-btn");
+    if (listSortToggleButton) {
+        listSortToggleButton.addEventListener("click", toggleListSortOrder);
+    }
 });
\ No newline at end of file
diff --git a/WebApp/wwwroot/index.html b/WebApp/wwwroot/index.html
index 7e672e0..3dbf68c 100644
--- a/WebApp/wwwroot/index.html
+++ b/WebApp/wwwroot/index.html
@@ -71,7 +71,7 @@
 						<button class="btn btn-link" onclick="">
 							<svg xmlns="http://www.w3.org/2000/svg" height="30px" viewBox="0 -960 960 960" width="30px" fill="#2898BD"><path d="M440-120v-240h80v80h320v80H520v80h-80Zm-320-80v-80h240v80H120Zm160-160v-80H120v-80h160v-80h80v240h-80Zm160-80v-80h400v80H440Zm160-160v-240h80v80h160v80H680v80h-80Zm-480-80v-80h400v80H120Z" /></svg>
 						</button>
-						<button class="btn btn-link" onclick=""><svg xmlns="http://www.w3.org/2000/svg" height="30px" viewBox="0 -960 960 960" width="30px" fill="#2898BD"><path d="M320-440v-287L217-624l-57-56 200-200 200 200-57 56-103-103v287h-80ZM600-80 400-280l57-56 103 103v-287h80v287l103-103 57 56L600-80Z" /></svg></button>
+						<button class="btn btn-link" id="list-sort-btn" onclick=""><svg xmlns="http://www.w3.org/2000/svg" height="30px" viewBox="0 -960 960 960" width="30px" fill="#2898BD"><path d="M320-440v-287L217-624l-57-56 200-200 200 200-57 56-103-103v287h-80ZM600-80 400-280l57-56 103 103v-287h80v287l103-103 57 56L600-80Z" /></svg></button>
 					</span>
 				</div>
 
diff --git a/WebApp/wwwroot/js/eventList.js b/WebApp/wwwroot/js/eventList.js
index 66fa15e..00f14d7 100644
--- a/WebApp/wwwroot/js/eventList.js
+++ b/WebApp/wwwroot/js/eventList.js
@@ -8,35 +8,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, void 0, function* () {
-    const container = document.getElementById("eventList");
-    if (!container)
-        return;
-    try {
-        const res = yield fetch("/api/events");
-        if (!res.ok)
-            throw new Error("Błąd pobierania wydarzeń");
-        const events = yield res.json();
-        if (events.length === 0) {
-            container.innerHTML = "<p class='text-muted'>Brak wydarzeń do wyświetlenia.</p>";
+var isAscending = false;
+function toggleListSortOrder() {
+    isAscending = !isAscending;
+    loadEvents();
+}
+function loadEvents() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const container = document.getElementById("eventList");
+        if (!container)
             return;
-        }
-        // Wyczyść kontener przed dodaniem nowych
-        container.innerHTML = '';
-        for (const ev of events) {
-            const card = document.createElement("div");
-            card.className = "event-card filled";
-            card.innerHTML = `
+        try {
+            const res = yield fetch("/api/events" + (isAscending ? "?sort=asc" : ""));
+            if (!res.ok)
+                throw new Error("Błąd pobierania wydarzeń");
+            const events = yield res.json();
+            if (events.length === 0) {
+                container.innerHTML = "<p class='text-muted'>Brak wydarzeń do wyświetlenia.</p>";
+                return;
+            }
+            // Wyczyść kontener przed dodaniem nowych
+            container.innerHTML = '';
+            for (const ev of events) {
+                const card = document.createElement("div");
+                card.className = "event-card filled";
+                card.innerHTML = `
                 <span>${ev.title}</span>
                 <button class="remove-btn delete-btn" data-id="${ev.eventId}">
                     <svg xmlns="http://www.w3.org/2000/svg" height="30px" viewBox="0 -960 960 960" width="30px" fill="#FFFFFF"><path d="M280-440h400v-80H280v80ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
                 </button>
             `;
-            container.appendChild(card);
+                container.appendChild(card);
+            }
         }
-    }
-    catch (err) {
-        container.innerHTML = `<p class="text-danger">Błąd ładowania danych.</p>`;
-        console.error(err);
+        catch (err) {
+            container.innerHTML = `<p class="text-danger">Błąd ładowania danych.</p>`;
+            console.error(err);
+        }
+    });
+}
+document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, void 0, function* () {
+    loadEvents();
+    // listen for clicks
+    const listSortToggleButton = document.getElementById("list-sort-btn");
+    if (listSortToggleButton) {
+        listSortToggleButton.addEventListener("click", toggleListSortOrder);
     }
 }));