- adjust showing upcoming meetup (#85)

* - adjust showing upcoming meetup

* - fix closing images in gallery

* - fix closing images in gallery

* - adjust processing past meetups

* - cr fix

* Update public/application.js

Co-authored-by: Dawid Rudnik <48356242+dawidrudnik@users.noreply.github.com>

* - fix

* - cr fix

* - cr fix

* - cr fix

---------

Co-authored-by: Dawid Rudnik <48356242+dawidrudnik@users.noreply.github.com>

public/application.js

@@ -19,6 +19,7 @@ function initialize() {
       await this.fetchData()
       this.calculateCounters()
       this.processPastMeetups()
+      this.loadUpcomingMeetup()
       setInterval(() => {
         this.calculateCounters()
       }, 1000)
@@ -79,9 +80,15 @@ function initialize() {
       }
     },
     loadUpcomingMeetup: function () {
-      const upcomingMeetup = this.meetups.find(
-        (meetup) => new Date(meetup.datetime) > new Date()
-      )
+      const now = moment()
+      const endOfDay = moment().endOf('day')
+
+      const upcomingMeetup = this.meetups.find((meetup) => {
+        const meetupDate = moment(meetup.datetime)
+
+        return meetupDate.isSameOrAfter(now, 'day')
+      })
+
       if (upcomingMeetup) {
         this.processMeetup(upcomingMeetup)
       }
@@ -92,15 +99,18 @@ function initialize() {
       )
       if (specificMeetup) {
         this.processMeetup(specificMeetup)
-      } else {
-        console.error('Meetup not found')
       }
     },
     processMeetup: function (meetup) {
       let time = moment(meetup.datetime).locale('pl')
       meetup.date = time.format('DD MMMM')
       meetup.time = time.format('HH:mm')
       meetup.year = time.format('Y')
+      const meetupDate = moment(meetup.datetime)
+      const endOfMeetupDay = meetupDate.endOf('day')
+
+      meetup.isPastEndOfDay = moment().isAfter(endOfMeetupDay)
+
       meetup.agenda = meetup.agenda.map((lecture) => ({
         ...lecture,
         expanded: false,
@@ -135,9 +145,13 @@ function initialize() {
       }
     },
     processPastMeetups: function () {
-      const now = new Date()
+      const now = moment()
+
       this.pastMeetups = this.meetups
-        .filter((meetup) => new Date(meetup.datetime) < now)
+        .filter((meetup) => {
+          const meetupDate = moment(meetup.datetime)
+          return meetupDate.isBefore(now, 'day')
+        })
         .map((meetup) => ({
           ...meetup,
           formattedDate: this.formatDate(meetup.datetime),
@@ -174,11 +188,6 @@ function initialize() {
         ).padStart(2, '0')
       }
     },
-    initializeSpeakers: function () {
-      if (this.meetup && this.meetup.lineup && this.meetup.lineup.length > 0) {
-        this.selectedSpeakerIndex = 0
-      }
-    },
     selectPreviousSpeaker: function () {
       if (this.meetup && this.meetup.lineup) {
         this.selectedSpeakerIndex =

public/meetup.html

@@ -699,6 +699,7 @@ <h2 class="text-5xl font-bold">Galeria</h2>
             x-show="lightbox.visible"
             x-transition
             class="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-70"
+            @click.self="closeLightbox()"
           >
             <button
               @click="closeLightbox()"