Commit graph

1522 commits

Author SHA1 Message Date
Matthew Taylor
40fb433d7d Make country choice a function that’s called
And also default the country in address to the country in demographics. Thanks @rschamp @carljbowman!
2016-07-28 09:56:01 -04:00
Matthew Taylor
2650e6e148 Move countryOptions to the global scope
thanks @rschamp!
2016-07-28 08:30:29 -04:00
Matthew Taylor
cf4a057278 Fix “afterschool” typo
Also make default country selectable in the user demographic step, and fix the spacing with `Create a Username`
2016-07-27 23:33:45 -04:00
Ray Schamp
668f141457 Merge pull request #778 from rschamp/bugfix/chrome-52
Set common y-origin for validation bubbles
2016-07-27 20:17:32 -04:00
Ray Schamp
ecbbeb5612 Set common y-origin for validation bubbles
I believe this will keep the misalignment from happening across browsers. Sets the top left corner to the top left corner of the input block.

Resolves #770
2016-07-27 20:15:53 -04:00
Ray Schamp
ade303bd80 Merge pull request #777 from rschamp/bugfix/class-invite
Resurrect old invite step design for new users
2016-07-27 19:34:34 -04:00
Ray Schamp
19d67dc0b4 Resurrect old invite step design for new users 2016-07-27 19:32:08 -04:00
Technoboy10
2da07923ca revert verbiage change as per IRL discussion with Carl 2016-07-27 15:49:48 -04:00
Ray Schamp
27a7b98ab9 Merge pull request #765 from rschamp/bugfix/752
Redesign invite step, add option to log out
2016-07-27 14:37:45 -04:00
Ray Schamp
89071b10d0 Lint 2016-07-27 14:12:55 -04:00
Ray Schamp
b35d7606f4 Merge pull request #766 from rschamp/bugfix/password-reset
Don't redirect to password reset on complete_registration
2016-07-27 10:28:11 -04:00
Ray Schamp
0b1f708400 Don't redirect to password reset on complete_registration 2016-07-27 10:27:31 -04:00
Ray Schamp
d1f73c3ef4 Redesign invite step, add option to log out
Resolves #752
2016-07-27 10:24:37 -04:00
Technoboy10
26d314a5c1 undo weird merge thing that happened a while back 2016-07-27 09:54:07 -04:00
Technoboy10
5e7bf85733 remove redundant media query from footer.scss 2016-07-27 09:48:07 -04:00
Ray Schamp
2b1cf25f88 Merge pull request #763 from rschamp/bugfix/3878
Redirect students that must reset their password
2016-07-27 09:35:19 -04:00
Technoboy10
0d2416c850 fix merge conflicts 2016-07-27 09:33:15 -04:00
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