scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 08:41:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
9274 commits 221 branches 1 tag 507 MiB
Commit graph

4523 commits

Author SHA1 Message Date
Paul Kaplan
ecd4fa9438
Merge pull request #5458 from ericrosenbaum/studio-report-responsive 
Studio report modal style fixes
 2021-05-20 10:04:23 -04:00
Paul Kaplan
29bb2f1f5a Make the clickable items show a clickable cursor 2021-05-20 10:02:27 -04:00
Paul Kaplan
8832d31fd9
Merge pull request #5444 from paulkaplan/studio-admin-panel 
Studio admin panel
 2021-05-20 09:37:59 -04:00
Paul Kaplan
85172b78fa Use log.error instead of console 2021-05-20 09:32:31 -04:00
Eric Rosenbaum
5acff71cf7 adjust size of thanks modal 2021-05-19 22:44:43 -04:00
Eric Rosenbaum
a621449153 add studio report thanks image 2021-05-19 17:01:15 -04:00
Eric Rosenbaum
39a54b0bd3 update studio report modal text 2021-05-19 15:57:45 -04:00
Paul Kaplan
d0465acb21
Merge pull request #5440 from apple502j/decorate-desc 
Linkify studio descriptions
 2021-05-19 15:43:02 -04:00
Paul Kaplan
a405908d0b While I'm here, fixup the image styling too 2021-05-19 15:37:11 -04:00
Paul Kaplan
1d72806914 Also use a div for the title so it doesn't use scrollbars and fix the alignment 2021-05-19 15:36:56 -04:00
Paul Kaplan
c039a29189 Use the same class name, use tag selector for styling 2021-05-19 15:36:23 -04:00
Paul Kaplan
8a2cbc5ea4 Dont timeout error alerts 2021-05-19 15:09:06 -04:00
Eric Rosenbaum
70d22a0f1e make studio report modal work on short or narrow screens 2021-05-19 14:27:53 -04:00
Paul Kaplan
64d4bd4fde Do not use project name in duplicate message since we do not have it 2021-05-19 13:54:29 -04:00
Paul Kaplan
e2eb8611b1 Dont catch pointer events in the alert container 2021-05-19 13:46:06 -04:00
Paul Kaplan
9a931b026e Add and use alert providers on curators, managers, projects and project modal 2021-05-19 13:36:16 -04:00
Paul Kaplan
5ee1c7c203 Add reusable alert component using context 2021-05-19 13:33:41 -04:00
apple502j
116d640fdd
Set background to studio-description-text 2021-05-20 00:44:46 +09:00
Paul Kaplan
b38a97adf3 Studio admin panel 2021-05-18 11:41:32 -04:00
Eric Rosenbaum
b37481a601 remove unused import 2021-05-18 11:22:46 -04:00
Eric Rosenbaum
f703578b6c move studio report css into its own file 2021-05-18 11:20:51 -04:00
Eric Rosenbaum
47c12aefa3 move studio report modal into modals dir 2021-05-18 10:41:11 -04:00
Eric Rosenbaum
dc1316c8ff Merge branch 'develop' of https://github.com/LLK/scratch-www into studio-report-modal 2021-05-18 10:08:30 -04:00
apple502j
536caf994a
Linkify studio descriptions 2021-05-18 05:22:02 +09:00
Paul Kaplan
ff2e321067 Add dynamic meta tags for studio pages 2021-05-17 15:47:51 -04:00
Eric Rosenbaum
33a0be0e35 add placeholder for error handling 2021-05-17 15:44:08 -04:00
Paul Kaplan
b0eae61d5b Fix periods 2021-05-17 15:32:16 -04:00
Karishma Chadha
bc77b4b257
Merge pull request #5435 from LLK/hotfix/donate-banner-analytics 
[Develop] Hotfix Donate Banner Update
 2021-05-17 15:31:27 -04:00
Paul Kaplan
efe961e103 Handle more types of project add errors 2021-05-17 15:24:51 -04:00
Eric Rosenbaum
7bfb045c4f style tiles and send button 2021-05-17 15:16:08 -04:00
Paul Kaplan
cc66341252 Wait for session to be fetched before loading comments 2021-05-17 14:53:02 -04:00
Eric Rosenbaum
a1c9744ee8 tile styling 2021-05-17 14:15:37 -04:00
Paul Kaplan
b6baedcbab
Merge pull request #5433 from paulkaplan/fix-thumbnail-caching 2021-05-17 13:55:30 -04:00
Eric Rosenbaum
3698e12c66 style tweaks 2021-05-17 13:43:20 -04:00
Eric Rosenbaum
c7df1227ff constrain thumbnail size 2021-05-17 11:51:21 -04:00
Eric Rosenbaum
ba2ef16c0e studio report tile text content size and overflow 2021-05-17 11:41:18 -04:00
Karishma Chadha
3094602235 Remove end time for donate banner. 2021-05-17 11:32:42 -04:00
Karishma Chadha
cdee0e74f9 Send analytics event when the donate button in the banner is clicked. 2021-05-17 11:31:49 -04:00
Paul Kaplan
168cd5a01b Update the curator invitation component 2021-05-17 11:05:24 -04:00
Eric Rosenbaum
1281d043b7 styling selected state 2021-05-17 10:52:18 -04:00
Eric Rosenbaum
a76f0b3fac styling studio report tiles 2021-05-14 17:08:08 -04:00
Eric Rosenbaum
df30f9bac6 add modal for report received 2021-05-14 16:03:22 -04:00
Paul Kaplan
5be42442f6 Use client-side image preview instead of server response 2021-05-14 16:00:15 -04:00
Eric Rosenbaum
20a342c0a2 Merge branch 'develop' of https://github.com/LLK/scratch-www into studio-report-modal 
# Conflicts:
#	src/views/studio/studio-report.jsx
 2021-05-14 15:20:41 -04:00
Eric Rosenbaum
454ae1e92f don’t use html form 2021-05-14 15:15:27 -04:00
Eric Rosenbaum
3a9742c77e use radio button values in report 2021-05-14 14:51:17 -04:00
Paul Kaplan
789e15c3ab Make enter submit title field instead of adding newlines 2021-05-14 12:53:11 -04:00
Paul Kaplan
5892f2e7ba Allow space to trigger submit on project tiles in modal because they are buttons 2021-05-14 12:52:45 -04:00
Paul Kaplan
f222dec925 Trim whitespace from username input 2021-05-14 12:40:58 -04:00
Paul Kaplan
acc88069e9 Allow curators to remove themselves 2021-05-14 12:37:05 -04:00
Paul Kaplan
31655d7f11 Fix issue where multiple overflow menus could be opened at once 2021-05-14 12:25:04 -04:00
Paul Kaplan
6de19b0450 Fix awkward project thumbnail layout issues 2021-05-14 12:22:02 -04:00
Paul Kaplan
304c456de9 Fix loadMore not working for user-projects-modal 2021-05-14 12:02:42 -04:00
Eric Rosenbaum
28a5ee47aa initial work on studio report modal 2021-05-14 11:46:37 -04:00
Paul Kaplan
44c51a7dc8 Minor style cleanups for studio page 2021-05-14 09:40:56 -04:00
Paul Kaplan
8bc026a958
Merge pull request #5381 from paulkaplan/studio-tile-overflow-menu 
Studio tile overflow menu
 2021-05-14 09:30:56 -04:00
Paul Kaplan
e9728b8a13
Merge pull request #5388 from paulkaplan/studio-project-errors 
Add error display for studio curator and project adder inputs
 2021-05-14 09:30:42 -04:00
Paul Kaplan
d847a57078
Merge branch 'develop' into studio-recent-students 2021-05-14 08:49:25 -04:00
Paul Kaplan
3fad1f6fef
Merge pull request #5397 from paulkaplan/bugfix/studio-playground-may12 
Bug fixes from studio playground test on May 12
 2021-05-14 08:48:43 -04:00
Paul Kaplan
d16042310b Fixup header styling 2021-05-13 21:45:05 -04:00
Paul Kaplan
2962f78881
Merge pull request #5405 from fsih/avatarStyle 
Outlines for avatars
 2021-05-13 21:23:00 -04:00
