From 9134f6a2a652c0572e3f20e415dd41859e7c895d Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Mon, 28 Oct 2024 14:42:18 +0200 Subject: [PATCH 01/25] feat: [UEPR-67] restyle community guidelines page --- src/_colors.scss | 1 + src/views/guidelines/guidelines.jsx | 142 +++++++++--- src/views/guidelines/guidelines.scss | 212 +++++++++++++++++- src/views/guidelines/l10n.json | 15 +- static/svgs/guidelines/blobblue_respect.svg | 1 + static/svgs/guidelines/blobgreen_remix.svg | 1 + .../svgs/guidelines/blobmagenta_feedback.svg | 1 + static/svgs/guidelines/blobpink_friendly.svg | 1 + static/svgs/guidelines/blobpurple_honest.svg | 1 + static/svgs/guidelines/blobyellow_safe.svg | 1 + .../svgs/guidelines/header_sprinkles_left.svg | 27 +++ .../guidelines/header_sprinkles_right.svg | 27 +++ .../svgs/guidelines/illustration_feedback.svg | 1 + .../svgs/guidelines/illustration_friendly.svg | 1 + .../svgs/guidelines/illustration_honest.svg | 1 + static/svgs/guidelines/illustration_remix.svg | 1 + .../svgs/guidelines/illustration_respect.svg | 1 + static/svgs/guidelines/illustration_safe.svg | 1 + 18 files changed, 383 insertions(+), 53 deletions(-) create mode 100644 static/svgs/guidelines/blobblue_respect.svg create mode 100644 static/svgs/guidelines/blobgreen_remix.svg create mode 100644 static/svgs/guidelines/blobmagenta_feedback.svg create mode 100644 static/svgs/guidelines/blobpink_friendly.svg create mode 100644 static/svgs/guidelines/blobpurple_honest.svg create mode 100644 static/svgs/guidelines/blobyellow_safe.svg create mode 100644 static/svgs/guidelines/header_sprinkles_left.svg create mode 100644 static/svgs/guidelines/header_sprinkles_right.svg create mode 100644 static/svgs/guidelines/illustration_feedback.svg create mode 100644 static/svgs/guidelines/illustration_friendly.svg create mode 100644 static/svgs/guidelines/illustration_honest.svg create mode 100644 static/svgs/guidelines/illustration_remix.svg create mode 100644 static/svgs/guidelines/illustration_respect.svg create mode 100644 static/svgs/guidelines/illustration_safe.svg diff --git a/src/_colors.scss b/src/_colors.scss index ad8b3a9165e..aea15a2aa73 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -37,6 +37,7 @@ $ui-purple-10percent: hsla(260, 60%, 60%, .1); $ui-purple-25percent: hsla(260, 60%, 60%, .25); $ui-magenta: hsla(300, 53%, 60%, 1); /* #CF63CF Sounds Primary */ $ui-magenta-dark: hsla(300, 48%, 50%, 1); /* #BD42BD Sounds Tertiary */ +$ui-light-grayish-blue: hsla(215, 76%, 95%, 1); $ui-yellow: hsla(45, 100%, 50%, 1); // #FFBF00 Events Primary $ui-coral: hsla(350, 100%, 70%, 1); // #FF6680 More Blocks Primary diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx index e18d9aada78..d399f47fcf9 100644 --- a/src/views/guidelines/guidelines.jsx +++ b/src/views/guidelines/guidelines.jsx @@ -1,49 +1,119 @@ const FormattedMessage = require('react-intl').FormattedMessage; const React = require('react'); -const Box = require('../../components/box/box.jsx'); - const Page = require('../../components/page/www/page.jsx'); const render = require('../../lib/render.jsx'); require('./guidelines.scss'); +const pageSections = [ + { + id: 'respect', + headerTextId: 'guidelines.respectheader', + contentTextIds: [ + 'guidelines.respectbody1', + 'guidelines.respectbody2' + ], + sectionImgSrc: '/svgs/guidelines/illustration_respect.svg', + buttonImgSrc: '/svgs/guidelines/blobblue_respect.svg' + }, + { + id: 'privacy', + headerTextId: 'guidelines.privacyheader', + contentTextIds: [ + 'guidelines.privacybody1', + 'guidelines.privacybody2' + ], + sectionImgSrc: '/svgs/guidelines/illustration_safe.svg', + buttonImgSrc: '/svgs/guidelines/blobyellow_safe.svg' + }, + { + id: 'helpful', + headerTextId: 'guidelines.helpfulheader', + contentTextIds: [ + 'guidelines.privacybody1', + 'guidelines.privacybody2' + ], + sectionImgSrc: '/svgs/guidelines/illustration_feedback.svg', + buttonImgSrc: '/svgs/guidelines/blobmagenta_feedback.svg' + }, + { + id: 'remix', + headerTextId: 'guidelines.remixheader', + contentTextIds: [ + 'guidelines.remixbody1', + 'guidelines.remixbody2' + ], + sectionImgSrc: '/svgs/guidelines/illustration_remix.svg', + buttonImgSrc: '/svgs/guidelines/blobgreen_remix.svg' + }, + { + id: 'honesty', + headerTextId: 'guidelines.honestyheader', + contentTextIds: [ + 'guidelines.honestybody1', + 'guidelines.honestybody2' + ], + sectionImgSrc: '/svgs/guidelines/illustration_honest.svg', + buttonImgSrc: '/svgs/guidelines/blobpurple_honest.svg' + }, + { + id: 'friendly', + headerTextId: 'guidelines.friendlyheader', + contentTextIds: [ + 'guidelines.friendlybody1', + 'guidelines.friendlybody2' + ], + sectionImgSrc: '/svgs/guidelines/illustration_friendly.svg', + buttonImgSrc: '/svgs/guidelines/blobpink_friendly.svg' + } +]; + const Guidelines = () => ( -
- +
+
+
+
+
+
+
+
+
+ { + pageSections.map(({id, headerTextId, buttonImgSrc}) => ( + + + + + )) + } +
+
+
+ { + pageSections.map(({id, headerTextId, contentTextIds, sectionImgSrc}, index) => ( +
+
+
+

+ +

+

+ +

+
+ +
+ )) } - > -

-   -   - -

