From b075ef7e7816ff431e52f323613ae4af6c8498f6 Mon Sep 17 00:00:00 2001 From: eee4 <41441600+eee4@users.noreply.github.com> Date: Mon, 2 Jun 2025 01:11:18 +0200 Subject: [PATCH] fix: place emojis in .ts file oops --- WebApp/ts/eventList.ts | 11 +++++------ WebApp/ts/eventView.ts | 6 +++--- WebApp/wwwroot/js/eventList.js | 2 -- WebApp/wwwroot/js/eventView.js | 6 +++--- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/WebApp/ts/eventList.ts b/WebApp/ts/eventList.ts index 52e1e4e..fffaa76 100644 --- a/WebApp/ts/eventList.ts +++ b/WebApp/ts/eventList.ts @@ -54,21 +54,20 @@ async function loadEvents(org_id: number, evs?: Promise) { for (const ev of events) { const card = document.createElement("div"); card.className = "event-card filled"; - //card.innerHTML = ` - // ${ev.title}` - // Do odkomentowania kiedy widok podglądu wydarzeń będzie gotowy + let formattedDate: string = new Intl.DateTimeFormat('en-US', { weekday: 'long', // "Monday" year: 'numeric', // "2023" month: 'long', // "December" day: 'numeric' // "1" - }).format(ev.eventDate); - console.log(formattedDate); + }).format(new Date(ev.eventDate)); + card.innerHTML = ` ${ev.title} -

${ev.organisation} | ${ev.location} | ${formattedDate}

+

👥 ${ev.organisation} | 📍 ${ev.location} | 📅 ${formattedDate}

` + if (org_id == ev.organisationId) { card.innerHTML += `
diff --git a/WebApp/ts/eventView.ts b/WebApp/ts/eventView.ts index 8f323de..2b7d80d 100644 --- a/WebApp/ts/eventView.ts +++ b/WebApp/ts/eventView.ts @@ -47,10 +47,10 @@ document.addEventListener("DOMContentLoaded", async () => { titleText.innerHTML = thisEvent.title + ` (#${eventId})`; - locationText.innerHTML = "Place: " + thisEvent.location; + locationText.innerHTML = "📍 Place: " + thisEvent.location; descText.innerHTML = thisEvent.description; - dateText.innerHTML = "When: " + newdateText + " " + newtimeText; //thisEvent.eventDate; - organizerText.innerHTML = "Organized by: " + thisEvent.organisationName; + dateText.innerHTML = "📅 When: " + newdateText + " " + newtimeText; //thisEvent.eventDate; + organizerText.innerHTML = "👥 Organized by: " + thisEvent.organisationName; if (org_id == thisEvent.organisationId) { // Użytkownik jest organizacją, która diff --git a/WebApp/wwwroot/js/eventList.js b/WebApp/wwwroot/js/eventList.js index 7d85f66..2b7a95d 100644 --- a/WebApp/wwwroot/js/eventList.js +++ b/WebApp/wwwroot/js/eventList.js @@ -59,14 +59,12 @@ function loadEvents(org_id, evs) { for (const ev of events) { const card = document.createElement("div"); card.className = "event-card filled"; - let formattedDate = new Intl.DateTimeFormat('en-US', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' // "1" }).format(new Date(ev.eventDate)); - card.innerHTML = ` ${ev.title} diff --git a/WebApp/wwwroot/js/eventView.js b/WebApp/wwwroot/js/eventView.js index b50b8ac..b5e8598 100644 --- a/WebApp/wwwroot/js/eventView.js +++ b/WebApp/wwwroot/js/eventView.js @@ -53,10 +53,10 @@ document.addEventListener("DOMContentLoaded", () => __awaiter(void 0, void 0, vo const newdateText = new Date(thisEvent.eventDate).toLocaleDateString('pl-PL'); const newtimeText = new Date(thisEvent.eventDate).toLocaleTimeString('pl-PL'); titleText.innerHTML = thisEvent.title + ` (#${eventId})`; - locationText.innerHTML = "Place: " + thisEvent.location; + locationText.innerHTML = "📍 Place: " + thisEvent.location; descText.innerHTML = thisEvent.description; - dateText.innerHTML = "When: " + newdateText + " " + newtimeText; //thisEvent.eventDate; - organizerText.innerHTML = "Organized by: " + thisEvent.organisationName; + dateText.innerHTML = "📅 When: " + newdateText + " " + newtimeText; //thisEvent.eventDate; + organizerText.innerHTML = "👥 Organized by: " + thisEvent.organisationName; if (org_id == thisEvent.organisationId) { // Użytkownik jest organizacją, która // stworzyła to wydarzenie