scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-03 12:27:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
9274 commits 216 branches 1 tag 484 MiB
Commit graph

4523 commits

Author SHA1 Message Date
Zoë Bentley
69a383ceb2 Added links and locations for partner organizations 2021-07-12 17:19:30 -04:00
Paul Kaplan
f134dbf201 perf(styles): extract css from js into stylesheets 2021-07-12 14:48:08 -04:00
Paul Kaplan
bc43ad7e29 feat(annual-report): dynamically load the world map when it is scrolled to 2021-07-12 14:34:24 -04:00
Paul Kaplan
8e4ee5fb7a feat(build): support dynamic import 
add the babel plugin for dynamic import syntax and fixup the path references in webpack and template
so the chunks can be loaded dynamically
 2021-07-12 14:34:17 -04:00
Zoë Bentley
0149718c8d lint 2 2021-07-12 11:32:09 -04:00
Zoë Bentley
791b4c7cde lint 2021-07-12 11:31:49 -04:00
Zoë Bentley
15ad33aa05 Added ILCE to list of orgs 2021-07-12 11:16:16 -04:00
Zoë Bentley
f660af26eb Updated SEC page with 39 participating orgs and 6 partner orgs 2021-07-12 10:43:01 -04:00
Eric Rosenbaum
6fb1e7ccd2 do not show option to transfer ownership to yourself 2021-07-09 17:01:34 -04:00
Eric Rosenbaum
f8195d1024 only show ownership transfer option if there are >1 managers 2021-07-09 16:43:00 -04:00
Eric Rosenbaum
d7858e9a1a initial work on transfer ownership selection step 2021-07-09 15:09:35 -04:00
Eric Rosenbaum
a16ef0c3d5 first step of transfer ownership modal 2021-07-09 11:42:56 -04:00
Paul Kaplan
dcf2682f09
Merge pull request #5662 from paulkaplan/test-studio-member-actions 
Create detailed unit tests for studio-member-actions
 2021-07-07 15:28:55 -04:00
Paul Kaplan
ad386714a9 fix(studios): remove duplicate css for full width load more buttons 
Remove the `display: content;` way of making the load more button full width, and reuse the existing
shared css class instead. Also change the markup back to the way it was originally, with the load
more button within the grid, since that is how it is meant to be used
 2021-07-06 15:06:26 -04:00
Paul Kaplan
d693beb1b3 fix(studios): share css to make load more buttons full width 
Changes the markup and css classes used by activity, curators, managers and projects grids to use a
shared full-width load more button
 2021-07-06 14:51:16 -04:00
Paul Kaplan
4866d96da1 fix(studios): change the curators, projects and managers load count to 24 
Changing from 20 to 24 will fix the issue where we are loading rows that aren't "full" on a 3-tile
row. Now it will always fill a row no matter the display breakpoint (1,2 or 3 tiles per row)
 2021-07-06 14:36:12 -04:00
Paul Kaplan
e719d25e3d fix(studio): do not show mute error as if manager can edit info 2021-07-06 10:42:02 -04:00
Karishma Chadha
6dbf8d1bd5
Merge pull request #5692 from kchadha/manager-permissions 
Update manager permissions for studios.
 2021-07-06 09:22:59 -04:00
Paul Kaplan
54b9161dc0 fix(studio): prevent duplicate submissions on studio project browser modal 2021-07-01 13:36:29 -04:00
Paul Kaplan
e835cafc37 fix(studio): limit the max length of studio titles on the client side 2021-07-01 11:50:54 -04:00
Karishma Chadha
d0ad0a45d4 Update manager permissions for studios. 2021-06-25 12:41:36 -04:00
Paul Kaplan
b2c9c922d3 Use errors from project adder in the add to studio modal 2021-06-25 12:13:29 -04:00
apple502j
3b9383d930
Link community guidelines in project.defaultCensoredMessage 2021-06-26 00:18:34 +09:00
Paul Kaplan
e6d65c1364
Revert "Revert "Switch studios route to real version for testing on staging"" 2021-06-25 10:53:00 -04:00
Paul Kaplan
1027b82f66 Include unit tests for more of the action creators 2021-06-25 10:43:33 -04:00
Paul Kaplan
ffb0e96f47
Merge pull request #5664 from LLK/revert-5660-revert-5630-reduce-reply-requests 
Reduce reply requests, for real this time I promise
 2021-06-24 14:51:39 -04:00
