scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-13 17:21:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3769 commits 220 branches 1 tag 509 MiB
Commit graph

436 commits

Author SHA1 Message Date
Benjamin Wheeler
95dc611d77
Merge pull request #2222 from benjiwheeler/copy-remix 
Set capability flags to be passed to GUI, to support remix and save as copy
 2018-10-24 13:24:40 -04:00
Paul Kaplan
2c5efbda50 Fix scss linting 2018-10-24 11:45:17 -04:00
Paul Kaplan
9066686c2b Decorate comment text to add @username links and scratch-domain links 2018-10-24 11:25:32 -04:00
Paul Kaplan
faf3f49c50 Fix proptypes 2018-10-24 10:43:21 -04:00
Paul Kaplan
520018ee50 View single thread of comments by URL hash 2018-10-24 10:29:33 -04:00
Paul Kaplan
4d8256e985 Update all preview... l10n strings to project... 2018-10-24 09:35:30 -04:00
Paul Kaplan
ae626d5244 Do not rely on total comment number for load more functionality 
Show the load more comments button any time the last comment page was filled to the requested limit. As noted in the comment, this heuristic will be wrong at most 5% of the time but the failure mode (showing load more which, when clicked doesn't load any more, just goes away) is very mild, and for the overwhelming majority of project views that happen on projects with many, many comments, this is very unlikely to ever be noticed. It obviously isn't a perfect solution, but I cannot think of another that does not need the server to do another query to find out the total number of visible comments, or to find out if there are more comments after the requested offset+limit.
 2018-10-24 09:18:45 -04:00
Ben Wheeler
3d964911a1 renamed canSaveAsCopy to canCreateCopy 2018-10-23 17:42:55 -04:00
Ben Wheeler
d713249bee changed the meaning of canCreateNew to true creation 2018-10-23 17:42:55 -04:00
Ben Wheeler
e03f83466e better logic around canSave when project is new 2018-10-23 17:42:55 -04:00
Ben Wheeler
ed7b6541e9 set canRemix and canSaveAsCopy 2018-10-23 17:42:55 -04:00
Paul Kaplan
f4887008a5 Extract strings for localizing the preview page 2018-10-23 11:38:34 -04:00
chrisgarrity
3fcc13a8cd Integrate www-gui localization 
* Initialize `locales` in redux using methods exported by GUI.
* pass GUI method to set the `scratchlanguage` cookie

NOTE: It does not reload the page, so switching back to the project page will not reflect language changes made in gui until the next page reload. Reloading the page will lose project state so we don’t want to do that.
 2018-10-22 17:38:35 -04:00
Paul Kaplan
c289ce72d1 Use parent_id and commentee_id the right way when posting comments. 
The parent_id is the top-level-parent, the commentee_id is the user to whom the comment is directed , the one that is mentioned in @ reply.
 2018-10-22 14:35:42 -04:00
Benjamin Wheeler
a6409bbcce
Pass to and receive from GUI info about project creation lifecycle; handle url changes (#2197) 
* add canSaveNew prop to pass to GUI

* pass to and receive from GUI info about project lifecycle

* reset project data or fetch new project data depending on updates received from gui

* removed canSaveNew

* projectId always a string

* moved handleUpdateProjectId calls that fetch or set project metadata into componentDidUpdate

* changed page history object

* removed comments

* two small fixes to deal with edge cases

* cleaning up getExtensions
 2018-10-19 16:02:59 -04:00
Paul Kaplan
8acbf05b1a
Merge pull request #2211 from paulkaplan/fix-studio-modal 
Connect the consolidated studio data directly
 2018-10-19 10:44:32 -04:00
Paul Kaplan
f9f662a3f3
Merge pull request #2206 from paulkaplan/staff-comments 
Add * to comments from staff on preview
 2018-10-19 08:55:41 -04:00
Paul Kaplan
35abd285df Connect the consolidated studio data directly 
To the modal to prevent constantly updating. Also only render the modals if they are visible
 2018-10-18 16:45:24 -04:00
Paul Kaplan
f3b9826fd5
Merge pull request #2208 from paulkaplan/fix-load-more 
Use top level + replies count to control "Load More" comments button
 2018-10-18 13:19:10 -04:00
Paul Kaplan
4f6f7502ae
Use scratchteam instead of is_staff 2018-10-18 13:09:43 -04:00
Paul Kaplan
61947f2390
Use scratchteam instead of is_staff 2018-10-18 13:09:08 -04:00
Paul Kaplan
066e5ff141 Use top level + replies count to control "Load More" comments button 
This fixes an issue where a project with one top-level comment and one reply would should the "Load more" button at the bottom, even though there were no more to load
 2018-10-18 11:42:10 -04:00
Paul Kaplan
1d3c3ff431 Use EmojiText component to allow emoji display when API includes them 2018-10-18 10:18:00 -04:00
Paul Kaplan
c257379846 Add * to comments from staff on preview 
This requires the API to include the `is_staff` flag, but it will not change functionality if it is not there, everyone would be considered not staff, which is the current behavior.
 2018-10-18 10:14:42 -04:00
Paul Kaplan
d982d2d723 Show the username of the person being replied to in a comment on preview 2018-10-18 10:11:51 -04:00
Paul Kaplan
312a9e2bff Restrict reporting comments to logged in users 2018-10-17 13:19:46 -04:00
Paul Kaplan
7b514344fa Allow admins access to comment delete 2018-10-17 13:16:41 -04:00
Ray Schamp
cd0fb08045 Change conditional rendering to be consistent 2018-10-17 11:21:52 -04:00
Paul Kaplan
2ac90315ea Use can prefix instead of undefined callback 2018-10-16 15:09:10 -04:00
Paul Kaplan
1965a1223d Fix sass lint 2018-10-16 15:08:01 -04:00
Paul Kaplan
7772e197c7 Make comment deleting and restoring correctly update replies 2018-10-16 15:08:01 -04:00
Paul Kaplan
592c0e5703 Add restore functionality to comments for admins 2018-10-16 15:08:00 -04:00
Paul Kaplan
b0ac4018ee Use admin routes to include all comments when loading page 2018-10-16 15:08:00 -04:00
Paul Kaplan
b7b7b079b9 Combine comment reported and deleted flags into visibility string 
To prepare for server including visibility
 2018-10-16 15:08:00 -04:00
Paul Kaplan
effbfbeaff
Merge pull request #2196 from paulkaplan/share-banner 
Make share banner work on preview
 2018-10-16 13:21:16 -04:00
Paul Kaplan
9ce79deac6 Control visibility externally and fix css 2018-10-16 13:02:22 -04:00
Paul Kaplan
21a7f1227e Make share banner actually share projects 2018-10-16 11:38:26 -04:00
Benjamin Wheeler
4124e26588
set explicit capabilities like “can____” for GUI and project page (#2187) 
* set explicit capabilities like “can____” for GUI and project page

* set canShare to proper value instead of hardcoding it

* don't tell gui canReport
 2018-10-16 10:49:35 -04:00
Paul Kaplan
29a6a27f46
Merge pull request #2173 from paulkaplan/comment-i10n 
Localize all the comment related strings
 2018-10-16 10:04:06 -04:00
Paul Kaplan
85f13935b3 Use the proper API route for reporting projects 2018-10-15 11:17:40 -04:00
Paul Kaplan
231e9c6d89 Internationalize strings in compose-comment 2018-10-12 09:16:27 -04:00
Paul Kaplan
600ba29933 Prevent replying when comments are turned off 2018-10-11 11:54:58 -04:00
Paul Kaplan
1f8342b987
Merge pull request #2164 from paulkaplan/comment-report-delete 
Comment report action and modal flow for deleting
 2018-10-11 11:08:07 -04:00
Paul Kaplan
57408e46af Fix scss name order 2018-10-10 15:29:30 -04:00
Paul Kaplan
086012f802 Add comment toggling 2018-10-10 15:14:53 -04:00
Paul Kaplan
6b4e0595d0 Use gray for deleted, red for reported 2018-10-10 11:25:16 -04:00
Paul Kaplan
c19adee84a Fix internationalization 2018-10-10 11:15:09 -04:00
Paul Kaplan
237c6ecb55 Add parens for clarity 2018-10-10 09:17:18 -04:00
Paul Kaplan
997d0b5694 Fix css for report and delete comment styles 2018-10-10 09:13:21 -04:00
Paul Kaplan
ce84dddc34 Fix proptype warning for project id 2018-10-09 11:38:34 -04:00
Paul Kaplan
bdde34ba26 Implement report action with modal flow 2018-10-09 11:38:24 -04:00
chrisgarrity
32aa3e66d4
Merge pull request #2153 from LiFaytheGoblin/2133/move-media-queries-to-frameless 
Move media queries used in responsive project page to frameless
 2018-10-09 10:56:11 -04:00
chrisgarrity
47f71c2758 Fix confict resolution error 
I missed one of the changes when resolving conflicts.
 2018-10-09 10:24:02 -04:00
Paul Kaplan
58ab51a629 Add messages for other rejected comment reasons 2018-10-09 09:36:42 -04:00
Paul Kaplan
9b122470f5 Fix formatting from review comments 2018-10-09 09:36:42 -04:00
Paul Kaplan
24fe4fef65 Use topLevelCommentId to simplify adding and deleting comments 
This fixes the nested comment deletion problem: https://github.com/LLK/scratch-www/issues/2151
 2018-10-09 09:36:41 -04:00
Paul Kaplan
744c90501e Add comments to projects and replies to comments 2018-10-09 09:36:41 -04:00
chrisgarrity
7af2c8a80a
Merge branch 'develop' into 2133/move-media-queries-to-frameless 2018-10-09 09:12:58 -04:00
Ray Schamp
ab08aa4281
Merge pull request #2152 from LiFaytheGoblin/2133/subactions-share-date-as-prop 
[new project page] share date is passed as a prop to subactions component
 2018-10-08 21:35:38 +01:00
Ray Schamp
3f5f224a76
Merge pull request #2107 from LiFaytheGoblin/responsive-project-page/container-width 
Make container smaller for mobile to allow for space left and right
 2018-10-08 18:13:40 +01:00
Linda
14741e1cb8 if the report or add to studio modals are open, don't switch to fulls… (#2145) 
* if the report or add to studio modals are open, don't switch to fullscreen on orientationchange landscape

* fix linting errors
 2018-10-05 18:00:52 -04:00
Linda
d358c45482 media queries used in responsive project page have been moved to frameless.css 2018-10-05 10:25:56 -04:00
Linda
8db5216f17 share date is passed as a prop to subactions 2018-10-05 09:15:09 -04:00
Linda
bf3977821a fixed linting errors 2018-10-04 10:51:26 -04:00
Linda
ad1531aff3 fixes to spacing around page content and a few other fixes 2018-10-04 10:41:10 -04:00
Linda
502ead072f Merge branch 'develop' into responsive-project-page/container-width 2018-10-04 10:25:48 -04:00
Linda
8476cd3152 solution from before was not working if combined with current develop branch 2018-10-04 09:47:28 -04:00
Paul Kaplan
24e1c92b74
Merge pull request #2141 from paulkaplan/comment-delete 
Add comment deleting for project owners on preview
 2018-10-03 16:26:50 -04:00
Linda
27d7a3bf59
Merge pull request #2135 from LiFaytheGoblin/responsive-project-page/header 
Make header of new project page look good on mobile
 2018-10-03 15:41:03 -04:00
Linda
1aa30fb10b
Merge pull request #2136 from LiFaytheGoblin/responsive-project-page/see-inside-remix-buttons 
New project page: See inside and remix buttons disappear on mobile
 2018-10-03 15:40:47 -04:00
Paul Kaplan
a3f1ccc132 Fix sass-lint 2018-10-03 14:00:56 -04:00
Paul Kaplan
24b456873b Add comment deleting for project owners 2018-10-03 13:31:54 -04:00
Linda
fc57218066 fix linting errors 2018-10-03 11:12:56 -04:00
Linda
a3df002b49 resolve mergin issues 2018-10-03 11:03:18 -04:00
Linda
193a4ac70a
Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons 2018-10-03 10:45:10 -04:00
Linda
38b8e2e97e on mobile, remix credit is still a flex row 2018-10-03 10:32:12 -04:00
Linda
f11d338d65 text gets vertically centered 2018-10-03 10:29:45 -04:00
Linda
57e147e110 remove commented out css 2018-10-03 10:09:44 -04:00
Linda
8009978c06 fixed linting errors 2018-10-03 10:09:44 -04:00
Linda
6f5b5c3278 extract css for new components and make some fixes to validation in report modal 2018-10-03 10:09:44 -04:00
Linda
5832969912 fixed linting errors 2018-10-03 10:09:44 -04:00
Linda
0895719f36 subactions getting own component 2018-10-03 10:09:44 -04:00
Linda
d85ca5d755 subactions getting their own component 2018-10-03 10:05:21 -04:00
Linda
b4a4ded822 share date positioning on small screens 2018-10-03 09:59:15 -04:00
Linda
8b10f3cba4 made project stats and action buttons responsive 2018-10-03 09:58:01 -04:00
Linda
2408568dda Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons 2018-10-02 17:03:18 -04:00
Linda
a525e09cf6 Merge branch 'develop' into responsive-project-page/header 2018-10-02 16:59:01 -04:00
Linda
d0257ae43d
Merge pull request #2105 from LiFaytheGoblin/responsive-project-page/landscape-player 
If in landscape format on mobile, switch to fullscreen mode
 2018-10-02 16:38:57 -04:00
Linda
f55dd02665 never mind screen.orientation 2018-10-02 15:42:29 -04:00
Linda
a0b190aa87
Merge pull request #2118 from LiFaytheGoblin/responsive-project-page/notes-section 
Made project notes look better on mobile
 2018-10-01 19:30:36 -04:00
Linda
3432d95cdb
Merge pull request #2117 from LiFaytheGoblin/responsive-project-page/comments 
Made comments look better on mobile
 2018-10-01 19:30:25 -04:00
Linda
ef1b7d8f9f checking for landscape browser proof 2018-10-01 16:58:05 -04:00
Linda
d5641daae6 improve solution for spacing in container and used desktop variable instead of hardcoded value 2018-10-01 13:56:11 -04:00
Linda
f1738ca384 improved the code stylewise 2018-10-01 09:52:50 -04:00
Linda
3010db684d
Merge pull request #2116 from LiFaytheGoblin/responsive-project-page/thumbnailcolumns 
Thumbnailcolumns appear at bottom on mobile
 2018-09-28 13:57:24 -04:00
Linda
ec067778f2
Merge pull request #2099 from LiFaytheGoblin/2067/project-page/comments-fade-out-safari 
Made comments fade out look nice in Safari too
 2018-09-28 13:57:11 -04:00
Linda
50c7eb9bfd added todo 2018-09-27 10:31:32 -04:00
Ray Schamp
1ad9a95a3d Add placeholder share handler 
Having the `onShare` prop defined to a function enables the button in the GUI
 2018-09-26 21:42:44 -04:00
Linda
e014906125 linting fixes 2018-09-26 17:26:19 -04:00
Linda
32ab0202bc made project notes look better on mobile 2018-09-26 17:16:17 -04:00
Linda
b5a49e6cf2 linting fixes 2018-09-26 16:45:42 -04:00
Linda
c18a073e17 some fixes 2018-09-26 16:39:37 -04:00
Linda
532e201f53 made comments roughly responsive 2018-09-26 16:36:48 -04:00
Linda
cc57d0f206 removed stuff that doesn't belong into this pr 2018-09-26 15:01:25 -04:00
Linda
4f3d77f42a some fixes and adapted remix and studio thumbnails 2018-09-26 14:55:17 -04:00
Linda
a4e7ee35e4 adapted show and remix button to mobile 2018-09-26 14:54:33 -04:00
Linda
4299afaec5 fixes to warning and thumbnailcolumns for mobile WIP 2018-09-26 14:35:36 -04:00
Linda
7465c2e85a removed sth that isn't part of the title issue 2018-09-26 12:02:00 -04:00
Linda
6445c7471e some fixes and adapted remix and studio thumbnails 2018-09-26 11:52:32 -04:00
Linda
6b2ddcd217 adapted title area for mobile 2018-09-26 11:48:29 -04:00
Linda
f1c6f6c223 fixed linting errors 2018-09-25 15:31:31 -04:00
Linda
4983fb3f8c solution for container size for screen size between tablet and 942 according to design 2018-09-25 15:21:26 -04:00
Linda
51bb905381 extensions appear on correct place depending on media query 2018-09-25 15:04:31 -04:00
Linda
d066e73b91 extensions buttons made responsive 2018-09-25 14:49:37 -04:00
Linda
56f1b80f24 if in landscape format on mobile, switch to fullscreen mode 2018-09-25 14:36:34 -04:00
Benjamin Wheeler
935eb0b15f
move login/registration functions and view state to session reducer, pass to gui (#2078) 
* move login/registration functions and view state to session reducer, pass to gui

* navigation reducer handles login; gui passed renderLogin function

* put back in join class to make smoke tests keep working
 2018-09-24 11:04:30 -04:00
Linda
a160180245 added transparent for ui primary for cross browser support to colors css 2018-09-21 13:26:49 -04:00
Linda
c047612d68
Merge pull request #2083 from LiFaytheGoblin/2082/project-page/project-notes-alignment 
Fix notfications box, player box, buttons and icons alignments
 2018-09-21 10:03:58 -04:00
Linda
0d894e3208 convention of writing hsl is with percentages 2018-09-21 09:57:49 -04:00
Linda
8bc158118e fixed color gradiant display in Safari 2018-09-21 09:53:58 -04:00
Linda
f721c9591a Ok, css that doesn't work in all browsers is not an option... 2018-09-20 10:33:00 -04:00
Linda
c9b2306827 removed some stuff that is not needed anymore 2018-09-19 16:17:14 -04:00
Linda
a9872a14ff fixed problem that occured with remix credits 2018-09-19 15:03:20 -04:00
Linda
d0d7bba70e
Merge pull request #2079 from LiFaytheGoblin/2065/title-too-long-warning 
Implemented design for title-too-long-warning
 2018-09-18 13:20:13 -04:00
Linda
42f0ed16e5
Merge pull request #2073 from LiFaytheGoblin/2005/animate-add-to-studio-buttons 
Animate add-to-studio-buttons on preview project page
 2018-09-14 12:28:44 -04:00
Linda
0a50c1fb34 align notes box and player box on same y pos and align buttons and icons below notifications and player at same y pos 2018-09-13 14:58:00 -04:00
Linda
35558bfdba fixed linking problems 2018-09-13 10:49:59 -04:00
Linda
8a8f3b6da1 implemented title too long warning design 2018-09-13 10:39:19 -04:00
Linda
a60bd65887 positioning of alert field incomplete 2018-09-12 17:28:27 -04:00
Linda
a8ebdb7d32
Merge pull request #2046 from LiFaytheGoblin/2045/project-page/studio-thumbnails 
Fix appearance of studio thumbnails on preview project page
 2018-09-11 10:10:21 -04:00
Linda
0898054e41
Merge pull request #2043 from LiFaytheGoblin/1986/project-page/fit-title-length 
Keep title on preview project page from overflowing or otherwise messing up the layout
 2018-09-11 10:08:38 -04:00
Linda
ab4f8a09ce the animation now works 2018-09-07 16:11:37 -04:00
Ben Wheeler
2a19bb283f no need to pass title to embedded gui 2018-09-06 16:54:12 -04:00
Ben Wheeler
2f5604d23d localized Title too long error string 2018-09-05 18:38:19 -04:00
Ben Wheeler
478a30efcb pass project title to GUI, and disable submit when editing title 2018-09-05 18:38:19 -04:00
Benjamin Wheeler
3c6530fe85
Merge pull request #2022 from benjiwheeler/account-nav-component 
split account nav into its own component, pass logout callback to GUI
 2018-09-05 13:32:45 -04:00
Linda
d78ee1fe7c some linting 2018-08-30 15:44:17 -04:00
Linda
b0ecae351e prevented the project title from overflowing in a way more elegant way 2018-08-30 15:37:51 -04:00
Linda
591c792a5c Merge branch 'develop' of https://github.com/LLK/scratch-www into 1986/project-page/fit-title-length 2018-08-30 13:47:19 -04:00
Linda
affdc7e670 use specific class instead of h2 2018-08-28 17:01:36 -04:00
Linda
3863e9c5bf remove unnecessary comments 2018-08-28 16:50:34 -04:00
Ben Wheeler
733134c421 pass through logout callback to GUI 2018-08-27 18:56:27 -04:00
Linda
919910f30a made empty space next to comments section a bit smaller 2018-08-24 13:14:22 -04:00
Linda
10aa57e4a2 fixed ordering and so in css 2018-08-24 09:25:04 -04:00
Linda
79e80aea54 improved remix and studio row 2018-08-24 09:05:08 -04:00
Linda
befa5485bb some ordering of css stuff fixed 2018-08-23 14:31:44 -04:00
Linda
9db42fe9f4 prevented overflowing project title in a nice looking way 2018-08-23 14:24:31 -04:00
Ray Schamp
a3c929db3d Finish setup of backpack, assets, projects hosts 2018-08-16 17:40:09 -04:00
Ray Schamp
d538412357 WIP: configure GUI for staging 2018-08-16 17:39:04 -04:00
Ray Schamp
a19fb29f36 WIP: enable backpack in preview 2018-08-16 17:37:19 -04:00
Ray Schamp
fccbed0782
Merge pull request #2021 from technoboy10/preview-hide-intro-modal 
Hide intro modal in editor on new project page
 2018-08-16 17:02:57 -04:00
Ben Wheeler
466b53b518 project page stage margin and width adjustments to match gui stage css changes 2018-08-13 23:48:27 -04:00
Connor Hudson
d795d87e18 Hide intro modal in editor on new project page 2018-08-09 15:50:31 -04:00
Ben Wheeler
2c8990ae7e report project POSTs to scratchr2, displays modal reactively 2018-08-09 12:41:38 -04:00
Connor Hudson
1875870a86
Initial implementation for displaying comments on project page (#1997) 
* Create Comment component, start styling it

* Restructure PreviewPresentation to better match mockup

* Add padding, border to comment bubble

* add padding to bottom row of comment

* Tweak alignment of avatar and comment content

* Add margin to lower project page container

* Use border-box box sizing for comment bubble

* Make user avatar a link

* Add initial implementation of comment tail

* Align username row properly, fix comment bubble width

* Use ::before pseudoelement for comment tail

* Remove unused props to Comment component

* Add CommentContainer to handle comment replies

* Use CommentContainer instead of Comment in PreviewPresentation

* Remove debug data from CommentContainer

* Fetch top level comments from the API

* Force comment container to stretch to bottom of view div

* Remove unused api import in CommentContainer

* Long words in comments should not overflow page

* Remove @ before username in comment title

* Fix word wrapping on Firefox

* Refactor CommentContainer into a class

* Properly export CommentContainer component

* Make replies column take up proper width

* Pass project ID to CommentContainer

* Fetch comment replies in CommentContainer

* Initial implementation for loading more comments

* Add "Load More" button to Presentation

* Initial implementation of collapsing threads longer than 3 replies

* Remove console log from preview.js redux

* Tweak last comment gradient color

* Only show three total replies in collapsed state

* Match scratchr2 behavior for thread collapsing

* Use width calc instead of margin and width 100%

* Fix styling for load more button

* Make comment border gray to match the wireframe

* Allow clicking through comment fade gradient

* Add comment compose component

* style comment compose box

* Style post, cancel buttons on comment compose component

* Add margin to create comment container

* Tweak styling for characters remaining text

* Tweak placeholder text

* Add more margin to comment avatar

* Add icons and styling to delete, report text

* Refactor px -> rem where possible in comment styles

* Change comment time color to dark gray

* Tweak margin and border radius

* Add reply icon to preview comments

* Clean up unused imports, console.log in compose-comment component

* Remove console statement in preview.jsx

* Add some clarifying comments to unfinished parts of comments

* Remove direct passing of comment api response to CommentContainer

* CommentContainer should not pass api response directly

* Rename CommentContainer to TopLevelComment

* First pass at getReplies for comments in redux

* Move reply fetching into redux actions instead of in TopLevelComment

* Refactor getReplies logic to behave better

* Remove components not directly related to reading comments

* Hide load more button if all comments are loaded
This uses the project info returned by the API

* Use same gradient as add to studio modal on comment thread
 2018-08-06 11:52:18 -04:00
Ben Wheeler
c450b7e658 corrected brackets for lint error 2018-07-31 18:10:42 -04:00
Ben Wheeler
e83f29dbbc moved NaN check in preview.jsx to be guard-style 2018-07-31 16:38:49 -04:00
Ben Wheeler
097fb66955 currentStudioIds now an array; reverted a few changes 2018-07-31 15:00:56 -04:00
Ben Wheeler
a60da11f8a curated studios endpoint doesn't pass unnecessary token to api 2018-07-26 18:54:58 -04:00
Ben Wheeler
1a4922a262 addtostudio buttons in own component; currentStudioIds redux object; lint fixes 2018-07-25 15:08:12 -04:00
Ben Wheeler
0c6b8607da better approach to tracking which studios the project current belongs to 2018-07-24 11:50:03 -04:00
Ben Wheeler
ffe5e8cb43 adding distinct object to redux/preview.js state to track studio membership 2018-07-24 09:12:13 -04:00
Ben Wheeler
d1d42f4245 resolved spinner conflict 2018-07-20 21:14:41 -04:00
Ben Wheeler
fc5912526e addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate. 
addtostudio modal interfaces with api add/remove endpoints; waits to close; handles open studios that user does not curate.
 2018-07-20 20:37:36 -04:00
carljbowman
ebd41b169e Update colors to match 3.0 palette 
Updates maintain WWW color variable naming conventions, but replaces values with 3.0 colors.

Colors have the commented HEX and GUI variable name.

More work to do auditing but it’s a start.
 2018-07-16 18:02:12 -04:00
Ben Wheeler
a59d533a1c merged changes in report modal and add to studio handling 2018-07-16 13:39:29 -04:00
Ben Wheeler
bc7b31e924 finished draft of intermediary refactor of addtostudio modal redux code, container-presentation code simplified 2018-07-13 09:50:17 -04:00
Ben Wheeler
6a32edb2fe addtostudiomodal: incomplete progress on 1. container-presentation refactor, 2. redux handling of add and leave studio requests 2018-07-11 15:08:01 -04:00
Ben Wheeler
9cac70ab18 small steps towards addtostudio modal's container-presentation refactor 2018-07-07 14:09:43 -04:00
Ben Wheeler
af25e44fc6 refactoring add to studio modal into container and presentation; added getCuratedStudios functionality to preview 2018-07-04 18:01:11 -04:00
Connor Hudson
289e17195d
Merge pull request #1932 from technoboy10/feature/projects-extension-display 
Preview - Implement extension info strip
 2018-06-27 16:59:47 -04:00
Connor Hudson
da1fe6a6fc Use lib/log instead of console.log for project parsing error 2018-06-26 08:41:06 -04:00
Connor Hudson
5ab0aa50ad Add min-height: 0 to description block to fix notes layout on Firefox 2018-06-25 16:41:39 -04:00
Connor Hudson
80dfaa6a1e Use l10n ids in extension chip 2018-06-22 10:01:12 -04:00
Connor Hudson
1842be2f1a Add l10n strings for extension chips 2018-06-22 09:16:20 -04:00
Connor Hudson
363c0fdfb5 Update extension parsing in Preview to match updated VM PR 2018-06-22 09:02:11 -04:00
Connor Hudson
2293eebaec Try to fetch extensions in constructor of Preview 2018-06-21 09:45:53 -04:00
Connor Hudson
5dfbe422d7 Add additional check to getExtensions function 2018-06-21 09:45:32 -04:00
Ben Wheeler
0a6ec304d3 starting to change addtostudios modal to make changes on the fly 2018-06-20 20:25:46 -04:00
Connor Hudson
ccfd25d864 Use project ID from state instead of props 2018-06-20 17:08:06 -04:00
Connor Hudson
456e99f1be Catch errors in getExtensions function 2018-06-20 17:04:16 -04:00
Connor Hudson
b2ddc50529 Remove misplaced getExtensions call in handleReportClick (5!) 2018-06-20 15:58:34 -04:00
Connor Hudson
b958567a24 Fix scss lint errors 2018-06-20 10:25:00 -04:00
Connor Hudson
a69ad0ec86 Implement extension fetching in Preview component 2018-06-20 09:55:09 -04:00
Connor Hudson
9f2304b8c9 Add check for extensions prop existence in PreviewPresentation 2018-06-20 09:48:40 -04:00
Connor Hudson
7fb7e9146b Merge upstream/develop, move logic to preview instead of presentation 2018-06-20 09:28:41 -04:00
Ben Wheeler
c25bfab7bb improved addtostudio modal variable names 2018-06-20 08:38:16 -04:00
Connor Hudson
bd22d573b6 extension-info.js -> extensions.js 2018-06-19 16:18:08 -04:00
Connor Hudson
168e155ac5 Use EXTENSION_INFO file in presentation.jsx 2018-06-19 16:13:47 -04:00
Connor Hudson
f7987fd568 Don't display image in extension chip if iconURI undefined 2018-06-19 15:58:54 -04:00
Connor Hudson
ea1c0ce4a2 Add initial implementation of loading extension info from sb3 project 2018-06-19 12:26:22 -04:00
Ben Wheeler
16190f1147 got addtostudio modal state changes to work, though not updating to server yet 2018-06-19 10:13:40 -04:00
Ben Wheeler
e05079a28c mocked my permissioned studios 2018-06-19 00:00:37 -04:00
Ben Wheeler
4c657a1e80 showing actual studio membership, though not unadded studios yet 2018-06-18 23:36:20 -04:00
Ray Schamp
9e02798f7b Lint 2018-06-18 17:19:12 -04:00
Ray Schamp
0c3221f835 Prevent wrapping the notes and credits column 2018-06-18 17:15:56 -04:00
Ben Wheeler
f8df3c0146 added royal blue color, button styles, small jsx fixes to Add to Studio modal 2018-06-18 15:17:19 -04:00
Ben Wheeler
9d9226f4a4 got rid of bug keeping page from displaying 2018-06-16 19:28:28 -04:00
Ben Wheeler
f0fbc0a57f add to studio modal appears from project page, looks horrendous 2018-06-16 19:13:50 -04:00
Ben Wheeler
20242af3de preview view comment 2018-06-16 18:19:31 -04:00
Connor Hudson
b826a1ad2f Add onExtensionAdded function to bindAll call 2018-06-15 09:52:12 -04:00
Connor Hudson
3b09bf145c Fix hasStatus prop type 2018-06-15 08:47:52 -04:00
Connor Hudson
1f5075f9d8 Initial (hacky) solution for loading EIABCW content 2018-06-14 16:54:55 -04:00
Connor Hudson
3eb0e12bf6 Only use extensions with preexisting data URIs for demo chips 2018-06-14 15:11:03 -04:00
Connor Hudson
b40f939566 iconSrc -> iconURI to match CategoryInfo format 2018-06-14 15:10:33 -04:00
Ray Schamp
1840b9df31 Convert presentation function component 
Fixing a typo let the linter catch that this no longer needs to be a class component
 2018-06-14 09:26:44 -04:00
Connor Hudson
b317c12e79 Add some mockup extensions 2018-06-13 16:45:48 -04:00
Connor Hudson
e7e0ba720c Add extension list styles 2018-06-13 16:45:06 -04:00
Connor Hudson
f9dd4e76aa Add padding to extension status div 2018-06-13 15:35:58 -04:00
Connor Hudson
0733a5dde4 Fix class name for extension icon 2018-06-13 15:32:31 -04:00
Connor Hudson
11af7fec9b Add extension status styling, tweak margins and spacing 2018-06-13 15:24:19 -04:00
Connor Hudson
a9e8a06c6d Add props to ExtensionChip 2018-06-13 14:53:41 -04:00
Connor Hudson
0056e93e4a Add more margin to extension chip content, use rem where it makes sense 2018-06-13 14:53:26 -04:00
Connor Hudson
6bace1b11e Add ExtensionChip component with demo content 2018-06-13 14:05:20 -04:00
chrisgarrity
74c76fb1cf Refactor report-modal 
* addresses comments for https://github.com/LLK/scratch-www/pull/1900
* renames report fields to match scratchr2 expectations
* restyle modal to allow display of validation messages
* removed cruft
 2018-06-01 15:25:28 -04:00
chrisgarrity
47b90d449b Fix formatting of long project description fields 
Description block also needed to be `display: flex`, and the content was missing the `overflow: auto` to make it scrollable.
 2018-06-01 09:45:49 -04:00
chrisgarrity
6872cfc51f FIxing PR #1900 comments 
addresses most comments except modal refactor, and error response from sumitting report.
* restore gui as a dev dependency
* better separation of view container/presentation
* replace absolute heights for textareas with making all sub components `display: flex`
* start to make presentation more modular added subcomponents to the view folder:
  * share-banner (moved from components)
  * remix-credit
  * remix-list
  * studio-list
 2018-05-31 21:04:11 -04:00
chrisgarrity
285b2dbcff Updated styles 2018-05-31 15:02:45 -04:00
chrisgarrity
db3120091d Fix lint and don’t duplicate the ‘other’ string 2018-05-31 15:02:45 -04:00
chrisgarrity
c6f197f576 Adjust share-date to give action buttons more room 2018-05-31 15:02:45 -04:00
chrisgarrity
0bc5bf745d Fix up stats line 
* Update for newer version of API - remix count in stats
* create projectShape to remove duplication
* add approximate-number to limit the size of the stats row.
 2018-05-31 15:02:45 -04:00
chrisgarrity
71dfe690be First pass at correcting project input styles 
* Add placeholders to description input text-areas
* fix styling to show box shadow highlight on focus
* adjust height for non-remix project
* fix lint errors
 2018-05-31 15:02:45 -04:00
chrisgarrity
08cf4f4f3d Refactor report modal 
* move all the report modal presentation into the component
* add strings to general l10n file because we don’t handle l10n files in components
* Add current project id and username to the data before submitting
 2018-05-31 15:02:44 -04:00
chrisgarrity
34042c9e8e Report first pass 
Report button opens a modal with the report project form. All the content is currently in `preview/presentation` because components cannot have their own l10n files.
 2018-05-31 15:02:44 -04:00
chrisgarrity
bd391b422a presentation first pass 
First pass at project page design using actual assets from Carl, and matching styles with current design.

Includes a (negative margin) hack to line up the stage. see https://github.com/LLK/scratch-gui/issues/2132
 2018-05-31 14:58:23 -04:00
chrisgarrity
99ed30e2c8 Fix up favorites 
Found a couple of typos now that API can process favorites.
 2018-05-30 14:39:25 -04:00
chrisgarrity
80de164d02
Handle See inside button (#1890) 
* Handle See inside button

Import GUI reducers, initial state and middleware (throttle).

Update render to handle state and middleware.

Remove preview mode state and use scratchGui.mode from redux instead.

URL is getting updated, and mode will be updated based on URL. However, the history needs work - it doesn’t work with the modal back.

* Update to latest GUI

This is the minimum version of GUI that is needed for see-inside

* Really remove cruft.
 2018-05-24 16:23:07 -04:00
chrisgarrity
6df58e41fd Correct preview route for fastly 
- use more explicit route
- handle fastly error in the callback correctly
- more succinct parsing of the URL path
 2018-05-02 17:04:14 -04:00
chrisgarrity
d1420862ea
Initial GUI embed (#1869) 
- `/preview/editor` will load GUI with an empty project
- `/preview/:id/editor` will load GUI with a project from the projects server (not local data)
- passes intl object to GUI
- `/preview/:id` with show the project page with an embedded player
- `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode.

* Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes
 2018-05-02 15:27:49 -04:00
chrisgarrity
b8326a3d57
Feature/preview project2 (#1856) 
* Add user-session awareness
  - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user)
* decorate text with @mentions and #hashtags
* Add studios, loves, favs
* In-place editing of title and description if current user is author and project shared (with validation)
 2018-04-24 11:00:47 -04:00
chrisgarrity
1b2050c58a cleanup 2018-03-20 20:19:48 -04:00
chrisgarrity
1c6b0dd64c Cleanup 
Fixing lint problems and removing (most) unused code. I left user and session as they will get used soon even though they aren’t currently.
 2018-03-15 17:40:16 -04:00
chrisgarrity
f836c6e3a8 Adding in remix metadata 
- Moved preview state into redux
- Gets remix credit if the project is a remix
- Shows up to 5 remixes (direct children?)
- handles empty remixes result (it’s not an array)
- Added Column component - based on Grid, but doesn’t use frameless to set width.
- allows trailing ‘/‘ on the URL
- cleaned up conditional content
 2018-03-14 15:50:27 -04:00
chrisgarrity
79199d6d32 Placeholders for everything ‘above the fold’ 2018-03-08 15:57:19 -05:00
chrisgarrity
f86bd01609 Remove obsolete code 2018-02-28 13:58:22 -05:00
chrisgarrity
ea6de54104 [WIP]: embed GUI in a preview page 2018-02-21 14:39:21 -05:00