Skip to content
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

Game view #42

Merged
merged 23 commits into from
Jun 15, 2018
Merged

Game view #42

merged 23 commits into from
Jun 15, 2018

Conversation

Okazari
Copy link
Owner

@Okazari Okazari commented Jun 15, 2018

No description provided.

RQMplays added 23 commits June 6, 2018 15:16
@Okazari Okazari merged commit 1a263ea into profilView Jun 15, 2018
@Okazari Okazari deleted the gameView branch June 15, 2018 13:53
Okazari added a commit that referenced this pull request Jun 15, 2018
* 🎨 copy Link to commons

* 🎨 move Toolbar to Toolbars folder and rename it AppToolbar

* 🚧 designing the game view

* 🎨 Create GameView comp. for the game Layout, and move all Game related comp underneath

* 💄 nightmode for GameView with not 50 but 2 shades of grey

* 💄 switch Grey Tone for GameView

* 💄 fix width 100% and margin-bottom for last transitions in GameView

* 🚧 WIP query for trialGame

* 🚧 create game object for trials in a graphQL query && updating some front display

* ♻️ Refactor deletePage in graphQL resolver from forEach to Map

* 🎨♻️ Create metadata object for Effects and Conditions in EffectService

* ♻️ Refactor the mapping from object to use the key as value for options from EffectService

* 🎨💄 move Trial and Game containers to their respective Views. Create DisplayStats comp in TrialToolbar

* 💄 change style of DisplayStats

* ✨🎨 add DisplayObjects to TrialToolbar too

* 🐛🚨 fixing no key in iterator for react in DisplayStats/Objects and GamePage comp.

* ➕ add normalizr

* 🚧 add schema and normalization for the book metaData

* ♻️ modify deletePage resolver in RootSchema to change only toPage attr

* ♻️ wrong double negations in GameTransition

* 💄♻️ change margin on transitionButton

* ♻️ refactor usage of EffectService in Effect and Condition Input

* ♻️ change wrong variable name on previous refacto
Okazari added a commit that referenced this pull request Jun 15, 2018
* 🎨 copy Link to commons

* 🎨 move Toolbar to Toolbars folder and rename it AppToolbar

* 🚧 designing the game view

* 🎨 Create GameView comp. for the game Layout, and move all Game related comp underneath

* 💄 nightmode for GameView with not 50 but 2 shades of grey

* 💄 switch Grey Tone for GameView

* 💄 fix width 100% and margin-bottom for last transitions in GameView

* 🚧 WIP query for trialGame

* 🚧 create game object for trials in a graphQL query && updating some front display

* ♻️ Refactor deletePage in graphQL resolver from forEach to Map

* 🎨♻️ Create metadata object for Effects and Conditions in EffectService

* ♻️ Refactor the mapping from object to use the key as value for options from EffectService

* 🎨💄 move Trial and Game containers to their respective Views. Create DisplayStats comp in TrialToolbar

* 💄 change style of DisplayStats

* ✨🎨 add DisplayObjects to TrialToolbar too

* 🐛🚨 fixing no key in iterator for react in DisplayStats/Objects and GamePage comp.

* ➕ add normalizr

* 🚧 add schema and normalization for the book metaData

* ♻️ modify deletePage resolver in RootSchema to change only toPage attr

* ♻️ wrong double negations in GameTransition

* 💄♻️ change margin on transitionButton

* ♻️ refactor usage of EffectService in Effect and Condition Input

* ♻️ change wrong variable name on previous refacto
Okazari added a commit that referenced this pull request Jun 18, 2018
* 🎨 copy Link to commons

* 🎨 move Toolbar to Toolbars folder and rename it AppToolbar

* 🚧 designing the game view

* 🎨 Create GameView comp. for the game Layout, and move all Game related comp underneath

* 💄 nightmode for GameView with not 50 but 2 shades of grey

* 💄 switch Grey Tone for GameView

* 💄 fix width 100% and margin-bottom for last transitions in GameView

* 🚧 WIP query for trialGame

* 🚧 create game object for trials in a graphQL query && updating some front display

* ♻️ Refactor deletePage in graphQL resolver from forEach to Map

* 🎨♻️ Create metadata object for Effects and Conditions in EffectService

* ♻️ Refactor the mapping from object to use the key as value for options from EffectService

* 🎨💄 move Trial and Game containers to their respective Views. Create DisplayStats comp in TrialToolbar

* 💄 change style of DisplayStats

* ✨🎨 add DisplayObjects to TrialToolbar too

* 🐛🚨 fixing no key in iterator for react in DisplayStats/Objects and GamePage comp.

* ➕ add normalizr

* 🚧 add schema and normalization for the book metaData

* ♻️ modify deletePage resolver in RootSchema to change only toPage attr

* ♻️ wrong double negations in GameTransition

* 💄♻️ change margin on transitionButton

* ♻️ refactor usage of EffectService in Effect and Condition Input

* ♻️ change wrong variable name on previous refacto
Okazari added a commit that referenced this pull request Jun 18, 2018
* 🎨 copy Link to commons

* 🎨 move Toolbar to Toolbars folder and rename it AppToolbar

* 🚧 designing the game view

* 🎨 Create GameView comp. for the game Layout, and move all Game related comp underneath

* 💄 nightmode for GameView with not 50 but 2 shades of grey

* 💄 switch Grey Tone for GameView

* 💄 fix width 100% and margin-bottom for last transitions in GameView

* 🚧 WIP query for trialGame

* 🚧 create game object for trials in a graphQL query && updating some front display

* ♻️ Refactor deletePage in graphQL resolver from forEach to Map

* 🎨♻️ Create metadata object for Effects and Conditions in EffectService

* ♻️ Refactor the mapping from object to use the key as value for options from EffectService

* 🎨💄 move Trial and Game containers to their respective Views. Create DisplayStats comp in TrialToolbar

* 💄 change style of DisplayStats

* ✨🎨 add DisplayObjects to TrialToolbar too

* 🐛🚨 fixing no key in iterator for react in DisplayStats/Objects and GamePage comp.

* ➕ add normalizr

* 🚧 add schema and normalization for the book metaData

* ♻️ modify deletePage resolver in RootSchema to change only toPage attr

* ♻️ wrong double negations in GameTransition

* 💄♻️ change margin on transitionButton

* ♻️ refactor usage of EffectService in Effect and Condition Input

* ♻️ change wrong variable name on previous refacto
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