scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-26 00:58:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5684 commits 219 branches 1 tag 468 MiB
Commit graph

3398 commits

Author SHA1 Message Date
Ray Schamp
e8d58c6884
Move space out of l10n string and into JSX 2020-04-14 10:56:56 -04:00
Ben Wheeler
d1366360f1 removed lodash.debounce, use onmouseleave instead 2020-04-14 10:33:59 -04:00
apple502j
8ca097fde2 Rename followee to studio 2020-04-14 13:47:07 +09:00
-Accio-
4c0e13a154
Make desc1a bold 
Made desc1a bold in order to emphasize it, and added a line break betwwen regestrationDelayed and connectNow
 2020-04-13 21:25:03 -04:00
-Accio-
952f95c784
Seperate desc1 
Seperate desc1 into desc1 and desc1a so that desc1a can be bolded in order to emphasize it.
 2020-04-13 21:19:56 -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
Benjamin Wheeler
ae04860160
Merge pull request #3788 from benjiwheeler/join-endpoint 
added /signup/TOKEN route; handle route alongside existing student signup route
 2020-04-13 14:41:19 -04:00
Ben Wheeler
05e61cc842 changed student signup route from /join/TOKEN to /signup/TOKEN 2020-04-13 13:11:11 -04:00
apple502j
3146ee8b83 Remove app flag 2020-04-14 01:40:05 +09:00
-Accio-
6e68eb0ae5
Fix spacing again 2020-04-12 10:00:34 -04:00
-Accio-
9675bfe76e
Fix spacing 
Co-Authored-By: apple502j <33279053+apple502j@users.noreply.github.com>
 2020-04-12 09:22:38 -04:00
-Accio-
ca2e6fd089
Delay Scratch Conference to 2021 2020-04-11 22:40:14 -04:00
-Accio-
8cf5e09546
Delay Scratch Conference to 2021 2020-04-11 22:39:58 -04:00
Chris Garrity
23306ff336 remove excess space in the form 
There’s too much space after removing the redundant field.
 2020-04-10 16:09:17 -04:00
Chris Garrity
7d9e6ea8b7 Add pop up Help widget 
Initial version of contact us with the pop up Freshdesk help widget.
* adding feature flag `?CONTACT_US_POPUP=true` to the URL allows to switch between current contact-us with form, and new contact-us with popup widget.
* new copy for the contact us page (selected based on feature flag)
* handles scratchr2 redirects by pre-opening the popup on the contact us form and handles multiple parameters
 2020-04-10 12:16:44 -04:00
Chris Garrity
93d7946af7 Remove unnecessary userAgent field 
The Freshdesk form/widget collects Browser and OS meta data so there’s no need to duplicate it.
 2020-04-10 12:08:07 -04:00
seotts
907c0a5228 Merge branch 'report-copy' of github.com:seotts/scratch-www into report-copy 2020-04-08 14:18:38 -04:00
seotts
41b87b0958 use exisiting general string for "Community Guidelines" 2020-04-08 14:14:43 -04:00
Sarah Otts
fed2fe0fa1
remove unnecessary curly brackets 2020-04-08 10:29:33 -04:00
seotts
42cfba3199 Update report copy 2020-04-08 10:10:10 -04:00
Ben Wheeler
2972c528f4 use state.classroom.id instead of url param classroomId 2020-04-06 10:36:06 -04:00
Ben Wheeler
81678b70a7 refactored uri pathname parsing to library 2020-04-03 16:11:45 -04:00
Ben Wheeler
75f8c6429a added join token route; handle route alongside existing student signup uri 2020-04-03 14:40:56 -04:00
seotts
272d96fdba Lints 2020-04-03 10:41:42 -04:00
seotts
8f4a7643cf Open Community Guidelines links in new tabs 2020-04-03 10:25:48 -04:00
apple502j
544b1e1d45 Split follow splash into FollowUser and FollowStudio 2020-04-03 09:15:55 +09:00
seotts
fd79507bf5 Move period inside quotation 2020-04-02 16:29:25 -04:00
seotts
091181d387 Refer correctly to the "Send" button in the Face Reveal prompt 2020-04-02 16:29:25 -04:00
seotts
f2dc3719c6 Remove duplicate i10n string 2020-04-02 16:29:25 -04:00
seotts
8933705c76 Fix linting 2020-04-02 16:29:25 -04:00
seotts
ce4c0f09ec Format report prompts without using FormattedHTMLMessage 2020-04-02 16:29:25 -04:00
seotts
2d6d746922 Format prompts with multiple paragraphs and a list 2020-04-02 16:29:24 -04:00
seotts
035913b954 Subcategories and deadends work 2020-04-02 16:29:24 -04:00
seotts
739cf8117b Add a deadend step to report flow 2020-04-02 16:29:24 -04:00
seotts
af78e4c05e Add subcategory selection if subcategories specified, and submit final report 2020-04-02 16:29:24 -04:00
picklesrus
36ef3222c0 Merge remote-tracking branch 'upstream/develop' into captcha-component-ta 2020-03-27 09:50:50 -04:00
picklesrus
187406938a Make props required 2020-03-27 09:03:45 -04:00
picklesrus
7843ae8d4c Add Captcha to teacher registration. 2020-03-26 16:21:13 -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
picklesrus
0ca47ec8fb
Merge pull request #3740 from picklesrus/educator-faq 
Educator faq updates
 2020-03-20 14:29:08 -04:00
