From 1d10c0faede1636734b6b8019cef28ba4b20e061 Mon Sep 17 00:00:00 2001
From: Eric Veilleux <virx@virxcase.dev>
Date: Wed, 1 Mar 2023 16:38:29 -0500
Subject: [PATCH 1/2] Update events gui

---
 rlbot_gui/gui/js/community-events-vue.js | 39 +++++++++++++++++++-----
 rlbot_gui/gui/js/main-vue.js             |  9 +++++-
 setup.py                                 |  2 +-
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/rlbot_gui/gui/js/community-events-vue.js b/rlbot_gui/gui/js/community-events-vue.js
index 4835c07..3dc7ead 100644
--- a/rlbot_gui/gui/js/community-events-vue.js
+++ b/rlbot_gui/gui/js/community-events-vue.js
@@ -7,8 +7,11 @@ export default {
 			</div>
 			<div v-else v-for="event in events">
 				<h3>{{ event.name }}</h3>
-                <p class="mb-1">
-                    <b-icon icon="alarm"/> Starts in <b>{{ event.timeUntil }}</b> ({{ event.time }})
+                <p v-if="event.timeUntilMs > 0" class="mb-1">
+                    <b-icon icon="calendar-plus"/> Starts in <b>{{ event.timeUntil }}</b> ({{ event.time }})
+                </p>
+                <p v-else class="mb-1">
+                    <b-icon icon="alarm"/> Started <b>{{ event.timeUntil }}</b> ago, but you can still join!
                 </p>
 				<p>
                     <b-icon icon="geo"/> <a :href="event.location" target="_blank">{{ event.location }}</a>
@@ -19,6 +22,8 @@ export default {
     data() {
         return {
             events: [],
+            eventsNow: 0,
+            eventsFuture: 0,
         }
     },
     methods: {
@@ -60,7 +65,7 @@ export default {
                 }
             }
             catch (e) {
-                console.log("Error checking recurrence:" + e);
+                console.error("Error checking recurrence:" + e);
             }
 
             const time_untils = new_date.getTime() - today.getTime();
@@ -76,13 +81,28 @@ export default {
             );
             let format = "";
             if (days > 0) {
-                format += days + " days ";
+                format += days;
+                if (days > 1) {
+                    format += " days ";
+                } else {
+                    format += " day ";
+                }
             }
             if (hours > 0) {
-                format += hours + " hours ";
+                format += hours;
+                if (hours > 1) {
+                    format += " hours ";
+                } else {
+                    format += " hour ";
+                }
             }
             if (minutes > 0) {
-                format += minutes + " minutes ";
+                format += minutes;
+                if (minutes > 1) {
+                    format += " minutes ";
+                } else {
+                    format += " minute ";
+                }
             }
             return format;
         },
@@ -99,9 +119,14 @@ export default {
                     for (let event of data.items) {
                         let [names, new_date, time_until_ms] = this.dateTimeCheck(new Date(), event);
 
+                        if (time_until_ms > 0)
+                            this.eventsFuture += 1;
+                        else
+                            this.eventsNow += 1;
+
                         // time_untils is the time until the event in milliseconds
                         // convert this to something human readable, like "in 2 days"
-                        const format = this.formatFromNow(time_until_ms);
+                        const format = this.formatFromNow(Math.abs(time_until_ms));
 
                         this.events.push({
                             name: names,
diff --git a/rlbot_gui/gui/js/main-vue.js b/rlbot_gui/gui/js/main-vue.js
index df24578..c8a94bc 100644
--- a/rlbot_gui/gui/js/main-vue.js
+++ b/rlbot_gui/gui/js/main-vue.js
@@ -32,7 +32,14 @@ export default {
 			<b-button @click="$bvModal.show('community-events')" variant="dark" class="ml-2">
 				Events
 				<b-badge v-if="$refs.communityEvents?.events.length > 0" variant="danger">
-					{{ $refs.communityEvents.events.length }}
+					<span v-if="$refs.communityEvents?.eventsNow">
+						<b-icon icon="alarm"/>
+						{{ $refs.communityEvents.eventsNow }}
+					</span>
+					<span v-if="$refs.communityEvents?.eventsFuture">
+						<b-icon icon="calendar-plus"/>
+						{{ $refs.communityEvents.eventsFuture }}
+					</span>
 				</b-badge>
 			</b-button>
 
diff --git a/setup.py b/setup.py
index 724ade9..30b94f4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 import setuptools
 
-__version__ = '0.0.148'
+__version__ = '0.0.149'
 
 with open("README.md", "r") as readme_file:
     long_description = readme_file.read()

From ec99f70c0773bc0933e50d7951e81b4f2fbcffce Mon Sep 17 00:00:00 2001
From: Darxeal <jira.pihrt@volny.cz>
Date: Fri, 3 Mar 2023 18:48:29 +0100
Subject: [PATCH 2/2] cleaner badges

---
 rlbot_gui/gui/js/main-vue.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/rlbot_gui/gui/js/main-vue.js b/rlbot_gui/gui/js/main-vue.js
index c8a94bc..259bc18 100644
--- a/rlbot_gui/gui/js/main-vue.js
+++ b/rlbot_gui/gui/js/main-vue.js
@@ -31,15 +31,11 @@ export default {
 
 			<b-button @click="$bvModal.show('community-events')" variant="dark" class="ml-2">
 				Events
-				<b-badge v-if="$refs.communityEvents?.events.length > 0" variant="danger">
-					<span v-if="$refs.communityEvents?.eventsNow">
-						<b-icon icon="alarm"/>
-						{{ $refs.communityEvents.eventsNow }}
-					</span>
-					<span v-if="$refs.communityEvents?.eventsFuture">
-						<b-icon icon="calendar-plus"/>
-						{{ $refs.communityEvents.eventsFuture }}
-					</span>
+				<b-badge v-if="$refs.communityEvents?.events.length" variant="primary">
+					{{ $refs.communityEvents.events.length }}
+				</b-badge>
+				<b-badge v-if="$refs.communityEvents?.eventsNow" variant="danger">
+					{{ $refs.communityEvents.eventsNow }} live!
 				</b-badge>
 			</b-button>