scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-04 12:51:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1635 commits 216 branches 1 tag 485 MiB
Commit graph

588 commits

Author SHA1 Message Date
Matthew Taylor
9a037fda81 don't use let yet for variable definitions 
Fixes #670
 2016-07-05 14:21:40 -04:00
Matthew Taylor
aa3cbe552a Make category options into key/value 
so that we can store the query string with the tab name, since it's not the same in every instance. fixes #666, and makes a couple other style tweaks.
 2016-07-05 13:38:51 -04:00
Ray Schamp
7fe82c11be Get rid of most splash warnings in development 2016-07-03 14:49:01 -04:00
Technoboy10
5e5c2a4f9d Remove z-index as it wasn't needed 2016-06-30 16:46:44 -04:00
Connor Hudson
7f3af0f8be Merge pull request #639 from technoboy10/gh637-relativepaths 
Fix GH-637: Make links to help and tips window relative
 2016-06-30 15:57:43 -04:00
Ray Schamp
a0a82ef5a7 Merge pull request #646 from rschamp/bugfix/608 
Fix localization of address validation message
 2016-06-30 15:55:26 -04:00
Ray Schamp
554e21cd15 Fix localization of address validation message 
Fixes #608
 2016-06-30 15:54:32 -04:00
Matthew Taylor
2017e1573d point landing page to teacher faq page 
Fixes #636
 2016-06-30 13:37:12 -04:00
Technoboy10
b5bf0298d7 Make s.m.e links relative 2016-06-30 10:06:10 -04:00
Technoboy10
088eb7cc66 inherit width on iframe 2016-06-30 09:46:39 -04:00
Technoboy10
b0f0bce211 enable fullscreen, fix border radius and aspect ratio 2016-06-30 09:43:24 -04:00
Matthew Taylor
9fb6170569 style error-step like last-step 
Since they're both mostly info cards. Fixes #627.
 2016-06-29 14:08:16 -04:00
Connor Hudson
42ccc6c0a0 Merge pull request #622 from technoboy10/gh620-coming-soon 
Fix GH-620: Replace "Request account" with "Coming Soon"
 2016-06-29 10:41:28 -04:00
Technoboy10
ce4069fdb1 tweak padding 2016-06-29 09:56:15 -04:00
Technoboy10
db039739dd change request account button to coming soon 2016-06-29 09:51:23 -04:00
Matthew Taylor
7bb52c25fe move permissions checks to mirror session more 
thanks @rschamp!
 2016-06-28 14:25:11 -04:00
Matthew Taylor
f2310170b2 Add permissions dispatch for WillReceiveProps 
We still need `componentWillMount` to handle the initial render for a logged in teacher first visting the page. Fixes issue in which a teacher would not see the banner immediately after dynamic login.
 2016-06-28 13:30:36 -04:00
Matthew Taylor
16fe86b2fd Fix scratch ed links 
they are not domain agnostic. fyi @rschamp
 2016-06-28 08:35:01 -04:00
Matthew Taylor
c5f85022f3 Copy edits for conference site 2016-06-28 07:51:49 -04:00
Connor Hudson
5724a4c609 Merge pull request #606 from technoboy10/gh604-localize-educator-landing 
Fix GH-604: Localize Educator Landing Page
 2016-06-24 10:51:34 -04:00
Technoboy10
0277b96698 move teacher accounts string to general 2016-06-24 10:39:55 -04:00
Technoboy10
3d18f04a43 localize educator landing page 2016-06-24 10:05:44 -04:00
Matthew Taylor
633fee162a Merge pull request #603 from TheGrits/patch-2 
Fix gh-602: Remove Community Counselor
 2016-06-24 08:58:10 -04:00
Connor Hudson
5cb46b1579 Merge pull request #601 from technoboy10/educator-landing 
Fix GH-311: Educator landing page
 2016-06-24 08:21:02 -04:00