Paul Kaplan
f9c1b429f0 Include avatar sizing 2021-05-13 21:22:27 -04:00
Paul Kaplan
a88feb5888 add mutating css class for project toggle and fix imports 2021-05-13 21:07:31 -04:00
Paul Kaplan
1b0b5a09b9 Use the correct l10n string, fix imports and add mutating css class 2021-05-13 21:02:54 -04:00
DD Liu
bd2bcd1331 Outlines for avatars 2021-05-13 17:49:23 -04:00
DD Liu
3d1bd3768e Replace checkbox with toggle for whether studio is open to all 2021-05-13 16:20:35 -04:00
DD Liu
cccc3abd57 Adjust padding so that the class can be reused for other pages 2021-05-13 16:05:56 -04:00
DD Liu
dffcbebc37 Switch the checkbox to a toggle slider for studio comments allowed 2021-05-13 15:46:34 -04:00
Paul Kaplan
26704990d7 Bonus: update the loadmore style to match other loader sections 2021-05-13 13:24:24 -04:00
Paul Kaplan
e73312c0d2 Show students filter for educators viewing a classroom studio 2021-05-13 13:23:47 -04:00
Paul Kaplan
134cd927ec Add classroomId to studio reducer 2021-05-13 13:20:26 -04:00
Paul Kaplan
d35c539529 Add validation messages for title, image and description 2021-05-13 10:36:40 -04:00
Zoë Bentley
3fbfb6dfd1 Fixed problem introduced by previous fix 2021-05-13 09:39:08 -04:00
chrisgarrity
132cf487f4
Merge pull request #5391 from LLK/fix-intro-when-logged-in 
fix logic for when to show intro to users
 2021-05-13 09:35:32 -04:00
Paul Kaplan
a190424f7e Make sure modal always fits inside the screen 2021-05-13 09:22:50 -04:00
Paul Kaplan
231fba944a Check for duplicates locally before trying to add the project to the studio 2021-05-13 09:06:04 -04:00
Paul Kaplan
4fcdf9b99f Allow URLs to be passed for the project input 2021-05-13 09:05:23 -04:00
Paul Kaplan
4f6a583277 Add placeholders for project and curator inputs 2021-05-13 09:04:39 -04:00
Paul Kaplan
3a59ea072c Prevent submission of blank curator/project fields 2021-05-13 08:35:46 -04:00
zoebentley
bf55d26e20
Merge branch 'release/2021-05-12' into dev-page-fix 2021-05-12 16:56:26 -04:00
Zoë Bentley
d5af535ea2 Fixes to Developers' Page 2021-05-12 16:52:16 -04:00
Ben Wheeler
d3685610f6 fix logic for when to show intro to users 2021-05-12 16:27:25 -04:00
Ben Wheeler
316f26bed5 rename .close-button style to not conflict 2021-05-12 14:14:34 -04:00
Paul Kaplan
827dad461e Add error display for curator and project adder inputs 2021-05-12 13:37:59 -04:00
Paul Kaplan
d265e45b62 Use OverflowMenu for project and curator tile menus 2021-05-12 10:55:23 -04:00
Paul Kaplan
8dddb393a7 Add overflow menu and show example on components page 2021-05-12 10:53:52 -04:00
Paul Kaplan
397ac7334a
Merge branch 'develop' into studio-empty-states 2021-05-11 14:10:56 -04:00
Paul Kaplan
f61047dda0
Merge branch 'develop' into add-studio-activity-pagination 2021-05-11 13:38:15 -04:00
Paul Kaplan
0fdf54339a Merge branch 'develop' into add-studio-activity-pagination 2021-05-11 12:09:10 -04:00
Paul Kaplan
443dcc28e2 Merge branch 'develop' into feature/studio-project-modal 2021-05-11 12:04:05 -04:00
Eric Rosenbaum
aaff5ab0ce
Merge pull request #5372 from ericrosenbaum/activity-feed-styles 
Styled studio activity feed
 2021-05-11 11:45:24 -04:00
Paul Kaplan
669f701fd3 Fix wrapping on long activity text 2021-05-11 11:33:49 -04:00
Paul Kaplan
b4c9e31d30 Include removecurator notification 2021-05-11 11:33:38 -04:00
Paul Kaplan
02a5c0b4df Fixup usernames 2021-05-11 10:57:26 -04:00
Eric Rosenbaum
4e580054fc use import instead of require 2021-05-11 10:51:07 -04:00
Paul Kaplan
c25fb3a9e4 Add empty states for curators and projects 2021-05-11 09:50:34 -04:00
Paul Kaplan
9904586a38 Merge branch 'develop' into bugfix/studio-playground-may5 2021-05-10 21:11:05 -04:00
Paul Kaplan
64ff2cffdd Move max image size to constant 2021-05-10 21:09:08 -04:00
Paul Kaplan
6ac3012b8c Use formatted message 2021-05-10 21:02:20 -04:00
Paul Kaplan
62b1f8f3a5 Merge branch 'develop' into feature/studio-project-modal 2021-05-10 20:55:20 -04:00
Paul Kaplan
43eb9e4e91 Include if user projects are already in the studio 2021-05-10 20:46:38 -04:00
Karishma Chadha
a9d70b2cc0
Merge pull request #5370 from kchadha/studio-404-page 
Set up studios view with 404 page
 2021-05-10 17:49:30 -04:00
Sarah Otts
70f7a9ef73
Merge pull request #5331 from zoebentley/update-teacher-faq-and-devs-page-2021 
Changed Developers and Teacher FAQ pages
 2021-05-10 16:43:44 -04:00
zoebentley
dfa9b99728
Update src/views/developers/developers.jsx 
Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
 2021-05-10 16:40:48 -04:00
Benjamin Wheeler
4591c65e6f
Merge pull request #5345 from benjiwheeler/donate-banner 
add donate banner, make close button a mode of button component
 2021-05-10 16:14:26 -04:00
Eric Rosenbaum
790e433313 lint 2021-05-10 15:13:02 -04:00
Eric Rosenbaum
94d0f30b71 fix missing comma from merge 2021-05-10 14:45:00 -04:00
Eric Rosenbaum
f55d34aab8 Merge branch 'develop' of https://github.com/LLK/scratch-www into activity-feed-styles 
# Conflicts:
#	src/views/studio/l10n.json
#	src/views/studio/studio.scss
 2021-05-10 14:41:14 -04:00
Karishma Chadha
7876bc4fba
Merge pull request #5359 from kchadha/studio-translation-setup 
Add l10n file to studios view and replace text with formatted message.
 2021-05-10 14:19:40 -04:00
Paul Kaplan
f474525398 Remove unused loadMore functionality from infinite list because it was overly specific, now it is no longer being used by any component 2021-05-10 14:14:46 -04:00
Paul Kaplan
600e5846d0 Move activity loading to studio-activity-actions, include pagination 2021-05-10 14:14:19 -04:00
Karishma Chadha
1b2b595338 Get rid of extra piece of state being tracked in redux and update selector to tell if studio load failed. Use that to display 404 page instead. 2021-05-10 14:01:17 -04:00
Karishma Chadha
040350314b Set up studios view with 404 page 2021-05-10 13:16:15 -04:00
Eric Rosenbaum
cb3ba550d5 add alt text for icons 2021-05-10 13:01:20 -04:00
Eric Rosenbaum
188b51bbbe add icons 2021-05-10 12:14:51 -04:00
Paul Kaplan
e2dafff5b7 Include rate limit and 404 error types 2021-05-10 11:59:37 -04:00
Eric Rosenbaum
de85a25db1 use formatted messages for each activity notification 2021-05-10 11:44:39 -04:00
Paul Kaplan
968afdb412 Fix whitespace 2021-05-10 10:29:24 -04:00
Paul Kaplan
35dbcb07ba Add user projects modal 2021-05-10 10:24:21 -04:00
Paul Kaplan
f1fde9e5f8 Ensure project ID is always a number 2021-05-10 10:23:13 -04:00
Paul Kaplan
95766fd68a Add clear to infinite list, fixup tests 2021-05-10 10:22:18 -04:00
Karishma Chadha
51bf0d6c3d Fix lint error 2021-05-10 10:16:54 -04:00
Ben Wheeler
3dd69c287c Remove stale comments, remove extra space, add padding 2021-05-07 22:23:45 -04:00
Benjamin Wheeler
33e9c88217
Merge pull request #5252 from benjiwheeler/remove-unnecessary-page 
removed unnecessary Page component
 2021-05-07 18:37:32 -04:00
