Commit graph

412 commits

Author SHA1 Message Date
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
Ray Schamp
c966f8a0ba Fix modal layout
The styles in the upgraded react-modal broke our centering.
The auto-focusing on the modal made an annoying blue border around it in Chrome.
2016-05-26 16:00:28 -04:00
Ray Schamp
fe08f8c18f Update final graphic 2016-05-26 14:38:56 -04:00
Ray Schamp
18bb2357c6 Update final copy and links 2016-05-26 14:10:59 -04:00
Ray Schamp
d1f675374b Localize banner 2016-05-24 17:30:48 -04:00
Ray Schamp
448bb8aa3f Add Power Puff Girls banner 2016-05-24 17:14:12 -04:00
Matthew Taylor
a860b27941 Some updates to the redux structure
1. split `auth.js` up so it's 1 reducer per file
2. consolidate the conference schedule reducers
3. make conference reducer names more descriptive
4. add error handling for `body === 'undefined'`

Thanks @rschamp for all the help!
2016-05-19 16:55:25 -04:00
Matthew Taylor
d69de477a1 Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/conference-schedule
* 'develop' of https://github.com/LLK/scratch-www: (32 commits)
  Lint
  Bundle all locale data
  Don't bundle polyfills
  Set up Raven within init.js
  Prefix privacyPolicy message string
  Exclude minified javascript from linting
  One space more
  Changes "interfacesto" to "interfaces to"
  Remove tag target
  Filter before mapping to avoid returning undefined
  Fix Pass condition for "static" routes
  Spacing2
  Mangling is the default
  Spacing
  Update for typography fixes
  Cherry pick PR #476 into master
  Add invisible spacer to anchored sections
  For Developers
  Lint JSON, expand and simplify lint step
  Fix banned user redirect
  ...

