Merge branch 'master' into DtoBuilders

DTO building allows for fully returning correct event's
skills and registrations

WebApp/DTOs/EventDetailsDto.cs

@@ -1,18 +1,21 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using WebApp.Entities;
 
 namespace WebApp.DTOs;
 
 // Output values in JSON file
 public record class EventDetailsDto
-(
-    int EventId,
-    [Required] int? OrganisationId,
-    [Required] string? OrganisationName,
-    [Required][StringLength(50)] string Title,
-    [StringLength(500)] string Description,
-    [Required][StringLength(100)] string Location,
-    [Required] DateTime? EventDate,
-    ICollection<EventSkill> EventSkills,
-    ICollection<EventRegistration> EventRegistrations
-);
+{
+    public int EventId { get; set; }
+    [Required] public int? OrganisationId {  get; set; }
+    [Required] public string? OrganisationName { get; set; }
+    [Required][StringLength(50)] public string Title { get; set; }
+    [StringLength(500)] public string Description { get; set; }
+    [Required][StringLength(100)] public string Location { get; set; }
+    [Required] public DateTime? EventDate { get; set; }
+    //ICollection<EventSkill> EventSkills,
+    public ICollection<SkillSummaryDto> EventSkills { get; set; }
+    public ICollection<EventRegistrationDto> EventRegistrations { get; set; }
+
+    public EventDetailsDto() { }
+};

WebApp/DTOs/EventRegistrationDto.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+using WebApp.Entities;
+
+namespace WebApp.DTOs;
+
+public record class EventRegistrationDto
+{
+    public int EventId { get; set; }
+    public int UserId { get; set; }
+    public string UserName { get; set; }
+    public DateTime RegisteredAt { get; set; }
+
+    public EventRegistrationDto() { }
+
+};

WebApp/DTOs/EventSummaryDto.cs

@@ -1,17 +1,19 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using WebApp.Entities;
 
 namespace WebApp.DTOs;
 
 // Output values in JSON file
-public record class EventSummaryDto(
-    int EventId,
-    [Required] string Organisation,
-    [Required] int OrganisationId,
-    [Required] [StringLength(50)] string Title,
-    [StringLength(500)] string Description,
-    [Required] [StringLength(100)] string Location,
-    [Required] DateTime? EventDate,
-    ICollection<EventSkill> EventSkills,
-    ICollection<EventRegistration> EventRegistrations
-    );
+public record class EventSummaryDto {
+    public int EventId { get; set; }
+    [Required] public string Organisation { get; set; }
+    [Required] public int OrganisationId { get; set; }
+    [Required] [StringLength(50)] public string Title { get; set; }
+    [StringLength(500)] public string Description { get; set; }
+    [Required] [StringLength(100)] public string Location { get; set; }
+    [Required] public DateTime? EventDate { get; set; }
+    public ICollection<EventSkill> EventSkills { get; set; }
+    public ICollection<EventRegistration> EventRegistrations { get; set; }
+
+
+};

WebApp/DTOs/EventSummaryNoErDto.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using WebApp.Entities;
 
 namespace WebApp.DTOs;
@@ -13,4 +13,5 @@ public record class EventSummaryNoErDto(
     [Required][StringLength(100)] string Location,
     [Required] DateTime? EventDate,
     ICollection<EventSkill> EventSkills
+    // ICollection<SkillSummaryDto> EventSkills
 );

WebApp/DTOs/SkillSummaryDto.cs

@@ -1,9 +1,13 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using WebApp.Entities;
 
 namespace WebApp.DTOs;
 
 public record class SkillSummaryDto
-(
-    [Required] int SkillId,
-    [Required] string SkillName
-);
+{
+    public int? SkillId { get; set; }
+    public string? SkillName { get; set; }
+
+    public SkillSummaryDto() { }
+
+};

WebApp/Endpoints/AuthEndpoints.cs

