Commit graph

163 commits

Author SHA1 Message Date
chrisgarrity
53ca763646 Add Error Boundary and Crash message
Added all the strings to general l10n as error boundary/crash message applies to all pages.
2018-03-30 10:51:22 -04:00
chrisgarrity
2989857dbe Update Conference page to close session proposals
Fixes #1782, needs to be hotfixed on Feb 5
2018-01-31 17:14:42 -05:00
Sheshank Shankar
240606b3d0 Fixes #1702: Scratch Conference site - small edits (#1727)
Update the conference page with new banner image and small copy edits.
2017-12-13 15:25:12 -05:00
chrisgarrity
04e1e36978 revert 2017 HoC top and middle banners 2017-12-12 11:21:35 -05:00
chrisgarrity
4fe3997df4 Top and middle banners for HoC 2017
Css animated top banner

Middle banner of activities - responsive

https://github.com/LLK/scratchr2/issues/4869

Also updated ttt see-more/open- modal link to be consistent with the new icon from Carl.
2017-11-03 16:50:26 -04:00
Matthew Taylor
3dd768f2f6 GH-1361: Implement Notifications Page (#1487)
* start work on www page
committing out of paranoia.
including changing splash page endpoints

* updates from feedback

thanks @rschamp! This includes:

1. splitting out messages list into a separate component (for clarity)
2. some comment/formatting adjustments for the api calls
3. removal of an extraneous property in emoji-text

* remove duplicate string declaration

* use object.assign instead of defaults deep

we don’t need deep defaults

* fix react warnings
2017-08-31 17:05:22 -04:00
St19_Galla
43b8f0b38f Down Deep - Scratch Camp 2017 Page (#1409)
* Add files via upload

* Create downdeep.jsx

* Delete downdeep.jsx

* Delete downdeep.scss

* Delete l10n.json

* Delete downdeep.jsx

* Create dd.jsx

* Rename dd.jsx to filler.jsx

* Add files via upload

* Delete dd.jsx

* Delete filler.jsx

* Create filler.jsx

* Add files via upload

* Delete filler.jsx

* Update routes.json

* whoops

* travis

* Update downdeep.jsx

* Update downdeep.scss

* Update downdeep.scss

* Update _colors.scss

* what i get for rushing

* Update downdeep.jsx

* Update l10n.json

* thisandagain's changes

* Carl's Changes

* carl's changes

* carl's changes

* Update downdeep.jsx

* Rename downdeep.jsx to camp.jsx

* Rename downdeep.scss to camp.scss

* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx

* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss

* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json

* Update camp.jsx

* Add files via upload

* Update camp.jsx

* Update camp.scss

* Update l10n.json

* Create filler

* Add files via upload

* Delete bubbles.svg

* Delete dolphin.svg

* Delete fish-divider.svg

* Delete fish-divider2.svg

* Delete map.svg

* Delete ocean-bottom.svg

* Delete ocean-top.svg

* Delete treasure.svg

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.jsx

* whoops

* Update camp.scss

* Update l10n.json

* Update camp.scss

* Update camp.jsx

* Update _colors.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update _colors.scss

* Update camp.scss

* Update camp.scss
2017-07-19 11:48:29 -04:00
chrisgarrity
74e315dc71 Add new Tips page (#1357)
New of tips page, uses cards from new resources server (s3)

* added get-localized-urls script to get the generated json from the s3 bucket
* added /tips route
* correct localized-urls for other pages
* remove thingstotry
* redirect /go
* fix up /info/cards view to use resources (s3).
* redirect /go to /tips
* change /hoc redirect from /go to /tips
* Add full set of cards pdf download to tips localization
* removed cards and guides from static PDFs, they are all coming from resources.scratch.mit.edu now.
* removed things to try view

Corrections for reviews:
* decided to pretty print the localized URLs
* replaced console.errors with process.stdout and fail with exit(1)
* formatted localized-urls to make it easier to read
* moved link outside  `<Button…` makes whole button clickable instead of just text
* fixed up css styles, removed unnecessary classes
* corrected “unused” resource links
2017-06-21 16:20:18 -04:00
Matthew Taylor
ae53dcd746 Remove 10th banner 2017-05-15 11:08:15 -04:00
Matthew Taylor
fc075aedaf Add anniversary banner 2017-04-28 08:51:40 -04:00
Matthew Taylor
8b772737a3 Add 2017 conference site 2017-02-15 08:35:10 -05:00
Matthew Taylor
67a39e4870 Archive 2016 site
move to a subfolder, do some css shuffling and add some trello style guide stylings to help scope for also adding 2017
2017-02-15 08:34:46 -05:00
Matthew Taylor
2daa882331 Add hoc event row
still missing the video for content, otherwise should be good to go
2016-11-29 11:13:00 -05:00
Matthew Taylor
c4f42b3673 Add hoc banner 2016-11-16 08:52:18 -05:00
Matthew Taylor
ac46cce989 Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
Fix gh-979: TTT page
2016-11-15 07:22:16 -05:00
Matthew Taylor
370164c585 Make cards tweaks
Fixes #995
2016-11-14 13:35:13 -05:00
chrisgarrity
1f8d26186c Add all the banners
Removed the getting started placeholder.
Added all the banners from #980, updated ttt.json with banner location
2016-11-10 11:32:58 -05:00
chrisgarrity
c6f2fa68a7 First version of TTT page 2016-11-07 15:07:19 -05:00
Matthew Taylor
e01afa0161 Add new cards and card thumbs to www
Fixes #856. This also updates the styling of the `cards.jsx` view to follow the trello style guide, as previously discussed.
2016-10-19 13:45:37 -04:00
Matthew Taylor
6bcc7eeae3 Update make it fly hoc image to be higher res
Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time.
2016-10-03 16:40:57 -04:00
Matthew Taylor
cd6a60e5b8 Change bearstack/bball to hide and dance
Also make updates to style scoping based on feedback from @rschamp
2016-09-15 11:44:33 -04:00
Matthew Taylor
469d7a35bb Update hoc page with new tutorials
Adds:
1. Make it Fly
2. Make Music

Removes:
1. Hide-and-Seek
2. Dance, Dance, Dance
2016-09-15 08:15:37 -04:00
Technoboy10
adab508b09 replace asset per #737 2016-07-21 10:26:53 -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
Connor Hudson
a90b7cab2a add the not-carousel images 2016-06-24 08:06:08 -04:00
Connor Hudson
dd249e8b88 add assets for teacher page 2016-06-22 13:18:47 -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
fe74208f32 Add international phone validation 2016-06-14 17:29:29 -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
Ray Schamp
448bb8aa3f Add Power Puff Girls banner 2016-05-24 17:14:12 -04:00
carljbowman
e885c08ea1 For Developers
Add landing page for developers
2016-05-17 07:51:08 -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
3c487163a0 Last minute copy updates 2016-04-22 09:07:32 -04:00
Matthew Taylor
66113e1c58 Add conference sub-site 2016-04-21 16:22:39 -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
Matthew Taylor
b903067658 Update the cards with new grouped structure 2016-03-23 16:37:15 -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
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
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
f4be08fc4f Remove unused files 2016-03-02 09:50:11 -05:00
Andrew Sliwinski
6204b52479 WIP 2016-01-31 13:02:10 -05:00
morant
77a4bd2d10 adding tips to the microworld 2015-12-21 13:30:22 -05:00
Andrew Sliwinski
aa7efc7e4f Merge branch 'develop' of github.com:llk/scratch-www into feature/about 2015-12-08 10:31:48 -05:00
Hannah Cole
c82aecf1f7 created jobs page 2015-11-29 13:42:26 -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
morant
9f0d36624a Fresh version of arts microworld 2015-11-22 21:40:08 -05:00
carljbowman
ba2902f979 Add Made with Code Logo 2015-11-20 09:56:10 -05:00
Andrew Sliwinski
87dd5e7bf3 Migrate static images for about view 2015-11-18 20:09:29 -05:00
carljbowman
4cfd7cc02e Add new backgrounds for Dance and Name 2015-11-10 16:20:48 -08:00
carljbowman
96b1dba277 Update HOC tutorials and linking
- Swapped Pong Game with B-Ball Hoops
- Changed Bearstack Story's thumbnail to clear up confusion around similar thumbnails
- Added 'B-Ball Hoops' to localization JSON
- Added anchor link to resource section for easy acess.
2015-11-10 10:58:08 -08:00
Matthew Taylor
ad8d32474f Update HOC page with new mobile, styling & content
Mobile styling is from the frameless framework from #198 (ht @rthorn!). Localization also in as well.

Use `white-space: normal` instead of `inline-block`

Prep for componetizing Sub-Nav

- Fixed top banner extra margin
- Updated HTML containers and SCSS

Add subnavigation component

Added more content

- More projects (still need photos)
- Added section about Studios (need to create links to studios)

WIP: adding frameless to HOC page

Remove Grid elements on Sections

Made the implmentation more granular with breakpoints in mind.

More formatting adjustments

Cards in box now working.

Update responsive behavior and spacing

Updated all elements to respond to new grid system breakpoints.

Update content and organize HOC assets

- Added studios section with studio elements
- Reorganized the image assets for HOC 2015

Fix SCSS linting errors

Update addtional activities photo assets

Generalize `info` class on subnav

Move onto one line

left-align single-column studio links

Add strings for localization

Some rebase conflicts

Code review feedback

ht @thisandagain!

Fix alignment of studios

Keep `inline-block` for mobile
2015-11-03 23:50:51 -05:00
Andrew Sliwinski
c0907f34cd Update default og:image 2015-10-29 18:40:56 -04:00
Ray Schamp
58d3ed4ecb Add welcome component and show it conditionally
Move some of the colors used on the splash page into _colors.scss so they can be reused.
2015-10-22 12:21:47 -04:00
Andrew Sliwinski
a7255c49b2 Add GA tracking and optimize open graph tags 2015-10-20 10:51:33 -04:00
carljbowman
4424fe2f0b Add Collaborators and Logos 2015-10-14 14:45:00 -06:00
carljbowman
75756e4096 Add CN Logo to Hide & Seek asset 2015-10-14 11:51:34 -06:00
carljbowman
2d745dd1ea Update HOC with Banner Hoverstates & Assets
- Added hover states on the tutorial cards that changes the banner background.
- Included new web optimized image assets.
2015-10-14 10:30:52 -06:00
carljbowman
823609f1a7 Update HOC Landing Page
- Added folder of SVGS (includes on for the landing page)
- Swapped out images assets (removed links to Dropbox)
- Added resource styling
2015-10-01 14:30:30 -04:00
carljbowman
1c6720b123 Update User Info and Assets in Navigation 2015-09-23 09:57:20 -04:00
carljbowman
9a67d3fb98 Navigation WIP 2015-09-21 09:18:00 -04:00
Ray Schamp
ab85004e4e Add logged in state and dropdown 2015-09-14 16:14:40 -04:00
Andrew Sliwinski
fa4fce1b1c Initial commit 2015-09-02 12:08:58 -07:00