Sarah Otts
3958d9df7d
Merge pull request #5659 from seotts/manager-modal-padding 
Change manager modal width
 2021-06-24 14:33:10 -04:00
Sarah Otts
d5a94ae59c
Merge pull request #5658 from seotts/add-by-url-text 
Match Add Project placeholder & button text to old studios
 2021-06-24 14:33:02 -04:00
Paul Kaplan
975d24cd5d
Revert "Revert "Only request replies if reply_count > 0"" 2021-06-24 10:59:09 -04:00
Paul Kaplan
c9ba9d443c Add tests for all studio-member-actions 2021-06-23 21:28:33 -04:00
Paul Kaplan
a8ed7410a4 Separate studio reducers and initial state into a helper 2021-06-23 20:57:30 -04:00
Paul Kaplan
8a3e6155c4 Separate helper for creating the default redux store for www pages 2021-06-23 20:56:48 -04:00
Karishma Chadha
10f887f8ba
Revert "Only request replies if reply_count > 0" 2021-06-23 16:30:20 -04:00
seotts
29a818a5bc Change http to https in placeholder 2021-06-23 14:26:03 -04:00
seotts
a3b3a66f7a Rename button; change placeholder text 
lint fix

lint
 2021-06-23 14:13:49 -04:00
seotts
0f43addd10 Change manager modal width 2021-06-23 14:06:57 -04:00
Paul Kaplan
b3795c943f
Merge pull request #5630 from paulkaplan/reduce-reply-requests 
Only request replies if reply_count > 0
 2021-06-23 12:40:45 -04:00
Paul Kaplan
b5a68924c9
Merge pull request #5651 from paulkaplan/update-reply-count-for-new-replies 
Update the reply_count when you leave a reply
 2021-06-23 12:38:33 -04:00
Paul Kaplan
614cfdc4bb
Update src/redux/comments.js 
Co-authored-by: Karishma Chadha <kchadha@scratch.mit.edu>
 2021-06-23 12:37:15 -04:00
Paul Kaplan
810465bfcf
Merge branch 'develop' into no-report-own-comments 2021-06-23 09:49:38 -04:00
Paul Kaplan
96cb2f7959
Revert "Switch studios route to real version for testing on staging" 2021-06-23 09:29:04 -04:00
DD Liu
b7eb0b9026
Merge pull request #5653 from fsih/hoverState 
Studio tab nav button styling
 2021-06-22 20:01:16 -04:00
DD Liu
a85fb9c5dd
Merge pull request #5652 from fsih/replacePngs 
Replace pngs with svgs
 2021-06-22 19:44:23 -04:00
DD Liu
d3e400485e Fix syntax 2021-06-22 19:37:41 -04:00
DD Liu
cf26eb9cb2 Increase the padding in and around tab nav buttons 2021-06-22 16:48:18 -04:00
Paul Kaplan
d1242f8f26
Merge pull request #5645 from paulkaplan/fix-admin-panel-spacing 2021-06-22 14:39:27 -04:00
DD Liu
2ebd1be1a8 Make the tab button hover states match the spec 2021-06-22 13:40:33 -04:00
Paul Kaplan
d575928ea1
Merge pull request #5646 from paulkaplan/fix-studio-grid-spacing 
Make column and row gaps the same on studio tile grids
 2021-06-22 12:11:41 -04:00
Paul Kaplan
581f4d0cac Update the reply_count when you leave a reply 2021-06-22 12:03:13 -04:00
DD Liu
4ecffa885f Replace pngs with svgs 2021-06-22 02:45:28 -04:00
Paul Kaplan
cfd52d9369 Pass a customized comment component for studios 2021-06-21 16:06:40 -04:00
Paul Kaplan
fced16b08c Make Comment component a prop 2021-06-21 15:37:36 -04:00
Paul Kaplan
53b207e003 Only show reply button when comments are allowed 2021-06-21 12:56:29 -04:00
Paul Kaplan
547f5b959b Make column and row gaps the same 2021-06-21 12:36:53 -04:00
Paul Kaplan
1cace60ebd Fix admin panel space remaining after logging out 2021-06-21 12:25:19 -04:00
Eric Rosenbaum
303d800041
Merge pull request #5632 from ericrosenbaum/add-to-studio-fixes 
Style fixes for "add to studio" modal
 2021-06-18 15:43:33 -04:00