Matthew Taylor
ebf45c6f1d Fix linting errors 
Signed-off-by: Connor Hudson <technoboy10@fake.email>
 2016-06-24 08:13:32 -04:00
The_Grits
f233f660b0 Fix gh-602: Remove Community Counselor 2016-06-23 18:28:24 -04:00
Connor Hudson
53eb56c1df style tweaks 2016-06-23 17:23:35 -04:00
Matthew Taylor
74bd2b3255 Merge pull request #599 from mewtaylor/feature/teacher-registration-flow 
[Updates] Teacher registration flow
 2016-06-23 16:48:58 -04:00
Connor Hudson
7de13d029b get rid of carousel, make things centered if they need it 2016-06-23 15:46:02 -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
6aeee284bc style waiting room 
also "deep purple" :)
 2016-06-23 15:25:22 -04:00
Matthew Taylor
10f154ca10 accidentally took this out 2016-06-23 15:10:41 -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
Connor Hudson
6d3d8b7446 more styling 2016-06-23 13:48:18 -04:00
Connor Hudson
c52a6e16e9 attempted mobile styling 2016-06-23 13:18:45 -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
Connor Hudson
3624e18e08 inherit line height, remove margin 2016-06-22 16:58:58 -04:00
Connor Hudson
230cadffa5 more styling, carousel 2016-06-22 16:48:58 -04:00
Ray Schamp
93ed60cd0d Add teacher waiting room view 2016-06-22 13:35:38 -04:00
Connor Hudson
9c14f7cb3f create landing page 2016-06-22 13:18:19 -04:00
Ray Schamp
de8ac6c56a Only pass necessary props to steps 
Rather than lazily including all form progress to every step, just give each step what it needs.
 2016-06-21 18:45:41 -04:00
carljbowman
ee8d6bf0c5 Update Jobs page 
- Add 'Web Designer' position
- Adjusted typography to match new Type Standards
- Add Hex Value to Colors for consistency
 2016-06-21 15:00:51 -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
Connor Hudson
5d12e5773d Merge pull request #584 from technoboy10/gh554-localize-faq 
Fix GH-554: Localize FAQ title
 2016-06-17 14:47:46 -04:00
Matthew Taylor
b337b47590 Merge pull request #586 from mewtaylor/issue/conference-updates 
Fix GH-[571,563] – updates to the conference site
 2016-06-17 14:14:53 -04:00
Ray Schamp
bf76e88ca2 Add serverside email validation 2016-06-17 13:01:53 -04:00
Ray Schamp
11b9876930 Clean up 2016-06-17 12:22:29 -04:00
Ray Schamp
078463ac25 Move registration step to main component 
Add a placeholder error step
 2016-06-17 12:22:11 -04:00
Ray Schamp
8646bd84b3 Submit the rest of the fields when registering 2016-06-17 11:01:34 -04:00
Ray Schamp
532a1cce57 This help text is redundant now 2016-06-17 11:01:10 -04:00
Ray Schamp
ad5da0f543 Fix organization "other" field enablement 2016-06-17 11:00:48 -04:00
Matthew Taylor
f0b178c290 Merge pull request #583 from mewtaylor/issue/gh-541-faq-schools 
Fix GH-541: Add "schools" section to faq
 2016-06-17 09:39:41 -04:00
Ray Schamp
d7ca0166ab Get the form creating regular accounts 2016-06-16 17:25:14 -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
Connor Hudson
1e571d0e2d localize FAQ title 2016-06-16 15:11:43 -04:00
Matthew Taylor
f5cbdfa2c9 Merge pull request #582 from mewtaylor/issue/teacher-faq 
Add teacher faq page
 2016-06-16 11:31:29 -04:00
Connor Hudson
c188a268e2 Merge pull request #568 from TheGrits/patch-1 
Fix gh-555: Squished News Icons
 2016-06-16 11:17:44 -04:00
