scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-22 13:32:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14425 commits 223 branches 1 tag 526 MiB
Commit graph

1662 commits

Author SHA1 Message Date
Ben Wheeler
c9cbb4a1e0 have join flow use refreshSessionWithRetry() 2019-12-03 21:19:14 -05:00
Paul Kaplan
7129cb2054
Merge pull request #3545 from apple502j/goodbye-jobs-page 
Goodbye jobs page
 2019-11-21 13:13:02 -05:00
picklesrus
d1c7829853 Use indexOf instead of includes because of old browsers. 2019-11-18 14:06:19 -05:00
apple502j
6d9a7d20da Links and test changes 2019-11-19 01:34:19 +09: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
picklesrus
a036d5d13c Put the right value in the password field. This got mixed up in #3512. 2019-11-13 10:10:14 -05:00
Ben Wheeler
48d7209942 remove truncation of password, passwordConfirm 2019-11-12 11:43:23 -05:00
picklesrus
3ad17a4572 Add privacy policy and link to the email step. 2019-11-06 12:32:55 -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
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
a95d17f708 refactor error handling in join flow 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
b6fcffd6f3 correct misspelled join flow intl id 2019-10-31 23:21:21 -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
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
Ben Wheeler
c499624345 make text selectable, so users can copy errors 2019-10-18 13:54:59 -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
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
8b78fcb8db always load captcha on email step 2019-10-17 22:22:44 -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
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
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
2b23a41a45 several fixes to join modal responsiveness 2019-10-03 12:35:36 -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
Ben Wheeler
17c1a257aa adjust email centering 2019-10-02 18:29:28 -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
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
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
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
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
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
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
Ben Wheeler
693c8e11e3 new join flow modal stays open on click outside 2019-09-23 10:36:58 -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
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
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
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
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
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
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
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
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
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
Benjamin Wheeler
110ce59cc7
Revert "Revert "on complete join flow, take user to new project"" 2019-08-26 15:41:32 -04:00
Benjamin Wheeler
607a314189
Revert "on complete join flow, take user to new project" 2019-08-26 15:40:41 -04:00
Ben Wheeler
4270fa4b53 on complete join flow, take user to new project 2019-08-26 15:35:40 -04:00
Ben Wheeler
925f2de024 be safer with arrow-border-width 2019-08-26 14:30:52 -04:00
Ben Wheeler
37c2112a3e remove redundant use of redux registrationOpen 2019-08-26 14:19:08 -04:00
Ben Wheeler
add30d9d26 don’t close registration window when login status updates 2019-08-25 10:18:08 -04:00
Ben Wheeler
4146a7a308 Move flag that controls which join flow we use to redux 2019-08-23 17:30:38 -04:00
Ben Wheeler
98bb0cbb11 make join flow modal stay showing even when session is refreshed 2019-08-23 17:19:12 -04:00
Benjamin Wheeler
0c9e66c777
Merge pull request #3278 from benjiwheeler/join-flow-center-gender-rows 
make gender radio rows center themselves horizontally within the modal
 2019-08-22 10:46:59 -04:00
Benjamin Wheeler
9aee049250
Merge pull request #3279 from benjiwheeler/join-flow-improve-padding 
improve top and bottom positioning for multiple steps
 2019-08-22 10:46:28 -04:00
Benjamin Wheeler
baa3aded83
Merge pull request #3280 from benjiwheeler/join-flow-select-fail 
formik-select handles fail state with orange border
 2019-08-21 16:57:40 +02:00
picklesrus
433f7ebd2f
Merge pull request #3281 from benjiwheeler/join-flow-email-initial 
add missing initial values, remove unnecessary one
 2019-08-21 10:25:27 -04:00
Ben Wheeler
7b076d74c1 add missing initial values, remove unnecessary one 2019-08-21 14:25:21 +02:00
Ben Wheeler
a600d7fe18 formik-select handles fail state with orange border 2019-08-21 14:07:04 +02: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
01941b16de improve top and bottom positioning for multiple steps 2019-08-21 10:52:43 +02:00
Ben Wheeler
ab4369dc28 make caret svgs taller 2019-08-21 10:20:09 +02:00
Ben Wheeler
6285784cd2 improve logic, appearance of birthdate step select elements 2019-08-21 04:00:22 +02:00
Ben Wheeler
af13ec037c info button message should appear on top of validations 2019-08-21 04:00:13 +02:00
Ben Wheeler
16e1a46997 validation messages can position on the left 2019-08-21 04:00:01 +02:00
Ben Wheeler
8bd1119b65 make gender radio rows center themselves horizontally within the modal 2019-08-21 03:58:49 +02:00
Benjamin Wheeler
ae8f5a1e90
Merge pull request #3274 from benjiwheeler/join-flow-misc 
Join flow misc UI improvements
 2019-08-21 01:40:16 +02:00
Ben Wheeler
1512cdb4df restored radio button label htmlFor 2019-08-21 00:31:49 +02:00
Ben Wheeler
2aa5ea0f02 gender step gets custom input ref, focuses on click 2019-08-21 00:31:49 +02:00
Ben Wheeler
5ec8811427 formik-radio-button can pass custom input ref up 2019-08-21 00:31:49 +02:00
Ben Wheeler
b438eed70d formik-input can set ref to its inner input 2019-08-21 00:31:49 +02:00
Ben Wheeler
e55d2f27d8 simplified formik radio handling, attach label to input 2019-08-21 00:30:27 +02:00
Benjamin Wheeler
a5b9cdc410
Merge pull request #3251 from benjiwheeler/join-flow-highlighting-positive 
Join flow: show positive blue tooltips when you focus an input that is empty
 2019-08-21 00:15:57 +02:00