Karishma Chadha
b065ff86d4 Add l10n file to studios view and replace text with formatted message. 2021-05-07 17:04:14 -04:00
Ben Wheeler
3156976fee update method of checking goodlist of pages for banned user to see 2021-05-07 13:14:53 -04:00
Ben Wheeler
23f2135c17 add donate banner, make close button a mode of button component 2021-05-07 11:50:47 -04:00
Paul Kaplan
7c021b6ac5 Catch too large thumbnails before trying to upload 2021-05-06 09:30:43 -04:00
Paul Kaplan
903eef969f Allow Enter key to submit curator and project adders 2021-05-06 09:21:32 -04:00
Paul Kaplan
3785108348 Promoted and added curators should go at the end of the list 2021-05-06 09:14:15 -04:00
Paul Kaplan
be088b9513 Fix tab ordering 2021-05-06 09:03:35 -04:00
Paul Kaplan
27bdabcfeb Fix trailing slash breaking tab navigation 2021-05-06 09:02:05 -04:00
Benjamin Wheeler
732b596c61
Revert "Add privacy policy and terms of use to allowlist" 2021-05-05 16:17:22 -04:00
Paul Kaplan
ec5d424719 Fix firefox mega follower button 2021-05-05 16:08:23 -04:00
Paul Kaplan
bf260acd88 Catch error from user who is already part of studio 2021-05-05 16:08:11 -04:00
Eric Rosenbaum
1232f98195 initial styling 2021-05-05 09:32:46 -04:00
Paul Kaplan
757f95f89c
Merge branch 'develop' into studio-report 2021-05-04 15:13:04 -04:00
Paul Kaplan
2936bc72db
Render the error from reporting 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-05-04 15:12:11 -04:00
Zoë Bentley
dc2b431f83 Changed Developers and Teacher FAQ pages 2021-05-03 16:08:36 -04:00
Paul Kaplan
699e30dedd Fix curator permissions for removing projects 2021-05-03 13:26:50 -04:00
Paul Kaplan
0f8baaaa45 Add tests for new studio permissions 2021-05-03 10:52:04 -04:00
Paul Kaplan
29f6006b40 Add functionality for adding/removing projects and managing curators 2021-05-03 10:20:24 -04:00
Paul Kaplan
4f54e14e63
Merge pull request #5306 from paulkaplan/studio-info-styling 
Studio info styling
 2021-05-03 10:19:17 -04:00
Benjamin Wheeler
7242fbfbf0
Merge pull request #5220 from apple502j/patch-23 
Add privacy policy and terms of use to allowlist
 2021-04-29 13:53:01 -04:00
Ben Wheeler
ec710a1d98 removed redundant goodlist page paths 2021-04-29 13:48:30 -04:00
Paul Kaplan
2f5a01eb1e Studio reporting using legacy endpoint 2021-04-29 11:14:35 -04:00
Paul Kaplan
ef9318463e Reset comments when admin logs in 2021-04-29 09:00:50 -04:00
Paul Kaplan
8c104ed351 Remove unused component 2021-04-29 08:50:15 -04:00
Paul Kaplan
1c31d7cf65 Refactor layout and add styling for studio info 2021-04-28 13:44:25 -04:00
Paul Kaplan
129d87642c Remove unuseable NOT_FETCHED state for studio info 2021-04-28 13:44:24 -04:00
Paul Kaplan
83c896246e
Merge pull request #5274 from paulkaplan/studio-mutations 
Add client-side editing of studio info
 2021-04-27 09:45:30 -04:00
Paul Kaplan
26de328bfe Handle additional error responses 2021-04-27 09:14:34 -04:00
Paul Kaplan
5827aaab8f Update permissions for editing open_to_all to match current backend 2021-04-27 09:06:40 -04:00
Paul Kaplan
dec9f96eed Replace loading with fetching in new components 2021-04-27 09:01:19 -04:00
Paul Kaplan
f9419ac8fc Fix comment toggling and add permissions test 2021-04-26 15:11:06 -04:00
Paul Kaplan
aab4c9aca6 Update proptypes 2021-04-26 14:52:05 -04:00
Paul Kaplan
c9684b52d3 Add actions for studio open to commenting or project adding 2021-04-26 14:34:12 -04:00
Paul Kaplan
430f67c0e1 Include modifying the studio image 2021-04-26 09:58:34 -04:00
Paul Kaplan
2e029f8966 Move comment mute strings to general l10n file 2021-04-22 09:53:56 -04:00
Paul Kaplan
647575e4a8 Move permissions into its own reducer 2021-04-21 14:52:56 -04:00
Paul Kaplan
82da633e61 Add title, description and following editors 2021-04-21 14:52:56 -04:00
Paul Kaplan
c789a27018 Fix logged in selector with test 2021-04-21 14:52:53 -04:00
Ben Wheeler
e80a343211 removed unnecessary Page component 2021-04-12 15:15:17 -04:00
Paul Kaplan
7c4871c19b Remove unused reference 2021-04-08 10:57:28 -04:00
Paul Kaplan
74a29a62a0 Hook up delete restore and report actions for studio comments 2021-04-08 10:38:34 -04:00
Paul Kaplan
810eadd258 Remove params from studio comment actions that can be retrieved from state 2021-04-08 10:37:45 -04:00
Paul Kaplan
11794d885a Add permissions selectors and tests for studio comments 2021-04-08 10:36:56 -04:00
BryceLTaylor
7a5bdc0400 Change class for search input wrapper to search-wrapper 2021-04-06 14:19:05 -04:00
BryceLTaylor
0cd1f6e6be Add class to searchbar for automated tests 2021-04-06 14:19:05 -04:00
Paul Kaplan
bd279fe557 Stop passing around admin/token info in studio comment component. 
Instead of getting data out of redux just to pass it back to a dispatch,
use getState in the thunk to get the data we need. This allows the
component to not care about admin/token info, since it is not related
to rendering.
 2021-04-05 10:41:19 -04:00
Paul Kaplan
c6b0493e08 Stop passing around studio id and user info for getting studio data 
Insteaad of passing in the studio id and user data into the component
just to have it used for fetching data, get that data directly from
the redux store from within the thunk. This simplifies the components
and lets them be concerned more with what they render.
 2021-04-05 10:32:47 -04:00
Paul Kaplan
f0adda4e3b Include studio id in the store default data 2021-04-05 10:31:19 -04:00
Paul Kaplan
6ea071e8df Reorder and add selector for studio id 2021-04-05 10:30:35 -04:00
Paul Kaplan
8267dcf16a Fix TODO and add selector for studio comment capability 2021-04-02 12:43:32 -04:00
Paul Kaplan
dc460fffde Merge branch 'develop' into studio-selectors 2021-04-02 12:36:44 -04:00
Paul Kaplan
cd8ae4b197 Use lodash.get to simplify permissions, move test data into fixtures for better testing 2021-04-02 12:33:18 -04:00
apple502j
9a3fc9876c
Add privacy policy and terms of use to allowlist 2021-04-02 04:28:27 +09:00
Paul Kaplan
3a9dde404e Include onAddComment for studio comments 2021-04-01 14:05:22 -04:00
Benjamin Wheeler
3a62fa3a51
Merge pull request #5017 from JoelGritter/patch-1 
Fix gh-4913: MacOS version string update
 2021-04-01 13:31:57 -04:00
Karishma Chadha
7eb583a867
Merge pull request #5217 from kchadha/studio-comments-fetching 
Studio Comments Fetching & Initial UI
 2021-04-01 12:36:55 -04:00
