Bye-bye 333ft #465
Merged
Bye-bye 333ft #465
Conversation
This file contains 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
|
FYI: No idea why Travis is failing, presumably they cached some build files from my other "pruning" PR that should not be cached. The changes are "harmless" and local builds do indeed proceed. |
campos20
reviewed
Dec 27, 2019
tnoodle-ui/src/wca/events.js
Outdated
| @@ -2,8 +2,8 @@ | |||
| import _ from 'lodash'; | |||
|
|
|||
| export default { | |||
| official: [{"id":"333","name":"3x3x3 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"222","name":"2x2x2 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"444","name":"4x4x4 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"555","name":"5x5x5 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"666","name":"6x6x6 Cube","format_ids":["m","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"777","name":"7x7x7 Cube","format_ids":["m","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"333bf","name":"3x3x3 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"333fm","name":"3x3x3 Fewest Moves","format_ids":["m","2","1"],"can_change_time_limit":false,"is_timed_event":false,"is_fewest_moves":true,"is_multiple_blindfolded":false},{"id":"333oh","name":"3x3x3 One-Handed","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"333ft","name":"3x3x3 With Feet","format_ids":["m","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"clock","name":"Clock","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"minx","name":"Megaminx","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"pyram","name":"Pyraminx","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"skewb","name":"Skewb","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"sq1","name":"Square-1","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"444bf","name":"4x4x4 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"555bf","name":"5x5x5 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"333mbf","name":"3x3x3 Multi-Blind","format_ids":["3","2","1"],"can_change_time_limit":false,"is_timed_event":false,"is_fewest_moves":false,"is_multiple_blindfolded":true}].map(extend), | |||
| byId: _.mapValues({"333":{"id":"333","name":"3x3x3 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"222":{"id":"222","name":"2x2x2 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"444":{"id":"444","name":"4x4x4 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"555":{"id":"555","name":"5x5x5 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"666":{"id":"666","name":"6x6x6 Cube","format_ids":["m","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"777":{"id":"777","name":"7x7x7 Cube","format_ids":["m","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"333bf":{"id":"333bf","name":"3x3x3 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"333fm":{"id":"333fm","name":"3x3x3 Fewest Moves","format_ids":["m","2","1"],"can_change_time_limit":false,"is_timed_event":false,"is_fewest_moves":true,"is_multiple_blindfolded":false},"333oh":{"id":"333oh","name":"3x3x3 One-Handed","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"333ft":{"id":"333ft","name":"3x3x3 With Feet","format_ids":["m","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"clock":{"id":"clock","name":"Clock","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"minx":{"id":"minx","name":"Megaminx","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"pyram":{"id":"pyram","name":"Pyraminx","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"skewb":{"id":"skewb","name":"Skewb","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"sq1":{"id":"sq1","name":"Square-1","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"444bf":{"id":"444bf","name":"4x4x4 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"555bf":{"id":"555bf","name":"5x5x5 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"333mbf":{"id":"333mbf","name":"3x3x3 Multi-Blind","format_ids":["3","2","1"],"can_change_time_limit":false,"is_timed_event":false,"is_fewest_moves":false,"is_multiple_blindfolded":true},"magic":{"id":"magic","name":"Magic","format_ids":["a"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"mmagic":{"id":"mmagic","name":"Master Magic","format_ids":["a"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},"333mbo":{"id":"333mbo","name":"3x3x3 Multi-Blind Old Style","format_ids":["3","2","1"],"can_change_time_limit":false,"is_timed_event":false,"is_fewest_moves":false,"is_multiple_blindfolded":true}}, extend), | |||
| official: [{"id":"333","name":"3x3x3 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"222","name":"2x2x2 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"444","name":"4x4x4 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"555","name":"5x5x5 Cube","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"666","name":"6x6x6 Cube","format_ids":["m","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"777","name":"7x7x7 Cube","format_ids":["m","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"333bf","name":"3x3x3 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"333fm","name":"3x3x3 Fewest Moves","format_ids":["m","2","1"],"can_change_time_limit":false,"is_timed_event":false,"is_fewest_moves":true,"is_multiple_blindfolded":false},{"id":"333oh","name":"3x3x3 One-Handed","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"clock","name":"Clock","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"minx","name":"Megaminx","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"pyram","name":"Pyraminx","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"skewb","name":"Skewb","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"sq1","name":"Square-1","format_ids":["a","3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"444bf","name":"4x4x4 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"555bf","name":"5x5x5 Blindfolded","format_ids":["3","2","1"],"can_change_time_limit":true,"is_timed_event":true,"is_fewest_moves":false,"is_multiple_blindfolded":false},{"id":"333mbf","name":"3x3x3 Multi-Blind","format_ids":["3","2","1"],"can_change_time_limit":false,"is_timed_event":false,"is_fewest_moves":false,"is_multiple_blindfolded":true}].map(extend), | |||
There was a problem hiding this comment.
I don't think we should remove all the references foot 333ft here. From official, ok, but we should keep in the byId part. If you take a closer look, there are still magic, 333mbo...
Test commit from browser
|
Merging up for the 2020 release |
viroulep
reviewed
Dec 31, 2019
| }; | ||
|
|
||
| function extend(rawEvent) { | ||
| rawEvent = _.mapKeys(rawEvent, (v, k) => _.camelCase(k)); | ||
| return { | ||
| ...rawEvent, | ||
| } | ||
| ...rawEvent |
There was a problem hiding this comment.
Was it removed automatically by your text editor?
In the website source we try to enforce the trailing commas in multilines arrays and map, it leads to cleaner diff when adding/removing elements.
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.
Removing 333ft from the TNoodle UI, because it is not recognised as an official event anymore starting January 1st, 2020.
There are no major implications from this change as far as I'm concerned, because the underlying 333 scrambler is still needed for plenty of other events.