scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-03 12:27:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1268 commits 216 branches 1 tag 484 MiB
Commit graph

414 commits

Author SHA1 Message Date
Ray Schamp
c25852b3c6 Merge pull request #657 from rschamp/bugfix/645 
Revalidate address step after invalid submissions
 2016-07-01 13:48:13 -04:00
Ray Schamp
a56f994886 Revalidate address step after invalid submissions 
I don't like that the state is being set to a calculation of existing props. When I did that calculation in `render`, it didn't update when fields were changed.

Fixes #645
 2016-07-01 11:43:18 -04:00
Technoboy10
2206cb97f6 message icon tweak 2016-06-30 19:17:53 -04:00
Technoboy10
42c000d14f orangify this 2016-06-30 18:06:17 -04:00
Matthew Taylor
6db426a586 Use empty default object 
Looks as if the having one of these objects as the default causes overwriting in some way, as opposed to augmentation. Have the source object be an empty one, so that it gets the attributes of both defaults and props. Fixes #642.
 2016-06-30 16:52:46 -04:00
Ray Schamp
5b288e4d3e Merge pull request #648 from rschamp/feature/username-clarity 
Clarify username field is not for logging in
 2016-06-30 16:17:14 -04:00
Ray Schamp
0816b0ec0f Clarify username field is not for logging in 2016-06-30 16:16:31 -04:00
Ray Schamp
554e21cd15 Fix localization of address validation message 
Fixes #608
 2016-06-30 15:54:32 -04:00
Matthew Taylor
f2b8e9025d switch ordering in defaults 
This was assigning `props` to defaults, rather than the other way around. Fixes #618.
 2016-06-30 08:00:40 -04:00
Matthew Taylor
b874d05bda Override devault input style for login 
so that it looks like it used to, and not to tall. Fixes #618.
 2016-06-29 14:54:00 -04:00
Connor Hudson
9bafdf6067 Merge pull request #619 from technoboy10/darken-dropdown 
Darken Account Nav Link when Menu Open
 2016-06-29 13:31:27 -04:00
Technoboy10
41d9b1f526 use classNames before return 2016-06-29 13:24:37 -04:00
Matthew Taylor
8f60b020cb fix educator faq link 
`info` is not in there anymore
 2016-06-29 12:35:53 -04:00
Matthew Taylor
19bbd5ae7b Link icon to splash page 
fixes #623
 2016-06-29 10:53:55 -04:00
Connor Hudson
221170a9ff Merge pull request #616 from technoboy10/gh537-dropdown-gap 
Fix GH-537: Logged-in user dropdown gap
 2016-06-29 08:58:16 -04:00
Technoboy10
52d834c3fa darken account nav link when menu open 2016-06-28 21:10:33 -04:00
Matthew Taylor
7bb52c25fe move permissions checks to mirror session more 
thanks @rschamp!
 2016-06-28 14:25:11 -04:00
Technoboy10
c4a98c5571 close gap, use border-box for box-sizing 2016-06-28 13:50:58 -04:00
Matthew Taylor
91de6f7912 Merge pull request #614 from mewtaylor/issue/gh-611-teacher-banner 
Fix GH-611: Connect `TeacherBanner` to redux
 2016-06-27 22:40:13 -04:00
Technoboy10
5f62e5ffaf scoping tweak 2016-06-24 11:42:35 -04:00
Matthew Taylor
c4a365a0e8 Connect TeacherBanner to redux 
whoops! Thanks @rschamp. Fixes #611
 2016-06-24 11:40:50 -04:00
Technoboy10
172dd3cd62 set the size of the language chooser 2016-06-24 11:34:11 -04:00
Matthew Taylor
ef881a07f9 Merge pull request #610 from mewtaylor/cleanup/teacher-styling 
styling cleanup for teacher registration
 2016-06-24 11:25:25 -04:00
Matthew Taylor
97516b1e1d styling cleanup for teacher registration 
some scoping, as well as class labeling
 2016-06-24 11:19:41 -04:00
Technoboy10
93054cf393 change from defaultValue to value because of formsy 2016-06-24 11:13:05 -04:00
Matthew Taylor
92883d3cbe swap logos in conference footer 2016-06-23 22:46:11 -04:00
Matthew Taylor
e71aff5df1 Merge pull request #594 from St19Galla/develop 
Navbar issues; :hover
 2016-06-23 17:20:44 -04:00