Paul Kaplan
6026ededd3 Only pass explicit props to prepare for better permission selectors 2021-04-01 09:41:52 -04:00
Paul Kaplan
8434a06a90 Remove extra check for logged in 2021-04-01 09:29:52 -04:00
Paul Kaplan
8bc6e4ee77 Remove unneeded debug info 2021-04-01 09:24:13 -04:00
Paul Kaplan
1ad53aeb23 Add postURI which was left off by mistake 2021-04-01 09:23:59 -04:00
Paul Kaplan
ead57013e3 Use useCallback instead of binding anonymous function 2021-04-01 09:23:42 -04:00
Paul Kaplan
b8b56fff61 Destructure props to clean up the code 2021-04-01 09:23:16 -04:00
Karishma Chadha
073c14e6da Add UI for composing a comment and seeing the list of comments on the studio comments tab. Starting to fill in some additional state information like logged in state 2021-03-31 16:38:44 -04:00
BryceLTaylor
11c773deb4 Move the studio route from routes-dev.json to routes.json 2021-03-31 16:23:00 -04:00
Karishma Chadha
4d5fdf6094 Generalize comment components for use with projects and studios by taking passing in the POST URI as a prop. Update project page to accommodate the new prop. 2021-03-31 16:19:19 -04:00
Karishma Chadha
9c83271af7 Create studio comment action creators. Add comments reducer and initial studio comment actions to studio comments view. Display preliminary data fetching. 2021-03-31 14:41:49 -04:00
Eric Rosenbaum
4a7d909671
Merge pull request #5211 from ericrosenbaum/more-components 
Add more components to the components page
 2021-03-31 11:36:56 -04:00
Ben Wheeler
491735b9f0 use smaller svgs instead of pngs 2021-03-30 21:32:54 -04:00
Eric Rosenbaum
542c416ea7 lint 2021-03-30 15:49:33 -04:00
Eric Rosenbaum
ec0f41286d lint 2021-03-30 15:44:41 -04:00
Eric Rosenbaum
eec9b29516 add text area 2021-03-30 15:41:52 -04:00
Eric Rosenbaum
2ff5e8d8fb styling 2021-03-30 10:53:06 -04:00
Eric Rosenbaum
33b7d87840 update grid json 2021-03-30 10:52:57 -04:00
Eric Rosenbaum
8b98820495 Add nav bubbles 2021-03-24 16:12:47 -04:00
Eric Rosenbaum
82d759e30a grid displays “Project Title” 2021-03-24 16:12:37 -04:00
Paul Kaplan
8a33d1c5a5 Re-export missing base comment actions to simplify 2021-03-24 14:48:05 -04:00
Paul Kaplan
9252d56376 Merge branch 'develop' into comments-reducer 2021-03-24 14:35:12 -04:00
Eric Rosenbaum
9466a7b75b add grid 2021-03-23 16:58:38 -04:00
seotts
f6f1095d93 add justMuted variable, fix linting 2021-03-23 16:33:24 -04:00
seotts
60bf05fbbf Reuse l10n strings instead of duplicating them 2021-03-23 15:45:16 -04:00
Paul Kaplan
8144b0c2e1 Display permissions selectors in the playground 2021-03-23 15:19:28 -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
Eric Rosenbaum
6080facb66
Merge pull request #5171 from ericrosenbaum/fix-components-page 
Fix components page
 2021-03-23 10:04:17 -04:00
Zoë Bentley
138ed7339e Fixed other place where date appears 2021-03-23 09:57:50 -04:00
Eric Rosenbaum
2330553765 re-add the carousel component in a box 2021-03-22 17:27:52 -04:00
Eric Rosenbaum
10f9194f61 fix form and carousel enough to display them 2021-03-22 17:24:18 -04:00
Paul Kaplan
cd0ab5dbc8
Merge pull request #5164 from paulkaplan/studio-roles 
Fetch studio info and roles in redux
 2021-03-22 11:09:44 -04:00
Sarah Otts
a087ac4f18
Merge pull request #5165 from zoebentley/conference-update-followup-march-2021 
Made small updates to Scratch 2021 Conference page
 2021-03-22 10:47:53 -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
Zoë Bentley
bb46884667 replaced header image and modified strings 2021-03-19 15:23:12 -04:00
seotts
5d7d1cde3d Add comments; fix reply logic 2021-03-19 15:18:36 -04:00
Paul Kaplan
57495259cf Fix lint and remove unused code 2021-03-19 15:12:45 -04:00
Paul Kaplan
a97263cb91 Fetch studio info and roles in redux 2021-03-19 14:56:39 -04:00
seotts
94eb3dc6de Continued work 2021-03-18 16:15:11 -04:00
Paul Kaplan
fd7b2ce41b Replace remixes which was removed by mistake 2021-03-18 15:18:55 -04:00
Paul Kaplan
183a31d5ed
Merge pull request #5149 from paulkaplan/studio-redux-modules 
Reusable redux module for fetching paginated data
 2021-03-18 11:56:27 -04:00
Paul Kaplan
4029f431b3 Fix linting 2021-03-18 11:42:01 -04:00
Paul Kaplan
96589f4066 Comment the useEffect usage 2021-03-18 11:38:38 -04:00
Paul Kaplan
f40f3fa7c7 Rename variables 2021-03-18 11:31:28 -04:00
Paul Kaplan
ac6b4616ba Split project specific comment actions 2021-03-18 11:21:41 -04:00
Paul Kaplan
296c04ff99 Merge branch 'develop' into comments-reducer 2021-03-18 11:20:47 -04:00
seotts
23da1e2781 Continued work 2021-03-17 16:07:30 -04:00
Sarah Otts
c3342d9224
Merge pull request #5121 from zoebentley/conference-update-march-2021-fixed-dependencies 
Made changes to conf 2020 page (fixed dependencies)
 2021-03-16 15:05:48 -04:00
Paul Kaplan
eb3bdfee56 Fix linting 2021-03-16 14:58:54 -04:00
Zoë Bentley
9e74481db4 Changed the date to be only one day, July 22 2021-03-16 14:57:04 -04:00
Paul Kaplan
acedd550da Use the infinite loading module for all the data 2021-03-16 14:18:22 -04:00
Paul Kaplan
6b87429e65 Create a redux module for infinitely loading editable lists 2021-03-16 14:17:52 -04:00
Paul Kaplan
560379f9fb Simple data fetching using react hooks 2021-03-16 14:17:52 -04:00
seotts
cf71b77622 Work on adding messaging for previous mute 2021-03-15 15:42:12 -04:00
Paul Kaplan
7b7266c5b4
Merge pull request #5117 from paulkaplan/studio-route 
Add dev route with very bare studio playground
 2021-03-15 12:03:24 -04:00
chrisgarrity
8271bb62bb
Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted 
Prevent feedback when not just muted
 2021-03-15 09:10:48 -04:00
Sarah Otts
da64706b0d
Remove unused FlexRow 2021-03-12 09:10:25 -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
f78a683b09 Update link to LLK to new Media Lab url 2021-03-10 16:16:06 -05:00
Paul Kaplan
fb4370b412 Remove dev routes on staging 2021-03-10 15:09:07 -05:00
Zoë Bentley
eabab89bd5 Made changes to conf 2020 page (fixed dependencies) 2021-03-10 11:13:46 -05:00
Paul Kaplan
24cdd291ca Add staging route for studio playground 2021-03-09 15:32:35 -05:00
Sarah Otts
dc9d079e4b
Merge pull request #5116 from seotts/revert-revert-zoe-content-update 
Revert "Revert "Content updates march 2021""
 2021-03-09 15:10:48 -05:00
seotts
a1759f42b3 Revert "Revert "Content updates march 2021"" 
This reverts commit 65f69d1201.
 2021-03-09 14:38:36 -05:00