@@ -99,9 +99,16 @@ namespace WebApp.Endpoints
 
                 if(!user.IsOrganisation)
                 {
-                    var events = await context.EventRegistrations
+
+                    var eventIds = await context.EventRegistrations
                         .Where(er => er.UserId == user.UserId)
-                        .Select(er => er.Event.ToEventSummaryNoErDto())
+                        .Select(er => er.EventId)
+                        .ToListAsync();
+
+                    var events = await context.Events
+                        .Where(e => eventIds.Contains(e.EventId))
+                        .Include(e => e.Organisation)
+                        .Select(e => e.ToEventSummaryDto())
                         .ToListAsync();
 
                     return Results.Ok(events);

WebApp/Endpoints/EventRegistrationEndpoints.cs

@@ -0,0 +1,135 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.EntityFrameworkCore;
+using System.Security.Cryptography;
+using WebApp.Data;
+using WebApp.DTOs;
+using WebApp.Entities;
+using WebApp.Mapping;
+
+namespace WebApp.Endpoints
+{
+    public static class EventsRegistrationEndpoints
+    {
+        const string GetEventEndpointRegistrationName = "GetEventRegistration";
+
+        public static RouteGroupBuilder MapEventsRegistrationEndpoints(this WebApplication app)
+        {
+            var group = app.MapGroup("api/events")
+                                    .WithParameterValidation();
+
+            // POST /api/events/join/{id}
+            group.MapPost("/join/{id}",
+                async (int id, ApplicationDbContext dbContext, HttpContext httpContext, GeneralUseHelpers guhf) =>
+            {
+                Event? Eve = await dbContext.Events.FindAsync(id);
+                if (Eve is null)
+                    return Results.Json(new { success = false, error_msg = "Event not found." });
+
+                Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
+                User? user = await guhf.GetUserFromToken(token);
+
+                if (user is null || user.IsOrganisation)
+                    return Results.Json(new { success = false, error_msg = "Unauthorized or organisations cannot register for events." });
+
+                if (await dbContext.EventRegistrations.AnyAsync(er => er.UserId == user.UserId && er.EventId == id))
+                    return Results.Json(new { success = false, error_msg = "You are already registered for this event." });
+
+                if (Eve.EventDate < DateTime.UtcNow)
+                    return Results.Json(new { success = false, error_msg = "This event has already ended." });
+
+                EventRegistration registration = new EventRegistration
+                {
+                    UserId = user.UserId,
+                    EventId = id,
+                    RegisteredAt = DateTime.UtcNow
+                };
+                dbContext.EventRegistrations.Add(registration);
+                await dbContext.SaveChangesAsync();
+
+                return Results.Json(new { success = true });
+            });
+
+            // POST /api/events/leave/{id}
+            group.MapPost("/leave/{id}",
+                async (int id, ApplicationDbContext dbContext, HttpContext httpContext, GeneralUseHelpers guhf) =>
+            {
+                Event? Eve = await dbContext.Events.FindAsync(id);
+                if (Eve is null)
+                    return Results.Json(new { success = false, error_msg = "Event not found." });
+
+                Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
+                User? user = await guhf.GetUserFromToken(token);
+
+                if (user is null)
+                    return Results.Json(new { success = false, error_msg = "Unauthorized." });
+                
+                if (!await dbContext.EventRegistrations.AnyAsync(er => er.UserId == user.UserId && er.EventId == id))
+                    return Results.Json(new { success = false, error_msg = "You are not registered for this event." });
+
+                if (Eve.EventDate < DateTime.UtcNow)
+                    return Results.Json(new { success = false, error_msg = "This event has already ended." });
+
+                EventRegistration? registration = await dbContext.EventRegistrations
+                    .FirstOrDefaultAsync(er => er.UserId == user.UserId && er.EventId == id);
+
+                dbContext.EventRegistrations.Remove(registration);
+                await dbContext.SaveChangesAsync();
+
+                return Results.Json(new { success = true });
+            });
+
+            // GET /api/events/registrations/{id}
+            group.MapGet("/registrations/{id}",
+                async (int id, ApplicationDbContext dbContext, HttpContext httpContext, GeneralUseHelpers guhf) =>
+            {
+                Event? Eve = await dbContext.Events.FindAsync(id);
+                if (Eve is null)
+                    return Results.Json(new { success = false, error_msg = "Event not found." });
+
+                Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
+                Organisation? org = await guhf.GetOrganisationFromToken(token);
+                if (org is null || org.OrganisationId != Eve.OrganisationId)
+                    return Results.Json(new { success = false, error_msg = "Unauthorized." });
+
+                var registrations = await dbContext.EventRegistrations
+                    .Where(er => er.EventId == id)
+                    .Select(er => er.ToEventRegistrationDto())
+                    .ToListAsync();
+
+                return Results.Json(new
+                {
+                    success = true,
+                    registrations
+                });
+            });
+
+            // POST /api/events/remove/{id}/{userId}
+            group.MapPost("/remove/{id}/{userId}",
+                async (int id, int userId, ApplicationDbContext dbContext, HttpContext httpContext, GeneralUseHelpers guhf) =>
+            {
+                Event? Eve = await dbContext.Events.FindAsync(id);
+                if (Eve is null)
+                    return Results.Json(new { success = false, error_msg = "Event not found." });
+
+                Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
+                Organisation? org = await guhf.GetOrganisationFromToken(token);
+                if (org is null || org.OrganisationId != Eve.OrganisationId)
+                    return Results.Json(new { success = false, error_msg = "Unauthorized." });
+
+                EventRegistration? registration = await dbContext.EventRegistrations
+                    .FirstOrDefaultAsync(er => er.UserId == userId && er.EventId == id);
+
+                if (registration is null)
+                    return Results.Json(new { success = false, error_msg = "Registration not found." });
+
+                dbContext.EventRegistrations.Remove(registration);
+                await dbContext.SaveChangesAsync();
+
+                return Results.Json(new { success = true });
+            });
+
+            return group;
+        }
+    }
+}

WebApp/Endpoints/EventsEndpoints.cs

@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.Intrinsics.Arm;
 using WebApp.Data;
 using WebApp.DTOs;
 using WebApp.Entities;
@@ -40,14 +42,17 @@ namespace WebApp.Endpoints
                            .AsNoTracking()
                            .ToListAsync();
             });