# Conflicts:
#	src/redux/actions.js
#	src/redux/reducer.js
2016-05-19 13:25:36 -04:00
Matthew Taylor
cad75217f0 Add schedule/detail components for conference 2016-05-19 11:34:59 -04:00
Matthew Taylor
b969c4e2ed Split reducers into separate files
Use a model of reducer/action files for each component that has them, and make `reducer.js` be the one that imports and configures all of them. This modeling is based on a few examples I've seen which seemed to work for our current case, but I'm totally fine with splitting actions and reducers into separate directories if we'd like too.
2016-05-19 11:34:28 -04:00
Ray Schamp
219d144be2 Prefix privacyPolicy message string
So that it matches the rest, and is localized. Not sure, but I think this was fallout from de-localizing the Privacy Policy page.
2016-05-17 21:01:49 -04:00
Rachel Thornton
dc42b317e2 Removed rows from grid, changed explore tabs
Grid component now no longer uses row concept, and changed tabs in the
Explore page to projects/studios, with categories in a new picker above
the tabs. Also compressed svg files.
2016-05-17 12:40:16 -04:00
Matthew Taylor
829cb6ff0c Merge pull request #478 from mewtaylor/issue/gh-419
Fix GH-419: Some localization cleanup
2016-05-17 11:43:27 -04:00
Ray Schamp
b7dd55e7e0 Merge branch 'feature/for-developers' into develop 2016-05-17 08:28:25 -04:00
carljbowman
e885c08ea1 For Developers
Add landing page for developers
2016-05-17 07:51:08 -04:00
Matthew Taylor
4abebd8194 Remove duplicate About Scratch entry
Towards #419 – makes "About Scratch" work on the About page. Additionally, removes `defaultMessages` from the footer since we no longer use those.
2016-05-16 10:19:52 -04:00
Matthew Taylor
804a65e3d0 Whoops
That change is coming later with more redux in conference :).
2016-05-12 18:39:33 -04:00
Matthew Taylor
82dbfabcec Constrain view styles to within view name classes
So that they don't affect styles declared outside the scope of the view. Thanks @rschamp!
2016-05-12 18:32:57 -04:00
Matthew Taylor
e1cebe46db Ergonomics – get rid of typography file
1. Merge typography into main
2. Get rid of use of `#view` in scss
3. Make `render` work with conference pages
2016-05-12 18:05:26 -04:00
The_Grits
8d294e4d29 Float 2016-05-11 09:53:39 -04:00
Rachel Thornton
4b632e4f5f Removed extraneous image file 2016-05-10 08:26:41 -04:00
Rachel Thornton
4a2a2c8ca2 Whitespace added 2016-05-10 08:22:48 -04:00
Rachel Thornton
9c6475aed5 Support for studios
Search and Explore now support studios, thought currently the api is
not ready for them.
2016-05-10 08:16:46 -04:00
Rachel Thornton
d7c9057cbd Refactoring, new grid component
Significant refactoring of Explore and Search pages, including new grid
component for displaying projects
2016-05-10 00:54:46 -04:00
The_Grits
75258be4a4 margin-right
4.4px is the max margin we can put to the right of the button without the "Forgot password?" text wrapping.
2016-05-09 11:27:22 -04:00
Rachel Thornton
fdd78a5433 Style changes
Changes to style for lint tests
2016-04-30 16:38:48 -04:00
Rachel Thornton
eb499c929c Changed path of search page to allow for studio tabs
Users and Forum tabs removed
2016-04-30 16:03:11 -04:00
Rachel Thornton
e2a7698cde Changes to path for search results
No longer uses google_results in url
Also now has correct link to project page from clicking on projects in
explore and search
2016-04-30 14:50:11 -04:00
Rachel Thornton
bca374b88f Merged changes to routing, separated Tabs into a component 2016-04-30 14:07:11 -04:00
Rachel Thornton
74a6d132bd Search page functions 2016-04-30 11:44:10 -04:00
Matthew Taylor
87009babae Merge pull request #431 from TheGrits/patch-6
Fix gh-426: Update Project Count
2016-04-29 16:38:02 -04:00
Matthew Taylor
cf71520875 final content update for conference
"coming soon" image for schedule, and schedule reference on landing page. Also background image for the landing page.
2016-04-27 23:23:43 -04:00
Matthew Taylor
7d7fb9797d Cleanup for scratch conference
1. s/collaborators/sponsors
2. open footer links in new window
3. remove superfluous require statement
4. increase spacing for scratch family links
2016-04-26 12:24:55 -04:00
The_Grits
e73d3fabcc All other references 2016-04-22 14:16:59 -04:00
Matthew Taylor
2eb62e8ab3 move component convention back to what it was
formerly presentation components such as `navigation` and `footer` have been nested, and renamed to `container` inside their respective component subdirs
2016-04-21 18:13:21 -04:00
Matthew Taylor
66113e1c58 Add conference sub-site 2016-04-21 16:22:39 -04:00
Matthew Taylor
017d58fb1b Split out footer container/presentation 2016-04-21 16:22:16 -04:00
Matthew Taylor
f05cb39501 Add flex-row component
Just a container with some default flexbox formatting.
2016-04-21 16:21:22 -04:00
Matthew Taylor
eed6f1fc08 Restructure src
1. Put formatting-specific components into the `presentation` subdir of `components`
2. Put content-specific components into the `container` subdir of `components`
3. Put views that are sub-urls of the site into a subdir of `views` (i.e. `microworlds`, and eventually `conference`)
2016-04-21 15:46:32 -04:00
Rachel Thornton
405f666109 Merge remote-tracking branch 'LLK/develop' into develop 2016-04-18 16:51:53 -04:00
Rachel Thornton
dfa7b9e582 Starting mock of search page 2016-04-18 16:51:45 -04:00
Rachel Thornton
8e6921cd82 Load button and tabs functioning
Users can now load more projects by clicking a button at the bottom of
the page, and check out different genres of project using the tabs.
2016-04-03 16:45:31 -04:00
Ray Schamp
c9157e70b9 Fix reference to session
Caused by merging an old branch which didn't have conflicts, but did have a different understanding of session.
2016-03-29 18:38:39 -04:00
Rachel Thornton
bfd3fac6a0 Merge remote-tracking branch 'LLK/develop' into develop
# Conflicts:
#	src/components/navigation/navigation.jsx
2016-03-26 21:15:36 -04:00
Ray Schamp
78649b69e2 Merge pull request #353 from morantsur/feature/microworlds
Moving Microworlds pages to scratch-www & adding arts
2016-03-25 15:43:10 -04:00
Ray Schamp
ea04658b4a Merge pull request #387 from rschamp/feature/scratchr2#2937-student-nav
Add "My Class" to student nav
2016-03-25 14:32:22 -04:00
Rachel Thornton
ff228e022c Merge remote-tracking branch 'LLK/develop' into develop 2016-03-25 11:35:47 -04:00
Ray Schamp
6e0d35efaa Fix incorrect nesting in search styles 2016-03-24 13:12:41 -04:00
Ray Schamp
74d23d05dc Remove inline default messages 2016-03-24 12:29:40 -04:00
Ray Schamp
2d6a38800b Add "My Class" to student nav 2016-03-24 12:28:32 -04:00
Ray Schamp
dce35a4bee Add keys to children where necessary 2016-03-24 11:29:26 -04:00
Rachel Thornton
d4277cabae Early Explore Page
Added an early prototype of the new Explore page
2016-03-24 10:16:53 -04:00
Ray Schamp
19f469db48 Upgrade and quiet sass-linter
These warnings were annoying me because the noise makes it easy to miss real issues.

