scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-24 16:18:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10272 commits 216 branches 1 tag 465 MiB
Commit graph

138 commits

Author SHA1 Message Date
picklesrus
d8ad0c38ea Show warning message when user has been muted several times. 2020-12-17 15:43:07 -05:00
picklesrus
19b260a4a5 Add a timeout to stop displaying the mute status when a mute expires. 2020-12-15 14:49:35 -05:00
picklesrus
90ed44d6a8 Fix lint 2020-12-14 20:07:03 -05:00
picklesrus
2f2e95f3e2 Fix merge conflict. 2020-12-14 16:16:09 -05:00
picklesrus
a39244ea6c
Merge branch 'develop' into timeout-mute 2020-12-14 13:27:12 -05:00
picklesrus
242fedbfe6 Add a test that the constructor properly sets muteExpriresAtMs by converting from seconds to ms. 2020-12-14 08:45:08 -05:00
Chris Garrity
57a094179c Fix tests again 2020-12-11 14:42:06 -05:00
Chris Garrity
015f036e93 Update tests 
Tests needed to be updated after wrapping the MuteModal component in the Intl HOC.
 2020-12-11 08:45:29 -05:00
picklesrus
110077e8e8 Rename state's muteExpiresAt to muteExpiresAtMs so units are explicit. 
Also, fix isMuted so it doesn't do an extra unit conversion.
 2020-12-11 08:14:15 -05:00
picklesrus
835a271be4 Show the comment status box on project page loads if the user is muted. 
Don't show the compose box if they're muted, but do show it, but greyed 
out, if they just posted a comment that resulted in a mute.
 2020-12-08 07:28:40 -05:00
picklesrus
f4f6b70f2e
Merge branch 'develop' into readable-time 2020-12-07 16:05:02 -05:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
picklesrus
aed0f024c0 Disable comment box functionality when you've just been muted. 
Also, keep showing the blue comment status box based on when the mute 
expires rather than basing it on the status of the commet box itself.

TODO: css for disabled state.  The grey is there as a placeholder/proof 
of concept.
 2020-11-17 17:04:54 -05:00
picklesrus
6eb7504442 Initial time formatting pass. Does integer minutes, hours, days. 
TODOS:
- set langauge appropriately
- do partial hours and days. e.g. 1 hour 5 minutes instead of just 1
hour.

Add a time formatting utility that formats a relative time in the future.
Use it in the mute modal & comment box.
 2020-11-13 08:26:54 -05:00
picklesrus
e5f97d1f18 Skeleton of code to show mute modal and comment status. 
Still todo:
- l10n
- Time needs formatting
- Compose box needs to be shown/formatted correctly based on mute status
- Blue comment status box need to be sticky
 2020-11-09 11:01:42 -05:00
picklesrus
a567a593fe
Merge pull request #4495 from picklesrus/comment-status 
Commenting status component.
 2020-10-13 09:03:41 -04:00
picklesrus
0e6e49759c Commenting status component. 2020-10-08 15:12:09 -04:00
picklesrus
eccf6be8d2 Add test for mute modal. 2020-10-05 11:09:54 -04:00
picklesrus
6e72f6b4ee Add mute-step unit test. 2020-10-05 08:49:05 -04:00
picklesrus
a67a34a06c remove stray debugger 2020-07-30 11:08:34 -04:00
picklesrus
0036550ae8 Move timeout id out of state to a member variable and add some unittests. 2020-07-30 10:55:18 -04:00
picklesrus
fac3ccad57 Make all times be in ms. 2020-07-17 14:44:36 -04:00
picklesrus
7eeb63cb3f rename SetupMessagePolling to pollForMessages 2020-07-16 12:24:13 -04:00
picklesrus
5de96c373d Exponentially back off the time between message polling instead of doing it every two minutes. 2020-07-06 17:44:28 -04:00
Ben Wheeler
924c862b9e remove email opt-in from join flow 2020-06-12 12:35:34 -04:00
Ben Wheeler
d1366360f1 removed lodash.debounce, use onmouseleave instead 2020-04-14 10:33:59 -04:00
Ben Wheeler
5805d8a0fe first take on toggleable open close state for info messages 
make info button have large, invisible boundary

fix info button ref setting

WIP: experiment with more sophisticated mouseout handling

add lodash debounce

use lodash debounce to reduce info message flickering

tweak info message position per added padding

remove leftover function

update info button tests, add a bunch more
 2020-04-13 17:06:33 -04:00
picklesrus
f9e48973bc Move reCaptcha codeto a component so it can be used in another spot later. 2020-03-24 17:41:22 -04:00
Ben Wheeler
7b46ddf243 Revert "Merge pull request #3628 from LLK/revert-3618-hotfix/join-retry-session" 
This reverts commit 7c9a098598, reversing
changes made to 2c68f2041e.
 2020-01-14 21:58:38 -05:00
Benjamin Wheeler
1dbe89f2bc
Revert "[Develop] Hotfix/join retry session" 2020-01-09 08:44:27 -05:00
Benjamin Wheeler
6a97d44978
Merge pull request #3576 from benjiwheeler/join-flow-retry-session 
Retry fetching session until it succeeds, when registering using join flow
 2019-12-13 15:03:43 -05:00
