This repository has been archived by the owner on Aug 7, 2024. It is now read-only.
Merge react branch into master #646
Merged
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
…#547) * setup code responses for react * Add Editor Redux feature * code review changes * link editor code with django right now the game id is fixed to 1 * test get code button * Add GamePage snapshot test * add post code epic * Sends post request successfully * add a way to get csrf token via ajax * update npm packages * add post request for code * simplify passing of epics * move api calls into an api folder * simplify post api call * simplify syntax * Fix tests and add some more
* setup code responses for react * Add Editor Redux feature * code review changes * link editor code with django right now the game id is fixed to 1 * Merge branch 'master' into django_editor_link * test get code button * Add GamePage snapshot test * add post code epic * Sends post request successfully * add a way to get csrf token via ajax * update npm packages * add post request for code * simplify passing of epics * move api calls into an api folder * simplify post api call * simplify syntax * Fix tests and add some more * Add front-end component for AceEditor * Modified theme of code editor * Merge branch 'UI_new_design' into code_editor_frontend * Fixed failing test and updated snapshot for code editor * Merge branch 'code_editor_frontend' of https://github.com/ocadotechnology/aimmo into code_editor_frontend
* Get intial state of code on editor load * Added more types to handle changing code * Wrote a test case for changeCodeEpic * fix deps * Inject testscheduler into changeCodeEpic * State in post request should be evaluated at the time of the action * fix eslint in GamePage tests * code review changes
* Add material-ui core * Add mui theme to MUIThemeProvider and styled components ThemeProvider * Use theme colors for existing ui I didn't do the Unity one because it's going to not have a background * delete unused file * add a withTheme testHelper * Use withTheme testHelper * Update snapshots * Use absolute imports for testhelpers
* Add typography * withTheme is a default export * Fix tests so that they are testing the correct code * Merge branch 'master' Conflicts: game_frontend/package-lock.json game_frontend/package.json game_frontend/yarn.lock players/views.py * JS: Update dependencies and lock files * Add more snapshot tests for containers * Merge with UI_new_design
* Add documentation for `createShallowWithTheme` test helper * Remove feature path * Fix redux-dev-tools deployment bug
* Add react-unity-webgl package as a dependency * Introduce new unity module to the component * Update the README * Move GameView to be a container * Add some extra functionality local to the file for now * Add utilities and a API with JSON settings. Resolves #612 * More functionality to connect two systems * More Redux changes for success & connection * Refactor method name of the view to not include 'view' * Add initial state & send information across to Unity WebGL * Add socketIO dependency to generated HTML * Call Unity functions as redux actions now * Remove irrelevant comments now * Serialise boolean SSL flag for Unity * More changes to how communication is conducted * Handle errors * Add lunch json for VS code to git ignore * Emit success event in the epic * Remove middlewares * New feature introduced for Game * Remove old game reducer and move to its own. Resolves #619 Same as below * Separate epics for each event refactoring * Remove older epic * Update .gitignore launch json path Ignore all .vscode files Update .gitignore * Remove a TODO comment * Fix existing tests to suit new code * Merge branch 'UI_new_design' into add_unity_to_react * Regenerate yarn.lock * Revert the refactoring, can be done in a different PR * Add epic tests for the happy path * Remove unwanted comment and add EOF lines * Change reducer name, forgot to change beforehand * Add reducer test for all current cases * More function tests * Some testing changes as requested in PR by @mrniket * Change imports to one liner using aliases * Remove redundant alias for default import * Refactoring of setGameURL successful, rest not done * Refactoring of setGameURL fixed * Finish refactoring * Merge remote-tracking branch 'origin/UI_new_design' into add_unity_to_react * GameView minor esLint changes * Merge remote-tracking branch 'origin/UI_new_design' into add_unity_to_react * Fix indentation and other eslint issues in unity * Certain eslint fixes * More eslint * Fix minor SSL bug * Add extra developer settings to the parcel bundler * Initial connectionParams naming changes More naming changes More naming changes again connectionParams naming change done * Name change in the view to parameters * utilities called game_helpers now * Add another shallow theme test to the layout * Test passing, still unhappy with marble completion * Use action creators instead of explicit objects * Add css to Game Page testing * Change the djangoBundler check environment before setting vars * Update tests without theme to use shallow instead * Export unity as a object containing all the calls instead * Bring id of current avatar view to be called game_id again * Add naming change to game_helpers as requested * Fix tests to be correct now * Make aimmo compatible with Django 1.9 (#642) * Make aimmo compatible with Django 1.9 * Using patch version of Django 1.9 (#643) * Using patch version of Django 1.9 * Merge remote-tracking branch 'origin/master' into add_unity_to_react * Simply the API for api.js, put error in payload of fail actions * Add test for emit unity failure
|
Reviewed 5 of 34 files at r1, 33 of 45 files at r2, 34 of 36 files at r3. Comments from Reviewable |
OlafSzmidt
changed the title
OlafSzmidt
approved these changes
Jul 4, 2018
There was a problem hiding this comment.
Reviewed 5 of 34 files at r1, 33 of 45 files at r2, 34 of 36 files at r3.
Reviewable status:complete! all files reviewed, all discussions resolved
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Existing ui still there as well in this PR, will remove in a separate PR
This change is