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

514 commits

Author SHA1 Message Date
Paul Kaplan
1277ca4876 Make "See more replies" only the width of the replies column 2019-01-10 10:58:34 -05:00
chrisgarrity
ccbaa60e59 Don’t allow remixing if the project is not loaded 
Depends on https://github.com/LLK/scratch-gui/pull/4312

Adds new `isProjectLoaded` state to the project view, and disables the remix button until the project is loaded. Passes new callback to gui to be notified when the project is loaded.
 2019-01-10 10:50:37 -05:00
Paul Kaplan
f7e8922757 Allow loading more than 20 replies 2019-01-10 10:46:01 -05:00
Paul Kaplan
7f99e8b8c2 Prevent uncaught errors from going to sentry 
For real this time. Just needed to figure out the right plugins to filter. TryCatch plugin is the one that reports errors from setTimeouts, which the VM executes code in.

Remove the previous window.onerror kludge, it was not working and prevented errors from reaching the console.

Tested locally by providing the staging DSN for Sentry
 2019-01-10 10:07:30 -05:00
Paul Kaplan
2ea49fc4d3
Disable window onerror 2019-01-09 16:56:31 -05:00
Paul Kaplan
885977e554 Disable global handlers 2019-01-08 14:19:11 -05:00
Benjamin Wheeler
63cc104668
Merge branch 'develop' into hotfix/proxy-love-favorite 2019-01-07 14:20:28 -05:00
Paul Kaplan
3ecc7d9a7e
Merge pull request #2612 from chrisgarrity/hotfix/no-comment-unshared 
Disallow comments on unshared projects
 2019-01-07 13:10:09 -05:00
Ben Wheeler
8e1d6fee54 love and favorite proxy, and use x-requested-with header 2019-01-07 11:39:31 -05:00
chrisgarrity
29fb4b69d1 restore 5000 character limit for description fields 
Also make sure that validation error message is visible when 5000 character limit is exceeded.
 2019-01-07 11:09:44 -05:00
chrisgarrity
1d223825df Disallow comments on an unshared project 2019-01-07 10:42:53 -05:00
Benjamin Wheeler
ad0da48eeb
Merge pull request #2596 from benjiwheeler/hotfix/view-all-remixes 
[Master] Show link to view all remixes on project page
 2019-01-04 11:47:47 -05:00
Benjamin Wheeler
976524b64d
Merge pull request #2600 from benjiwheeler/hotfix/view-all-remixes 
[Develop] Show link to view all remixes on project page
 2019-01-04 10:50:42 -05:00
Ben Wheeler
7f2fbd4a3b added View all link at top of studios list 2019-01-04 10:30:43 -05:00
Ben Wheeler
b452f73a32 revised remix list header css to handle longer strings better 2019-01-04 10:22:48 -05:00
Ben Wheeler
0ad5c977aa show link to view all remixes on project page 2019-01-03 18:50:19 -05:00
Ben Wheeler
9625bc554d added comments explaining need to show project instructions, notes when both are empty 2019-01-03 13:12:08 -05:00
Ben Wheeler
627737fdd4 collapse empty project instructions or notes and credits 2019-01-03 12:45:07 -05:00
Paul Kaplan
07ad54bb6c Only track green flag once 2019-01-02 16:22:42 -05:00
Paul Kaplan
a2fbdf9943 Only track green flag once 2019-01-02 16:19:26 -05:00
Andrew Sliwinski
4a4b8815e5 Remove "CappedNumber" from view count on project page. 2018-12-30 10:06:02 -05:00
Ray Schamp
7a7a6de4b0
Merge pull request #2543 from paulkaplan/fix-gui-min-size 
Bring in the min sizes for GUI to allow scrollable UI
 2018-12-27 16:10:59 -05:00
Paul Kaplan
da8d60706f Bring in the min sizes for GUI to allow scrollable UI 2018-12-27 11:12:34 -05:00
Paul Kaplan
bfd14a115a Fix the studio links to use the correct URL 2018-12-27 09:27:11 -05:00
Paul Kaplan
dcb03a0526 Fix lint whitespace 2018-12-20 13:48:38 -05:00
Colby Gutierrez-Kraybill
6a946b99fc Update to new sentry API pattern 
Use current Sentry browser package and forward errorId into eventId
Fix up errorInfo reference
Put Sentry on the window object for GUI to use
Remove unneeded reference to old style Raven and raven-js
Move Sentry webpack config into production only