Ben Wheeler
4533c983fd converted images around splash video to png, smaller file size 2021-03-09 10:15:44 -05:00
Paul Kaplan
49e62afa8b Fix typo in mapStateToProps 2021-03-08 12:27:32 -05:00
Paul Kaplan
27dafac7f0 Move comments out of project reducer 2021-03-08 12:01:22 -05:00
Sarah Otts
cfb0a00414
Copy update on spam header 2021-03-04 16:19:39 -05:00
seotts
2cb9189b44 Add spam mute message 2021-03-04 13:49:38 -05:00
Sarah Otts
65f69d1201
Revert "Content updates march 2021" 2021-03-03 15:39:25 -05:00
Sarah Otts
4a625a634a
Merge pull request #5078 from zoebentley/content-updates-jan-2021 
Content updates march 2021
 2021-03-02 16:57:26 -05:00
Zoë Bentley
e2c98762fa Updated people.json 2021-03-02 15:02:23 -05:00
zoebentley
e756d751c6
Update src/views/credits/credits.jsx 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:40:57 -05:00
zoebentley
43e2eb22dd
Update src/views/about/about.jsx 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:31:46 -05:00
zoebentley
695efb77c0
Update src/views/about/about.jsx 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:28:38 -05:00
zoebentley
eb93e2dd9a
Update src/views/about/about.jsx 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:28:12 -05:00
zoebentley
d2ec8e804e
Update src/views/credits/credits.scss 
Co-authored-by: Sarah Otts <se0042@gmail.com>
 2021-03-02 14:19:29 -05:00
Zoë Bentley
d41a230e83 Added newline at end of file and changed languages count to be rounded down to 60 2021-03-02 14:09:52 -05:00
seotts
ec3a205dea Create Plotly bundle to load only choropleth 
lint
 2021-03-01 16:22:02 -05:00
Zoë Bentley
559f3d412c Updated list of usernames 2021-03-01 14:48:01 -05:00
Paul Kaplan
dce9b99a62
Merge pull request #5058 from paulkaplan/split-phone-bundle 
Don't require a big phone number validation library on every page
 2021-03-01 08:43:43 -05:00
Paul Kaplan
b0390f36a2 Fix lint and missing components 2021-02-26 11:01:13 -05:00
Paul Kaplan
0353135cc4 Split phone number step to reduce bundle for other registration pages 2021-02-26 10:31:20 -05:00
Paul Kaplan
da2ca40ccf Only require libphonenumber when rendering phone inputs 2021-02-26 10:31:19 -05:00
Sarah Otts
faf9fcd26c
Merge pull request #5022 from zoebentley/sec-update-feb-2021 
Change wording and image size on SEC page
 2021-02-23 09:27:24 -05:00
Zoë Bentley
bc7063a65d Made updates to wording on SEC page and changed size of image 2021-02-19 14:48:43 -05:00
Zoë Bentley
3fd4337f6e lint 2021-02-19 12:04:14 -05:00
Zoë Bentley
118ffadb76 Changed images on About page and changed many text strings 2021-02-19 12:04:13 -05:00
Zoë Bentley
1caa1da81f Began making changes to Credits page 2021-02-19 12:04:13 -05:00
Paul Kaplan
d79ae074b2 Update eslintrc for new UNSAFE_ rule 2021-02-19 11:39:21 -05:00
Paul Kaplan
56345874e3 Mark deprecated methods with UNSAFE_ prefix 2021-02-19 11:12:00 -05:00
Joel Gritter
e0e3a0c342
MacOS version string update 
"Mac OSX 10.4 or later" -> "Mac OSX 10.4 through 10.14"

Fixes gh-4913
 2021-02-18 13:37:12 -05:00
picklesrus
41f7fcd68d Update relative-time-polyfill.js 2021-02-16 14:07:26 -05:00
picklesrus
14db1428f1 Update relative-time-polyfill.js 2021-02-16 14:06:10 -05:00
picklesrus
91c256ad75 Fix pluralrules polyfill 
This should hopefully fix the Safari 12 issues we were having.
 2021-02-16 14:06:02 -05:00
picklesrus
d22049a22e update feedback mistaake message 2021-02-16 14:05:12 -05:00
seotts
7bd6c98b0a Fix proptype of startStep 2021-02-16 14:04:24 -05:00
seotts
e98e90dd4e send automod feedback to api 2021-02-16 14:04:17 -05:00
Karishma Chadha
ca392e6d5b Fix lint errors related to eslint-config-scratch update 2021-02-16 10:54:50 -05:00
picklesrus
4e97e7c60e
Merge pull request #4943 from picklesrus/reply-mute 
Open mute modal from reply button if you're muted.
 2021-02-08 13:28:21 -05:00
picklesrus
7c382a73fa Fix double reply button click bug by "cancelling" the reply when you click it and are already muted. 2021-02-08 07:38:39 -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
chrisgarrity
baba146ffb
Merge pull request #4895 from chrisgarrity/relative-time-polyfill 
Add @formatjs/relativetimeformat-polyfill
 2021-02-02 11:35:52 -05:00
picklesrus
f7bf204924 Draft: open mute modal from reply button if you're muted. 2021-02-02 11:34:27 -05:00
Chris Garrity
ae2bc24ffd Add @formatjs/relativetimeformat-polyfill 
Safari < 14 does not support Intl.RelativeTimeFormat which is used in the moderation messaging. Adding this polyfill to support it. RelativeTimeFormat depends on Locale, which is also not available in Safari <14, and PluralRules, not available in Safari < 13.

There is a trade off between adding locale-data for all users that load the page regardless of what browser they’re using and whether they get muted, and only localizing the most common languages.
In the last 30 days only ~3% of users on scratch use a version of Safari (13.x) that doesn’t support Intl. Of that 3%, these 7 locales would cover over 60% of the users. English will be used by default if the locale data is not available.
 2021-02-02 09:07:38 -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
e6f056b178 Add message at the top of file mentioning the version in scratchr2 2021-02-01 15:35:02 -05:00
Karishma Chadha
26d3bb73c6
Merge pull request #4932 from LLK/hotfix/sec-text-update 
[Develop] Hotfix SEC Page Text Update
 2021-02-01 10:32:27 -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
Zoë Bentley
e51591620f Changed text on SEC page (for hotfix) 2021-01-29 14:56:47 -05:00
seotts
42eb195b57 move feedback form to its own component 2021-01-28 15:45:00 -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
64c89b1716 Update to the general moderation message. 2021-01-28 12:11:35 -05:00
Chris Garrity
d639c2d7a9 Fix typo 2021-01-28 11:01:09 -05:00
Sarah Otts
90e0f40886
Merge branch 'develop' into automod-feedback-modal 2021-01-26 15:30:26 -05:00
seotts
a037395689 Merge branch 'automod-feedback-modal' of https://github.com/seotts/scratch-www into seotts-automod-feedback-modal 
# Conflicts:
#	src/components/modal/mute/modal.jsx
#	src/components/modal/mute/modal.scss
#	src/l10n.json
 2021-01-26 15:27:05 -05:00
Chris Garrity
1afa2a3e33 Adjust formatting of the comment status box 
Reduce the width of the comment status paragraphs to make them easier to read. Ensure that the bottom text is still below all other text by making it 100% width.
 2021-01-26 08:58:01 -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
Benjamin Wheeler
0155d28ea5
Merge pull request #4831 from GrahamSH-LLK/develop 
Update 1.4 Copytext
 2021-01-25 13:32:48 -05:00
Ben Wheeler
7810eab73b slight change to wording about newer versions of scratch 2021-01-25 13:31:59 -05:00
seotts
f2a3dfda1b Revert "Revert "Use formik for feedback form"" 
This reverts commit c22c2c967b.
 2021-01-22 15:14:21 -05:00
seotts
037f91e76c Revert "Revert "Add feedback step using a Formsy textarea"" 
This reverts commit 1bc3aaf0ee.
 2021-01-22 15:14:06 -05:00
seotts
1bc3aaf0ee Revert "Add feedback step using a Formsy textarea" 
This reverts commit 5e4fc154c6.
 2021-01-22 15:12:14 -05:00
seotts
c22c2c967b Revert "Use formik for feedback form" 
This reverts commit 512358e9af.
 2021-01-22 15:12:14 -05:00
seotts
b42966ac6a Revert "Add feedback step using a Formsy textarea" 
This reverts commit 5e4fc154c6.
 2021-01-22 12:13:40 -05:00
