forked from garsh0p/garpr
-
Notifications
You must be signed in to change notification settings - Fork 13
Map Splash Page #204
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.
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
Open
BrandonCookeDev
wants to merge
343
commits into
master
Choose a base branch
from
brandon-map-splash
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Map Splash Page #204
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: scraper/smashgg.py test/test_scraper/test_smashgg.py
* Fix alias mapping bugs for players starting with $ symbol - must pass alias_to_id_map around as list of tuples instead of dict; keys starting with $ and $$ are handled specially by angular. * update tests
…et names to their subsequent ids. Refactored smashgg tests a little.
- Changed pull of entrantScore to get method for error handling. - Refactored extra match details pull
Smash GG - DQ's and Bracket Selection
* Query player list locally for player dropdown feature. Don't hammer the server with pointless requests. * pull all players from server so searchbar can search all players * sort player name matches by quality of match
…rged players in alias suggestion (#88)
…hould run this file instead of start.sh
… un/pw in plaintext to dev console)
* ignore OOR players * this commit should fix the region stuff * fixed rankings for merge
…GARPR to NOTGARPR
* fix bug in server.py * add Merges feature to navbar * fix bug in server.py * add Merges feature to navbar * add time and requester data to merge table * merge conflict
Create the `player-typeahead-directive` for reusability, and replace the existing typeaheads with the directive.
* upgrade to angular 1.4.0 * use cdn for ui-bootstrap-tpls * update code to work with angular 1.4.0 need constant expressions (strings delimited by quotes) for ng-true-value and ng-false-value * fix deprecation: dropdown -> uib-dropdown * rm checked in ui-bootstrap-tpls * fix deprecation: $modal -> $uibModal * fix deprecation: collapse -> uib-collapse * fix deprecation: typeahead -> uib-typeahead * upgrade angular-ui-bootstrap to 0.14.0 * upgrade angular-ui-bootstrap to 1.1.0
* return most relevant player matches from server if querying by string * fixes * frontend for ajax player search (rm logic, debounce) * reformat app module deps * fix filtering on promises * loading spinner for ajax call
* top-level ApplicationController * refactor: auth to different directory * create auth module * add SessionService methods for populating/clearing session * add AuthenticationService * change AuthenticationController to call AuthenticationService * load session upon opening page * rm some dependencies in AuthenticationController * populate region data on login * only populate additional data when logging in * fix bug: hide pending tournaments and merges when you log out * rename auth service callbacks to make more sense * de-populate password field when closing login modal
* parse challonge url instead of forcing user to enter id * change help text to tell user to paste challonge url * cosmetic changes * handling invalid urls, fix integration test * add some comments
…le for garpr which can be used to navigate regions. Added external lib for us map
…o regions with a single subregion navigate to the rankings page of that subregion
… it whenever the page loads
…Modified html to correctly list the subregions for access to their rankings
d1a9e59
to
21b9705
Compare
Seems that this PR is broken too. Tho it's not ready for merge yet at all. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using a Interactive US Map js library, created a directive that injects a US Map partial into a specified div.
The Map automatically populates regions that are active based on those region's "Macro Region", and that macro region becomes highlighted blue on the map. When clicked users are redirected to the rankings page for that region.