-                
+
 
             // GET /events/1
-            group.MapGet("/{id}", 
+            group.MapGet("/{id}",
                 async (int id, ApplicationDbContext dbContext, HttpContext httpContext, GeneralUseHelpers guhf) =>
             {
-                Event? Eve = await dbContext.Events.FindAsync(id);
 
+                Event? Eve = await dbContext
+                    .Events
+                    .Include(e => e.Organisation)
+                    .FirstOrDefaultAsync(e => e.EventId == id);
                 if (Eve is null) return Results.NotFound();
 
                 // Sprawdź, czy token należy do organizacji, a jeżeli tak, to do której.
@@ -55,16 +60,14 @@ namespace WebApp.Endpoints
                 Organisation? org = await guhf.GetOrganisationFromToken(token);
 
                 // Jeśli token należy do organizacji, która utworzyła to wydarzenie,
-                // to zwróć także EventRegistrations. W przeciwnym razie usuń to pole
-                // przed jego wysłaniem!
-                if (org is null || org.OrganisationId != Eve.OrganisationId) Eve.EventRegistrations = [];
+                // to zwróć także EventRegistrations. W przeciwnym razie niech będzie to
+                // puste pole.
+                List<EventDetailsDto> result = await guhf.BuildDetailedEventsDto(
+                    dbContext,
+                    (org is not null && Eve.Organisation == org)
+                );
 
-                // DLACZEGO?
-                Eve.Organisation = await guhf.GetOrganisationFromId(Eve.OrganisationId);
-
-                EventDetailsDto EveDto = Eve.ToEventDetailsDto();
-
-                return Results.Ok(EveDto); //EventDetailsDto
+                return Results.Ok(result.FirstOrDefault(e => e.EventId == id));
             })
             .WithName(GetEventEndpointName);
 
@@ -214,6 +217,9 @@ namespace WebApp.Endpoints
 
                         // UWAGA! TO NIE POWINNO TAK DZIAŁAĆ!
                         // KTOKOLWIEK WIDZIAŁ, KTOKOLWIEK WIE CZEMU Organisation JEST null?
+                        //
+                        // Odpowiedź: Bo pobieramy dane bez .Include(e => e.Organisation),
+                        // co zapobiega masie innych problemów, m.in. rekurencyjnym importom.
                         e.Organisation = await guhf.GetOrganisationFromId(e.OrganisationId);
 
                         if (matchFound) SearchResults.Add(e.ToEventSummaryDto());

WebApp/Endpoints/GeneralUseHelperFunctions.cs

@@ -1,5 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using WebApp.Data;
+using WebApp.DTOs;
 using WebApp.Entities;
 
 namespace WebApp.Endpoints;
@@ -112,4 +113,49 @@ public class GeneralUseHelpers
         // Sprawdza, czy któreś ze słów pasuje (nawet częściowo) do searchTerm
         return words.Any(word => word.Contains(searchTerm, StringComparison.OrdinalIgnoreCase));
     }