Ray Schamp
e062096445 Add progress indicators 2016-06-16 10:54:36 -04:00
Matthew Taylor
b13a388425 Fix typo 
thanks @technoboy10!
 2016-06-16 10:54:35 -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
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
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
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
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
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
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
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
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
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
Andrew Sliwinski
e05572dc0a Fix issues in FAQ of /developers page. 2016-06-13 11:38:11 -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
Connor Hudson
fde193ca06 move shuffle to utility module 2016-06-13 09:40:32 -04:00
Matthew Taylor
e5f274933b Add final copy for teacher account banner 2016-06-13 07:47:43 -04:00
Connor Hudson
3d6a95e84b fix error with shuffleArray function 2016-06-09 17:33:49 -04:00
Connor Hudson
04166ab423 add shuffleArray function, shuffle most loved and most remixed 2016-06-09 17:22:31 -04:00
Matthew Taylor
b065ed5254 quick formatting fix for box header on search 2016-06-09 07:57:41 -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
fb4464d0d4 Correction for Nichole Pinkard's name on /expect 
Apologies for the copy error!
 2016-06-06 08:32:48 -04:00
Connor Hudson
5bd1f4f2ac add container div to fix dmca 2016-06-03 15:02:55 -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
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
00ac15d475 add test, tweak terms 2016-06-01 12:05:03 -04:00
Connor Hudson
1178a50beb restyle all the things 2016-06-01 11:57:50 -04:00
Connor Hudson
10a4dc656e fix travis 2016-06-01 10:49:59 -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
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
ad1e723188 Drop the text below the button 
thanks @carljbowman!
 2016-05-27 16:35:23 -04:00
Matthew Taylor
011032308c Consolidate text 
thanks @carljbowman !
 2016-05-27 16:19:51 -04:00
Matthew Taylor
74ac6e52bb conference formatting tweaks for mobile 
thanks @carljbowman!
 2016-05-27 15:55:27 -04:00
Matthew Taylor
b07b61c925 Update conference to reflect being sold out 2016-05-27 15:55:08 -04:00
Ray Schamp
45abaff962 Fix account links on Privacy Policy page 2016-05-27 14:33:12 -04:00
The_Grits
4f75713bd5 Update privacypolicy.jsx 2016-05-27 09:56:56 -04:00
Connor Hudson
a4f15f4ec8 Merge pull request #510 from technoboy10/gh507-scheduleanchor 
Fix gh-507: Consistently change URI
 2016-05-26 16:59:44 -04:00
Connor Hudson
59f4d303c6 Merge pull request #512 from TheGrits/patch-1 
Fix gh-29: Migrate Terms of Use
 2016-05-26 16:15:21 -04:00
The_Grits
f3fafb7b3a Rename and Update 2016-05-26 11:31:16 -04:00
The_Grits
9bd63bd11a Spacing 2016-05-26 11:23:17 -04:00
Ray Schamp
448bb8aa3f Add Power Puff Girls banner 2016-05-24 17:14:12 -04:00
Matthew Taylor
87ce6db1cd generalize pdf check 
thanks @rschamp! fyi, I left it in cards only because I'm not sure that we really do this `(English)` thing anywhere else.
 2016-05-24 14:27:16 -04:00
Matthew Taylor
ffc1e8d0ca Fix pdf localization check 
It was adding the `(English)` suffix no matter what. This fixes it by getting the locale from props, and also by making the conditional check a bit more safe.
 2016-05-24 13:09:34 -04:00
The_Grits
7948c8bbc4 Hello Travis 2016-05-24 10:21:19 -04:00
The_Grits
ac96ffc6f6 Squash and Merge 2016-05-24 10:05:17 -04:00
Connor Hudson
e73b26b686 fix spacing issues 
Fixes Travis testing
 2016-05-23 15:35:05 -04:00
