mirror of
https://github.com/GCMatters/hermes.git
synced 2026-02-04 13:40:13 +01:00
Compare commits
3 Commits
5da58ee030
...
Prothotype
| Author | SHA1 | Date | |
|---|---|---|---|
| 32027f7384 | |||
|
|
2a8fff39c9 | ||
|
|
b194819b6e |
8
WebApp/DTOs/SingleSkillDto.cs
Normal file
8
WebApp/DTOs/SingleSkillDto.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace WebApp.DTOs;
|
||||
|
||||
public record class SingleSkillDto
|
||||
(
|
||||
[Required] int Skill
|
||||
);
|
||||
9
WebApp/DTOs/SkillSummaryDto.cs
Normal file
9
WebApp/DTOs/SkillSummaryDto.cs
Normal file
@@ -0,0 +1,9 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace WebApp.DTOs;
|
||||
|
||||
public record class SkillSummaryDto
|
||||
(
|
||||
[Required] int SkillId,
|
||||
[Required] string SkillName
|
||||
);
|
||||
@@ -1,5 +1,6 @@
|
||||
using Microsoft.AspNetCore.Http.HttpResults;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Runtime.Intrinsics.Arm;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using WebApp.Data;
|
||||
@@ -123,6 +124,42 @@ namespace WebApp.Endpoints
|
||||
|
||||
});
|
||||
|
||||
group.MapPost("/add_skill", async (SingleSkillDto dto, HttpContext httpContext, ApplicationDbContext context, GeneralUseHelpers guh) =>
|
||||
{
|
||||
// Uzyskaj użytkownika z tokenu
|
||||
Token? token = await guh.GetTokenFromHTTPContext(httpContext);
|
||||
User? user = await guh.GetUserFromToken(token);
|
||||
|
||||
// Tylko wolontariusze powinno móc dodawać swoje skille
|
||||
if (user == null || user.IsOrganisation) {
|
||||
return Results.Json(new { message = "Unauthorized" }, statusCode: 401);
|
||||
}
|
||||
|
||||
// Szukamy skilla w bazie o ID takim, jak w otrzymanym DTO
|
||||
Skill? skill = await context.Skills.FindAsync(dto.Skill);
|
||||
if (skill is null)
|
||||
{
|
||||
return Results.Json(new { message = "Skill not found" }, statusCode: 404);
|
||||
}
|
||||
|
||||
// Sprawdzamy, czy ten użytkownik nie ma już takiego skilla. Jeżeli ma, nie ma sensu dodawać go kilkukrotnie.
|
||||
VolunteerSkill? vs = await context.VolunteerSkills.FirstOrDefaultAsync(v => v.UserId == user.UserId && v.SkillId == dto.Skill);
|
||||
if (vs is null)
|
||||
{
|
||||
// Nie ma - zatem musimy dodać nowy VolunteerSkill do bazy
|
||||
VolunteerSkill newVs = dto.ToVolunteerSkillEntity(user.UserId);
|
||||
context.VolunteerSkills.Add(newVs);
|
||||
await context.SaveChangesAsync();
|
||||
|
||||
} else
|
||||
{
|
||||
// Ma - (ta para UserId <-> SkillId już istnieje w bazie) użytkownik już ma ten skill
|
||||
return Results.Json(new { message = "User already has this skill" }, statusCode: 400);
|
||||
}
|
||||
|
||||
return Results.Json(new { message = "Skill added successfully!" }, statusCode: 201);
|
||||
});
|
||||
|
||||
return group;
|
||||
}
|
||||
|
||||
|
||||
25
WebApp/Mapping/SkillMapping.cs
Normal file
25
WebApp/Mapping/SkillMapping.cs
Normal file
@@ -0,0 +1,25 @@
|
||||
using WebApp.DTOs;
|
||||
using WebApp.Entities;
|
||||
|
||||
namespace WebApp.Mapping
|
||||
{
|
||||
public static class SkillMapping
|
||||
{
|
||||
public static Skill ToSkillEntity(this SingleSkillDto SSDto, string name)
|
||||
{
|
||||
return new Skill()
|
||||
{
|
||||
SkillId = SSDto.Skill,
|
||||
Name = name
|
||||
};
|
||||
}
|
||||
|
||||
public static SkillSummaryDto ToSkillSummaryDto(this Skill s)
|
||||
{
|
||||
return new SkillSummaryDto(
|
||||
s.SkillId,
|
||||
s.Name
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
17
WebApp/Mapping/VolunteerSkillMapping.cs
Normal file
17
WebApp/Mapping/VolunteerSkillMapping.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using WebApp.DTOs;
|
||||
using WebApp.Entities;
|
||||
|
||||
namespace WebApp.Mapping
|
||||
{
|
||||
public static class VolunteerSkillMapping
|
||||
{
|
||||
public static VolunteerSkill ToVolunteerSkillEntity(this SingleSkillDto SSDto, int uid)
|
||||
{
|
||||
return new VolunteerSkill()
|
||||
{
|
||||
UserId = uid,
|
||||
SkillId = SSDto.Skill,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,18 +4,17 @@ function deleteCookie(name: string): void {
|
||||
document.cookie = `${name}=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT`;
|
||||
}
|
||||
|
||||
function logoutUser(): void {
|
||||
// Inform backend to remove cookie if necessary
|
||||
fetch('/api/logout', {
|
||||
method: 'POST',
|
||||
credentials: 'include',
|
||||
}).catch((err) => console.warn('Logout request failed:', err));
|
||||
async function logoutUser(): Promise<void> {
|
||||
await fetch("/api/auth/logout", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
});
|
||||
|
||||
// Clear the auth cookie
|
||||
deleteCookie('token');
|
||||
deleteCookie('token');
|
||||
|
||||
// Redirect to login page
|
||||
window.location.href = 'index.html';
|
||||
window.location.href = "/index.html";
|
||||
}
|
||||
|
||||
function redirectToLogin(): void {
|
||||
@@ -46,7 +45,10 @@ function setupAuthUI(): void {
|
||||
|
||||
if (logoutBtn) {
|
||||
logoutBtn.classList.toggle('d-none', !isAuthenticated);
|
||||
logoutBtn.addEventListener('click', logoutUser);
|
||||
logoutBtn.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
logoutUser();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -80,6 +80,8 @@
|
||||
|
||||
<script type="module" src="/js/eventCreate.js"></script>
|
||||
<script type="module" src="/js/generalUseHelpers.js"></script>
|
||||
<script type="module" src="/js/auth.js"></script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
|
||||
@@ -1,18 +1,28 @@
|
||||
"use strict";
|
||||
// /js/auth.ts
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
function deleteCookie(name) {
|
||||
document.cookie = `${name}=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT`;
|
||||
}
|
||||
function logoutUser() {
|
||||
// Inform backend to remove cookie if necessary
|
||||
fetch('/api/logout', {
|
||||
method: 'POST',
|
||||
credentials: 'include',
|
||||
}).catch((err) => console.warn('Logout request failed:', err));
|
||||
// Clear the auth cookie
|
||||
deleteCookie('token');
|
||||
// Redirect to login page
|
||||
window.location.href = 'index.html';
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
yield fetch("/api/auth/logout", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
});
|
||||
deleteCookie('token');
|
||||
window.location.href = "/index.html";
|
||||
});
|
||||
}
|
||||
function redirectToLogin() {
|
||||
window.location.href = 'login.html';
|
||||
@@ -36,7 +46,10 @@ function setupAuthUI() {
|
||||
}
|
||||
if (logoutBtn) {
|
||||
logoutBtn.classList.toggle('d-none', !isAuthenticated);
|
||||
logoutBtn.addEventListener('click', logoutUser);
|
||||
logoutBtn.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
logoutUser();
|
||||
});
|
||||
}
|
||||
}
|
||||
// Initialize on load
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
<h2 id="locationText">Place: 127.0.0.1</h2>
|
||||
<h2 id="dateText">When: now or never!</h2>
|
||||
<h3>Description:</h3>
|
||||
<h4 id="descText"></h4><br/>
|
||||
<h4 id="descText"></h4><br />
|
||||
|
||||
<button id="applyBtn" class="button hidden-before-load"><span>Apply</span><span>⮞</span></button>
|
||||
<button id="editBtn" class="button hidden-before-load"><span>Modify</span><span>⮞</span></button>
|
||||
@@ -71,6 +71,8 @@
|
||||
|
||||
<script type="module" src="/js/eventView.js"></script>
|
||||
<script type="module" src="/js/generalUseHelpers.js"></script>
|
||||
<script type="module" src="/js/auth.js"></script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user