scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-11 00:02:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
7909 commits 221 branches 1 tag 504 MiB
Commit graph

2624 commits

Author SHA1 Message Date
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
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
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
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
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
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
23f2135c17 add donate banner, make close button a mode of button component 2021-05-07 11:50:47 -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
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
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
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
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
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
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
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
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
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
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
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
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
8b98820495 Add nav bubbles 2021-03-24 16:12:47 -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
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
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
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
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
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
Paul Kaplan
49e62afa8b Fix typo in mapStateToProps 2021-03-08 12:27:32 -05:00