Technoboy10
a3fda6be30 use single quotes to appease travis 2016-05-23 14:28:34 -04:00
Technoboy10
6bddc8d2d3 replace anchor when schedule day clicked 2016-05-23 14:10:09 -04:00
Technoboy10
0b6b81e1f1 Merge branch 'release/2.2.9' of https://github.com/llk/scratch-www into release/2.2.9 2016-05-23 10:48:29 -04:00
Technoboy10
b020964ef4 add media query to center links 2016-05-23 10:48:11 -04:00
Technoboy10
7bb9c622c7 set time headers to correct color 2016-05-23 10:10:31 -04:00
Matthew Taylor
a477be4814 Some more cleanup 
1. typo with splitting token/session out
2. redefine `chunk` as `timeSlot`
3. move timeSlot sorting into its own method
 2016-05-19 17:37:51 -04:00
Matthew Taylor
337b6dcfca fix lint warnings 2016-05-19 17:02:21 -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
bca90bd835 Add icons for schedule/details 
from @carljbowman
 2016-05-19 16:40:30 -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
4017266327 Fix typo 2016-05-19 11:26:11 -04:00
Ray Schamp
bb0ac87aec Merge pull request #488 from TheGrits/patch-1 
[Privacy Policy] One space more
 2016-05-17 16:26:50 -04:00
Ray Schamp
dff9c3d128 Merge pull request #489 from technoboy10/patch-3 
Hotfix: Resolve gh-484 (cosmetic issue in developers page)
 2016-05-17 16:24:17 -04:00
The_Grits
2d80c46c74 One space more 
I can't believe I missed this one earlier. *facepalm*
 2016-05-17 15:46:20 -04:00
Connor Hudson
9808a31d9a Changes "interfacesto" to "interfaces to" 2016-05-17 13:07:19 -06: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
Ray Schamp
0ede616f44 Merge pull request #481 from TheGrits/patch-2 
Fix Spacing Issues on Privacy Policy
 2016-05-17 11:03:11 -04:00
The_Grits
792a5c9622 Spacing2 
Changed as per @rschamp's comments
 2016-05-17 11:02:34 -04:00
The_Grits
834f2db463 Spacing 
I noticed some spacing issues on the page, I thought I would fix them.
 2016-05-17 09:52:42 -04:00
Ray Schamp
6b420b4445 Update for typography fixes 2016-05-17 08:30:27 -04:00
Ray Schamp
b7dd55e7e0 Merge branch 'feature/for-developers' into develop 2016-05-17 08:28:25 -04:00
Matthew Taylor
89c2f2628e Add invisible spacer to anchored sections 
so that the headers are visible
 2016-05-17 08:24:03 -04:00
carljbowman
e885c08ea1 For Developers 
Add landing page for developers
 2016-05-17 07:51:08 -04:00
The_Grits
76c003d854 Lint fixes 2016-05-16 06:45:06 -04:00
The_Grits
5d05d19566 aha 
Does this fix the lint error?
 2016-05-14 23:21:10 -04:00
The_Grits
c2fca9c4c6 Squash and Merge 2016-05-14 22:39:40 -04:00
Matthew Taylor
bf1b3f894d Some leftovers 
Thanks @rschamp again!
 2016-05-12 22:54:07 -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
Rachel Thornton
577ed2c746 Small fix 2016-05-10 08:18:47 -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
Matthew Taylor
fd1016059b Merge branch 'patch-8' of https://github.com/TheGrits/scratch-www into TheGrits-patch-8 
* 'patch-8' of https://github.com/TheGrits/scratch-www:
  Indent p element
  Edit spacing
  Whoops
  Squash and Merge
  Add DMCA route

# Conflicts:
#	src/routes.json
 2016-05-03 10:23:34 -04:00
Matthew Taylor
47d7257895 Merge pull request #462 from mewtaylor/hotfix/add-register-faq 
[Develop] Hotfix: Add Registration to FAQ
 2016-05-01 12:48:41 -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