Add GA tracker ID to window

Allows scratch-gui to use same GA id
 2018-12-20 12:56:33 -05:00
Paul Kaplan
a196462818
Merge pull request #2515 from paulkaplan/enfasten-remixing-further 
Set isRemixing to true and then start remixing process
 2018-12-20 08:31:58 -05:00
picklesrus
2f35049ff8
Merge pull request #2501 from kyleplo/patch-3 
Make it clear that only Scratchers can use the cloud
 2018-12-19 17:24:25 -05:00
Paul Kaplan
137015cfc0 Set isRemixing to true and then start remixing process 
This makes it feel snappier to start the remixing project because it does not wait for the GUI to notify
 2018-12-19 15:58:38 -05:00
Benjamin Wheeler
64fc4b3ed8
Merge pull request #2508 from benjiwheeler/switch-to-editor-on-remix 
switch to editor after remixing from project page
 2018-12-19 15:35:18 -05:00
Ben Wheeler
5ff13da56d admins should not see editable project title in editor 2018-12-19 11:59:47 -05:00
Ben Wheeler
859574a8bd switch to editor after remixing from project page 2018-12-19 11:40:49 -05:00
Benjamin Wheeler
293b7beefc
Merge pull request #2506 from benjiwheeler/mod-info 
added author username to moderation info area
 2018-12-18 11:45:51 -05:00
Paul Kaplan
f0b37134ff
Merge pull request #2505 from paulkaplan/remove-approx-liking 
Remove approx liking/favoriting format
 2018-12-18 11:40:07 -05:00
Ben Wheeler
5d96a6293a less css repetition 2018-12-18 10:48:03 -05:00
Ben Wheeler
edec88f0ab added author username to moderation info area 2018-12-18 10:43:11 -05:00
Paul Kaplan
d9b30d96d1 Remove approx liking/favoriting format 2018-12-18 09:50:17 -05:00
kyleplo
11ec64ac9c
Make it clear that only Scratchers can use the cloud 2018-12-17 16:41:57 -05:00
Ben Wheeler
153c749546 pass onUpdateProjectThumbnail to gui when on project page 2018-12-17 15:36:09 -05:00
Paul Kaplan
e20f928147 Put project info alerts below navbar 2018-12-14 16:47:54 -05:00
Ben Wheeler
2a0a76fba1 don't use flex-row class to wrap instructions and credits 2018-12-13 14:01:27 -05:00
Ray Schamp
295c1df2ff Hook up onClickLogo in GUI 
This way it will take us to where we expect on staging and production.

Resolves #2296
 2018-12-13 09:44:14 -05:00
Paul Kaplan
eb0c98b939
Merge pull request #2464 from paulkaplan/minor-style-fixes 
Minor style fixes to the project page
 2018-12-13 08:44:39 -05:00
Benjamin Wheeler
e9001e17c3
Merge pull request #2452 from benjiwheeler/parent-remix-null 
if remix parent or original is unshared, don't crash project page
 2018-12-12 21:33:56 -05:00
Paul Kaplan
bbda370d56
Merge pull request #2445 from paulkaplan/fix-preview-remix-list 
Fix hard-coded /preview/id url for remix list.
 2018-12-12 19:39:03 -05:00
Paul Kaplan
ef217b96a1 Use custom meta tag info for project page. 
Note this _will not_ work until the page uses a template that does not include these meta tags. That is because react-helmet does not override any existing info in the head.

Thus, this was tested by removing that info from the template and seeing it work, then putting the template back.
 2018-12-12 19:30:48 -05:00
