Skip to content

Push to production version 2/17/25#1551

Merged
varCepheid merged 8 commits intomainfrom
dev
Apr 14, 2025
Merged

Push to production version 2/17/25#1551
varCepheid merged 8 commits intomainfrom
dev

Conversation

@varCepheid
Copy link
Collaborator

No description provided.

* added checkmarks to match cards on event and event-team-matches pages

* enabled checkmarks on event-match page

* changed checkmarks to gray
* create alphabetical sorting function for realms dropdown

* made get-realms sort the realms, removed sorting from signup

* lint
resolve conflicts between dev and main
@varCepheid varCepheid requested a review from calebeby February 18, 2025 01:32
calebeby
calebeby previously approved these changes Feb 18, 2025
* updated comment-card max width

trying to fix issue 1480

* changed "next match" to be based on time

Scores don't upload quickly, so this appears to fix the issue. Also ran lint.

* the problem has been solved, it now shows five matches, in theory two before and three after the current time; in fixing some aestethic issues a couple more popped up, but I don't know exactly how to fix those (and they're a bit less noticeable)

* [WIP] change implementation and fix some CSS bugs

* [WIP] formatting changes on event-team pages. I couldn't test on any real events so it needs checking. --Elijah

* testing with manual date/time

* same

* testing changes

* same

* testing is hard

* removed score check for upcoming matches function

* changed time span for upcoming-matches

* changed times again

* more testing for upcoming matches

* reverted testing changes

* removed comments

* requested edits

removed "No Upcoming Matches" on event-team page
added space below header
changed getUpcomingMatches to new series of filters

* Revert changes to `package-lock.json`

* undo unrelated changes

---------

Co-authored-by: ev118 <92764232+ev118@users.noreply.github.com>
Co-authored-by: Caleb Eby <caleb.eby01@gmail.com>
@varCepheid varCepheid added this pull request to the merge queue Feb 18, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Feb 18, 2025
@varCepheid varCepheid added this pull request to the merge queue Apr 14, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Apr 14, 2025
@varCepheid varCepheid added this pull request to the merge queue Apr 14, 2025
Merged via the queue into main with commit 30fbcf5 Apr 14, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants