Skip to content

Update events gui #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Darxeal merged 2 commits into from
Mar 3, 2023
Merged

Update events gui #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d10c0f
Update events gui
VirxEC Mar 1, 2023
ec99f70
cleaner badges
Darxeal Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 32 additions & 7 deletions rlbot_gui/gui/js/community-events-vue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -19,6 +22,8 @@ export default {
data() {
return {
events: [],
eventsNow: 0,
eventsFuture: 0,
}
},
methods: {
Expand Down Expand Up @@ -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();
Expand All @@ -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;
},
Expand All @@ -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,
Expand Down
5 changes: 4 additions & 1 deletion rlbot_gui/gui/js/main-vue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ 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">
<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>

<span id="sandbox-button-wrapper">
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down