Ben Wheeler
5c5f571438 hackily fix birthdate description wrapping 2019-08-20 20:34:59 +02:00
Benjamin Wheeler
8f64c8b3f8
Merge pull request #3272 from benjiwheeler/join-flow-various-images 
Join flow various images
 2019-08-20 19:27:23 +02:00
Ben Wheeler
c9b22141af add light hiligthing on hover for gender 2019-08-20 02:48:32 +02:00
Ben Wheeler
512c267449 use Country instead of select country 2019-08-20 02:37:17 +02:00
Ben Wheeler
4f0a87e25b removed duplicate confirm password string 2019-08-20 01:20:57 +02:00
Ben Wheeler
5d2b457436 Add microbit cards section, make responsive 2019-08-20 01:16:49 +02:00
Ben Wheeler
9eab36af9a consolidate mentions of “Download PDF” 2019-08-20 01:16:48 +02:00
Ben Wheeler
4740234f29 added custom checkmark svg 2019-08-20 01:01:23 +02:00
Ben Wheeler
ff2cab476d fixed proptypes bug, changed validationmessage to use mode 2019-08-19 23:04:23 +02:00
Ben Wheeler
0998171a67 display username tooltip messages 2019-08-19 23:04:23 +02:00
Ben Wheeler
f8c8dc1663 add support for positive validation messages 2019-08-19 23:03:07 +02:00
Benjamin Wheeler
3f150be19b
Merge pull request #3266 from benjiwheeler/join-flow-info-responsive 
use media queries to make info message responsive
 2019-08-19 18:01:30 +02:00
Ben Wheeler
092d587620 add info button svg 2019-08-19 17:35:36 +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
Benjamin Wheeler
ff3c91f9e0
Merge pull request #3186 from benjiwheeler/join-flow-add-images 
Join flow add images
 2019-08-19 16:23:07 +02:00
Ben Wheeler
aadf087b50 add join flow header images 2019-08-19 16:17:32 +02:00
Ben Wheeler
a609709f41 ability to pass formik checkbox label classname 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
7b53b60cec adjust gender css 2019-08-19 02:13:35 +02:00
Ben Wheeler
a299135260 removed obsolete css 2019-08-19 02:13:23 +02:00
Ben Wheeler
3200d168ea use flex and min-height to force join flow modal heights to be consistent 2019-08-19 01:24:51 +02:00
Ben Wheeler
b7f5d9359c gender step passes a descriptionClassName 2019-08-19 01:24:09 +02:00
Ben Wheeler
69d509fdef join flow step takes a descriptionClassName 2019-08-19 01:23:15 +02:00
Ben Wheeler
d02184daf3 added placeholders to username step 2019-08-18 18:07:33 +02:00
Ben Wheeler
f267af28b3 use media queries to make info message responsive 2019-08-18 04:44:28 +02:00
Ben Wheeler
f2c4a4ade3 trying heights 2019-08-17 00:52:52 -04: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
Ben Wheeler
8a70529692 removed extra, unused value prop 2019-08-13 17:59:11 -04:00
Ben Wheeler
12c41251c1 Add formik checkbox component, Show password checkbox 2019-08-13 17:59:11 -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
46de5a23e1
Merge pull request #3236 from benjiwheeler/join-flow-highlighting 
handle username validation errors states better
 2019-08-13 17:52:00 -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