seotts
af56e2389c Revert "Use formik for feedback form" 
This reverts commit 512358e9af.
 2021-01-22 12:13:03 -05:00
seotts
512358e9af Use formik for feedback form 
cleanup
 2021-01-22 11:58:56 -05:00
seotts
5e4fc154c6 Add feedback step using a Formsy textarea 2021-01-22 11:58:56 -05:00
seotts
9d08b69bed show correct messaging instead of always General 2021-01-20 13:03:39 -05:00
picklesrus
a5f436a4c0
Update compose-comment.jsx 
Fix whitespace
 2021-01-14 08:05:47 -05:00
picklesrus
6eca07a413
Fix syntax error from merge 2021-01-14 07:55:54 -05:00
picklesrus
1326f71abe
Merge branch 'develop' into timeout-mute 2021-01-14 07:47:47 -05:00
picklesrus
55d69b0e7b merge 2021-01-14 07:43:53 -05:00
picklesrus
47d63cb529 Reset more of the state when a mute expires. 
This allows the comment box to show up again in a normal state with no 
errors.
 2021-01-14 07:42:53 -05:00
Paul Kaplan
e1d0329633 Fix lint issues again 2021-01-13 09:39:36 -05:00
Paul Kaplan
4ca6e52233 Fix formatting 2021-01-13 09:29:40 -05:00
Paul Kaplan
2a0aa3b03e Add the FAQ 2021-01-13 08:55:22 -05:00
Paul Kaplan
5883070647 Update SEC page content 2021-01-12 15:59:59 -05:00
Benjamin Wheeler
596343048a
Merge pull request #4748 from mxmou/fix-search-loadmore 
Fix "Load more" scrolling on search results
 2021-01-12 14:51:35 -05:00
picklesrus
19ef91d3d0
Merge pull request #4827 from picklesrus/mute-modal-vertical 
Update vertical spacing on mute modal
 2021-01-12 10:31:28 -05:00
Ben Wheeler
07f6639ef3 changed wording of no javascript message per design team input 2021-01-11 14:04:55 -05:00
apple502j
62d4db7796 Add noscript tag 2021-01-11 14:04:55 -05:00
seotts
1aa59edaa3 Remove use of FormattedHTMLMessage 2021-01-08 14:03:29 -05:00
seotts
31016df1f5 Don’t fail if mute_status isn’t available 2021-01-07 14:05:02 -05:00
seotts
c8373ab888 Revert "Revert "Add new mute message types"" 
This reverts commit 1575ed06cf.
 2021-01-07 14:04:48 -05:00
picklesrus
4879570561 Update vertical spacing on mute modal 
This reduces the vertical padding in the mute modal to better fit on shorter screens.
 2021-01-07 11:07:39 -05:00
Sarah Otts
1575ed06cf
Revert "Add new mute message types" 2021-01-06 16:51:03 -05:00
Karishma Chadha
6d8cac4239
Merge pull request #4817 from LLK/hotfix/sec-google-nolink 
[Develop] Hotfix sec google nolink
 2021-01-06 10:56:41 -05:00
Karishma Chadha
3bdb5abdd5
Merge pull request #4814 from kchadha/annual-report-credits 
Add Tracy to credits page and Annual Report team section.
 2021-01-06 10:44:06 -05:00
Karishma Chadha
090312bf56
Merge pull request #4736 from seotts/world-map-fix 
World map fixes - Border thickness, Eswatini, remove unused css
 2021-01-06 10:43:50 -05:00
Karishma Chadha
edca23f6ce Add Tracy to credits page and Annual Report team section. 2021-01-05 15:51:38 -05:00
Sarah Otts
78d001e127
Merge pull request #4737 from seotts/team-new-tabs 
In the Annual Report Team section, open link to Scratch Team members in new tab
 2021-01-05 14:38:03 -05:00
Sarah Otts
f3dbe23c5e
Fix syntax error from merge 2021-01-04 11:20:16 -05:00
Sarah Otts
b9892ff6d8
Merge branch 'develop' into automod-new-messaging 2021-01-04 11:09:29 -05:00
picklesrus
664ccc5d36
Update compose-comment.jsx 
Fix missing comma from bad merge
 2020-12-21 10:49:16 -05:00
picklesrus
15a16e5b58
Merge branch 'develop' into timeout-mute 2020-12-21 08:38:37 -05:00
picklesrus
9037f8817a
Merge pull request #4774 from picklesrus/warning-mute 
Show warning message when user has been muted several times.
 2020-12-21 08:36:21 -05:00
Benjamin Wheeler
0c911da463
Merge pull request #4563 from GrahamSH-LLK/patch-1 
Add "FloralSunset" to Credits Page
 2020-12-18 20:54:41 -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
1aca3c0f25
Merge pull request #4768 from picklesrus/fix-prop-warning 
Fix prop type. muteStepContent is an array not a string.
 2020-12-17 10:00:26 -05:00
Benjamin Wheeler
aeaca81fb7
Merge pull request #4686 from benjiwheeler/api-check-username 
switch educator registration checkusername endpoint from scratchr2 to api
 2020-12-16 20:43:19 -05:00
picklesrus
760082d2d7 Fix prop type. muteStepContent is an array not a string. 2020-12-16 07:54:20 -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
a39244ea6c
Merge branch 'develop' into timeout-mute 2020-12-14 13:27:12 -05:00
chrisgarrity
17407f0fcf
Merge pull request #4752 from chrisgarrity/localize-mute 
Localize mute
 2020-12-11 16:19:27 -05:00
Chris Garrity
501147060d Update generic message copy 
Updated copy requres two paragraphs in the content. Modified the inputs to pass a content array and output one paragraph per item.
 2020-12-11 09:52:30 -05:00
Chris Garrity
929e670d8f Internationalize the mute messages 
Add formatted messages for comment status and mute modal
 2020-12-11 08:44:17 -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
GrahamSH
88aee16cb7
Move to fix alphabetization 2020-12-10 16:59:07 -05:00
MaxiMouse
8f4c67144a Fix "Load more" scrolling on search results 2020-12-10 22:12:51 +01:00
Benjamin Wheeler
8d4a5c2f91
Merge pull request #4526 from Purple-Hacker/patch-2 
Updated addresses on DMCA
 2020-12-10 14:21:28 -05:00
Benjamin Wheeler
0aa15b91c9
Merge pull request #2763 from apple502j/patch-10 
Change min height
 2020-12-10 14:15:19 -05:00
picklesrus
2d5e9a6378 Fix merge conflicts and set default object for mute_status if props do not exist. 2020-12-08 08:00:01 -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
seotts
b7cf82494b Remove unused variable and fix spacing 2020-12-07 16:16:42 -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
seotts
1d70ee243c Make borders smaller, show data for Eswatini 2020-12-07 12:45:01 -05:00
seotts
86650e1ce9 open link to Scratch Team member in new tab 2020-12-07 12:43:43 -05:00
Paul Kaplan
591b3ce6a2 Add Google.org to intro paragraph on SEC 2020-12-04 09:13:02 -05:00
Colby Gutierrez-Kraybill
6dc8d5ec74
Update routes.json 2020-12-02 14:18:47 -05:00
Colby Gutierrez-Kraybill
c92f161fa1
Merge pull request #4717 from LLK/hotfix/gh-4708 
[release] gh-4708
 2020-12-02 13:50:22 -05:00
Colby Gutierrez-Kraybill
f151f8dfeb Missing end optional parameter regex in annual-report 2020-12-02 13:30:15 -05:00
Colby Gutierrez-Kraybill
4973ff4a5d Follow the pattern of other routes, like contact-us for parameter ignoring in annual-report route 2020-12-02 12:16:44 -05:00
Colby Gutierrez-Kraybill
fd6018a92f Allow extra parameters to match annual-report route 2020-12-02 12:07:12 -05:00
Paul Kaplan
f315ea2f15
Update the SeC page wording 
Replace the phrase "historically underrepresented in computing” with “ historically excluded from computing.”

Change requested from KO.
 2020-12-01 13:32:36 -05:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
