Technoboy10
90631b3054
remove dev file
2016-07-27 09:27:22 -04:00
Technoboy10
25402113bf
tweak a few things before WIP PR
2016-07-27 09:26:33 -04:00
Matthew Taylor
f4c60a915b
Merge pull request #761 from mewtaylor/issue/gh-757
...
Fix GH-757: Redirect to `/educators/classes` if a confirmed teacher
2016-07-27 07:41:59 -04:00
Matthew Taylor
806fd25e46
Move to the view
...
thanks @rschamp!
2016-07-26 17:03:41 -04:00
Ray Schamp
d83df730c8
Redirect students that must reset their password
...
Fixes LLK/scratchr2#3878
2016-07-26 16:40:05 -04:00
Technoboy10
ae9c15f6ce
update with routes.json from develop branch
2016-07-26 15:51:05 -04:00
Matthew Taylor
60a62bb374
Redirect to /educators/classes if a confirmed teacher
...
Fixes #757 . Note: Because we are getting this info from the session, the redirect may not happen until the page is rendered first in cases where the connection is slow, or the db is slow.
2016-07-26 15:24:51 -04:00
Matthew Taylor
1c7dc73ed7
Merge pull request #753 from mewtaylor/issue/gh-749
...
Fix GH-749: Fix formatting for a few form elements
2016-07-26 11:42:13 -04:00
Technoboy10
2a5f330884
hide intro if not desktop width
2016-07-26 11:29:45 -04:00
Matthew Taylor
e87a2bce76
remove trailing whitespace
2016-07-26 11:24:51 -04:00
Technoboy10
a8b26b1a1c
experiment with removing content display from scss
2016-07-26 11:06:21 -04:00
Matthew Taylor
69ac5b60bd
make .no-label an auto assignment
...
thanks @rschamp!
2016-07-26 10:44:19 -04:00
Matthew Taylor
b510d154df
remove ‘noformsy` option on inputs
2016-07-26 10:20:06 -04:00
Ray Schamp
cd3eafe9a0
Merge pull request #754 from rschamp/bugfix/747
...
Make the student registration views more consistent with each other
2016-07-26 09:28:52 -04:00
Matthew Taylor
6787ae03ce
Apply classes to row, not textarea
...
And move help rendering into the phone input row.
2016-07-26 08:06:38 -04:00
Ray Schamp
74f56d42c5
Explicitly show a spinner while loading class data
...
To make this view work consistently with the complete registration view
2016-07-25 16:59:55 -04:00
Ray Schamp
4df4ea8930
Show an error to logged out users
...
When logged out users visit the complete registration view, show them an error rather than a spinner.
2016-07-25 16:58:38 -04:00
Matthew Taylor
d8e07ee7f6
use rowClassName instead
...
so that it can include `label`. Also add some default styling to `label` in `.row`. Thanks @rschamp!
2016-07-25 15:43:44 -04:00
Matthew Taylor
263d292b3c
Fix formatting for a few form elements
...
and make use of the FRC `elementWrapperClassName`, since they way we did it before – custom `className` strings on the element – was not working. Fixes #749 .
2016-07-25 13:21:28 -04:00
Ray Schamp
401edb354d
Merge pull request #751 from rschamp/bugfix/747
...
Show an error if the API doesn't return class data
2016-07-25 11:46:03 -04:00
Ray Schamp
61e21f6b5b
Show an error if the API doesn't return class data
...
Fixes #747 .
Also explicitly show a spinner when the component is waiting on the class API, and hide it when it returns.
2016-07-25 11:41:10 -04:00
Technoboy10
daf803d4a3
experiment with the react-responsive library
2016-07-25 10:53:57 -04:00
Technoboy10
188841c73c
layout reducer (needs work)
2016-07-22 14:57:47 -04:00
Technoboy10
808922b50d
pass layout to navbar and footer
2016-07-22 14:57:05 -04:00
Technoboy10
391344489d
footer mobile
2016-07-22 14:56:14 -04:00
Technoboy10
5b9cef8dd6
navbar mobile
2016-07-22 14:55:56 -04:00
Technoboy10
a9def9c1ae
tweak splash to not be terrible on mobile
2016-07-22 14:53:39 -04:00
Ray Schamp
7ae7db76a2
Fix typo
2016-07-22 12:45:18 -04:00
Ray Schamp
62609cbc87
Collapse by beginning all routes with a common ^
2016-07-22 12:38:24 -04:00
Ray Schamp
eba654c411
Collapse /classes routes to shorten condition
2016-07-22 12:21:42 -04:00
Ray Schamp
44c2b55f14
Merge pull request #746 from rschamp/bugfix/token-path
...
Don't require end slashes when replacing arguments
2016-07-22 11:48:03 -04:00
Ray Schamp
e5ad1872d0
Don't require end slashes when replacing arguments
2016-07-22 11:47:26 -04:00
Ray Schamp
4074e218b2
Merge pull request #744 from rschamp/feature/3679-complete-registration
...
Add Student registration update view
2016-07-22 09:44:23 -04:00
Ray Schamp
7455807591
Provide RegistrationError content as children
...
This allows us to do more inline formatting, so we don't have any of that outside of `render`.
Thanks @mewtaylor
2016-07-22 09:38:37 -04:00
Ray Schamp
be41d004ad
Show password by default
2016-07-21 21:08:07 -04:00
Ray Schamp
3335207c54
Update copy for password step
2016-07-21 21:08:07 -04:00
Ray Schamp
7e330bfb67
Redirect to student registration update view
...
Previously requests to /session/ would return a signal to redirect, but we need /session/ to complete registration. So check if we should redirect when we retrieve the session.
Also update this behavior for banned users.
2016-07-21 21:08:07 -04:00
Ray Schamp
a4dd1611d1
Add student registration update view
2016-07-21 21:08:06 -04:00
Ray Schamp
1df6eb5d2a
Update incorrect CSS class name
2016-07-21 21:08:06 -04:00
Ray Schamp
7a6e5c3eb4
Fix student registration localization
...
Add missing strings, actually translate the content of the steps
2016-07-21 21:08:06 -04:00
Ray Schamp
6144c6f8d1
Merge pull request #745 from rschamp/bugfix/student-registration-url
...
Grab-bag of student registration fixes
2016-07-21 20:46:42 -04:00
Ray Schamp
8dae646ff3
Style tweaks
2016-07-21 20:44:51 -04:00
Ray Schamp
b06a9e49d0
Fix wording on student username step
2016-07-21 20:44:51 -04:00
Ray Schamp
9aa7e828b7
Remove "blank" classroom, show spinner instead
...
It was broken due to a key error on `classroom.images` anyway
2016-07-21 20:44:51 -04:00
Ray Schamp
8038fbcdc1
Fix classroom API call
2016-07-21 18:10:41 -04:00
Andrew Sliwinski
74b26267d2
Merge pull request #741 from thisandagain/bugfix/740
...
Adjustments to the educators page as per feedback
2016-07-21 13:49:37 -04:00
Matthew Taylor
bf28fae97c
Merge pull request #739 from mewtaylor/issue/gh-698
...
Fix GH-698: refresh session on successful registration
2016-07-21 13:44:15 -04:00
Andrew Sliwinski
99c61ef0f7
Adjustments to the educators page as per feedback. Resolves GH-740
2016-07-21 13:43:35 -04:00
Matthew Taylor
859877c1ff
refresh session on successful registration
...
This is needed to ensure that the approval step displays the correct “Wait for Approval” message. Fixes #698
2016-07-21 12:57:49 -04:00
Connor Hudson
63b0b03b0c
Merge pull request #738 from technoboy10/gh737-teacher-landing-asset
...
Fix GH-737: Replace teacher account asset
2016-07-21 10:38:10 -04:00
