scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-29 18:46:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5676 commits 216 branches 1 tag 478 MiB
Commit graph

3398 commits

Author SHA1 Message Date
picklesrus
25620053c8
Merge pull request #3537 from picklesrus/join-flow-launch 
Roll out new Join Flow.
 2019-11-15 13:26:52 -05:00
picklesrus
5b351b6515 Roll out new Join Flow. 2019-11-15 11:28:10 -05:00
picklesrus
378cebe5f4 Take user to the homepage when finishing the join flow (unless they came from the editor). There is replication lag that makes creating a project immediatley a bad experience. We'll fix this in a followup. 2019-11-15 11:23:54 -05:00
apple502j
0bff005162 Member updates with latest info 2019-11-14 01:01:24 +09:00
chrisgarrity
e4c204463e
Merge pull request #3513 from chrisgarrity/download-faq 
Additional ChromeOS/Android FAQs for the download page
 2019-11-13 10:38:07 -05:00
picklesrus
a036d5d13c Put the right value in the password field. This got mixed up in #3512. 2019-11-13 10:10:14 -05:00
Chris Garrity
0d93c3faf0 Correct TM capitalization 2019-11-13 09:43:24 -05:00
Chris Garrity
4be41235b5 Additional ChromeOS/Android FAQs for the download page 
Two more questions related to bluetooth on ChromeOS/Android.

They should only be visible if either Chrome or Android is selected, and the `CHROME_APP_RELEASED` feature flag is true.
 2019-11-12 18:17:30 -05:00
Ben Wheeler
4c0026ab41 revised comment explaining character length count 2019-11-12 16:57:49 -05:00
Ben Wheeler
48d7209942 remove truncation of password, passwordConfirm 2019-11-12 11:43:23 -05:00
apple502j
cb3a979144 Don't link when userName is blank, in credits 2019-11-09 00:38:33 +09:00
apple502j
e391f8ce87 Member updates in Credits 2019-11-09 00:33:06 +09:00
Benjamin Wheeler
be0ae3307b
Merge pull request #3508 from picklesrus/policy-text 
Add privacy policy and link to the email step.
 2019-11-06 13:02:22 -05:00
picklesrus
3ad17a4572 Add privacy policy and link to the email step. 2019-11-06 12:32:55 -05:00
picklesrus
c2004d0f43 Switch to using scratchr2 check_username endpoing instead of api. There are some cleanspeak differences with the api one that need to be resolved. 2019-11-06 11:25:07 -05:00
picklesrus
b845010025
Merge pull request #3503 from picklesrus/join-ga 
Add analytics logging to join flow.
 2019-11-06 11:01:40 -05:00
Benjamin Wheeler
7cea138c46
Merge pull request #3505 from LLK/revert-3495-revert-3468-country-data-name-fix 
Revert "Revert "fixed country options to use full country name string as option value""
 2019-11-06 10:22:31 -05:00