Sarah Otts
fec148ac74
Merge pull request #4682 from LLK/annual-report-video-spinner 
Add loading spinner in Annual Report
 2020-11-25 15:29:11 -05:00
picklesrus
0f83b0c7c8
Merge pull request #4655 from picklesrus/use-minutes 
Disable comment box functionality when you've just been muted.
 2020-11-25 10:18:41 -05:00
Ben Wheeler
590873c765 switch educator registration checkusername endpoint from scratchr2 to api 2020-11-24 13:54:11 -05:00
seotts
246798b69d Use “play” event listener; clean-up code 2020-11-23 12:17:12 -05:00
seotts
785386b1c7 add newline to end of file 2020-11-23 11:15:44 -05:00
seotts
f75337dafd preload spinner image 2020-11-19 10:27:01 -05:00
picklesrus
71521e2aa5 Fix lint and update text. 2020-11-18 14:48:15 -05:00
picklesrus
fe9d9078b2 Fix styling of disabled comment box. 2020-11-18 14:40:11 -05:00
Zoë Bentley
dad5a34fbe Changed Teacher Accounts Setup Guide link to PDF link on resources server 2020-11-18 12:50:22 -05:00
Zoë Bentley
1bfa0f20a3 Changed Teacher Account Setup Guide link from .doc to .PDF 2020-11-18 12:05:33 -05:00
Ray Schamp
433a5c7100
Merge pull request #4664 from LLK/hotfix/hoc-banner-2020 
[Develop] HOC banner 2020
 2020-11-18 10:23:56 -05:00
Ray Schamp
470620a12a
Merge pull request #4654 from LLK/hotfix/hoc-banner-2020 
[Release] HOC banner 2020
 2020-11-18 10:20:53 -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
Ben Wheeler
a4689fc159 Turn off middle banner and set HoC start and end times for 2020 2020-11-17 15:04:29 -05:00
Ben Wheeler
bd3ef208f6 added makeItFly image and text for HoC banner 2020-11-17 15:04:07 -05:00
Paul Kaplan
2292fc039d
Merge pull request #4649 from LLK/hotfix/sec-page 
[Hotfix/Develop] SEC page
 2020-11-17 11:17:43 -05:00
Paul Kaplan
b92b98bd19 Fix hyphens 2020-11-16 15:19:42 -05:00
Paul Kaplan
2799bc97f6 Fix lint error 2020-11-16 14:39:37 -05:00
seotts
cf9cbdf392 Hide iframe & show spinner until it begins playing 2020-11-16 14:33:46 -05:00
Paul Kaplan
ee645b250a Add culturally sustaining link 2020-11-16 14:31:31 -05:00
Christopher Willis-Ford
35839ada12 remove version number from micro:bit firmware URL 
This new URL will be a redirect to the actual file, including the
version number. This way we'll be able to deploy firmware updates
without needing to change any content in this repository.
 2020-11-16 11:04:36 -08:00
seotts
cb01cb9321 use Wistia api to do callback 2020-11-16 12:36:07 -05:00
Paul Kaplan
550a661687 Add SEC page 2020-11-16 10:35:40 -05:00
picklesrus
b1f7a2be10
Merge pull request #4637 from picklesrus/use-minutes 
Convert mute timestamp to always show in minutes.
 2020-11-16 10:28:55 -05:00
Karishma Chadha
760e303d30
Merge pull request #4617 from kchadha/annual-report-data-cleanup 
Annual Report - Break out supporters list into separate JSON
 2020-11-16 10:15:28 -05:00
Karishma Chadha
4728e3f50e
Merge pull request #4615 from kchadha/annual-report-link 
Add link to annual report from about page
 2020-11-16 10:15:02 -05:00
picklesrus
0470e0e56b Convert timestamp to always show in minutes. 
This is minor step towards correct time formatting. More coming later.
 2020-11-13 15:03:49 -05:00
picklesrus
bfc4202d11 Use singular units so the library handles plurals. 2020-11-13 14:14:42 -05:00
Benjamin Wheeler
79d3d07dcc
Merge pull request #4284 from doc-han/patch-1 
update translation URL
 2020-11-13 14:13:16 -05:00
Ben Wheeler
f2111eb5a3 updated number of languages 2020-11-13 14:11:25 -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
Ben Wheeler
ccf0e92e98 removed communityblocks-interviews from routeAlias entries 2020-11-12 13:43:33 -05:00
Radman Siddiki
89c5ea324b Remove Community Blocks Interviews Route 2020-11-12 13:43:33 -05:00
Radman Siddiki
b74d857ad9 Delete communityblocks-interviews.jsx 2020-11-12 13:43:33 -05:00
Karishma Chadha
e14b6d52f3 Add spinner while video is still loading 2020-11-10 14:37:18 -05:00
picklesrus
2005b23777
Merge pull request #4616 from picklesrus/mute-behavior 
Skeleton of code to show mute modal and comment status.
 2020-11-10 10:24:04 -05:00
picklesrus
b8b0f5d10c
Merge pull request #4580 from picklesrus/modal-image-updates 
A few small upates to the muting modal
 2020-11-10 09:52:41 -05:00
Karishma Chadha
f89d1313e0 Break out supporters lists into json file and dynamically create lists of supporters. 2020-11-09 11:37:31 -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
Karishma Chadha
c3accb0111 Add link to annual report from about page 2020-11-09 10:20:11 -05:00
Benjamin Wheeler
69efc1afea
Merge pull request #4287 from R4356th/patch-11 
Replace "Tips Page" with "Ideas Page"
 2020-11-05 09:41:48 -05:00
picklesrus
495edd1820 A few small upates: 
- Add images and update styles to match.  
- Add timeMuted prop so it can display how long the user is muted for. 
- Text updates

This still needs localization.
 2020-10-30 10:07:43 -04:00
Karishma Chadha
4369899813 Fix BLM studio link 2020-10-29 09:43:10 -04:00
Karishma Chadha
4f6828bde8 Update board member section 2020-10-28 18:31:10 -04:00
seotts
b3cdc0ebcd fix Mahmoud’s image 2020-10-28 18:17:07 -04:00
seotts
729739c222 fix typo in project title 2020-10-28 18:04:51 -04:00
Karishma Chadha
412de9dbda Fix typos in content 2020-10-28 17:08:36 -04:00
Karishma Chadha
8d722d454f Update l10n to remove unused strings from financials section 2020-10-28 13:06:44 -04:00
seotts
367ada3452 remove middle of financials section 2020-10-28 12:57:20 -04:00
Karishma Chadha
b673d718d4 Minor content update 2020-10-28 10:34:41 -04:00
Karishma Chadha
9a5560bdf5 Don't show scratch-jr-transition images on small screens. Fix lint issue. 2020-10-27 16:43:21 -04:00
seotts
a8058aa0bf remove comments; add new lines 2020-10-27 15:29:50 -04:00
seotts
5e075a2feb make financials button responsive 2020-10-27 14:23:34 -04:00
seotts
23736463f8 make map key even more responsive 2020-10-27 14:16:42 -04:00
seotts
f88fd8279a make map key responsive 2020-10-27 13:55:10 -04:00
Karishma Chadha
73cf337ac2 Map title update 2020-10-27 12:55:16 -04:00
Karishma Chadha
5771444811 Some content/copy changes. 2020-10-27 12:26:25 -04:00
seotts
90650ff5d8 fix community guidelines bullet points 2020-10-27 12:12:59 -04:00
carljbowman
2db15df51e Tweaks to the map container 
- Ajust border radius
- Remove bottom padding to make the map flush with the bottom, which required adding `overflow: hidden` to maintain the bottom border radius.
 2020-10-27 11:51:27 -04:00
seotts
ae16b8638b un-yoda-fy some country names (eg “Korea, Rep..”) 2020-10-27 11:49:00 -04:00
seotts
96b2627dd0 remove outline on blm project tiles 2020-10-27 11:36:25 -04:00
carljbowman
a028512aa3 Fix overlapping text in Financials key section 2020-10-27 11:27:26 -04:00
carljbowman
d05486d4d1 Adjust layout / spacing of BLM story 2020-10-27 11:19:53 -04:00
carljbowman
3f57ccecfa Tweak rules and spacing on donor lists 2020-10-27 11:17:55 -04:00
carljbowman
c08230aa45 Fix fallback fonts for buttons 
Removed the narrowly scoped font-family definition on the button elements. Now buttons inherit the site wide font-family specification, which include the appropriate fallbacks.
 2020-10-27 11:03:32 -04:00