+
+    public async Task<List<EventDetailsDto>> BuildDetailedEventsDto(ApplicationDbContext context, bool includeEventRegistrations = false)
+    {
+        // https://khalidabuhakmeh.com/ef-core-and-aspnet-core-cycle-issue-and-solution
+
+        // Jeśli token należy do organizacji, która utworzyła to wydarzenie,
+        // to zwróć także EventRegistrations. W przeciwnym razie niech będzie to
+        // puste pole.
+        ICollection<EventRegistrationDto> ERs = new List<EventRegistrationDto>();
+        if (includeEventRegistrations)
+        {
+            ERs = await context
+                .EventRegistrations
+                .Select(er => new EventRegistrationDto
+                {
+                    EventId = er.EventId,
+                    UserId = er.UserId,
+                    UserName = er.User.FirstName + " " + er.User.LastName,
+                    RegisteredAt = er.RegisteredAt
+                }).ToListAsync();
+        }
+
+        List<EventDetailsDto> result = await context
+                .Events
+                .Select(e => new EventDetailsDto
+                {
+                    EventId = e.EventId,
+                    OrganisationId = e.OrganisationId,
+                    OrganisationName = e.Organisation.Name,
+                    Title = e.Title,
+                    Description = e.Description,
+                    Location = e.Location,
+                    EventDate = e.EventDate,
+                    EventSkills = e
+                        .EventSkills
+                        .Select(es => new SkillSummaryDto
+                        {
+                            SkillId = es.SkillId,
+                            SkillName = es.Skill.Name
+                        }).ToList(),
+                    EventRegistrations = ERs
+                }).ToListAsync();
+
+        return result;
+    }
 }

WebApp/Mapping/EventMapping.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using WebApp.DTOs;
 using WebApp.Entities;
 
@@ -34,20 +34,21 @@ public static class EventMapping
 
     public static EventSummaryDto ToEventSummaryDto(this Event myEvent)
     {
-        return new EventSummaryDto(
-            myEvent.EventId,
-            myEvent.Organisation!.Name,
-            myEvent.OrganisationId,
-            myEvent.Title,
-            myEvent.Description,
-            myEvent.Location,
-            myEvent.EventDate,
-            myEvent.EventSkills,
-            myEvent.EventRegistrations
-        );
+        return new EventSummaryDto {
+            EventId            = myEvent.EventId,
+            Organisation       = myEvent.Organisation!.Name,
+            OrganisationId     = myEvent.OrganisationId,
+            Title              = myEvent.Title,
+            Description        = myEvent.Description,
+            Location           = myEvent.Location,
+            EventDate          = myEvent.EventDate,
+            EventSkills        = myEvent.EventSkills,
+            EventRegistrations = myEvent.EventRegistrations
+        };
     }
     public static EventSummaryNoErDto ToEventSummaryNoErDto(this Event myEvent)
     {
+
         return new EventSummaryNoErDto(
             myEvent.EventId,
             myEvent.Organisation!.Name,
@@ -60,18 +61,42 @@ public static class EventMapping
         );
     }
 