Paul Kaplan
612d08e850 Fix line heights for instructions and comments 2018-12-12 17:04:14 -05:00
Paul Kaplan
fb4f6b6d56 Fix ordering and sizing of loves, extensions and mod info 2018-12-12 17:04:14 -05:00
Paul Kaplan
0af216137b Give copy-link and other subaction buttons an active state to show click 2018-12-12 17:04:14 -05:00
Paul Kaplan
ac92c65af6 Increase comment box border to prevent popping when focused 2018-12-12 17:04:14 -05:00
Paul Kaplan
70ab7c9c45 Correctly align extension chip images 2018-12-12 17:04:14 -05:00
Paul Kaplan
3aeda2208b Make the remix button spin the correct the direction 2018-12-12 15:38:00 -05:00
Ben Wheeler
634d6c93e0 if remix parent or original is unshared, don't crash project page 2018-12-12 13:24:41 -05:00
Benjamin Wheeler
a9f9d7ee49
Merge pull request #2428 from benjiwheeler/fix-favorite-love 
make love and favorite icons respond to click immediately, cleanly
 2018-12-12 11:25:31 -05:00
Benjamin Wheeler
964459fb17
Merge pull request #2437 from benjiwheeler/placeholder-text-go-away 
Placeholder text go away
 2018-12-12 11:24:43 -05:00
Paul Kaplan
bc99c52ebe Fix hard-coded /preview/id url for remix list. 2018-12-11 14:46:05 -05:00
Ben Wheeler
478259a5d2 placeholder text goes away when instructions, credits clicked 2018-12-11 12:29:31 -05:00
Paul Kaplan
78506f82c7 Hide project info alerts when switching to editor 2018-12-11 11:18:53 -05:00
Paul Kaplan
ace110c59b Show username and cloud var alerts on projects that use them. 
Only implemented for scratch3 projects
 2018-12-11 11:15:00 -05:00
chrisgarrity
594ce06b5b
Merge pull request #2427 from chrisgarrity/issue/sb2-mod-info 
Add moderator info for sb2 projects
 2018-12-11 10:13:45 -05:00
apple502j
c134a95de3 Translate placeholder 2018-12-11 20:41:49 +09:00
Ben Wheeler
d5ec7e17df add clientFaved and clientLoved, fix number selection 2018-12-10 11:59:32 -05:00
Paul Kaplan
26e821214a
Merge pull request #2431 from paulkaplan/fix-multi-love 
Only try to update fave counts if there are no requests in progress.
 2018-12-10 10:56:34 -05:00
Paul Kaplan
901dfeb6ca
Merge pull request #2425 from rschamp/admin-panel-occlusion 
Don't occlude page content with the admin panel
 2018-12-10 10:35:59 -05:00
Paul Kaplan
7c5d909a68 Only try to update fave counts if there are no requests in progress. 2018-12-10 10:31:58 -05:00
Paul Kaplan
98b5930b91 Use falsey check for shareDate instead of checking for null. 
It is set to empty string elsewhere when the value does not exist, not null
 2018-12-10 09:15:24 -05:00
chrisgarrity
84cfcdee85 Add moderator info for sb2 projects 2018-12-10 08:47:01 -05:00
Benjamin Wheeler
9d5788cc77
Merge pull request #2417 from benjiwheeler/view-count 
pass onGreenFlag to GUI; when called, call API to register project view
 2018-12-07 16:52:44 -05:00
Paul Kaplan
d20b16d79c
Merge pull request #2424 from paulkaplan/admin-toggle-comments 
Allow admins to toggle comments
 2018-12-07 16:47:01 -05:00
Paul Kaplan
3934c92c7a
Merge pull request #2423 from paulkaplan/add-to-studio-fix 
Show addToStudio for all logged in users on shared projects
 2018-12-07 16:46:42 -05:00
Paul Kaplan
551cc0cc13 Remove userOwnsProject because it is unused 2018-12-07 16:09:34 -05:00
Ray Schamp
1979675ebf Don't occlude page content with the admin panel 
/ht @paulkaplan for the idea to move it below the nav bar.
 2018-12-07 13:15:38 -05:00