3f7681821e info button in join flow: add support for, formatting of 2019-08-13 15:29:44 -04:00
Ben Wheeler
775a5edeaa WIP draft of info button tooltip for join flow 2019-08-13 15:29:44 -04:00
Ben Wheeler
7ead9d0e96 use updated strings in join flow 2019-08-13 15:02:25 -04:00
Ben Wheeler
ca6711e860 switch validation error message to just ‘Required’ 2019-08-13 15:02:25 -04:00
Ben Wheeler
aa69de39f3 keep showing validation errors on focus, until first keystroke; prioritize vulgarity 2019-08-13 14:22:46 -04:00
Ben Wheeler
11e2b0bf78 removed ie 10 and 11 css case 2019-08-13 14:22:46 -04:00
Ben Wheeler
f7fac2e41c handle username validation errors states better 2019-08-13 14:22:46 -04:00
Ben Wheeler
85bbd88ae4 fixed nonbinary id 2019-08-13 14:16:10 -04:00
Ben Wheeler
d88661113a make terms of use link underlined 2019-08-13 12:21:50 -04:00
Ben Wheeler
30e68db79e make terms of use a link in email footer 2019-08-13 12:21:03 -04:00
Ben Wheeler
7b70612e02 center email terms of use footer 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
2154fba86c renamed localResult var 2019-08-12 17:56:44 -04:00
Ben Wheeler
3a299cf810 use email-validator library, not isemail 2019-08-12 17:56:44 -04:00
Ben Wheeler
ae706ddb91 added missing comma 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
Ben Wheeler
9639347611 make country listing more efficient; make select wider 2019-08-08 14:52:08 -04:00
Ben Wheeler
bca11b1191 pass disabled prop to formik-select 2019-08-08 09:56:12 -04:00
Ben Wheeler
7a4925ddba add join flow country step 2019-08-08 00:29:04 -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
51aa38fb34 consolidated country-data and contry-list 2019-08-06 00:00:37 -04:00
Ben Wheeler
aca45d4032 replaced id with name in formik-radio-button 2019-08-03 00:08:18 -04:00
Ben Wheeler
c4d7ba0350 changed naming of user-provided radio input from other to custom 2019-08-03 00:08:18 -04:00
Ben Wheeler
8725cee6a1 replaced gender l10n strings with existing ones 2019-08-03 00:08:18 -04:00
Ben Wheeler
a2b96e9bac fixed linting errors 2019-08-03 00:08:18 -04:00
Ben Wheeler
0be2f463c3 removed unnecessary validation code 2019-08-03 00:08:18 -04:00
Ben Wheeler
29ea00ab3c correct proptype 2019-08-03 00:08:18 -04:00
Ben Wheeler
150201f8d0 add padding to top of gender step 2019-08-03 00:08:18 -04:00
Ben Wheeler
b7b65ec3ee remove formik input inline prop 2019-08-03 00:08:18 -04:00
Ben Wheeler
40c90e2d2e formik input can be made to appear inline 2019-08-03 00:08:18 -04:00
Ben Wheeler
bd83a282c5 gender step handles other option 2019-08-03 00:08:18 -04:00
Ben Wheeler
cf42b8b3a1 formik input accepts classname from radio option other 2019-08-03 00:08:17 -04:00
Ben Wheeler
26ab2b1366 validate gender step by defaulting to prefer not to say 2019-08-03 00:08:17 -04:00
Ben Wheeler
e22a848350 add GenderOption component to handle most gender radio options 2019-08-03 00:08:17 -04:00
Ben Wheeler
5de681fd68 remove header image and set height of overall gender step 2019-08-03 00:08:17 -04:00
Ben Wheeler
d70df3c91a add gender step to join flow sequence 2019-08-03 00:07:11 -04:00
Ben Wheeler
9e2a3eb3e3 add gender step draft, formik radio button draft 2019-08-03 00:07:11 -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
Ray Schamp
1da17e4035
Merge pull request #3192 from LLK/hotfix/registration-recaptcha 
[Develop] Adjust height when displaying reCAPTCHA challenge
 2019-07-31 09:03:25 -04:00
Ben Wheeler
db3c73c267 removed errant birth_month and birth_year variables 2019-07-30 14:21:19 -04:00
Ben Wheeler
a435626ae1 added stubs for email step, welcome step 2019-07-29 22:29:04 -04:00
Ben Wheeler
651807438a better validation positioning on birthdate step 2019-07-29 16:32:20 -04:00
Benjamin Wheeler
4d5232bec5
Merge pull request #3179 from benjiwheeler/join-flow-missing-strings 
added missing strings to join flow
 2019-07-29 16:25:34 -04:00
Ray Schamp
fe15a89486 Adjust height when displaying reCAPTCHA challenge 2019-07-29 12:03:59 -04:00
Benjamin Wheeler
986707ccf8
Merge pull request #3180 from benjiwheeler/join-flow-design-tweaks 
Join flow design tweaks
 2019-07-29 10:09:09 -04:00
Ben Wheeler
1cd0713bb9 added missing strings to join flow 2019-07-26 22:10:21 -04:00
Ben Wheeler
e5b80bb8c3 better line spacing for join flow descriptions 2019-07-26 13:39:33 -04:00
Benjamin Wheeler
0ac7cc7ab0
Merge pull request #3136 from benjiwheeler/fix-add-to-studio-height 
fix add-to-studio modal height, gradient interference
 2019-07-23 12:14:27 -04:00
Ben Wheeler
1e9b9a537d correct select padding 2019-07-23 12:09:10 -04:00
Ben Wheeler
77780bd94c whitespace fixes for linting 2019-07-22 21:24:37 -04:00
Ben Wheeler
1757f28a5e add missing props declarations 2019-07-22 21:24:37 -04:00
Ben Wheeler
87c1bc5858 add noopener noreferrer to fix lint errors 2019-07-22 21:24:37 -04:00
Ben Wheeler
740f1fb466 split join-flow-steps into separate files; simplify birth year options 2019-07-18 21:18:34 -04:00
Ben Wheeler
e33d7dd0ee Simplify birth month option generation 2019-07-18 21:18:34 -04:00
Ben Wheeler
55e7ada760 validate birthdate 2019-07-18 21:18:34 -04:00
Ben Wheeler
9539afd0e2 add birthdate header image 2019-07-18 21:18:33 -04:00
Ben Wheeler
d6c34f83ae add birthdate month and year header labels, initial vals 2019-07-18 21:18:33 -04:00
Ben Wheeler
71baf3e802 birthdate month and year layout 2019-07-18 21:18:33 -04:00
Ben Wheeler
39fd6b07ea added draft of birth date step; localize birth month string 2019-07-18 21:18:33 -04:00
Ben Wheeler
c8800d8663 After rebasing on develop, reintroduce changes 2019-07-17 12:58:50 -04:00
Ben Wheeler
faa37ae270 rename row-relative to row-with-tooltip 2019-07-17 12:52:42 -04:00
Ben Wheeler
911ecc8516 Format validation; redo of PR 3116 2019-07-17 12:52:42 -04:00
Benjamin Wheeler
62f30c7a8b
Merge pull request #3138 from benjiwheeler/join-flow-improve-css 
Improve formatting of join flow title, description, next step button
 2019-07-17 00:02:05 -04:00