+    public static EventRegistrationDto ToEventRegistrationDto(this EventRegistration myER)
+    {
+
+        return new EventRegistrationDto {
+            EventId      = myER.EventId,
+            UserId       = myER.UserId,
+            UserName     = myER.User.FirstName + " " + myER.User.LastName,
+            RegisteredAt = myER.RegisteredAt
+        };
+    }
+
     public static EventDetailsDto ToEventDetailsDto(this Event myEvent)
     {
-        return new EventDetailsDto(
-            myEvent.EventId,
-            myEvent.OrganisationId,
-            myEvent.Organisation.Name,
-            myEvent.Title,
-            myEvent.Description,
-            myEvent.Location,
-            myEvent.EventDate,
-            myEvent.EventSkills,
-            myEvent.EventRegistrations
-        );
+        List<SkillSummaryDto>      ssdto = new List<SkillSummaryDto>();
+        List<EventRegistrationDto> erdto = new List<EventRegistrationDto>();
+
+        foreach (EventSkill es in myEvent.EventSkills)
+        {
+            ssdto.Add(es.ToSkillSummaryDto());
+        }
+
+        foreach (EventRegistration er in myEvent.EventRegistrations)
+        {
+            erdto.Add(er.ToEventRegistrationDto());
+        }
+
+        return new EventDetailsDto {
+            EventId            = myEvent.EventId,
+            OrganisationId     = myEvent.OrganisationId,
+            OrganisationName   = myEvent.Organisation.Name,
+            Title              = myEvent.Title,
+            Description        = myEvent.Description,
+            Location           = myEvent.Location,
+            EventDate          = myEvent.EventDate,
+            EventSkills        = ssdto,
+            EventRegistrations = erdto
+        };
     }
-}
+}

WebApp/Mapping/EventRegistrationMapping.cs

@@ -0,0 +1,17 @@
+using WebApp.DTOs;
+using WebApp.Entities;
+
+namespace WebApp.Mapping
+{
+    public static class EventRegistrationMapping
+    {
+        public static EventRegistrationDto ToEventRegistrationDto(this EventRegistration er)
+        {
+            return new EventRegistrationDto(
+                er.EventId,
+                er.UserId,
+                er.RegisteredAt
+            );
+        }
+    }
+}

WebApp/Mapping/EventSkillMapping.cs

@@ -13,4 +13,12 @@ public static class EventSkillMapping
             SkillId = SSDto.Skill,
         };
     }
+
+    public static SkillSummaryDto ToSkillSummaryDto(this EventSkill es)
+    {
+        return new SkillSummaryDto{
+            SkillId   = es.SkillId,
+            SkillName = es.Skill.Name
+        };
+    }
 }

WebApp/Mapping/SkillMapping.cs

@@ -1,4 +1,4 @@
-using WebApp.DTOs;
+using WebApp.DTOs;
 using WebApp.Entities;
 
 namespace WebApp.Mapping
@@ -16,10 +16,10 @@ namespace WebApp.Mapping
 
         public static SkillSummaryDto ToSkillSummaryDto(this Skill s)
         {
-            return new SkillSummaryDto(
-                s.SkillId,
-                s.Name
-            );
+            return new SkillSummaryDto {
+                SkillId   = s.SkillId,
+                SkillName = s.Name
+            };
         }
     }
 }

WebApp/Program.cs

@@ -54,5 +54,6 @@ app.MapEventsEndpoints();
 app.MapOrganizationsEndpoints();
 app.MapAuthEndpoints();
 app.MapSkillsEndpoints();
+app.MapEventsRegistrationEndpoints();
 
 app.Run();

WebApp/ts/eventView.ts

@@ -1,4 +1,4 @@
-import { getEvent, getMyAccount, unhideElementById } from './generalUseHelpers.js';
+import { getEvent, getMyAccount, unhideElementById, getMyRegisteredEventIds } from './generalUseHelpers.js';
 
 const queryString = window.location.search;
 const urlParams = new URLSearchParams(queryString);
@@ -9,6 +9,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     var container   = document.getElementById("mainContainer");
     const modifyBtn = document.getElementById("editBtn");
     const removeBtn = document.getElementById("removeBtn");