c28f90857b Add registration faq question 2016-04-29 17:37:41 -04:00
Matthew Taylor
07bbc38822 Merge pull request #433 from TheGrits/patch-7 
Fix gh-19: Migrate Community Guidelines
 2016-04-29 17:32:35 -04:00
The_Grits
20dcf8eb4f switch 2016-04-29 17:27:39 -04:00
The_Grits
64143704d5 Thanks Travis 
Got rid of a trailing space
 2016-04-29 17:22:49 -04:00
The_Grits
aaf4ee5b49 oops lol 
Gotta love those duplicate lines!
 2016-04-29 17:18:09 -04:00
The_Grits
09775ad4a5 Squash and Merge 2016-04-29 17:15:26 -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
The_Grits
9ae31c132f Indent p element 2016-04-28 09:18:26 -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
df8c036daf Edit spacing 
As per @mewtaylor 's suggestions on #435
 2016-04-26 09:09:07 -04:00
Matthew Taylor
a4e19a5edc Temporarily remove "View Full Schedule" link 
Since we don't have one yet
 2016-04-25 17:39:31 -04:00
The_Grits
c657a4b5f9 Squash and Merge 2016-04-25 07:52:20 -04:00
The_Grits
117eed5eb3 Squash and Merge 2016-04-23 14:27:08 -04:00
The_Grits
e73d3fabcc All other references 2016-04-22 14:16:59 -04:00
The_Grits
123b366180 13mil -> 14mil 2016-04-22 14:11:25 -04:00
Matthew Taylor
3c487163a0 Last minute copy updates 2016-04-22 09:07:32 -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
f05cb39501 Add flex-row component 
Just a container with some default flexbox formatting.
 2016-04-21 16:21:22 -04:00
Matthew Taylor
3c8a7db834 Take margins out of typography 
They won't be the same margins for text-heavy and text-lite pages, so we should make thess view-specific for now
 2016-04-21 16:19:20 -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
Matthew Taylor
a6e199b5f4 Merge pull request #414 from TheGrits/patch-4 
Fix gh-413: Update supporting organizations
 2016-04-15 16:22:54 -04:00
The_Grits
c9492ae38b Update l10n.json 2016-04-15 16:12:17 -04:00
The_Grits
08ccaa7721 Spaces and Intel 2016-04-15 15:59:32 -04:00
The_Grits
1a2e30fccd mailto anchor 2016-04-15 15:58:11 -04:00
The_Grits
d6b08a0bff Add Chris and Julia 
As per https://github.com/LLK/scratch-www/issues/413#issuecomment-209889924
 2016-04-14 12:36:20 -04:00
The_Grits
174b351845 Delete the extra space 2016-04-09 14:28:05 -04:00
Matthew Taylor
7aeaaeb480 Wrap wedo2 view in page component 2016-04-07 16:49:35 -04:00
The_Grits
855154edcf Update CN url 
As per https://github.com/LLK/scratch-www/pull/414#issuecomment-206880466
 2016-04-07 09:36:45 -04:00
The_Grits
6d349cb7f9 Update supporting organizations 
Changed according to #413
 2016-04-06 17:49:30 -04:00
The_Grits
09d095b963 Change supporting organizations 
As per #413.
Specific additions:
- Cartoon Network
- Lemann Foundation
 2016-04-06 17:42:05 -04:00
Matthew Taylor
27b55082f0 Merge pull request #407 from mewtaylor/issue/gh-406-counselor-link 
GH-406: Add community counselor job
 2016-04-04 14:55:36 -04:00
Rachel Thornton
f545d8acf7 Fixed problem with loading 2016-04-04 14:11:35 -04:00
Rachel Thornton
ce8849e4aa Merge remote-tracking branch 'LLK/develop' into develop 
# Conflicts:
#	src/components/navigation/navigation.jsx
 2016-04-03 16:46:23 -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
53e508dd24 Merge pull request #411 from sayamindu/develop 
Add view for community blocks interview recruitment
 2016-04-01 16:34:57 -04:00
