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 {
{{ event.name }}
-
- Starts in {{ event.timeUntil }} ({{ event.time }})
+
+ Starts in {{ event.timeUntil }} ({{ event.time }})
+
+
+ Started {{ event.timeUntil }} ago, but you can still join!
{{ event.location }}
@@ -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..259bc18 100644
--- a/rlbot_gui/gui/js/main-vue.js
+++ b/rlbot_gui/gui/js/main-vue.js
@@ -31,9 +31,12 @@ export default {
Events
-
+
{{ $refs.communityEvents.events.length }}
+
+ {{ $refs.communityEvents.eventsNow }} live!
+
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()