Commit graph

1214 commits

Author SHA1 Message Date
Matthew Taylor
8ef3acd5d9 Merge pull request #560 from mewtaylor/issue/gh-556-footer
Fix GH-556: Add "For Developers" to the footer
2016-06-16 10:28:19 -04:00
Matthew Taylor
098bc8618a Merge pull request #577 from mewtaylor/issue/gh-573-grid-align
Fix GH-573: center align grid while left aligning projects
2016-06-16 10:24:53 -04:00
Matthew Taylor
b828200e94 add teacher faq page 2016-06-16 10:22:37 -04:00
Matthew Taylor
2ea2cfa6c5 Add "schools" section to faq 2016-06-15 15:22:41 -04:00
Ray Schamp
1fba322d01 Style pass 2016-06-15 15:08:56 -04:00
Matthew Taylor
ba5d8e0d63 Merge pull request #558 from mewtaylor/issue/gh-543-teacher-banner
Fix GH-543: Add teacher banner to splash page
2016-06-15 10:09:11 -04:00
Matthew Taylor
626b3f008e Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-543-teacher-banner
* 'develop' of https://github.com/LLK/scratch-www: (29 commits)
  Add explore redirects
  Allow access to 2014 and 2015 pages
  use route aliases for generalizable route patterns
  remove `/components` from `routes.json`
  Remove Make it Fly banner
  Fix issues in FAQ of /developers page.
  move shuffle to utility module
  fix error with shuffleArray function
  add shuffleArray function, shuffle most loved and most remixed
  use `image` to get studio thumbnail
  quick formatting fix for box header on search
  Fix merge issue
  Add localizations, minor style changes
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  ...

# Conflicts:
#	src/views/splash/splash.jsx
#	src/views/splash/splash.scss
2016-06-15 09:45:05 -04:00
Matthew Taylor
2f359c1d92 Merge pull request #576 from mewtaylor/issue/gh-574-explore-redirect
Fix GH-574: Add explore redirects
2016-06-15 09:36:51 -04:00
Matthew Taylor
2193914650 center align grid while left aligning projects
Fixes #573
2016-06-15 09:34:15 -04:00
Matthew Taylor
311f431ca1 Add explore redirects
for `/explore`, `/explore/projects` and `/explore/studios` to `/explore/<projects|studios>/all`
2016-06-15 08:19:27 -04:00
Ray Schamp
fb57c25afd Remove unused label component 2016-06-14 17:47:56 -04:00
Ray Schamp
333d52d2b6 Remove unused mixin factory 2016-06-14 17:41:12 -04:00
Ray Schamp
dffea48299 Fixup api refactor
Updates after a rebase
2016-06-14 17:33:54 -04:00
Ray Schamp
8da8ab4100 Add serverside username validation
With this we get cleanspeak for free
2016-06-14 17:29:31 -04:00
Ray Schamp
8dac67f292 L10n pass 2016-06-14 17:29:31 -04:00
Ray Schamp
97c4e9beb9 Explain the GeneralError component 2016-06-14 17:29:31 -04:00
Ray Schamp
f74a078afb Add help text when a field is not required
Most of our fields are required, so it makes more sense to display help when they are optional than to asterisk every required field
2016-06-14 17:29:31 -04:00
Ray Schamp
667ff08a36 L10n WIP 2016-06-14 17:29:31 -04:00
Ray Schamp
ce007d64f8 Change password confirmation to "show password" 2016-06-14 17:29:30 -04:00
Ray Schamp
4e0d54df98 Split up concerns of form progression and display
Still thinking of a good name for the form "card" component...
2016-06-14 17:29:30 -04:00
Ray Schamp
da2a4ce48c Add bot honeypot 2016-06-14 17:29:30 -04:00
Ray Schamp
cfa85427b1 Add address validation 2016-06-14 17:29:30 -04:00
Ray Schamp
f8037f6767 Lint 2016-06-14 17:29:30 -04:00
Ray Schamp
d7df1e980f Move api mixin to lib, remove mixin
The mixin doesn't gain us anything except complexity
2016-06-14 17:29:30 -04:00
Ray Schamp
56e16bc0dc Actually provide every state in world choice 2016-06-14 17:29:30 -04:00
Ray Schamp
0512b614be Fixup use iso 2016-06-14 17:29:29 -04:00
Ray Schamp
0206a4da9d Lint 2016-06-14 17:29:29 -04:00
Ray Schamp
f126a71336 Use iso-31660-2 package for country data 2016-06-14 17:29:29 -04:00
Ray Schamp
9da2bb29a8 Base phone and address country on user country 2016-06-14 17:29:29 -04:00
Ray Schamp
3ea1c64184 Split out steps from the view 2016-06-14 17:29:29 -04:00
Ray Schamp
0f3485534b Organize form data into objects 2016-06-14 17:29:29 -04:00
Ray Schamp
fe74208f32 Add international phone validation 2016-06-14 17:29:29 -04:00
Ray Schamp
bcda082014 Add validation to the rest of the form 2016-06-14 17:29:29 -04:00
Ray Schamp
175a71711d Update existing forms on the site to use formsy
Or not in the case of the search form
2016-06-14 17:29:29 -04:00
Ray Schamp
b5c615b1fa Use formsy-react for validation
Complete validation for username/password form (except for checking if a username exists).
2016-06-14 17:27:53 -04:00
Ray Schamp
de3151924c Lint 2016-06-14 17:27:53 -04:00
Ray Schamp
1eaf6effcc Tiny bit of style 2016-06-14 17:27:53 -04:00
Ray Schamp
04c8650512 Allow other types other than form in FormStep 2016-06-14 17:27:53 -04:00
Ray Schamp
2ca846f826 Use Scratch components for the form and clean up 2016-06-14 17:27:52 -04:00
Ray Schamp
350a573fc5 Move formset into forms 2016-06-14 17:27:52 -04:00
Ray Schamp
17a3f1ebcb Add initial form data 2016-06-14 17:27:52 -04:00
Ray Schamp
68d49a84dc Update FormSet to advance steps onSubmit 2016-06-14 17:27:52 -04:00
Ray Schamp
144d6e3754 wip 2016-06-14 17:27:52 -04:00
Ray Schamp
a080b2b64f wip 2016-06-14 17:27:52 -04:00
Matthew Taylor
55765551ae Merge pull request #570 from mewtaylor/bugfix/fastly-condition
Bugfix: shorten fastly condition
2016-06-14 13:16:52 -04:00
Matthew Taylor
60187d4a75 Allow access to 2014 and 2015 pages 2016-06-14 12:42:13 -04:00
Matthew Taylor
dfc4f9574d use route aliases for generalizable route patterns
1. match all `^/explore` to www
2. match all `^/search` to www
3. match all `^/conference` to www
2016-06-14 11:28:20 -04:00
Matthew Taylor
45d78b9c7c remove /components from routes.json
It's a dev-only route, and is in `dev-routes.json` already
2016-06-14 11:26:17 -04:00
The_Grits
1785c767b4 whoops 2016-06-13 15:37:31 -04:00
The_Grits
554dcb100c Fix gh-555: Squished News Icons 2016-06-13 15:06:41 -04:00