Sayamindu Dasgupta
bd81438800 Add view for community blocks interview recruitment 
We are recruiting Scratchers for interviews on the Scratch Community
blocks feature; this is a part of my PhD disseration. This commit has
the PDF forms and the views that are needed for the recruitment.
 2016-04-01 13:23:48 -04:00
Matthew Taylor
7734ee8931 Add community counselor job 
Fixes #406
 2016-04-01 10:29:13 -04:00
Matthew Taylor
1adb8ecf5b Add page component to jobs view 
Fixes #398
 2016-03-28 14:18:44 -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
Rachel Thornton
ff228e022c Merge remote-tracking branch 'LLK/develop' into develop 2016-03-25 11:35:47 -04:00
Ray Schamp
042ef65070 Merge pull request #393 from rschamp/feature/silence 
Upgrade sass-lint, quiet various warnings
 2016-03-24 12:02:40 -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
56787ee09c Add spot check for cards, use new Page paradigm 2016-03-23 16:47:55 -04:00
Matthew Taylor
b903067658 Update the cards with new grouped structure 2016-03-23 16:37:15 -04:00
Matthew Taylor
f95b62bf67 Change name to cards to prevent interaction fx 
thanks @rschamp !
 2016-03-23 16:37:15 -04:00
Matthew Taylor
5d693ed53d Add /info/cards/ route 
Also implements a method for handling translation of static files as described in https://github.com/LLK/scratch-www/issues/372#issuecomment-193350144
 2016-03-23 16:37:15 -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
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
Matthew Taylor
cb81ae550a Merge pull request #382 from mewtaylor/hotfix/wedo-appstore-link 
[Develop] Hotfix: wedo appstore link
 2016-03-10 15:28:50 -05:00
Matthew Taylor
c514d814c9 Update device manager app store link 2016-03-10 15:14:08 -05:00
Matthew Taylor
b484480e1e Merge branch 'wedo-landing' into develop 
* wedo-landing:
  Update with links, fix linter issues, center setup
  [WIP] Add WeDo Landing page

# Conflicts:
#	server/routes.json
 2016-03-10 09:05:51 -05:00
Matthew Taylor
aeaa02aae8 Update with links, fix linter issues, center setup 2016-03-09 23:04:25 -05:00
carljbowman
3220fd1b9d [WIP] Add WeDo Landing page 
Adding LEGO WeDO landing page. This also includes the initial pass on Global Typographic Standards.

Needs Work
-Add URLs to all links on the page (still being generated)
-Ater URLs have been added, update translation JSON to include messages that include links
 2016-03-09 14:33:17 -05:00
Andrew Sliwinski
47ab0a0ae0 Update jobs to match Media Lab listings 2016-03-02 09:42:51 -05:00
Andrew Sliwinski
7511121972 Merge branch 'develop' into feature/jobs 2016-03-01 10:19:34 -05:00
Matthew Taylor
0ac9f5edc5 Merge pull request #359 from TheGrits/patch-2 
Fix gh-357: Splash - Initial value of project count is arbitrary
 2016-02-23 11:43:26 -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
The_Grits
8d05ed84b4 singlequotes 
Apparently double quotes don't work
 2016-02-18 14:34:02 -05:00
The_Grits
9f2325bd83 "over 13 million" 
Changed as per @mewtaylor's suggestion
 2016-02-18 14:29:58 -05:00
The_Grits
7992c43b87 Update credits.jsx 
Travis was complaining that link 188 had over 120 characters, this should fix it.
 2016-02-12 07:37:25 -05:00
Matthew Taylor
212a2d2c41 Merge pull request #352 from technoboy10/gh333-creditspage 
Fix gh-333: Add/Remove Moderators on Credits Page
 2016-02-10 22:51:54 -05:00
The_Grits
91f3de0682 link formatting in paragraphs 2016-02-08 14:50:56 -05:00