The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks.  When the next release happens we should put that back.

https://github.com/sasstools/sass-lint/issues/307

Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors.
https://github.com/sasstools/sass-lint/issues/575

Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names.  It's a useful rule to keep class names consistent though.  Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70
2016-03-23 18:34:54 -04:00
Matthew Taylor
9a2a923b7b Remove projectCount from intro.jsx
thanks @rschamp!
2016-03-22 12:09:51 -04:00
Matthew Taylor
4914ba6d85 Use formatNumber to localize project count
`toLocaleString()` is not supported in Safari, but react-intl has a polyfill, and so it is. This also localized the intro description string, which wasn't previously. This also fixes #366 by doing as @rschamp suggested and checking if the count is the default count before setting the value.
2016-03-22 11:00:37 -04:00
Ray Schamp
7b72e6cdcd Fix lint errors 2016-03-18 12:40:30 -04:00
Ray Schamp
a5e336a175 Use redux for session handling 2016-03-18 11:51:22 -04:00
Ray Schamp
faabc63e65 Move component structure to one tree
Instead of inserting `Navigation` and `Footer` into every `render`ed component, just compose them in the views with a new `Page` component.
2016-03-18 10:54:26 -04:00
morant
99772ca41a * Fix alignment of Editor link in Microworlds.
* Remove fixed width from most components (replace with relative width).
2016-03-17 15:58:26 -04:00
morant
2e5a0e1439 Merge remote-tracking branch 'upstream/develop' into feature/microworlds
* Removed microwords from server/routes for now.

# Conflicts:
#	server/routes.json
#	src/components/thumbnail/thumbnail.jsx
2016-03-11 21:14:27 -05:00
morant
d735d38d91 * Fix aligning of thumbnails inside a NestedCarousel
* Remove links from thumbnail image
* Fix vertical aligning when a thumbnail has more than one line of text
2016-03-11 18:17:34 -05:00
Matthew Taylor
4a40482f74 Add tips to create link for logged out user
Fixes #374
2016-03-04 10:27:00 -05:00
morant
c7cc1b626f Revert "Revert "Fix review comments, and organize code a bit.""
This reverts commit e9cb08d273.
2016-02-19 15:11:23 -05:00
morant
e9cb08d273 Revert "Fix review comments, and organize code a bit."
This reverts commit 3d9d280bb9.
2016-02-19 14:39:43 -05:00
morant
3d9d280bb9 Fix review comments, and organize code a bit.
The only visible change should be that the tips thumbnails are no longer links.
2016-02-19 14:30:07 -05:00
Ray Schamp
fd584b1d67 Heed some SCSS warnings 2016-01-29 15:22:06 -05:00
Ray Schamp
f90198d7c3 Fix tall carousel
I am mystified by how this changed. But this fixes #345.
2016-01-29 15:22:02 -05:00
morant
7c411845c2 Remove addition to HREF 2016-01-29 12:29:17 -05:00
Matthew Taylor
c46e42e83c fix test 2016-01-25 09:07:55 -05:00
Matthew Taylor
581f071c0e Add missing alt tags 2016-01-25 08:30:10 -05:00
Matthew Taylor
2e79a5aa6b Merge pull request #323 from mewtaylor/bugfix/readme-update
Added some more documentation
2016-01-19 16:11:49 -05:00
morant
6e682269fb Align tips slider with the rest of the studios 2016-01-15 12:23:39 -05:00
morant
f7fe1125c8 fix play button positioning 2016-01-15 11:40:21 -05:00
Matthew Taylor
5e055fb6ea Merge pull request #321 from mewtaylor/issue/scratchr2-3245-logout-post
Change logout to do a POST request
2016-01-15 11:23:44 -05:00
Matthew Taylor
dddc867c1e Merge pull request #319 from mewtaylor/feature/gh-288-accessibility
GH-288: accessibility
2016-01-14 10:27:29 -05:00
Matthew Taylor
112cad14e3 Added some more documentation 2016-01-14 10:25:03 -05:00
Matthew Taylor
9e58efc7e2 Merge pull request #305 from mewtaylor/feature/266-componentize-locale-strings
GH-266: view-ify locale strings
2016-01-14 10:10:02 -05:00
Matthew Taylor
98d0f0de6e Updates based on feedback
1. changes intl filenames to `[view].intl.js`
2. Move nav/footer rendering to `render.jsx`
3. Set locale cookie before submitting language change form

