Commit graph

219 commits

Author SHA1 Message Date
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
3a9742c77e use radio button values in report 2021-05-14 14:51:17 -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
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
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
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
62b1f8f3a5 Merge branch 'develop' into feature/studio-project-modal 2021-05-10 20:55:20 -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
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
Paul Kaplan
95766fd68a Add clear to infinite list, fixup tests 2021-05-10 10:22:18 -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
Paul Kaplan
7c021b6ac5 Catch too large thumbnails before trying to upload 2021-05-06 09:30:43 -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
Benjamin Wheeler
732b596c61
Revert "Add privacy policy and terms of use to allowlist" 2021-05-05 16:17:22 -04:00
Paul Kaplan
757f95f89c
Merge branch 'develop' into studio-report 2021-05-04 15:13:04 -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
129d87642c Remove unuseable NOT_FETCHED state for studio info 2021-04-28 13:44:24 -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
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
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
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
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
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
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
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
Paul Kaplan
99195d6df3 Add studio selector and tests 2021-03-23 15:19:01 -04:00