Ben Wheeler
681e7d9a74 move next step font size to next-step-button.scss 2019-07-17 00:00:31 -04:00
Ben Wheeler
a85ad87028 Improve formatting of join flow title, description, next step button 2019-07-15 17:29:09 -04:00
Ben Wheeler
27cb6199b5 use padding rather than margin to avoid margin collapse; drop overflow clear approach 2019-07-15 16:07:39 -04:00
Ben Wheeler
2773495878 Format join flow using ModalTitle, ModalInnerContent, NextStepButton components 2019-07-15 09:58:41 -04:00
Ben Wheeler
862bc8000f fix add-to-studio modal height, gradient interference 2019-07-15 06:27:13 -04:00
Ben Wheeler
9084fb8bfd use existing select css 2019-07-12 14:43:22 -04:00
Ben Wheeler
658cb1d61e specify PropTypes format of formik-select options 2019-07-12 13:32:21 -04:00
Ben Wheeler
3d0da891a9 introduce formik select component 2019-07-12 12:47:02 -04:00
Benjamin Wheeler
07419526cd
Merge pull request #3119 from benjiwheeler/join-flow-advance-step 
handle join flow state for tracking, advancing current step
 2019-07-12 11:42:57 -04:00
Ben Wheeler
a1ed49084f add ModalInnerContent component, use it in modals 2019-07-11 16:10:33 -04:00
Benjamin Wheeler
86261ec1ef
Revert "add ModalInnerContent component, use it in modals" 2019-07-11 11:06:02 -04:00
Benjamin Wheeler
5214eeda6e
Revert "Format and position validation error messages in join flow" 2019-07-11 10:54:17 -04:00
Ben Wheeler
dd7a57d866 handle join flow state for tracking, advancing current step 2019-07-10 21:49:04 -04:00
Ben Wheeler
d4c59522bd comment explaining row relative style for validations 2019-07-10 13:57:52 -04:00
Ben Wheeler
c85214815b position/format validations in join flow 2019-07-10 13:56:04 -04:00
Ben Wheeler
ed5ff981c1 Support for formatting and positioning validation error messages 2019-07-10 13:48:31 -04:00
Ben Wheeler
171d5854ff prevent modal-inner-content margins from unexpectedly collapsing with parent 2019-07-09 23:50:11 -04:00
Ben Wheeler
3a685e38fb add ModalInnerContent component, use it in modals 2019-07-09 22:20:59 -04:00
Ben Wheeler
57d9ab6511 Add classname prop to modal title 2019-07-09 19:42:16 -04:00
Ben Wheeler
f02d41f8b5 created ModalTitle component 2019-07-08 17:42:05 -04:00
Benjamin Wheeler
30a17719c6
Merge pull request #3086 from benjiwheeler/simplify-join-flow-step 
use html form instead of formik form
 2019-07-08 11:49:05 -04:00
Ben Wheeler
a0618b5b4c removed unused css classname, added TODO re: 'hide username' text 2019-07-08 11:47:14 -04:00
Ben Wheeler
b044e973ac simplified export of join flow step 2019-07-02 17:53:10 -04:00
Ben Wheeler
585340d289 removed commented out code from join flow steps 2019-07-02 17:37:56 -04:00
Ben Wheeler
f6d1ba3194 WIP moving join flow validation functions to library 2019-07-02 17:27:44 -04:00
Ben Wheeler
7ecbe905f5 cleared up props passed in and out of username step 2019-06-26 14:44:20 -04:00
Ben Wheeler
15ddd0e86c working username step of join flow 2019-06-26 14:44:20 -04:00
Ben Wheeler
469e9a2626 use html form instead of formik form 2019-06-26 13:50:01 -04:00
Benjamin Wheeler
a445c0ccc1
Merge pull request #3081 from benjiwheeler/fix-formik-validation-message 
fix passing text to validation message
 2019-06-26 11:36:25 -04:00
Ben Wheeler
42721a3d6f fix passing text to validation message 2019-06-25 18:14:09 -04:00
Ben Wheeler
2fbaf4af8e moved join-flow-steps to join flow dir 2019-06-25 17:41:12 -04:00
Benjamin Wheeler
b12694fc12
Merge pull request #3077 from benjiwheeler/join-flow-step 
introduce join-flow-step, next-step-button
 2019-06-25 17:15:03 -04:00
Benjamin Wheeler
249d2b2525
Merge pull request #3076 from benjiwheeler/join-flow-formik-input 
added initial formik input component, form validation message component
 2019-06-25 17:13:51 -04:00
Ben Wheeler
c6fc3621d4 added initial formik input component, form validation message component 2019-06-25 17:06:57 -04:00
Ben Wheeler
3ecefebeb4 introduce join-flow-step, next-step-button 2019-06-25 17:03:35 -04:00
Ben Wheeler
a5bb0bddc3 Rename ExampleStep as UsernameStep, clean up props 2019-06-25 09:40:35 -04:00
Ben Wheeler
69164a5f53 added formik dependency, join flow steps using it 2019-06-24 13:35:01 -04:00
Benjamin Wheeler
c09fd1d5bc
Merge pull request #3074 from benjiwheeler/add-join-flow-component 
stub for join-flow component within modal
 2019-06-24 13:23:31 -04:00
