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

Story select (#23) #25

Merged
merged 9 commits into from
Jul 13, 2017
Merged

Story select (#23) #25

merged 9 commits into from
Jul 13, 2017

Conversation

awildbrysen
Copy link
Member

  • Story selection
  • Teacher code that has to be filled in

Review merge conflicts!

awildbrysen and others added 7 commits July 12, 2017 14:12
* Added teacher + room page, also added a firebase helper for handling some firebase checkups

* fix firebase deploy

* build before deploy, yarnify

* travis please dont delete the build folder

* Feature/reusable components (#19)

* add iconset

* style variables

* button component

* font

* empty filter component

* button styles

* new routes + button styling

* fix some imports

* added initialization screens

* fixed entry code bug

* Modules Implementation (#12) (#16)

* Added variety of modules

* Search Exercise Module added

* working ImageQuizModule + finalized ImageModule

* Finalized QuizModule

* updating modules + finishing youtube module

* fixed imports + finalized MapModule

* fixed missing import

* Removed console.logs

* Added room and switch structure

* refactored modules + room setup

* added redux test action room

* updated QuizModule
@awildbrysen awildbrysen requested a review from elsmr July 13, 2017 07:32
@awildbrysen awildbrysen mentioned this pull request Jul 13, 2017
@elsmr elsmr merged commit 37df772 into develop Jul 13, 2017
@elsmr elsmr deleted the feature/story-select branch July 13, 2017 16:50
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.

None yet

2 participants