scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 10:58:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8602 commits 216 branches 1 tag 480 MiB
Commit graph

246 commits

Author SHA1 Message Date
seotts
60bf05fbbf Reuse l10n strings instead of duplicating them 2021-03-23 15:45:16 -04:00
Paul Kaplan
99195d6df3 Add studio selector and tests 2021-03-23 15:19:01 -04:00
Paul Kaplan
f03fbb503b Add session selector and tests 2021-03-23 15:18:36 -04:00
Paul Kaplan
2265cd0d90 Add permissions selector and tests 2021-03-23 15:18:17 -04:00
seotts
ccab9566b8 Show different modal message when muted in the past 2021-03-23 11:00:01 -04:00
Sarah Otts
059b6bf2c5
Merge pull request #5166 from seotts/message-already-muted 
When a user is already muted, show a different message in the blue box
 2021-03-22 10:20:15 -04:00
seotts
d8a802fca2 Test that status gets correctly set in constructor 2021-03-19 15:42:54 -04:00
seotts
1744108570 Add test of shoudShowMuteModal when isReply 2021-03-19 15:29:29 -04:00
seotts
94eb3dc6de Continued work 2021-03-18 16:15:11 -04:00
seotts
23da1e2781 Continued work 2021-03-17 16:07:30 -04:00
Paul Kaplan
6b87429e65 Create a redux module for infinitely loading editable lists 2021-03-16 14:17:52 -04:00
seotts
50f49c28a2 remove commented-out test 2021-03-11 16:31:59 -05:00
seotts
936172d70b only show feedback link for new mute 
Add variable for isBad string
 2021-03-11 13:06:51 -05:00
seotts
0a8d8ad6c5 Fix and add tests for feedback link 2021-02-11 15:44:25 -05:00
picklesrus
de5a8026c1 Show the blue box on replies that got the user muted. 2021-02-05 08:16:00 -05:00
picklesrus
9a3fe8f222 Show the correct step of the modal based on whether the reply was just a click to try to reply while already muted or whether they replied and got muted. 2021-02-05 08:01:33 -05:00
picklesrus
92667c097d Add tests and expose steps enum so it can be referenced from outside MuteModal 2021-02-04 11:13:30 -05:00
Sarah Otts
f60a8c71a0
Merge pull request #4901 from seotts/automod-feedback-modal 
Automod feedback modal steps
 2021-02-02 08:58:47 -05:00
picklesrus
6d53018486
Merge pull request #4938 from picklesrus/zero-minutes-fix 
Change time library to default to 1 minute when the time remaining is less than 30 seconds.
 2021-02-01 15:56:37 -05:00
seotts
ba99d49298 Fix FeedbackForm tests + other small fixes 
Add strings
 2021-02-01 15:50:55 -05:00
picklesrus
b8cc0b2b83 Change time library to default to 1 minute when the time remaining is less than 30 seconds. 2021-02-01 09:53:46 -05:00
picklesrus
259446ed8e Set buttons to be disabled (and not just look disabled) when the user was just muted. They were clickable before. 2021-01-28 15:07:20 -05:00
Chris Garrity
eac7552841 Revise messaging when scratchers are muted 
We want folks to use comments appropriately, not punish them. Reword the messaging to be more friendly and encourage positive uses of comments.
 2021-01-26 08:42:41 -05:00
seotts
9df36b0fcf add tests for feedback form, clean-up form 2021-01-25 17:52:59 -05:00
seotts
14c7a7eae0 temporarily remove failing test 2021-01-22 13:16:44 -05:00
picklesrus
1326f71abe
Merge branch 'develop' into timeout-mute 2021-01-14 07:47:47 -05:00
seotts
c8373ab888 Revert "Revert "Add new mute message types"" 
This reverts commit 1575ed06cf.
 2021-01-07 14:04:48 -05:00