Paul Kaplan
1eb91e22b3
Merge pull request #5631 from paulkaplan/final-studio-routes 
Switch studios route to real version for testing on staging
 2021-06-18 15:41:32 -04:00
Paul Kaplan
6e43607a1d
Merge pull request #5633 from paulkaplan/remove-debug-errors 
Improve errors around following studios
 2021-06-18 15:01:23 -04:00
Paul Kaplan
10bcc2319a Fix typo in translation string 2021-06-18 14:59:32 -04:00
Paul Kaplan
d5e9dd0829
Merge pull request #5609 from fsih/adjustResponsive 
Adjust responsive boundaries for grid reflow
 2021-06-18 14:52:32 -04:00
Paul Kaplan
48958ddba4
Merge pull request #5607 from fsih/textBoxGray 
Make the border of editable fields dashed gray for studios. Otherwise, make them match the fields on project pages
 2021-06-18 14:52:18 -04:00
Paul Kaplan
ae202c7bcd Remove Debug component in studios 2021-06-18 11:49:57 -04:00
Paul Kaplan
fa8aff5837 Replace debug error on StudioFollow 2021-06-18 11:27:00 -04:00
Paul Kaplan
4c2b588926 Include react-hooks eslint plugin to prevent hooks usage errors. 
I'm including this now because when implementing the studio follow
error messaging, I made a mistake (conditionally calling useState)
that was tough to track down, and this linter plugin prevents that.
 2021-06-18 11:09:43 -04:00
Eric Rosenbaum
ffdf39282d gray border above done button row 2021-06-18 10:35:19 -04:00
Eric Rosenbaum
06e074bbe8 fix bottom padding 2021-06-18 10:32:02 -04:00
Paul Kaplan
7330bc00f5 Update studios route to final version for testing 2021-06-18 10:29:24 -04:00
Paul Kaplan
2e976e0358 Only request replies if reply_count > 0 2021-06-18 10:14:50 -04:00
Eric Rosenbaum
b913d5f3ae restyle nav buttons 2021-06-17 22:50:10 -04:00
seotts
ad3f50ac10 Revert "Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page"" 
This reverts commit 5b7127a271.

# Conflicts:
#	src/views/preview/subactions.jsx
 2021-06-17 17:19:51 -04:00
seotts
60b98908e0 use selectIsMuted to determine whether to show error 2021-06-17 17:18:40 -04:00
picklesrus
fe82cf3873 fix indentation 2021-06-17 15:48:38 -04:00
picklesrus
292bb02483
Merge branch 'develop' into studio-comments-off 2021-06-17 15:46:28 -04:00
Paul Kaplan
588ee63204
Merge pull request #5626 from ericrosenbaum/studio-single-comment 
Studio single comment view
 2021-06-17 15:01:32 -04:00
Paul Kaplan
cf0f4ee6b3
Merge pull request #5620 from paulkaplan/view-deleteted-studios 
Admins can view deleted studios
 2021-06-17 15:00:02 -04:00
Eric Rosenbaum
1605e23d5f fix logic for single comment effect 2021-06-17 14:05:25 -04:00
Eric Rosenbaum
a5800cb8fb revert change to comment limit 2021-06-17 14:04:34 -04:00
picklesrus
7d2d0cb3d9 Fix lint 2021-06-17 13:55:39 -04:00
picklesrus
d3e368bce2
Merge branch 'develop' into studio-comments-off 2021-06-17 13:47:03 -04:00
Eric Rosenbaum
bba5b69cb9
Merge pull request #5617 from LLK/release/2021-06-16 
Develop release/2021-06-16
 2021-06-17 13:17:50 -04:00
Paul Kaplan
23f7e563ab Include deleted studio banner 2021-06-17 12:37:45 -04:00
Karishma Chadha
f4b0bc8aee
Merge pull request #5621 from kchadha/studio-permissions-audit 
Studio creators and managers can delete their own comments
 2021-06-17 12:21:40 -04:00