Thanks @thisandagain !
2016-01-14 08:32:43 -05:00
morant
d002e0c63a Turn microworld to a component, and create paths to all three microworlds 2016-01-13 14:21:59 -05:00
Matthew Taylor
a15842a582 Add back in the session refresh
Thanks @thisandagain!
2016-01-13 13:36:36 -05:00
Matthew Taylor
31d4173ef5 Change logout to do a POST request 2016-01-13 11:36:04 -05:00
Matthew Taylor
2ac3e5337f Add alternative labels for input and links
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01
2016-01-12 13:27:36 -05:00
Matthew Taylor
01975b7e4d Add alt attribute to image tags
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02
2016-01-12 13:27:09 -05:00
Matthew Taylor
4821383d00 Merge pull request #315 from mewtaylor/issue/gh-289-overlapping-text
Fix GH-289: Allow white space to wrap in welcome text
2016-01-12 10:30:02 -05:00
Andrew Sliwinski
3721ecfd14 Fix error in parsing count from updated API route. Re: GH-316 2016-01-11 19:10:38 -05:00
Matthew Taylor
c88fc6f27d Make general nowrap more specific to paragraphs
And remove the overrides that were already there. ht @rschamp and @carljbowman!
2016-01-11 14:58:55 -05:00
Andrew Sliwinski
86c93df740 Migrate to new API route for message count. Resolves GH-316 Resolves GH-95 2016-01-11 14:13:34 -05:00
Matthew Taylor
d578d4a800 Allow white space to wrap in welcome text
It's in an href, so override the default and include wrapping. Fixes #289.
2016-01-11 09:11:13 -05:00
morant
6aa93b1711 Error Handling - when a component isn't declared, don't show it. 2016-01-08 18:35:17 -05:00
morant
5c919506cf Add tips 2016-01-08 14:42:35 -05:00
Matthew Taylor
398f9cb95a Move component strings into views
Handle localization and string loading in views only. Components should just of default text, but not the actual text for the page itself – all text handling should be at the view level.
2016-01-07 10:11:03 -05:00
morant
77a4bd2d10 adding tips to the microworld 2015-12-21 13:30:22 -05:00
Matthew Taylor
1c802f9230 Some translations cleanup
A couple missing translations
2015-12-09 14:03:30 -05:00
Andrew Sliwinski
66d9c390fe Change 'View All' link in news component to redirect towards announcements. Resolves GH-280 2015-12-08 14:05:03 -05:00
Ray Schamp
961d97eb67 Use FormattedMessage for My Classes text
I had matched it to My Stuff, but that's different since the top nav needs the text for a title attribute. h/t @mewtaylor
2015-11-30 16:25:11 -05:00
morant
bd1319edff Add interactive design studio, and make studios show arts projects.
Also many design changes.
2015-11-29 09:32:01 -05:00
Ray Schamp
9c6cf5f449 Fix GH-237: Show My Classes in nav to educators 2015-11-26 12:08:28 -08:00
Matthew Taylor
15641ee244 scratch foundation, not code to learn 2015-11-13 10:07:28 -05:00
Ray Schamp
7ed45cb5dd Stop spinner and display XHR errors if they occur
Resolves GH-232
2015-11-12 12:49:40 -05:00
Ray Schamp
7c0363e99b Merge pull request #211 from rschamp/bugfix/GH-195
Fix GH-195: Use a spinner component to convey activity while logging in
2015-11-11 11:11:02 -05:00
Ray Schamp
a8a05c4fdc Merge pull request #220 from rschamp/bugfix/activity-key-warnings
Quiet warnings about keys in Activity component
2015-11-10 14:55:02 -05:00
Ray Schamp
5dc6cd220d Quiet warnings about keys in Activity component 2015-11-06 11:36:35 -05:00
Andrew Sliwinski
35a3e4c192 Merge pull request #216 from rschamp/bugfix/GH-128
Fix GH-128: Use table layout in IE 9 for navigation and homepage
2015-11-06 10:14:22 -05:00