Paul Kaplan
5d409bcdcf Allow admins to toggle comments 2018-12-07 12:57:50 -05:00
Paul Kaplan
4522983e20 Show addToStudio for all logged in users on shared projects 2018-12-07 12:51:00 -05:00
Paul Kaplan
2a464c8c21 Remove share button on censored project banner. 
Functionality needs reconsidering.
 2018-12-07 12:32:54 -05:00
Ben Wheeler
8dd239ebe5 use authorUsername, not users own username, in hitting logProjectView endpoint; use cookie and tokens in request 2018-12-07 11:00:43 -05:00
Ray Schamp
402799e55f Fix lint issues 
My linter doesn't catch prop order for some reason. So fix linting so the build works.
 2018-12-06 23:15:54 -05:00
Ben Wheeler
5c3300dd68 pass onGreenFlag to GUI; when called, call API to register project view 2018-12-06 23:06:27 -05:00
Ray Schamp
0957173c88 Fix CSS 
I dunno what I was seeing that made me think the width should be 237, but it was incorrect.
 2018-12-06 22:48:03 -05:00
Ray Schamp
bc59a63e5e Only show the admin panel to admins 2018-12-06 17:07:28 -05:00
Ben Wheeler
d235d872e1 show remixed banner to all, not just new scratchers 2018-12-06 16:01:28 -05:00
Ben Wheeler
07568b0f65 remove editor from url when not appropriate 2018-12-06 16:01:28 -05:00
Ben Wheeler
1adca1800a Banner message showing that user has remixed 2018-12-06 16:01:28 -05:00
Ray Schamp
af32c08971
Merge pull request #2413 from rschamp/mod-panel-phase-3 
Match scratchr2 admin panel behavior more closely
 2018-12-06 15:47:48 -05:00
Ray Schamp
15cc6ca529 Lint 2018-12-06 15:16:22 -05:00
Ray Schamp
0f823531b6 Use local storage to remember the panel state 
This is mirroring from scratchr2
 2018-12-06 15:06:55 -05:00
Ray Schamp
d243b5dad7 Allow the iframe to close the parent admin panel 2018-12-06 15:06:21 -05:00
Ray Schamp
e41cd84f09 Fix up admin panel styles 
Match the width more closely and hide scrollbars
 2018-12-06 15:05:41 -05:00
Ray Schamp
b7ffa34eec Open and close admin panel from parent component 2018-12-06 15:05:20 -05:00
chrisgarrity
7ac90afb56
Merge pull request #2406 from chrisgarrity/issue/2388-embed-project 
show embed view
 2018-12-06 11:51:33 -05:00
Ray Schamp
8e75b8c6cf
Merge pull request #2404 from rschamp/mod-panel-phase-1 
Admin panel for the project page
 2018-12-06 09:33:02 -05:00
Paul Kaplan
27e0612ea9
Merge pull request #2401 from paulkaplan/admin-share-banner 
Allow admins to see share banner
 2018-12-06 05:33:27 -05:00
chrisgarrity
1a1122d984 show embed view 
* detect `embed` in the URL
* initialize GUI in embed mode if detected
* match `embed` in the project page route
* add fastly config rules to redirect `/projects/embed/:id` to `/projects/:id/embed`
 2018-12-05 17:35:44 -05:00
Ray Schamp
59e0941652 Update iframe to the standalone view 2018-12-05 17:12:18 -05:00
Ray Schamp
096aeb02a0 Lint 2018-12-05 16:09:04 -05:00
Ray Schamp
726a2005bb Basic project admin panel support 
Just in case we don't do anything else, this "proxies" the old admin panel to the new project page.

Requires https://github.com/LLK/scratchr2/pull/5219 to work.
 2018-12-05 15:40:18 -05:00
chrisgarrity
8d88ab9b9b
Merge pull request #2389 from chrisgarrity/issue/2306-projects-404 
Show NotAvailable for invalid URL
 2018-12-05 15:01:51 -05:00
Paul Kaplan
b481ae7fad Allow admins to see share banner 2018-12-05 13:39:18 -05:00
Paul Kaplan
ff8bbe79b4 Use message instead of censorMessage for the censor message. 2018-12-04 16:29:46 -05:00
chrisgarrity
880b890dc2 Show NotAvailable for invalid URL 
`/projects` without an id or `editor` should just show a 404.
 2018-12-04 10:48:16 -05:00