St19_Galla
49f6a6bee2 Update navigation.scss 
Changed padding rather than height
 2016-06-23 17:06:40 -04:00
Matthew Taylor
0c1abada3a Small tweaks 
1. left-align form elements even in mobile
2. Bolden input labels, except for checkboxes and radio elements

/cc @carljbowman
 2016-06-23 15:44:14 -04:00
Matthew Taylor
86a8f94919 some code formatting tweaks 2016-06-23 15:10:51 -04:00
Matthew Taylor
f00aedd17e linter error 2016-06-23 14:27:42 -04:00
Matthew Taylor
1a08e7ae49 Finalize styling for registration flow 
/cc @carljbowman

One issue we ran into is that our `frameless` configuration is in `em` rather than `rem`, making it difficult to have an aboslute grid applied uniformly at all hierarchies. For now, we're using straight `rem` calculations instead of `$cols{1,8}` in the styling until we can refactor `frameless` to use `em`.
 2016-06-23 14:06:36 -04:00
Matthew Taylor
1910d38bc6 Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow 
* 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www:
  Add teacher waiting room view
  Only pass necessary props to steps

# Conflicts:
#	src/components/registration/steps.jsx
#	src/views/teacherregistration/teacherregistration.jsx
 2016-06-23 07:35:06 -04:00
Matthew Taylor
8fb16bf397 Add formatting for teacher reg flow 2016-06-23 07:27:43 -04:00
Ray Schamp
93ed60cd0d Add teacher waiting room view 2016-06-22 13:35:38 -04:00
St19_Galla
ab2dc47921 Update navigation.scss 2016-06-22 11:22:30 -04:00
Matthew Taylor
9d6fb63d18 Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow 
* 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: (46 commits)
  Add serverside email validation
  Clean up
  Move registration step to main component
  Submit the rest of the fields when registering
  This help text is redundant now
  Fix organization "other" field enablement
  Get the form creating regular accounts
  Add method to api for submitting forms
  Update language chooser for formsy
  Add missing string
  Add progress indicators
  Style pass
  Remove unused label component
  Remove unused mixin factory
  Fixup api refactor
  Add serverside username validation
  L10n pass
  Explain the GeneralError component
  Add help text when a field is not required
  L10n WIP
  ...

# Conflicts:
#	src/l10n.json
#	src/views/splash/splash.jsx
 2016-06-17 15:32:49 -04:00
Matthew Taylor
32e9b089c5 updates to the conference site 
1. new collaborators
2. new sold out language
3. some copy edits
 2016-06-16 17:07:22 -04:00
Ray Schamp
d27b0a2433 Update language chooser for formsy 2016-06-16 16:31:13 -04:00
Ray Schamp
e062096445 Add progress indicators 2016-06-16 10:54:36 -04:00
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
Ray Schamp
1fba322d01 Style pass 2016-06-15 15:08:56 -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
2193914650 center align grid while left aligning projects 
Fixes #573
 2016-06-15 09:34:15 -04:00
Ray Schamp
fb57c25afd Remove unused label component 2016-06-14 17:47:56 -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
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
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
0206a4da9d Lint 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
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
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
Ray Schamp
01b662f77f Merge pull request #567 from rschamp/hotfix/remove-banner 
[Develop] Remove Make it Fly banner
 2016-06-13 14:43:37 -04:00
Ray Schamp
e2dcd6c647 Remove Make it Fly banner 
This reverts commit 7cf3846231, reversing
changes made to afe14ebe88.
 2016-06-13 14:35:08 -04:00
Matthew Taylor
e04b314656 remove dashes 
Thanks @rschamp!
 2016-06-13 10:07:00 -04:00
Matthew Taylor
0c2a73a910 Don't use dash in name 
It's used for grouping in `build-locales`.
 2016-06-13 09:41:12 -04:00
Matthew Taylor
e5f274933b Add final copy for teacher account banner 2016-06-13 07:47:43 -04:00
Matthew Taylor
e5467e5f45 Add "For Developers" to the footer 
Fixes #556
 2016-06-09 11:54:14 -04:00
Matthew Taylor
ef0037942e use image to get studio thumbnail 
same as with `project`
 2016-06-09 09:44:09 -04:00