Eric Rosenbaum
8c9cc0e859 load more button style 2021-06-17 10:03:24 -04:00
Eric Rosenbaum
0e49452fc7 expand replies 2021-06-17 09:49:23 -04:00
seotts
5b7127a271 Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page" 
This reverts commit d468072552, reversing
changes made to 469878a2fc.
 2021-06-17 09:02:31 -04:00
Eric Rosenbaum
48c3032f54 load single comment 2021-06-16 17:42:40 -04:00
Karishma Chadha
8821e0e865 Studio creators and managers can delete their own comments 2021-06-16 11:17:43 -04:00
Paul Kaplan
43b8b74d0c Move studio info request to top level 2021-06-16 09:55:29 -04:00
Paul Kaplan
4db968970a Use admin routes for studio info, curators, managers and activity 2021-06-16 09:54:40 -04:00
picklesrus
91f1c7ccf9 Merge branch 'studio-comments-off' of https://github.com/picklesrus/scratch-www into studio-comments-off 
resolve conflicts
 2021-06-15 17:25:22 -04:00
picklesrus
64f9d80c2a
Merge branch 'develop' into studio-comments-off 2021-06-15 17:24:43 -04:00
picklesrus
36516447cc Fix up tests from refactor and fix bug from refactor. 2021-06-15 17:22:32 -04:00
Eric Rosenbaum
7c0ec57165 add loading spinner 2021-06-15 15:35:25 -04:00
Sarah Otts
d468072552
Merge pull request #5573 from seotts/muted-add-proj-via-proj-page 
Muted users can’t add projects to studio via project page
 2021-06-15 15:26:47 -04:00
Eric Rosenbaum
469878a2fc
Merge pull request #5608 from fsih/thumbWhiteBg 
Adjust thumbnail css
 2021-06-15 15:06:09 -04:00
Sarah Otts
a0ab492bd9
Merge branch 'develop' into muted-add-proj-via-proj-page 2021-06-15 14:50:15 -04:00
Eric Rosenbaum
6bbc62c5e3 thumbnail in report matches main thumbnail style 2021-06-15 12:16:33 -04:00
Eric Rosenbaum
a344f1280d style fixes 2021-06-15 12:16:04 -04:00
Eric Rosenbaum
cbbd0ebdaf style empty state 2021-06-15 10:51:45 -04:00
seotts
1a753dfde3 Put Add to Studio change behind session flag 2021-06-15 09:45:09 -04:00
seotts
56dc892ee5 Muted user can’t add proj to studio via proj page 2021-06-15 09:45:09 -04:00
DD Liu
f11cd55995 Adjust responsive boundaries for grid reflow 2021-06-15 04:30:39 -04:00
DD Liu
df19f1b421 Adjust thumbnail css 2021-06-15 03:49:41 -04:00
DD Liu
8ea97e4577 Make the border of editable fields dashed gray for studios. Otherwise, make them match the fields on project pages. 2021-06-15 01:58:04 -04:00
Eric Rosenbaum
a2169d71c4 responsive fixed height 2021-06-14 17:45:20 -04:00
picklesrus
6b4bab02d1 Move logic about whether session is fetched into selectors 2021-06-14 17:15:47 -04:00
Sarah Otts
a7dae0561b
Merge branch 'develop' into muted-errors-from-backend 2021-06-14 15:40:05 -04:00
Ray Schamp
a17919e561
Merge pull request #5496 from rschamp/rearrange-conference-2021 
Bump Conference 2020 to 2021 (Take 2)
 2021-06-14 09:01:51 -04:00
DD Liu
2d884eef64
Merge pull request #5578 from fsih/whiteButtons 
Make the default nav button state white
 2021-06-13 23:07:33 -04:00
DD Liu
deb1f5eb7e
Merge pull request #5580 from fsih/titleLimit 
Make the title scroll after a certain length, and long words wrap
 2021-06-13 23:07:23 -04:00
Karishma Chadha
8ab13436c0
Merge pull request #5588 from kchadha/manager-limit 
Studio Manager Limit
 2021-06-11 16:39:27 -04:00