carljbowman
29d03282d4 Fix Tutorial stats layout 2020-10-27 10:46:26 -04:00
carljbowman
dbae2cbe66 Fix layout issues with CPS grid of 4 photos 
- Reorder images so supporting illustrations do not overlap important photographic content
- Tweaked Pizza and Pencils positioning to adjust layout
 2020-10-27 10:30:47 -04:00
carljbowman
e2894dd18d Fix photo credit typographic styles 2020-10-27 10:13:54 -04:00
Karishma Chadha
b689702930 Leadership renamed to Team in subnav. Update content in Supporters and Team sections. Fix board member company attribution. Update Mitch's name in people grid. 2020-10-27 02:08:05 -04:00
Karishma Chadha
e2db5fd562 Minor content update for initiatives description 2020-10-27 01:28:05 -04:00
Karishma Chadha
615aa812c5 Update content/copy from Initiatives - Community through Financials section. Add missing link in Initiatives - Schools section. Add new financials note. Fix financials percentages. Clean up some commented out code from scss file. 2020-10-27 01:26:15 -04:00
Karishma Chadha
da1e8c00c5 Update translation image in reach section. Fix remaining world map prop type warning. 2020-10-27 01:20:04 -04:00
Karishma Chadha
a8c7919f5f Add Initiatives description. 2020-10-26 22:36:02 -04:00
Karishma Chadha
f284200997 Fix 'languages' typo 2020-10-26 18:46:37 -04:00
Karishma Chadha
5fc610ac87 Update content strings through Initiatives - Creative Tools. Also includes fixes for supporter levels where they were missing a 0. Added the new initiatives description blurb to l10n.json, though it's not yet referenced in the html. 2020-10-26 18:40:51 -04:00
seotts
9956ded2ad fix conferences spaces, mobile 2020-10-26 17:51:33 -04:00
seotts
f0951af780 fixed abhi section at intermediate size 2020-10-26 17:45:37 -04:00
seotts
d68691de40 add map key 2020-10-26 17:36:23 -04:00
carljbowman
020e9029e9 Fix relatively sized line-height on paragraph styles 
Paragraphs with larger font sizes will now have proportionally sized line-heights based on the font size.
 2020-10-26 15:11:32 -04:00
Karishma Chadha
14397625db Move transition messages from milestones section into reach section. Fix ScratchJr transition messages based on changes made with the milestone-reach transition images. Fix lint issue. 2020-10-26 01:27:00 -04:00
Karishma Chadha
3546be1b12 Make data point numbers in Reach section bold. Make spacing more consistent in mission section of the scss file. 2020-10-25 23:39:24 -04:00
Karishma Chadha
240fd5e53b Make 4Ps more consistent with design sketch for all screen sizes. 2020-10-25 23:10:11 -04:00
Karishma Chadha
8cf04fe705 Fix incorrect scroll position behavior on Safari by switching to use window.scrollTo. Rename Donate section title to Support Us 2020-10-23 18:48:53 -04:00
seotts
c0fb4970e2 open donate link in new tab 2020-10-23 16:57:53 -04:00
seotts
83263631df Fix page title (in tab) 2020-10-23 16:51:46 -04:00
seotts
29a81b08c1 fit community guidelines into 2 cols 2020-10-23 16:48:12 -04:00
seotts
497ba5c6f3 fix tutorials spacing and size 2020-10-23 16:45:17 -04:00
seotts
544df10aae content updates 2020-10-23 11:57:37 -04:00
seotts
c460b4fbad update financials copy 2020-10-23 09:23:35 -04:00
Karishma Chadha
c6b967a688 Fix 4ps being out of order on smaller screens, fix responsiveness issues, initiatives tools hero images now scale along with page width. Fix #view width at 100% like some other pages do. 2020-10-23 00:17:58 -04:00
Karishma Chadha
99d8997035 Update content for message, covid response, and mission 2020-10-22 22:23:28 -04:00
Karishma Chadha
7904c7c1ca Fix font size on conferences photo credits and remove LLK from photo credits 2020-10-22 18:38:38 -04:00
Karishma Chadha
c10a805197 Add updated blocks images for reach section, clean up images folder (creating financials and reach subfolders) 2020-10-22 17:39:22 -04:00
seotts
9a0ce3db48 make equity and global strategies taller 2020-10-22 16:01:18 -04:00
rschamp
c3514aeb4c Finishing touches on responsive map 2020-10-22 15:47:21 -04:00
rschamp
59f0f2c093 Make the map always 100% width with 2:1 aspect ratio 2020-10-22 15:20:31 -04:00
carljbowman
964204c77f Update paragraph size for one-p 
Change the size of the description with four p’s.
 2020-10-22 15:10:35 -04:00
seotts
96fc42c496 formatting extensions statistics 2020-10-22 15:09:38 -04:00
seotts
d9415d6fe4 reduce space between paragraphs 2020-10-22 15:01:47 -04:00
seotts
3329a58da2 fix size of missions illustrations 2020-10-22 14:54:52 -04:00
seotts
9182ab9421 fix sizes of tools hero images 2020-10-22 14:44:35 -04:00
Karishma Chadha
df27950a31 Remove mapHeight and mapWidth prop validation since they're no longer in use 2020-10-22 12:20:26 -04:00
Karishma Chadha
aa25ee9d38 Add final team photo and updated blocks image, fix some responsiveness issues 2020-10-22 11:50:49 -04:00
seotts
3ccd72efec schools section respnsiveness 2020-10-22 11:50:48 -04:00
Karishma Chadha
44a5394667 More responsiveness updates and replace placeholder image for donate section 2020-10-22 11:50:48 -04:00
rschamp
67ff392776 Start on responsive map 2020-10-22 11:50:48 -04:00
Karishma Chadha
d1285b91ee Some more responsiveness fixes for intermediate size 2020-10-22 11:50:48 -04:00
rschamp
ed29a391fc Update translate intro with more context 2020-10-22 11:50:48 -04:00
seotts
dea1362697 make small scratch team grid have two columns 2020-10-22 11:50:48 -04:00
seotts
b931cf9645 fix cut-off bullet points 2020-10-22 11:50:48 -04:00
seotts
67d4090377 add wistia version of cps video 2020-10-22 11:50:48 -04:00
seotts
551eea91b5 Revert "Add CPS video" 
This reverts commit ec97646bf7430e874b0045a61a5f9d39d4c862de.
 2020-10-22 11:50:48 -04:00
seotts
be49e209bb Revert "Add ability to display YouTube in addition to Wistia" 
This reverts commit 8d758f0420b967aa5d3f9e9c14b9f9201c2702a6.
 2020-10-22 11:50:48 -04:00
seotts
dd1fa88889 scratchjr transition images 2020-10-22 11:50:48 -04:00
Karishma Chadha
8cec16ca9f Fix 4-column (mobile) responsiveness for creative tools section 2020-10-22 11:50:48 -04:00
Karishma Chadha
8c8052c052 Fix 4-column (mobile) responsiveness of schools and community sub-sections 2020-10-22 11:50:48 -04:00
Karishma Chadha
64bdc9eb29 Fix lint errors 2020-10-22 11:50:48 -04:00
seotts
ff6a3eb30f Add CPS video 2020-10-22 11:50:48 -04:00
seotts
79bc95a4c6 Add ability to display YouTube in addition to Wistia 2020-10-22 11:50:48 -04:00
seotts
5e1739f7c5 add leadership content 2020-10-22 11:50:48 -04:00
seotts
79b538dee3 add correct hrefs to links, and open in new tabs 2020-10-22 11:50:48 -04:00
seotts
c08650f2b7 add abhi video and fix thumbnail hover 2020-10-22 11:50:48 -04:00
seotts
e10898a765 Add BLM video 2020-10-22 11:50:48 -04:00