+    const applyBtn = document.getElementById("applyBtn");
+    const leaveBtn = document.getElementById("leaveBtn");
     var org_id: number = -1;
 
     try {
@@ -28,11 +30,11 @@ document.addEventListener("DOMContentLoaded", async () => {
     try {
         if (eventId) thisEvent = await getEvent(eventId);
     } catch (err) {
-        if (container !== null) container.innerHTML = `<p class="text-danger">To wydarzenie nie istnieje! <a href="/" style="color:#2898BD;">Powrót -></a></p>`;
+        if (container !== null) container.innerHTML = `<p class="text-danger">To wydarzenie nie istnieje! <a href="/" style="color:#2898BD;">Powr<EFBFBD>t -></a></p>`;
     }
 
     if (thisEvent == null) {
-        if (container !== null) container.innerHTML = `<p class="text-danger">B³¹d we wczytywaniu wydarzenia. <a href="/" style="color:#2898BD;">Powrót -></a></p>`;
+        if (container !== null) container.innerHTML = `<p class="text-danger">Błąd we wczytywaniu wydarzenia. <a href="/" style="color:#2898BD;">Powrót -></a></p>`;
     } else {
 
         const titleText     = document.getElementById(    "titleText") as HTMLElement;
@@ -51,13 +53,20 @@ document.addEventListener("DOMContentLoaded", async () => {
         organizerText.innerHTML = "Organized by: " + thisEvent.organisationName;
 
         if (org_id == thisEvent.organisationId) {
-            // U¿ytkownik jest organizacj¹, która
-            // stworzy³a to wydarzenie
+            // Użytkownik jest organizacją, która
+            // stworzyła to wydarzenie
             unhideElementById(document, "editBtn");
             unhideElementById(document, "removeBtn");
         } else if (org_id == -1) {
-            // U¿ytkownik jest wolontariuszem
-            unhideElementById(document, "applyBtn");
+            // Użytkownik jest wolontariuszem
+            const registeredIds = await getMyRegisteredEventIds();
+            const isRegistered = registeredIds.includes(Number(eventId));
+
+            if (isRegistered) {
+                unhideElementById(document, "leaveBtn");
+            } else {
+                unhideElementById(document, "applyBtn");
+            }
         }
 
         unhideElementById(document, "mainContainer");
@@ -76,7 +85,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             if (!confirmed) return;
 
             try {
-                // Wysy³a ¿¹danie DELETE do API
+                // Wysyła żądanie DELETE do API
                 const response = await fetch(`/api/events/${eventId}`, {
                     method: "DELETE"
                 });
@@ -94,4 +103,59 @@ document.addEventListener("DOMContentLoaded", async () => {
         });
     }
 
-});
+    if (applyBtn) {
+        applyBtn.addEventListener("click", async (e) => {
+            try {
+                const response = await fetch(`/api/events/join/${eventId}`, {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                });
+
+                const result: {
+                    success: boolean;
+                    error_msg?: string;
+                } = await response.json();
+
+                if (result.success) {
+                    window.location.href = `/view.html?event=${eventId}`;
+                } else {
+                    alert(`Error: ${result.error_msg ?? "Unknown error occurred."}`);
+                }
+            } catch (error) {
+                console.error("Failed to apply:", error);
+                alert("Failed to apply.");
+            }
+        });
+    }
+
+    if (leaveBtn) {
+        leaveBtn.addEventListener("click", async (e) => {
+            try {
+                const response = await fetch(`/api/events/leave/${eventId}`, {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                });
+
+                const result: {
+                    success: boolean;
+                    error_msg?: string;
+                } = await response.json();
+
+                if (result.success) {
+                    window.location.href = `/view.html?event=${eventId}`;
+                } else {
+                    alert(`Error: ${result.error_msg ?? "Unknown error occurred."}`);
+                }
+
+            } catch (error) {
+                console.error("Failed to leave:", error)
+                alert("Failed to leave.")
+            }
+        });
+    }
+
+});

WebApp/ts/generalUseHelpers.ts

@@ -36,9 +36,20 @@ export async function getEvent(id: string): Promise<EventData> {
 export async function getMyAccount(): Promise<MyAccount> {
     const res = await fetch("/api/auth/my_account");
     if (!res.ok) {
-        throw Error("U¿ytkownik niezalogowany!");
+        throw Error("U<EFBFBD>ytkownik niezalogowany!");
     }
     const data = await res.json();
     return data;
 }
 
+export async function getMyRegisteredEventIds(): Promise<number[]> {
+    const res = await fetch("/api/auth/my_events");
+
+    if (!res.ok) {
+        throw Error("Użytkownik niezalogowany!");
+    }
+
+    const events = await res.json();
+
+    return events.map((event: { eventId: number }) => event.eventId);
+}

WebApp/wwwroot/js/eventView.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getEvent, getMyAccount, unhideElementById } from './generalUseHelpers.js';
+import { getEvent, getMyAccount, unhideElementById, getMyRegisteredEventIds } from './generalUseHelpers.js';
 const queryString = window.location.search;
 const urlParams = new URLSearchParams(queryString);
 const eventId = urlParams.get('event');
@@ -15,6 +15,8 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
     var container = document.getElementById("mainContainer");
     const modifyBtn = document.getElementById("editBtn");
     const removeBtn = document.getElementById("removeBtn");
+    const applyBtn = document.getElementById("applyBtn");
+    const leaveBtn = document.getElementById("leaveBtn");
     var org_id = -1;
     try {
         var user = yield getMyAccount();
@@ -36,7 +38,7 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
     }
     catch (err) {
         if (container !== null)
-            container.innerHTML = `<p class="text-danger">To wydarzenie nie istnieje! <a href="/" style="color:#2898BD;">Powrót -></a></p>`;
+            container.innerHTML = `<p class="text-danger">To wydarzenie nie istnieje! <a href="/" style="color:#2898BD;">Powr<EFBFBD>t -></a></p>`;
     }
     if (thisEvent == null) {
         if (container !== null)
@@ -63,7 +65,14 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
         }
         else if (org_id == -1) {
             // Użytkownik jest wolontariuszem
-            unhideElementById(document, "applyBtn");
+            const registeredIds = yield getMyRegisteredEventIds();
+            const isRegistered = registeredIds.includes(Number(eventId));
+            if (isRegistered) {
+                unhideElementById(document, "leaveBtn");
+            }
+            else {
+                unhideElementById(document, "applyBtn");
+            }
         }
         unhideElementById(document, "mainContainer");
     }
@@ -96,4 +105,52 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo
             }
         }));
     }