Karishma Chadha
85beabad19 Remove unneded redux connect code 2021-06-11 15:58:22 -04:00
Karishma Chadha
c773018c8e Update managerCount in redux when promoting a curator or removing a manager. 2021-06-11 15:55:28 -04:00
Karishma Chadha
75687e52f7 Remove commented out CSS styling 2021-06-11 14:17:21 -04:00
Karishma Chadha
6486f119a3 fix trailing space issue 2021-06-10 19:40:53 -04:00
Karishma Chadha
9fc2f8167d Fix prop warning in the studio curator invite box. 2021-06-10 19:24:54 -04:00
Karishma Chadha
96aeabd255 Display info to managers/studio creator about how close the studio is to reaching the manager limit when over a threshold. Display info about removing managers when a studio has reached the limit. 2021-06-10 19:24:25 -04:00
Karishma Chadha
40b8f5a5c9 Update styling of promote modal so that if we get a network or other server error while trying to promote, we see the error message in the modal (and closer to the promote button). 2021-06-10 19:22:22 -04:00
Karishma Chadha
51858167c9 Display manager limit modal in two scenarios: if the frontend already knows that the manager limit has been reached, and if we have the promote modal up, but we got response from the server that the manager limit has been reached. 2021-06-10 19:20:51 -04:00
Karishma Chadha
e0e53b8d73 Create manager limit modal (modeled off of the promote-curator modal) which will be displayed if the user clicks promote when the manager limit has already been reached. 2021-06-10 19:17:07 -04:00
Karishma Chadha
ce8e270309 Set up state, tracking the number of managers the limits used to display info to the user. Handle new error response when trying to promote a curator. 2021-06-10 19:13:48 -04:00
picklesrus
17307cacd3 Add tests 2021-06-10 16:51:41 -04:00
picklesrus
fcbcef244b Show a status message in place of the usual comment components when studio comments are turned off. 2021-06-10 15:36:48 -04:00
Eric Rosenbaum
c7ba97d291 Empty state styling 2021-06-10 10:52:23 -04:00
Eric Rosenbaum
b6a91adf78 add empty states and done button 2021-06-09 17:38:22 -04:00
DD Liu
ee95a708b5 Make the title scroll after a certain length, and long words wrap 2021-06-09 14:57:53 -04:00
seotts
4f25a2ae34 Don’t show errors for toggling openToAll or commentsAllowed 2021-06-09 14:08:52 -04:00
seotts
91d66cd20b Display backend mute errors on studio edit 2021-06-09 14:08:51 -04:00
Eric Rosenbaum
b7eb303217
Merge pull request #5568 from ericrosenbaum/hide-validation 
Hide validation message on click outside
 2021-06-09 09:56:04 -04:00
picklesrus
b65ab82a89
Merge pull request #5561 from picklesrus/project-comments 
handle project comments turned off
 2021-06-09 09:41:44 -04:00
picklesrus
0edd946fee Address review comments 2021-06-09 09:08:16 -04:00
DD Liu
af5f810212 Make the default nav button state white. Also remove that weird tiny bit of resizing when you click on them, was that intentional? 2021-06-08 22:26:05 -04:00
Eric Rosenbaum
d9169e1892 catch errors 2021-06-08 14:55:37 -04:00
Eric Rosenbaum
5ba6bb83b9 hide validation on click outside for description 2021-06-08 14:16:23 -04:00
Eric Rosenbaum
b0a9bab71a hide validation on click outside for thumnbail image 2021-06-08 13:58:21 -04:00
seotts
3d6a789812 update session when user gets muted 2021-06-08 13:38:35 -04:00
Eric Rosenbaum
935ec7acad simplify wrapping 2021-06-08 11:01:54 -04:00
Eric Rosenbaum
6af78c45e5 hide validation message on click outside 2021-06-08 10:53:47 -04:00
picklesrus
ef801112cd
Merge branch 'develop' into project-comments 2021-06-07 15:38:40 -04:00
picklesrus
1afbe4ad79 clean up 2021-06-07 15:31:20 -04:00
picklesrus
993dd36aa5 WIP of being able to turn off project comments. 2021-06-07 11:28:29 -04:00
Karishma Chadha
7e1eb3a2f8
Merge pull request #5539 from kchadha/reply-thread-refresh-fix 
Use reply_count to check whether reply limit is reached
 2021-06-03 11:09:04 -04:00