Ben Wheeler
8635f3b152 revise join flow tests to use refreshSessionWithRetry 2019-12-05 23:27:13 -05:00
picklesrus
b89fe1a985 Add recognition text and links to the bottom of the page. 
Adds a prop to the Page component so each page can say whether or not it 
wants them to appear.
 2019-12-04 16:28:23 -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
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
b2e7a0c9eb revised join flow and registration error tests 2019-11-05 12:12:03 -05:00
Ben Wheeler
b1d71f2a4d revised join flow tests 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
6e83c496c8 revise and add registration error step tests 2019-11-05 12:11:04 -05:00
Ben Wheeler
2a318af246 revise, add join flow tests 2019-11-05 12:11:03 -05:00
Ben Wheeler
cb1332fb90 revised and expanded email step tests 2019-11-04 15:34:17 -05:00
Ben Wheeler
b6fcffd6f3 correct misspelled join flow intl id 2019-10-31 23:21:21 -04:00
Ben Wheeler
53f6b13399 revised tests to distinguish between erroneous remote requests 2019-10-30 17:45:15 -04:00
Ben Wheeler
420e7dfa3e WIP trying to fix tests 2019-10-30 15:34:52 -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
Ben Wheeler
6d3a379d57 revise registration error tests 2019-10-18 11:40:31 -04:00
Ben Wheeler
80ab13d32f added tests for whether registration modal shows up 2019-10-17 23:38:55 -04:00
Ben Wheeler
c1b3efe572 corrected mocked function name 2019-10-17 23:38:55 -04:00
Ben Wheeler
8c30051bdc mocked event in simulated click 2019-10-17 23:38:54 -04:00
Ben Wheeler
a6cca54647 revise navigation.jsx test 2019-10-17 23:38:54 -04:00
Ben Wheeler
16a1fccc27 several tests of join-flow changes 2019-10-17 23:32:26 -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
Ben Wheeler
226134bc81 renamed ErrorBoundary prop name to componentName 2019-10-11 17:17:50 -04:00
Ben Wheeler
46660a2ff9 revised errorboundary tests 2019-10-10 13:31:25 -04:00
Ben Wheeler
487ca236be Add errorboundary tests 2019-10-10 06:59:09 -04:00
Ben Wheeler
319c217e62 updated username test to reflect showPassword default 2019-10-01 18:26:56 -04:00
Ben Wheeler
495879d4a9 added tests for caching of username, email remote responses 2019-09-30 22:53:17 -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
Ben Wheeler
bc77322526 clear store between tests 2019-09-30 11:29:47 -04:00
Ben Wheeler
6ff1a1c4f1 add navigation test 2019-09-26 09:29:02 -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
picklesrus
cdd90da423 Rename error function. 2019-09-19 13:40:09 -04:00
picklesrus
6a45907ded Handle errors of captcha loading by setting error state on JoinFlow. 2019-09-18 10:26:37 -04:00
Ben Wheeler
de4077773a updated email-step test 2019-09-16 20:12:42 -04:00
Ben Wheeler
2c2de08ed3 added tests for RegistrationErrorStep vs Progression 2019-09-10 16:37:10 -04:00
Ben Wheeler
74dbec2d66 registration error test 2019-09-10 16:34:23 -04:00
Ben Wheeler
aec4d90201 join flow test 2019-09-10 16:34:23 -04:00
picklesrus
3d58fc4d12 Standardize on using require instead of import. 
Also fix a silly mistaake aand change the way I'm matching the contents 
of formData to be more specific.
 2019-09-03 17:32:31 -04:00
picklesrus
c9d7293119 use global.recaptcha instead of global.window.grecaptcha. 2019-08-30 13:42:49 -04:00
picklesrus
bd33b166f7 Add a unittest for the EmailStep. 2019-08-29 18:34:07 -04:00
Ben Wheeler
c4712128d5 added test with error, toolTip false 2019-08-27 11:44:18 -04:00
Ben Wheeler
31b1d300f6 added tests of revised validation message 2019-08-20 20:25:44 +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
picklesrus
83bbe40468
Merge pull request #3260 from picklesrus/test-formik-component 
Add simple tests for a couple of Formik components.
 2019-08-19 11:53:42 -04:00
Ben Wheeler
1803641ae8 fixed join flow test 2019-08-19 16:17:32 +02:00
Ben Wheeler
f267af28b3 use media queries to make info message responsive 2019-08-18 04:44:28 +02:00
picklesrus
8de11218cc Add simple unittests for a couple of Formik components. 2019-08-15 13:53:16 -04:00
picklesrus
6a660aabf8
Merge pull request #3216 from picklesrus/test-join-flow 
Add unittest for JoinFlowStep.
 2019-08-14 09:30:08 -04:00
picklesrus
742d33bcfe Remove some whitespace. 2019-08-14 09:04:39 -04:00
Ben Wheeler
5ee98e9ecd added info button test 2019-08-13 15:29:44 -04:00
picklesrus
edfa86e0c1 Rename tests. Move submit button test out into separate test. 2019-08-13 09:21:57 -04:00
picklesrus
a100438db6 Add unittest for JoinFlowStep. 2019-08-05 15:47:47 -04:00
picklesrus
98a25068d6 Enable react linting and move test file to .jsx instead of .js. 2019-08-01 16:16:42 -04:00
picklesrus
0e09e29c80 Add Enzyme to www and add a test for the NextStepButton. This takes our enzyme helpers from gui and copies them here. It also requires a babel plugin to play nicely with jest. 2019-07-31 17:35:57 -04:00