Paul Kaplan
4a57d36112
Merge pull request #2379 from paulkaplan/refresh-project-data 
Refresh the data related to the project json on switch back from editor
 2018-12-04 08:34:45 -05:00
Paul Kaplan
e49eb3a222 Refresh the data related to the project json on switch back from editor 2018-12-03 15:15:18 -05:00
Karishma Chadha
da4cfb3120 Track isScratcher status and pass hasCloudPermission flag to gui. 2018-12-03 15:02:13 -05:00
Ben Wheeler
655f3365ec rearranged css for linting 2018-12-03 09:24:35 -05:00
Ben Wheeler
089cdbb06b revised banner css to be more flexible 
simplified share banner conditionals

shorter banner height without button; button has margin instead
 2018-12-03 09:24:35 -05:00
Ben Wheeler
351d38de09 fixed lint errors 2018-12-02 08:35:31 -05:00
Ben Wheeler
e1cc0c390b tweaked banner css to bring it into line with design spec 2018-12-02 08:35:31 -05:00
Ben Wheeler
a6a5ef7941 long and short shared messages; clarified logic around which banner to show 2018-12-02 08:35:31 -05:00
Ben Wheeler
3af745eede don't show shared message forever 2018-12-02 08:35:31 -05:00
Ben Wheeler
8d74726080 added congratulations on sharing message for new scratchers 2018-12-02 08:35:31 -05:00
chrisgarrity
f6d54e25b9
Merge pull request #2367 from chrisgarrity/feature/mod-info 
Additional project data for Moderators/Admins on the project page
 2018-11-30 08:21:15 -05:00
chrisgarrity
e95e5c5f25 Additional project data for Moderators/Admins 2018-11-29 15:43:28 -05:00
Paul Kaplan
443039389a
Merge pull request #2366 from paulkaplan/fix-cloud-switching 
Pass canSave to both editor and player view to allow cloud reconnecting.
 2018-11-29 11:26:52 -05:00
Paul Kaplan
c777ccffc8 Pass canSave to both editor and player view to allow cloud reconnecting. 
The canSave prop was being passed to the editor view, but needs to also be passed to the player view because it is used to decide whether to connect the viewer to cloud variables. People cannot connect to cloud variables after entering editor mode on anothers project.
 2018-11-29 10:53:03 -05:00
Paul Kaplan
172915f9d9 Add project thumbnail update action 2018-11-29 09:55:45 -05:00
Benjamin Wheeler
84dc08b5cc
Merge pull request #2314 from chen-robert/gh2263-negative-loves 
Fix gh-2263: Negative loves
 2018-11-28 19:25:01 -08:00
chrisgarrity
5cff3f9ae4 Revised unsupported browser info 
- Header reads ‘This browser is not supported’
- FAQ link goes to general Scratch FAQ.
 2018-11-27 12:51:49 -05:00
Paul Kaplan
99ac59d2cb
Merge pull request #2350 from paulkaplan/fix-comments-remixing 
Remove comments when remixing, they do not exist on the new project
 2018-11-26 16:32:12 -05:00
Paul Kaplan
1c4c5895af Remove comments when remixing, they do not exist on the new project 2018-11-26 11:21:14 -05:00
Paul Kaplan
f025407818 Use a more popular clipboard manager 2018-11-26 10:22:55 -05:00
Paul Kaplan
1c09bdf7b0 Implement the copy link functionality 
This does not implement any further design, like showing a confirmation popover, but just makes sure the button works. I used a very slim package to implement copy that does not include any fallbacks for IE, since we do not need to support that here.
 2018-11-26 10:22:34 -05:00
Paul Kaplan
d31cbe58e2
Merge pull request #2344 from paulkaplan/fix-comment-actions 
Show comment actions on hover and fix report translation
 2018-11-26 10:15:16 -05:00
chrisgarrity
decb250dd5 Initial version 2018-11-26 09:43:05 -05:00
Paul Kaplan
1be21bdb7e
Merge pull request #2345 from paulkaplan/fix-placeholder-alignment 
Fix alignment of the placeholder and text in project instructions & note
 2018-11-26 09:25:44 -05:00