-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- sprites -
- +
); diff --git a/src/views/guidelines/guidelines.scss b/src/views/guidelines/guidelines.scss index 92566445d78..1b3bb426c2f 100644 --- a/src/views/guidelines/guidelines.scss +++ b/src/views/guidelines/guidelines.scss @@ -1,23 +1,211 @@ @import "../../colors"; @import "../../frameless"; -.guidelines { - .guidelines-footer { - margin-top: 1.5rem; - text-align: center; +#view { + padding: 0; +} + +.guidelines-page { + header { + display: flex; + flex-direction: column; + align-items: center; + + background-color: $motion-blue-3; + background-image: url('/svgs/guidelines/header_sprinkles_left.svg'), url('/svgs/guidelines/header_sprinkles_right.svg'); + background-position: left, right; + background-repeat: no-repeat; + + border-top: 50px solid $ui-blue; + padding: 6.25rem 0; + + div { + color: $ui-white; + text-align: center; + font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; + width: 708px; + } + + .title { + margin-bottom: 2.25rem; + font-size: 2.25rem; + font-weight: 700; + } + + .header1, .header2 { + font-size: 1.5rem; + font-weight: 500; + } + + .header1 { + margin-bottom: 1.5rem; + } } - dl { - dt { - margin-top: 1.5rem; + .navigation { + display: flex; + flex-direction: column; + justify-content: center; + gap: 4.5rem; + margin: 6rem 15% 0 15%; + padding-bottom: 6rem; + + border-bottom: 1px solid $active-gray; + + .header3 { + font-size: 1.25rem; + font-weight: 400; + font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; + text-align: start; + } + + .navigation-buttons { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(3, 1fr); + grid-auto-flow: column; + column-gap: 2.25rem; + row-gap: 1rem; + + a { + display: flex; + align-items: center; + gap: 1.875rem; + + padding: 1rem 2rem; + + font-size: 1.125rem; + font-weight: 500; + font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; + color: $header-gray; + text-align: start; + word-wrap: break-word; + + border: 1px solid $box-shadow-light-gray; + border-radius: 10px; + transition: background 0.5s ease-in-out; + } + + a:hover { + background-color: $ui-light-grayish-blue; + } } } -} -@media #{$medium-and-smaller}{ - .guidelines-footer { - img { - display: none; + .guidelines { + display: flex; + flex-direction: column; + gap: 12rem; + + margin: 6rem auto; + + .guideline { + display: flex; + align-items: center; + gap: 4.5rem; + scroll-margin-top: 6rem; + + div, p { + font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; + text-align: start; + } + + .guideline-title { + font-size: 1.5rem; + font-weight: 500; + } + + .first-paragraph { + font-size: 1.25rem; + font-weight: 400; + } + + .second-paragraph { + font-size: 1rem; + font-weight: 400; + } + + img { + width: $cols4; + } + } + + .content-first { + flex-direction: row; + } + + .image-first { + flex-direction: row-reverse; + } + } + + @media only screen and (max-width: 1024px) { + .guidelines { + .guideline { + flex-direction: column-reverse; + margin: 6rem 10%; + } + } + } + + @media only screen and (max-width: 768px) { + header { + background-image: unset; + padding: 6.25rem 10%; + + div { + width: auto; + } + } + } + + @media only screen and (max-width: 560px) { + header { + .title { + font-size: 2rem; + } + + .header1, .header2 { + font-size: 1.25rem; + } + } + + .navigation { + .navigation-buttons { + grid-template-columns: repeat(1, 1fr); + grid-template-rows: unset; + grid-auto-flow: unset; + } + } + } + + @media only screen and (max-width: 360px) { + header { + .title { + font-size: 1.5rem; + } + + .header1, .header2 { + font-size: 1rem; + } + } + + .navigation { + .header3 { + font-size: 1rem; + } + } + + .guidelines { + .guideline { + .guideline-title { + font-size: 1.25rem; + } + + .first-paragraph { + font-size: 1.125rem; + } + } } } } diff --git a/src/views/guidelines/l10n.json b/src/views/guidelines/l10n.json index 20e1ff0d0da..c9c3beb2578 100644 --- a/src/views/guidelines/l10n.json +++ b/src/views/guidelines/l10n.json @@ -4,16 +4,21 @@ "guidelines.header2": "We welcome people of all ages, races, ethnicities, religions, abilities, sexual orientations, and gender identities.", "guidelines.header3": "Help keep Scratch a welcoming, supportive, and creative space for all by following these Community Guidelines:", "guidelines.respectheader": "Treat everyone with respect.", - "guidelines.respectbody": "Scratchers have diverse backgrounds, interests, identities, and experiences. Everyone on Scratch is encouraged to share things that excite them and are important to them—we hope that you find ways to celebrate your own identity on Scratch, and allow others to do the same. It’s never OK to attack a person or group’s identity or to be unkind to someone about their background or interests.", + "guidelines.respectbody1": "Scratchers have diverse backgrounds, interests, identities, and experiences.", + "guidelines.respectbody2": "Everyone on Scratch is encouraged to share things that excite them and are important to them—we hope that you find ways to celebrate your own identity on Scratch, and allow others to do the same. It’s never OK to attack a person or group’s identity or to be unkind to someone about their background or interests.", "guidelines.privacyheader": "Be safe: keep personal and contact information private.", - "guidelines.privacybody": "For safety reasons, don't give out any information that could be used for private communication, in person or online. This includes sharing real last names, phone numbers, addresses, hometowns, school names, email addresses, usernames or links to social media sites, video chatting applications, or websites with private chat functionality.", + "guidelines.privacybody1": "For safety reasons, don't give out any information that could be used for private communication, in person or online.", + "guidelines.privacybody2": "This includes sharing real last names, phone numbers, addresses, hometowns, school names, email addresses, usernames or links to social media sites, video chatting applications, or websites with private chat functionality.", "guidelines.helpfulheader": "Give helpful feedback.", - "guidelines.helpfulbody": "Everyone on Scratch is learning. When commenting on a project, remember to say something you like about it, offer suggestions, and be kind, not critical. Please keep comments respectful and avoid spamming or posting chain mail. We encourage you to try new things, experiment, and learn from others.", + "guidelines.helpfulbody1": "Everyone on Scratch is learning.", + "guidelines.helpfulbody2": "When commenting on a project, remember to say something you like about it, offer suggestions, and be kind, not critical. Please keep comments respectful and avoid spamming or posting chain mail. We encourage you to try new things, experiment, and learn from others.", "guidelines.remixheader": "Embrace remix culture.", "guidelines.remixbody1": "Remixing is when you build upon someone else’s projects, code, ideas, images, or anything else they share on Scratch to make your own unique creation.", "guidelines.remixbody2": "Remixing is a great way to collaborate and connect with other Scratchers. You are encouraged to use anything you find on Scratch in your own creations, as long as you provide credit to everyone whose work you used and make a meaningful change to it. And when you share something on Scratch, you are giving permission to all Scratchers to use your work in their creations, too.", "guidelines.honestyheader": "Be honest.", - "guidelines.honestybody": "It’s important to be honest and authentic when interacting with others on Scratch, and remember that there is a person behind every Scratch account. Spreading rumors, impersonating other Scratchers or celebrities, or pretending to be seriously ill is not respectful to the Scratch Community.", + "guidelines.honestybody1": "It’s important to be honest and authentic when interacting with others on Scratch, and remember that there is a person behind every Scratch account.", + "guidelines.honestybody2": "Spreading rumors, impersonating other Scratchers or celebrities, or pretending to be seriously ill is not respectful to the Scratch Community.", "guidelines.friendlyheader": "Help keep the site friendly.", - "guidelines.friendlybody": "It’s important to keep your creations and conversations friendly and appropriate for all ages. If you think something on Scratch is mean, insulting, too violent, or otherwise disruptive to the community, click “Report” to let us know about it. Please use the “Report” button rather than engaging in fights, spreading rumors about other people’s behavior, or otherwise responding to any inappropriate content. The Scratch Team will look at your report and take the appropriate action." + "guidelines.friendlybody1": "It’s important to keep your creations and conversations friendly and appropriate for all ages.", + "guidelines.friendlybody2": "If you think something on Scratch is mean, insulting, too violent, or otherwise disruptive to the community, click “Report” to let us know about it. Please use the “Report” button rather than engaging in fights, spreading rumors about other people’s behavior, or otherwise responding to any inappropriate content. The Scratch Team will look at your report and take the appropriate action." } diff --git a/static/svgs/guidelines/blobblue_respect.svg b/static/svgs/guidelines/blobblue_respect.svg new file mode 100644 index 00000000000..1bce18972ff --- /dev/null +++ b/static/svgs/guidelines/blobblue_respect.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/blobgreen_remix.svg b/static/svgs/guidelines/blobgreen_remix.svg new file mode 100644 index 00000000000..635356fdc20 --- /dev/null +++ b/static/svgs/guidelines/blobgreen_remix.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/blobmagenta_feedback.svg b/static/svgs/guidelines/blobmagenta_feedback.svg new file mode 100644 index 00000000000..baac468c94a --- /dev/null +++ b/static/svgs/guidelines/blobmagenta_feedback.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/blobpink_friendly.svg b/static/svgs/guidelines/blobpink_friendly.svg new file mode 100644 index 00000000000..f27af60d7fd --- /dev/null +++ b/static/svgs/guidelines/blobpink_friendly.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/blobpurple_honest.svg b/static/svgs/guidelines/blobpurple_honest.svg new file mode 100644 index 00000000000..5a4151d8a81 --- /dev/null +++ b/static/svgs/guidelines/blobpurple_honest.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/blobyellow_safe.svg b/static/svgs/guidelines/blobyellow_safe.svg new file mode 100644 index 00000000000..dfd53ea26c4 --- /dev/null +++ b/static/svgs/guidelines/blobyellow_safe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/header_sprinkles_left.svg b/static/svgs/guidelines/header_sprinkles_left.svg new file mode 100644 index 00000000000..ac6236b8c1e --- /dev/null +++ b/static/svgs/guidelines/header_sprinkles_left.svg @@ -0,0 +1,27 @@ + + header_sprinkles-svg + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/svgs/guidelines/header_sprinkles_right.svg b/static/svgs/guidelines/header_sprinkles_right.svg new file mode 100644 index 00000000000..99f8c9f2f16 --- /dev/null +++ b/static/svgs/guidelines/header_sprinkles_right.svg @@ -0,0 +1,27 @@ + + header_sprinkles-svg + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/svgs/guidelines/illustration_feedback.svg b/static/svgs/guidelines/illustration_feedback.svg new file mode 100644 index 00000000000..25cee1c3e86 --- /dev/null +++ b/static/svgs/guidelines/illustration_feedback.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/illustration_friendly.svg b/static/svgs/guidelines/illustration_friendly.svg new file mode 100644 index 00000000000..3b91a6016db --- /dev/null +++ b/static/svgs/guidelines/illustration_friendly.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/illustration_honest.svg b/static/svgs/guidelines/illustration_honest.svg new file mode 100644 index 00000000000..056314c1b4d --- /dev/null +++ b/static/svgs/guidelines/illustration_honest.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/illustration_remix.svg b/static/svgs/guidelines/illustration_remix.svg new file mode 100644 index 00000000000..fcb9b12560b --- /dev/null +++ b/static/svgs/guidelines/illustration_remix.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/illustration_respect.svg b/static/svgs/guidelines/illustration_respect.svg new file mode 100644 index 00000000000..8ddf93fd500 --- /dev/null +++ b/static/svgs/guidelines/illustration_respect.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/svgs/guidelines/illustration_safe.svg b/static/svgs/guidelines/illustration_safe.svg new file mode 100644 index 00000000000..d371c887423 --- /dev/null +++ b/static/svgs/guidelines/illustration_safe.svg @@ -0,0 +1 @@ + \ No newline at end of file From fc97fa63096d4fff51a0c9d6796bb2ad8917972f Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Wed, 30 Oct 2024 10:46:18 +0200 Subject: [PATCH 02/25] feat: [UEPR-67] added learn more section --- src/views/guidelines/guidelines.jsx | 105 ++++++++++++------ src/views/guidelines/guidelines.scss | 7 +- src/views/guidelines/l10n.json | 5 +- .../guidelines/illustration_learn_more.svg | 21 ++++ 4 files changed, 101 insertions(+), 37 deletions(-) create mode 100644 static/svgs/guidelines/illustration_learn_more.svg diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx index d399f47fcf9..1cc5eb690ce 100644 --- a/src/views/guidelines/guidelines.jsx +++ b/src/views/guidelines/guidelines.jsx @@ -10,9 +10,9 @@ const pageSections = [ { id: 'respect', headerTextId: 'guidelines.respectheader', - contentTextIds: [ - 'guidelines.respectbody1', - 'guidelines.respectbody2' + contentTexts: [ + {id: 'guidelines.respectbody1'}, + {id: 'guidelines.respectbody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_respect.svg', buttonImgSrc: '/svgs/guidelines/blobblue_respect.svg' @@ -20,9 +20,9 @@ const pageSections = [ { id: 'privacy', headerTextId: 'guidelines.privacyheader', - contentTextIds: [ - 'guidelines.privacybody1', - 'guidelines.privacybody2' + contentTexts: [ + {id: 'guidelines.privacybody1'}, + {id: 'guidelines.privacybody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_safe.svg', buttonImgSrc: '/svgs/guidelines/blobyellow_safe.svg' @@ -30,9 +30,9 @@ const pageSections = [ { id: 'helpful', headerTextId: 'guidelines.helpfulheader', - contentTextIds: [ - 'guidelines.privacybody1', - 'guidelines.privacybody2' + contentTexts: [ + {id: 'guidelines.privacybody1'}, + {id: 'guidelines.privacybody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_feedback.svg', buttonImgSrc: '/svgs/guidelines/blobmagenta_feedback.svg' @@ -40,9 +40,9 @@ const pageSections = [ { id: 'remix', headerTextId: 'guidelines.remixheader', - contentTextIds: [ - 'guidelines.remixbody1', - 'guidelines.remixbody2' + contentTexts: [ + {id: 'guidelines.remixbody1'}, + {id: 'guidelines.remixbody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_remix.svg', buttonImgSrc: '/svgs/guidelines/blobgreen_remix.svg' @@ -50,9 +50,9 @@ const pageSections = [ { id: 'honesty', headerTextId: 'guidelines.honestyheader', - contentTextIds: [ - 'guidelines.honestybody1', - 'guidelines.honestybody2' + contentTexts: [ + {id: 'guidelines.honestybody1'}, + {id: 'guidelines.honestybody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_honest.svg', buttonImgSrc: '/svgs/guidelines/blobpurple_honest.svg' @@ -60,27 +60,54 @@ const pageSections = [ { id: 'friendly', headerTextId: 'guidelines.friendlyheader', - contentTextIds: [ - 'guidelines.friendlybody1', - 'guidelines.friendlybody2' + contentTexts: [ + {id: 'guidelines.friendlybody1'}, + {id: 'guidelines.friendlybody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_friendly.svg', buttonImgSrc: '/svgs/guidelines/blobpink_friendly.svg' + }, + { + id: 'learn-more', + headerTextId: 'guidelines.learnMoreheader', + contentTexts: [ + { + id: 'guidelines.learnMorebody1', + values: { + a: chunks => ( + + {chunks} + + ) + } + }, + {id: 'guidelines.learnMorebody2'} + ], + sectionImgSrc: '/svgs/guidelines/illustration_learn_more.svg' } ]; const Guidelines = () => (
-
-
-
+
+ +
+
+ +
+
+ +
-
+
+ +
- { - pageSections.map(({id, headerTextId, buttonImgSrc}) => ( + {pageSections + .filter(guide => guide.buttonImgSrc) + .map(({id, headerTextId, buttonImgSrc}) => ( ( - )) - } + ))}
- { - pageSections.map(({id, headerTextId, contentTextIds, sectionImgSrc}, index) => ( + {pageSections.map( + ({id, headerTextId, contentTexts, sectionImgSrc}, index) => (
-
+
+ +

- +

- +

- )) - } + ) + )}
); -render(, document.getElementById('app')); +render( + + + , + document.getElementById('app') +); diff --git a/src/views/guidelines/guidelines.scss b/src/views/guidelines/guidelines.scss index 1b3bb426c2f..f6906334de7 100644 --- a/src/views/guidelines/guidelines.scss +++ b/src/views/guidelines/guidelines.scss @@ -128,6 +128,10 @@ img { width: $cols4; } + + a { + text-decoration: underline; + } } .content-first { @@ -143,7 +147,8 @@ .guidelines { .guideline { flex-direction: column-reverse; - margin: 6rem 10%; + gap: 2.25rem; + margin: 0 10%; } } } diff --git a/src/views/guidelines/l10n.json b/src/views/guidelines/l10n.json index c9c3beb2578..97cea2103c8 100644 --- a/src/views/guidelines/l10n.json +++ b/src/views/guidelines/l10n.json @@ -20,5 +20,8 @@ "guidelines.honestybody2": "Spreading rumors, impersonating other Scratchers or celebrities, or pretending to be seriously ill is not respectful to the Scratch Community.", "guidelines.friendlyheader": "Help keep the site friendly.", "guidelines.friendlybody1": "It’s important to keep your creations and conversations friendly and appropriate for all ages.", - "guidelines.friendlybody2": "If you think something on Scratch is mean, insulting, too violent, or otherwise disruptive to the community, click “Report” to let us know about it. Please use the “Report” button rather than engaging in fights, spreading rumors about other people’s behavior, or otherwise responding to any inappropriate content. The Scratch Team will look at your report and take the appropriate action." + "guidelines.friendlybody2": "If you think something on Scratch is mean, insulting, too violent, or otherwise disruptive to the community, click “Report” to let us know about it. Please use the “Report” button rather than engaging in fights, spreading rumors about other people’s behavior, or otherwise responding to any inappropriate content. The Scratch Team will look at your report and take the appropriate action.", + "guidelines.learnMoreheader": "Want to learn more?", + "guidelines.learnMorebody1": "Download the guide for more details!", + "guidelines.learnMorebody2": "Discover the limitless potential of the Scratch online community with our guides! These valuable resources are designed to help you navigate and thrive as a Scratcher, revealing everything from setting up your profile to connecting with like-minded individuals. Learn how to connect with others, share your unique creations, and find inspiration for your next project." } diff --git a/static/svgs/guidelines/illustration_learn_more.svg b/static/svgs/guidelines/illustration_learn_more.svg new file mode 100644 index 00000000000..bd1a1682b02 --- /dev/null +++ b/static/svgs/guidelines/illustration_learn_more.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + From c27046698a457fa8c7430a35f0798807de4c63f3 Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Fri, 1 Nov 2024 13:10:04 +0200 Subject: [PATCH 03/25] feat: [UEPR-90] Added new section to the ideas page --- src/_colors.scss | 1 + src/views/ideas/ideas.jsx | 467 +++++++++--------- src/views/ideas/ideas.scss | 252 +++++----- src/views/ideas/l10n-static.json | 2 + src/views/ideas/l10n.json | 9 + static/images/ideas/make-board.svg | 1 + static/images/ideas/micro-bit.png | Bin 0 -> 11498 bytes static/images/ideas/see-tutorials-library.png | Bin 0 -> 28598 bytes 8 files changed, 351 insertions(+), 381 deletions(-) create mode 100644 static/images/ideas/make-board.svg create mode 100644 static/images/ideas/micro-bit.png create mode 100644 static/images/ideas/see-tutorials-library.png diff --git a/src/_colors.scss b/src/_colors.scss index ad8b3a9165e..60fdddfaecb 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -59,6 +59,7 @@ $active-dark-gray: hsla(0, 0%, 0%, .2); $box-shadow-gray: hsla(0, 0%, 0%, .25); $box-shadow-light-gray: hsla(0, 0%, 0%, .15); $overlay-gray: hsla(0, 0%, 0%, .75); +$gray-50: hsla(226, 15%, 97%, 1); $transparent-light-blue: rgba(229, 240, 254, 0); /* Typography Colors */ diff --git a/src/views/ideas/ideas.jsx b/src/views/ideas/ideas.jsx index a93579351e5..f1057061d84 100644 --- a/src/views/ideas/ideas.jsx +++ b/src/views/ideas/ideas.jsx @@ -1,284 +1,261 @@ -const bindAll = require('lodash.bindall'); const FormattedMessage = require('react-intl').FormattedMessage; -const injectIntl = require('react-intl').injectIntl; const React = require('react'); const Button = require('../../components/forms/button.jsx'); const FlexRow = require('../../components/flex-row/flex-row.jsx'); -const MasonryGrid = require('../../components/masonrygrid/masonrygrid.jsx'); const TitleBanner = require('../../components/title-banner/title-banner.jsx'); -const TTTModal = require('../../components/modal/ttt/modal.jsx'); -const TTTTile = require('../../components/ttt-tile/ttt-tile.jsx'); const Page = require('../../components/page/www/page.jsx'); -const intlShape = require('../../lib/intl-shape'); const render = require('../../lib/render.jsx'); -const Tiles = require('./ttt.json'); +const {useIntl} = require('react-intl'); require('./ideas.scss'); -class Ideas extends React.Component { - constructor (props) { - super(props); - bindAll(this, [ - 'handleShowTTTModal', - 'handleHideTTTModal', - 'renderTiles' - ]); - this.state = { - currentTile: Tiles[0], - TTTModalOpen: false - }; +const tipsSectionData = [ + { + tipImage: { + altTextId: 'ideas.gettingStartedImageDescription', + imageSrc: '/images/ideas/getting-started-illustration.svg' + }, + button: { + href: '/projects/editor/?tutorial=getStarted', + buttonTextId: 'ideas.gettingStartedButtonText' + } + }, + { + tipImage: { + altTextId: 'ideas.seeTutorialsLibraryImageDescription', + imageSrc: '/images/ideas/see-tutorials-library.png' + }, + button: { + href: '/projects/editor/?tutorial=all', + buttonTextId: 'ideas.seeTutorialsLibraryButtonText' + } + }, + { + tipImage: { + altTextId: 'ideas.starterProjectsImageDescription', + imageSrc: '/images/ideas/starter-projects-illustration.svg' + }, + button: { + href: '/starter_projects', + buttonTextId: 'ideas.starterProjectsButton' + } + }, + { + tipImage: { + altTextId: 'ideas.cardsIllustrationDescription', + imageSrc: '/images/ideas/cards-illustration.svg' + }, + button: { + hrefId: 'cards.scratch-cards-allLink', + buttonImageSrc: '/images/ideas/download-icon.svg', + buttonTextId: 'ideas.codingCards' + } } - handleShowTTTModal (tile) { - // expects translated tile - this.setState({ - currentTile: tile, - TTTModalOpen: true - }); - } - handleHideTTTModal () { - this.setState({ - TTTModalOpen: false - }); - } - renderTiles () { - return Tiles.map((tile, key) => { - const translatedTile = { - tutorialUrl: `/projects/editor/?tutorial=${tile.tutorialUrl}`, - modalImage: tile.modalImage, - modalImageDescription: this.props.intl.formatMessage({id: tile.modalImageDescription}), - description: this.props.intl.formatMessage({id: tile.description}), - guideUrl: this.props.intl.formatMessage({id: tile.guideUrl}), - thumbImage: tile.thumbImage, - thumbImageDescription: this.props.intl.formatMessage({id: tile.thumbImageDescription}), - title: this.props.intl.formatMessage({id: tile.title}), - cardsUrl: this.props.intl.formatMessage({id: tile.cardsUrl}) - }; - return ( - { // eslint-disable-line react/jsx-no-bind - this.handleShowTTTModal(translatedTile); - }} - {...translatedTile} - /> - ); - }); +]; + +const physicalIdeasData = [ + { + physicalIdeasImage: { + imageSrc: '/images/ideas/micro-bit.png', + imageClass: 'micro-bit' + }, + physicalIdeasDescription: { + headerId: 'ideas.microBitHeader', + bodyId: 'ideas.microBitBody', + hrefId: 'cards.microbit-cardsLink', + buttonImageSrc: '/images/ideas/download-icon.svg', + buttonTextId: 'ideas.codingCards' + } + }, + { + physicalIdeasImage: { + imageSrc: '/images/ideas/make-board.svg', + imageClass: 'makey-makey-img' + }, + physicalIdeasDescription: { + headerId: 'ideas.makeyMakeyHeader', + bodyId: 'ideas.makeyMakeyBody', + hrefId: 'cards.makeymakey-cardsLink', + buttonImageSrc: '/images/ideas/download-icon.svg', + buttonTextId: 'ideas.codingCards' + } } - render () { - return ( -
-
- -
- {this.props.intl.formatMessage({id: -

- -

- - - -
- -
-
-
- -
+]; + +const Ideas = () => { + const intl = useIntl(); + + return ( +
+ -
-
-
-
-
-

- -

-

- -

-
- - {this.renderTiles()} - - - - - -
+ +
+
+
+
+
-
- +
-
-
-
-
- -
+
+ +
+ + {physicalIdeasData.map((physicalIdea, index) => ( +
{this.props.intl.formatMessage({id: -
-
- -
+ ))} +
-
-
- -
- +
+
+ +
+ +

+ +

+

+ {chunks}}} /> -

- -

-

- {chunks}}} - /> -

-
-
- +
+
+ +

+ +

+

+ {chunks}, + forum: chunks => {chunks} + }} /> -

- -

-

- {chunks}, - forum: chunks => {chunks} - }} - /> -

-
- -
+

+
+
- ); - } -} - -Ideas.propTypes = { - intl: intlShape +
+ ); }; -const WrappedIdeas = injectIntl(Ideas); - render( - , document.getElementById('app')); + + + , + document.getElementById('app') +); diff --git a/src/views/ideas/ideas.scss b/src/views/ideas/ideas.scss index 317c23d0a62..6486ec1b3cc 100644 --- a/src/views/ideas/ideas.scss +++ b/src/views/ideas/ideas.scss @@ -17,127 +17,133 @@ $base-bg: $ui-white; background: bottom left url("/images/ideas/left-juice.png") no-repeat; } -.ttt-section { - display: flex; - margin: 0 auto; - text-align: center; - justify-content: center; - flex-wrap: wrap; - align-items: center; -} - -.tips-divider { - border-top: 1px solid $ui-gray; - width: 100%; -} - -.tips-banner-image { - max-width: calc(100% - 2rem); -} - -.banner-button { - background-color: $ui-white; - color: $ui-aqua; - font-size: 1rem; - - img { - margin-right: 1rem; - height: 1.5rem; - vertical-align: middle; - } - - a { - color: $ui-white; - } - - span { - vertical-align: middle; +.tips { + .inner { + display: flex; + flex-direction: column; + gap: 0.75rem; + + .tips-section { + display: flex; + justify-content: space-between; + + .tip { + display: flex; + flex-direction: column; + + .tips-img { + width: $cols3; + height: 10rem; + } + } + } } } -.ideas-button { - margin-right: .75rem; - background-color: $ui-purple-dark; - color: $ui-white; - font-size: 1rem; +.physical-ideas { + .inner { + display: flex; + flex-direction: column; + gap: 1.5rem; - img { - margin-right: 1rem; - height: 1.5rem; - vertical-align: middle; - } + .physical-ideas-section { + justify-content: space-between; + align-items: flex-start; + gap: 1.5rem; + + .physical-idea { + display: flex; + flex-direction: row; + gap: 1.5rem; + text-align: start; + + .makey-makey-img { + height: 6.5rem; + } + + .micro-bit { + height: 8.5rem; + } + + .physical-idea-description { + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: flex-start; + + p { + margin: 0; + font-size: 1rem; + font-weight: 400; + line-height: 1.5rem; + } + + .tips-button { + width: auto; + padding: 0.75rem; + } + } + } - a { - color: $ui-white; - } + .physical-idea:first-child { + flex: 1.5; + } - span { - vertical-align: middle; + .physical-idea:last-child { + flex: 2; + } + } } } -.wide-button { - width: 100%; -} - -.ideas-all-cards { - padding: 5rem 0 !important; -} - -.ideas-starter { - padding: 5rem 0 !important; -} - -.tips-getting-started { - background-color: $ui-light-gray; - padding-top: 2.5rem; +.tips, .physical-ideas { + display: flex; + justify-content: center; + padding: 3rem 0; + background-color: $gray-50; } -.tips-left { - justify-content: flex-start; -} +.gray-area { + background-color: $ui-gray; -.ideas-image { - margin-right: 2rem; -} + .tips-info-section { + padding: 2.5rem 0; + width: 100%; + flex-wrap: nowrap; -.tips-activity-guides { - background-color: $ui-light-gray; - padding-bottom: 2rem; -} + .tips-info-body { + text-align: left; + } + } -.purchase-button { - img { - margin-right: 0; - margin-left: .75rem; - width: 1rem; - vertical-align: baseline; + img.tips-icon { + height: 1.75rem; } } -.tips-info-section { - padding: 2.5rem 0; - width: 100%; - flex-wrap: nowrap; +.section-header { + font-size: 2rem; + font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; + font-weight: 700; } -.tips-info-body { - text-align: left; -} +.tips-button { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + gap: 0.5rem; + + font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; + font-weight: 700; + line-height: 1.25rem; -.tips-cards-buttons { - a { - white-space: normal; - } -} + width: 100%; + padding: 0.5rem 0; -.gray-area { - background-color: $ui-gray; + border-radius: 4px; } -img.tips-icon { - height: 1.75rem; -} //4 columns @media #{$small} { @@ -151,14 +157,7 @@ img.tips-icon { } } - .ttt-head { - - p { - max-width: $cols4; - } - } - - //put the image first if in 4-column + // put the image first if in 4-column .tips-info-body { max-width: $cols4; text-align: center; @@ -187,19 +186,6 @@ img.tips-icon { } } - .ttt-head { - p { - max-width: $cols6; - } - } - - .tips-info-body.tips-illustration { - order: -1; - img { - width: $cols4; - } - } - .tips-info-body { max-width: $cols4; text-align: center; @@ -219,21 +205,21 @@ img.tips-icon { } } - .ttt-head { - p { - max-width: $cols6; - } + .tips-info-body { + max-width: $cols4; } +} - .tips-info-section { - &.mod-align-top { - align-items: flex-start; +@media #{$intermediate-and-smaller}{ + .physical-ideas { + .inner { + .physical-ideas-section { + .physical-idea:first-child { + flex: 2; + } + } } } - - .tips-info-body { - max-width: $cols4; - } } // 12 columns @@ -248,12 +234,6 @@ img.tips-icon { } } - .ttt-head { - p { - max-width: $cols8; - } - } - .tips-info-section { &.mod-align-top { align-items: flex-start; diff --git a/src/views/ideas/l10n-static.json b/src/views/ideas/l10n-static.json index afbec418ad4..2073ceeffd0 100644 --- a/src/views/ideas/l10n-static.json +++ b/src/views/ideas/l10n-static.json @@ -2,6 +2,8 @@ "cards.scratch-cards-allLink": "https://resources.scratch.mit.edu/www/cards/en/scratch-cards-all.pdf", "cards.name-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/name-cards.pdf", "cards.animation-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/animation-cards.pdf", + "cards.microbit-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/microbit-cards.pdf", + "cards.makeymakey-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/makeymakey-cards.pdf", "cards.music-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/music-cards.pdf", "cards.story-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/story-cards.pdf", "cards.chase-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/chase-cards.pdf", diff --git a/src/views/ideas/l10n.json b/src/views/ideas/l10n.json index e105c1dfbaa..af9a4588993 100644 --- a/src/views/ideas/l10n.json +++ b/src/views/ideas/l10n.json @@ -4,7 +4,11 @@ "ideas.headerButtonMessage": "Choose a tutorial", "ideas.gettingStartedTitle": "Getting Started", "ideas.gettingStartedText": "New to Scratch? Try the Getting Started tutorial.", + "ideas.startHereText": "New to Scratch? Stay here!", + "ideas.gettingStartedButtonText": "Try Getting Started Tutorial", + "ideas.seeTutorialsLibraryButtonText": "See Tutorials Library", "ideas.gettingStartedImageDescription": "An illustrated boy plants his flag on top of a freshly painted mountaintop.", + "ideas.seeTutorialsLibraryImageDescription": "An illustration of three tutorial thumbnails.", "ideas.tryIt": "Try it!", "ideas.activityGuidesTitle": "Activity Guides", "ideas.activityGuidesText": "What do you want to make with Scratch? For each activity, you can try the Tutorial, download a set of Coding Cards, or view the Educator Guide.", @@ -37,6 +41,11 @@ "ideas.tryTheTutorial": "Try the tutorial", "ideas.codingCards": "Coding Cards", "ideas.educatorGuide": "Educator Guide", + "ideas.physicalPlayIdeas": "Physical Play Ideas", + "ideas.microBitHeader": "Have a micro:bit?", + "ideas.microBitBody": "Connect your Scratch project to the real world.", + "ideas.makeyMakeyHeader": "Have a MakeyMakey?", + "ideas.makeyMakeyBody": "Turn anything into a key that connects with your Scratch project!", "ideas.desktopEditorHeader": "Scratch App Download", "ideas.desktopEditorBody": "To create projects without an Internet connection, you can download the Scratch app.", "ideas.desktopEditorBodyHTML": "To create projects without an Internet connection, you can download the Scratch app.", diff --git a/static/images/ideas/make-board.svg b/static/images/ideas/make-board.svg new file mode 100644 index 00000000000..e68defc2540 --- /dev/null +++ b/static/images/ideas/make-board.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/images/ideas/micro-bit.png b/static/images/ideas/micro-bit.png new file mode 100644 index 0000000000000000000000000000000000000000..2c9fd4ec55db97041b813664222315ba253c5013 GIT binary patch literal 11498 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 aUNUj@Fzj*+m4VC4AbDvOaHXVi@c#ii7Ivrr literal 0 HcmV?d00001 diff --git a/static/images/ideas/see-tutorials-library.png b/static/images/ideas/see-tutorials-library.png new file mode 100644 index 0000000000000000000000000000000000000000..5628415aeafdc64323d4a47b93a62c18d5515547 GIT binary patch literal 28598 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 N002ovPDHLkV1n%*n@a!y literal 0 HcmV?d00001 From de60f74248c0532a0ec008a0adebbf1936a3b564 Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Tue, 5 Nov 2024 16:47:17 +0200 Subject: [PATCH 04/25] refactor: [UEPR-67] Changed title text --- src/views/guidelines/guidelines.jsx | 4 ++-- src/views/guidelines/l10n.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx index 1cc5eb690ce..d6395ff1f38 100644 --- a/src/views/guidelines/guidelines.jsx +++ b/src/views/guidelines/guidelines.jsx @@ -31,8 +31,8 @@ const pageSections = [ id: 'helpful', headerTextId: 'guidelines.helpfulheader', contentTexts: [ - {id: 'guidelines.privacybody1'}, - {id: 'guidelines.privacybody2'} + {id: 'guidelines.helpfulbody1'}, + {id: 'guidelines.helpfulbody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_feedback.svg', buttonImgSrc: '/svgs/guidelines/blobmagenta_feedback.svg' diff --git a/src/views/guidelines/l10n.json b/src/views/guidelines/l10n.json index 97cea2103c8..ca8b703ad6e 100644 --- a/src/views/guidelines/l10n.json +++ b/src/views/guidelines/l10n.json @@ -1,5 +1,5 @@ { - "guidelines.title": "Scratch Community Guidelines", + "guidelines.title": "The Purpose of Scratch Community", "guidelines.header1": "Scratch is a friendly and welcoming community for everyone, where people create, share, and learn together.", "guidelines.header2": "We welcome people of all ages, races, ethnicities, religions, abilities, sexual orientations, and gender identities.", "guidelines.header3": "Help keep Scratch a welcoming, supportive, and creative space for all by following these Community Guidelines:", From 6eda19637e6ed35423c04354dead7af40d2e21ad Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Thu, 7 Nov 2024 14:09:24 +0200 Subject: [PATCH 05/25] feat: [UEPR-67] Added alternative texts for images on guidelines page --- src/views/guidelines/guidelines.jsx | 148 ++++++++++++++++------------ src/views/guidelines/l10n.json | 15 ++- 2 files changed, 100 insertions(+), 63 deletions(-) diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx index d6395ff1f38..c76c0934e0f 100644 --- a/src/views/guidelines/guidelines.jsx +++ b/src/views/guidelines/guidelines.jsx @@ -3,6 +3,7 @@ const React = require('react'); const Page = require('../../components/page/www/page.jsx'); const render = require('../../lib/render.jsx'); +const {useIntl} = require('react-intl'); require('./guidelines.scss'); @@ -15,7 +16,9 @@ const pageSections = [ {id: 'guidelines.respectbody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_respect.svg', - buttonImgSrc: '/svgs/guidelines/blobblue_respect.svg' + sectionImgAltTextId: 'guidelines.respectSectionImageDescription', + buttonImgSrc: '/svgs/guidelines/blobblue_respect.svg', + buttonImgAltTextId: 'guidelines.respectButtonImageDescription' }, { id: 'privacy', @@ -25,7 +28,9 @@ const pageSections = [ {id: 'guidelines.privacybody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_safe.svg', - buttonImgSrc: '/svgs/guidelines/blobyellow_safe.svg' + sectionImgAltTextId: 'guidelines.privacySectionImageDescription', + buttonImgSrc: '/svgs/guidelines/blobyellow_safe.svg', + buttonImgAltTextId: 'guidelines.privacyButtonImageDescription' }, { id: 'helpful', @@ -35,7 +40,9 @@ const pageSections = [ {id: 'guidelines.helpfulbody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_feedback.svg', - buttonImgSrc: '/svgs/guidelines/blobmagenta_feedback.svg' + sectionImgAltTextId: 'guidelines.helpfulSectionImageDescription', + buttonImgSrc: '/svgs/guidelines/blobmagenta_feedback.svg', + buttonImgAltTextId: 'guidelines.helpfulButtonImageDescription' }, { id: 'remix', @@ -45,7 +52,9 @@ const pageSections = [ {id: 'guidelines.remixbody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_remix.svg', - buttonImgSrc: '/svgs/guidelines/blobgreen_remix.svg' + sectionImgAltTextId: 'guidelines.remixSectionImageDescription', + buttonImgSrc: '/svgs/guidelines/blobgreen_remix.svg', + buttonImgAltTextId: 'guidelines.remixButtonImageDescription' }, { id: 'honesty', @@ -55,7 +64,9 @@ const pageSections = [ {id: 'guidelines.honestybody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_honest.svg', - buttonImgSrc: '/svgs/guidelines/blobpurple_honest.svg' + sectionImgAltTextId: 'guidelines.honestySectionImageDescription', + buttonImgSrc: '/svgs/guidelines/blobpurple_honest.svg', + buttonImgAltTextId: 'guidelines.honestyButtonImageDescription' }, { id: 'friendly', @@ -65,7 +76,9 @@ const pageSections = [ {id: 'guidelines.friendlybody2'} ], sectionImgSrc: '/svgs/guidelines/illustration_friendly.svg', - buttonImgSrc: '/svgs/guidelines/blobpink_friendly.svg' + sectionImgAltTextId: 'guidelines.friendlySectionImageDescription', + buttonImgSrc: '/svgs/guidelines/blobpink_friendly.svg', + buttonImgAltTextId: 'guidelines.friendlyButtonImageDescription' }, { id: 'learn-more', @@ -83,69 +96,80 @@ const pageSections = [ }, {id: 'guidelines.learnMorebody2'} ], - sectionImgSrc: '/svgs/guidelines/illustration_learn_more.svg' + sectionImgSrc: '/svgs/guidelines/illustration_learn_more.svg', + sectionImgAltTextId: 'guidelines.learnMoreSectionImageDescription' } ]; -const Guidelines = () => ( -
-
-
- -
-
- -
-
- -
-
-
-
- -
-
- {pageSections - .filter(guide => guide.buttonImgSrc) - .map(({id, headerTextId, buttonImgSrc}) => ( - { + const intl = useIntl(); + + return ( +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ {pageSections + .filter(guide => guide.buttonImgSrc) + .map(({id, headerTextId, buttonImgSrc, buttonImgAltTextId}) => ( + + {intl.formatMessage({id: + + + ))} +
+
+
+ {pageSections.map( + ({id, headerTextId, contentTexts, sectionImgSrc, sectionImgAltTextId}, index) => ( +
- - - - ))} -
-
-
- {pageSections.map( - ({id, headerTextId, contentTexts, sectionImgSrc}, index) => ( -
-
-
- +
+
+ +
+

+ +

+

+ +

-

- -

-

- -

+ {intl.formatMessage({id:
- -
- ) - )} -
-
-); + ) + )} + +
+ ); +}; render( diff --git a/src/views/guidelines/l10n.json b/src/views/guidelines/l10n.json index ca8b703ad6e..4764f3ce8b2 100644 --- a/src/views/guidelines/l10n.json +++ b/src/views/guidelines/l10n.json @@ -23,5 +23,18 @@ "guidelines.friendlybody2": "If you think something on Scratch is mean, insulting, too violent, or otherwise disruptive to the community, click “Report” to let us know about it. Please use the “Report” button rather than engaging in fights, spreading rumors about other people’s behavior, or otherwise responding to any inappropriate content. The Scratch Team will look at your report and take the appropriate action.", "guidelines.learnMoreheader": "Want to learn more?", "guidelines.learnMorebody1": "Download the guide for more details!", - "guidelines.learnMorebody2": "Discover the limitless potential of the Scratch online community with our guides! These valuable resources are designed to help you navigate and thrive as a Scratcher, revealing everything from setting up your profile to connecting with like-minded individuals. Learn how to connect with others, share your unique creations, and find inspiration for your next project." + "guidelines.learnMorebody2": "Discover the limitless potential of the Scratch online community with our guides! These valuable resources are designed to help you navigate and thrive as a Scratcher, revealing everything from setting up your profile to connecting with like-minded individuals. Learn how to connect with others, share your unique creations, and find inspiration for your next project.", + "guidelines.respectButtonImageDescription": "A blue circle", + "guidelines.privacyButtonImageDescription": "A yellow circle", + "guidelines.helpfulButtonImageDescription": "A magenta circle", + "guidelines.remixButtonImageDescription": "A green circle", + "guidelines.honestyButtonImageDescription": "A purple circle", + "guidelines.friendlyButtonImageDescription": "A pink circle", + "guidelines.respectSectionImageDescription": "A graphic of two hands grasping each other in a handshake, with a pink heart above them.", + "guidelines.privacySectionImageDescription": "A graphic of a blue combination lock lock on a yellow background. Inside the lock is the shape of a head with a question mark printed on the face.", + "guidelines.helpfulSectionImageDescription": "A graphic of a piece of paper on top of a pink background. On the paper, there is a Scratch project with a white cat on a blue background. A pink pen with a heart on the cap is drawing a heart and a pencil is writing a comment.", + "guidelines.remixSectionImageDescription": "A graphic of the Scratch \"remix\" swirl on a green background. Two hands move orange, blue, and purple Scratch blocks around. A paintbrush paints a green streak.", + "guidelines.honestySectionImageDescription": "A graphic of a light blue compass on a purple background. There is a pink heart in the \"North\" position.", + "guidelines.friendlySectionImageDescription": "A graphic of 5 hands with different skin tones using their pointer and middle fingers to create a star on a pink background with a pink star and yellow star in the center.", + "guidelines.learnMoreSectionImageDescription": "A graphic of a box with a green arrow pointing inside of it with stars in the background." } From 05f053fd2cbbb6856b4992693961aa3750ba0570 Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Thu, 14 Nov 2024 10:24:45 +0200 Subject: [PATCH 06/25] refactor: [UEPR-67] removed top border --- src/views/guidelines/guidelines.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/guidelines/guidelines.scss b/src/views/guidelines/guidelines.scss index f6906334de7..6012cb20edf 100644 --- a/src/views/guidelines/guidelines.scss +++ b/src/views/guidelines/guidelines.scss @@ -15,8 +15,7 @@ background-image: url('/svgs/guidelines/header_sprinkles_left.svg'), url('/svgs/guidelines/header_sprinkles_right.svg'); background-position: left, right; background-repeat: no-repeat; - - border-top: 50px solid $ui-blue; + padding: 6.25rem 0; div { From 94984d7d59fec40831fe83829487d8a12ffd105e Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Thu, 14 Nov 2024 11:39:01 +0200 Subject: [PATCH 07/25] chore: [UEPR-90] Removed unused texts --- src/views/ideas/ideas.scss | 2 -- src/views/ideas/l10n.json | 27 +-------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/views/ideas/ideas.scss b/src/views/ideas/ideas.scss index 6486ec1b3cc..5b184468d93 100644 --- a/src/views/ideas/ideas.scss +++ b/src/views/ideas/ideas.scss @@ -53,7 +53,6 @@ $base-bg: $ui-white; .physical-idea { display: flex; - flex-direction: row; gap: 1.5rem; text-align: start; @@ -129,7 +128,6 @@ $base-bg: $ui-white; .tips-button { display: flex; - flex-direction: row; justify-content: center; align-items: center; gap: 0.5rem; diff --git a/src/views/ideas/l10n.json b/src/views/ideas/l10n.json index af9a4588993..53a4faffa24 100644 --- a/src/views/ideas/l10n.json +++ b/src/views/ideas/l10n.json @@ -2,16 +2,11 @@ "ideas.headerMessage": "What will you create?", "ideas.headerImageDescription": "Outlandish creations from pixelated unicorns to drumbeat waveforms to levitating tacos to buckets of rainbows.", "ideas.headerButtonMessage": "Choose a tutorial", - "ideas.gettingStartedTitle": "Getting Started", - "ideas.gettingStartedText": "New to Scratch? Try the Getting Started tutorial.", "ideas.startHereText": "New to Scratch? Stay here!", "ideas.gettingStartedButtonText": "Try Getting Started Tutorial", "ideas.seeTutorialsLibraryButtonText": "See Tutorials Library", "ideas.gettingStartedImageDescription": "An illustrated boy plants his flag on top of a freshly painted mountaintop.", "ideas.seeTutorialsLibraryImageDescription": "An illustration of three tutorial thumbnails.", - "ideas.tryIt": "Try it!", - "ideas.activityGuidesTitle": "Activity Guides", - "ideas.activityGuidesText": "What do you want to make with Scratch? For each activity, you can try the Tutorial, download a set of Coding Cards, or view the Educator Guide.", "ideas.animateANameTitle": "Animate a Name", "ideas.animateANameDescription": "Animate the letters of your name, initials, or favorite word.", "ideas.animateANameImageDescription": "The name ANYA in all caps and blocked letters is poised to wiggle", @@ -30,12 +25,7 @@ "ideas.videoSensingTitle": "Video Sensing", "ideas.videoSensingDescription": "Interact with a project using the Video Sensing extension.", "ideas.videoSensingImageDescription": "A virtual hand dodges a spurt of flame in an attempt to pet a dragon.", - "ideas.seeAllTutorials": "See All Tutorials", - "ideas.cardsTitle": "Get the Entire Collection of Coding Cards", - "ideas.cardsText": "With the Scratch Coding Cards, you can learn to create interactive games, stories, music, animations, and more!", "ideas.cardsIllustrationDescription": "An assortment of fun, animated characters and objects leap out of a stack of cards.", - "ideas.starterProjectsTitle": "Starter Projects", - "ideas.starterProjectsText": "You can play with Starter Projects and remix them to make your own creations.", "ideas.starterProjectsImageDescription": "An illustration of the Scratch Code Editor.", "ideas.starterProjectsButton": "Explore Starter Projects", "ideas.tryTheTutorial": "Try the tutorial", @@ -47,31 +37,16 @@ "ideas.makeyMakeyHeader": "Have a MakeyMakey?", "ideas.makeyMakeyBody": "Turn anything into a key that connects with your Scratch project!", "ideas.desktopEditorHeader": "Scratch App Download", - "ideas.desktopEditorBody": "To create projects without an Internet connection, you can download the Scratch app.", "ideas.desktopEditorBodyHTML": "To create projects without an Internet connection, you can download the Scratch app.", "ideas.questionsHeader": "Questions", - "ideas.questionsBody": "Have more questions? See the Frequently Asked Questions or visit the Help with Scripts Forum.", "ideas.questionsBodyHTML": "Have more questions? See the Frequently Asked Questions or visit the Help with Scripts Forum.", - "ideas.cardsPurchase": "Purchase Printed Set", "ideas.MakeItFlyTitle": "Make It Fly", "ideas.MakeItFlyDescription": "Choose any character and make it fly!", "ideas.MakeItFlyImageDescription": "The scratch cat flies over the skyline. Alongside a flying taco.", - "ideas.RaceTitle": "Race to the Finish", - "ideas.RaceDescription": "Make a game where two characters race each other.", - "ideas.HideAndSeekTitle": "Hide and Seek", - "ideas.HideAndSeekDescription": "Make a hide-and-seek game with characters that appear and disappear.", - "ideas.FashionTitle": "Fashion Game", - "ideas.FashionDescription": "Make a game where you dress a character with different clothes and styles.", "ideas.PongTitle": "Pong Game", "ideas.PongDescription": "Make a bouncing ball game with sounds, points, and other effects.", "ideas.PongImageDescription": "A ball bounces off a digital paddle.", "ideas.ImagineTitle": "Imagine a World", "ideas.ImagineDescription": "Imagine a world where anything is possible.", - "ideas.ImagineImageDescription": "A girl stands proudly in front of a thought bubble as big as the Earth and as intricate as butterfly wings.", - "ideas.DanceTitle": "Let's Dance", - "ideas.DanceDescription": "Design an animated dance scene with music and dance moves.", - "ideas.CatchTitle": "Catch Game", - "ideas.CatchDescription": "Make a game where you catch things falling from the sky.", - "ideas.VirtualPetTitle": "Virtual Pet", - "ideas.VirtualPetDescription": "Create an interactive pet that can eat, drink, and play." + "ideas.ImagineImageDescription": "A girl stands proudly in front of a thought bubble as big as the Earth and as intricate as butterfly wings." } From 226780c0892fcabe63ff48676fba87d7756ac8dd Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Mon, 18 Nov 2024 10:31:23 +0200 Subject: [PATCH 08/25] feat: [UEPR-48] redesign welcome section --- src/_colors.scss | 4 + src/components/welcome/welcome.jsx | 78 +++++++-------- src/components/welcome/welcome.scss | 102 +++++++------------- src/views/splash/l10n.json | 6 +- src/views/splash/presentation.jsx | 6 +- src/views/splash/splash.scss | 5 + static/images/create_a_project.svg | 46 +++++++++ static/images/explore_starter_projects.svg | 35 +++++++ static/images/learn_about_the_community.svg | 37 +++++++ static/images/welcome-connect.png | Bin 16577 -> 0 bytes static/images/welcome-learn.png | Bin 4497 -> 0 bytes static/images/welcome-try.png | Bin 26671 -> 0 bytes 12 files changed, 203 insertions(+), 116 deletions(-) create mode 100644 static/images/create_a_project.svg create mode 100644 static/images/explore_starter_projects.svg create mode 100644 static/images/learn_about_the_community.svg delete mode 100644 static/images/welcome-connect.png delete mode 100644 static/images/welcome-learn.png delete mode 100644 static/images/welcome-try.png diff --git a/src/_colors.scss b/src/_colors.scss index ad8b3a9165e..253753914a7 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -25,6 +25,9 @@ $background-color: hsla(0, 0%, 99%, 1); //#FDFDFD $motion-blue-3: hsla(215, 60%, 50%, 1);//#3373CC +$ui-light-blue: hsla(195, 63%, 86%, 1); +$ui-cyan-blue: hsla(194, 73%, 36%, 1); + /* UI Secondary Colors */ /* 3.0 colors */ /* Using www naming convention for now, should be consistent with gui */ @@ -48,6 +51,7 @@ $ui-light-primary: hsl(215, 100%, 95%); $ui-light-primary-transparent: hsla(215, 100%, 95%, 0); $ui-border: hsla(0, 0%, 85%, 1); //#D9D9D9 +$ui-border-light-blue: hsla(215, 50%, 90%, 1); //##D9E3F2 /* modals */ $ui-mint-green: hsl(163, 69%, 44%); diff --git a/src/components/welcome/welcome.jsx b/src/components/welcome/welcome.jsx index 1606a229c23..fcb8f1f6c04 100644 --- a/src/components/welcome/welcome.jsx +++ b/src/components/welcome/welcome.jsx @@ -18,54 +18,42 @@ const Welcome = props => ( moreTitle="x" title={props.messages['welcome.welcomeToScratch']} > -
-

- - {props.messages['welcome.learn']} - -

+ - - @@ -75,9 +63,9 @@ const Welcome = props => ( Welcome.propTypes = { messages: PropTypes.shape({ 'welcome.welcomeToScratch': PropTypes.string, - 'welcome.learn': PropTypes.string, - 'welcome.tryOut': PropTypes.string, - 'welcome.connect': PropTypes.string + 'welcome.explore': PropTypes.string, + 'welcome.community': PropTypes.string, + 'welcome.create': PropTypes.string }), onDismiss: PropTypes.func, permissions: PropTypes.object, @@ -87,9 +75,9 @@ Welcome.propTypes = { Welcome.defaultProps = { messages: { 'welcome.welcomeToScratch': 'Welcome to Scratch!', - 'welcome.learn': 'Learn how to make a project in Scratch', - 'welcome.tryOut': 'Try out starter projects', - 'welcome.connect': 'Connect with other Scratchers' + 'welcome.explore': 'Explore Starter Projects', + 'welcome.community': 'Learn about the community', + 'welcome.create': 'Create a Project' } }; diff --git a/src/components/welcome/welcome.scss b/src/components/welcome/welcome.scss index 23065338205..15c358d1062 100644 --- a/src/components/welcome/welcome.scss +++ b/src/components/welcome/welcome.scss @@ -2,76 +2,48 @@ .welcome { .box-content { - padding: 0; - } - - .welcome-col { - display: inline-block; - margin: 10px 15px; - width: 150px; - height: 253px; - - h4 { - margin-top: 12px; - padding: 0; - font-weight: 200; - } - - > a { - display: block; - margin-top: 20px; - margin-bottom: 35px; - height: 100px; - } + display: flex ; + flex-direction: column; + justify-content: center; + align-items: center; + flex: 1 1 100%; - $color-bars: "h4:before, > a:after"; + padding: 0; - #{$color-bars} { - display: block; - margin: 10px 0; - border-radius: 5px; + .welcome-banner { width: 100%; - height: 10px; - content: ""; - } - - img { - display: block; - max-width: 133px; - max-height: 100px; - } - - &.blue { - #{$color-bars} { - background-color: $ui-blue; - } - - a { - color: $ui-blue; - } - - img { - margin-left: 4px; - } - } - - &.green { - #{$color-bars} { - background-color: $ui-aqua; - } - - a { - color: $ui-aqua; - } + font-size: 0.875rem; + font-weight: 500; + line-height: 1.125rem; + text-align: center; + color: $ui-cyan-blue; + background-color: $ui-light-blue; + padding: 0.625rem 0; } - &.pink { - #{$color-bars} { - background-color: $ui-purple; - } - - a { - color: $ui-purple; + .welcome-options { + display: flex; + justify-content: center; + align-items: center; + gap: 1rem; + flex-wrap: wrap; + + padding: 1.5rem 0; + + .welcome-option-button { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 1rem; + + width: 10rem; + height: 13rem; + + border: 1px solid $ui-border-light-blue; + border-radius: 20px; + + text-align: center; } } } diff --git a/src/views/splash/l10n.json b/src/views/splash/l10n.json index 79bc1e3bcb5..bd897708a78 100644 --- a/src/views/splash/l10n.json +++ b/src/views/splash/l10n.json @@ -51,9 +51,9 @@ "hocbanner.animateACharacter": "Animate a Character", "welcome.welcomeToScratch": "Welcome to Scratch!", - "welcome.learn": "Learn how to make a project in Scratch", - "welcome.tryOut": "Try out starter projects", - "welcome.connect": "Connect with other Scratchers", + "welcome.explore": "Explore Starter Projects", + "welcome.community": "Learn about the community", + "welcome.create": "Create a Project", "activity.seeUpdates": "This is where you will see updates from Scratchers you follow", "activity.checkOutScratchers": "Check out some Scratchers you might like to follow", diff --git a/src/views/splash/presentation.jsx b/src/views/splash/presentation.jsx index 90296fe9190..a1bb9af6085 100644 --- a/src/views/splash/presentation.jsx +++ b/src/views/splash/presentation.jsx @@ -335,9 +335,9 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/ 'general.viewAll': formatMessage({id: 'general.viewAll'}), 'news.scratchNews': formatMessage({id: 'news.scratchNews'}), 'welcome.welcomeToScratch': formatMessage({id: 'welcome.welcomeToScratch'}), - 'welcome.learn': formatMessage({id: 'welcome.learn'}), - 'welcome.tryOut': formatMessage({id: 'welcome.tryOut'}), - 'welcome.connect': formatMessage({id: 'welcome.connect'}), + 'welcome.explore': formatMessage({id: 'welcome.explore'}), + 'welcome.community': formatMessage({id: 'welcome.community'}), + 'welcome.create': formatMessage({id: 'welcome.create'}), 'intro.aboutScratch': formatMessage({id: 'intro.aboutScratch'}), 'intro.forEducators': formatMessage({id: 'intro.forEducators'}), 'intro.forParents': formatMessage({id: 'intro.forParents'}), diff --git a/src/views/splash/splash.scss b/src/views/splash/splash.scss index 647258bd13e..89a54e82799 100644 --- a/src/views/splash/splash.scss +++ b/src/views/splash/splash.scss @@ -33,6 +33,11 @@ } } + .box.welcome { + display: flex; + flex-direction: column; + } + .news { width: 40%; diff --git a/static/images/create_a_project.svg b/static/images/create_a_project.svg new file mode 100644 index 00000000000..737df13ae67 --- /dev/null +++ b/static/images/create_a_project.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/explore_starter_projects.svg b/static/images/explore_starter_projects.svg new file mode 100644 index 00000000000..0fee9d26746 --- /dev/null +++ b/static/images/explore_starter_projects.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/learn_about_the_community.svg b/static/images/learn_about_the_community.svg new file mode 100644 index 00000000000..7a230cd87bc --- /dev/null +++ b/static/images/learn_about_the_community.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/welcome-connect.png b/static/images/welcome-connect.png deleted file mode 100644 index 2ff63822d5aaa025f5d1619ffddaae8e410f3907..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16577 zcmaL9W0WRAvo6|r+s3q}J#E{z?Vh&zwr$&(wr$(CZBE0cT0?=*%6`*)p8-I4!SU^|IwI4J{7om>qZ zOh5#Ufrci8k~RirCQ2p-#_slGCOjY@;KUXx8crIrGF(PL8#;skVCdXz?EYzkfbj6U z*%=sFnK%&|nwVMG@)BQn^biwT81oXVv&u5a+6kMOTS#~~m?(S5sTg@!8F3mD^Yan% zxN-d>urYBmAat{_wsquk<0bwtUao)j|JUPybg4Hg^Aq*4FWVH`Bicqjxi~qi3XJ_)kdx4V0Dr|A*Sx z{2#QVlak5*_4ogi*ipsZ&V*jc#1ZK1VDzu!On?2ylpU9_gNcC?&_M+VwEpi_R4@lR z0UgbOc7(#ptc0=#Mi#dJk^c)XE6XKm>*!=)Yh)rR!b|**fzHChn2UphgGGpqNraP) zft8U_l!-%xoq>~sfq_L#R7_AvPTd*K@k<8IgE`sa45G3ZiQspibDPR4w2DkwAR}OY*;jyKn8j z?;6|9njJ#L!*+L3Xps6ldN5aH%>-jjpF&>gwtzC@_kUBV*I;RyzYh17F5Ir%#+@ z6AZ$}^s_y>@YVr?6p}LSg?vwUC)D>ny#CDS?QFpcq~|B zNPYYusq5Qe4#->Np@q2IKUi>t_Uz;03YsEZMG)Ic35sd4_kx(c6n+a7a>NwXxx~_2 zM12ewzU@V7K5vvG^*XZtW2-)mPrsI2ILVCb$2fmjcrqi3arKifH4nE=7%`u??9!yu z<#NH3__%NMqL*lLRUt`4r2Bq8c5OnpG2{}z2tm(?GtA4L^l56I1_1(sKt;l~?+L>*!a@qzq$Wbt%3>lW0w|4eSkU1E@o!V?dQLrG z+8aH`elPd&4F%Twud+Gt(-f`6-(eoW^E(?oT5NmOcxEf*$9N!>3qQ{*WXJTw)s^$5 z;K~o2i(Y*9qLW(2=G&46D4Xm%lf=1^}oUf?GFGYy& zrP+E*5#taYsKn`{=$c&2kYDGxBG+ZVNOt^Vk-dY!414rw zrf^fe5vcd&0ty_o)nC=?cPU(MahSn6P2!x{&m#khF|X}jm>&jFl5YKdvCqJMMxH*# z&R%C7g`}ZsJdG)g-7VPh+~T49k3CHFDe{pisdihP{@BsM(x^OF1i23jaR_3#2)~iG zkl~nopHnlR>ffM!bcyziomghCfD)uvn=eE;01V8YNYLfFn_ccSaA?D?hqB_*TR`Me zL^Wsi?M&b`qO9jRx;1V2#1(H<4?kH0Z~y_~JFlH8z(9Ex;)aaXJ11x2TsHu>cM8I(2{j0uG5BSaO3 zAp9;sQ3<;4I!-xy=66N#{dCo~+G~ldo>)p_R7_BS4-XyuJhJ&Nqean_Q@UVQ!K^3R z!@#cIPAE4IonGz-HS8-Ga|>nucs(RKoqjk_CD$%NkJBUAR^=fSr`2}_rf6&9$S*FV zBT}0FSs2_EqT%|E7r~EiNyHMEqw`|`8wdc6AqJHL5d^eKO*vZAkXbIl;)4uaAZjan z|KtHp)IhF`r}?zYhiYN~_EKmZVf2tM?6+2%SCZpYJ~mC^GdTRt@qbN02hw!bx_Py) zAx;fUheQkw6rV|~6CemB)H}UAXb{g~ImwSwr>k->*^m1;r2;ACT~df&J*i#x-+6NN zOdSQ>)44GbJnn{c7RZgw%&_1+m{2A4DR?k#Y+)(A3HpqKt0njWsA&dA9FF7FAo>wa zku-V-qiRWPouXheIQ;ps<2t$a=T(%6WYM;^mB4f8uV((Wn!@j@7Cu-QtA38%A@OU^ zr@$quXkB#A?z&A2fN}hYF(PatAw{XcPv86eQ=F{h33_%`cK5vL2JA3$g0@Ejg6cKj zS~XelfTV1f>Rs}V}I^+YswK$Kx$M0^dDv&|}Vyf5m?6n&dYkR@nXI5PP zRTYSzQb|EIv6mPSpl8%_yZoCy{+RykI3c_cI6rZRu(B≫$_n5asBxl9kC6TWekx*-qU;AHLum%YY2vqO*RVbjZXuAO2Izr5`^xR{Gbz~C=WG)P6)YM(FuIi zs5O~L$#M;|GEX$L*F^4M8;xk3L!Pe3(~2YnU-e2cK8WXi|9)KN9&`D7Bbm4w)Oz#A z4KaDxn5L(B>(k*LmBciz-r*`?VWA|(HQ}F`J^5}`L#tk9ku7T;H+m4eot>2mNdW3l zTYt9>a}cuaKJrmnX}nspc@;KR>iyD};RNYyWaMciZFrm{$iB%nQoK~^y#AIr1tyhi z*&tWZaXSpLRr5W31=Jeo#ttsBOcD`E`w>?MA-XMLXQktw(8tmMJe`Xf7Ou85Z)KqkS;ap_8P;Z+>~&J$RM}@= z&#B*HBpi8Bv7Ga97?^_4AzV-V46B_Al3rmYw({jY0wm!7*b5B_0JHM&h_x(my`Po} zcP#vY!=Y{UYf=9PcCdo8G-K^qLo8OyjI|1=rpka6<`J7(^2(AaBpOpKHz>hK-k=g! z2-I(SZ=n=Xn7TD<^{F%vYt!PouC5_G_>q9VusOp&t}7qzku@>yfx1BCfaiPhl+9ZG z^)pp&Y*0IBCgAO)A~}xh)#k(~`uqZT%;?2LM1RuezDCkQnX0UFh0?s^U6lpGmrIy< zQOPg0rD4>B$OG-JZUf1E=a|+?go0usgzRA&?e)s9fv$LksuB|=pRu8Ge)O?-PZO*< zp?F~epZ1FlSy^tRL6|cRg7VaGNZFOx-#AvSEJRG)RLDX70+Gr@Bih|a6zA|}kf1+1BwB9w8J-mYA zjWR7WCZQ=Fl2BpnA8`mG#GCw)hLa2No>N=kX8(kvUsI#}wgl{MAp+HY3*N|!KbJ)1Z~meiLFaA=VsJf-UUjC-SwJ#Dip zEctl|H9KFQfwf@c5lrM`m<^;3tHX1^R3j^UT(SnIN^oP9Be!SA;Wm$Uh-a z+mtQD_OUs~v}h3+dDr&kkWHgho}u3xzls!I7u~c3I>iR?_eC7NWlb`pX{oZb3}w;{ z9Pc14qd1)-*3w2AKFz6#@3G4H7AY|P%Hm{Zd)Ah<|HAprW7sZQ)g$p))a^b7krsvS z>N<~zzEW!Z{Z#kse)*c0$w7p_^g|RdV_eQ0j7&elC<$Gv0`B`s4c6!5r`I12gTc9C za=q@4LsQf(WgIL#AlAgPq{Hqxrl;#`yMGuDtCukNsm)fYaZAsN$bgHc&@>26D&u@B z=btGCQC}&ij%;h_%4)@WY6lPTS10gVCAdD!g67XMsH=dyNA7HPcpjFMpqq`ol>m>D zUdr(wCeKmxU$73akg5cmwsK>0P{Cc?6N&c=)|@LHI8{oGiUkEEU_DltOhf1zE60Ud);~MgQgfh*RMO#RjeW5f)s;NN&YB#h zQ)tF;S)kLOw?7l`2?YxjX>j>|Zl7DD6l$+bm+|2s0Zs&RyS5q*kBithoxJ68WMWKW za!M;|EGLCV3oUbMs)n+2a3TjFMLe$2$651aoLN65%)_8w-;0b64;%N~i5{H~+WZ;#($&a^8;I1g1 zdOWR6*luYlHy5;fxw(9&1rK<34zZtG5)0B+tAkUP17eK<>`ywXrk}Rc zBValp?kT-NCHx+LlNfz#f297QS-$!@J`z+qAB~BBs=m=RgD#rz6_yiK*#$yZHk}&# z=+K0-yS0u&eQOlRHWM+SLI+1=YKD<7)79qiI|3aHZdpmu<{#8%TYxjoB3BL|@$xI` zQCTc;jcGsdmVT&;%#PrD)^yhuEZ`;FJ1S>;S?BGSIQ?Kfvbn3&)RR-jj5h8l06oFq zW`4r)W%*di+Bq~iY-Dk1{nLJlGBfx!;LCWlKEqb^=`z*gy5+l)>k|wFzK@R#ru^pq zj+Ec2I`nee`PhldRNPvA80(XDk7>lGs#(-subqNGf5k8sK_C#j-7rQhnB++dA`a+< zZqr=#j@_y3zrBVT7A4|L(%#JGsH#6~Xnt8FS~c{Tox?wT@gp1KbC~{J1L@k-xN)h* z8l0@Ea&;g#E&zdOL%CDOmHAQgY(@{U@^DF-3zp$5o_3xs&gb>kva))ol-!Gfj>Eb( zd-8SCP^I&iMu+FeEJ+v{h(CCGDHZTz3N44N31A-4x*CY!@FWRcnY@fG;mr4NC}|YU zZzwA(&9))E;AjD8NJ!6H7>TCFkC4hGVQu+^@1$Suw=F_!ocD`XvS^|B*t(kbXCikk zIb4*p+oyQN0Q7?cii*Ub{=#mfmi?wNjH(I)tlQUg1}qW&4nb682;L44?D_%bpZEm= zPE_NUuBPW5tYj_U=S!>UNg+Zp9J$OF%g5qaJ{@(Po#Om5IiCu2U*e~~^A-5NpT~mP zr>AHc(jLqL?(IWdwOHV4=-Q9ViI$^Ca>+Jn{X4F;?RV{_;`TS$b$dqA4HGm6m-gRZ z8t`&_-3f6`R9WoFP`wORZ(HWwMisN>$N{gmzkzd<2T=Q-@?TSJZ78el_Y>FUJKSo{`7<*ks(AcQ z^Y=i!a&r#N>$|sK$ndRwYGQI5+VG<1URRNiAy;Z?`K4q8&x;$}uC^PTt@7i4G#8*^ zX0+Pw7}>Cj;Bow5xR)1~FLb(0^){|7C5!S|&|y4G5__=N#gT_fmb-H*>-ZQ9e4ND> z;4=6!wt=gif<`N<7vC47$K1n{_~~jlPt(Bh^)nytSFr-A=aNT)G2Hi)Mo~PX9mk*i z)RHrwnx~B-@{DvaVR9W7s{)^{)H-O@b>ElC?j+$;*$(C_KCbs~^i9bb_PSVEDI)Q{ zAD{;qo_>J+z6f3loD{GzTAK#7F6#FU(g?5HPayHNFF3Cd>Jt|#`w45-Fw~xVHVF(s zv3~>^)s<$`6F~$!*tK!twr;G?P`j3d)1@)*@z%sBmG^f}3Vclvq}Aq$KscSh*%taB=3;9&0Vu1MZ9ez=VJ<)e1{Iu0Vgr4 zuy}4G-Jnr?6+rc?PK0=7UxbkaC$`L|) zS{1PFGWW3;c^ruF@%A==5LYNJ$0X?6n{JHei!OnsSa+=BR56jyfG%NWo&G+gz3#?A z7#Kt|=%#4KlxY!12T?k>)J_UZM6xaNuwP9)h`+Rd(Rr~9bIO+p%XQyt3xF{C`2LU< zJ-x`Ie>cd0i~U#e~e zej8H7dc-1VNx9TA@+{OeQcr@akQn_$x6*{dQ25KF&$XWA*hyijHp*J?AdMyi6ngki-Da&Zxo@b}w6m$qsM3POy- zZu)COLrKb3yAyPmKQ=aGhLQXcQyOf-(S-5KqB65qGE+N9G7Rt&<9IUMWS=&gWp#6K zJNf{t2}wZfRKjD0P_6nX3AS?5n8cfV4`_cX&Fg7-t>J}Cqk@<>4UmSOs`S6@D2 zljEjybWR7a$g^uJ%Suj|(!3tMyjmvUr0d>1EVa<#@}Q_$J^3lhPqjP$)@5X2Zi&u* zU7RdROEJ#Ux<7dk?a8WF5T563PAaL^^^iVw!X3&iE{vRLS#8TQqM9d{je}NFeB>D! z@sW6IgS!8Ep_@hLv=YX`DP(1*^ZADG9-T=B~*>jEpycx{*XgEBm>cYD@pL0kTOU0ZXNU>{zhc29$bO1c)x`3HJ%HN?6} z6;W>hMHp($l7i(AgTXPzprVnVNDS`RKQ{$Xn4E@H0p^j&*D2%!VxeE$F@j()DKXr? z%`0L-K3_h5EkL&JSMJLSO|M}Lr`ouPX#@@DW%{!OzPv@@gmS$pV~v3{VINw@lqnme zV&porX87RVBNBy^W5q|0rjU5bP9^m4TivvbNTOnDv{45VkFlXtjflL_$x~i)62@P#fJp_>amx9j37&PKVOKFe-cZbnXi`wmQm>TtCK-(U zbTQFkZci7Sx}DY*ym@km*JC?ueLdWXvS70c3IeED?$)095+6wC!r;4HZ#{ZG7s;mQ zE}Rx!$2YV$?zg*AQ*b+Q;5sAaCQ9kGyT%3W7jhBb%gJmVbyc8vDd!(x?!gxH`MD4b zfJKhJ#YORbMlAEQiz$?`Z+&f_K$5IHUM7P&ewQURwyf+fc`74aV1i})8aeP)M~@q# zuN>~-47C&f&J&TxPU>lBP8$xly=tA5#w-;;J^j)jFYep)GR#>Zw0DB-FG}KHR0*;-I^zgsztJ07_dm zT`P#a*XK~rEu8a7%ab`dvQOe?I&io0!Wn<6lv97Vq%Pf^MPZNl5kb%YlqcPbKmxS^ zT;L-v%Up8_j4krs@zM=Dj#WtV>$a`Z`gjdJE@7U#TyofL^=k@;z+W6SW`0zFeJP_z z0zA4n{0#ww6zG95B~kj&Lh~GQ3yqMZ5}*SrTHw`7iChKNa|Lb9S<+&9^<=uc-l#ln z`&$5ww`a$0w;R#8Wq8{cfQFYJPex@U3({NSUOe{$oX2$^{~%8$qKE4@r$f9w6~Bmm zc-Fwt?vFXRyUIN~hgH!4owe;;T;16;e&Dr9zmGINp<`QC*pt}5=YoHzm*YH z4x2$$)24=KPnYS;3Xe8)!QCy?w^Ev6kv#0MxrSHlu&y{{Z2q4-l;Mm` zuUd*}BOn04Z-+A>8X{TWyIud59q>N5kVj7KzIu~gvul660zn~&D_u|q6q*;ThZ+zn zQdS4@)&?weBnV+&8Xika%d>O&dibC4kjl!+j~?FF`A=PhWi>#ry_3GfO5e`R3L||TEq<6j5V)7Q_4F^VKlPW{ z{X)kR^Fv-FK#dIF8R;XB{QHvzLkBFIBB zO_=Pg`fiLwgNxdPq5GO_Hd|vkQ^<8nw7j=0A)eBxMyOP*3^k;)oJ{pqW_)J#K=x}D zKtDPNdPT3D6UZtbWMwuCY%Hies`)5@`igHE*&B?~ zf@J|C-8emggu_^YfX}a9SF4t;oAI?bofiF+i6xg6n;uDqNq2Jo@4r3W_pz8Upt*El zCXdAKV`+-D1K=nUv`o7*&?C;wJp_+X<66_#m6Z|+0Q!s|f$exJXDq(IpXM*D zN)T{W+}?E}+Yy^v*FV4X^~4kC!7d5~%1fp9K&|ljv!VdllritNnr`)FZADcDgzOn6 zoD!Ebrip8X^mr=JM0*E zuX@(mAl+$2t9BZ>F7u%s6w7O1Wh-&uy;iC$SRj2C8wVKuk-k}OEE0G#4c5562m73u?|X&zkqbrGuSE;q#mfFXa z-vSGHMgB6C4V9ks|2|JH;g?ZWtj8y&Iel+QLt-A4qg>_uB;aZNy92Ctd+L1;o%r^6 z$VgSU@wI-R9(nd+xE=`E(79jUj^h|JmrY-8PC1%L{YIv|_2}w(o6?z$)%NUD7Y;#` zk#*I*2z5M`_x&nTU$k7>tN(?>W49s-&EPcu${a$nb;@wo)KDTjN{Pp2`@!-3RW*mj zZhSM_eLxO@WV_SknsbL1j!CMBy&Lme>LVB2ZK7j0oS!0F{JCFg_k69SED}2m^FhMx zX1OQpDU9AeG4B_7h0RmYGMnW^+~wofQx~hb)sG9d5nWyvBc*njg%&7Yh%-oCH* z1dLJtUW>Xv`nkKf$WE{!!D)5tw}#o&q*Oyi<3l$I*O&d4Q?wr}(Usc~BNiwGsS<*9 zQPDu~J@9dH;jg?A%<1@K4l6kS{`~Mvq2{WRjyC9WC#lcx8YqKsk47DU_+=TI!k)nZ zA8*Gn#kiH%qM#*Ir5t*SoHqm^g-U{qk{>2_Tdt8Ji2M*LA*rjIli|bmJY5t!sm%aR z6~($^8fbObw884Lzh*7bOAz2B0i5ms+_>tjJKv>^#BYVhO^7N* z=7jN68@l|#-w2HgXYG4GR*bS5!qa}TH z|pG&L5BJTH_B)kyHyQd)?T5+iyRCzbplire&jzBZ4*=k9j8jeb60 zy1K*jgF+(UQR8X7nV4A-qBkD-s%g*p-b$~k>HL@`TJ+1sHMlb?Sn@>T^bvbWf7 zIGVo=#?NU8jfLcmA3}y4IcYT+N}QwP1Xjq7pCQjyTx_LWU_lhua6azUm3W4gIk`%$ zI$Gor0WiEl_}W0FV(0!n$q>k`wl;Qf(}fJRmeecGO(bPzB=9m*mCj+)@ye_hJ^#G3 zF>|;ynpUDRovBqlo~@p zce3%fjK6!nhVXfKXr=qEpWAh(C5R9@#2~fjEqmo4hr#)U8|eKf>{hKplCji(w#L`- zS+oF!iGz72>*&Qyt#f1Zxcew%4H*?0as&<;t4Rt%@^<=De3z3-naUrH2kcPSdnmId zy9%%2GO640d`aX0Y_y#J{WfiffQ^hA1SJ6c(}6yaSC_p$7K`Xw0f5_l;~ zV7>Eq)?e>8|DB$14W%odldMK_vqjWzopLsFEx&UH-%)*bEY)ESlp0Rmf)y-}I?^t| zyUB*0_j>|8YHXg}Tk)JovLMWC?*U^r9QgK*YrV|0GMXrd54R=o9*yC9Fxf=cogNZ? z{=btz`D~T9rZM9n?V7I+JJW7J&>oP$cMlF=DvO<(n3f)YHfy=Gllb=}y~f0FpiSDE-#VZ_D2lo` z-I;Lw28ms=Wjs6}Ek6|Xe8Eit{ae5^KEQADW^eD8INY$=zYrx-3&#uIA4*^e*Zj3U zJ)C@`9i?CA98M;`Z$z%wn||hPo;I#48u?`Io|GMm%v1F6M~zM~L1!6Vb5DGvEx>ER zj)ced=>CitgwER1;!w^}3;GG4zd&)cQGtQj;}(Y=^)<3lHF2fTe+@_9M7(JA9H7@( zeIcU<$0nzwqN!3B9Loci?S4#*%@0_+zgB-IBu~AL$M?F3h3wkCe(u=1>ds=$*hRx# z>*74Qe>~-<;HCcSOESmp{Z{y07FC=d;1o7F4*P?Tbz#YzZK~sG-KPvg1(koNR=Q|G zSb}A`PfOevplbRImzs`}kqqIJ<34ejOz%G&CB3p&5G+OV(oq)C+B+XEZb0-hK;Y5f zQ{T0!s*?ybt|&imq+-H|MZ#t(gkva;ixih>HSVs!)V}j&!_8Ng5*mNeKu#(mE282k z9vO>=fS~vJxb?R=Z?=B1{jxzyve9VyXj%b3{%z#Jh}a}xiJxOIaDR~uC*?VjI@tTt zg1dhA=7`u2awue3g{(B6~q~^f2zU)OJAU?SO<2)T(yFK5Tr;`(2aUNU2v7k*x!fhdR$dav_BM57UZpf zVGG8_ty-G~_(iD+DK-ol=1GkH5Pcz#OCUt)wId;2>tpd`jM!HghhH3Lv5gsez=v>r=#7@MEn z{W>C0TOUh7ZzpZ>cTNaLb|byI2jm;B6HV?^k>Vf5qyOtuMkic$21#~h;mYq#{}Jq60J)C1oG^|v5VEY z^r%t8or!pD=(1oT+H47-n6~}ukK{S3{b~syg6=;Dc0M2JKI$ysvg%qDCyNaTp3cH_ zSK@H4MR|Od`)!nkf8CoyCS_O1(7yx|Bb}e*IG;B5bLNiq6U}cU?L8Z|;x26x)o+`> zX7FT0ms>k%Bpsmk`VAWOrv19vb%TnG2c#6*+878=(HiRT9+Xuu7dfQ%{GuMV-hj?$11Y8H=8EjpuzR`_N&`bJv0VSnv< zZNLr_><3RgNK1^E=NW+8sK4WkKz==?)qUSKTFmSN$Q`lLgFsWjQ9)I)t07w>q~L}! zD4J5@VaUV(a`)a+sT&>myQ;-mBA_}iv>#fq?`(YTi^t&ldo2IGzvZbZ%px^7bNNxW%2ET zof@B}!RFv!5h3(DFzLvCLAo_}g!*punoz}tI?w+le%=sLW@Qp2hH}@bfiz&GOrzWI zHd`%q_osu*Y_S`_o!lEg;Ris%VjW|4JJ(oW&*lkhD65hPFmkmar9g)b3$PQz$TCPg z3L16RIDSG(V)v(ttvdTf<7`b#cmp=?yKSA>T$&((U~!$ZE(*?G$%6>+tLSU9>qH9%4_tHL2%0Nadefn@qNfP`Yq9UyFy23AM7SXJ1Ak($;@ z$GJyw8limG|9YDH)ao|l+O*=+?d4I(L;!>@u-N{9sUgThjy*cEoaGMDL^S928jaANkm=cT%aSMC+aPm(tGRdSlT@f%h+>f?Mc}XAO8J+Rw&&2f>1ti4`1f@0IJ7h`9_GM%W`W z=J+VMa~1eIR2DZJsfBIBqb3YBt*jLyiifjK5=9D9k>s>H%$8F1)^E}k+*Wf{)P+=j zssIG_F_qMD#A7{*4#Gvsl66!JHGE5dA7V%4(t{_&q}Qkn%V-LaGExz_S*`J9jVTrO zH~o<#3tD`0hP?mW2{s#=I8evCC)!R{m3*0-t3y$~W^$+KZljG%(TbQ9qpWmoNsCFf zcZ$Ptb$(_5EoVR>#*gNEydH3N(koa*M*KCcQoDb70`)y#s{IUS)LG5NMwP!O!rbFO&OXG*$6+E*DU5mn!o5l7pdkG^Dfz35Qu$AoJWkV_B-Q=F5jKoN1~ci>3GVeLYTT4KC6vxoyQADkEU#= zRd_K@Mr#iH72f^EQ@|qRSQvSma{-LSTJ4fQ>I=OuHayfCbRZ$bK?jysY;Ge$CNG|f z$J>vsnvT!l`pKT|tti`99L~BW^Lfk0#p3kY=3T5lVB&@n!KpfH8n*K{Etr=Kn44}w9hHT8#~V2W@i^+bkOxeMQFckw zFj+K4{Ysn4f#+2$n187erM7byRZw`_GEHM*7!uNED?|6nc$yGn^GpAMO?q1$EQaihVW;VFUVPU7N5S)>=4?T}5d;UE{b&O1K41hu0S&s(=p=o-2HGP5Iv&40Ad0A3- zS!yj*{9H{hWIsVPhs`Qw_$%SBdC~i9$fkR&pD{U;7i#EB&}{1ZW)Vj^J6+S6UUIn6 zUDzM!^3L6~3!4>D=j>;7?5i%@6W%q*Cv2JzmSi1hkphKxd=N8c!JhB>bpq2|AJNk3 zO~h$-JJOXMB_l!-E!rGi8~ik8@~3&}Vp?q#O3MEG8PA>%CA8>#DJF=&J+C33ws`5; z{)1UXB^YG>@KSMuZ~zlk=MKx|oRM>-e1EkS@|h|EUdoB!9jEVs5n&1C1uBHZpYWEH zyj4mlHng|&R{pAJyxaJ}GKj+Qq@+*qI>7j2(BN0L(5%5)w9ChLOGFb)d3cQ`r(3_} zs`tcbHAIRZiN=c}km+EO(R+)&SF*M-{%zpYJ6wY`vHXmcduiA^1gMPbGH0hz@yh1M zgdAln>}=x$;$gMQcAn6(Fb0&UvB}X0D%DY(+6GY3WA2E6zh_I}(nB3JF&Er_SlR%C z(2($EH`*jbrDSYbiTXtL0tRNxHu+(vH0H+w-3Aqzv%4I|21+Gk{vrY?B<9lXYRMuZ zC?}6f3>3FsK?j8qFDe4uKjt@`)22Cn|MD({!iibhKMVx=2a#|lWYu)PAJ1Bxs{IYn zVa>3=@B@KW#D#%8$fsDVO8>N?Mr>bqqR7_A9?kCg+-!8RpTi5p!?ddJ_IBL%IC@;B zU*`Qv3l-`706C7P?_MN0X&|JOPIH~(Y>rNhb49wEm=_t7xH#2epTf5~CKi7~m#cEU zWH5}MAnHpOtj}n9`dRWLy$BwR2+KfT^rP#szY;#ggtUyVxu9Q9+jS%i!!rr@hjdx8 zi%i5zx^EMg?gELsQ68q6;C?2T6~o*y>Yp%*$4lCTKq|PN5%}5j&8%~g1Z!)Xs(m_v zI=7d--k00(ug^A{4VBAF4Mmjq?9St zsRSNRlzOMrzv9%4?o+n|>dA+t^GeZ|Uv2>?|0X`f56$v5R$`73IEx?E!vlIYRB!J% z!YQ)MoU*QrY^J+{T_aU1<7n^6Ah_QiiN<8hJhzi*{ip1Q0y|>|Fv#U$I%wTwe|zU} zWObFKR0u;%7k`?c9~IW-29lCOJNi0YMbskYszA+e`^!_3HdL4h$`(Bl6)z0hS6FED z_>;HzM-#}sH`Nr ze>FprPal>~OVCmlw%#hgI_bT?Z>!Q)g+iL=K-~4QrBnYsS!ymjm{eRT^UW(%B*|s? zCy?hV5;4n%nd{zcL;TGmhLP2_y4v4 zuZ;#A>s5DbpTCTpt&q!yt(SA~yKuF^mV%aJRW`v?#w;HjPqKaAKC4pFe2JCe`a5!l z63CRwD9L^nX8SR_7uDGmVwt(HB*+@93yiT6>8p9hF2XJ}I4=wjTKTih59}Mp{Z#;9 zm>p3JxO#`wcbi79U#9ZlM-e9Zm#V57yK@@9L5q$7h-!2y+P>Zn({XST!E+A)35ttd z!qrd*)Lmp|uhKO% z-k-wBL6g{9enfEtSS)I*jwQA`7scSPsis~vA4;{l74jKN+`ff%!To!lK4*sA|6`G*2SPrr|_(=^?s|$r~RG3^k+Q z_4($!d#!%>TA@GLxH+e7dgo3kHhUnXcuf>n_pU=sM2Vc!+FC!fXGOSP;a{G^=k`&d z!!5<(kx3C1OqleD*0kFBtr>b3Dwdv}kcbDpUvCj-&;LGRBG3;hGTWG5YH_$kHpn4( zUT`#SV|a$V>ZWps1^dU(+A^H+Uv>_^{#EbxsLb=Q`e zCBi*I2q@%WHW0(8pqqR(_NzX`!fVJSnTS>VBGQ@_juJsdhk&W0iq|igBW=l8VD5x%r&u>3cJMq}c6EnQIEGeUXj*YT+?CMx} zQkPH9=4>@wAYc0Q3<6lXuBPSEgVBnAC&}RKF$$(kihbYg1xSV3(Mal-M#1v9uAIQ6 ziSZ7QJ+0W>gls^r7QL!> zo^K*OT;GT9Aq0aIqO`OO@U%V%%p*L>j61Q@=t;Lf9|Vpky05Z|WRyFL!zCh<{P5{s z5Y~QxrmA3VM^0i@R4CRa7RnS?XbQy~`z)!Vh`ZnBz_cu!qjY<@qt0a0n zlSZ24AlD-vDj%@=qFHHil;OSJ9#&@|vzt7`I)iEE@tC*gxQY^;5ZlEw=};@T=#nkT z=8|A)h$aR`HscC4RG0s)u{C^WvpgmZa6&y)4uZQh-TSV0a1B69VuhNUR_7S=BmU7$ zZB7!AmPRVI!qaibl%RWSefQlLoz@gS#2LuynT621s{Sxiru)h5AD^9?_W zG6$1g*ki5MXqVmD#(45PP}-SC6gjd$s;9|Ftt8l+ZT;9QZ;wGQhL9aVYRCq^>a;E} z@jLp6OBy#<;Kcj7%-~2#l=wj`jRi&vO(Z$XB^7p;Ef?%BU<5fd`ZH4Sg_f&HwPJ)( zNyL~2uO0E_IT()qbCidc!_gvRwMTipV6Nf@Id zbpgaS)1*QSlAp^+8MQspn&xsiuv&;tF9o>zqG|opse^@^G&<7QKQRUZ&BAD$fcgz^ z#1W#{Cu?Dq0(Cr%VNOxfrIN{EaWoTS#(&YH>{J|}2&s11a|6zyEQdQIOm(8y$qgmt z+Vz=i$M(l#OUsRZwMI;4Sut;^5_XlUdLAC6V=5?DP&uky075yPUXawS8*MFFTB|Du)~u8_HK`Ine+?~ea0Ds-f2TTDz`m0ojT zDrcSzxAU@&>7Fe!HG&!a^n?DSEgMH##&^+4w8~<(f0+A%L&bM7)XGyn!ZR$OA3TVf zUsAa&0;@umV*)X21t2y30YSyZlq3<7nIwn>pw&qb58o;DjGO7z2k6Rm1Nw43%@aBO z5E{W7G5qP`BO**7XGM5>rb$hTX4$uENROs|2C*)EA_6&EZ%iA058K@qwhv^y?WnHB zFR+gj8uXIGnGm*Of~Vzbb%C3O5E=UaJZ2|YD_&(_p z&B$2~<>$4O^gsP58@ml@S5UWJak`}|Y)IKM zP6o;560el1S`b`@i{>fnbO2Q()6{<8$_fb&arexttn;(Ax}y51N<{W0&_*>1-eToT zE1WW&8bj8*HbTI#;Tgu*C<`#&IzG6h`i-xyzcdd(kL;rylfPaeKuU5$a|+JMPImrE zvXLn|He&qt*9js#`AuFL?)nf52IW<9G3=scS_X^!xxSCIlV2ljdg zYC`hdJK?1*Fyw=%j*^(OD$`2m<4{d!8idO`??SrvLhS1EK)-~|;Lgr_WNC7Zm(CYt z*9=+_Lvlr;9+Sjtr1NoV(vS$}PP|w$UHH;=1|j(8+ao9U*>?S|s4ofV5#~tp$}j18 z&bVFjmcpQMhKP_6qUR;c`cpt;6H6^$sb3n(7)d zC(%qH(o{Apk-8+=TilM;?G;Se^G*e?gAX|sZ|GzTmiN0pZi-h&CO;rt;op|$2JQXb zkyx#aY-;kJK>tYZr=y0)l1lBMTqgR@*yB8qENBUG*g&`Gy|KtXiJf2zX9;}?8k9<# zTOAzuhY<}h$%sGRRI{>rFSiYFm8qBXrHB~ouwN_s}c{2r4fyoaRki;Bm)`I*R$-4`81k7l&!h%oR|JL>TLXUJT z=B(D|=*tb?Un1xE&e$m`bNIWeWxpIVhIOav zp#mN$^)n+mo7@w`L+4AGF)RG0)Ly(NWsJirZ6Wk{g=LgigowfVJ%L? zuZ3t8Ov|J~%+SR_LrE^OBA@rN_A*HABCPh|s#2@uMZ!vd)KcD7c$REFU_z;~8Qpv! zc|v{|A;k#T97g+@-ur~*>;*r3dv>K$YBdW+LXhQ-|Jvv^icZ4HNI&MLN`*sCnsS7l zy&&KUC!PmR5IM-ba}?vJj|S}u5*&lxzI&Z}{Ep#EOh|7Vd3zqkhiCpt6E#dW$oyja?X4o{h#Zhn6$ zj8;rVoNonlT9`{1;^2h!lWzzGLi|O;_;&qLnGY913mN-!oEeVCR$9e9LhIBPk%gAx z7crRhj7kPDN>D9Yra~+2ptUFxMUEu#;Op=|Y*GHN{mS31AN-(@AX6aEekUs-?f?0yfTXCLNVSlD!2bhynzXwB diff --git a/static/images/welcome-learn.png b/static/images/welcome-learn.png deleted file mode 100644 index 8717acd00f0888c7275592052d6776ca6fd4918d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4497 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 diff --git a/static/images/welcome-try.png b/static/images/welcome-try.png deleted file mode 100644 index 351a648b41706c9d876a5cf213df71219d4269a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26671 zcmaI7W0WRAvo6}U?S9)mZQHhO+qP{R)7{gyZBN^_ZR^f=&e{9iAN$@~t12^V#q&f& zW>jTXW>%zvoH#rT4h#?w5WJ*>h|<3_^xtU$1@iAo@!Le^UxMu-s^Ow+Z|34|=wu2c zXku?<3XrrlG&fZ;H8k;b95>|w0syc$H>gW&dyE)U}9iopl4vBXJn#fWanaL;$mO`{GWsPpEf5GGcF|&vHzp%Ux}C4 z!o|gbi=N)y-JQ;zna5wi@lSIy}iwU)uMuhy^FoG zg}nnnSeX?dYiMj~_n-3rl9!d`lC*PnF|;!_l@#G6{>MOPX=%d6$j-(o$|=mm$;QCJ z$SBIhA;QkU$-%(DA|@&(C@jkPUsw@)V^>>KJD2~$n*3iZ^ZzIIKcQgj@K3XdsgtFf zsfn1Ay)EE>xy)txKiI;-!NDTL#w7NSkM)1H<$q&M{s&wBH

<{}W69&lvjuH0=MY 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 From 85e9886906b586af41f5a84abb6d28f407ddc359 Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Tue, 19 Nov 2024 13:05:18 +0200 Subject: [PATCH 09/25] refactor: [UEPR-90] fixed gap between components and how pdfs open --- src/views/guidelines/guidelines.jsx | 6 +++++- src/views/ideas/ideas.jsx | 5 +++++ src/views/ideas/ideas.scss | 6 +++++- src/views/ideas/l10n.json | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx index c76c0934e0f..3d76a62a807 100644 --- a/src/views/guidelines/guidelines.jsx +++ b/src/views/guidelines/guidelines.jsx @@ -88,7 +88,11 @@ const pageSections = [ id: 'guidelines.learnMorebody1', values: { a: chunks => ( - + {chunks} ) diff --git a/src/views/ideas/ideas.jsx b/src/views/ideas/ideas.jsx index f1057061d84..41214dfb48f 100644 --- a/src/views/ideas/ideas.jsx +++ b/src/views/ideas/ideas.jsx @@ -141,6 +141,9 @@ const Ideas = () => { id: tipData.button.hrefId }) } + {...(tipData.button.hrefId ? + {target: '_blank', rel: 'noopener noreferrer'} : + {})} >

+
+ +
+
+ +
+ {GUIDES_SECTIONS[currentPage].cards.map(card => ( +
+ + + + +
+ ))} +
+
+ + + ); +}; + +CardsModal.propTypes = { + isOpen: PropTypes.bool, + onClose: PropTypes.func +}; diff --git a/src/components/cards-modal/cards-modal.scss b/src/components/cards-modal/cards-modal.scss new file mode 100644 index 00000000000..1927285efdc --- /dev/null +++ b/src/components/cards-modal/cards-modal.scss @@ -0,0 +1,150 @@ +@import "../../colors"; +@import "../../frameless"; + +.cards-modal-overlay { + display: flex; + justify-content: center; + align-items: center; + + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 510; + + background-color: $box-shadow-light-gray; + border-color: unset; +} + +.cards-modal-container { + display: flex; + flex-direction: column; + + background: white; + border-radius: 8px; + width: 640px; + + box-shadow: 0 0 0 4px $ui-blue-25percent; + + &:focus { + outline: none; + border: none; + } + + .cards-modal-header { + display: flex; + justify-content: space-between; + align-items: center; + + padding: 10px; + background-color: $ui-blue; + border-radius: 8px 8px 0 0; + + .cards-title { + font-size: 1rem; + font-weight: 700; + line-height: 1.25rem; + color: $ui-white; + margin-left: auto; + margin-right: auto; + } + + .close-button { + position: unset; + margin: 0; + } + } + + .cards-modal-section-title { + text-align: center; + vertical-align: middle; + + color: $header-gray; + font-size: 1.5rem; + font-weight: 700; + line-height: 2rem; + + padding: 0.5rem 0; + margin: 0.75rem 0 + } + + .cards-modal-section-content { + display: flex; + flex-wrap: wrap; + justify-content: center; + align-items: center; + margin: 0 1.25rem; + gap: 1.25rem; + + .section-img { + width: 200px; + } + + .cards-modal-cards-list { + flex: 1; + + .card { + display: flex; + justify-content: space-between; + align-items: center; + + font-size: 0.875rem; + font-weight: 500; + + + .button { + display: flex; + justify-content: center; + align-items: center; + width: 2rem; + height: 2rem; + } + } + + .card + .card { + border-top: 1px solid $box-shadow-light-gray; + } + } + } + + .cards-modal-navigation { + justify-content: center; + align-items: center; + margin: 1.75rem 0; + + .navigation-button { + padding: 0; + margin: 0 1rem; + } + + .dotRow{ + width: 32px; + height: 16px; + gap: 0.5rem; + } + + .dot{ + width: 8px; + height: 8px; + background-color: transparent; + border: 2px solid $ui-blue; + } + + .active{ + background-color: $ui-blue; + box-shadow: 0 0 0 4px $ui-blue-25percent; + } + } +} + +.cards-modal-container:focus { + outline: none; + border: none; +} + +@media only screen and (max-width: $mobileIntermediate) { + .cards-modal-container { + width: 100%; + } +} \ No newline at end of file diff --git a/src/components/community-guidelines/community-guidelines-modal.jsx b/src/components/community-guidelines/community-guidelines-modal.jsx index 13e78cde8a2..2ea0420c371 100644 --- a/src/components/community-guidelines/community-guidelines-modal.jsx +++ b/src/components/community-guidelines/community-guidelines-modal.jsx @@ -36,13 +36,25 @@ export const CommunityGuidelinesModal = props => { : - null} + onNextPage={ + currentPage < communityGuidelines.length - 1 ? + onNextPage : + onComplete + } + nextButtonText={ + currentPage === communityGuidelines.length - 1 ? ( + + ) : ( + + ) + } + prevButtonText={ + + } onBackPage={currentPage > 0 ? onBackPage : null} /> - ); + + ); }; CommunityGuidelinesModal.propTypes = { diff --git a/src/components/community-guidelines/community-guidelines.jsx b/src/components/community-guidelines/community-guidelines.jsx index fa7252c4eab..5e6644d4661 100644 --- a/src/components/community-guidelines/community-guidelines.jsx +++ b/src/components/community-guidelines/community-guidelines.jsx @@ -1,7 +1,7 @@ import React, {useEffect} from 'react'; import {FormattedMessage} from 'react-intl'; import thumbnailUrl from '../../lib/user-thumbnail.js'; -import OnboardingNavigation from '../onboarding-navigation/onboarding-navigation.jsx'; +import ModalNavigation from '../modal-navigation/modal-navigation.jsx'; import './community-guidelines.scss'; import PropTypes from 'prop-types'; @@ -65,6 +65,7 @@ export const CommunityGuidelines = ({ userId, currentPage, nextButtonText, + prevButtonText, onNextPage, onBackPage }) => { @@ -108,10 +109,11 @@ export const CommunityGuidelines = ({
)}
- @@ -123,7 +125,8 @@ CommunityGuidelines.propTypes = { currentPage: PropTypes.number, userId: PropTypes.string, constructHeader: PropTypes.func, - nextButtonText: PropTypes.string, + nextButtonText: PropTypes.node, + prevButtonText: PropTypes.node, onNextPage: PropTypes.func, onBackPage: PropTypes.func }; diff --git a/src/components/forms/button.scss b/src/components/forms/button.scss index db7be8f3371..aaf71b7e7cb 100644 --- a/src/components/forms/button.scss +++ b/src/components/forms/button.scss @@ -39,6 +39,10 @@ $pass-bg: $ui-aqua; box-shadow: none; } + &.transparent { + background-color: transparent; + } + &.large { border-radius: .25rem; font-size: 1rem; diff --git a/src/components/onboarding-navigation/onboarding-navigation.jsx b/src/components/modal-navigation/modal-navigation.jsx similarity index 55% rename from src/components/onboarding-navigation/onboarding-navigation.jsx rename to src/components/modal-navigation/modal-navigation.jsx index 71d5421c177..d5aeef82619 100644 --- a/src/components/onboarding-navigation/onboarding-navigation.jsx +++ b/src/components/modal-navigation/modal-navigation.jsx @@ -1,21 +1,24 @@ import React, {useEffect, useMemo} from 'react'; import Button from '../forms/button.jsx'; -import {FormattedMessage} from 'react-intl'; import PropTypes from 'prop-types'; -import './onboarding-navigation.scss'; +import './modal-navigation.scss'; import classNames from 'classnames'; -const OnboardingNavigation = ({ +const ModalNavigation = ({ currentPage, totalDots, onNextPage, onBackPage, - nextButtonText + nextButtonText, + prevButtonText, + nextButtonImageSrc, + prevButtonImageSrc, + className }) => { useEffect(() => { - new Image().src = '/images/onboarding/right-arrow.svg'; - new Image().src = '/images/onboarding/left-arrow.svg'; + new Image().src = nextButtonImageSrc; + new Image().src = prevButtonImageSrc; }, []); const dots = useMemo(() => { @@ -32,49 +35,62 @@ const OnboardingNavigation = ({ }, [currentPage, totalDots]); return ( -
+
{ } {(currentPage >= 0 && totalDots) &&
{dots}
} -
); }; -OnboardingNavigation.propTypes = { +ModalNavigation.propTypes = { currentPage: PropTypes.number, totalDots: PropTypes.number, onNextPage: PropTypes.func, onBackPage: PropTypes.func, - nextButtonText: PropTypes.node + nextButtonText: PropTypes.node, + prevButtonText: PropTypes.node, + nextButtonImageSrc: PropTypes.string, + prevButtonImageSrc: PropTypes.string, + className: PropTypes.string }; -export default OnboardingNavigation; +ModalNavigation.defaultProps = { + nextButtonImageSrc: '/images/onboarding/right-arrow.svg', + prevButtonImageSrc: '/images/onboarding/left-arrow.svg' +}; + +export default ModalNavigation; diff --git a/src/components/onboarding-navigation/onboarding-navigation.scss b/src/components/modal-navigation/modal-navigation.scss similarity index 96% rename from src/components/onboarding-navigation/onboarding-navigation.scss rename to src/components/modal-navigation/modal-navigation.scss index dbfa2e11df3..69ca11ebca7 100644 --- a/src/components/onboarding-navigation/onboarding-navigation.scss +++ b/src/components/modal-navigation/modal-navigation.scss @@ -1,7 +1,7 @@ @import "../../colors"; @import "../../frameless"; -.button{ +.navigation-button{ display: flex; justify-content: center; align-items: center; @@ -35,6 +35,7 @@ .dotRow{ display: flex; justify-content: space-between; + align-items: center; width: 244px; min-width: 0px; padding: 0px 5px; diff --git a/src/views/become-a-scratcher/become-a-scratcher.jsx b/src/views/become-a-scratcher/become-a-scratcher.jsx index e674847d17a..6b46e2d2c2e 100644 --- a/src/views/become-a-scratcher/become-a-scratcher.jsx +++ b/src/views/become-a-scratcher/become-a-scratcher.jsx @@ -14,7 +14,7 @@ import Button from '../../components/forms/button.jsx'; import Modal from '../../components/modal/base/modal.jsx'; import NotAvailable from '../../components/not-available/not-available.jsx'; import WarningBanner from '../../components/title-banner/warning-banner.jsx'; -import OnboardingNavigation from '../../components/onboarding-navigation/onboarding-navigation.jsx'; +import ModalNavigation from '../../components/modal-navigation/modal-navigation.jsx'; import { CommunityGuidelines, communityGuidelines @@ -285,10 +285,11 @@ const BecomeAScratcher = ({user, invitedScratcher, scratcher, sessionStatus}) =>
- } + prevButtonText={} />
); diff --git a/src/views/ideas/ideas.jsx b/src/views/ideas/ideas.jsx index f1057061d84..4abffd557c7 100644 --- a/src/views/ideas/ideas.jsx +++ b/src/views/ideas/ideas.jsx @@ -1,5 +1,6 @@ const FormattedMessage = require('react-intl').FormattedMessage; const React = require('react'); +const {useState, useCallback} = require('react'); const Button = require('../../components/forms/button.jsx'); const FlexRow = require('../../components/flex-row/flex-row.jsx'); @@ -9,6 +10,7 @@ const Page = require('../../components/page/www/page.jsx'); const render = require('../../lib/render.jsx'); const {useIntl} = require('react-intl'); +const {CardsModal} = require('../../components/cards-modal/cards-modal.jsx'); require('./ideas.scss'); @@ -87,6 +89,10 @@ const physicalIdeasData = [ const Ideas = () => { const intl = useIntl(); + const [isOpen, setIsOpen] = useState(false); + + const onOpen = useCallback(() => setIsOpen(true), [setIsOpen]); + const onClose = useCallback(() => setIsOpen(false), [setIsOpen]); return (
@@ -154,6 +160,31 @@ const Ideas = () => {
+
+
+
+ + {chunks}, + a: chunks => {chunks} + }} + /> + +
+
+
diff --git a/src/views/ideas/ideas.scss b/src/views/ideas/ideas.scss index 6486ec1b3cc..90d08b02b0e 100644 --- a/src/views/ideas/ideas.scss +++ b/src/views/ideas/ideas.scss @@ -40,6 +40,36 @@ $base-bg: $ui-white; } } +.youtube-videos { + .inner { + .download-cards { + display: flex; + align-items: center; + gap: 1rem; + + margin-bottom: 3.5rem; + + .button { + display: flex; + justify-content: center; + align-items: center; + width: 2rem; + height: 2rem; + } + + span { + font-size: 1rem; + line-height: 1.5rem; + text-align: start; + + a { + text-decoration: underline; + } + } + } + } +} + .physical-ideas { .inner { display: flex; diff --git a/src/views/ideas/l10n-static.json b/src/views/ideas/l10n-static.json index 2073ceeffd0..b0fe6bf57a3 100644 --- a/src/views/ideas/l10n-static.json +++ b/src/views/ideas/l10n-static.json @@ -11,6 +11,8 @@ "cards.pong-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/pong-cards.pdf", "cards.fly-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/fly-cards.pdf", "cards.imagine-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/imagine-cards.pdf", + "cards.paperplanes-turtlegraphics-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/paperplanes-turtlegraphics-cards.pdf", + "cards.facesensing-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/facesensing-cards.pdf", "guides.NameGuideLink": "https://resources.scratch.mit.edu/www/guides/en/NameGuide.pdf", "guides.AnimateGuideLink": "https://resources.scratch.mit.edu/www/guides/en/AnimateGuide.pdf", "guides.MusicGuideLink": "https://resources.scratch.mit.edu/www/guides/en/MusicGuide.pdf", @@ -19,5 +21,13 @@ "guides.VideoGuideLink": "https://resources.scratch.mit.edu/www/guides/en/VideoGuide.pdf", "guides.PongGuideLink": "https://resources.scratch.mit.edu/www/guides/en/PongGuide.pdf", "guides.FlyGuideLink": "https://resources.scratch.mit.edu/www/guides/en/FlyGuide.pdf", - "guides.ImagineGuideLink": "https://resources.scratch.mit.edu/www/guides/en/ImagineGuide.pdf" + "guides.ImagineGuideLink": "https://resources.scratch.mit.edu/www/guides/en/ImagineGuide.pdf", + "guides.ScratchLearningResource_CreateOriginalSpriteLink": "https://resources.scratch.mit.edu/www/guides/en/ScratchLearningResource_CreateOriginalSprite.pdf", + "guides.ScratchLearningResource_RemixRe-imagineSpritesLink": "https://resources.scratch.mit.edu/www/guides/en/ScratchLearningResource_RemixRe-imagineSprites.pdf", + "guides.ScratchLearningResource_BringYourDrawingsIntoScratchLink": "https://resources.scratch.mit.edu/www/guides/en/ScratchLearningResource_BringYourDrawingsIntoScratch.pdf", + "guides.ScratchLearningResource_SoundsAddRecordText-to-SpeechLink": "https://resources.scratch.mit.edu/www/guides/en/ScratchLearningResource_SoundsAddRecordText-to-Speech.pdf", + "guides.ScratchLearningResource_CreateanAssetPackLink": "https://resources.scratch.mit.edu/www/guides/en/ScratchLearningResource_CreateanAssetPack.pdf", + "guides.ScratchLearningResource_ConditionalStatementsLink": "https://resources.scratch.mit.edu/www/guides/en/ScratchLearningResource_ConditionalStatements.pdf", + "guides.ScratchLearningResource_VariablesandListsLink": "https://resources.scratch.mit.edu/www/guides/en/ScratchLearningResource_VariablesandLists.pdf", + "guides.ScratchLearningResource_MyBlocksLink": "https://resources.scratch.mit.edu/www/guides/en/ScratchLearningResource_MyBlocks.pdf" } diff --git a/src/views/ideas/l10n.json b/src/views/ideas/l10n.json index af9a4588993..8275c0371eb 100644 --- a/src/views/ideas/l10n.json +++ b/src/views/ideas/l10n.json @@ -2,16 +2,11 @@ "ideas.headerMessage": "What will you create?", "ideas.headerImageDescription": "Outlandish creations from pixelated unicorns to drumbeat waveforms to levitating tacos to buckets of rainbows.", "ideas.headerButtonMessage": "Choose a tutorial", - "ideas.gettingStartedTitle": "Getting Started", - "ideas.gettingStartedText": "New to Scratch? Try the Getting Started tutorial.", - "ideas.startHereText": "New to Scratch? Stay here!", + "ideas.startHereText": "New to Scratch? Start here!", "ideas.gettingStartedButtonText": "Try Getting Started Tutorial", "ideas.seeTutorialsLibraryButtonText": "See Tutorials Library", "ideas.gettingStartedImageDescription": "An illustrated boy plants his flag on top of a freshly painted mountaintop.", "ideas.seeTutorialsLibraryImageDescription": "An illustration of three tutorial thumbnails.", - "ideas.tryIt": "Try it!", - "ideas.activityGuidesTitle": "Activity Guides", - "ideas.activityGuidesText": "What do you want to make with Scratch? For each activity, you can try the Tutorial, download a set of Coding Cards, or view the Educator Guide.", "ideas.animateANameTitle": "Animate a Name", "ideas.animateANameDescription": "Animate the letters of your name, initials, or favorite word.", "ideas.animateANameImageDescription": "The name ANYA in all caps and blocked letters is poised to wiggle", @@ -30,12 +25,7 @@ "ideas.videoSensingTitle": "Video Sensing", "ideas.videoSensingDescription": "Interact with a project using the Video Sensing extension.", "ideas.videoSensingImageDescription": "A virtual hand dodges a spurt of flame in an attempt to pet a dragon.", - "ideas.seeAllTutorials": "See All Tutorials", - "ideas.cardsTitle": "Get the Entire Collection of Coding Cards", - "ideas.cardsText": "With the Scratch Coding Cards, you can learn to create interactive games, stories, music, animations, and more!", "ideas.cardsIllustrationDescription": "An assortment of fun, animated characters and objects leap out of a stack of cards.", - "ideas.starterProjectsTitle": "Starter Projects", - "ideas.starterProjectsText": "You can play with Starter Projects and remix them to make your own creations.", "ideas.starterProjectsImageDescription": "An illustration of the Scratch Code Editor.", "ideas.starterProjectsButton": "Explore Starter Projects", "ideas.tryTheTutorial": "Try the tutorial", @@ -47,31 +37,30 @@ "ideas.makeyMakeyHeader": "Have a MakeyMakey?", "ideas.makeyMakeyBody": "Turn anything into a key that connects with your Scratch project!", "ideas.desktopEditorHeader": "Scratch App Download", - "ideas.desktopEditorBody": "To create projects without an Internet connection, you can download the Scratch app.", "ideas.desktopEditorBodyHTML": "To create projects without an Internet connection, you can download the Scratch app.", "ideas.questionsHeader": "Questions", - "ideas.questionsBody": "Have more questions? See the Frequently Asked Questions or visit the Help with Scripts Forum.", "ideas.questionsBodyHTML": "Have more questions? See the Frequently Asked Questions or visit the Help with Scripts Forum.", - "ideas.cardsPurchase": "Purchase Printed Set", "ideas.MakeItFlyTitle": "Make It Fly", "ideas.MakeItFlyDescription": "Choose any character and make it fly!", "ideas.MakeItFlyImageDescription": "The scratch cat flies over the skyline. Alongside a flying taco.", - "ideas.RaceTitle": "Race to the Finish", - "ideas.RaceDescription": "Make a game where two characters race each other.", - "ideas.HideAndSeekTitle": "Hide and Seek", - "ideas.HideAndSeekDescription": "Make a hide-and-seek game with characters that appear and disappear.", - "ideas.FashionTitle": "Fashion Game", - "ideas.FashionDescription": "Make a game where you dress a character with different clothes and styles.", "ideas.PongTitle": "Pong Game", "ideas.PongDescription": "Make a bouncing ball game with sounds, points, and other effects.", "ideas.PongImageDescription": "A ball bounces off a digital paddle.", "ideas.ImagineTitle": "Imagine a World", "ideas.ImagineDescription": "Imagine a world where anything is possible.", "ideas.ImagineImageDescription": "A girl stands proudly in front of a thought bubble as big as the Earth and as intricate as butterfly wings.", - "ideas.DanceTitle": "Let's Dance", - "ideas.DanceDescription": "Design an animated dance scene with music and dance moves.", - "ideas.CatchTitle": "Catch Game", - "ideas.CatchDescription": "Make a game where you catch things falling from the sky.", - "ideas.VirtualPetTitle": "Virtual Pet", - "ideas.VirtualPetDescription": "Create an interactive pet that can eat, drink, and play." + "ideas.modalTitle": "Written Guides", + "ideas.modalSectionTitleSpritesAndSounds": "Sprites and Sounds", + "ideas.modalSectionTitleAdvancedTopics": "Advanced Topics", + "ideas.modalCardNameCreateSprite": "Create a Sprite with the Paint Editor", + "ideas.modalCardNameRemix": "Remix and Re-Imagine Sprites", + "ideas.modalCardNameBringDrawingsIntoScratch": "Bring Your Drawings Into Scratch", + "ideas.modalCardNameSound": "Sound: Add, Record, and Use Text to Speech Blocks", + "ideas.modalCardNameCreateAsset": "Create Your Own Asset Pack", + "ideas.modalCardNameConditionalStatements": "Conditional Statements", + "ideas.modalCardNameVariablesLists": "Variables and Lists", + "ideas.modalCardNameCustomBlocks": "Make Your Custom My Blocks", + "ideas.modalCardNameFaceSensing": "Scratch Lab Face Sensing Coding Cards", + "ideas.modalCardNameComputationalConcepts": "Turtle Graphics Coding Cards", + "ideas.downloadGuides": "Computer doesn’t allow Youtube? Download written guides for these topics." } diff --git a/static/images/ideas/advanced-topics.svg b/static/images/ideas/advanced-topics.svg new file mode 100644 index 00000000000..7da4e86a9ef --- /dev/null +++ b/static/images/ideas/advanced-topics.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/images/ideas/left-arrow.svg b/static/images/ideas/left-arrow.svg new file mode 100644 index 00000000000..296a055af89 --- /dev/null +++ b/static/images/ideas/left-arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/images/ideas/right-arrow.svg b/static/images/ideas/right-arrow.svg new file mode 100644 index 00000000000..1ceccd5dc24 --- /dev/null +++ b/static/images/ideas/right-arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/images/ideas/sprites-sounds.svg b/static/images/ideas/sprites-sounds.svg new file mode 100644 index 00000000000..6be0a409829 --- /dev/null +++ b/static/images/ideas/sprites-sounds.svg @@ -0,0 +1 @@ + \ No newline at end of file From 4038e22e2884449baf55152ee0fb48fb02fb4006 Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Fri, 22 Nov 2024 11:56:24 +0200 Subject: [PATCH 11/25] chore: [UEPR-48] added hex vslues for colours --- src/_colors.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/_colors.scss b/src/_colors.scss index 253753914a7..58608c9301d 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -25,8 +25,8 @@ $background-color: hsla(0, 0%, 99%, 1); //#FDFDFD $motion-blue-3: hsla(215, 60%, 50%, 1);//#3373CC -$ui-light-blue: hsla(195, 63%, 86%, 1); -$ui-cyan-blue: hsla(194, 73%, 36%, 1); +$ui-light-blue: hsla(195, 63%, 86%, 1); //#C5E7f2 +$ui-cyan-blue: hsla(194, 73%, 36%, 1); //#19809F /* UI Secondary Colors */ /* 3.0 colors */ @@ -51,7 +51,7 @@ $ui-light-primary: hsl(215, 100%, 95%); $ui-light-primary-transparent: hsla(215, 100%, 95%, 0); $ui-border: hsla(0, 0%, 85%, 1); //#D9D9D9 -$ui-border-light-blue: hsla(215, 50%, 90%, 1); //##D9E3F2 +$ui-border-light-blue: hsla(215, 50%, 90%, 1); //#D9E3F2 /* modals */ $ui-mint-green: hsl(163, 69%, 44%); From 4570d114ef5e0462f43e59db6e1b0ce41118a9ce Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Thu, 28 Nov 2024 09:22:04 +0200 Subject: [PATCH 12/25] uepr-108:renamed css class --- src/components/adminpanel/adminpanel.jsx | 2 +- src/components/adminpanel/adminpanel.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/adminpanel/adminpanel.jsx b/src/components/adminpanel/adminpanel.jsx index 926a7a4f537..3649348ff83 100644 --- a/src/components/adminpanel/adminpanel.jsx +++ b/src/components/adminpanel/adminpanel.jsx @@ -11,7 +11,7 @@ const AdminPanel = ({ onOpen, onClose }) => ( -
+
{isOpen ? ( Date: Thu, 28 Nov 2024 14:43:23 +0200 Subject: [PATCH 13/25] uepr-108:scoped css classname --- .../onboarding-navigation/onboarding-navigation.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/onboarding-navigation/onboarding-navigation.scss b/src/components/onboarding-navigation/onboarding-navigation.scss index dbfa2e11df3..589df0a8b62 100644 --- a/src/components/onboarding-navigation/onboarding-navigation.scss +++ b/src/components/onboarding-navigation/onboarding-navigation.scss @@ -21,10 +21,6 @@ } } -.hidden{ - visibility: hidden; -} - .navigation{ display: flex; width: 100%; @@ -32,6 +28,10 @@ align-items: center; margin-bottom: 40px; + .hidden{ + visibility: hidden; + } + .dotRow{ display: flex; justify-content: space-between; From 3b0f521a8096bff32a930f4d0f2380fdfca08033 Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Sun, 1 Dec 2024 17:58:42 +0200 Subject: [PATCH 14/25] Reordered rendering of elements, made the video render before it is visible --- src/components/intro/intro.jsx | 14 ++++++++------ src/components/intro/intro.scss | 8 ++++++++ src/components/video/video.jsx | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/components/intro/intro.jsx b/src/components/intro/intro.jsx index a9d31fd1972..9ff789c3718 100644 --- a/src/components/intro/intro.jsx +++ b/src/components/intro/intro.jsx @@ -3,6 +3,8 @@ const connect = require('react-redux').connect; const PropTypes = require('prop-types'); const React = require('react'); +const classnames = require('classnames'); + const navigationActions = require('../../redux/navigation.js'); const Video = require('../video/video.jsx'); @@ -52,13 +54,8 @@ class Intro extends React.Component { - {this.state.videoOpen ? + {!this.state.videoOpen && ( - diff --git a/src/components/video/video.jsx b/src/components/video/video.jsx index 715dffa3e38..99923443abb 100644 --- a/src/components/video/video.jsx +++ b/src/components/video/video.jsx @@ -12,11 +12,12 @@ class Video extends React.Component { videoStarted: false }; } + componentDidMount () { - /** - uses code snippets from - https://github.com/mrdavidjcole/wistia-player-react/blob/master/src/components/wistia_embed.js - **/ + if (!this.props.play) { + return; + } + if (!document.getElementById('wistia_script')) { const wistiaScript = document.createElement('script'); wistiaScript.id = 'wistia_script'; @@ -28,14 +29,14 @@ class Video extends React.Component { window._wq = window._wq || []; - // Use onReady in combination with the Wistia 'play' event handler so that onVideoStart() - // isn't called until the video actually starts. onReady fires before the video player is visible. window._wq.push({ id: this.props.videoId, onReady: video => { video.bind('play', () => { this.setState({videoStarted: true}); - this.props.onVideoStart(); + if (this.props.onVideoStart) { + this.props.onVideoStart(); + } return video.unbind; }); } @@ -43,10 +44,12 @@ class Video extends React.Component { } render () { - // Provide CSS classes for anything using the video component to configure what happens before and after - // the video has played for the first time. See VideoPreview for an example. + if (!this.props.play) { + return null; + } + const videoStartedClass = this.state.videoStarted ? 'iframe-video-started' : 'iframe-video-not-started'; - + return (