Commit graph

2327 commits

Author SHA1 Message Date
Paul Kaplan
086012f802 Add comment toggling 2018-10-10 15:14:53 -04:00
Benjamin Wheeler
8b222f0466
fix base modal prop passed to ReactModal (#2165) 2018-10-10 14:08:59 -04:00
Paul Kaplan
c535f8e731 Update report route to match newest API update 2018-10-10 14:01:14 -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
c622d52396 Pass the topLevelCommentId to make sure nested comment deleting works 2018-10-09 10:16:35 -04:00
Paul Kaplan
e29caceb6b
Merge pull request #2150 from paulkaplan/new-comment
Add comments to projects and replies to comments
2018-10-09 10:02:17 -04:00
Benjamin Wheeler
341428ce50
storage.js can use PROJECT_HOST env setting (#2146) 2018-10-09 09:59:04 -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
79afc55f26
Merge pull request #2108 from LiFaytheGoblin/responsive-project-page/modals
Make modals responsive
2018-10-04 10:23:35 -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
437334b872 resolve merging conflicts 2018-10-03 10:54:53 -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
06bb9c60c4 fixed problem where sometimes there would be two scrollbars 2018-10-02 15:33:15 -04:00
Linda
b03bd51f79 fixed linting error 2018-10-02 13:57:41 -04:00
Linda
7c8fdbfcc3 fixed height of studio buttons scrolling container to fill all modal 2018-10-02 13:49:56 -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
Ray Schamp
5278e77e0c
Merge pull request #2098 from chen-robert/gh1930-teacher-register-year
Fix gh-1930: Teacher registration dates
2018-09-28 10:58:26 -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
3d67488b29
Merge pull request #2106 from LiFaytheGoblin/responsive-project-page/extension-buttons
Extension buttons are responsive
2018-09-26 17:19:38 -04:00
Linda
fa049d79fc
Merge pull request #2112 from LiFaytheGoblin/2104/remove-mod-pos-from-jobs
Removed moderator position from jobs page
2018-09-26 17:19:14 -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
Robert Chen
a94b9d6c84 Fix gh-1934: Search bar special chars (#2075)
* Fixed Issue 1934

The text was encoded once already by the search bar. That means we need to decode it twice in order to decode special characters.

* Rewrote search query parsing
2018-09-26 14:16:56 -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
89aaaab4d3 removed moderator position from jobs page 2018-09-26 10:24:53 -04:00
Linda
35194803b4 fixed linting errors 2018-09-25 16:06:46 -04:00
Linda
a5d2ee18ef fixed validation message for modals 2018-09-25 15:58:10 -04:00
Linda
d061e2afe9 improve responsiveness for project page modals and also clean up the modals a bit 2018-09-25 15:40:27 -04:00
Linda
55cdeea04d wip refactored and responsive project page modals 2018-09-25 15:37:52 -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
eb9abd23a0
fixed errors in splash page that appear in develop (#2077) 2018-09-25 00:52:23 -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
Robert Chen
86551baa94 Fixed Issue 1930 2018-09-20 22:15:24 -07: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
497aae2a3c convention fixes 2018-09-13 11:04:14 -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
c54b7413bc replaced old spinner with new svg to work everywhere where spinner is used 2018-09-12 14:54:15 -04:00
Linda
1cee3c68fc removed some leftovers 2018-09-11 17:18:09 -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
7313f26530 fixed linting errors 2018-09-07 16:45:17 -04:00
Linda
b582b31491 added comments and improved spin animation a little 2018-09-07 16:19:49 -04:00
Linda
ab4f8a09ce the animation now works 2018-09-07 16:11:37 -04:00
Benjamin Wheeler
3271c54744
Merge pull request #2052 from benjiwheeler/rename_title
pass project title to GUI, and disable submit when editing title
2018-09-07 16:03:16 -04:00
Linda
ed604a21d4 add studio buttons animation on preview page, need fixing 2018-09-07 09:26:11 -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
Ben Wheeler
4bf0964bf2 moved dispatched navigation function calls to mapDispatchToProps 2018-09-05 17:52:03 -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
Ben Wheeler
f9003077a3 use account-nav class, not account-nav id 2018-09-04 17:15:52 -04:00
Linda
0f2ca09892 added Katelyn to credits page 2018-09-04 12:54:29 -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
chrisgarrity
39aa73c095
Merge pull request #2058 from LLK/hotfix/search-default-mode
[DEVELOP] Hotfix/search default mode
2018-08-30 11:12:34 -04:00
chrisgarrity
6722582994 Use popular for the default sort mode 2018-08-30 10:51:02 -04:00
chrisgarrity
17bf7c4061
Merge pull request #2044 from LLK/release/august-2018
[Master] Release for August 2018
2018-08-30 10:10:22 -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
Linda
a1721abc46
Merge pull request #2042 from LiFaytheGoblin/2038/add-to-studio-dialog-entries-cursor
2038/add to studio dialog entries cursor
2018-08-28 17:41:44 -03:00
Linda
f10c811009
Merge pull request #2048 from LiFaytheGoblin/2047/project-page/white-space-next-to-comments
2047/project page/white space next to comments
2018-08-28 17:39:15 -03:00
Linda
c52eb610b4
Merge pull request #2041 from LiFaytheGoblin/1991/accessibility-extension-landing
1991/accessibility extension landing
2018-08-28 17:37:51 -03:00
Ray Schamp
e6ea1e301d
Merge pull request #2037 from LiFaytheGoblin/2016/add-to-studio-dialog-clip-studio-name
2016/add to studio dialog clip studio name
2018-08-28 16:08:29 -04:00
Linda
0ef4eca0bb improved wording 2018-08-28 09:33:06 -04:00
Ben Wheeler
733134c421 pass through logout callback to GUI 2018-08-27 18:56:27 -04:00
Eric Rosenbaum
a72f187b94 Add wedo troubleshooting item about updating scratch link 2018-08-27 12:17:59 -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
d95ee37c04 now you can see the full title of something when hovering over the title which might be cut off 2018-08-24 09:09:17 -04:00
Linda
79e80aea54 improved remix and studio row 2018-08-24 09:05:08 -04:00
Linda
ba919062f3 changed look of studio thumbnails 2018-08-24 08:41:37 -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
Ben Wheeler
796ad7b152 split account nav into its own component 2018-08-23 14:10:55 -04:00
Linda
50242a3bb1 added pointer cursor style to the buttons that add or remove a project to or from a studio 2018-08-23 11:32:18 -04:00
Linda
f934b9bc7e fixed some intendation 2018-08-23 11:18:12 -04:00
Linda
b3b0843b75 some improvements and added alt attributes for microbit 2018-08-23 11:05:38 -04:00
Linda
4635ae3b82 added alt tags to wedo page 2018-08-23 10:38:49 -04:00
Eric Rosenbaum
f51f6801e6 Add wedo troubleshooting item about updating scratch link 2018-08-23 10:03:02 -04:00
Linda
641e9895f6 updated from develop with new extension landing pages 2018-08-22 18:05:57 -04:00
Linda
56d9ac2af9 resolve travis errors caused by wrong ordering of css stuff 2018-08-22 16:48:07 -04:00
Eric Rosenbaum
78b32597c5
Merge branch 'develop' into hotfix/extension-landing-pages 2018-08-22 16:28:52 -04:00
Ray Schamp
7851789f9f
Merge pull request #2001 from kyleplo/patch-2
Add sort scheme dropdown to search results page
2018-08-22 15:59:25 -04:00
Linda
68c7616a25 remove now obsolete truncate library 2018-08-22 15:10:19 -04:00
Linda
a7c279fab5 cut of studio name on studio adding dialog using css and not using the library for that anymore, also displays full title as a title of the div 2018-08-22 15:05:21 -04:00
kyleplo
d7feb51695
Fix non-existent term 2018-08-22 14:50:19 -04:00
kyleplo
d2721f0bbc
Fix getting query 2018-08-22 14:43:00 -04:00
kyleplo
0b9ceb413f
Fix getting querystring 2018-08-22 14:25:31 -04:00
kyleplo
78b88443c0
Fix setting mode 2018-08-22 14:17:26 -04:00
Linda
253d6ac279 style fix 2018-08-22 13:32:23 -04:00
Linda
d4ad8f7d35 add language tag 2018-08-22 13:05:49 -04:00
Linda
9a91fa9b0a h2 in header is now h1, including overwritten styles 2018-08-22 10:45:19 -04:00
Linda
c26dc79b8d add alt tags to remaining images and correct some 2018-08-22 10:21:28 -04:00
kyleplo
46e24ac3ef
Fix spacing in message title 2018-08-22 08:15:22 -04:00
kyleplo
458170390c
Fix acceptableModes 2018-08-22 08:05:20 -04:00
kyleplo
4435408cdc
Revert "Add mode" 2018-08-22 07:57:19 -04:00
Linda
83553c3bc2 making the conditional translation more elegant 2018-08-21 16:40:49 -04:00
Linda
25234d7e27 add conditional alt attributes to ev3 landing page installation step 2018-08-21 16:33:50 -04:00
Linda
bf5a890a87 added alt attributes to img tags in starter projects component and when using this component on ev3 page 2018-08-21 16:07:27 -04:00
Eric Rosenbaum
179edefaaa Use relative link to wedo-legacy 2018-08-21 15:48:28 -04:00
Italy
1ff394f9b2 adding simple alt attributes to imgs on ev3 landing page 2018-08-21 15:39:59 -04:00
Eric Rosenbaum
d0881c3ba2 Add mint green 2018-08-21 15:34:02 -04:00
Eric Rosenbaum
6884314492 Add WeDo legacy page link to troubleshooting 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
9c6721c888 Fix swapped starter project links 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
1e4d7000a5 Add WeDo starter project links, images and text 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
7be5857120 Add todo comment 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
0c5de6cea1 Detect mac vs windows 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
287bc8405a Use project id links for starter projects instead of downloads 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
fd10e08d80 Use temp l10n strings without duplication 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
43ee8a6631 Lint 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
1356d863b1 Remove “manual update” from firmware update instructions 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
b666382f8b Change LEGO MINDSTORMS EV3 in body text to LEGO MINDSTORMS Education EV3 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
d0bf1bb36a Update links for wedo and EV3 to lego education pages 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
ac1d5ae325 SYNCHRONIZE JUICE FLAVORS
Ray told me I can’t put emoji here, sorry everyone
2018-08-21 15:16:07 -04:00
Eric Rosenbaum
83232212ab css for outline around screenshot images 2018-08-21 15:16:07 -04:00
Eric Rosenbaum
0c628c3e97 Add new WeDo landing page, move old one to wedo-legacy 2018-08-21 15:16:06 -04:00
Connor Hudson
3f3c36d733 Add missing l10n strings to EV3 page (#2013) 2018-08-21 15:15:50 -04:00
Connor Hudson
b604b19641 Refactor Extension Landing Pages (#2006)
* Add extension-landing generalized styles, install scratch link component

* Make EV3 page use generalized stuff

* Use OS_ENUM file instead of class variable

* use extension-landing/os-enum in os chooser

* Use extension-landing class in extension-landing.scss

* Use extension-landing styles and components on microbit page

* Add view-specific styles

* Move install scratch link l10n strings to src/l10n.json

* Start moving steps display to its own components

* Finish initial pass at Step, Steps components for extension landing pages

* Create ProjectCard component

* Use new components on InstallScratchLInk component

* Use new components on EV3 page

* allow className prop in Steps component

* Use new components on micro:bit landing page

* imageUrl -> imageSrc in ProjectCard

* Create ExtensionHeader component and use it on micro:bit and EV3 pages

* Fix a spacing issue in the InstallScratchLink component

* Add ExtensionRequirements component

* Use ExtensionRequirements component on landing pages

* Remove requirements l10n string for ev3 page

* Move project card styles out of things-to-try section

* Don't render the number row in a step if compact and number props are not set

* Add ExtensionSection component

* Use ExtensionSection on ev3 and microbit pages

* Move state configuration to ExtensionLanding class

* Move tip box, screenshot styles outside of specific section

* Add TipBox component and use it on the EV3 page

* Use hr element instead of section-separator div

* Remove refactor TODO comments :)
2018-08-21 15:13:49 -04:00
Ray Schamp
39c0bc9048
Merge pull request #2009 from apple502j/patch-4
Update the last updated date
2018-08-21 14:10:58 -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
Connor Hudson
7742eccb87
Add missing l10n strings to EV3 page (#2013) 2018-08-03 17:29:15 -04:00
Benjamin Wheeler
f76ca8b891
Merge pull request #1985 from benjiwheeler/studio-modal-benwheeler
Add To Studio modal on project page. Sorry for merge commit, merges from develop made these un-squashable :(
2018-08-02 17:53:53 -04:00
Connor Hudson
de2691762e
Refactor Extension Landing Pages (#2006)
* Add extension-landing generalized styles, install scratch link component

* Make EV3 page use generalized stuff

* Use OS_ENUM file instead of class variable

* use extension-landing/os-enum in os chooser

* Use extension-landing class in extension-landing.scss

* Use extension-landing styles and components on microbit page

* Add view-specific styles

* Move install scratch link l10n strings to src/l10n.json

* Start moving steps display to its own components

* Finish initial pass at Step, Steps components for extension landing pages

* Create ProjectCard component

* Use new components on InstallScratchLInk component

* Use new components on EV3 page

* allow className prop in Steps component

* Use new components on micro:bit landing page

* imageUrl -> imageSrc in ProjectCard

* Create ExtensionHeader component and use it on micro:bit and EV3 pages

* Fix a spacing issue in the InstallScratchLink component

* Add ExtensionRequirements component

* Use ExtensionRequirements component on landing pages

* Remove requirements l10n string for ev3 page

* Move project card styles out of things-to-try section

* Don't render the number row in a step if compact and number props are not set

* Add ExtensionSection component

* Use ExtensionSection on ev3 and microbit pages

* Move state configuration to ExtensionLanding class

* Move tip box, screenshot styles outside of specific section

* Add TipBox component and use it on the EV3 page

* Use hr element instead of section-separator div

* Remove refactor TODO comments :)
2018-08-02 13:09:55 -04:00
Connor Hudson
afde4597d0
Merge pull request #2010 from technoboy10/bugfix/tablet-banner-centering
[DEVELOP] Fix top banner centering on android chrome
2018-08-01 16:45:52 -04:00
Connor Hudson
42dbeee985 Set more position properties to fix banner centering on android chrome 2018-08-01 16:43:21 -04:00
Ben Wheeler
d941ec1dff do not modify state object directly 2018-08-01 16:37:48 -04:00
Ben Wheeler
7aa81199ce modal halo 2018-08-01 15:53:53 -04:00
Benjamin Wheeler
08453f9f7c
Merge branch 'develop' into studio-modal-benwheeler 2018-08-01 14:46:33 -04:00
Ben Wheeler
4ce72ce61f consolidated colors per consult with Carl 2018-08-01 14:42:15 -04:00
Ben Wheeler
38f4c6a5c3 rearranged colors; longer studio button names 2018-08-01 11:01:37 -04:00
Connor Hudson
d48adc2ae4 Set more position properties to fix banner centering on android chrome 2018-08-01 10:26:26 -04:00
Ben Wheeler
5fab657fad Merge remote-tracking branch 'origin/develop' into studio-modal-benwheeler 2018-08-01 10:14:09 -04:00
kyleplo
86befd1e31
Remove recent from language 2018-08-01 09:17:01 -04:00
kyleplo
7091e65fb5
Remove recent option 2018-08-01 09:16:41 -04:00
apple502j
b7fd515517
Update the date 2018-08-01 09:35:18 +09:00
Ben Wheeler
c450b7e658 corrected brackets for lint error 2018-07-31 18:10:42 -04:00
kyleplo
a6bb77de8a
Rename m query parameter to mode 2018-07-31 17:26:03 -04:00
Ben Wheeler
e83f29dbbc moved NaN check in preview.jsx to be guard-style 2018-07-31 16:38:49 -04:00
carljbowman
3352f8a7f0 Add missing semicolon 2018-07-31 15:33:34 -04:00
carljbowman
e3e422714e Fix 2017 conference banner
Updates the light blue background to a dark blue. Give the text more contrast.
2018-07-31 15:33:11 -04:00
carljbowman
e41d16e656 Fix button contrast in Tips page masthead
Previously the button was made aqua, but there was a lot of contrast between the ui-blue and ui-aqua.
2018-07-31 15:32:29 -04:00
Ben Wheeler
097fb66955 currentStudioIds now an array; reverted a few changes 2018-07-31 15:00:56 -04:00
carljbowman
6a8676ea35 Remove Darken and Ligthen SCSS
Updated all the places in the SCSS where we use Darken and Lighten properties.

These properties have been problematic in the past and caused some state issues, e.g. New message(s) hightlight (which was fixed seperately from this issue)
2018-07-31 14:37:49 -04:00
chrisgarrity
4b3d6b9e9d
Merge pull request #1964 from JoelGritter/JoelGritter-patch-1
Fix gh-1962: Update footer wiki link
2018-07-31 08:08:55 -04:00
chrisgarrity
409b452200
Merge pull request #1979 from joker314/feature/add-bryce-taylor
Add brycedtea to Credits page
2018-07-31 08:08:21 -04:00
chrisgarrity
08e45c076f
Merge pull request #1980 from GreenBayRules/develop
Add Kathy Wu to Credits
2018-07-31 08:07:49 -04:00
kyleplo
9bf2f7d436
Add mode 2018-07-28 07:36:08 -04:00
kyleplo
5ad2476790
Fix indent 2018-07-27 14:16:57 -04:00
kyleplo
0494822f7c
Fix more errors 2018-07-27 13:15:53 -04:00
kyleplo
190cb7553e
Fix errors 2018-07-27 13:09:48 -04:00
kyleplo
6c5d655bd5
Add language file 2018-07-27 12:56:27 -04:00
kyleplo
539cfa5bcd
Add filter mode dropdown 2018-07-27 12:54:59 -04:00
kyleplo
3ebe44f86a
Add css for dropdown 2018-07-27 12:06:06 -04:00
Ben Wheeler
8eec0d3a87 corrected parentheses for lint error 2018-07-27 10:49:42 -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
7cc2f61a2b compressed svgs; small modal scss reversion 2018-07-25 16:30:50 -04:00
Ben Wheeler
1a4922a262 addtostudio buttons in own component; currentStudioIds redux object; lint fixes 2018-07-25 15:08:12 -04:00
Sean Hickey
767fabb22c Updated livestream link to proper URL 2018-07-24 12:12:17 -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
66c21d8b33 merged docker-compose 2018-07-24 09:29:07 -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
Sean Hickey
8ab5656e33 Added link to keynote livestream 2018-07-23 16:49:13 -04:00
Ben Wheeler
52281502b2 corrected mismatched addtostudio field name in redux/preview.js 2018-07-23 10:39:20 -04:00
carljbowman
7de1cb80d6 Fix new message highlight
New messages should now have a blue backgroud (like they did previously).
2018-07-21 09:55:08 -04:00
Ben Wheeler
d1d42f4245 resolved spinner conflict 2018-07-20 21:14:41 -04:00
Ben Wheeler
1ad7ce4f4c resolved version conflicts 2018-07-20 21:08:33 -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
Connor Hudson
5f0016f385
Add landing pages for the micro:bit and EV3 extensions (#1981)
* start building ev3 landing page structure

* Inject translations, add more content and structure to ev3 landing page

* Add ev3 route

* add active styles for os chooser buttons

* Add ev3 assets

* Add content and intial styles for everything down to "Sample Projects"

* Add correct padding to all sections on ev3 page

* Add more margins to match the mockup

* Create os chooser component for reuse on other landing pages

* Make EV3 page stateful, add OS logic, change step styles, fix images on Chrome

* Add sample project cards and styles

* Add fixed ev3 icon svg

* Add app store badges (no href on links yet)

* Add section separator, fix sample project card margins

* Add border to project cards, make project cards clickable links

* Add FAQ boilerplate and styling from InformationPage component

* Add indented ol style, example

* Add link style with underline

* Add EV3 retail link

* Content updates

* Fix some z-index issues with os chooser

* micro:bit page mega-commit

* os chooser should not have a higher z-index than nav

* Update starter projects

* Localize OS chooser

* Add localization configuration for EV3 page

* Localize section titles on ev3 page

* Add starter project images and descriptions

* Add link to microbit.org

* Fix tip box width on microbit and ev3 pages

* add l10n strings up to things to try on ev3 page

* Fix lint error in ev3.scss

* Add download link style to ev3

* microbit getting started text and images

* Remove tip about microbit name

* Hex file and starter project download links

* microbit wording updates

* update images

* Fix issues with download link style

* text fix

* Add ev3 starter project downloads

* Add microbit l10n file and config

* Add l10n strings for microbit header and scratch link sections

* Add l10n strings for microbit page up to faq

* content updates

* Fix some page overflow issues

* microbit faq content and style

* Use zipped version of microbit hex file

* Add platform name to scratch link download button

* Add EV3 faq to l10n.json

* Add final strings from micro:bit and EV3 pages to l10n.json files

* Add white download asset

* Tweak styles for ev3 and microbit

* Add some final tweaks to the EV3 page styles

* Add TODO comments about refactoring duplicate code
2018-07-19 18:08:44 -04:00
Sheshank Shankar
3c020d9200
Update credits.jsx 2018-07-19 10:57:09 -07:00
Sheshank Shankar
a5070bfda5
Remove trailing spaces 2018-07-19 09:08:20 -07:00
Sheshank Shankar
4de9b49d2a
Bug fix 2018-07-19 09:07:08 -07:00
Sheshank Shankar
7b205fb136
Add Kathy Wu to credits 2018-07-19 08:59:43 -07:00
jokebookservice1
0f5778cab9 Add brycedtea to Credits page 2018-07-19 18:54:50 +03:00
Ben Wheeler
cf63c35e94 interface with api add/remove project to/from studio works; addtostudio modal waits to close 2018-07-18 18:52:15 -04:00
Ken
d95058a1bc
Added Community Moderator job listing
Closes #1972
2018-07-18 17:17:59 +02:00
Connor Hudson
61cfbb90e6 Remove extra characters from preview faq redirect routeAlias 2018-07-17 10:36:13 -04:00
Andrew Sliwinski
61bfc254ce
Merge pull request #1956 from technoboy10/feature/beta-banner
Add top and middle splash page banners for beta launch
2018-07-17 09:46:14 -04:00
carljbowman
ef9b726f63 Replace last remaining HEX colors in _colors.scss
There were a few colors used in the logged-out Welcome message. Replaced them with new 3.0 colors.
2018-07-17 09:26:46 -04:00
carljbowman
9d87d8700c Remove custom color in What’s Happening Callout
Swapped colors to make it more consistent.
2018-07-17 09:15:17 -04:00
carljbowman
cf7149a356 Fix linting 2018-07-16 19:25:35 -04:00
carljbowman
12c0706dbb Modify load more button
With box-shadows being removed from buttons there were a few places that needed to be adjusted: white buttons on light gray backdrop
2018-07-16 18:06:15 -04:00
carljbowman
201517a32d Remove shadows on buttons
GET OUT OF HERE BOX SHADOWS.
2018-07-16 18:05:10 -04:00
carljbowman
5a067132b6 Remove numeric font-weights
We have seen lots of issues across browsers with font-weights defined as numbers (e.g. 400 vs regular).

Updated one place that was effected by new line lengths and wrapping issues.
2018-07-16 18:04:43 -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
Connor Hudson
90bd2af3aa Move banner timestamps to constants at top of file 2018-07-16 13:16:48 -04:00
Connor Hudson
a669106796 Redirect /preview-faq -> /3faq, remove "Preview" from faq title 2018-07-16 12:47:18 -04:00
Connor Hudson
595a4a8c60 Hide banners before launch date (actual dates TBD) 2018-07-16 11:35:25 -04:00
Bryce Taylor
656b22f713
Merge pull request #1958 from joker314/develop
Remove unneeded testing file
2018-07-16 10:28:20 -04:00
Connor Hudson
664fc1998e Update beta banner styles to match mockup 2018-07-16 10:09:34 -04:00
Connor Hudson
ae49bbf74f Update l10n strings 2018-07-16 10:09:10 -04:00
Connor Hudson
fee657977e Use module.exports for banners, remove .default for banner imports in presentation 2018-07-16 09:17:26 -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
Joel Gritter
90ab0f75d0
Update wiki link 2018-07-10 17:29:25 -04:00
Ray Schamp
5844fed2e0 Merge branch 'hotfix/update-conference-2018-3' into develop 2018-07-09 16:34:23 -04:00
jokebookservice1
07202ff6ec
Remove unneeded testing file 2018-07-09 16:48:17 +03:00
Andrew Sliwinski
f3bd092482
Merge pull request #1951 from JoelGritter/JoelGritter-patch-1
Fix gh-1950: Update parent email age on FAQ page
2018-07-09 08:47:24 -04:00
Ben Wheeler
9cac70ab18 small steps towards addtostudio modal's container-presentation refactor 2018-07-07 14:09:43 -04:00
Connor Hudson
5b520c21ef Update copy from doc 2018-07-06 13:47:55 -04:00
Connor Hudson
a7aae29041 Tweak small top banner styles 2018-07-06 11:38:41 -04:00
Connor Hudson
917497ab66 Use localization strings for banner copy 2018-07-06 10:37:51 -04:00
Connor Hudson
565eeb776f Make middle banner image resize properly and keep its aspect ratio 2018-07-06 10:37:10 -04:00
Sean Hickey
377eaf0e61 Conference updates - schedule, logos, room locations 2018-07-06 10:17:57 -04:00
Connor Hudson
61aad76b68 Fix middle banner image styles 2018-07-06 09:52:24 -04:00
Connor Hudson
d1d7b2e711 Adjust middle banner width and margin to match other front page rows 2018-07-05 15:26:34 -04:00
Ben Wheeler
d9543314cc small comment 2018-07-05 13:34:41 -04:00
Joel Gritter
b77c5fe837
Update parent email age
13 -> 16
2018-07-05 09:27:53 -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
4129a701e7 Second pass at responsive top banner 2018-07-03 16:18:11 -04:00
Connor Hudson
5ebb5fa8db Fix image weirdness on chrome, safari 2018-07-03 15:02:00 -04:00
Connor Hudson
08178a58e5 Initial work on responsive middle banner 2018-07-03 14:48:20 -04:00
Connor Hudson
0eb12ae469 Style button on top banner 2018-07-03 13:16:01 -04:00
Connor Hudson
97cb50917f Add initial pass at middle banner 2018-07-03 12:21:21 -04:00
Connor Hudson
142b46b138 Rename image container 2018-07-03 12:07:03 -04:00
Connor Hudson
655625568c Add initial pass at top banner with assets 2018-07-03 12:03:22 -04:00
Connor Hudson
4eca432811 Style middle banner 2018-07-02 11:41:17 -04:00
Connor Hudson
251f7bf59d Add middle banner in progress copy 2018-07-02 11:41:10 -04:00
Connor Hudson
dfaee503b8 Style top banner, add placeholder copy 2018-07-02 10:51:19 -04:00
Connor Hudson
5b5eb8cc5a Tweak class for small top banner 2018-07-02 10:25:58 -04:00
Connor Hudson
cf48231284 Tweak class names, button padding for small top banner 2018-07-02 10:08:38 -04:00