Paul Kaplan
c23805f543
Merge pull request #3753 from LLK/hotfix/multi-step-report 
[Hotfix/Develop] Split project report flow into two steps
 2020-03-18 11:58:01 -04:00
Ray Schamp
507023fa96
Merge pull request #3749 from apple502j/images-403 
Fix image links
 2020-03-18 09:18:48 -04:00
Paul Kaplan
5670b4558a Add modifier class to fix button margin 2020-03-17 10:16:33 -04:00
Paul Kaplan
f796093e79 Revise comments to clarify functionality 2020-03-17 10:03:16 -04:00
Paul Kaplan
bc3a454f4c Split project report flow into multiple steps 2020-03-17 10:03:16 -04:00
picklesrus
09c50d9dde Switch message back to FormattedHTMLMessage because the old version has html in it. 
Change the id of a message whose contents changed to not have html.
 2020-03-16 09:19:31 -04:00
apple502j
7c7887adc4 Fix image links 2020-03-16 15:48:39 +09:00
Chris Garrity
501a5d8fc0 Fix mistakes 
- take captcha off the helpform url
- use encodeUriComponent to make sure semicolons in the agent string don’t mess up the form parameters
- take the `$` end matcher off the route to allow for parameters to be passed
- fix forum links
- fix faq link `/faq` => `/info/faq`
 2020-03-13 09:47:31 -04:00
picklesrus
f2ee4ea985 Change answer to student account deletion question. 2020-03-12 13:51:27 -04:00
chrisgarrity
1d80c946f7
Merge pull request #3737 from LLK/hotfix/scratch-desktop-3.9.0 
[Develop] hotfix/scratch desktop 3.9.0
 2020-03-12 09:06:52 -04:00
picklesrus
ae6648f663 Update to data collection question. 2020-03-10 12:07:08 -04:00
chrisgarrity
9335274765
Merge pull request #3719 from chrisgarrity/freshdesk-contactus 
Add new Contact Us information page
 2020-03-10 10:58:28 -04:00
picklesrus
3b869c36a2 Replace FormattedHtmlMessage with FormattedMessage where it wasn't necessary. 2020-03-10 09:42:48 -04:00
picklesrus
132db9b362 Fix copy/paste error of links 2020-03-09 10:21:24 -04:00
Chris Garrity
e8197e4ffc Address review comments 
* With Carl decided to put the sidebar back even with just one item. It’s still one we want to emphasize.
* made sure the freshdesk js file would not block loading the form (it doesn’t appear to be needed for the form, it’s probably mainly for the pop-up version)
* moved the query processing into a constructor (more idomatic react)
* expanded the form so it should not need to scroll - also noted that in incognito mode a captcha is shown, so created enough space for that to be visible.
 2020-03-06 08:58:30 -05:00
Christopher Willis-Ford
83112f76b2 update scratch-desktop Windows URL for 3.9.0 2020-03-05 13:28:28 -08:00
Christopher Willis-Ford
ffb0bf86a7 make download URLs easier to find and update 2020-03-05 13:28:28 -08:00
Chris Garrity
ee09ba59a4 Add handling for parameters passed in the query from scratchr2 
Scratchr2 has links to contact us from the report (profile|studio) dialogs. Looking at the scratchr2 source, there’s also one for confirmations, so this change handles the additional details in the same way - in the subject and description. In the future we could consider pre-filling specific form fields that we define.
 2020-03-05 11:51:11 -05:00
picklesrus
badc47f81c fix typo 2020-03-05 10:32:50 -05:00
picklesrus
d01b3c8b31 Add 250 student question. 
Change formttedhtmlmessage -> formattedmessage
 2020-03-05 09:15:44 -05:00
picklesrus
4404f2bbf4 Initial commit for educator FAQ updates. 2020-03-04 18:14:32 -05:00
Chris Garrity
f0bcd9f574 Remove the nav section and make the form full width 
Decided that there is no need for the Nav sidebar since we don’t want the link to the Discussions right now. It could come back if we add the knowledge base.
 2020-03-03 11:17:07 -05:00
Ray Schamp
720e2bacba
Merge pull request #3730 from rschamp/hotfix/conference-delay-spacing 
[Develop] Split out message about conference registration delay
 2020-03-03 11:12:07 -05:00
Ray Schamp
0c03a6e8b8
Merge pull request #3729 from rschamp/hotfix/conference-delay-spacing 
[Master] Split out message about conference registration delay
 2020-03-03 11:11:52 -05:00