Matthew Taylor
b065ed5254 quick formatting fix for box header on search 2016-06-09 07:57:41 -04:00
Matthew Taylor
365c3d0bad Fix merge issue 2016-06-09 07:44:28 -04:00
Matthew Taylor
9fad938eb8 Add localizations, minor style changes 2016-06-09 07:32:25 -04:00
Matthew Taylor
ac17850491 Add teacher banner to splash page 
This only shows if the logged in user is a teacher, and persists for teachers.
 2016-06-08 13:47:11 -04:00
Matthew Taylor
0894724dfd Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn 
* 'develop' of https://github.com/rthorn/scratch-www:
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  Changed path of search page to allow for studio tabs
  Changes to path for search results
  Removed unnecessary files
  Search page functions
  Starting mock of search page
  Fixed problem with loading
  Load button and tabs functioning
  Merge remote-tracking branch 'LLK/develop' into develop
  Early Explore Page

# Conflicts:
#	src/components/navigation/www/navigation.jsx
 2016-06-07 09:06:01 -04:00
Matthew Taylor
bf1fa2934d Merge pull request #552 from mewtaylor/bugfix/mobile-nav-conference 
[Develop] hotfix: mobile nav conference
 2016-06-06 11:01:12 -04:00
Matthew Taylor
fce41dc32e use row wrap instead of columns 
apparently mobile doesn't like columns as much as row wrap for flexbox.
 2016-06-06 08:29:51 -04:00
Connor Hudson
245c9cbe4f Merge pull request #542 from technoboy10/gh307-newstatic 
Fix GH-307: Restyle FAQ and legal pages
 2016-06-03 14:31:08 -04:00
Technoboy10
acea4f4df1 move imports into .information-page 2016-06-03 14:16:17 -04:00
Technoboy10
fea1fc611f restrict styles to only informationpage element 2016-06-03 14:14:45 -04:00
Technoboy10
9853f5ba5a Move all styling into the InformationPage component 2016-06-03 14:02:29 -04:00
Connor Hudson
f280d1d8df Remove quotes around keys, results -> session 2016-06-01 17:22:11 -04:00
Connor Hudson
fd1401fe1b used stricter comparison 2016-06-01 16:14:58 -04:00
Connor Hudson
4d65d478ed change to more extensible session 2016-06-01 15:28:18 -04:00
Connor Hudson
1178a50beb restyle all the things 2016-06-01 11:57:50 -04:00
Connor Hudson
e402363576 initial pass 2016-05-31 16:37:42 -04:00
Ray Schamp
7fb512f4a8 Merge pull request #531 from rschamp/feature/cn-banner 
[Develop] Homepage module
 2016-05-31 12:25:16 -04:00
Ray Schamp
3632f3dc1d Merge branch 'release/2.2.9' into develop 2016-05-31 12:24:21 -04:00
Ray Schamp
7cf3846231 Merge pull request #530 from rschamp/feature/cn-banner 
[Master] Homepage module
 2016-05-31 10:18:20 -04:00
Ray Schamp
89bdeff631 Don't break up navigation on mobile 2016-05-31 09:32:04 -04:00
Matthew Taylor
932dab40c7 Some additional mobile changes 2016-05-29 11:59:53 -04:00
Matthew Taylor
6eeebe05c3 Merge pull request #525 from mewtaylor/issue/conference-tweaks 
For GH-497: conference tweaks for fallout from schedule/typography
 2016-05-27 16:40:39 -04:00
Matthew Taylor
c351d54e9b fix lint warning 
thanks @rschamp!
 2016-05-27 16:02:38 -04:00
Matthew Taylor
74ac6e52bb conference formatting tweaks for mobile 
thanks @carljbowman!
 2016-05-27 15:55:27 -04:00
Ray Schamp
992f6d7481 Update footer and nav styles per @carljbowman 2016-05-27 12:02:22 -04:00
Ray Schamp
986341341b Fix line height and wrapping on splash components 2016-05-27 11:46:35 -04:00
Ray Schamp
2a01ebee84 Fix search button display 
Update search form submit button from an input[type=submit] to a button.  React 15 omits the value prop if it's blank, so the `<input type="submit" value="">` was rendered as `<input type="submit">`. This caused the input to display the default value of "Submit".  The button element is more appropriate for this behavior and doesn't have the missing value issue.
 2016-05-26 16:00:28 -04:00