Sarah Otts
1575ed06cf
Revert "Add new mute message types" 2021-01-06 16:51:03 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging 2021-01-04 11:09:29 -05:00
picklesrus
15a16e5b58
Merge branch 'develop' into timeout-mute 2020-12-21 08:38:37 -05:00
seotts
7e140b3832 add new mute messages 
Get correct mute message info for modal

remove extra spapce
 2020-12-18 10:24:43 -05:00
picklesrus
ad5dc31cc7 Have mute modal always show if you post a comment and showWarning is true. 2020-12-18 09:30:02 -05:00
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
b1d4c6d1b5 Add backup langauges and remove tests that aren't useful. 2020-12-07 15:38:58 -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
bfc4202d11 Use singular units so the library handles plurals. 2020-11-13 14:14:42 -05:00
picklesrus
13369c3809 add spaces 2020-11-13 08:37:18 -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
597216113b
Merge pull request #4293 from LLK/hotfix/messages 
[Develop] Hotfix/messages
 2020-08-10 12:25:45 -04:00
picklesrus
05075712e8
Merge pull request #4292 from picklesrus/backoff-messages 
Exponentially back off the time between message polling.
 2020-08-07 14:45:56 -04:00
picklesrus
6078c3653b Puts back the original change but sets the default to Lax instead of Strict. Scratchr2 needs these cookies sent on top level navigations. 2020-08-05 10:50:06 -04:00
picklesrus
62629413a7
Revert "Make the cookie library set the SameSite cookie value to strict by default" 2020-08-03 14:45:34 -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
34c8652ffb Fix capitalization: cookie library we use requires sameSite in opts object to have a lowercase s. 2020-07-20 15:32:54 -04:00
picklesrus
10a4e92d21 Make the cookie library set the SamSite cookie value to strict by default. If callers want to set it to something else, they can pass it through the opts object like they can 'exprires'. 
Also added a test file for jar.js so I could test the set method. The 
other methods remain untested.
 2020-07-20 15:18:09 -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
Benjamin Wheeler
21ccd45f9b
Merge pull request #4121 from apple502j/wiki-link 
Set wiki link per user's selected language
 2020-07-09 14:20:28 -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
Benjamin Wheeler
dc79eb54c3
Merge pull request #3974 from benjiwheeler/move-to-country-data-lib 
move country name lookup to library
 2020-06-19 10:44:26 -04:00
Ben Wheeler
d388eef59f renamed lookupCountryInfo and lookupCountryName functions 2020-06-19 10:42:34 -04:00
apple502j
a903e3e9b2 Set wiki link per user's selected language 2020-06-18 20:22:22 +09: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
Ben Wheeler
05e61cc842 changed student signup route from /join/TOKEN to /signup/TOKEN 2020-04-13 13:11:11 -04:00
Ben Wheeler
81678b70a7 refactored uri pathname parsing to library 2020-04-03 16:11:45 -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
ae96ac7eed
Merge pull request #3618 from LLK/hotfix/join-retry-session 
[Develop] Hotfix/join retry session
 2020-01-07 14:36:38 -05:00
Benjamin Wheeler
e0c562bfa6
Merge pull request #3484 from benjiwheeler/join-flow-count-unicode 
count unicode characters as single characters
 2020-01-02 15:15:29 -05:00
Ben Wheeler
d53fe43241 fix bug, updating session request retry code per rschamp's feedback 2019-12-16 17:53:30 -05:00
Ben Wheeler
69e519286d session tests mock api response various ways 2019-12-16 13:35:24 -05:00
Ben Wheeler
0c71121540 session testing WIP 2019-12-14 22:44:38 -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
Ben Wheeler
419f996f75 revise username spaces test 2019-11-19 16:25:21 -05:00
picklesrus
5b351b6515 Roll out new Join Flow. 2019-11-15 11:28:10 -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
dd3e1c9f28 update country data test 2019-11-05 18:31:13 -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
b2e7a0c9eb revised join flow and registration error tests 2019-11-05 12:12:03 -05:00
Ben Wheeler
0305fff670 added test for error string with no message 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