Add new component with the system selector/button + actions #65
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
nicoknoll
suggested changes
Jan 14, 2017
| const schoolService = Server.service('/schools'); | ||
| const systemService = Server.service('/systems'); | ||
|
|
||
| String.prototype.capitalizeFirstLetter = function () { |
There was a problem hiding this comment.
Whoa maybe don't extend the String class here but just make it either make it a normal function or put it somewhere so it's available for everything.
| return this.substr(0, 1).toUpperCase() + this.substr(1); | ||
| }; | ||
|
|
||
| Array.prototype.indexBy = function (property) { |
| password: '' | ||
| } | ||
| password: '', | ||
| systemId: '0000d186816abba584714c92' // the id of the 'local' system. |
There was a problem hiding this comment.
We should discuss with @Langleu how it should work for the local system as it isn't related to any school
| @@ -20,72 +24,25 @@ class LoginForm extends React.Component { | |||
| this.props.actions.login.bind(this)({ | |||
| email: this.state.email, | |||
| password: this.state.password, | |||
| school: this.state.school || undefined, | |||
There was a problem hiding this comment.
I removed it since we didn't use the parameter in the login action. However, we should actually pass it to the account service since there's a field schoolId in our model. I'll put it back :)
# Conflicts: # src/modules/login/actions/login.js # src/modules/login/components/login_form.jsx # src/modules/login/containers/login.js
nicoknoll
approved these changes
Jan 18, 2017
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.
The elements are now hidden by default, the 'local' system is selected in this case