picklesrus
68fc4fe45b Fix merge conflicts :( 2019-11-05 20:01:35 -05:00
picklesrus
c77db39062 Guard calls to componentDidMount with a check for existence. 
Fix tag on username step.
 2019-11-05 19:50:42 -05:00
picklesrus
30967a3056 Set sendAnalytics to be required and send the right props to the error step. Also add a test for the error step. 2019-11-05 19:50:42 -05:00
picklesrus
e4b79c1bd2 Add analytics logging to join flow. Adding page views for each step in the flow. 2019-11-05 19:48:44 -05:00
Ben Wheeler
7b69935d50 in join flow, use country name options 2019-11-05 18:31:05 -05:00
Ben Wheeler
3e7753691f use country code options in regular registration 2019-11-05 18:30:49 -05:00
Ben Wheeler
70d81b85fe made separate functions for country options with name, code 2019-11-05 18:30:20 -05:00
Benjamin Wheeler
2182853dc6
Revert "Revert "fixed country options to use full country name string as option value"" 2019-11-05 18:07:31 -05:00
Benjamin Wheeler
77fca39bbf
Merge pull request #3485 from benjiwheeler/join-flow-cache-ignores-api-failures 
username step and email step caches ignore api failures
 2019-11-05 12:51:33 -05:00
Ben Wheeler
7b2e75821c revise function names and handling of registration errors 2019-11-05 12:12:03 -05:00
Ben Wheeler
e3d3d97c19 change p tags to divs; set isRequired on canTryAgain 2019-11-05 12:12:03 -05:00
Ben Wheeler
510906e538 removed stray onCaptchaError from bind list 2019-11-05 12:12:03 -05:00
Ben Wheeler
f713298d37 use class instead of id for identifying errorMsg in test 2019-11-05 12:11:04 -05:00
Ben Wheeler
d265ad3d44 show errorMsg content, not formatted message with errMsg as id 2019-11-05 12:11:03 -05:00
Ben Wheeler
469db4dc36 simplify canTryAgain function, reset registrationError on retry 2019-11-05 12:11:03 -05:00
Ben Wheeler
9a97285ac6 rename handleRegistrationError to handleCaptchaError 2019-11-05 12:11:03 -05:00
Ben Wheeler
5cc0bfd782 fix password error regex 2019-11-05 12:09:56 -05:00
Ben Wheeler
a95d17f708 refactor error handling in join flow 2019-11-05 12:09:56 -05:00
Ben Wheeler
c6ae2176da added validation functions for error code validation 2019-11-05 12:09:56 -05:00
Ben Wheeler
ceb3af1c58 improve formatting of welcome, error step text 2019-11-05 12:09:56 -05:00
Ben Wheeler
517d8ff7cc registration error step takes different props 2019-11-05 12:09:56 -05:00
Ben Wheeler
df6c369e89 Added error strings for particular join flow errors 2019-11-05 12:09:55 -05:00
Ben Wheeler
b6fcffd6f3 correct misspelled join flow intl id 2019-10-31 23:21:21 -04:00
Benjamin Wheeler
20d9ab64ac
Revert "fixed country options to use full country name string as option value" 2019-10-31 10:56:46 -04:00
kosiecki17
3cd5e9679b
HoC Redirect to Talking Tales and Code a Cartoon 2019-10-30 15:23:20 -04:00
Ben Wheeler
6bf27b7e8a count unicode characters as single characters 2019-10-30 15:06:22 -04:00
Ben Wheeler
652871f0bd removed password length code, moved to separate PR 2019-10-30 14:32:04 -04:00
Nandakumar Edamana
f54cf1a639 fixed a margin issue caused by the previous fix 2019-10-27 17:07:43 +05:30
Nandakumar Edamana
4e3956e1e4 fixed the issue "Create a Username" has different font weight 2019-10-27 16:57:55 +05:30
Ben Wheeler
49fe86ae3c username step and email step caches ignore api failures 2019-10-23 17:02:57 -04:00
Ray Schamp
6631bbafb2
Merge pull request #3469 from rschamp/fix-dev-server 
Fix dev server by splitting up redirect regex
 2019-10-21 16:28:33 -04:00
Benjamin Wheeler
a85c1c3f78
Merge pull request #3468 from benjiwheeler/country-data-name-fix 
fixed country options to use full country name string as option value
 2019-10-21 16:12:25 -04:00
rschamp
21a8f4d5be Fix dev server by splitting up redirect regex 
This pattern works for building/deploying, but not for running locally. Split it up to deal with what express expects a path to look like.
 2019-10-21 13:51:50 -04:00
Ben Wheeler
f26a83423c fixed country options 2019-10-21 12:33:34 -04:00
Benjamin Wheeler
d9bd2baf15
Merge pull request #3424 from benjiwheeler/join-flow-splash-join-button 
splash page join button works with new join flow
 2019-10-21 12:18:01 -04:00
Benjamin Wheeler
fdbbc5e632
Merge pull request #3423 from benjiwheeler/join-flow-select-text 
make text selectable, so users can copy errors
 2019-10-21 11:17:02 -04:00
Benjamin Wheeler
e0658585cc
Merge pull request #3462 from benjiwheeler/join-flow-error-state-limit-one-retry 
Join flow error state limit one retry
 2019-10-21 10:44:18 -04:00
Ben Wheeler
c499624345 make text selectable, so users can copy errors 2019-10-18 13:54:59 -04:00
Ben Wheeler
cd5f3b5437 change method of redirecting user to join flow page 2019-10-18 11:53:31 -04:00
Ben Wheeler
baa4e0e2c3 refactor intro.jsx and navigation.jsx to use new navigation reducer single registration open request action 2019-10-17 23:38:54 -04:00
Ben Wheeler
d4676ec990 redo navigation reducer to handle registration request with single action 2019-10-17 23:38:54 -04:00
Ben Wheeler
ed99e410f5 splash page join button works with new join flow 2019-10-17 23:38:54 -04:00
Ben Wheeler
0dfd1cf9fc added comment about setting initial state 2019-10-17 23:34:31 -04:00
Ben Wheeler
eeb9f03887 use initialState to set, reset state of join-flow component 2019-10-17 23:32:06 -04:00
Ben Wheeler
3469f17bfe error step can show try again, or start over; limits to one retry 2019-10-17 22:25:00 -04:00
Ben Wheeler
1c3eca3e06 add start over string, make capitalization consistent in make a project 2019-10-17 22:23:14 -04:00
Ben Wheeler
8b78fcb8db always load captcha on email step 2019-10-17 22:22:44 -04:00
Ray Schamp
699bd84190
Merge pull request #3459 from LLK/hotfix/hoc-redirects 
[Develop] Add redirects for Make it Fly and Imagine If tutorials
 2019-10-17 16:58:08 -04:00
rschamp
82e6e2c412 Add redirects for Make it Fly and Imagine If tutorials 
Resolves #3390
 2019-10-17 10:49:27 -04:00
Benjamin Wheeler
3e6e87c3a4
Merge pull request #3417 from benjiwheeler/join-flow-cache-remote 
Join flow cache remote
 2019-10-17 08:23:47 -04:00
Benjamin Wheeler
f271a4f0c3
Merge pull request #3444 from benjiwheeler/join-flow-sentry-wrap 
Add Sentry to Join Flow; set Sentry tags on various ErrorBoundaries
 2019-10-16 16:34:43 -04:00
Benjamin Wheeler
6b6b415069
Merge pull request #3434 from benjiwheeler/join-flow-responsive-more 
Join flow responsive changes for input, button and select widths
 2019-10-16 16:19:50 -04:00
Ben Wheeler
226134bc81 renamed ErrorBoundary prop name to componentName 2019-10-11 17:17:50 -04:00
Benjamin Wheeler
757ac80677
Merge pull request #3427 from benjiwheeler/join-flow-autocomplete-3 
turn off automplete and autocorrect for join-flow inputs
 2019-10-11 16:28:25 -04:00
Benjamin Wheeler
14c6211614
Merge pull request #3435 from benjiwheeler/join-flow-image-bg-color 
Join flow image preview using background color
 2019-10-11 16:27:48 -04:00
Ben Wheeler
91a05d636f redo sentry tag key and values, move ErrorBoundary around embed 2019-10-10 13:15:35 -04:00
Chris Garrity
c93dd77aef Remove reference to Chrome/Android in FAQ 2019-10-10 11:17:35 -04:00
Ben Wheeler
cd73afee1b use ‘scratch-www’ rather than ‘www’ in report to sentry 2019-10-09 23:05:23 -04:00
Ben Wheeler
fbbf467878 set ‘www’ as tag, rather than environment 2019-10-09 22:48:11 -04:00
Ben Wheeler
54f30fc944 set errorboundary name tag everywhere ErrorBoundary is used 2019-10-09 22:30:59 -04:00
Ben Wheeler
0f8eb638cc add support in ErrorBoundary for setting errorboundary tag 2019-10-09 22:30:35 -04:00
Ben Wheeler
46ef423c5d set sentry environment in www 2019-10-09 22:29:12 -04:00
Ben Wheeler
e45397d250 custom birth month and year width for small window sizes 2019-10-07 16:51:00 -04:00
Ben Wheeler
abc85fe3be change calculation for join flow modal inner content width, to be more friedly at small sizes 2019-10-07 16:51:00 -04:00
Ben Wheeler
5b60366985 change how we handle the width of gender custom input 2019-10-07 16:51:00 -04:00
Benjamin Wheeler
3a06ad81b1
Merge pull request #3425 from benjiwheeler/join-flow-truncate-custom-gender 
truncate custom gender, and other inputs
 2019-10-07 12:47:58 -04:00
Benjamin Wheeler
60609dc819
Merge pull request #3430 from benjiwheeler/join-flow-responsive-fixes 
Join flow responsive fixes
 2019-10-07 12:44:30 -04:00
Benjamin Wheeler
0985124f8b
Merge pull request #3431 from benjiwheeler/join-flow-adjust-email-centering 
adjust join flow email centering
 2019-10-07 12:43:45 -04:00
Ben Wheeler
868fb0f044 fix join flow header image height, so color background will be completely covered 2019-10-03 19:26:41 -04:00
Ben Wheeler
e27a7cdbbc pass join flow image background classes through to relevant steps 2019-10-03 19:25:56 -04:00
Ben Wheeler
6da150d02e add background styles for join flow images 2019-10-03 19:24:43 -04:00
Ben Wheeler
6430c58478 add colors to use in join flow image loading background 2019-10-03 19:23:35 -04:00
Ben Wheeler
8a35ec4a21 correct comment to identify yellow as Events, not Control 2019-10-03 19:23:13 -04:00
Ben Wheeler
2a57da32a5 rewrite join view scss without changing styles 2019-10-03 12:39:58 -04:00
Ben Wheeler
2b23a41a45 several fixes to join modal responsiveness 2019-10-03 12:35:36 -04:00
chrisgarrity
62015b8b2d
Merge pull request #3429 from chrisgarrity/chrome-content 
Changes to various pages for the Chrome/Android launch
 2019-10-02 17:01:43 -07: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
Ben Wheeler
17c1a257aa adjust email centering 2019-10-02 18:29:28 -04:00
Benjamin Wheeler
18fd960a6a
Merge pull request #3377 from benjiwheeler/embed-view 
embed view with minimal functionality, route
 2019-10-02 17:32:45 -04:00
Ben Wheeler
644aa272b3 turn off automplete and autocorrect for join-flow inputs 2019-10-01 18:38:47 -04:00
Benjamin Wheeler
28fd111199
Revert "turn off automplete and autocorrect for join-flow inputs" 2019-10-01 18:34:19 -04:00
Ben Wheeler
f9b436182b Revert "removing Page" 
This reverts commit 06124331cc.
 2019-10-01 18:21:14 -04:00
Ben Wheeler
5db507201a truncate username, passwords, and email to their max stored lengths 2019-10-01 18:15:38 -04:00
Ben Wheeler
825c613db8 truncate custom gender to 25 chars long 2019-10-01 18:04:47 -04:00
Ben Wheeler
62fc3457e7 turn off automplete and autocorrect for join-flow inputs 2019-10-01 16:43:33 -04:00
Ben Wheeler
06124331cc removing Page 2019-10-01 00:46:32 -04:00
Ben Wheeler
309e5a77e1 try adding Page to make build succeed 2019-09-30 23:57:11 -04:00
Benjamin Wheeler
a47e1c9898
Merge pull request #3418 from benjiwheeler/join-flow-move-modal-down 
move join flow modal down in small window widths
 2019-09-30 17:02:46 -04:00
Benjamin Wheeler
d4d4adc9f9
Merge pull request #3362 from benjiwheeler/join-flow-spinner-simple 
format and update timing of join flow spinner
 2019-09-30 16:49:52 -04:00
Benjamin Wheeler
fdeb87fce9
Merge pull request #3383 from benjiwheeler/join-flow-navigate-to-join-page 
scratch3 join flow redirects to /join, outside editor
 2019-09-30 16:44:24 -04:00
Benjamin Wheeler
aabdd128f4
Merge pull request #3416 from benjiwheeler/join-flow-show-password-default 
change password default; remove unused state var
 2019-09-30 16:43:50 -04:00
Ben Wheeler
0656ab6a9e added simple memoizing cache for email step 2019-09-30 13:29:17 -04:00
Ben Wheeler
3bc6e7ff6f revised comments 2019-09-30 13:29:17 -04:00
Ben Wheeler
0d4d6a9adc cache remote username check response 2019-09-30 13:29:17 -04:00
Benjamin Wheeler
3c5313d8ce
Merge pull request #3415 from benjiwheeler/join-flow-validation-semi-bold 
make validations semi-bold
 2019-09-30 13:21:29 -04:00
Ben Wheeler
484cf46b8c move join flow modal down in small window widths 2019-09-30 11:49:04 -04:00
Ben Wheeler
60ad7e5125 removed unnecessary return statement 2019-09-30 10:56:42 -04:00
Ben Wheeler
6772dc3b6d refactor project view and embed view to not use shared hoc 2019-09-30 10:49:19 -04:00
Ben Wheeler
4a2553e819 create sentry library for initing Sentry 2019-09-30 10:48:10 -04:00
Ben Wheeler
10e6685a15 remove console.log statements 2019-09-30 10:07:18 -04:00
Ben Wheeler
afb7957d04 moved Sentry init into ProjectViewHOC wrapper’s code 2019-09-30 10:06:33 -04:00
Ben Wheeler
df95f4f116 refactored getProjectData back into only project-view 2019-09-30 10:06:06 -04:00
Ben Wheeler
ae591857a4 removed unnecessary React.Fragment 2019-09-30 10:04:44 -04:00
Ben Wheeler
a2e045f8ef removed extra sentry init 2019-09-28 13:59:43 -04:00
Ben Wheeler
01a273b1f8 refactored project view and embed view to use hoc 2019-09-28 10:19:06 -04:00
Ben Wheeler
ca4a4bcbb3 added project view hoc, not hooked up yes 2019-09-28 10:18:19 -04:00
Ben Wheeler
ae661a48c7 corrected embed route name 2019-09-28 10:17:59 -04:00
Ben Wheeler
3bee3fae4b change password default; remove unused state var 2019-09-26 14:51:33 -04:00
Ben Wheeler
51c816c5cf make validations semi-bold 2019-09-26 14:49:42 -04:00
Ben Wheeler
2efb3a7bfa join flow bold text and related design tweaks 2019-09-26 14:46:42 -04:00
Paul Kaplan
db8cc6f80f Make app store links open in a new tab 2019-09-26 10:43:36 -04:00
Paul Kaplan
a3359a487e Update routes files 2019-09-26 10:39:36 -04:00
Ben Wheeler
6ff1a1c4f1 add navigation test 2019-09-26 09:29:02 -04:00
Paul Kaplan
a9a175b3cb
Merge pull request #3384 from benjiwheeler/join-flow-gender-strings 
gender step uses blank default, lcase values
 2019-09-25 16:04:58 -04: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
ccffa35037 change gender string defaults 2019-09-25 09:57:40 -04:00
Ben Wheeler
6fc5705779 revise country placeholder 2019-09-24 20:16:48 -04:00
Ben Wheeler
7e86319a36 wired showCloseButton through new join flow 2019-09-24 18:43:29 -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
Ben Wheeler
465a87d453 use Scratch3Registration instead of JoinModal in /join 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
fd131b84c1 Add Logo to join flow standalone page. 
Will need some css work, especially for small screens.
 2019-09-24 14:21:02 -04:00
picklesrus
1a58095782 Put values directly in render props. 2019-09-24 13:43:34 -04:00
picklesrus
0d60b64c39 Add a prop to Modal that allows you to hide the close button. Set it to show by default and have the standalone join flow page set it to hidden. 2019-09-24 13:43:34 -04:00
Benjamin Wheeler
c609d99e0e
Merge pull request #3386 from benjiwheeler/join-flow-disable-click-outside 
new join flow modal stays open on click outside
 2019-09-24 12:10:56 -04:00
Benjamin Wheeler
0e13c2dd48
Merge pull request #3392 from benjiwheeler/join-flow-validation-positioning 
Join Flow validation positioning/spacing fixes
 2019-09-24 12:10:25 -04:00
Benjamin Wheeler
779520aa2a
Merge pull request #3395 from benjiwheeler/join-flow-responsive-validation 
make validations be the same width as inputs…
 2019-09-24 12:09:43 -04:00
Benjamin Wheeler
117f0cee91
Merge pull request #3394 from benjiwheeler/join-flow-drag 
set modal close icon to draggable false
 2019-09-24 09:29:23 -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
Ben Wheeler
e901deb398 make validations be the same width as inputs… 
…when window is narrow
 2019-09-23 16:26:34 -04:00
Ben Wheeler
d4c791adfb set modal close icon to draggable false 2019-09-23 15:16:20 -04:00
Ben Wheeler
865e0a09dd give join-flow validations more spacing from inputs they refer to; unset width of Required message 2019-09-23 13:23:38 -04:00
Eric Rosenbaum
21e9494e1a Update BOOST troubleshooting to suggest Link update 2019-09-23 11:45:17 -04:00
Ray Schamp
638b4dca5c
Merge pull request #3388 from LLK/hotfix/zalgo 
[Develop] Contain zalgo text
 2019-09-23 10:55:54 -04:00
Ben Wheeler
693c8e11e3 new join flow modal stays open on click outside 2019-09-23 10:36:58 -04:00
Paul Kaplan
e2e9bb8db3
Merge pull request #3375 from LLK/canonical-link 
Include canonical link in project meta tags
 2019-09-23 10:21:59 -04:00
rschamp
cc61683fa3 Contain zalgo text 2019-09-23 10:11:05 -04:00
Benjamin Wheeler
ecdfaeeeec
Merge pull request #3361 from benjiwheeler/join-flow-dropdown-validation 
when select dropdown is focused, clear any validation errors
 2019-09-23 09:56:19 -04:00
Benjamin Wheeler
c683eb9af9
Merge pull request #3381 from benjiwheeler/join-flow-handle-text-overflow 
Join flow handle text overflow more flexibly
 2019-09-23 09:55:55 -04:00
apple502j
f00f11ed4c
Update Code Club Link 2019-09-21 08:25:00 +09:00
Ben Wheeler
d905f624ca gender step uses blank default, lcase values 2019-09-20 18:22:15 -04:00
Ben Wheeler
106ccb34c6 make gender step height more flexible 2019-09-20 17:54:45 -04:00
Ben Wheeler
58baa25d9f scratch3 join flow redirects to /join, outside editor 2019-09-20 17:50:33 -04:00
Ben Wheeler
6bcde6129b shorter description line height 2019-09-20 17:17:53 -04:00
Ben Wheeler
0e7ed0e0fd show info button in a way that does not increase line height 2019-09-20 17:17:38 -04:00
Paul Kaplan
bbbe0f8836
Fix linter issues with prop ordering 2019-09-20 13:48:08 -04:00
Paul Kaplan
aa6e85d863
Include canonical link in project meta tags 
This will tell crawlers that this page and all its exact duplicates (/fullscreen, /editor, /embed, etc...) should be considered the same and use the project page as the canonical crawled page. We had an issue before where by not selected a canonical, google was considering all the project pages duplicates :(
 2019-09-20 08:59:26 -04:00
Ben Wheeler
775173661f embed view with minimal functionality, route 2019-09-19 18:06:52 -04:00
picklesrus
cdd90da423 Rename error function. 2019-09-19 13:40:09 -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
Benjamin Wheeler
2e7a687547
Merge pull request #3359 from benjiwheeler/join-flow-placeholder-fixes 
Join flow placeholder fixes
 2019-09-17 21:43:06 -04:00
Ben Wheeler
d2bfa13d0a set size of join flow next step spinner 2019-09-16 22:49:28 -04:00
Ben Wheeler
5d1c46d24f slower spinner animation, with bezier timing 2019-09-16 22:41:28 -04:00
Ben Wheeler
628e00f401 when select dropdown is focused, clear any validation errors 2019-09-16 22:34:32 -04:00
Ben Wheeler
8f45c12b89 fix welcome vertical spacing, make it flexible 2019-09-16 21:49:06 -04:00
Ben Wheeler
87e8b18ab1 comment placeholder option 2019-09-16 21:45:45 -04:00
Ben Wheeler
e9605dcca1 disable birthdate placeholders 2019-09-16 21:45:26 -04:00
Ben Wheeler
c034c6c701 make sure correct input css is used for formik input 2019-09-16 21:45:11 -04:00
Benjamin Wheeler
303481b61d
Merge pull request #3352 from benjiwheeler/join-flow-privacy-under 
Join flow revise descriptions and privacy messages
 2019-09-16 21:06:10 -04:00
Ben Wheeler
e95cd8e3d5 moved validation info box shadow, font weight into info-button-message class 2019-09-16 17:00:32 -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
148d1914dd remove unused class 2019-09-15 21:41:05 -04:00
Ben Wheeler
c08c9f8802 country step adjust spacing 2019-09-15 21:38:09 -04:00
Ben Wheeler
4341d364d4 adjust email step vertical spacing, redo its footer 2019-09-15 17:22:25 -04:00
Ben Wheeler
b82787fc6d move info button down, and give its message a shadow 2019-09-15 17:12:57 -04:00
Ben Wheeler
31d8189e54 format each join flow title’s padding differently 2019-09-15 17:11:43 -04:00
Ben Wheeler
ad3940555e remove descriptions from several join flow steps 2019-09-15 17:09:57 -04:00
Ben Wheeler
8bc83fa136 move privacy message to below inputs; format color 2019-09-15 17:08:40 -04:00
Benjamin Wheeler
df2fc74031
Merge pull request #3335 from benjiwheeler/join-flow-reorder 
reorder join flow to put country second
 2019-09-12 16:25:53 -04:00
Ray Schamp
18b2ffe934
Merge pull request #3343 from LLK/hotfix/scratch-desktop-3.6.0 
Release Scratch Desktop 3.6.0
 2019-09-12 13:58:30 -04:00
Christopher Willis-Ford
ab35d1ee64 release Scratch Desktop 3.6.0 2019-09-12 09:46:06 -07:00
Ben Wheeler
cc578109fa put back missing refreshSession() call 2019-09-12 10:45:48 -04:00
picklesrus
b15dcaa2bc Add captcha token to ther request. It was left out of #3291. 2019-09-11 12:36:56 -04:00
Ben Wheeler
70baf75f5e reorder join flow to put country second 2019-09-11 10:39:46 -04:00
Ben Wheeler
7587c68582 include example of failing response 2019-09-10 16:37:10 -04:00
Ben Wheeler
ce3921bec5 update join flow lint exceptions 2019-09-10 16:37:10 -04:00
Ben Wheeler
9ea6cc8d42 use mergeProps to make tests work 2019-09-10 16:37:10 -04:00
Ben Wheeler
1d976c7cdf refactor handleRegistrationResponse 2019-09-10 16:34:23 -04:00
Ben Wheeler
643b4a611b comment preventDefault() 2019-09-10 16:34:23 -04:00
Ben Wheeler
f693728c1c use consistent quotes in object keys 2019-09-10 16:34:23 -04:00
Ben Wheeler
ce5558f8e2 refactor advance step and register functions 2019-09-10 16:34:23 -04:00
Ben Wheeler
3809d83c36 rename RegistrationError to RegistrationErrorStep 2019-09-10 16:34:23 -04:00
Ben Wheeler
f7a70475e2 added explanatory join flow comments 2019-09-10 16:34:23 -04:00
Ben Wheeler
e44d52b735 added placeholder for g-recaptcha-response 2019-09-10 16:34:23 -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
8f11de675d
Merge pull request #3289 from benjiwheeler/join-flow-validate-email-remotely 
Join flow validate email remotely
 2019-09-10 10:05:27 -04:00
Benjamin Wheeler
8431403322
Merge pull request #3297 from LLK/revert-3296-revert-3295-join-flow-create-project 
on complete join flow, take user to new project
 2019-09-09 10:32:48 -04:00
Ben Wheeler
46351c116d collapse switch cases 2019-09-05 11:53:47 -04:00
Ben Wheeler
55cb112ee9 use params prop instead of inline query params 2019-09-05 11:53:47 -04:00
Ben Wheeler
fa91a57b35 show email validation error until you make a change 2019-09-05 11:53:46 -04:00
Ben Wheeler
d6e5637dbe in email step, use remote validation 2019-09-05 11:53:46 -04:00
Ben Wheeler
020231bb02 add local, remote email validation to validate library 2019-09-05 11:53:46 -04:00
Benjamin Wheeler
f50717d4f9
Merge pull request #3306 from benjiwheeler/join-flow-restyle-next-button 
restyle next button to remove border, add hover color
 2019-09-05 11:28:10 -04:00
Ben Wheeler
c92c0af396 more subtle Next hover state 2019-09-04 12:06:59 -04:00
picklesrus
6e5a2292a6 Requiring the Page component (even though we don't use it) allows www to build without running out of memory. 2019-09-04 10:51:13 -04:00
picklesrus
84be22f335 add in unused Page for testing webpack memory. 2019-09-03 16:57:43 -04:00
picklesrus
49ed43e397 Join flow standalone with no extra stuff. 2019-09-03 16:38:38 -04:00
picklesrus
73c353ba2c
Merge pull request #3276 from picklesrus/captcha-join 
Initial work for captcha in new join flow.
 2019-08-29 16:10:50 -04:00
Ben Wheeler
e3cd4e0628 changed string id to correct one 2019-08-29 11:44:08 -04:00
picklesrus
3c716af744 Fix merge conflicts. 2019-08-29 11:33:50 -04:00
picklesrus
c4d6e3dcef space fixes 2019-08-29 11:26:49 -04:00
picklesrus
f5a44c3458 Only load the captcha js if it hasn't been loaded yet. 2019-08-29 11:26:49 -04:00
picklesrus
350f6e6bab Make it so Create Account button is not clickable until captcha js loads. 2019-08-29 11:26:11 -04:00
picklesrus
b8b76f69ba Make sure the "create account" button is clickable until captcha is actually solved. 2019-08-29 11:24:59 -04:00
picklesrus
f83fa4390c - Undo bad merge changing name of validateEmail function 
- Move loading of capcha js to final step
- add in onload and onerror callbacks for catpcha js loading
 2019-08-29 11:24:59 -04:00
picklesrus
d2cb0818c8 Maybe setup captcha site keys properly? 2019-08-29 11:22:55 -04:00
picklesrus
9d4d2f3c67 Put the captcha badge in the bottom right. 2019-08-29 11:22:55 -04:00
picklesrus
3daba3b907 Initial work for captcha in new join flow. 
TODOS:
- handle error states
- Setup keys for different environments.
- Make sure remote validators are run before captcha.
 2019-08-29 11:22:55 -04:00
Paul Kaplan
ba519e7a0f
Update microbit.jsx 2019-08-29 11:21:10 -04:00
Paul Kaplan
b15229f19f
Update microbit.jsx 2019-08-29 11:01:53 -04:00
Paul Kaplan
1f704a4d4d
Use new tab for PDF download button 2019-08-29 10:58:05 -04:00
Benjamin Wheeler
5ab2bf100b
Merge pull request #3303 from benjiwheeler/join-flow-misc-fixes 
Join flow misc fixes
 2019-08-28 10:28:15 -04:00
Ben Wheeler
2a78723ce4 restyle next button to remove border, add hover color 2019-08-28 10:23:15 -04:00
Benjamin Wheeler
0937b40857
Merge pull request #3302 from benjiwheeler/join-flow-password-font-size 
make password font size large, if password hidden
 2019-08-28 10:10:59 -04:00
Ben Wheeler
b5d71af4c3 restore default orange background color for validation tooltips 2019-08-27 23:01:08 -04:00
Ben Wheeler
9f5dc9928f make password font size large, if password hidden 2019-08-27 16:07:31 -04:00
Ben Wheeler
2c56c8b4cc shift info button down, in alignment with text 2019-08-27 16:06:14 -04:00
Ben Wheeler
81323f755f set validation info box shadow, font weight 2019-08-27 15:25:10 -04:00
Ben Wheeler
606421615a make long strings wrap, so they don’t bleed outside bounds 2019-08-27 15:21:31 -04:00
Ben Wheeler
65b6475ed6 smarter handling of handleCompleteRegistration 2019-08-27 12:15:49 -04:00
Benjamin Wheeler
f8b901844b
Merge pull request #3277 from benjiwheeler/join-flow-gender-validation-positioning 
Join flow birthdate validation positioning
 2019-08-27 11:45:18 -04:00
Ben Wheeler
12631a6c64 also accept error false 2019-08-27 11:44:17 -04:00
Ben Wheeler
425675e760 accept bool as toolTip type 2019-08-27 11:44:02 -04:00
Ben Wheeler
0ebc168f21 comment prop for eslint 
# Conflicts:
#	src/components/registration/scratch3-registration.jsx
 2019-08-26 17:29:33 -04:00
Ben Wheeler
19a15988b2 in email step, auto-focus on first input 2019-08-26 16:02:07 -04:00
Ben Wheeler
ea9d62129a in username step, auto-focus on first input 2019-08-26 16:01:59 -04:00
Ben Wheeler
daeed19dc5 use onSetRef instead of setRef in formik-input 2019-08-26 16:01:42 -04:00
Ben Wheeler
b0bc59f9bd use more user-friendly error message if api call fails 2019-08-26 15:48:16 -04:00