Commit graph

1783 commits

Author SHA1 Message Date
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
Kenny2github
13f3706a9d Migrate to FormattedMessage 2018-12-24 12:57:23 +08:00
picklesrus
033a47f7d9
Merge pull request #2533 from picklesrus/add-illustrator
Add an illustrator
2018-12-20 16:31:51 -05:00
picklesrus
9c5836fba8 Add an illustrator 2018-12-20 16:00:24 -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
Benjamin Wheeler
3c8cf1a6fc
Merge pull request #2526 from chrisgarrity/feature/2319-masthead
Implement new Intro masthead
2018-12-20 11:35:39 -05:00
picklesrus
60ef644bc7 Add people to acknoledgements. Move credits from /info/credits to /credits. Remove 3.0 from text about illustrations. 2018-12-20 11:02:38 -05:00
ChampikaF
d74681650e
Merge pull request #2523 from picklesrus/ChampikaF-UpdateFAQ
FAQ updates from Champikaf
2018-12-20 10:41:00 -05:00
picklesrus
e864055605 Fix some duplicates 2018-12-20 10:30:12 -05:00
picklesrus
a9971b2f7b Fix formatting issues. Fix broken mailto. Remove duplicate message 2018-12-20 09:47:50 -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
32d1c63a3e Merge branch 'UpdateFAQ' of https://github.com/ChampikaF/scratch-www into ChampikaF-UpdateFAQ 2018-12-20 08:24:16 -05:00
picklesrus
f2c79ab658
Merge pull request #2511 from picklesrus/parents-page
Parents page
2018-12-20 08:20:42 -05:00
chrisgarrity
496d585add Don’t duplicate localization strings
Current launch banner should just use the intro.startCreating string for the call to action. Leaving the generic Call to Action in place for the next banner.
2018-12-20 08:05:52 -05:00
chrisgarrity
496fdad8be New 3.0 Masthead
* intro component was changed for new banner masthead layout
* added new video component for embedding wistia (based on extension video, we should probably figure out consolidating the two)
* new and updated strings in splash/l10n.json
* updated splash presentation to move Intro above `inner` to allow it to be full width (like banners)
* new assets
2018-12-20 07:32:03 -05:00
Champika
66c4466465 faq page updates for Scratch 3 2018-12-19 18:05:24 -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
picklesrus
54d9c202c2 change out the video 2018-12-19 14:13:30 -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
picklesrus
495299908b Updates to the parents page. See #2355 2018-12-19 11:30:25 -05:00
picklesrus
d13a773f7c
Merge pull request #2498 from picklesrus/download-space-edits
Fix some spacing issues on the download page. Adds a more padding und…
2018-12-19 09:44:13 -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
chrisgarrity
2972ac7462
Merge pull request #2495 from chrisgarrity/issue/2493-skip-tutorial
Remove tutorial for logged in users.
2018-12-18 07:16:24 -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
picklesrus
158f130fab Fix some spacing issues on the download page. Adds a more padding under heading titles and makes the text in the older versions section have normal text styling. 2018-12-17 15:03:41 -05:00
chrisgarrity
0d5323ff0c Remove tutorial for logged in users. 2018-12-17 10:40:48 -05:00
Paul Kaplan
e20f928147 Put project info alerts below navbar 2018-12-14 16:47:54 -05:00
Benjamin Wheeler
92ac2786e5
Merge pull request #2474 from picklesrus/download-content-updates
Download content updates
2018-12-14 12:58:32 -05:00
picklesrus
96bc439ab0
Merge pull request #2478 from picklesrus/educator-links
Add proper links to cards and guides instead of hard coding them.
2018-12-14 07:14:28 -05:00
Benjamin Wheeler
d949edef6f
Merge pull request #2479 from benjiwheeler/fix-misalign
don't use flex-row class to wrap instructions and credits
2018-12-13 15:48:15 -05:00
picklesrus
3ebdcc11f7 Add icon! 2018-12-13 14:57:21 -05:00
picklesrus
828bf569b8 Add links! 2018-12-13 14:32:38 -05:00
picklesrus
43db3c12e5 Add proper links to cards and guides instead of hard coding them. 2018-12-13 14:10:47 -05:00
Ben Wheeler
2a0a76fba1 don't use flex-row class to wrap instructions and credits 2018-12-13 14:01:27 -05:00
Eric Rosenbaum
e170a9cd4a
Merge pull request #2455 from ericrosenbaum/feature/ideas-page
Ideas page
2018-12-13 13:58:55 -05:00
picklesrus
c52b083c62 Add correct screenshots. Update lots of text. 2018-12-13 12:57:42 -05:00
Eric Rosenbaum
b434865c45 Update l10n-static ids 2018-12-13 12:35:11 -05:00
Eric Rosenbaum
6d4af6014d Fix spacing of lower cards and starter sections 2018-12-13 11:52:12 -05:00
chrisgarrity
f945897e86
Merge pull request #2470 from chrisgarrity/issue/2318-launch-banner
Issue/2318 launch banner
2018-12-13 11:41:45 -05:00
chrisgarrity
9cbcd80c76 two more tweaks with the mobile version 2018-12-13 11:40:39 -05:00
picklesrus
8848f11c8d download button padding 2018-12-13 11:20:32 -05:00
picklesrus
bdf93a15db Add questions to FAQ and change some messages. 2018-12-13 11:16:59 -05:00
Eric Rosenbaum
9f343fa662 Fix l10n-static ids 2018-12-13 11:01:25 -05:00
Eric Rosenbaum
4ca6570592 Remove or rename unused l10n strings 2018-12-13 10:28:48 -05:00
picklesrus
1ce8ef5b0d
Merge pull request #2449 from picklesrus/download-directly-version
New Download page
2018-12-13 10:26:23 -05:00
Eric Rosenbaum
b993b274ad Rename function and prop 2018-12-13 10:22:35 -05:00
picklesrus
c76d55de70 css cleanup! 2018-12-13 10:14:24 -05:00
picklesrus
f9bf122850
Merge pull request #2451 from picklesrus/educator-tweaks
minor educator pages fixes
2018-12-13 09:54:23 -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
picklesrus
7276cb3bff remove leftover line 2018-12-13 09:27:46 -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
chrisgarrity
c28b5051ca revise with images absolute
Switched the images div to absolute positioning instead of the header container.
2018-12-12 20:42:23 -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
Eric Rosenbaum
c1e5b05a0f update static l10n 2018-12-12 18:36:32 -05:00
Eric Rosenbaum
3cc6794ca1
Merge pull request #2443 from ericrosenbaum/feature/landing-pages-update
Update extension landing pages
2018-12-12 18:18:53 -05:00
Eric Rosenbaum
521a11e8a3 Remove duplicate l10n strings 2018-12-12 18:04:53 -05:00
Eric Rosenbaum
8fddd3b430 Use template for tutorial URLs 2018-12-12 17:22:17 -05:00
Eric Rosenbaum
ecccc6ac23 Add tutorial links 2018-12-12 17:13:31 -05:00
Eric Rosenbaum
7db60b7631 Align button text 2018-12-12 17:13:23 -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
Eric Rosenbaum
5829ff29b2 Improve l10n ids 2018-12-12 16:47:39 -05:00
Eric Rosenbaum
600830acc5 Fixing links 2018-12-12 15:57:27 -05:00
Paul Kaplan
3aeda2208b Make the remix button spin the correct the direction 2018-12-12 15:38:00 -05:00
Eric Rosenbaum
bd96aaf81f l10n cleanup 2018-12-12 15:32:47 -05:00
Eric Rosenbaum
b9e4f51a00 Wording changes 2018-12-12 15:32:38 -05:00
Eric Rosenbaum
666e26b324 Cleanup 2018-12-12 15:21:14 -05:00
Eric Rosenbaum
43e7ec6ebf css lint and cleanup 2018-12-12 15:05:36 -05:00
chrisgarrity
b9fb557b88 style adjustments 2018-12-12 14:24:07 -05:00
Eric Rosenbaum
20e3812380 First pass at complete layout 2018-12-12 14:17:39 -05:00
picklesrus
dcfb168878 fix lint 2018-12-12 13:45:42 -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
picklesrus
36ce0a4f74 minor educator pages fixes 2018-12-12 13:11:32 -05:00
picklesrus
3aaf36e82a where did the ; go? 2018-12-12 12:41:31 -05:00
picklesrus
a3afa5e482
Merge pull request #2447 from picklesrus/educators
Educators Page Changes
2018-12-12 12:18:34 -05:00
picklesrus
5c67ef4961 lint 2018-12-12 12:06:44 -05:00
picklesrus
dc24ab193d Fix up some stuff to better match the spec 2018-12-12 12:01:15 -05:00
chrisgarrity
79449ac547 [WIP] Draft 3.0 Launch banner
Started transition to ‘featured’ banner that is somewhat reusable. However, middle and smallTop banners are still based on beta. They’re not used for 3.0 launch.
2018-12-12 11:35: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
picklesrus
5b6bbbdb8a rename some messages and fix some wording 2018-12-12 10:21:12 -05:00
picklesrus
1d305adc79 Fix some messages. 2018-12-12 09:07:49 -05:00
picklesrus
c3dde0c9eb version without app store buttons 2018-12-12 08:43:50 -05:00
Andrew Sliwinski
4587736684
Merge pull request #2438 from apple502j/patch-6
Unquote userId
2018-12-12 08:26:21 -05:00
picklesrus
e6420b601a fix lint and remove unused stuff 2018-12-11 17:30:35 -05:00
picklesrus
09afde4396 add more links 2018-12-11 17:23:04 -05:00
Paul Kaplan
a99e8574f5
Merge pull request #2433 from paulkaplan/cloud-data-modal
Show username and cloud var alerts on projects that use them.
2018-12-11 16:58:11 -05:00
picklesrus
0a39123a3b more links 2018-12-11 16:53:43 -05:00
picklesrus
4716cb3b32 fix all the things 2018-12-11 16:36:17 -05:00
picklesrus
f3fb63b2e4 fix some stuff 2018-12-11 16:13:34 -05:00
picklesrus
8a8a564996 Beginnings of new educator page 2018-12-11 15:02:43 -05:00
Paul Kaplan
bc99c52ebe Fix hard-coded /preview/id url for remix list. 2018-12-11 14:46:05 -05:00
Eric Rosenbaum
09a14b811a Update microbit starter project links 2018-12-11 14:30:57 -05:00
Eric Rosenbaum
6a1cf5b6e9 Update landing getting started instructions 2018-12-11 14:28:08 -05:00
Eric Rosenbaum
13e3c8efdc Update EV3 starter projects 2018-12-11 14:21:20 -05:00
Eric Rosenbaum
134126c170 Update WeDo starter projects 2018-12-11 13:53:49 -05:00
Ben Wheeler
478259a5d2 placeholder text goes away when instructions, credits clicked 2018-12-11 12:29:31 -05:00
picklesrus
84e3d84ed0 minor stuff 2018-12-11 11:55:42 -05:00
picklesrus
570ba86e75 lint! 2018-12-11 11:44:35 -05:00
picklesrus
60af2fff7c Fix background color 2018-12-11 11:32:57 -05:00
picklesrus
145770798f Fix padding around screenshots 2018-12-11 11:31:36 -05:00
picklesrus
6dde3fa231 Move the scratch2 download page to /download/scratch2. 2018-12-11 11:26:53 -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
bc49f04ed6
Merge pull request #2387 from Kenny2github/delete-cards
Redirect /info/cards route to /ideas 
/cc @ericrosenbaum
2018-12-11 10:25:48 -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
picklesrus
77c311ccea clean up some css and align some images with text 2018-12-11 10:11:06 -05:00
apple502j
c134a95de3 Translate placeholder 2018-12-11 20:41:49 +09:00
apple502j
fa29c2f2a5
Unquote userId 2018-12-11 18:29:02 +09:00
picklesrus
8bfa310f5a Fix line spacing and font size along with a message. 2018-12-10 19:34:23 -05:00
picklesrus
47ce5f5919 Crush the pngs 2018-12-10 18:49:03 -05:00
picklesrus
ce854f7b80 more faq. More messages 2018-12-10 18:35:17 -05:00
picklesrus
d7a678ad8c Mostly adding messages and removing unnecessary sections 2018-12-10 18:09:36 -05:00
Eric Rosenbaum
68c8decae9 Remove microworlds pages 2018-12-10 18:06:23 -05:00
Eric Rosenbaum
8e6af59635 Initial draft of ideas page 2018-12-10 18:06:07 -05:00
picklesrus
2baf5860ca Skeleton of downloads page. 2018-12-10 17:33:22 -05: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