Ben Wheeler
0b69eef56d removed unnecessary redux connect 2019-06-24 11:36:18 -04:00
Ben Wheeler
0468c19665 stub for join-flow component within modal 2019-06-24 11:31:16 -04:00
Ben Wheeler
037f1c66d7 Moved validation message css from card to own file 2019-06-24 11:23:32 -04:00
Ben Wheeler
3375d6d3d5 introduced stub components for new scratch3 join modal 2019-06-18 16:50:27 -04:00
Ben Wheeler
f6cb3d5078 make search urls consistent 
in search urls:
* use %20 for spaces everywhere
* encode search term strings
* hide ‘q’ key if it has no value
 2019-05-10 22:58:33 -04:00
Benjamin Wheeler
d97f5b9d7a
Merge pull request #2924 from benjiwheeler/embed-modal 
Embed/social sharing modal
 2019-05-08 14:53:19 -04:00
Ben Wheeler
4ef73525c4 Revised modal title to Copy Link, use orig icon 2019-05-08 14:36:00 -04:00
Ben Wheeler
73944a34e4 removed unused css for embed modal 2019-05-07 10:54:21 -04:00
Ben Wheeler
4ae4d4232a removed social images and links 2019-05-07 10:54:01 -04:00
Ben Wheeler
6a3110e24e moved and renamed linkUrl to keep url generation in one place 2019-05-06 18:49:57 -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
Eric Rosenbaum
513bbb43cd Fix headline icon size and position 2019-04-30 15:56:20 -04:00
Ben Wheeler
433aabc1c2 cleaned up comments 2019-04-26 14:03:55 -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
63baada567 added social icons and links 2019-04-23 17:11:27 -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
9587de480c first attempt at external share modal 2019-04-18 11:29:00 -04:00
Benjamin Wheeler
32484656ba
Merge pull request #2805 from apple502j/patch-12 
Add SiP Link
 2019-03-26 16:16:41 -04:00
Ben Wheeler
dd3b777763 moved educators SiP from 3-icon section to standalone sub-banner 2019-03-21 09:23:59 -04:00
Ben Wheeler
2a4e076339 corrected mail list form; links use _blank; redirect conference url; logo links to main site 2019-02-28 10:44:30 -05:00
Ben Wheeler
42844a8927 made more conferences 2019 related strings translatable 2019-02-27 16:58:13 -05:00
Ben Wheeler
6668e6d840 updated text and icons per feedback from scratch foundation 2019-02-25 17:22:30 -05:00
Ben Wheeler
42f2486e1c improved 2019 conference responsiveness, improved calendar icon 2019-02-25 13:49:08 -05:00
Ben Wheeler
f33b96d6bf new title image for conference page, new calendar icon 2019-02-20 18:13:07 -05:00
Ben Wheeler
3179f7e59d use solid icons, not outlines ones, on 2019 conference page 2019-02-19 16:26:30 -05:00
Ben Wheeler
9509e698cb initial conference 2019 changes 2019-02-15 12:11:14 -05:00
Benjamin Wheeler
16ca2d7319
Merge pull request #2739 from chrisgarrity/issue/2309-wide-translations 
Wrap ‘need help?’ link when translation is too long
 2019-02-05 09:43:15 -05:00
chrisgarrity
56d2a90bf2 Wrap ‘need help’ link when translation is too long 
Refactored the submit row of the login component to use Flex Row instead of `float: right` for the `need help` link.  The bulk of the changes are white space, so remember to ignore whitespace for review.
 2019-02-05 13:00:41 +01:00
Ben Wheeler
7aa1ba6c42 use slider toggle for turning comments on and off 2019-02-01 17:03:43 -05:00
chrisgarrity
3c661660c8 Make www modal z-index consitent with gui 
The gui uses z-indices up to 500 for things that should be covered by a modal and sets the modal to 510. www should match gui.
 2019-01-30 11:50:07 +01:00
Ben Wheeler
a8d4184b3f renamed frameless.js tablet var to mobileIntermediate, use tabletPortrait for breaks 2019-01-29 10:35:19 -05:00
Ben Wheeler
be975cba26 using tabletPortrait instead of changing value of tablet var, per chrisg's suggestion 2019-01-28 22:36:39 -05:00
Benjamin Wheeler
4d3e46e40b
Revert "Revert "Add to studio modal should only show studios user can actually change"" 2019-01-22 17:07:52 -05:00
Benjamin Wheeler
5ddb7660f6
Revert "Add to studio modal should only show studios user can actually change" 2019-01-17 11:22:00 -05:00
Ben Wheeler
ab82d37720 only show studios user can manipulate in add to studio modal 
Refactored studio list consolidation code for add to studio; set canAdd, 
canRemove flags directly on each studio.

pass flag userOwnsProject through to add to studio modal and its 
buttons.

pass flag isAdmin through to add to studio and its buttons.

set flags in add to studio buttons for whether user has permission to 
add project to studio, remove project from studio.

Set user ability/inability to click add to studio buttons using 
permissions flags and css
 2019-01-16 13:49:54 -05:00
apple502j
d8a0a90e92
Change Credits URL - Footer 2019-01-15 14:49:45 +09:00
apple502j
8e4124f093 Wear helmet on 404 to set title 2019-01-08 13:51:18 +09:00
kyleplo
7cfad7b075
switch to more common options 2019-01-03 09:23:06 -05:00
kyleplo
c7f3ac00e9
Fix font in add to studio modal 2019-01-03 08:30:46 -05:00
Paul Kaplan
0f4b20d5f6
Merge pull request #2530 from colbygk/integrate-sentry-webpack 
Use sentry webpack instead of Raven
 2018-12-20 15:36:46 -05:00