Chris Garrity
3dc5155c38 Revised wording 2020-03-03 10:10:20 -05:00
rschamp
f596089d0a Split out message about conference registration delay 2020-03-03 09:31:24 -05:00
Paul Kaplan
e43cb7ab4e Reorder and de-red report action on project page 2020-03-03 08:56:25 -05:00
rschamp
3d87f6feed Make updates in response to COVID-19 2020-03-02 15:53:23 -05:00
Chris Garrity
8fc9b57e7d Add new Contact Us information page 
Using the Freshdesk Feedback form
* adds new component HelpForm for the Freshdesk component
* adds new contact-us view
* modifies Information page css with style for a header on the right hand nav section
* adds new route for the contact-us page (is identical to the old scratchr2 URL)
 2020-03-02 11:33:54 -05:00
rschamp
375e525372 Fix dates, be less paranoid about l10n ids 
The strings will get updated, even if the id persists.
 2020-03-02 11:26:34 -05:00
rschamp
3c3b29708d Address various copy-paste errors 
Nice catch @adroitwhiz :)
 2020-03-02 10:16:47 -05:00
rschamp
0e83287b37 Update conference page to open registration 2020-02-29 11:02:09 -05:00
apple502j
a3a22a087a Localize activity messages 2020-02-26 13:52:17 +09:00
Ben Wheeler
049c0b946a use api instead of scratchr2 to validate usernames 2020-02-05 15:48:15 -05:00
Chris Garrity
d55d18a8e0 Update text 2020-02-05 09:00:44 -05:00
Chris Garrity
4fd69c526a Add FAQ about updating the app 
Addresses #3104

Added separate answers for the Downloaded vs Play store versions. Also noted that school managed installations would have to be updated by administrators.
 2020-02-04 11:02:49 -05:00
Paul Kaplan
345da1e41e
Add comments.isNotPermitted string 
We were missing a string for the case where a user has not confirmed their email address. These string IDs are interpolated directly from the error code, so no other change is needed.
 2020-01-30 16:29:08 -05:00
Chris Garrity
70cef7335b Really delete the cookie 
It appears that setting the domain on the cookie prevents it from actually deleting the cookie.
 2020-01-30 09:43:51 -05:00
Chris Garrity
c95d087289 Ensure that the old scratchlanguage cookie is removed if it exists. 
On init, remove the old cookie if it exists.
On the project page, make sure `handleSetLanguage` also sets the domain.
 2020-01-29 16:11:58 -05:00
Chris Garrity
ad2f0fa4e2 Don’t prefix localhost with . 
Need to special case localhost so that changing language works when running locally.
 2020-01-23 16:56:12 -05:00
Chris Garrity
92a729e9c8 Set language cookie domain to allow for cross-domain cookies 
Add leading `.` to the current hostname for the language cookie domain.
 2020-01-22 15:54:05 -05:00
Benjamin Wheeler
10f2a0983a
Merge pull request #3640 from benjiwheeler/join-flow-retry-retry-session 
Retry of the change that retries fetching session
 2020-01-22 10:35:34 -05:00
Ben Wheeler
2d3158a8f7 Introduce new tx-push-www script to automate string push to transifex 2020-01-16 16:06:55 -05:00
Ben Wheeler
6654362b2c fix for session promise issue 2020-01-14 22:03:05 -05: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
25b01b6df9
Merge pull request #3624 from LLK/hotfix/mandrill-outage-page-banner 
[Develop] Hotfix/mandrill outage page banner
 2020-01-09 17:33:29 -05:00
Ben Wheeler
223bed257b changed wording to be more specific abount time 2020-01-09 17:28:19 -05:00
Ben Wheeler
88e59a5b49 Move warning banner from splash to Page 2020-01-11 00:16:34 -05:00
Benjamin Wheeler
1dbe89f2bc
Revert "[Develop] Hotfix/join retry session" 2020-01-09 08:44:27 -05:00
Ben Wheeler
2c40d8c51e draft of mandrill outage banner 2020-01-09 00:03:58 -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
2797405669
Merge pull request #3590 from benjiwheeler/session-error-string-fix 
corrected error messages that wrongly mentioned session
 2020-01-06 18:24:41 -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
Benjamin Wheeler
08386bf427
Merge pull request #3599 from benjiwheeler/instructions-word-break 
break word in project description
 2019-12-18 17:31:40 -05:00
Ben Wheeler
ea1fea8b3d remove work-break: break-word, which is deprecated 2019-12-18 11:32:00 -05:00
chrisgarrity
ca7e766f76
Merge pull request #3609 from LLK/hotfix/chromeos-faq 
[Develop] Hotfix/chromeos faq
 2019-12-18 09:54:31 -05:00
Chris Garrity
037443ba5c Update troubleshooting and FAQ sections for Scratch App and hardware extensions 
Fixes #3570
 2019-12-17 15:42:17 -05:00
Ben Wheeler
5ce878abbb added overflow-wrap 2019-12-17 12:18:16 -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