Paul Kaplan
3fb5dd769a
Merge pull request #2340 from paulkaplan/visibility-info 
Show details about why a project is not public
 2018-11-26 09:18:38 -05:00
Paul Kaplan
d5c3ae773f Fix lint 2018-11-21 13:00:53 -05:00
Paul Kaplan
847d0c3844 Fix alignment of the placeholder and text in project instructions & note 2018-11-21 12:12:51 -05:00
Paul Kaplan
a8cf28958c Fix incorrect translation string in comment report 2018-11-21 11:47:12 -05:00
Paul Kaplan
933b805044 Make comment actions (report, delete, restore) only visible on hover 2018-11-21 11:46:54 -05:00
Paul Kaplan
2ed74a2682 Show deleted banner if both deleted and censored. 
This is because the user can take an action to remove the trash status, but not the censored status.
 2018-11-21 10:36:27 -05:00
Paul Kaplan
0b8c13fb40 Use the project author username in visibility request instead of viewer 
/ht @chrisgarrity
 2018-11-21 10:31:10 -05:00
Ray Schamp
df3d18e649
Revert "Revert "use cdn.scratch.ly in staging"" 2018-11-21 10:27:13 -05:00
Ray Schamp
45415944c1
Revert "use cdn.scratch.ly in staging" 2018-11-21 10:07:57 -05:00
Benjamin Wheeler
95fb947c08
Merge pull request #2325 from benjiwheeler/hash-redirect 
redirect hash urls to url pathnames
 2018-11-20 16:06:46 -05:00
Paul Kaplan
ac6a870a3f
Merge pull request #2334 from chrisgarrity/feature/rename-preview 
Rename /preview to /projects
 2018-11-20 15:34:03 -05:00
Ben Wheeler
79ae4dd511 let pathname end without a slash 2018-11-20 15:03:57 -05:00
Paul Kaplan
c18ccba646 Fix scss linting 2018-11-20 12:16:10 -05:00
Paul Kaplan
122160726d Show details about why a project is not public 
Follow up the project info request with a request to the visibility endpoint to find out if the project is trashed or censored. The project just not being published is handled by the existing code.

This PR generalizes the ShareBanner to a more generic "Banner" that is then filled with the relevant content.
 2018-11-20 12:01:52 -05:00
Paul Kaplan
af301ba450
Merge pull request #2336 from paulkaplan/exit-single-comment-view 
Allow user to exit "single comment mode" and see all comments.
 2018-11-20 08:13:42 -05:00
Ben Wheeler
7ee463509c use cdn.scratch.ly in staging 2018-11-19 17:07:48 -05:00
chrisgarrity
c4403c5d8d Replace uses of /preview in URLs 2018-11-19 17:02:09 -05:00
Paul Kaplan
3fe1242aa6 Allow user to exit "single comment mode" and see all comments. 
This visually appears like a "load more comments" button for now, but has the impact of unsetting the #comments-<id> hash in the url and resetting the comment state, showing all the comments (in paginated view)
 2018-11-19 15:47:47 -05:00
Paul Kaplan
7cfc3ed846 Show projectNotAvailable view in editor mode also 2018-11-19 14:16:56 -05:00
Ben Wheeler
50a2072794 removed stale comment 2018-11-19 13:58:02 -05:00
Ben Wheeler
1c8a124f44 switched button border radius back to 4px 2018-11-19 13:22:27 -05:00
Ben Wheeler
cd030e0895 rearranged css to get tests working 2018-11-18 11:19:21 -05:00
Ben Wheeler
d9fdb67543 redirect hash urls to url pathnames 2018-11-17 23:59:41 -05:00
Ben Wheeler
30ed29a39a enable remix button; format remix, see inside button css 2018-11-17 15:13:58 -05:00
Robert Chen
9b7097a772 Resolved issue #2263 2018-11-14 17:06:33 -08:00
Paul Kaplan
194dc90688 Add missing extensions and images 2018-11-14 15:39:40 -05:00