Commit graph

226 commits

Author SHA1 Message Date
Eric Rosenbaum
13e3c8efdc Update EV3 starter projects 2018-12-11 14:21:20 -05:00
Eric Rosenbaum
134126c170 Update WeDo starter projects 2018-12-11 13:53:49 -05:00
picklesrus
422a5864a2 compress svg 2018-12-10 18:56:34 -05:00
picklesrus
47ce5f5919 Crush the pngs 2018-12-10 18:49:03 -05:00
Eric Rosenbaum
8e6af59635 Initial draft of ideas page 2018-12-10 18:06:07 -05:00
picklesrus
2baf5860ca Skeleton of downloads page. 2018-12-10 17:33:22 -05:00
Eric Rosenbaum
824764bc83
Merge pull request #2380 from ericrosenbaum/feature/update-win-version-req
Update Windows version requirement on hardware extension landing pages
2018-12-04 16:17:17 -05:00
Eric Rosenbaum
87fd733615 Ensmallinate microbit header image 2018-12-04 14:59:09 -05:00
Paul Kaplan
ee4268af15 Add es6-promise polyfill to fix browsers lacking promise.finally
This fixes an issue where projects could not be loaded on Edge
2018-12-03 09:32:27 -05:00
chrisgarrity
f6d54e25b9
Merge pull request #2367 from chrisgarrity/feature/mod-info
Additional project data for Moderators/Admins on the project page
2018-11-30 08:21:15 -05:00
chrisgarrity
e95e5c5f25 Additional project data for Moderators/Admins 2018-11-29 15:43:28 -05:00
Eric Rosenbaum
8260d7bb5d Add Makey Makey extension chip 2018-11-29 15:28:55 -05:00
chrisgarrity
decb250dd5 Initial version 2018-11-26 09:43:05 -05:00
Eric Rosenbaum
bfc36e25f9
Merge pull request #2329 from ericrosenbaum/feature/get-link-from-app-stores
App store badges for Link download
2018-11-20 13:17:18 -05:00
chrisgarrity
2065090bb8
Merge pull request #2262 from sjgllghr/issue/gh2212-migrate-scratch-1.4
Fix gh-2212: Migrate Scratch 1.4 download page
2018-11-19 15:27:49 -05:00
Eric Rosenbaum
9ee3c9eb6c App store badges for Link download 2018-11-19 13:51:29 -05:00
Paul Kaplan
16e3fa100b
Merge pull request #2313 from paulkaplan/fix-missing-extensions
Add missing extensions and images
2018-11-14 20:31:26 -05:00
chrisgarrity
7e9403d049
Merge pull request #2291 from chrisgarrity/feature/2280-hoc-2018
2018 Hour of Code Banners
2018-11-14 17:10:35 -05:00
picklesrus
6c7a56dde8
Merge pull request #2220 from picklesrus/credits-stuff
Redo the credits page.
2018-11-14 16:32:43 -05:00
Paul Kaplan
194dc90688 Add missing extensions and images 2018-11-14 15:39:40 -05:00
chrisgarrity
a156c404e1 2018 Hour of Code Banners
* add Top and Middle HoC banners
* banners share styles
* add new assets for banners
* update presentation to check date to determine whether to show the HoC banners.
2018-11-07 17:14:28 -05:00
Paul Kaplan
315c8b78fc Add "project not available" view for when project body cannot be loaded
This happens when the project id does not exist, or is not visible to the given user.
2018-11-07 16:32:12 -05:00
S. Gallagher
3ba4e551d4 migrate scratch 1.4 download page 2018-10-31 16:20:35 -07:00
Colby Gutierrez-Kraybill
48e70307c8
Merge pull request #2121 from colbygk/add_maint_page
Maintenance and trouble related static content
2018-10-24 06:18:05 -04:00
picklesrus
ad564b4ea4 Redo the credits page.
See https://github.com/LLK/scratch-www/issues/2093 for details.
2018-10-21 14:57:12 -04:00
kathy wu
294126b9b7 Update Scratch Link icon in toolbar screenshot
There is a screenshot on extension pages showing Scratch Link in context with each OS. These were updated so the featured icon is the newest Scratch Link icon.
2018-10-09 18:14:40 -04:00
kathy wu
2fd3b3df6f Change scratch link icon
Replace gear icon into newer icon
2018-10-03 10:26:29 -04:00
Colby Gutierrez-Kraybill
10f60a83de A place to track maintenance and trouble related static content stored in our CDN 2018-09-27 09:12:36 -04:00
Linda
c54b7413bc replaced old spinner with new svg to work everywhere where spinner is used 2018-09-12 14:54:15 -04:00
Eric Rosenbaum
78b32597c5
Merge branch 'develop' into hotfix/extension-landing-pages 2018-08-22 16:28:52 -04:00
Eric Rosenbaum
1e4d7000a5 Add WeDo starter project links, images and text 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
5ac6365fb6 Update extension library image for EV3 and microbit 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
0c628c3e97 Add new WeDo landing page, move old one to wedo-legacy 2018-08-21 15:16:06 -04:00
Connor Hudson
1875870a86
Initial implementation for displaying comments on project page (#1997)
* Create Comment component, start styling it

* Restructure PreviewPresentation to better match mockup

* Add padding, border to comment bubble

* add padding to bottom row of comment

* Tweak alignment of avatar and comment content

* Add margin to lower project page container

* Use border-box box sizing for comment bubble

* Make user avatar a link

* Add initial implementation of comment tail

* Align username row properly, fix comment bubble width

* Use ::before pseudoelement for comment tail

* Remove unused props to Comment component

* Add CommentContainer to handle comment replies

* Use CommentContainer instead of Comment in PreviewPresentation

* Remove debug data from CommentContainer

* Fetch top level comments from the API

* Force comment container to stretch to bottom of view div

* Remove unused api import in CommentContainer

* Long words in comments should not overflow page

* Remove @ before username in comment title

* Fix word wrapping on Firefox

* Refactor CommentContainer into a class

* Properly export CommentContainer component

* Make replies column take up proper width

* Pass project ID to CommentContainer

* Fetch comment replies in CommentContainer

* Initial implementation for loading more comments

* Add "Load More" button to Presentation

* Initial implementation of collapsing threads longer than 3 replies

* Remove console log from preview.js redux

* Tweak last comment gradient color

* Only show three total replies in collapsed state

* Match scratchr2 behavior for thread collapsing

* Use width calc instead of margin and width 100%

* Fix styling for load more button

* Make comment border gray to match the wireframe

* Allow clicking through comment fade gradient

* Add comment compose component

* style comment compose box

* Style post, cancel buttons on comment compose component

* Add margin to create comment container

* Tweak styling for characters remaining text

* Tweak placeholder text

* Add more margin to comment avatar

* Add icons and styling to delete, report text

* Refactor px -> rem where possible in comment styles

* Change comment time color to dark gray

* Tweak margin and border radius

* Add reply icon to preview comments

* Clean up unused imports, console.log in compose-comment component

* Remove console statement in preview.jsx

* Add some clarifying comments to unfinished parts of comments

* Remove direct passing of comment api response to CommentContainer

* CommentContainer should not pass api response directly

* Rename CommentContainer to TopLevelComment

* First pass at getReplies for comments in redux

* Move reply fetching into redux actions instead of in TopLevelComment

* Refactor getReplies logic to behave better

* Remove components not directly related to reading comments

* Hide load more button if all comments are loaded
This uses the project info returned by the API

* Use same gradient as add to studio modal on comment thread
2018-08-06 11:52:18 -04:00
Benjamin Wheeler
08453f9f7c
Merge branch 'develop' into studio-modal-benwheeler 2018-08-01 14:46:33 -04:00
carljbowman
e41d16e656 Fix button contrast in Tips page masthead
Previously the button was made aqua, but there was a lot of contrast between the ui-blue and ui-aqua.
2018-07-31 15:32:29 -04:00
Ben Wheeler
7cc2f61a2b compressed svgs; small modal scss reversion 2018-07-25 16:30:50 -04:00
Ben Wheeler
d1d42f4245 resolved spinner conflict 2018-07-20 21:14:41 -04:00
Connor Hudson
5f0016f385
Add landing pages for the micro:bit and EV3 extensions (#1981)
* start building ev3 landing page structure

* Inject translations, add more content and structure to ev3 landing page

* Add ev3 route

* add active styles for os chooser buttons

* Add ev3 assets

* Add content and intial styles for everything down to "Sample Projects"

* Add correct padding to all sections on ev3 page

* Add more margins to match the mockup

* Create os chooser component for reuse on other landing pages

* Make EV3 page stateful, add OS logic, change step styles, fix images on Chrome

* Add sample project cards and styles

* Add fixed ev3 icon svg

* Add app store badges (no href on links yet)

* Add section separator, fix sample project card margins

* Add border to project cards, make project cards clickable links

* Add FAQ boilerplate and styling from InformationPage component

* Add indented ol style, example

* Add link style with underline

* Add EV3 retail link

* Content updates

* Fix some z-index issues with os chooser

* micro:bit page mega-commit

* os chooser should not have a higher z-index than nav

* Update starter projects

* Localize OS chooser

* Add localization configuration for EV3 page

* Localize section titles on ev3 page

* Add starter project images and descriptions

* Add link to microbit.org

* Fix tip box width on microbit and ev3 pages

* add l10n strings up to things to try on ev3 page

* Fix lint error in ev3.scss

* Add download link style to ev3

* microbit getting started text and images

* Remove tip about microbit name

* Hex file and starter project download links

* microbit wording updates

* update images

* Fix issues with download link style

* text fix

* Add ev3 starter project downloads

* Add microbit l10n file and config

* Add l10n strings for microbit header and scratch link sections

* Add l10n strings for microbit page up to faq

* content updates

* Fix some page overflow issues

* microbit faq content and style

* Use zipped version of microbit hex file

* Add platform name to scratch link download button

* Add EV3 faq to l10n.json

* Add final strings from micro:bit and EV3 pages to l10n.json files

* Add white download asset

* Tweak styles for ev3 and microbit

* Add some final tweaks to the EV3 page styles

* Add TODO comments about refactoring duplicate code
2018-07-19 18:08:44 -04:00
Andrew Sliwinski
61bfc254ce
Merge pull request #1956 from technoboy10/feature/beta-banner
Add top and middle splash page banners for beta launch
2018-07-17 09:46:14 -04:00
Ben Wheeler
a59d533a1c merged changes in report modal and add to studio handling 2018-07-16 13:39:29 -04:00
Ray Schamp
5844fed2e0 Merge branch 'hotfix/update-conference-2018-3' into develop 2018-07-09 16:34:23 -04:00
Sean Hickey
377eaf0e61 Conference updates - schedule, logos, room locations 2018-07-06 10:17:57 -04:00
Connor Hudson
655625568c Add initial pass at top banner with assets 2018-07-03 12:03:22 -04:00
Connor Hudson
289e17195d
Merge pull request #1932 from technoboy10/feature/projects-extension-display
Preview - Implement extension info strip
2018-06-27 16:59:47 -04:00
Ben Wheeler
6989fd4ecf Added SVGs for add to studio modal 2018-06-27 11:38:32 -04:00
Sean Hickey
05fd133f27 Updated LEGO Foundation logo to LEGO Education logo. Removed Thursday dinner from expect page. 2018-06-26 15:04:55 -04:00
Connor Hudson
7fb7e9146b Merge upstream/develop, move logic to preview instead of presentation 2018-06-20 09:28:41 -04:00
Connor Hudson
7539e74436 Add extension icons, extension info object 2018-06-19 16:13:25 -04:00
Sean Hickey
8f0b12c2a6 Updated sponsor logos and keynote descriptions 2018-06-13 15:12:50 -04:00
chrisgarrity
bd391b422a presentation first pass
First pass at project page design using actual assets from Carl, and matching styles with current design.

Includes a (negative margin) hack to line up the stage. see https://github.com/LLK/scratch-gui/issues/2132
2018-05-31 14:58:23 -04:00
Sean Hickey
fd24fbacef Updated asset paths 2018-05-29 11:07:08 -04:00
Sean Hickey
9ef187aada Updated conference pages for 2018 2018-05-29 11:07:07 -04:00
Ray Schamp
25a0c5b729 Add Object.assign polyfill
Fixes IE11 Splash page error
2018-04-03 14:31:41 -04:00
Ray Schamp
cc041c2550 Update Symbol polyfill to actual minified version 2018-04-02 14:53:05 -04:00
Ray Schamp
827942f910 Update ES6 Symbol polyfill
Apparently the one we are using isn't sufficient for one of our dependencies coming with scratch-gui, so update to a different one that is sufficient.
2018-03-30 10:51:22 -04:00
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
Ray Schamp
0a6092bde8 Add Symbol polyfill 2018-01-31 10:01:14 -05:00
Ray Schamp
295a1045cd Add polyfills for formsy-react-components
This module now requires polyfills for Set and Array.from: https://github.com/twisty/formsy-react-components#browser-support
2018-01-30 20:22:19 -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
1f722a046f resize svgs 2017-09-08 16:37:18 -04:00
Matthew Taylor
92ed6adead fix typo
thanks @jwzimmer!
2017-09-08 16:08:53 -04:00
Matthew Taylor
9e3823e6e7 add icons to social message notifications 2017-09-08 14:10:46 -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
f3e53ae4c8 Add files via upload 2017-08-02 23:41:45 -04:00
St19_Galla
1817dde96d Delete cards.svg 2017-08-02 23:41:17 -04:00
St19_Galla
200f4a6107 Delete resources.svg 2017-07-31 11:21:40 -04:00
St19_Galla
190abf45e0 Add files via upload 2017-07-31 11:21:19 -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
Sarah Otts
1789720ba4 Add card translations (#1275)
* Added pdfs; added translations for /cards

* Added spanish cards to ttt page

* Added catalan cards to ttt and /cards

* Added zh-tw cards to /cards and /go and fixed /cards link for Fashion cards for all languages

* Removed duplicate starter link for ca, remove starter links for zh-tw (no translation)

fixes #1276 (swedish)
2017-04-19 16:40:57 -04:00
chrisgarrity
d94349b8d2 Add Guide PDFs for new activities 2017-02-23 16:21:19 -05:00
Matthew Taylor
7a2e7cc949 Some additional tweaks for conference 2017
1. Updates svgs for formatting
2. Makes the font size of the title smaller

Fixes #1211, 5-6 in #1206
2017-02-23 09:39:57 -05:00
Matthew Taylor
509d8e84d7 Add new icons
and format accordingly
2017-02-16 16:58:27 -05: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
2e7336ff55 Merge branch 'feature/gh-981' into release/hoc-nov-21
* feature/gh-981:
  Add hoc banner
  Move padding to splash element
  trello-ize title banner h1,p styling

# Conflicts:
#	src/components/title-banner/title-banner.scss
#	src/views/hoc/hoc.jsx
2016-11-23 11:17:47 -05:00
chrisgarrity
58656aea17 Additional content changes
- new FlyCards.pdf (fixes shortcut url on title page)
- changes ‘download’ to ‘open’ for PDFs
2016-11-21 11:06:12 -05:00
chrisgarrity
ecbf138333 update ttt content
Replace broken Hide-and-Seek-Guide.pdf
Add missing CatchGuide.pdf
2016-11-18 17:42:15 -05:00
Matthew Taylor
e77e02d5a6 Update ttt content
Still missing `FashionGuide`, may need to remove that guide.
2016-11-18 17:42:09 -05:00
Matthew Taylor
b7bfaec438 Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
Fix gh-979: TTT page
2016-11-18 17:41:58 -05:00
Matthew Taylor
e6de0d0ba4 Merge pull request #1018 from mewtaylor/issue/gh-995
Fix GH-995: Make cards tweaks
2016-11-18 17:41:49 -05:00
Matthew Taylor
9ca54e83ce Merge pull request #1008 from mewtaylor/issue/gh-980
Implement GH-980: add new TTT modal component
2016-11-18 17:41:26 -05:00
Matthew Taylor
c4f42b3673 Add hoc banner 2016-11-16 08:52:18 -05:00
Matthew Taylor
e4231e9d57 Update ttt content
Still missing `FashionGuide`, may need to remove that guide.
2016-11-15 07:42:36 -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
chrisgarrity
a27fea51e6 Integrated ttt-modal
integrated modal and added guide pdfs.
Catch and Pet Guides are still missing. We may need to remove them from the TTT list. Wanted to get this committed in any case to start review.
2016-11-14 14:34:45 -05:00
Matthew Taylor
370164c585 Make cards tweaks
Fixes #995
2016-11-14 13:35:13 -05:00
Matthew Taylor
484e3d2544 Add ttt modal component
This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.
2016-11-14 10:31:40 -05:00
Matthew Taylor
b1e37360f3 Refactor modal components
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-14 10:31:40 -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
ca7d0cf30e Next draft
Includes new SVGs for banner and resources link
MasonryGrid does the reordering of items
Using react-responsive MediaQuery to change columns
Brought in ../forms/button.scss for button styling, and then modified for TTT

Still needs Modal
Final styling pass with Carl
2016-11-09 09:28:59 -05:00
Matthew Taylor
5af05466f6 Add ttt modal component
This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.
2016-11-08 14:44:50 -05:00
Matthew Taylor
c9de1d73d9 Refactor modal components
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-08 14:44:03 -05:00