Paul Kaplan
95658d06b8 Fix indentation for linting 2018-12-20 13:38:22 -05:00
chrisgarrity
54ae001e72
Merge pull request #2480 from chrisgarrity/issue/consistent-languages 
Make list of languages on www consistent with gui
 2018-12-20 13:28:19 -05:00
Colby Gutierrez-Kraybill
6a946b99fc Update to new sentry API pattern 
Use current Sentry browser package and forward errorId into eventId
Fix up errorInfo reference
Put Sentry on the window object for GUI to use
Remove unneeded reference to old style Raven and raven-js
Move Sentry webpack config into production only

Add GA tracker ID to window

Allows scratch-gui to use same GA id
 2018-12-20 12:56:33 -05:00
Benjamin Wheeler
3c8cf1a6fc
Merge pull request #2526 from chrisgarrity/feature/2319-masthead 
Implement new Intro masthead
 2018-12-20 11:35:39 -05:00
chrisgarrity
496fdad8be New 3.0 Masthead 
* intro component was changed for new banner masthead layout
* added new video component for embedding wistia (based on extension video, we should probably figure out consolidating the two)
* new and updated strings in splash/l10n.json
* updated splash presentation to move Intro above `inner` to allow it to be full width (like banners)
* new assets
 2018-12-20 07:32:03 -05:00
Paul Kaplan
8af12ec0e1 Show error ID and report React errors to Sentry 2018-12-19 13:47:17 -05:00
chrisgarrity
94a8396713 Make list of languages on www consistent with gui 
start to depend on `scratch-l10n`

So far only the supported locales is used.

There is one small difference between scratch-l10n and the `languages.json` that was removed.
languages was:
`{locale: ‘languagename’, …}` key value pairs.