Karishma Chadha
9b323d99a0 Fix reply status box alignment. 2021-06-02 18:14:09 -04:00
Karishma Chadha
17ada7172d Add totalReplyCount prop to check whether thread has reached limit instead of checking only the 20 we load on the first try 2021-06-02 17:38:10 -04:00
Karishma Chadha
c377af81f2 Fix l10n string ID where it previously got missed. 2021-06-02 15:45:07 -04:00
Karishma Chadha
e2db890814
Merge pull request #5495 from kchadha/comment-thread-limit 
Comment thread limit
 2021-06-02 14:08:03 -04:00
Eric Rosenbaum
be047a5a7b
Merge pull request #5503 from ericrosenbaum/promote-modal 
Add "Promote to manager" modal
 2021-06-02 10:51:05 -04:00
Karishma Chadha
da231ed3af Change l10n string ID to match server error 2021-06-02 10:48:04 -04:00
Eric Rosenbaum
9ccbe94be1 add promote modal 2021-05-26 22:54:23 -04:00
DD Liu
2179ade65e Fix lint 2021-05-26 15:00:52 -04:00
DD Liu
cd930046bb Merge branch 'develop' into commentsNotAllowed 2021-05-26 14:47:20 -04:00
DD Liu
217c7ecafc Add comments not allowed box 2021-05-26 14:45:47 -04:00
Paul Kaplan
8451e57a8a Merge branch 'develop' into studio-curator-invite 2021-05-26 12:09:17 -04:00
Paul Kaplan
3ca94ee6cf Merge branch 'develop' into studio-curator-invite 2021-05-26 12:07:05 -04:00
Paul Kaplan
dbf7522856 Merge branch 'develop' into editThumbnailButton 2021-05-26 12:02:54 -04:00
Paul Kaplan
3621cd24cf Add edit icon 2021-05-26 11:59:58 -04:00
Paul Kaplan
f44cc23a98
Merge branch 'develop' into studio-meta 2021-05-26 11:55:35 -04:00
Paul Kaplan
60b154126d
Merge pull request #5467 from seotts/muted-users-cant-edit-studios 
Prototype: muted users can't edit studios
 2021-05-26 11:01:47 -04:00
Paul Kaplan
47560e5d5e Use the correct l10n message for curator page 2021-05-26 10:58:28 -04:00
Paul Kaplan
cb8a869e4f Merge branch 'develop' into muted-users-cant-edit-studios 2021-05-26 10:58:12 -04:00
rschamp
31e6616544 Rename all Conference 2020 folders to 2021 
This is both to reduce confusion in the future, and so that Transifex sees what it expects, with the name of the resource corresponding to the path to the l10n file.
 2021-05-26 10:22:12 -04:00
rschamp
232d9f3bbd Revert "Merge pull request #5494 from LLK/revert-5476-rearrange-conference-2021" 
This reverts commit 4edab6927e, reversing
changes made to 7b7322c9f9.
 2021-05-26 09:40:41 -04:00
Ray Schamp
f902e25b0f
Revert "Bump conference URL one year" 2021-05-26 09:35:35 -04:00
Karishma Chadha
6870db418e Track which comment thread has the thread limit status box so that only one status box is displayed in the whole studio comments view. 2021-05-25 23:19:36 -04:00
Karishma Chadha
e57cd9a111 Introduce comment thread limit on studio comments. When a user clicks reply on a thread that has reached the limit, display a comment status message in place of the comment composer. The user should only see one status box in a message thread. 2021-05-25 23:17:57 -04:00
DD Liu
eff5803b92 Fix lint issues 2021-05-25 17:35:18 -04:00
DD Liu
8f542fa5e5 Change file input to edit thumbnail icon" 2021-05-25 17:30:38 -04:00
rschamp
c52677ccc6 Update community guidelines 2021-05-25 11:05:17 -04:00
Paul Kaplan
0ccf28e388
Merge pull request #5466 from ericrosenbaum/load-24-projects-per-page 
Small fixes for "add to studio" modal
 2021-05-25 10:00:03 -04:00
