From 9134f6a2a652c0572e3f20e415dd41859e7c895d Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Mon, 28 Oct 2024 14:42:18 +0200 Subject: [PATCH 001/135] feat: [UEPR-67] restyle community guidelines page --- src/_colors.scss | 1 + src/views/guidelines/guidelines.jsx | 142 +++++++++--- src/views/guidelines/guidelines.scss | 218 ++++++++++++++++-- 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, 386 insertions(+), 56 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 ad8b3a916..aea15a2aa 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 e18d9aada..d399f47fc 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 92566445d..1b3bb426c 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; - } - } -} - -@media #{$medium-and-smaller}{ - .guidelines-footer { - img { - display: none; + .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; + } + } + } + + .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 20e1ff0d0..c9c3beb25 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 000000000..1bce18972 --- /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 000000000..635356fdc --- /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 000000000..baac468c9 --- /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 000000000..f27af60d7 --- /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 000000000..5a4151d8a --- /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 000000000..dfd53ea26 --- /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 000000000..ac6236b8c --- /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 000000000..99f8c9f2f --- /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 000000000..25cee1c3e --- /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 000000000..3b91a6016 --- /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 000000000..056314c1b --- /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 000000000..fcb9b1256 --- /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 000000000..8ddf93fd5 --- /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 000000000..d371c8874 --- /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 002/135] 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 d399f47fc..1cc5eb690 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 1b3bb426c..f6906334d 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 c9c3beb25..97cea2103 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 000000000..bd1a1682b --- /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 003/135] feat: [UEPR-90] Added new section to the ideas page --- src/_colors.scss | 1 + src/views/ideas/ideas.jsx | 489 +++++++++--------- src/views/ideas/ideas.scss | 282 +++++----- 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, 377 insertions(+), 407 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 ad8b3a916..60fdddfae 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 a93579351..f1057061d 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 - }); +]; + +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' + } } - 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} - /> - ); - }); - } - render () { - return ( -
-
- -
- {this.props.intl.formatMessage({id: -

- -

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

- -

-

- -

-
- - {this.renderTiles()} - - - - - -
-
-
-
-
- -
-

- -

-

- -

- - - -
-
- {this.props.intl.formatMessage({id: -
- -
-
+ +
+
-
-
-
-
- -
- {this.props.intl.formatMessage({id: -
-
-

- -

-

- -

-

- - - -

-
- +
+
-
-
-
- -
+ + {tipsSectionData.map((tipData, index) => ( + -
- -

- -

-

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

-
- -
+ ))} +
- ); - } -} - -Ideas.propTypes = { - intl: intlShape +
+
+
+ +
+ + {physicalIdeasData.map((physicalIdea, index) => ( +
+ +
+

+ +

+

+ +

+ + + +
+
+ ))} + +
+
+
+
+ +
+ +

+ +

+

+ {chunks}}} + /> +

+
+
+ +

+ +

+

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

+
+ +
+
+
+ ); }; -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 317c23d0a..6486ec1b3 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 { +.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; + } + } + } + } +} + +.physical-ideas { + .inner { + display: flex; + flex-direction: column; + gap: 1.5rem; + + .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; + } + } + } + + .physical-idea:first-child { + flex: 1.5; + } + + .physical-idea:last-child { + flex: 2; + } + } + } +} + +.tips, .physical-ideas { 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; - } -} - -.ideas-button { - margin-right: .75rem; - background-color: $ui-purple-dark; - color: $ui-white; - font-size: 1rem; - - img { - margin-right: 1rem; - height: 1.5rem; - vertical-align: middle; - } - - a { - color: $ui-white; - } - - span { - vertical-align: middle; - } -} - -.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-left { - justify-content: flex-start; -} - -.ideas-image { - margin-right: 2rem; -} - -.tips-activity-guides { - background-color: $ui-light-gray; - padding-bottom: 2rem; -} - -.purchase-button { - img { - margin-right: 0; - margin-left: .75rem; - width: 1rem; - vertical-align: baseline; - } -} - -.tips-info-section { - padding: 2.5rem 0; - width: 100%; - flex-wrap: nowrap; -} - -.tips-info-body { - text-align: left; -} - -.tips-cards-buttons { - a { - white-space: normal; - } + padding: 3rem 0; + background-color: $gray-50; } .gray-area { background-color: $ui-gray; + + .tips-info-section { + padding: 2.5rem 0; + width: 100%; + flex-wrap: nowrap; + + .tips-info-body { + text-align: left; + } + } + + img.tips-icon { + height: 1.75rem; + } } -img.tips-icon { - height: 1.75rem; +.section-header { + font-size: 2rem; + font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; + font-weight: 700; } + +.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; + + width: 100%; + padding: 0.5rem 0; + + border-radius: 4px; +} + //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,23 +205,23 @@ img.tips-icon { } } - .ttt-head { - p { - max-width: $cols6; - } - } - - .tips-info-section { - &.mod-align-top { - align-items: flex-start; - } - } - .tips-info-body { max-width: $cols4; } } +@media #{$intermediate-and-smaller}{ + .physical-ideas { + .inner { + .physical-ideas-section { + .physical-idea:first-child { + flex: 2; + } + } + } + } +} + // 12 columns @media #{$big} { .title-banner { @@ -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 afbec418a..2073ceeff 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 e105c1dfb..af9a45889 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 000000000..e68defc25 --- /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 004/135] 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 1cc5eb690..d6395ff1f 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 97cea2103..ca8b703ad 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 005/135] feat: [UEPR-67] Added alternative texts for images on guidelines page --- src/views/guidelines/guidelines.jsx | 150 ++++++++++++++++------------ src/views/guidelines/l10n.json | 15 ++- 2 files changed, 101 insertions(+), 64 deletions(-) diff --git a/src/views/guidelines/guidelines.jsx b/src/views/guidelines/guidelines.jsx index d6395ff1f..c76c0934e 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}) => ( - - - - - ))} -
-
-
- {pageSections.map( - ({id, headerTextId, contentTexts, sectionImgSrc}, index) => ( -
-
-
+const Guidelines = () => { + 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) => ( +
+
+
+ +
+

+ +

+

+ +

-

- -

-

- -

+ {intl.formatMessage({id:
- -
- ) - )} -
-
-); + ) + )} + +
+ ); +}; render( diff --git a/src/views/guidelines/l10n.json b/src/views/guidelines/l10n.json index ca8b703ad..4764f3ce8 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 eb89f6c65033b8e887a0710a92a037dcf3958bf3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:46:35 +0000 Subject: [PATCH 006/135] fix(deps): lock file maintenance --- package-lock.json | 112 +++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19c3efdf1..da3938a19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -370,9 +370,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", - "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz", + "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==", "dev": true, "license": "MIT", "dependencies": { @@ -5523,14 +5523,14 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", - "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", + "version": "0.4.12", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz", + "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==", "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.6.2", + "@babel/helper-define-polyfill-provider": "^0.6.3", "semver": "^6.3.1" }, "peerDependencies": { @@ -5552,13 +5552,13 @@ } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", - "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz", + "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.2" + "@babel/helper-define-polyfill-provider": "^0.6.3" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -5814,9 +5814,9 @@ "license": "MIT" }, "node_modules/bn.js": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", - "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz", + "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "dev": true, "license": "MIT" }, @@ -6551,9 +6551,9 @@ "license": "MIT" }, "node_modules/caniuse-lite": { - "version": "1.0.30001679", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz", - "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==", + "version": "1.0.30001680", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", + "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", "dev": true, "funding": [ { @@ -8976,9 +8976,9 @@ } }, "node_modules/dompurify": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz", - "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.0.tgz", + "integrity": "sha512-AMdOzK44oFWqHEi0wpOqix/fUNY707OmoeFDnbi3Q5I8uOpy21ufUA5cDJPr0bosxrflOVD/H2DMSvuGKJGfmQ==", "dev": true, "license": "(MPL-2.0 OR Apache-2.0)" }, @@ -9246,9 +9246,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.55", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz", - "integrity": "sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==", + "version": "1.5.56", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.56.tgz", + "integrity": "sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==", "dev": true, "license": "ISC" }, @@ -19506,14 +19506,14 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", - "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz", + "integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==", "dev": true, "license": "MIT", "dependencies": { "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", + "postcss-selector-parser": "^7.0.0", "postcss-value-parser": "^4.1.0" }, "engines": { @@ -19524,13 +19524,13 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", - "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz", + "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==", "dev": true, "license": "ISC", "dependencies": { - "postcss-selector-parser": "^6.0.4" + "postcss-selector-parser": "^7.0.0" }, "engines": { "node": "^10 || ^12 || >= 14" @@ -19556,9 +19556,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", - "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz", + "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==", "dev": true, "license": "MIT", "dependencies": { @@ -22068,9 +22068,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.310", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.310.tgz", - "integrity": "sha512-4CrTZ8Lcw8InfodNz6btNNfQ9QtjTZ1ZiuyZ7N9V8Wwe3fmcWn/Kffq/fqLRN9C41nhmsJSQZ2v+Nb3jRGKo9w==", + "version": "1.0.313", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.313.tgz", + "integrity": "sha512-nRBusoUfHXo1Ua+xy+7JAtJZoZsnGX7CDr6S18Xl2h3WKR4Ww+Y6iXcEqHtFLst5jCsdPoxkhcZUwipZAIE+KA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22477,9 +22477,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.487", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.487.tgz", - "integrity": "sha512-qwlv2snJPRXTAKLlU9Dsd3ncVE6S7rvqo1we7CFDraaQIfxMeajaMOMp5jwOoBGdoOdyYlKiPo/1PNmjzqaQyw==", + "version": "2.2.490", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.490.tgz", + "integrity": "sha512-dxGzIVpBZR4gEfn52rMcadIRSPrflIKDo4XLjckXou36AUWoljOvJRiW3/i9PK1ITFFqJYgJaP1myaSGaYIYNg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22545,9 +22545,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.90", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.90.tgz", - "integrity": "sha512-pcbNQd/473r5wGa3GTBgz7r+J9G5s3iWw0v55rEq27KvmdZKiIgD9/EWowbrrPu5rlJMQ5BaRaRJfXxqbeIJsw==", + "version": "1.2.94", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.94.tgz", + "integrity": "sha512-1Ls6VT+jOWI/af1TJf/taz7i2us0jJL2uapGlQB09yfdiTLKZKT4mUSGdDpXOzHv8Vlf64GjzFvoa5JrCx1YFQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22565,9 +22565,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.123", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.123.tgz", - "integrity": "sha512-sAMxwwAg7fP0T73U7Fs8/u7wHHFtiV62MykGrTf0SzJXOGx4xu4illVKKa/CyYh6Kh2fsgSyucNdkD2zHi2x2Q==", + "version": "1.0.125", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.125.tgz", + "integrity": "sha512-9+fWqxAL1Dn7MbmeE9iJjwF8sl6Preb9Cf2YxhUz+9jNwnbIR676Xioyoc/GKkSI5TNUY8XPoVWoYD/MsjWNaQ==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -22597,9 +22597,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.303", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.303.tgz", - "integrity": "sha512-HJGH6xJXyThzzuqkSbXzln+2CxC2wpf1lEIUd4WjQD4BG2P3RucQynWM9bDHJA9bZsviyNiKmX3uPhscRdqXqw==", + "version": "1.0.306", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.306.tgz", + "integrity": "sha512-SYwuuKry5ktBMv3/AMj6NGCeOVTgOcrgS+oQpYiGeQjIiWMjUWxiwqkr/3FLMzcc7OrzDGU0AdZbsfn8bUMs0g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22657,9 +22657,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.34", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.34.tgz", - "integrity": "sha512-iTdI3Fql7WbeY2Cf4Bsotji5vizNfoDtVb90nLkJaNr4sDof9IP64+0y+p5dEn33r+XDubz9bhf+05U/zkX/Yg==", + "version": "2.5.35", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.35.tgz", + "integrity": "sha512-qENj9wA1cucU7aTwYxQlIv8qBHHI5AKsvD4CmxwsDEuEE7ZzYxVzZ5wyVaNCjm07Tnl+aZ7QbZyPx2xcWcsD3g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22700,9 +22700,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.79", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.79.tgz", - "integrity": "sha512-2FJssRj9PU47spmvRimoHkBZKneoc3xXoTkxbt1+OJEoVk5nnH6HwO0GcQZa2HmxR32IHjuqcOyqkENRtgapnw==", + "version": "4.8.82", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.82.tgz", + "integrity": "sha512-7uttoV6JYXH5OyToK09cqYwepSt6IcyKPbR0DUCRb/+4oA4367UU5ES5+PWaDjBw5MfB51KO4DNg7OC93pIiQg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22723,7 +22723,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.34", + "scratch-svg-renderer": "2.5.35", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", From 200569099fc544bf6aad3eb8b22476e3813cdbc6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:53:21 +0000 Subject: [PATCH 007/135] chore(deps): update dependency postcss to v8.4.48 --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index af798c21b..ac0ec012f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -88,7 +88,7 @@ "minilog": "2.1.0", "pako": "0.2.8", "plotly.js": "1.47.4", - "postcss": "8.4.47", + "postcss": "8.4.48", "postcss-import": "12.0.1", "postcss-loader": "4.3.0", "postcss-simple-vars": "5.0.2", @@ -19359,9 +19359,9 @@ } }, "node_modules/postcss": { - "version": "8.4.47", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", - "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", + "version": "8.4.48", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.48.tgz", + "integrity": "sha512-GCRK8F6+Dl7xYniR5a4FYbpBzU8XnZVeowqsQFYdcXuSbChgiks7qybSkbvnaeqv0G0B+dd9/jJgH8kkLDQeEA==", "dev": true, "funding": [ { @@ -19380,7 +19380,7 @@ "license": "MIT", "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.1.0", + "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, "engines": { diff --git a/package.json b/package.json index 04ff696db..5c4070dc6 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "minilog": "2.1.0", "pako": "0.2.8", "plotly.js": "1.47.4", - "postcss": "8.4.47", + "postcss": "8.4.48", "postcss-import": "12.0.1", "postcss-loader": "4.3.0", "postcss-simple-vars": "5.0.2", From 292ae6564017bcd10352219987896f231935a8b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 01:50:06 +0000 Subject: [PATCH 008/135] chore(deps): update node.js to v18.20.5 --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 17719ce25..1117d417c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.20.4 +18.20.5 From 05f053fd2cbbb6856b4992693961aa3750ba0570 Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Thu, 14 Nov 2024 10:24:45 +0200 Subject: [PATCH 009/135] 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 f6906334d..6012cb20e 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 ea281818e4499b4a80538bf00c2e1cea3fe20714 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 08:32:50 +0000 Subject: [PATCH 010/135] fix(deps): lock file maintenance --- package-lock.json | 76 +++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2330cf06d..e66fb4613 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9246,9 +9246,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.56", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.56.tgz", - "integrity": "sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==", + "version": "1.5.58", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.58.tgz", + "integrity": "sha512-al2l4r+24ZFL7WzyPTlyD0fC33LLzvxqLCwurtBibVPghRGO9hSTl+tis8t1kD7biPiH/en4U0I7o/nQbYeoVA==", "dev": true, "license": "ISC" }, @@ -9523,9 +9523,9 @@ } }, "node_modules/es-abstract": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", - "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "version": "1.23.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.4.tgz", + "integrity": "sha512-HR1gxH5OaiN7XH7uiWH0RLw0RcFySiSoW1ctxmD1ahTw3uGBtkmm/ng0tDU1OtYx5OK6EOL5Y6O21cDflG3Jcg==", "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", @@ -9543,7 +9543,7 @@ "function.prototype.name": "^1.1.6", "get-intrinsic": "^1.2.4", "get-symbol-description": "^1.0.2", - "globalthis": "^1.0.3", + "globalthis": "^1.0.4", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.3", @@ -9559,10 +9559,10 @@ "is-string": "^1.0.7", "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", + "object-inspect": "^1.13.3", "object-keys": "^1.1.1", "object.assign": "^4.1.5", - "regexp.prototype.flags": "^1.5.2", + "regexp.prototype.flags": "^1.5.3", "safe-array-concat": "^1.1.2", "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.9", @@ -12093,9 +12093,9 @@ } }, "node_modules/gl-text/node_modules/regl": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/regl/-/regl-2.1.0.tgz", - "integrity": "sha512-oWUce/aVoEvW5l2V0LK7O5KJMzUSKeiOwFuJehzpSFd43dO5spP9r+sSUfhKtsky4u6MCqWJaRL+abzExynfTg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/regl/-/regl-2.1.1.tgz", + "integrity": "sha512-+IOGrxl3FZ8ZM9ixCWQZzFRiRn7Rzn9bu3iFHwg/yz4tlOUQgbO4PHLgG+1ZT60zcIV8tief6Qrmyl8qcoJP0g==", "dev": true, "license": "MIT" }, @@ -22068,9 +22068,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.313", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.313.tgz", - "integrity": "sha512-nRBusoUfHXo1Ua+xy+7JAtJZoZsnGX7CDr6S18Xl2h3WKR4Ww+Y6iXcEqHtFLst5jCsdPoxkhcZUwipZAIE+KA==", + "version": "1.0.315", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.315.tgz", + "integrity": "sha512-2YGSXqKTxs6rnkM2MDX3O7Q+xB16DsRi6H6o3DWVnhnEVsENAQelE4Ng+nnnUumE/G6PTtu5wd10MdCKm/vZ/A==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22477,9 +22477,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.490", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.490.tgz", - "integrity": "sha512-dxGzIVpBZR4gEfn52rMcadIRSPrflIKDo4XLjckXou36AUWoljOvJRiW3/i9PK1ITFFqJYgJaP1myaSGaYIYNg==", + "version": "2.2.494", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.494.tgz", + "integrity": "sha512-fothMEo2K9bmlznW7huXQAMESi44SLURlBsU8Avvzrd6pTcSo43m15O6gax+oLHCDT0JexSSyciJRkmA2C3Kog==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22545,9 +22545,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.94", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.94.tgz", - "integrity": "sha512-1Ls6VT+jOWI/af1TJf/taz7i2us0jJL2uapGlQB09yfdiTLKZKT4mUSGdDpXOzHv8Vlf64GjzFvoa5JrCx1YFQ==", + "version": "1.2.98", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.98.tgz", + "integrity": "sha512-LV6vOWKGZ1M5qERvhsrR0swrvtxWSDkWs9xmzMrct0/r/F9273kZ8B6JUjGJs/Snqc8HquGsH+5XGXJb4M4phA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22597,9 +22597,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.306", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.306.tgz", - "integrity": "sha512-SYwuuKry5ktBMv3/AMj6NGCeOVTgOcrgS+oQpYiGeQjIiWMjUWxiwqkr/3FLMzcc7OrzDGU0AdZbsfn8bUMs0g==", + "version": "1.0.308", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.308.tgz", + "integrity": "sha512-WxdkzMAGO0Pm0ikfVn60nvKxPA/f6Lv2zM7Lg5k1NOpvPyE63GVtvtVZNzWHIDr/+/F+b8vb7wqg4qL2GiRgLg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22657,9 +22657,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.35", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.35.tgz", - "integrity": "sha512-qENj9wA1cucU7aTwYxQlIv8qBHHI5AKsvD4CmxwsDEuEE7ZzYxVzZ5wyVaNCjm07Tnl+aZ7QbZyPx2xcWcsD3g==", + "version": "2.5.37", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.37.tgz", + "integrity": "sha512-GaGYkiz0RxLsNf6qjufSpQUGm4qiU1LwKe7nyba+/V32TvBunD9ooz1+Uy28CgL46lWitPqC/+tJ+NS8qAboLQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22700,9 +22700,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.82", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.82.tgz", - "integrity": "sha512-7uttoV6JYXH5OyToK09cqYwepSt6IcyKPbR0DUCRb/+4oA4367UU5ES5+PWaDjBw5MfB51KO4DNg7OC93pIiQg==", + "version": "4.8.87", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.87.tgz", + "integrity": "sha512-/usqe23NEI8ALYnHF/TMxA+1J2MIAAZMCQvXbxqvc+t8DrHVt1ujNGKp9TO80/n+zK7mqAo+G41+/Sle5DygSg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22723,7 +22723,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.35", + "scratch-svg-renderer": "2.5.37", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", @@ -26576,22 +26576,22 @@ "license": "ISC" }, "node_modules/tldts": { - "version": "6.1.60", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.60.tgz", - "integrity": "sha512-TYVHm7G9NCnhgqOsFalbX6MG1Po5F4efF+tLfoeiOGQq48Oqgwcgz8upY2R1BHWa4aDrj28RYx0dkYJ63qCFMg==", + "version": "6.1.61", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.61.tgz", + "integrity": "sha512-rv8LUyez4Ygkopqn+M6OLItAOT9FF3REpPQDkdMx5ix8w4qkuE7Vo2o/vw1nxKQYmJDV8JpAMJQr1b+lTKf0FA==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^6.1.60" + "tldts-core": "^6.1.61" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.60", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.60.tgz", - "integrity": "sha512-XHjoxak8SFQnHnmYHb3PcnW5TZ+9ErLZemZei3azuIRhQLw4IExsVbL3VZJdHcLeNaXq6NqawgpDPpjBOg4B5g==", + "version": "6.1.61", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.61.tgz", + "integrity": "sha512-In7VffkDWUPgwa+c9picLUxvb0RltVwTkSgMNFgvlGSWveCzGBemBqTsgJCL4EDFWZ6WH0fKTsot6yNhzy3ZzQ==", "dev": true, "license": "MIT" }, From 94984d7d59fec40831fe83829487d8a12ffd105e Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Thu, 14 Nov 2024 11:39:01 +0200 Subject: [PATCH 011/135] 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 6486ec1b3..5b184468d 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 af9a45889..53a4faffa 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 40c4fbf0dd5302fbc66e36ea3ffca8016efbb6c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 12:46:13 +0000 Subject: [PATCH 012/135] fix(deps): update dependency scratch-gui to v4.1.3 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2330cf06d..74103bc07 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.80.6", "sass-loader": "10.5.2", - "scratch-gui": "4.1.2", + "scratch-gui": "4.1.3", "scratch-l10n": "4.0.24", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22192,9 +22192,9 @@ } }, "node_modules/scratch-gui": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.2.tgz", - "integrity": "sha512-uS7qTAAMF6vjiyN0c+sHqrSGFOR3mA5T2fb1dl4nwWNEKYNGXQnRayjEzpOKL8Foo5uBOg4Qigf1mV3BRu/iiA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.3.tgz", + "integrity": "sha512-9FElZ/wr7By9BreFnhv2AB+asw11qIoQIzvykQwCJ34AQSLfq0ip1eSUrfo/LkRkIXgzs0kma5H5hCFOGXRlng==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 5c4070dc6..6edebbe53 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.80.6", "sass-loader": "10.5.2", - "scratch-gui": "4.1.2", + "scratch-gui": "4.1.3", "scratch-l10n": "4.0.24", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From a2337ab338004bb2c986fcf5ced86d0defbf297e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 21:39:58 +0000 Subject: [PATCH 013/135] chore(deps): update dependency postcss to v8.4.49 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 74103bc07..e94af60a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -88,7 +88,7 @@ "minilog": "2.1.0", "pako": "0.2.8", "plotly.js": "1.47.4", - "postcss": "8.4.48", + "postcss": "8.4.49", "postcss-import": "12.0.1", "postcss-loader": "4.3.0", "postcss-simple-vars": "5.0.2", @@ -19359,9 +19359,9 @@ } }, "node_modules/postcss": { - "version": "8.4.48", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.48.tgz", - "integrity": "sha512-GCRK8F6+Dl7xYniR5a4FYbpBzU8XnZVeowqsQFYdcXuSbChgiks7qybSkbvnaeqv0G0B+dd9/jJgH8kkLDQeEA==", + "version": "8.4.49", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", + "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 6edebbe53..4d2995648 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "minilog": "2.1.0", "pako": "0.2.8", "plotly.js": "1.47.4", - "postcss": "8.4.48", + "postcss": "8.4.49", "postcss-import": "12.0.1", "postcss-loader": "4.3.0", "postcss-simple-vars": "5.0.2", From 0feeb8038d8e79a9e84f2920b838ae8129770db5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 05:05:57 +0000 Subject: [PATCH 014/135] fix(deps): update dependency scratch-l10n to v4.0.25 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e94af60a5..74806442c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.80.6", "sass-loader": "10.5.2", "scratch-gui": "4.1.3", - "scratch-l10n": "4.0.24", + "scratch-l10n": "4.0.25", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.24", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.24.tgz", - "integrity": "sha512-8HoTKkTWGCUiXvYJmhdsEEei6PJ50Ffll3vgc5shSCgYhR1asSMRp1nYq80o7BJyT+0/FOXfPCheMv4+gPjBvw==", + "version": "4.0.25", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.25.tgz", + "integrity": "sha512-psLx9QZS7tac2qcP7LOZHLUUWZBX8aQSci+UkQ7i9lO5RS0Jt7g+kZbmxxRzwlmMgsWKa4NxfP7VVclhMA4p+Q==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 4d2995648..59029505e 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.80.6", "sass-loader": "10.5.2", "scratch-gui": "4.1.3", - "scratch-l10n": "4.0.24", + "scratch-l10n": "4.0.25", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 1aff5f45cffb1d557bc8403e6df64c023bb734c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:09:36 +0000 Subject: [PATCH 015/135] fix(deps): update dependency scratch-l10n to v4.0.27 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 74806442c..d016a1973 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.80.6", "sass-loader": "10.5.2", "scratch-gui": "4.1.3", - "scratch-l10n": "4.0.25", + "scratch-l10n": "4.0.27", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.25", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.25.tgz", - "integrity": "sha512-psLx9QZS7tac2qcP7LOZHLUUWZBX8aQSci+UkQ7i9lO5RS0Jt7g+kZbmxxRzwlmMgsWKa4NxfP7VVclhMA4p+Q==", + "version": "4.0.27", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.27.tgz", + "integrity": "sha512-CYOLzWXbtCZTZGMFLSxurz+rfiyl+pVT+wqoqT1xy00N8EqCNe4rV+dvIHYNQWLd1meycXXWMRf0bZA+tc5Cvw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 59029505e..7b34cad67 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.80.6", "sass-loader": "10.5.2", "scratch-gui": "4.1.3", - "scratch-l10n": "4.0.25", + "scratch-l10n": "4.0.27", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From b87af050dab2d470c1d25aa1f397c9dda4abbc4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 00:31:26 +0000 Subject: [PATCH 016/135] chore(deps): update dependency sass to v1.80.7 --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index d016a1973..93ca0f774 100644 --- a/package-lock.json +++ b/package-lock.json @@ -109,7 +109,7 @@ "redux-mock-store": "1.5.5", "redux-thunk": "2.4.2", "regenerator-runtime": "0.13.9", - "sass": "1.80.6", + "sass": "1.80.7", "sass-loader": "10.5.2", "scratch-gui": "4.1.3", "scratch-l10n": "4.0.27", @@ -13304,9 +13304,9 @@ "license": "MIT" }, "node_modules/immutable": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", - "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz", + "integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==", "dev": true, "license": "MIT" }, @@ -21905,14 +21905,14 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.80.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz", - "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==", + "version": "1.80.7", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.7.tgz", + "integrity": "sha512-MVWvN0u5meytrSjsU7AWsbhoXi1sc58zADXFllfZzbsBT1GHjjar6JwBINYPRrkx/zqnQ6uqbQuHgE95O+C+eQ==", "dev": true, "license": "MIT", "dependencies": { "chokidar": "^4.0.0", - "immutable": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { diff --git a/package.json b/package.json index 7b34cad67..eb87d42b8 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "redux-mock-store": "1.5.5", "redux-thunk": "2.4.2", "regenerator-runtime": "0.13.9", - "sass": "1.80.6", + "sass": "1.80.7", "sass-loader": "10.5.2", "scratch-gui": "4.1.3", "scratch-l10n": "4.0.27", From 6801b840024ab8bdf257e1a2cfa6f73a5331a4bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 10:15:16 +0000 Subject: [PATCH 017/135] fix(deps): update dependency scratch-l10n to v4.0.30 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f24c2a1c2..140c2ed2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.80.7", "sass-loader": "10.5.2", "scratch-gui": "4.1.3", - "scratch-l10n": "4.0.27", + "scratch-l10n": "4.0.30", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.27", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.27.tgz", - "integrity": "sha512-CYOLzWXbtCZTZGMFLSxurz+rfiyl+pVT+wqoqT1xy00N8EqCNe4rV+dvIHYNQWLd1meycXXWMRf0bZA+tc5Cvw==", + "version": "4.0.30", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.30.tgz", + "integrity": "sha512-uhHzq55doU4voz6qawG1O9vYd7slJ4vMHUKc3mVLpUxXDWFGnGrT60FDey/j0W1AXbeJMlTk/6txMMFkFUQQFA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index eb87d42b8..4c9cb1429 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.80.7", "sass-loader": "10.5.2", "scratch-gui": "4.1.3", - "scratch-l10n": "4.0.27", + "scratch-l10n": "4.0.30", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From abb45dea061ab21cfe6aa66076ed2557b15e60f2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 10:17:49 +0000 Subject: [PATCH 018/135] fix(deps): lock file maintenance --- package-lock.json | 62 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index f24c2a1c2..f7dbd0448 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9246,9 +9246,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.58", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.58.tgz", - "integrity": "sha512-al2l4r+24ZFL7WzyPTlyD0fC33LLzvxqLCwurtBibVPghRGO9hSTl+tis8t1kD7biPiH/en4U0I7o/nQbYeoVA==", + "version": "1.5.62", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.62.tgz", + "integrity": "sha512-t8c+zLmJHa9dJy96yBZRXGQYoiCEnHYgFwn1asvSPZSUdVxnB62A4RASd7k41ytG3ErFBA0TpHlKg9D9SQBmLg==", "dev": true, "license": "ISC" }, @@ -9523,9 +9523,9 @@ } }, "node_modules/es-abstract": { - "version": "1.23.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.4.tgz", - "integrity": "sha512-HR1gxH5OaiN7XH7uiWH0RLw0RcFySiSoW1ctxmD1ahTw3uGBtkmm/ng0tDU1OtYx5OK6EOL5Y6O21cDflG3Jcg==", + "version": "1.23.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.5.tgz", + "integrity": "sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==", "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", @@ -11004,9 +11004,9 @@ } }, "node_modules/flow-remove-types": { - "version": "2.252.0", - "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.252.0.tgz", - "integrity": "sha512-Vv3p2UjixHt2ISJJUwbGmXA104uegB79eEGuqr5uOlJDD7JdiZgR2jH+Mxqaq1gRQXBenHKGgRVLJkgtKn98DQ==", + "version": "2.253.0", + "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.253.0.tgz", + "integrity": "sha512-4L1X1FZE08AOe9SMyqFhyl+TSM6L+tHbVBfIMQsZHduPUwnTuIs5jfVyz35bRAS67k2c1e14qSosgYVi+Uuj1Q==", "dev": true, "license": "MIT", "dependencies": { @@ -22068,9 +22068,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.315", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.315.tgz", - "integrity": "sha512-2YGSXqKTxs6rnkM2MDX3O7Q+xB16DsRi6H6o3DWVnhnEVsENAQelE4Ng+nnnUumE/G6PTtu5wd10MdCKm/vZ/A==", + "version": "1.0.320", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.320.tgz", + "integrity": "sha512-wZwgxXqAzqv/NN+Ps/NbLn1xWyvjGrYirumcflzDuQbIJxxj8CXF0ChN029S1ydFWbHodsKLRxICgF5yfX5HXQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22477,9 +22477,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.494", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.494.tgz", - "integrity": "sha512-fothMEo2K9bmlznW7huXQAMESi44SLURlBsU8Avvzrd6pTcSo43m15O6gax+oLHCDT0JexSSyciJRkmA2C3Kog==", + "version": "2.2.498", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.498.tgz", + "integrity": "sha512-Xe4gOaLm317ngGjpG4FNDWjysHsBEf/h0ypGKAlCnRoqeEXmTMgoM68qisgBNV9gNWZ7/fwciv1bdDcQ9ovSmg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22545,9 +22545,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.98", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.98.tgz", - "integrity": "sha512-LV6vOWKGZ1M5qERvhsrR0swrvtxWSDkWs9xmzMrct0/r/F9273kZ8B6JUjGJs/Snqc8HquGsH+5XGXJb4M4phA==", + "version": "1.2.104", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.104.tgz", + "integrity": "sha512-hDGfW0AsWWKmW7XALjNqdS3C7gsdpC02GL4qfDRBNIkNrcB5QvOFOlvWQaEFDPE879a5EST77Us3e3mk5/zFeg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22565,9 +22565,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.125", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.125.tgz", - "integrity": "sha512-9+fWqxAL1Dn7MbmeE9iJjwF8sl6Preb9Cf2YxhUz+9jNwnbIR676Xioyoc/GKkSI5TNUY8XPoVWoYD/MsjWNaQ==", + "version": "1.0.126", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.126.tgz", + "integrity": "sha512-XBK88BjPMdBK1MOIKafGibCaSaoPj2sueu1QglRL2WFKy6y66v830TTfE1ugHK5RCXCbDFx7iJV1QOgJqkSFHw==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -22597,9 +22597,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.308", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.308.tgz", - "integrity": "sha512-WxdkzMAGO0Pm0ikfVn60nvKxPA/f6Lv2zM7Lg5k1NOpvPyE63GVtvtVZNzWHIDr/+/F+b8vb7wqg4qL2GiRgLg==", + "version": "1.0.311", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.311.tgz", + "integrity": "sha512-Rz7g05oW+IS60wqEG5y6b/l3R8v/maGpICyqqMzdfNOP1KAkgykBb9+VubYiGm9Sgr9VzphEWpkI79bYEOKPuw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22657,9 +22657,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.37", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.37.tgz", - "integrity": "sha512-GaGYkiz0RxLsNf6qjufSpQUGm4qiU1LwKe7nyba+/V32TvBunD9ooz1+Uy28CgL46lWitPqC/+tJ+NS8qAboLQ==", + "version": "2.5.38", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.38.tgz", + "integrity": "sha512-71MwTICnoAr3l7ytETlORxKUBfRlURLvvHXhPoVLlGhL9t5Byuly/JkxiCglELFzbH8pGnN5rBHR7bzTpD9PkA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22700,9 +22700,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.87", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.87.tgz", - "integrity": "sha512-/usqe23NEI8ALYnHF/TMxA+1J2MIAAZMCQvXbxqvc+t8DrHVt1ujNGKp9TO80/n+zK7mqAo+G41+/Sle5DygSg==", + "version": "4.8.91", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.91.tgz", + "integrity": "sha512-495Qbqe2XVqjB9/Wz0HpEVwubSVdL74Lrx4pyYvBnoEG4sZ1wWLfWB8ZNzHf16vETZ5U7zDcUayVUacg6e1jdQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22723,7 +22723,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.37", + "scratch-svg-renderer": "2.5.38", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", From 9ab4c88ea55a3eacaa28ceda71e29a41dda19090 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:21:38 +0000 Subject: [PATCH 019/135] fix(deps): update dependency scratch-gui to v4.1.4 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 140c2ed2a..72b6d3f92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.80.7", "sass-loader": "10.5.2", - "scratch-gui": "4.1.3", + "scratch-gui": "4.1.4", "scratch-l10n": "4.0.30", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22192,9 +22192,9 @@ } }, "node_modules/scratch-gui": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.3.tgz", - "integrity": "sha512-9FElZ/wr7By9BreFnhv2AB+asw11qIoQIzvykQwCJ34AQSLfq0ip1eSUrfo/LkRkIXgzs0kma5H5hCFOGXRlng==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.4.tgz", + "integrity": "sha512-rUySVNHqYRuXI8NV+P5Ugq8euZ1TLYah0LDc+cuj7Z6uU0RGpqp7ubkZFhA0+MMIA473VTau0Toxw2DDzN4bpg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 4c9cb1429..8702258ee 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.80.7", "sass-loader": "10.5.2", - "scratch-gui": "4.1.3", + "scratch-gui": "4.1.4", "scratch-l10n": "4.0.30", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From 017b307fc7f229b0628cad6af901e575c8366f3d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 03:52:13 +0000 Subject: [PATCH 020/135] chore(deps): update dependency sass to v1.81.0 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72b6d3f92..5df1fac4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -109,7 +109,7 @@ "redux-mock-store": "1.5.5", "redux-thunk": "2.4.2", "regenerator-runtime": "0.13.9", - "sass": "1.80.7", + "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.4", "scratch-l10n": "4.0.30", @@ -21905,9 +21905,9 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.7.tgz", - "integrity": "sha512-MVWvN0u5meytrSjsU7AWsbhoXi1sc58zADXFllfZzbsBT1GHjjar6JwBINYPRrkx/zqnQ6uqbQuHgE95O+C+eQ==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.81.0.tgz", + "integrity": "sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 8702258ee..2fb9930de 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "redux-mock-store": "1.5.5", "redux-thunk": "2.4.2", "regenerator-runtime": "0.13.9", - "sass": "1.80.7", + "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.4", "scratch-l10n": "4.0.30", From 226780c0892fcabe63ff48676fba87d7756ac8dd Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Mon, 18 Nov 2024 10:31:23 +0200 Subject: [PATCH 021/135] feat: [UEPR-48] redesign welcome section --- src/_colors.scss | 4 + src/components/welcome/welcome.jsx | 78 +++++++--------- src/components/welcome/welcome.scss | 98 +++++++------------- 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, 201 insertions(+), 114 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 ad8b3a916..253753914 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 1606a229c..fcb8f1f6c 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 230653382..15c358d10 100644 --- a/src/components/welcome/welcome.scss +++ b/src/components/welcome/welcome.scss @@ -2,76 +2,48 @@ .welcome { .box-content { + display: flex ; + flex-direction: column; + justify-content: center; + align-items: center; + flex: 1 1 100%; + 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; - } - - $color-bars: "h4:before, > a:after"; - - #{$color-bars} { - display: block; - margin: 10px 0; - border-radius: 5px; + .welcome-banner { width: 100%; - height: 10px; - content: ""; + 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; } - img { - display: block; - max-width: 133px; - max-height: 100px; - } + .welcome-options { + display: flex; + justify-content: center; + align-items: center; + gap: 1rem; + flex-wrap: wrap; - &.blue { - #{$color-bars} { - background-color: $ui-blue; - } + padding: 1.5rem 0; - a { - color: $ui-blue; - } - - img { - margin-left: 4px; - } - } - - &.green { - #{$color-bars} { - background-color: $ui-aqua; - } - - a { - color: $ui-aqua; - } - } - - &.pink { - #{$color-bars} { - background-color: $ui-purple; - } - - a { - color: $ui-purple; + .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 79bc1e3bc..bd897708a 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 90296fe91..a1bb9af60 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 647258bd1..89a54e827 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 000000000..737df13ae --- /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 000000000..0fee9d267 --- /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 000000000..7a230cd87 --- /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≫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 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 403759d59c2b925ae8678359fa05c0a83f8b2dbf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:52:55 +0000 Subject: [PATCH 022/135] fix(deps): update dependency scratch-l10n to v4.0.31 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2889529cd..5bd602e61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.4", - "scratch-l10n": "4.0.30", + "scratch-l10n": "4.0.31", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.30", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.30.tgz", - "integrity": "sha512-uhHzq55doU4voz6qawG1O9vYd7slJ4vMHUKc3mVLpUxXDWFGnGrT60FDey/j0W1AXbeJMlTk/6txMMFkFUQQFA==", + "version": "4.0.31", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.31.tgz", + "integrity": "sha512-qmF2zPa8NoPZqsQpEhIS5aEwvdEGySiCy773m3FlsLterFtuwlEV/JnHShsG1Fh/hvFGCSiKmBNNv6rqJQ/Nqg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 2fb9930de..f5c81190a 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.4", - "scratch-l10n": "4.0.30", + "scratch-l10n": "4.0.31", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From c470407e568bc1ece2d9cc52e36e02694ba6daf6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:55:05 +0000 Subject: [PATCH 023/135] fix(deps): lock file maintenance --- package-lock.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2889529cd..91ea90161 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22068,9 +22068,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.320", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.320.tgz", - "integrity": "sha512-wZwgxXqAzqv/NN+Ps/NbLn1xWyvjGrYirumcflzDuQbIJxxj8CXF0ChN029S1ydFWbHodsKLRxICgF5yfX5HXQ==", + "version": "1.0.321", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.321.tgz", + "integrity": "sha512-Y2CzEVblux31oAU2N8z2Kye80nrQBKjSP8z5NAUxoLlCPNkG0kKBaLSbtRPRcd5EpTU8BF4vetfusyzk9OnkKQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22477,9 +22477,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.498", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.498.tgz", - "integrity": "sha512-Xe4gOaLm317ngGjpG4FNDWjysHsBEf/h0ypGKAlCnRoqeEXmTMgoM68qisgBNV9gNWZ7/fwciv1bdDcQ9ovSmg==", + "version": "2.2.501", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.501.tgz", + "integrity": "sha512-QuD9zfAzCVSTXzX8fhzDYRUHSSYr9+kc8PqWf2lNc/lp856i5K6S0rfhdTWUaNp4uFff1YB10j328Y54+HQOqw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22545,9 +22545,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.104", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.104.tgz", - "integrity": "sha512-hDGfW0AsWWKmW7XALjNqdS3C7gsdpC02GL4qfDRBNIkNrcB5QvOFOlvWQaEFDPE879a5EST77Us3e3mk5/zFeg==", + "version": "1.2.109", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.109.tgz", + "integrity": "sha512-L/1w4pr0ELV4Nnp66W99lVUl6ClqqM4Fv0jhyNJwZxQloMxUfD3YvuvpMz5BOWGvqYfu16Ui3Yw+ZCi+Jm1aPg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22565,9 +22565,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.126", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.126.tgz", - "integrity": "sha512-XBK88BjPMdBK1MOIKafGibCaSaoPj2sueu1QglRL2WFKy6y66v830TTfE1ugHK5RCXCbDFx7iJV1QOgJqkSFHw==", + "version": "1.0.127", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.127.tgz", + "integrity": "sha512-/bEBHFrN7PWlxEP8gZ8fhSt1r7ePEg3EQQDMWlKa/MMgA65pP2vil+axPiZ1PT6x2kDLyzfpUCjuCy0mwgIuoA==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -22597,9 +22597,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.311", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.311.tgz", - "integrity": "sha512-Rz7g05oW+IS60wqEG5y6b/l3R8v/maGpICyqqMzdfNOP1KAkgykBb9+VubYiGm9Sgr9VzphEWpkI79bYEOKPuw==", + "version": "1.0.313", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.313.tgz", + "integrity": "sha512-igEShfwUfpxJdRQuHHAnczPV+SrIudiDXzcyPDWx+UHfii+PsY2FVaUFaO+WREC9KYufc1i9sd1ms53ERU0bMQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22657,9 +22657,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.38", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.38.tgz", - "integrity": "sha512-71MwTICnoAr3l7ytETlORxKUBfRlURLvvHXhPoVLlGhL9t5Byuly/JkxiCglELFzbH8pGnN5rBHR7bzTpD9PkA==", + "version": "2.5.39", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.39.tgz", + "integrity": "sha512-80+ZdYASw6GVBV4h3qhoFnfCADLmJhLx26sZm1dHSy805zxDtvNT4mO3CqqXdDYIUjmSWJ5HkJ54fd0lGNCiZg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22700,9 +22700,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.91", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.91.tgz", - "integrity": "sha512-495Qbqe2XVqjB9/Wz0HpEVwubSVdL74Lrx4pyYvBnoEG4sZ1wWLfWB8ZNzHf16vETZ5U7zDcUayVUacg6e1jdQ==", + "version": "4.8.94", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.94.tgz", + "integrity": "sha512-SeuZjrW60D6bD7o0ZDCidG660CtHEx7oX3ZWCzUwGRmQ1kJR8QFPrO3mBEEUecRuDMG1KlkwwdIzuCj0Pdg8NA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22723,7 +22723,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.38", + "scratch-svg-renderer": "2.5.39", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", From 2b2372c0018060f887359c256ec1d6f2a2406887 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 03:49:06 +0000 Subject: [PATCH 024/135] fix(deps): update dependency scratch-l10n to v4.0.32 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5bd602e61..b9b5090b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.4", - "scratch-l10n": "4.0.31", + "scratch-l10n": "4.0.32", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.31", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.31.tgz", - "integrity": "sha512-qmF2zPa8NoPZqsQpEhIS5aEwvdEGySiCy773m3FlsLterFtuwlEV/JnHShsG1Fh/hvFGCSiKmBNNv6rqJQ/Nqg==", + "version": "4.0.32", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.32.tgz", + "integrity": "sha512-0El0ztRmD1CRFv98MIWWGswuD7b5SoC4IUTsrEHnWu7+5JUkfYEcQ1KHJSidcV4sP5CkKOk2dJMZ1nL8t5H3NA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index f5c81190a..e3ffd2767 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.4", - "scratch-l10n": "4.0.31", + "scratch-l10n": "4.0.32", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From a9207535bcb47d460d7b776d3256ed6aaf0b94a2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 07:02:17 +0000 Subject: [PATCH 025/135] fix(deps): update dependency scratch-gui to v4.1.5 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9b5090b4..1e453522a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.4", + "scratch-gui": "4.1.5", "scratch-l10n": "4.0.32", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22192,9 +22192,9 @@ } }, "node_modules/scratch-gui": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.4.tgz", - "integrity": "sha512-rUySVNHqYRuXI8NV+P5Ugq8euZ1TLYah0LDc+cuj7Z6uU0RGpqp7ubkZFhA0+MMIA473VTau0Toxw2DDzN4bpg==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.5.tgz", + "integrity": "sha512-+UQ2ARJQRn4GKEAZH2GDaaC1zmlACFBDcPWMRXfMfbJlIIhGlfaDOVVpZR3ftSfeDuRO9RfA0x5jhkaN2qlIhw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index e3ffd2767..4971f0849 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.4", + "scratch-gui": "4.1.5", "scratch-l10n": "4.0.32", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From 643266b12147d20c1a79801b8d200e57c83dea3d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 10:50:23 +0000 Subject: [PATCH 026/135] fix(deps): update dependency scratch-l10n to v4.0.34 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e453522a..68c3db5da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.5", - "scratch-l10n": "4.0.32", + "scratch-l10n": "4.0.34", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.32", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.32.tgz", - "integrity": "sha512-0El0ztRmD1CRFv98MIWWGswuD7b5SoC4IUTsrEHnWu7+5JUkfYEcQ1KHJSidcV4sP5CkKOk2dJMZ1nL8t5H3NA==", + "version": "4.0.34", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.34.tgz", + "integrity": "sha512-sO/KcFdLVZT+zRmp/CGUvYYIGd2f1csXSmhHvaHSeumh6CY83nv0YDqd3zOLRmoomW0MgoxrlKIH8WUqWSNSNg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 4971f0849..943eafe05 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.5", - "scratch-l10n": "4.0.32", + "scratch-l10n": "4.0.34", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 85e9886906b586af41f5a84abb6d28f407ddc359 Mon Sep 17 00:00:00 2001 From: MiroslavDionisiev Date: Tue, 19 Nov 2024 13:05:18 +0200 Subject: [PATCH 027/135] 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 c76c0934e..3d76a62a8 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 f1057061d..41214dfb4 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 000000000..1927285ef --- /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 13e78cde8..2ea0420c3 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 fa7252c4e..5e6644d46 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 db7be8f33..aaf71b7e7 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 71d5421c1..d5aeef826 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 dbfa2e11d..69ca11ebc 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 e674847d1..6b46e2d2c 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 f1057061d..4abffd557 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 6486ec1b3..90d08b02b 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 2073ceeff..b0fe6bf57 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 af9a45889..8275c0371 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 000000000..7da4e86a9 --- /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 000000000..296a055af --- /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 000000000..1ceccd5dc --- /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 000000000..6be0a4098 --- /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 037/135] 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 253753914..58608c930 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 a3dcbd3d99fc08a56e558c7398bd8f00c5601993 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 11:06:25 +0000 Subject: [PATCH 038/135] fix(deps): update dependency scratch-gui to v4.1.7 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b0856d59..c54955aca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.6", + "scratch-gui": "4.1.7", "scratch-l10n": "4.0.40", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22192,9 +22192,9 @@ } }, "node_modules/scratch-gui": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.6.tgz", - "integrity": "sha512-jfRnsx5WQYm6OuSqw38YWHNMib0evW2RfkJ1x2m2bnOFhmYvqeI6icQKX8iK3VxN5URFv7qF2WFg6vwj1E6e9g==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.7.tgz", + "integrity": "sha512-DZHERBC95J4rRE//OXytfnzPksZVir4zp3TVyvhv1xME9f8GJRbFFYe9ZTptSjZWyk2boUGlbu+ad0uE/x+A0A==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 3310e4a90..59cef2c93 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.6", + "scratch-gui": "4.1.7", "scratch-l10n": "4.0.40", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From f005f0aa6ce747f819fe7343f00534697d2f8c56 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:46:15 +0000 Subject: [PATCH 039/135] fix(deps): update dependency scratch-l10n to v4.0.42 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c54955aca..035b4ecec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.40", + "scratch-l10n": "4.0.42", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22461,9 +22461,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.40", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.40.tgz", - "integrity": "sha512-jtHeF6SsWtlgHohqSUiyjCr8m1q0opH4KWDfes5P048HvOfZS+Bwhcx3cFfMT2UU2gr3beCa8cNd0ZW6utw6Dg==", + "version": "4.0.42", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.42.tgz", + "integrity": "sha512-kaI60M+TKcplhYel6vYhNj9qpvGsSzZ2/ma+YEV4COQmo5tiL3htbuXl2X/rzDnrDaUeNf3THt+FrR4aUQ3j9g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 59cef2c93..ca14d6704 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.40", + "scratch-l10n": "4.0.42", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 71826cd9b3c8cf10fa9a5fcb259e50204d00bcd8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 08:14:22 +0000 Subject: [PATCH 040/135] fix(deps): lock file maintenance --- package-lock.json | 185 +++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 100 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dedba731..1edb18346 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3882,16 +3882,6 @@ "@babel/types": "^7.20.7" } }, - "node_modules/@types/dompurify": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz", - "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/trusted-types": "*" - } - }, "node_modules/@types/eslint": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", @@ -4039,9 +4029,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.9.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.1.tgz", - "integrity": "sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==", + "version": "22.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.3.tgz", + "integrity": "sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==", "dev": true, "license": "MIT", "dependencies": { @@ -4109,7 +4099,8 @@ "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", "dev": true, - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/@types/usb": { "version": "1.5.4", @@ -6551,9 +6542,9 @@ "license": "MIT" }, "node_modules/caniuse-lite": { - "version": "1.0.30001683", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001683.tgz", - "integrity": "sha512-iqmNnThZ0n70mNwvxpEC2nBJ037ZHZUoBI5Gorh1Mw6IlEAZujEoU1tXA628iZfzm7R9FvFzxbfdgml82a3k8Q==", + "version": "1.0.30001684", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz", + "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==", "dev": true, "funding": [ { @@ -9249,9 +9240,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.63", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz", - "integrity": "sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==", + "version": "1.5.64", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz", + "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==", "dev": true, "license": "ISC" }, @@ -11007,9 +10998,9 @@ } }, "node_modules/flow-remove-types": { - "version": "2.254.0", - "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.254.0.tgz", - "integrity": "sha512-bOasdtqZfx0lEAe7/eWfRtJhGPuI1ycRAY0X4F1l+MrHE5sjjFhzbSt8YZVdQwElRsZUagldOxNU1xSMFdXffQ==", + "version": "2.254.2", + "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.254.2.tgz", + "integrity": "sha512-zkN7rQ3/T0uJ/ghjD9THU1DQ129ufH4PeVKs3JRahmW0gzAvD7+INFoJoZhrArDIFSDiVqHsEweji1iWMP3AdQ==", "dev": true, "license": "MIT", "dependencies": { @@ -13684,7 +13675,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", - "dev": true, "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" @@ -13830,13 +13820,15 @@ } }, "node_modules/is-finalizationregistry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", - "dev": true, + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.0.tgz", + "integrity": "sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA==", "license": "MIT", "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13896,7 +13888,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dev": true, "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" @@ -13942,7 +13933,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -14092,7 +14082,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -14206,7 +14195,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -14231,7 +14219,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.7", @@ -14274,14 +14261,13 @@ } }, "node_modules/isomorphic-dompurify": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/isomorphic-dompurify/-/isomorphic-dompurify-2.16.0.tgz", - "integrity": "sha512-cXhX2owp8rPxafCr0ywqy2CGI/4ceLNgWkWBEvUz64KTbtg3oRL2ZRqq/zW0pzt4YtDjkHLbwcp/lozpKzAQjg==", + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/isomorphic-dompurify/-/isomorphic-dompurify-2.17.0.tgz", + "integrity": "sha512-W9RC9aPgEAFF55VMo/9AUQ+GYkQ68gTRMLqS8fP9rw1VoYCsI7RdrRMAePhhqyCLfZS3JNjA4ahFi1L4aczUUg==", "dev": true, "license": "MIT", "dependencies": { - "@types/dompurify": "^3.0.5", - "dompurify": "^3.1.7", + "dompurify": "^3.2.1", "jsdom": "^25.0.1" }, "engines": { @@ -19783,9 +19769,9 @@ "license": "ISC" }, "node_modules/psl": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.11.0.tgz", - "integrity": "sha512-pjFdcBXT4g061k/SQkzNCRnav+1RdIOgrcX8hs5eL3CEQcFZP9qT8T1RWYxGKT11rH1DdIW+kJRfCYykBJuerQ==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.13.0.tgz", + "integrity": "sha512-BFwmFXiJoFqlUpZ5Qssolv15DMyc84gTBds1BjsV1BfXEo1UyyD7GsmN67n7J77uRhoSNW1AXtXKPLcBFQn9Aw==", "dev": true, "license": "MIT", "dependencies": { @@ -20994,19 +20980,18 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", - "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", - "dev": true, + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.7.tgz", + "integrity": "sha512-bMvFGIUKlc/eSfXNX+aZ+EL95/EgZzuwA0OBPTbZZDEJw/0AkentjMuM1oiRfwHrshqk4RzdgiTg5CcDalXN5g==", "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.23.1", + "es-abstract": "^1.23.5", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.4", - "globalthis": "^1.0.3", - "which-builtin-type": "^1.1.3" + "gopd": "^1.0.1", + "which-builtin-type": "^1.1.4" }, "engines": { "node": ">= 0.4" @@ -21087,16 +21072,16 @@ } }, "node_modules/regexpu-core": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz", - "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz", + "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==", "dev": true, "license": "MIT", "dependencies": { "regenerate": "^1.4.2", "regenerate-unicode-properties": "^10.2.0", "regjsgen": "^0.8.0", - "regjsparser": "^0.11.0", + "regjsparser": "^0.12.0", "unicode-match-property-ecmascript": "^2.0.0", "unicode-match-property-value-ecmascript": "^2.1.0" }, @@ -21112,9 +21097,9 @@ "license": "MIT" }, "node_modules/regjsparser": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz", - "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz", + "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -22071,9 +22056,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.325", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.325.tgz", - "integrity": "sha512-UdXWrRlsVhrvBoyncBlBV7IPLAdJd6F5Q3Xzv5yBRWq8wiNMG0IT19jYdqi8mPbXlNPlFyqyLs/RznCnAt/PnA==", + "version": "1.0.330", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.330.tgz", + "integrity": "sha512-29TnzuTkm5y1GzXG0rw/ILdgmHVyts5dCTZguv5YE44aGig4a4aXPxI6+wtpqIGzQCBox9H2zbEHJ3aGfaEX8g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22480,9 +22465,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.508", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.508.tgz", - "integrity": "sha512-e2wS98L7cux7NsggCH+m7pW+I+ftw6f/p+RtKE4kG2+uvqpnU0lncGGuPkOp7kBr999TSVu7d1iB/ZFkpAXnyA==", + "version": "2.2.515", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.515.tgz", + "integrity": "sha512-jI3kOu037zKgZKR4gAamdcRfc4NoyM9l/yhrOfIVa3Kk3DVUAKr6VcRqDbGqRqBMvBoxd5zRBBxliLysnQt4Og==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22548,9 +22533,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.115", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.115.tgz", - "integrity": "sha512-+X/hqEGH5C3socHt5/GjlfAa9zBdOCNp+RaRGvgDqARPPJrTC4eQUOPXIDx/mUP9FZNRfQQQM0Zz/+fZjuZIjQ==", + "version": "1.2.121", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.121.tgz", + "integrity": "sha512-W8bzWfG1ZouIo2PGNNn/X2LU7e8RcdeGhAB4xW187cfCATYhop23YAP8RiTLHDAKr0FI4NACQjS3i2sYbmWM4Q==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22568,9 +22553,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.129", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.129.tgz", - "integrity": "sha512-IVza4I3KANE0AQM1mM+FefqYrsNz4vPbvhzhlrY4VOYWlOnY0dQXnlccnWSMjYH9KCmm1FNGCKJGRi8ttOmtQg==", + "version": "1.0.130", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.130.tgz", + "integrity": "sha512-76hnac/udWE275C56gi2q1vnwzfQXk7Zcvk3BM9IQiaE3xQcMz8jiV/hy1urXg5XI0wkGZyFkjK60oyBeijSdg==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -22600,9 +22585,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.317", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.317.tgz", - "integrity": "sha512-1APiiOuWzI0r3a9s3I2OZthAXZJWvy4dp5gxlNyR1RhsakeqfU45t+88ITla88CvUA15uWEYvkC1GsEewUBIHQ==", + "version": "1.0.322", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.322.tgz", + "integrity": "sha512-FWf1hr0w6OHigx+4s2aIWvrNp2ETQ/H7DYDkQkRP08s1RBddGi/tNHu6tKHKojgo6eEAhgDKJ6ZEzFoFHSgDdA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22660,9 +22645,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.40", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.40.tgz", - "integrity": "sha512-IRk1NoGkgtneWOPAgd33KzhTWfUs4RvxNa7SwbzRPo7+DLiWLgeMtyK9Y0kjtD34I8I7U8snUsgbTvaxf+2hFw==", + "version": "2.5.43", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.43.tgz", + "integrity": "sha512-MgyoSIoYsgAYF1JHJQz0+r1NvtS1uOM+LLAfvIyYfiD9c5islNKD3asgGmry3PmSFBhEH189zkAIsTa8q3EJCg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22703,9 +22688,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.102", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.102.tgz", - "integrity": "sha512-YCdocJcnMo5cPCNTe/NQuFdShh8rxsRD5PVJDXMEuCP9HO0axPHamymePJK1g6ihDbthD5eUaBFwIvI5zUA6pw==", + "version": "4.8.111", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.111.tgz", + "integrity": "sha512-unT2vHVH6mWbpsjk26uoKPnWEZ3DOLgq4x/r+zDjcKfwoQ8zERO+0e4R2gsT49MIYsfCxjVQ8v4Q6/QG7IdSKw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22726,7 +22711,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.40", + "scratch-svg-renderer": "2.5.43", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", @@ -26579,22 +26564,22 @@ "license": "ISC" }, "node_modules/tldts": { - "version": "6.1.62", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.62.tgz", - "integrity": "sha512-TF+wo3MgTLbf37keEwQD0IxvOZO8UZxnpPJDg5iFGAASGxYzbX/Q0y944ATEjrfxG/pF1TWRHCPbFp49Mz1Y1w==", + "version": "6.1.64", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.64.tgz", + "integrity": "sha512-ph4AE5BXWIOsSy9stpoeo7bYe/Cy7VfpciIH4RhVZUPItCJmhqWCN0EVzxd8BOHiyNb42vuJc6NWTjJkg91Tuw==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^6.1.62" + "tldts-core": "^6.1.64" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.62", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.62.tgz", - "integrity": "sha512-ohONqbfobpuaylhqFbtCzc0dFFeNz85FVKSesgT8DS9OV3a25Yj730pTj7/dDtCqmgoCgEj6gDiU9XxgHKQlBw==", + "version": "6.1.64", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.64.tgz", + "integrity": "sha512-uqnl8vGV16KsyflHOzqrYjjArjfXaU6rMPXYy2/ZWoRKCkXtghgB4VwTDXUG+t0OTGeSewNAG31/x1gCTfLt+Q==", "dev": true, "license": "MIT" }, @@ -27129,9 +27114,9 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz", + "integrity": "sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw==", "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", @@ -27139,7 +27124,8 @@ "for-each": "^0.3.3", "gopd": "^1.0.1", "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "is-typed-array": "^1.1.13", + "reflect.getprototypeof": "^1.0.6" }, "engines": { "node": ">= 0.4" @@ -27149,17 +27135,17 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", - "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-proto": "^1.0.3", "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" }, "engines": { "node": ">= 0.4" @@ -28351,17 +28337,17 @@ } }, "node_modules/which-builtin-type": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz", - "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==", - "dev": true, + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.0.tgz", + "integrity": "sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA==", "license": "MIT", "dependencies": { + "call-bind": "^1.0.7", "function.prototype.name": "^1.1.6", "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", "is-date-object": "^1.0.5", - "is-finalizationregistry": "^1.0.2", + "is-finalizationregistry": "^1.1.0", "is-generator-function": "^1.0.10", "is-regex": "^1.1.4", "is-weakref": "^1.0.2", @@ -28381,7 +28367,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, "license": "MIT", "dependencies": { "is-map": "^2.0.3", From 30e1a13bc60237d3d29565cb38332bdf673a132e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 10:51:49 +0000 Subject: [PATCH 041/135] fix(deps): update dependency scratch-l10n to v4.0.45 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dedba731..493437638 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.42", + "scratch-l10n": "4.0.45", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22464,9 +22464,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.42", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.42.tgz", - "integrity": "sha512-kaI60M+TKcplhYel6vYhNj9qpvGsSzZ2/ma+YEV4COQmo5tiL3htbuXl2X/rzDnrDaUeNf3THt+FrR4aUQ3j9g==", + "version": "4.0.45", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.45.tgz", + "integrity": "sha512-LNE7alQ41ApSBW+p/fEXpjBKKIJ1+0889RfTTvsAB0FH6sZf/MyRdEniIbJibXlUuURzsVhwuUI7HFJV8MeSBw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index ca14d6704..18c1bb173 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.42", + "scratch-l10n": "4.0.45", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From ef4823630cf18f1e836d6c109f0c9f5a8c01584d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 07:40:50 +0000 Subject: [PATCH 042/135] fix(deps): update dependency scratch-l10n to v4.0.46 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 493437638..db2e1e9b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.45", + "scratch-l10n": "4.0.46", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22464,9 +22464,9 @@ } }, "node_modules/scratch-l10n": { - "version": "4.0.45", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.45.tgz", - "integrity": "sha512-LNE7alQ41ApSBW+p/fEXpjBKKIJ1+0889RfTTvsAB0FH6sZf/MyRdEniIbJibXlUuURzsVhwuUI7HFJV8MeSBw==", + "version": "4.0.46", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.46.tgz", + "integrity": "sha512-L+5eTrFe7qYUt0aK005qf20kg5Nm1gny2wDwpP1eI0Sk5Of6qGUyG7dr/FtAw5OHzbZENbYoT9tNWBf/swJ2gQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/package.json b/package.json index 18c1bb173..575abb02d 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.45", + "scratch-l10n": "4.0.46", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From aa4d20ac48cbf784c9d3c3586472a277b6add2a8 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:14:41 -0800 Subject: [PATCH 043/135] chore!: set license to AGPL-3.0-only BREAKING CHANGE: This project is now licensed under the AGPL version 3.0 See https://www.scratchfoundation.org/open-source-license --- LICENSE | 663 +++++++++++++++++++++++++++++++++++++++++++++- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 658 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index d6ef4156f..0ad25db4b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,661 @@ -Copyright (c) 2021, Scratch Foundation -All rights reserved. + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + Preamble -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/package-lock.json b/package-lock.json index db2e1e9b5..6a8bdbe67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "www", "version": "1.0.0", - "license": "BSD-3-Clause", + "license": "AGPL-3.0-only", "dependencies": { "bunyan": "1.8.15", "clipboard-copy": "2.0.1", diff --git a/package.json b/package.json index 575abb02d..d0c0e8182 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "url": "git+ssh://git@github.com/scratchfoundation/scratch-www.git" }, "author": "Massachusetts Institute of Technology", - "license": "BSD-3-Clause", + "license": "AGPL-3.0-only", "bugs": { "url": "https://github.com/scratchfoundation/scratch-www/issues" }, From b71317b20e53382226217fb1fde6e2573e0527a1 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:14:41 -0800 Subject: [PATCH 044/135] ci: add signature assistant workflow --- .github/workflows/signature-assistant.yml | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/signature-assistant.yml diff --git a/.github/workflows/signature-assistant.yml b/.github/workflows/signature-assistant.yml new file mode 100644 index 000000000..acd2c3bb2 --- /dev/null +++ b/.github/workflows/signature-assistant.yml @@ -0,0 +1,31 @@ +name: "Signature Assistant" +on: + issue_comment: + types: [created] + pull_request_target: + types: [opened,closed,synchronize] + +permissions: + actions: write + contents: read + pull-requests: write + statuses: write + +jobs: + CLA-Assistant: + runs-on: ubuntu-latest + steps: + - name: "CLA Assistant" + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # the below token should have repo scope and must be manually added by you in the repository's secrets + PERSONAL_ACCESS_TOKEN: ${{ secrets.GHA_AGREEMENTS_PAT }} + with: + remote-organization-name: 'scratchfoundation' + remote-repository-name: 'scratch-agreements' + path-to-signatures: 'signatures/version1/cla.json' + path-to-document: 'https://github.com/scratchfoundation/scratch-agreements/blob/main/CLA.md' + branch: 'main' + allowlist: semantic-release-bot,*[bot] From 79bcef7ad25ca1fcd3b181196cabac6dde258641 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:15:42 +0000 Subject: [PATCH 045/135] chore(deps): update dependency scratch-l10n to v5 --- package-lock.json | 20 ++++++++++++++++++-- package.json | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index db2e1e9b5..a8329686f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.46", + "scratch-l10n": "5.0.0", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22463,7 +22463,7 @@ "react": "^16.0.0" } }, - "node_modules/scratch-l10n": { + "node_modules/scratch-gui/node_modules/scratch-l10n": { "version": "4.0.46", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-4.0.46.tgz", "integrity": "sha512-L+5eTrFe7qYUt0aK005qf20kg5Nm1gny2wDwpP1eI0Sk5Of6qGUyG7dr/FtAw5OHzbZENbYoT9tNWBf/swJ2gQ==", @@ -22479,6 +22479,22 @@ "tx-push-src": "scripts/tx-push-src.js" } }, + "node_modules/scratch-l10n": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.0.tgz", + "integrity": "sha512-kFZbaOtsttxznLMLmwjm0uwGVmv5GtPddGVs5LFSjMxSOKinuOsJcGb+udU5+gPWBFvptI4BT4yfZUeQuP93Tg==", + "dev": true, + "license": "AGPL-3.0-only", + "dependencies": { + "@transifex/api": "4.3.0", + "download": "8.0.0", + "transifex": "1.6.6" + }, + "bin": { + "build-i18n-src": "scripts/build-i18n-src.js", + "tx-push-src": "scripts/tx-push-src.js" + } + }, "node_modules/scratch-paint": { "version": "2.2.508", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.508.tgz", diff --git a/package.json b/package.json index 575abb02d..8289d2305 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "4.1.7", - "scratch-l10n": "4.0.46", + "scratch-l10n": "5.0.0", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 25519bb487a864b286808e0c11aa61f5ece4f6bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:15:57 +0000 Subject: [PATCH 046/135] fix(deps): update dependency scratch-parser to v6 --- package-lock.json | 25 ++++++++++++++++++++----- package.json | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index db2e1e9b5..8455e18e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "react-router-dom": "5.3.4", "react-twitter-embed": "3.0.3", "react-use": "17.5.1", - "scratch-parser": "5.2.1", + "scratch-parser": "6.0.0", "scratch-storage": "2.3.284" }, "devDependencies": { @@ -22534,10 +22534,10 @@ } }, "node_modules/scratch-parser": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.2.1.tgz", - "integrity": "sha512-O9acef/B5MAQSB6PrEGKtbmEL1AOVZf4mYZnR0sNlzRvqqaEd+fZDL5SM7E9uQP09dIghefrm6/xmgzQIJP9Wg==", - "license": "BSD-3-Clause", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-6.0.0.tgz", + "integrity": "sha512-LXcKxJIupqBtXSe2+SXkQxwdMWg4JCdZfoSdPYj1ZtV/UhejyUYju6ptYUrr98RsLFT5UyCmmUaev8gA1SNvhQ==", + "license": "AGPL-3.0-only", "dependencies": { "ajv": "^6.3.0", "jszip": "^3.1.5", @@ -22760,6 +22760,21 @@ "microee": "0.0.6" } }, + "node_modules/scratch-vm/node_modules/scratch-parser": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.2.1.tgz", + "integrity": "sha512-O9acef/B5MAQSB6PrEGKtbmEL1AOVZf4mYZnR0sNlzRvqqaEd+fZDL5SM7E9uQP09dIghefrm6/xmgzQIJP9Wg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "ajv": "^6.3.0", + "jszip": "^3.1.5", + "pify": "^4.0.1" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/screenfull": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz", diff --git a/package.json b/package.json index 575abb02d..4a812ef13 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "react-router-dom": "5.3.4", "react-twitter-embed": "3.0.3", "react-use": "17.5.1", - "scratch-parser": "5.2.1", + "scratch-parser": "6.0.0", "scratch-storage": "2.3.284" }, "devDependencies": { From 5bffaf347c29efafea000a4d7debf3b50c0ea0ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:01:20 +0000 Subject: [PATCH 047/135] fix(deps): lock file maintenance --- package-lock.json | 111 +++++++++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbf11dcab..017c090ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4029,13 +4029,13 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.9.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.3.tgz", - "integrity": "sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==", + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.19.8" + "undici-types": "~6.20.0" } }, "node_modules/@types/node-hid": { @@ -9240,9 +9240,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.64", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz", - "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==", + "version": "1.5.65", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.65.tgz", + "integrity": "sha512-PWVzBjghx7/wop6n22vS2MLU8tKGd4Q91aCEGhG/TYmW6PP5OcSXcdnxTe1NNt0T66N8D6jxh4kC8UsdzOGaIw==", "dev": true, "license": "ISC" }, @@ -10998,13 +10998,13 @@ } }, "node_modules/flow-remove-types": { - "version": "2.254.2", - "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.254.2.tgz", - "integrity": "sha512-zkN7rQ3/T0uJ/ghjD9THU1DQ129ufH4PeVKs3JRahmW0gzAvD7+INFoJoZhrArDIFSDiVqHsEweji1iWMP3AdQ==", + "version": "2.255.0", + "resolved": "https://registry.npmjs.org/flow-remove-types/-/flow-remove-types-2.255.0.tgz", + "integrity": "sha512-93BVaLf/NyGqd9nq7Gf7jFvk4tF56+yU9R8FW0NFIAIeiULHO8UBIjJ4Cxc3VDh4QiHsvwT6HDLxB4MzGpYLqw==", "dev": true, "license": "MIT", "dependencies": { - "hermes-parser": "0.24.0", + "hermes-parser": "0.25.1", "pirates": "^3.0.2", "vlq": "^0.2.1" }, @@ -12916,20 +12916,20 @@ } }, "node_modules/hermes-estree": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.24.0.tgz", - "integrity": "sha512-LyoXLB7IFzeZW0EvAbGZacbxBN7t6KKSDqFJPo3Ydow7wDlrDjXwsdiAHV6XOdvEN9MEuWXsSIFN4tzpyrXIHw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz", + "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==", "dev": true, "license": "MIT" }, "node_modules/hermes-parser": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.24.0.tgz", - "integrity": "sha512-IJooSvvu2qNRe7oo9Rb04sUT4omtZqZqf9uq9WM25Tb6v3usmvA93UqfnnoWs5V0uYjEl9Al6MNU10MCGKLwpg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz", + "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==", "dev": true, "license": "MIT", "dependencies": { - "hermes-estree": "0.24.0" + "hermes-estree": "0.25.1" } }, "node_modules/history": { @@ -17437,9 +17437,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -22056,9 +22056,9 @@ } }, "node_modules/scratch-audio": { - "version": "1.0.330", - "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.330.tgz", - "integrity": "sha512-29TnzuTkm5y1GzXG0rw/ILdgmHVyts5dCTZguv5YE44aGig4a4aXPxI6+wtpqIGzQCBox9H2zbEHJ3aGfaEX8g==", + "version": "1.0.332", + "resolved": "https://registry.npmjs.org/scratch-audio/-/scratch-audio-1.0.332.tgz", + "integrity": "sha512-ok9gw14R4KmYXNtJ2qrSI3PKRksTH+ROfoe8tyZTkumr+8+Coam2/inuH4aVJygRda5X7xFrERstlkZ8X8zeTQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22481,9 +22481,9 @@ } }, "node_modules/scratch-paint": { - "version": "2.2.515", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.515.tgz", - "integrity": "sha512-jI3kOu037zKgZKR4gAamdcRfc4NoyM9l/yhrOfIVa3Kk3DVUAKr6VcRqDbGqRqBMvBoxd5zRBBxliLysnQt4Og==", + "version": "2.2.518", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.518.tgz", + "integrity": "sha512-cyxSMgLLC3z6wMpHcc0HpK2yyj5AcDhiUbee03Ml1/UbbmQA9kbe+itT9QMk2mNCW9KNWL9G/BkOLDhaLCwESg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22549,9 +22549,9 @@ } }, "node_modules/scratch-render": { - "version": "1.2.121", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.121.tgz", - "integrity": "sha512-W8bzWfG1ZouIo2PGNNn/X2LU7e8RcdeGhAB4xW187cfCATYhop23YAP8RiTLHDAKr0FI4NACQjS3i2sYbmWM4Q==", + "version": "1.2.126", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-1.2.126.tgz", + "integrity": "sha512-c+DKX/Ysyv7QWpd8qO+uVqHEtAHN+8F4mAfBcm3tGZ16ATHD7h55GGg3G9gn7fNvFx8cvI/84Dz466YPmUwGQg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22569,9 +22569,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.130", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.130.tgz", - "integrity": "sha512-76hnac/udWE275C56gi2q1vnwzfQXk7Zcvk3BM9IQiaE3xQcMz8jiV/hy1urXg5XI0wkGZyFkjK60oyBeijSdg==", + "version": "1.0.131", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.131.tgz", + "integrity": "sha512-6ZQZd7sxtPM3FyFxTEXu4/EiZLpsFw68BRP6S6AfUhSpfuYjK8eia7HhoURYR8/ULw7LkN8PAuQcGtcXs3J93g==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -22601,9 +22601,9 @@ "dev": true }, "node_modules/scratch-sb1-converter": { - "version": "1.0.322", - "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.322.tgz", - "integrity": "sha512-FWf1hr0w6OHigx+4s2aIWvrNp2ETQ/H7DYDkQkRP08s1RBddGi/tNHu6tKHKojgo6eEAhgDKJ6ZEzFoFHSgDdA==", + "version": "1.0.324", + "resolved": "https://registry.npmjs.org/scratch-sb1-converter/-/scratch-sb1-converter-1.0.324.tgz", + "integrity": "sha512-ZHIf2KCmYKchayLQFknni7QfXhOCI+w4Wq1wIQuN5D6xZwUyIe51/B4YO+pofOGr3tz4nnwQIjgs3AowdNKWDQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22661,9 +22661,9 @@ } }, "node_modules/scratch-svg-renderer": { - "version": "2.5.43", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.43.tgz", - "integrity": "sha512-MgyoSIoYsgAYF1JHJQz0+r1NvtS1uOM+LLAfvIyYfiD9c5islNKD3asgGmry3PmSFBhEH189zkAIsTa8q3EJCg==", + "version": "2.5.46", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.46.tgz", + "integrity": "sha512-SrQgHZdqnu3DX6UuJNJPg/kpJTQT/mIVbQZvm5uTE/B47U5mSaVfgoGlNFhoNUWZlbHucqySyG4KMe+ThDUR/A==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22704,9 +22704,9 @@ "license": "BSD-3-Clause" }, "node_modules/scratch-vm": { - "version": "4.8.111", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.111.tgz", - "integrity": "sha512-unT2vHVH6mWbpsjk26uoKPnWEZ3DOLgq4x/r+zDjcKfwoQ8zERO+0e4R2gsT49MIYsfCxjVQ8v4Q6/QG7IdSKw==", + "version": "4.8.115", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-4.8.115.tgz", + "integrity": "sha512-8kqPCiZOElfLOPSh2bgSS+JKkKsetAM2TDxlxOohje4GZp/FwIg7/F5p61TUObK75d3UKRyYw6yUfgshS2FPzA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -22727,7 +22727,7 @@ "scratch-render": "^1.0.232", "scratch-sb1-converter": "^1.0.0", "scratch-storage": "^2.3.5", - "scratch-svg-renderer": "2.5.43", + "scratch-svg-renderer": "2.5.44", "scratch-translate-extension-languages": "^1.0.0", "text-encoding": "^0.7.0", "uuid": "^8.3.2", @@ -22776,6 +22776,25 @@ "node": ">=8.0" } }, + "node_modules/scratch-vm/node_modules/scratch-svg-renderer": { + "version": "2.5.44", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-2.5.44.tgz", + "integrity": "sha512-ShQhlAPNERUg98tORU0lwA8rcEXlYea0im3GhzBI9aDfKFERh/C2o2mcADrbk4wYdH1b9YV+7DswtjCRZzI7CA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "base64-js": "^1.2.1", + "base64-loader": "^1.0.0", + "css-tree": "^1.1.3", + "fastestsmallesttextencoderdecoder": "^1.0.22", + "isomorphic-dompurify": "^2.4.0", + "minilog": "^3.1.0", + "transformation-matrix": "^1.15.0" + }, + "peerDependencies": { + "scratch-render-fonts": "^1.0.0" + } + }, "node_modules/screenfull": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz", @@ -27379,9 +27398,9 @@ } }, "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", "dev": true, "license": "MIT" }, From ee8d1bafbc7b8210f0795a1a7ae3d6c8a6443a45 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:02:52 +0000 Subject: [PATCH 048/135] chore(deps): update dependency scratch-gui to v5 --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbf11dcab..1c7722bd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.7", + "scratch-gui": "5.0.1", "scratch-l10n": "5.0.0", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22180,11 +22180,11 @@ } }, "node_modules/scratch-gui": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-4.1.7.tgz", - "integrity": "sha512-DZHERBC95J4rRE//OXytfnzPksZVir4zp3TVyvhv1xME9f8GJRbFFYe9ZTptSjZWyk2boUGlbu+ad0uE/x+A0A==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-5.0.1.tgz", + "integrity": "sha512-BTQUodIDYunIBZ5T3bST41kn0/Qm/kXhDXJveh221M639nBX5JRQhygKtg3bXo72eLwl4KC1GoUaBuB53y1P4A==", "dev": true, - "license": "BSD-3-Clause", + "license": "AGPL-3.0-only", "dependencies": { "@microbit/microbit-universal-hex": "^0.2.2", "arraybuffer-loader": "^1.0.6", diff --git a/package.json b/package.json index 47e8b5d09..93b72a78f 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "4.1.7", + "scratch-gui": "5.0.1", "scratch-l10n": "5.0.0", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From 8cfa8f2736d05ef0ee2ccd989ab90047c95fdcf5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:26:32 +0000 Subject: [PATCH 049/135] fix(deps): update dependency scratch-l10n to v5.0.2 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c7722bd4..731589aef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.0", + "scratch-l10n": "5.0.2", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.0.tgz", - "integrity": "sha512-kFZbaOtsttxznLMLmwjm0uwGVmv5GtPddGVs5LFSjMxSOKinuOsJcGb+udU5+gPWBFvptI4BT4yfZUeQuP93Tg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.2.tgz", + "integrity": "sha512-2gRKJrqqy1u5HGuAX1wYqRfJwRVfNKfNVjgkL9NYsKwzgc8JSbppdyCnthUdgvhGw/QyWe85dzVX9q8k2lPNrQ==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 93b72a78f..700d4df6f 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.0", + "scratch-l10n": "5.0.2", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 680615c8e5e45502d85f233c0533cba5816d9977 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 21:30:48 +0000 Subject: [PATCH 050/135] fix(deps): update dependency scratch-l10n to v5.0.3 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 731589aef..dce10e9bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.2", + "scratch-l10n": "5.0.3", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.2.tgz", - "integrity": "sha512-2gRKJrqqy1u5HGuAX1wYqRfJwRVfNKfNVjgkL9NYsKwzgc8JSbppdyCnthUdgvhGw/QyWe85dzVX9q8k2lPNrQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.3.tgz", + "integrity": "sha512-k6aS1F2aRYCvd2CtuvkIwshug5abZOxRExziWEAfdYcRzxj+Kn9kj4xeqmOMBAcPK4XmteZtsq4qJeflcocs2g==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 700d4df6f..1d9c78b07 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.2", + "scratch-l10n": "5.0.3", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From bc605c45a4e8f6cc65854cc1a8be0d831e5cc3a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:30:37 +0000 Subject: [PATCH 051/135] fix(deps): update dependency scratch-l10n to v5.0.6 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index dce10e9bb..7a26776d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.3", + "scratch-l10n": "5.0.6", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.3.tgz", - "integrity": "sha512-k6aS1F2aRYCvd2CtuvkIwshug5abZOxRExziWEAfdYcRzxj+Kn9kj4xeqmOMBAcPK4XmteZtsq4qJeflcocs2g==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.6.tgz", + "integrity": "sha512-/1JFbSchmWNqz1KhVIoDNT/IcfBsagLD+xabXxtnzYLLHjY1AgKyIyMy1osX/8dt9qFkklV2nAV58sFDEAkIQw==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 1d9c78b07..fc5c58da6 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.3", + "scratch-l10n": "5.0.6", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 5fbc766161a6ddb6ba08281ae8682fe687799891 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:07:08 +0000 Subject: [PATCH 052/135] chore(deps): update dependency google-libphonenumber to v3.2.39 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a26776d8..2aa5b82c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,7 +69,7 @@ "formsy-react-components": "1.1.0", "git-bundle-sha": "0.0.2", "glob": "5.0.15", - "google-libphonenumber": "3.2.38", + "google-libphonenumber": "3.2.39", "html-webpack-plugin": "5.6.0", "iso-3166-2": "1.0.0", "jest": "29.7.0", @@ -12533,9 +12533,9 @@ "license": "Apache-2.0" }, "node_modules/google-libphonenumber": { - "version": "3.2.38", - "resolved": "https://registry.npmjs.org/google-libphonenumber/-/google-libphonenumber-3.2.38.tgz", - "integrity": "sha512-t/K0dsVmA0gMMVLJgcMeB9g1Ar4ANVWfkY+AJGSdfyJ2Ay7Bu8ceLYpUlC6FZSilZgaF1qbkM9tZydGBEBHqAg==", + "version": "3.2.39", + "resolved": "https://registry.npmjs.org/google-libphonenumber/-/google-libphonenumber-3.2.39.tgz", + "integrity": "sha512-dpCbkY6ZxHXIHEFDwSir/gPBWkn22e2EixBv47guVs/NE8+qd35f1yu+fxQ8awRnHEXC60uhcPM9mbqmrD6nmw==", "dev": true, "license": "(MIT AND Apache-2.0)", "engines": { diff --git a/package.json b/package.json index fc5c58da6..0997f0fdf 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "formsy-react-components": "1.1.0", "git-bundle-sha": "0.0.2", "glob": "5.0.15", - "google-libphonenumber": "3.2.38", + "google-libphonenumber": "3.2.39", "html-webpack-plugin": "5.6.0", "iso-3166-2": "1.0.0", "jest": "29.7.0", From 242bc7c8ecd96bb871ca24263677568f106cc93f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 03:52:48 +0000 Subject: [PATCH 053/135] fix(deps): update dependency scratch-l10n to v5.0.7 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2aa5b82c0..dc615854d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.6", + "scratch-l10n": "5.0.7", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.6.tgz", - "integrity": "sha512-/1JFbSchmWNqz1KhVIoDNT/IcfBsagLD+xabXxtnzYLLHjY1AgKyIyMy1osX/8dt9qFkklV2nAV58sFDEAkIQw==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.7.tgz", + "integrity": "sha512-S4KY75py0p6nIN9ll+K7qn0LIzzVUz4oPaxTj7B0ayEY2EW/JPsilgoJ5pBLC2kEGv5rOar5mSk3vekGpq4uqg==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 0997f0fdf..2b1d1ada4 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.1", - "scratch-l10n": "5.0.6", + "scratch-l10n": "5.0.7", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 4570d114ef5e0462f43e59db6e1b0ce41118a9ce Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Thu, 28 Nov 2024 09:22:04 +0200 Subject: [PATCH 054/135] 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 926a7a4f5..3649348ff 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 08:07:20 +0000 Subject: [PATCH 055/135] fix(deps): update dependency scratch-gui to v5.0.2 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9201f3e1..62930d95c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "5.0.1", + "scratch-gui": "5.0.2", "scratch-l10n": "5.0.7", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", @@ -22180,9 +22180,9 @@ } }, "node_modules/scratch-gui": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-5.0.1.tgz", - "integrity": "sha512-BTQUodIDYunIBZ5T3bST41kn0/Qm/kXhDXJveh221M639nBX5JRQhygKtg3bXo72eLwl4KC1GoUaBuB53y1P4A==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-5.0.2.tgz", + "integrity": "sha512-YQ/t83rBZlJJDwaNTz1jWTYnhiylbO7ZxLZc+N7rEgaQz+RXuod0c/gtuj4GMrgDck3psWD9DI3Nqhz+7j6BtQ==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 2b1d1ada4..90375d08e 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "5.0.1", + "scratch-gui": "5.0.2", "scratch-l10n": "5.0.7", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", From ae2c1679ddac01b11e3fdd1f6672bb725870002a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 08:09:28 +0000 Subject: [PATCH 056/135] fix(deps): lock file maintenance --- package-lock.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9201f3e1..129e628af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4029,9 +4029,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "version": "22.10.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz", + "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9240,9 +9240,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.65", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.65.tgz", - "integrity": "sha512-PWVzBjghx7/wop6n22vS2MLU8tKGd4Q91aCEGhG/TYmW6PP5OcSXcdnxTe1NNt0T66N8D6jxh4kC8UsdzOGaIw==", + "version": "1.5.66", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.66.tgz", + "integrity": "sha512-pI2QF6+i+zjPbqRzJwkMvtvkdI7MjVbSh2g8dlMguDJIXEPw+kwasS1Jl+YGPEBfGVxsVgGUratAKymPdPo2vQ==", "dev": true, "license": "ISC" }, @@ -9674,14 +9674,14 @@ } }, "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", "license": "MIT", "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" }, "engines": { "node": ">= 0.4" @@ -13148,7 +13148,7 @@ "version": "0.2.10", "resolved": "https://registry.npmjs.org/hull.js/-/hull.js-0.2.10.tgz", "integrity": "sha512-UO3W30HxhWgeSpNKCdXt00xkwjRTGmhQaoZNP8ll509Nl+DP9juXE3wRGizihuop08FSB4xtAWIbWSe+RxEoog==", - "deprecated": "This package is no longer published on npmjs.com, you are using a deprecated and vulnerable version. Do not use it. Check package homepage on GitHub to see how to fetch the latest version.", + "deprecated": "This package is no longer published on npmjs.com, you are using a deprecated and vulnerable version. Do not use it! Check project homepage on GitHub (README / NPM package) to see how to fetch the latest version.", "dev": true, "license": "BSD" }, @@ -22569,9 +22569,9 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.131", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.131.tgz", - "integrity": "sha512-6ZQZd7sxtPM3FyFxTEXu4/EiZLpsFw68BRP6S6AfUhSpfuYjK8eia7HhoURYR8/ULw7LkN8PAuQcGtcXs3J93g==", + "version": "1.0.132", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.132.tgz", + "integrity": "sha512-IfML9nhPqsVLxoTBF5F3nthoeXmImmKGp10Z/6YDL1WXbU4JLRunDZl9CGVfpMKczyDbhcRd9GI9A5V7JqqFuw==", "dev": true, "dependencies": { "base64-loader": "^1.0.0" @@ -28439,9 +28439,9 @@ "license": "ISC" }, "node_modules/which-typed-array": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", - "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.16.tgz", + "integrity": "sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ==", "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", From 118e980d2c44599a89cec1a362f20fe9b3fe9e8a Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Thu, 28 Nov 2024 14:43:23 +0200 Subject: [PATCH 057/135] 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 dbfa2e11d..589df0a8b 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 0bf84c728318b6158c40ae7ae2323269098de059 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:53:18 +0000 Subject: [PATCH 058/135] fix(deps): update dependency scratch-l10n to v5.0.9 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62930d95c..367f7a871 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.2", - "scratch-l10n": "5.0.7", + "scratch-l10n": "5.0.9", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.7.tgz", - "integrity": "sha512-S4KY75py0p6nIN9ll+K7qn0LIzzVUz4oPaxTj7B0ayEY2EW/JPsilgoJ5pBLC2kEGv5rOar5mSk3vekGpq4uqg==", + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.9.tgz", + "integrity": "sha512-0SHpVZbAGtLJQzO23wUsTmEs60P522ZBSuj7SLueVOCb7oXODM0EY/LgPHMu59yjLnUJ7ijwW+XXyV3xAspB1w==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 90375d08e..9202532a5 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.2", - "scratch-l10n": "5.0.7", + "scratch-l10n": "5.0.9", "selenium-webdriver": "4.26.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 290d0de9f560e8b8fb2c4ccff6c5f514ccd944ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 16:23:44 +0000 Subject: [PATCH 059/135] chore(deps): update dependency selenium-webdriver to v4.27.0 --- package-lock.json | 18 ++++++++++++++---- package.json | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 367f7a871..818a5f881 100644 --- a/package-lock.json +++ b/package-lock.json @@ -113,7 +113,7 @@ "sass-loader": "10.5.2", "scratch-gui": "5.0.2", "scratch-l10n": "5.0.9", - "selenium-webdriver": "4.26.0", + "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", "style-loader": "4.0.0", @@ -22842,10 +22842,20 @@ "license": "MIT" }, "node_modules/selenium-webdriver": { - "version": "4.26.0", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.26.0.tgz", - "integrity": "sha512-nA7jMRIPV17mJmAiTDBWN96Sy0Uxrz5CCLb7bLVV6PpL417SyBMPc2Zo/uoREc2EOHlzHwHwAlFtgmSngSY4WQ==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.27.0.tgz", + "integrity": "sha512-LkTJrNz5socxpPnWPODQ2bQ65eYx9JK+DQMYNihpTjMCqHwgWGYQnQTCAAche2W3ZP87alA+1zYPvgS8tHNzMQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/SeleniumHQ" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/selenium" + } + ], "license": "Apache-2.0", "dependencies": { "@bazel/runfiles": "^6.3.1", diff --git a/package.json b/package.json index 9202532a5..5ac0f061d 100644 --- a/package.json +++ b/package.json @@ -148,7 +148,7 @@ "sass-loader": "10.5.2", "scratch-gui": "5.0.2", "scratch-l10n": "5.0.9", - "selenium-webdriver": "4.26.0", + "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", "style-loader": "4.0.0", From 7bbdc8c962a8743d7d6529d3f9c65476ff139b8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:40:27 +0000 Subject: [PATCH 060/135] fix(deps): update dependency scratch-l10n to v5.0.12 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 818a5f881..59ad02dcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.2", - "scratch-l10n": "5.0.9", + "scratch-l10n": "5.0.12", "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.9.tgz", - "integrity": "sha512-0SHpVZbAGtLJQzO23wUsTmEs60P522ZBSuj7SLueVOCb7oXODM0EY/LgPHMu59yjLnUJ7ijwW+XXyV3xAspB1w==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.12.tgz", + "integrity": "sha512-qTpKbduyp2YeZ+i5LNgjp6eiqF/nICbl6N5T5GchG+tcU72FQm/RuIhMFDz/oU66MC+e8/e1iKBoF6tCQA3ocA==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 5ac0f061d..541e87dca 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.2", - "scratch-l10n": "5.0.9", + "scratch-l10n": "5.0.12", "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From a5e1354ae97400b344f46e6c8ba2c7334764d379 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 06:11:50 +0000 Subject: [PATCH 061/135] fix(deps): lock file maintenance --- package-lock.json | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6aaea8a89..637597017 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8967,9 +8967,9 @@ } }, "node_modules/dompurify": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.1.tgz", - "integrity": "sha512-NBHEsc0/kzRYQd+AY6HR6B/IgsqzBABrqJbpCDQII/OK6h7B7LXzweZTDsqSW2LkTRpoxf18YUP+YjGySk6B3w==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.2.tgz", + "integrity": "sha512-YMM+erhdZ2nkZ4fTNRTSI94mb7VG7uVF5vj5Zde7tImgnhZE3R6YW/IACGIHb2ux+QkEXMhe591N+5jWOmL4Zw==", "dev": true, "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { @@ -9240,9 +9240,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.66", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.66.tgz", - "integrity": "sha512-pI2QF6+i+zjPbqRzJwkMvtvkdI7MjVbSh2g8dlMguDJIXEPw+kwasS1Jl+YGPEBfGVxsVgGUratAKymPdPo2vQ==", + "version": "1.5.67", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.67.tgz", + "integrity": "sha512-nz88NNBsD7kQSAGGJyp8hS6xSPtWwqNogA0mjtc2nUYeEf3nURK9qpV18TuBdDmEDgVWotS8Wkzf+V52dSQ/LQ==", "dev": true, "license": "ISC" }, @@ -12543,12 +12543,15 @@ } }, "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.1.0.tgz", + "integrity": "sha512-FQoVQnqcdk4hVM4JN1eromaun4iuS34oStkdlLENLdpULsuQcTyXj8w7ayhuUfPwEYZ1ZOooOTT6fdA9Vmx/RA==", "license": "MIT", "dependencies": { - "get-intrinsic": "^1.1.3" + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13148,7 +13151,7 @@ "version": "0.2.10", "resolved": "https://registry.npmjs.org/hull.js/-/hull.js-0.2.10.tgz", "integrity": "sha512-UO3W30HxhWgeSpNKCdXt00xkwjRTGmhQaoZNP8ll509Nl+DP9juXE3wRGizihuop08FSB4xtAWIbWSe+RxEoog==", - "deprecated": "This package is no longer published on npmjs.com, you are using a deprecated and vulnerable version. Do not use it! Check project homepage on GitHub (README / NPM package) to see how to fetch the latest version.", + "deprecated": "This package is no longer published on npmjs.com, you are using a deprecated and vulnerable version. Do not use it! Check project homepage on GitHub to see how to fetch the latest version: https://github.com/andriiheonia/hull?tab=readme-ov-file#npm-package", "dev": true, "license": "BSD" }, @@ -17932,9 +17935,9 @@ "dev": true }, "node_modules/nwsapi": { - "version": "2.2.13", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.13.tgz", - "integrity": "sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==", + "version": "2.2.16", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz", + "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==", "dev": true, "license": "MIT" }, @@ -19769,9 +19772,9 @@ "license": "ISC" }, "node_modules/psl": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.13.0.tgz", - "integrity": "sha512-BFwmFXiJoFqlUpZ5Qssolv15DMyc84gTBds1BjsV1BfXEo1UyyD7GsmN67n7J77uRhoSNW1AXtXKPLcBFQn9Aw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.14.0.tgz", + "integrity": "sha512-Syk1bnf6fRZ9wQs03AtKJHcM12cKbOLo9L8JtCCdYj5/DTsHmTyXM4BK5ouWeG2P6kZ4nmFvuNTdtaqfobCOCg==", "dev": true, "license": "MIT", "dependencies": { From df3d9aa43680ae2a99e6c910a8a00163a4b0f6e6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 10:25:36 +0000 Subject: [PATCH 062/135] fix(deps): update dependency scratch-gui to v5.0.3 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6aaea8a89..66a0c5551 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "5.0.2", + "scratch-gui": "5.0.3", "scratch-l10n": "5.0.12", "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", @@ -22180,9 +22180,9 @@ } }, "node_modules/scratch-gui": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-5.0.2.tgz", - "integrity": "sha512-YQ/t83rBZlJJDwaNTz1jWTYnhiylbO7ZxLZc+N7rEgaQz+RXuod0c/gtuj4GMrgDck3psWD9DI3Nqhz+7j6BtQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-5.0.3.tgz", + "integrity": "sha512-gP3ja/ZnkhfguC9HxI5uZLFZndkfMBhqEWPrVdYRpqb/vUEEmQkSr+3eGNdD9RJryfiHCNB0exYIcf71F8BewQ==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 541e87dca..6b4417532 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.81.0", "sass-loader": "10.5.2", - "scratch-gui": "5.0.2", + "scratch-gui": "5.0.3", "scratch-l10n": "5.0.12", "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", From fe189211333b1bd2951ebeac3a8e4f69ea071e18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 14:04:52 +0000 Subject: [PATCH 063/135] fix(deps): update dependency scratch-l10n to v5.0.14 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66a0c5551..32ae7770f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.3", - "scratch-l10n": "5.0.12", + "scratch-l10n": "5.0.14", "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.12.tgz", - "integrity": "sha512-qTpKbduyp2YeZ+i5LNgjp6eiqF/nICbl6N5T5GchG+tcU72FQm/RuIhMFDz/oU66MC+e8/e1iKBoF6tCQA3ocA==", + "version": "5.0.14", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.14.tgz", + "integrity": "sha512-tfArLlPE9LrOgs73r78U6bTogSE+Vw0tv/gcN0TBJJq5Yiiiw5eTogKBSTaKrn6PVVC9cvTrBfLPr28+RN9DKg==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 6b4417532..a6ebcb2ee 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.3", - "scratch-l10n": "5.0.12", + "scratch-l10n": "5.0.14", "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 1472b96f17f0d5b47ba19a3da6a870c5b30a4226 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 09:07:48 +0000 Subject: [PATCH 064/135] fix(deps): update dependency scratch-l10n to v5.0.15 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32ae7770f..eff8bda3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.3", - "scratch-l10n": "5.0.14", + "scratch-l10n": "5.0.15", "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", @@ -22465,9 +22465,9 @@ } }, "node_modules/scratch-l10n": { - "version": "5.0.14", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.14.tgz", - "integrity": "sha512-tfArLlPE9LrOgs73r78U6bTogSE+Vw0tv/gcN0TBJJq5Yiiiw5eTogKBSTaKrn6PVVC9cvTrBfLPr28+RN9DKg==", + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.15.tgz", + "integrity": "sha512-BwX6cBziFfMv5PIegq5/5TY7xF3OnHmtkmMIZjDDF6UYVB/g/9fq5CFGyI61IVXgQ6nvdF0EI7Z866Ax71DnFg==", "dev": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index a6ebcb2ee..738d7712b 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "sass": "1.81.0", "sass-loader": "10.5.2", "scratch-gui": "5.0.3", - "scratch-l10n": "5.0.14", + "scratch-l10n": "5.0.15", "selenium-webdriver": "4.27.0", "slick-carousel": "1.8.1", "stream-browserify": "3.0.0", From 3b0f521a8096bff32a930f4d0f2380fdfca08033 Mon Sep 17 00:00:00 2001 From: Bogomil-Stoyanov Date: Sun, 1 Dec 2024 17:58:42 +0200 Subject: [PATCH 065/135] 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 a9d31fd19..9ff789c37 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 715dffa3e..99923443a 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 (