l10n exports:
`{locale: {name: ‘languagename’},…}

That required an additional change to the language chooser.
 2018-12-13 16:00:41 -05:00
Eric Rosenbaum
e170a9cd4a
Merge pull request #2455 from ericrosenbaum/feature/ideas-page 
Ideas page
 2018-12-13 13:58:55 -05:00
Paul Kaplan
cac7c2ff49
Merge pull request #2457 from paulkaplan/scroll-studios 
Fix scrollbars for add-to-studio modal
 2018-12-13 11:41:59 -05:00
Eric Rosenbaum
7aecb1185d Fix tile layout 2018-12-13 11:13:15 -05:00
Eric Rosenbaum
646624a07f Clicking modal img also opens tutorial 2018-12-13 10:22:47 -05:00
Eric Rosenbaum
600830acc5 Fixing links 2018-12-12 15:57:27 -05:00
Paul Kaplan
1aafd28b0c Fix scrollbars for add-to-studio modal 2018-12-12 15:14:13 -05:00
Eric Rosenbaum
43e7ec6ebf css lint and cleanup 2018-12-12 15:05:36 -05:00
Eric Rosenbaum
8a06137284 Remove unused require 2018-12-12 14:25:25 -05:00
Eric Rosenbaum
20e3812380 First pass at complete layout 2018-12-12 14:17:39 -05:00
Paul Kaplan
bc99c52ebe Fix hard-coded /preview/id url for remix list. 2018-12-11 14:46:05 -05:00
Eric Rosenbaum
7212436f3b Update nav from “tips” to “ideas” 2018-12-10 18:17:05 -05:00
Eric Rosenbaum
8e6af59635 Initial draft of ideas page 2018-12-10 18:06:07 -05:00
Ray Schamp
1979675ebf Don't occlude page content with the admin panel 
/ht @paulkaplan for the idea to move it below the nav bar.
 2018-12-07 13:15:38 -05:00
Ray Schamp
af32c08971
Merge pull request #2413 from rschamp/mod-panel-phase-3 
Match scratchr2 admin panel behavior more closely
 2018-12-06 15:47:48 -05:00
Ray Schamp
b7ffa34eec Open and close admin panel from parent component 2018-12-06 15:05:20 -05:00
Eric Rosenbaum
b49854300b
Merge pull request #2405 from ericrosenbaum/feature/landing-pg-vids 
Add videos to WeDo and EV3 landing pages
 2018-12-06 10:38:19 -05:00
Eric Rosenbaum
c371a3757f Maybe this is the correct order for CSS properties 2018-12-06 09:43:30 -05:00
Ray Schamp
8e75b8c6cf
Merge pull request #2404 from rschamp/mod-panel-phase-1 
Admin panel for the project page
 2018-12-06 09:33:02 -05:00
Eric Rosenbaum
8c6013b243 Add extension video component to wedo and ev3 pages 2018-12-05 17:25:07 -05:00
Ray Schamp
096aeb02a0 Lint 2018-12-05 16:09:04 -05:00
Ray Schamp
726a2005bb Basic project admin panel support 
Just in case we don't do anything else, this "proxies" the old admin panel to the new project page.

Requires https://github.com/LLK/scratchr2/pull/5219 to work.
 2018-12-05 15:40:18 -05:00
Eric Rosenbaum
d206b44abe Add video player to wedo page 2018-12-05 10:48:46 -05:00
Eric Rosenbaum
3c24bf236b Adjust header layout 2018-12-04 14:58:16 -05:00
Eric Rosenbaum
e9c2e8f13f Lint 2018-12-03 17:58:51 -05:00
Eric Rosenbaum
421aabadc1 Update version requirements 2018-12-03 15:29:25 -05:00
Ray Schamp
df3d18e649
Revert "Revert "use cdn.scratch.ly in staging"" 2018-11-21 10:27:13 -05:00
Ray Schamp
45415944c1
Revert "use cdn.scratch.ly in staging" 2018-11-21 10:07:57 -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
Ben Wheeler
7ee463509c use cdn.scratch.ly in staging 2018-11-19 17:07:48 -05:00
Eric Rosenbaum
f77357daf2 Update mac and windows app store links 2018-11-19 15:59:37 -05:00
Eric Rosenbaum
8efb6045ee Lint 2018-11-19 15:22:18 -05:00
Eric Rosenbaum
9ee3c9eb6c App store badges for Link download 2018-11-19 13:51:29 -05:00
chrisgarrity
13b3e57381 open getting started tutorial for logged out users 
- `create` on the navbar opens the getting started tutorial if the user is not logged in
- replaced any other use of `tip_bar=getStarted` with `tutorial=getStarted` (with the exception of Tips page)
- did not replace other uses of `tip_bar=home` as those should probably go to the new tips/ideas page.
 2018-11-12 12:58:59 -05:00
MasterOfTheTiger
12aeba90ed Use https for ScratchJR links 2018-11-09 09:17:04 -08: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
f4887008a5 Extract strings for localizing the preview page 2018-10-23 11:38:34 -04:00
Paul Kaplan
8acbf05b1a
Merge pull request #2211 from paulkaplan/fix-studio-modal 
Connect the consolidated studio data directly
 2018-10-19 10:44:32 -04:00
chrisgarrity
b0a5f7feff
Merge pull request #2183 from sehgalvibhor/character-fix 
Japanese Character Fix
 2018-10-19 09:12:53 -04:00
Paul Kaplan
35abd285df Connect the consolidated studio data directly 
To the modal to prevent constantly updating. Also only render the modals if they are visible
 2018-10-18 16:45:24 -04:00
sjgllghr
6d8235c7e8 Fix gh-2156: Use variables for media queries for consistency (#2182) 
* use variables for media queries

* add medium-and-intermediate media query variable
 2018-10-16 13:28:41 -04:00
Benjamin Wheeler
9106a14340
made account menu have min-width, changed max-width to rem from px (#2181) 2018-10-15 16:00:47 -04:00
Vibhor Sehgal
1ae8180aa4 Fix Select Menu in Messages Section (#2179) 
* Fix width for Select in Message Section

* Removed extra CSS property

* Removed Margin property; Not required

* Fix for the CI test
 2018-10-15 06:48:29 -04:00
Vibhor Sehgal
d9018185e7 Japanese Character Fix 2018-10-14 13:28:48 +05:30
Benjamin Wheeler
d5343dfb01
fix ReactModal bodyOpenClassName error so that it is entirely omitted, rather than passing null value (#2176) 2018-10-11 16:58:30 -04:00
Paul Kaplan
1f8342b987
Merge pull request #2164 from paulkaplan/comment-report-delete 
Comment report action and modal flow for deleting
 2018-10-11 11:08:07 -04:00
Benjamin Wheeler
8b222f0466
fix base modal prop passed to ReactModal (#2165) 2018-10-10 14:08:59 -04:00
Paul Kaplan
bdde34ba26 Implement report action with modal flow 2018-10-09 11:38:24 -04:00
chrisgarrity
32aa3e66d4
Merge pull request #2153 from LiFaytheGoblin/2133/move-media-queries-to-frameless 
Move media queries used in responsive project page to frameless
 2018-10-09 10:56:11 -04:00
Paul Kaplan
744c90501e Add comments to projects and replies to comments 2018-10-09 09:36:41 -04:00
Linda
d358c45482 media queries used in responsive project page have been moved to frameless.css 2018-10-05 10:25:56 -04:00
Linda
437334b872 resolve merging conflicts 2018-10-03 10:54:53 -04:00
Linda
8009978c06 fixed linting errors 2018-10-03 10:09:44 -04:00
Linda
6f5b5c3278 extract css for new components and make some fixes to validation in report modal 2018-10-03 10:09:44 -04:00
Linda
06bb9c60c4 fixed problem where sometimes there would be two scrollbars 2018-10-02 15:33:15 -04:00
Linda
b03bd51f79 fixed linting error 2018-10-02 13:57:41 -04:00
Linda
7c8fdbfcc3 fixed height of studio buttons scrolling container to fill all modal 2018-10-02 13:49:56 -04:00
Linda
3010db684d
Merge pull request #2116 from LiFaytheGoblin/responsive-project-page/thumbnailcolumns 
Thumbnailcolumns appear at bottom on mobile
 2018-09-28 13:57:24 -04:00
Ray Schamp
5278e77e0c
Merge pull request #2098 from chen-robert/gh1930-teacher-register-year 
Fix gh-1930: Teacher registration dates
 2018-09-28 10:58:26 -04:00
Linda
4299afaec5 fixes to warning and thumbnailcolumns for mobile WIP 2018-09-26 14:35:36 -04:00
Linda
35194803b4 fixed linting errors 2018-09-25 16:06:46 -04:00
Linda
a5d2ee18ef fixed validation message for modals 2018-09-25 15:58:10 -04:00
Linda
d061e2afe9 improve responsiveness for project page modals and also clean up the modals a bit 2018-09-25 15:40:27 -04:00
Linda
55cdeea04d wip refactored and responsive project page modals 2018-09-25 15:37:52 -04:00
Benjamin Wheeler
935eb0b15f
move login/registration functions and view state to session reducer, pass to gui (#2078) 
* move login/registration functions and view state to session reducer, pass to gui

* navigation reducer handles login; gui passed renderLogin function

* put back in join class to make smoke tests keep working
 2018-09-24 11:04:30 -04:00
Robert Chen
86551baa94 Fixed Issue 1930 2018-09-20 22:15:24 -07:00
Linda
42f0ed16e5
Merge pull request #2073 from LiFaytheGoblin/2005/animate-add-to-studio-buttons 
Animate add-to-studio-buttons on preview project page
 2018-09-14 12:28:44 -04:00
Linda
497aae2a3c convention fixes 2018-09-13 11:04:14 -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
Linda
1cee3c68fc removed some leftovers 2018-09-11 17:18:09 -04:00
Linda
a8ebdb7d32
Merge pull request #2046 from LiFaytheGoblin/2045/project-page/studio-thumbnails 
Fix appearance of studio thumbnails on preview project page
 2018-09-11 10:10:21 -04:00
Linda
7313f26530 fixed linting errors 2018-09-07 16:45:17 -04:00
Linda
b582b31491 added comments and improved spin animation a little 2018-09-07 16:19:49 -04:00
Linda
ab4f8a09ce the animation now works 2018-09-07 16:11:37 -04:00
Linda
ed604a21d4 add studio buttons animation on preview page, need fixing 2018-09-07 09:26:11 -04:00
Ben Wheeler
4bf0964bf2 moved dispatched navigation function calls to mapDispatchToProps 2018-09-05 17:52:03 -04:00
Benjamin Wheeler
3c6530fe85
Merge pull request #2022 from benjiwheeler/account-nav-component 
split account nav into its own component, pass logout callback to GUI
 2018-09-05 13:32:45 -04:00
Ben Wheeler
f9003077a3 use account-nav class, not account-nav id 2018-09-04 17:15:52 -04:00
Linda
3863e9c5bf remove unnecessary comments 2018-08-28 16:50:34 -04:00
Linda
a1721abc46
Merge pull request #2042 from LiFaytheGoblin/2038/add-to-studio-dialog-entries-cursor 
2038/add to studio dialog entries cursor
 2018-08-28 17:41:44 -03:00
Linda
c52eb610b4
Merge pull request #2041 from LiFaytheGoblin/1991/accessibility-extension-landing 
1991/accessibility extension landing
 2018-08-28 17:37:51 -03:00
Ray Schamp
e6ea1e301d
Merge pull request #2037 from LiFaytheGoblin/2016/add-to-studio-dialog-clip-studio-name 
2016/add to studio dialog clip studio name
 2018-08-28 16:08:29 -04:00
Ben Wheeler
733134c421 pass through logout callback to GUI 2018-08-27 18:56:27 -04:00
Linda
10aa57e4a2 fixed ordering and so in css 2018-08-24 09:25:04 -04:00
Linda
d95ee37c04 now you can see the full title of something when hovering over the title which might be cut off 2018-08-24 09:09:17 -04:00
Linda
79e80aea54 improved remix and studio row 2018-08-24 09:05:08 -04:00
Linda
ba919062f3 changed look of studio thumbnails 2018-08-24 08:41:37 -04:00
Ben Wheeler
796ad7b152 split account nav into its own component 2018-08-23 14:10:55 -04:00
Linda
50242a3bb1 added pointer cursor style to the buttons that add or remove a project to or from a studio 2018-08-23 11:32:18 -04:00
Linda
f934b9bc7e fixed some intendation 2018-08-23 11:18:12 -04:00
Linda
641e9895f6 updated from develop with new extension landing pages 2018-08-22 18:05:57 -04:00
Linda
56d9ac2af9 resolve travis errors caused by wrong ordering of css stuff 2018-08-22 16:48:07 -04:00
Eric Rosenbaum
78b32597c5
Merge branch 'develop' into hotfix/extension-landing-pages 2018-08-22 16:28:52 -04:00
Linda
68c7616a25 remove now obsolete truncate library 2018-08-22 15:10:19 -04:00
Linda
a7c279fab5 cut of studio name on studio adding dialog using css and not using the library for that anymore, also displays full title as a title of the div 2018-08-22 15:05:21 -04:00
Linda
253d6ac279 style fix 2018-08-22 13:32:23 -04:00
Linda
9a91fa9b0a h2 in header is now h1, including overwritten styles 2018-08-22 10:45:19 -04:00
Linda
c26dc79b8d add alt tags to remaining images and correct some 2018-08-22 10:21:28 -04:00
kyleplo
46e24ac3ef
Fix spacing in message title 2018-08-22 08:15:22 -04:00
Linda
bf5a890a87 added alt attributes to img tags in starter projects component and when using this component on ev3 page 2018-08-21 16:07:27 -04:00
Eric Rosenbaum
7be5857120 Add todo comment 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
0c5de6cea1 Detect mac vs windows 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
287bc8405a Use project id links for starter projects instead of downloads 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
43ee8a6631 Lint 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
83232212ab css for outline around screenshot images 2018-08-21 15:16:07 -04:00
Connor Hudson
b604b19641 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-21 15:13: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
7aa81199ce modal halo 2018-08-01 15:53:53 -04:00
Benjamin Wheeler
08453f9f7c
Merge branch 'develop' into studio-modal-benwheeler 2018-08-01 14:46:33 -04:00