Paul Kaplan
5903f57597
Merge pull request #5468 from cwillisf/studios-stats-and-icons 
Studios stats and icons
 2021-05-25 09:53:18 -04:00
Paul Kaplan
f50d8dbf66 Wrap counts in span for styling 2021-05-25 09:48:33 -04:00
Eric Rosenbaum
e5212234ac lint 2021-05-24 17:22:20 -04:00
Eric Rosenbaum
a390c0655f Merge branch 'develop' of https://github.com/LLK/scratch-www into load-24-projects-per-page 
# Conflicts:
#	src/views/studio/modals/user-projects-modal.jsx
 2021-05-24 17:18:09 -04:00
Eric Rosenbaum
a194b48566 load more button is fill width 2021-05-24 17:12:20 -04:00
Paul Kaplan
832324ea83
Merge pull request #5451 from paulkaplan/studio-alerts 
Alert component and studio error and success alerts
 2021-05-24 15:33:10 -04:00
Paul Kaplan
f9702d9017
Merge pull request #5437 from paulkaplan/fix-studio-project-adding-errors 
Handle more types of project add errors
 2021-05-24 15:32:37 -04:00
Paul Kaplan
2c53c70307
Merge pull request #5436 from paulkaplan/fix-admin-studio-comments 
Wait for session to be fetched before loading comments
 2021-05-24 15:32:24 -04:00
Ray Schamp
460010e64f
Merge pull request #5476 from rschamp/rearrange-conference-2021 
Bump conference URL one year
 2021-05-24 13:53:22 -04:00
Bryce Taylor
bfe64aa313
Merge pull request #4540 from BryceLTaylor/move-navbar-tests 
Move Navbar integration tests from Tap to Jest
 2021-05-24 10:57:21 -04:00
rschamp
40295d3860 Bump conference URL one year 
Resolves #5197
 2021-05-24 09:36:47 -04:00
Eric Rosenbaum
b1b0d6b259 add/remove icons for project tiles 2021-05-21 17:01:08 -04:00
Christopher Willis-Ford
59e7490a46 fix nav tab size change on click 2021-05-21 12:53:14 -07:00
Christopher Willis-Ford
ad6675f64d show '100+' if project/comment count is 100 or more 2021-05-21 12:43:57 -07:00
Christopher Willis-Ford
87f4fb3a9c add icon & style to the StudioReport button 2021-05-21 12:43:57 -07:00
Christopher Willis-Ford
ddaa099cf0 add icons to StudioStats 2021-05-21 12:43:52 -07:00
Christopher Willis-Ford
594cd7a285 add tab icons to StudioTabNav 2021-05-21 12:41:52 -07:00
Christopher Willis-Ford
b21e55b5f3 add followers, last-updated date to studio sidebar 2021-05-21 10:31:35 -07:00
Christopher Willis-Ford
a0992bb5f7 add project and comment count to StudioTabNav 2021-05-21 10:31:30 -07:00
Eric Rosenbaum
0a9e465830 style border for added projects 2021-05-21 11:09:43 -04:00
seotts
6798380ca8 Fix conflicts 
d
 2021-05-21 10:29:38 -04:00
seotts
3212ccf7cb Add a comment about shouldShow*MuteErrors 2021-05-21 10:02:16 -04:00
seotts
4f618336a8 Error should only shrink textarea on small screens 2021-05-21 10:02:16 -04:00
seotts
13739ae0bc Minor changes to error messages 2021-05-21 10:01:07 -04:00
seotts
dbb258cf8b Work on tests 
remove failing tests
 2021-05-21 10:00:15 -04:00
seotts
4f556785d3 Move whether to show mute both into selectors 2021-05-21 10:00:15 -04:00
seotts
9e8186808d Correct projects message 2021-05-21 09:59:24 -04:00
seotts
db5358d79c Show mute edit errors on hover 2021-05-21 09:59:23 -04:00
seotts
19a9997e0f Muted users can’t edit studios 
linting fixes
 2021-05-21 09:46:19 -04:00
Eric Rosenbaum
15b31c689e load 24 projects per page in add to studio modal 2021-05-21 09:20:51 -04:00
Eric Rosenbaum
a7ab994638 use buttons in subnav to make keyboard nav work 2021-05-20 17:12:27 -04:00
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