+    if (applyBtn) {
+        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;
+            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: ${(_c = result.error_msg) !== null && _c !== void 0 ? _c : "Unknown error occurred."}`);
+                }
+            }
+            catch (error) {
+                console.error("Failed to leave:", error);
+                alert("Failed to leave.");
+            }
+        }));
+    }
 }));

WebApp/wwwroot/js/generalUseHelpers.js

@@ -35,3 +35,13 @@ export function getMyAccount() {
         return data;
     });
 }
+export function getMyRegisteredEventIds() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield fetch("/api/auth/my_events");
+        if (!res.ok) {
+            throw Error("Użytkownik niezalogowany!");
+        }
+        const events = yield res.json();
+        return events.map((event) => event.eventId);
+    });
+}

WebApp/wwwroot/modify.html

@@ -80,6 +80,7 @@
 
         <script type="module" src="/js/eventModify.js"></script>
         <script type="module" src="/js/generalUseHelpers.js"></script>
+        <script type="module" src="/js/auth.js"></script>
 </body>
 
 

WebApp/wwwroot/view.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="pl">
 <head>
     <meta charset="UTF-8">
@@ -64,6 +64,7 @@
             <h4 id="descText"></h4><br />
 
             <button id="applyBtn" class="button hidden-before-load"><span>Apply</span><span>&#11166;</span></button>
+            <button id="leaveBtn" class="button hidden-before-load"><span>Leave</span><span>&#11166;</span></button>
             <button id="editBtn" class="button hidden-before-load"><span>Modify</span><span>&#11166;</span></button>
             <button id="removeBtn" class="button hidden-before-load" style="background-color: red;"><span>Remove permanently</span><span>&#11166;</span></button>