Commit graph

212 commits

Author SHA1 Message Date
Ben Wheeler
1c3eca3e06 add start over string, make capitalization consistent in make a project 2019-10-17 22:23:14 -04:00
Chris Garrity
916be715c1 Other Scratch app changes
* Footer
* ideas page
* FAQ
* parents
2019-10-02 16:38:38 -07:00
Chris Garrity
54c5484263 Copy changes for Download page. 2019-10-02 15:57:06 -07:00
Paul Kaplan
32165c0d31
Merge pull request #3397 from paulkaplan/chromeos-feature-flag
Download and initial extension pages for forthcoming ChromeOS app launch
2019-09-25 16:00:06 -04:00
Ben Wheeler
6fc5705779 revise country placeholder 2019-09-24 20:16:48 -04:00
Ben Wheeler
691faabe28 pass createProjectOnComplete prop through join flow
…so welcome step can display correct completion text
2019-09-24 18:41:24 -04:00
Paul Kaplan
762dc324b8 Update extension pages for new OS picker 2019-09-24 16:25:58 -04:00
Paul Kaplan
5d39e59dd5 Use a feature flag to contain new Scratch Desktop updates 2019-09-24 15:17:11 -04:00
picklesrus
5f3d6506c0
Merge pull request #3367 from picklesrus/captcha-error-handling
Handle errors of captcha loading by setting error state on JoinFlow.
2019-09-23 23:57:13 -04:00
Ray Schamp
d8ce9555c5
Merge pull request #3365 from LLK/hotfix/footer
Remove tagline from site footer
2019-09-18 10:41:30 -04:00
picklesrus
6a45907ded Handle errors of captcha loading by setting error state on JoinFlow. 2019-09-18 10:26:37 -04:00
rschamp
c6d39b7509 Remove tagline from site footer 2019-09-16 12:07:43 -04:00
Ben Wheeler
c26d37442d revised email info string 2019-09-16 11:46:44 -04:00
Ben Wheeler
2421d630e5 update email privacy info string 2019-09-15 21:41:27 -04:00
Ben Wheeler
4341d364d4 adjust email step vertical spacing, redo its footer 2019-09-15 17:22:25 -04:00
Ben Wheeler
31d8189e54 format each join flow title’s padding differently 2019-09-15 17:11:43 -04:00
Ben Wheeler
8bc83fa136 move privacy message to below inputs; format color 2019-09-15 17:08:40 -04:00
Ben Wheeler
5269cf7330 join flow register user function, registration error component
* add yesno checkbox
* allow checkbox to be hidden
* add registration error, waiting prop to join flow steps
* use redux to dispatch session refresh
* call register function in join flow
* make join flow modal stay showing even when session is refreshed
2019-09-10 16:34:23 -04:00
Benjamin Wheeler
0a77f62c02
Merge pull request #3263 from benjiwheeler/microbit-add-cards
Microbit add cards
2019-08-21 11:30:23 +02:00
Ben Wheeler
4f0a87e25b removed duplicate confirm password string 2019-08-20 01:20:57 +02:00
Ben Wheeler
9eab36af9a consolidate mentions of “Download PDF” 2019-08-20 01:16:48 +02:00
Ben Wheeler
095493a313 add advice tooltip strings for username step 2019-08-19 23:03:07 +02:00
Benjamin Wheeler
2854d9defd
Merge pull request #3267 from benjiwheeler/join-flow-placeholders
added placeholders to username step
2019-08-19 16:52:00 +02:00
Ben Wheeler
18605ea047 create your account 2019-08-19 16:10:24 +02:00
Ben Wheeler
5b5ac6a66f added email subscribe checkbox 2019-08-19 16:10:23 +02:00
Ben Wheeler
8f5f89abfd improve email step in several ways 2019-08-19 16:08:55 +02:00
Ben Wheeler
d02184daf3 added placeholders to username step 2019-08-18 18:07:33 +02:00
Benjamin Wheeler
96a7d01cdc
Merge pull request #3261 from benjiwheeler/join-flow-add-nonbinary
add nonbinary option to gender step of join flow
2019-08-16 17:48:55 -04:00
Benjamin Wheeler
4e0aaafa01
Merge pull request #3239 from benjiwheeler/join-flow-confirm-text
Add ToS footer to email step, make next button Create Account
2019-08-13 17:55:04 -04:00
Benjamin Wheeler
0321929412
Merge pull request #3185 from benjiwheeler/join-flow-more-strings
Revised and added several join flow strings
2019-08-13 17:50:59 -04:00
Ben Wheeler
fa6913c346 use info button in birthdate step, gender step 2019-08-13 15:29:44 -04:00
Ben Wheeler
e75b73d6fe revised validation strings 2019-08-13 15:02:25 -04:00
Ben Wheeler
4fa85e5c3b add several missing strings for join flow errors 2019-08-13 15:02:25 -04:00
Ben Wheeler
8469e77622 change Terms of Service to Terms of Use 2019-08-13 12:20:44 -04:00
Ben Wheeler
6b1b4d7f36 Add ToS footer to email step, make next button Create Account 2019-08-13 12:20:44 -04:00
Ben Wheeler
181601dbf5 translate email address placeholder 2019-08-12 17:56:44 -04:00
Ben Wheeler
e64dc60ae6 formatted email step, added input 2019-08-12 17:56:43 -04:00
Ben Wheeler
74c76dedcb add nonbinary option to gender step of join flow 2019-08-09 17:05:21 -04:00
Ray Schamp
6275b516fc
Merge pull request #3199 from benjiwheeler/join-flow-country-data
Consolidate country lists, fix country field in teacher account registration
2019-08-07 15:00:50 -04:00
Ben Wheeler
564baf2ebc handle error when teacher country selection fails to resolve to country name 2019-08-06 15:00:18 -04:00
Ben Wheeler
8725cee6a1 replaced gender l10n strings with existing ones 2019-08-03 00:08:18 -04:00
Ben Wheeler
09ff758eee add gender step strings 2019-08-03 00:08:18 -04:00
Benjamin Wheeler
56ce60fe86
Merge pull request #3207 from benjiwheeler/join-flow-welcome-text
add instructions text to join flow welcome step
2019-08-03 00:06:00 -04:00
Ben Wheeler
16dd9e0b76 format next button, use correct strings 2019-08-01 22:27:47 -04:00
Ben Wheeler
bef6063373 add instructions text to join flow welcome step 2019-08-01 16:27:54 -04:00
Ben Wheeler
a435626ae1 added stubs for email step, welcome step 2019-07-29 22:29:04 -04:00
Ben Wheeler
1cd0713bb9 added missing strings to join flow 2019-07-26 22:10:21 -04:00
Ben Wheeler
4ef73525c4 Revised modal title to Copy Link, use orig icon 2019-05-08 14:36:00 -04:00
Ben Wheeler
d5e2ed69ad refined colors 2019-05-06 16:22:41 -04:00
Ben Wheeler
08f8e1c546 simplified embed modal to remove social links 2019-05-02 17:18:13 -04:00
Ben Wheeler
fdfa61649f removed copy link button on project page 2019-04-26 16:11:53 -04:00
Ben Wheeler
2289584bbf got copied result text working, closing in on final design 2019-04-24 15:09:39 -04:00
Ben Wheeler
67e7a54413 renamed externalShare to social 2019-04-24 12:09:44 -04:00
Ben Wheeler
5d12f0f781 put social links section, copy project link button inside social share modal 2019-04-22 22:36:26 -04:00
Ben Wheeler
1e63b51565 first take on embed modal 2019-04-22 14:50:49 -04:00
Ben Wheeler
42844a8927 made more conferences 2019 related strings translatable 2019-02-27 16:58:13 -05:00
Ben Wheeler
3179f7e59d use solid icons, not outlines ones, on 2019 conference page 2019-02-19 16:26:30 -05:00
Paul Kaplan
f7e8922757 Allow loading more than 20 replies 2019-01-10 10:46:01 -05:00
Paul Kaplan
3cd837d20d
Revert "Check for recommended browser version" 2019-01-08 16:09:26 -05:00
chrisgarrity
84606bf753 Check for recommended browser version
Also removed Vivaldi from the rejected list to match gui
2019-01-08 09:17:02 -05:00
apple502j
220b027c46
capitalize URL 2019-01-04 10:28:06 +09:00
Paul Kaplan
8af12ec0e1 Show error ID and report React errors to Sentry 2018-12-19 13:47:17 -05:00
Eric Rosenbaum
7212436f3b Update nav from “tips” to “ideas” 2018-12-10 18:17:05 -05:00
chrisgarrity
5cff3f9ae4 Revised unsupported browser info
- Header reads ‘This browser is not supported’
- FAQ link goes to general Scratch FAQ.
2018-11-27 12:51:49 -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
Paul Kaplan
3fe1242aa6 Allow user to exit "single comment mode" and see all comments.
This visually appears like a "load more comments" button for now, but has the impact of unsetting the #comments-<id> hash in the url and resetting the comment state, showing all the comments (in paginated view)
2018-11-19 15:47:47 -05:00
Eric Rosenbaum
9ee3c9eb6c App store badges for Link download 2018-11-19 13:51:29 -05:00
Paul Kaplan
c62470150b
Merge pull request #2290 from paulkaplan/project-not-available
Add "project not available" view for when project body cannot be loaded
2018-11-08 12:58:37 -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
Paul Kaplan
4105e88cfd Add IP Mute message to project comment errors 2018-11-07 10:58:07 -05:00
Paul Kaplan
f4887008a5 Extract strings for localizing the preview page 2018-10-23 11:38:34 -04:00
Paul Kaplan
242f01118b Add missing status message for comments 2018-10-17 11:56:43 -04:00
Paul Kaplan
592c0e5703 Add restore functionality to comments for admins 2018-10-16 15:08:00 -04:00
Paul Kaplan
b7b7b079b9 Combine comment reported and deleted flags into visibility string
To prepare for server including visibility
2018-10-16 15:08:00 -04:00
Paul Kaplan
231e9c6d89 Internationalize strings in compose-comment 2018-10-12 09:16:27 -04:00
Paul Kaplan
c19adee84a Fix internationalization 2018-10-10 11:15:09 -04:00
Linda
4635ae3b82 added alt tags to wedo page 2018-08-23 10:38:49 -04:00
Ben Wheeler
2c8990ae7e report project POSTs to scratchr2, displays modal reactively 2018-08-09 12:41:38 -04:00
Benjamin Wheeler
f76ca8b891
Merge pull request #1985 from benjiwheeler/studio-modal-benwheeler
Add To Studio modal on project page. Sorry for merge commit, merges from develop made these un-squashable :(
2018-08-02 17:53:53 -04:00
Connor Hudson
de2691762e
Refactor Extension Landing Pages (#2006)
* Add extension-landing generalized styles, install scratch link component

* Make EV3 page use generalized stuff

* Use OS_ENUM file instead of class variable

* use extension-landing/os-enum in os chooser

* Use extension-landing class in extension-landing.scss

* Use extension-landing styles and components on microbit page

* Add view-specific styles

* Move install scratch link l10n strings to src/l10n.json

* Start moving steps display to its own components

* Finish initial pass at Step, Steps components for extension landing pages

* Create ProjectCard component

* Use new components on InstallScratchLInk component

* Use new components on EV3 page

* allow className prop in Steps component

* Use new components on micro:bit landing page

* imageUrl -> imageSrc in ProjectCard

* Create ExtensionHeader component and use it on micro:bit and EV3 pages

* Fix a spacing issue in the InstallScratchLink component

* Add ExtensionRequirements component

* Use ExtensionRequirements component on landing pages

* Remove requirements l10n string for ev3 page

* Move project card styles out of things-to-try section

* Don't render the number row in a step if compact and number props are not set

* Add ExtensionSection component

* Use ExtensionSection on ev3 and microbit pages

* Move state configuration to ExtensionLanding class

* Move tip box, screenshot styles outside of specific section

* Add TipBox component and use it on the EV3 page

* Use hr element instead of section-separator div

* Remove refactor TODO comments :)
2018-08-02 13:09:55 -04:00
Ben Wheeler
d1d42f4245 resolved spinner conflict 2018-07-20 21:14:41 -04:00
Ben Wheeler
fc5912526e addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate.
addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate.
2018-07-20 20:37:36 -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
Ben Wheeler
9cac70ab18 small steps towards addtostudio modal's container-presentation refactor 2018-07-07 14:09:43 -04:00
Ben Wheeler
f8df3c0146 added royal blue color, button styles, small jsx fixes to Add to Studio modal 2018-06-18 15:17:19 -04:00
Ben Wheeler
f0fbc0a57f add to studio modal appears from project page, looks horrendous 2018-06-16 19:13:50 -04:00
chrisgarrity
db3120091d Fix lint and don’t duplicate the ‘other’ string 2018-05-31 15:02:45 -04:00
chrisgarrity
08cf4f4f3d Refactor report modal
* move all the report modal presentation into the component
* add strings to general l10n file because we don’t handle l10n files in components
* Add current project id and username to the data before submitting
2018-05-31 15:02:44 -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
Joel Gritter
316a36f1ed Fix gh-1824: Add note about real names (#1830)
* Add note about real names as a new string

Fixes gh-1824
2018-03-16 16:18:17 -04:00
Ray Schamp
5513b6a7e9 Merge branch 'develop' of github.com:LLK/scratch-www into issue/gh1400-load-more-button-behavior
# Conflicts:
#	src/views/search/search.jsx
2018-02-08 10:42:04 -05:00
Ray Schamp
590f505a61 Revert "Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade"
This reverts commit 1b1b396e92, reversing
changes made to a144bab0e6.
2018-01-30 11:53:12 -05:00
Ray Schamp
46511e1253
Revert "[Develop] Upgrade to ES6" 2018-01-30 09:54:45 -05:00
Matthew Taylor
6d1f2fbccd initial es6 commit 2018-01-19 14:06:26 -05:00
Carl-Myer R. Flor
36b90980a6 Adds button behavior for various search result state 2017-12-11 23:24:02 +08:00
chrisgarrity
b10b8a3d51 Revise student invitation string
fixes #1454.

Changes ‘has invited you to join the class:’ sentence fragment to a complete sentence ‘Your teacher has invited you to join a class:’ to account for languages that reverse the  order of subject/object.
2017-09-01 09:20:36 -04:00
chrisgarrity
4cc353ab43 remove obsolete strings
‘Help’ and ‘Discuss’ are not needed now that they’ve been replaced with the Tips page.

Fixes #1362
2017-07-17 10:14:32 -04:00
Matthew Taylor
b22aaa8465 Add /store to footer 2017-06-26 10:35:29 -04:00
Andrew Sliwinski
124c8e36d7 Update navigation. Resolves GH-1262 (#1285) 2017-06-22 09:40:34 -04:00