From 6a8a6b68a088bdeb09d630ab9a9c5ae88fe65e59 Mon Sep 17 00:00:00 2001 From: esefxdz Date: Mon, 13 Jul 2026 01:07:46 +0300 Subject: [PATCH] calendar update --- js/calendar.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/js/calendar.js b/js/calendar.js index 8cf0a02..29fd46c 100644 --- a/js/calendar.js +++ b/js/calendar.js @@ -1,4 +1,4 @@ -// Calendar tab — country-timezone-aware, auto-converts to your local time +// Calendar tab — timezone-aware (auto-converts to your local time) const CAL_FB_CONFIG = { apiKey: "AIzaSyDuSjEGEKx5FnWYnQq8f_owbpYRBRrl5x0", authDomain: "esef-514bf.firebaseapp.com", @@ -12,18 +12,16 @@ const WEEKDAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]; const MONTHS = ["January","February","March","April","May","June", "July","August","September","October","November","December"]; -function fmtTime(utcIso, time, country) { +function fmtTime(utcIso) { if (utcIso) { try { var d = new Date(utcIso); if (!isNaN(d.getTime())) { - var local = d.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }); - if (country) local += " (" + country + ")"; - return local; + return d.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }); } } catch (e) {} } - return (time || "") + (country ? " (" + country + ")" : ""); + return ""; } document.addEventListener("DOMContentLoaded", () => { @@ -49,10 +47,8 @@ document.addEventListener("DOMContentLoaded", () => { title: d.title || "", date: d.date || "", time: d.time || "", - country: d.country || "", utc: d.utc || "", description: d.description || "", - createdBy: d.createdBy || "", _sort: d.utc || (d.date + "T" + (d.time || "00:00")) }); }); @@ -109,7 +105,7 @@ document.addEventListener("DOMContentLoaded", () => { dayEvents.forEach(e => { html += '
'; if (e.time) { - html += '' + fmtTime(e.utc, e.time, e.country) + " "; + html += '' + fmtTime(e.utc) + " "; } html += esc(e.title); if (e.description) html += '
' + esc(e.description) + "
"; @@ -124,12 +120,12 @@ document.addEventListener("DOMContentLoaded", () => { const upcoming = allEvents.filter(e => e.date >= todayStr); if (upcoming.length === 0) { - sidebarEl.innerHTML = '

No upcoming events.
Use /book in Discord.

'; + sidebarEl.innerHTML = '

No upcoming events.
Use !book in Discord.

'; } else { sidebarEl.innerHTML = upcoming.slice(0, 15).map(e => '
' + '
' + e.date + - (e.time ? " " + fmtTime(e.utc, e.time, e.country) : "") + "
" + + (e.time ? " " + fmtTime(e.utc) : "") + "
" + '
' + esc(e.title) + "
" + (e.description ? '
' + esc(e.description) + "
" : "") + "
"