From 5cebd7cd85f3ebf12f2f5c4c8a4d41902e39cd1d Mon Sep 17 00:00:00 2001
From: easrng
Date: Tue, 29 Sep 2020 14:35:18 -0400
Subject: [PATCH 01/24] Create privacy.md
---
privacy.md | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 privacy.md
diff --git a/privacy.md b/privacy.md
new file mode 100644
index 0000000..a350e6a
--- /dev/null
+++ b/privacy.md
@@ -0,0 +1,39 @@
+---
+layout: markdown
+title: Privacy policy
+description: This Privacy Policy describes how we collect, use, and safeguard the information you give us.
+---
+
+This Privacy Policy describes how we collect, use, and safeguard the information you give us. In this agreement, website refers to the Scratch Addons website (https://scratchaddons.com/). Extension refers to our browser extension, which you can download from https://chrome.google.com/webstore/detail/fbeffbjdlemaoicjdapfpikkikjoneco or https://addons.mozilla.org/firefox/addon/scratch-messaging-extension/.
+
+When we talk about the service, we mean any service provided by us, such as the website or our services used in addons. The terms "we," "us," and "our" refer to the leaders of the Scratch Addons open source project (https://github.com/ScratchAddons). When you use our services, you agree to this privacy policy.
+
+## Information we collect
+
+We collect a few different kinds of information about you, like what part of the world you are in, what pages you come to our website from, and what device and software you use. We also collect information about how you use our website. We might collect your Scratch username.
+
+### Information collected via Technology
+
+When you load our website, your browser automatically sends us some information about you. That information includes what page you were on before you came to our website, what kind of device you use, and your IP address. This information does not let us know who you are, but it can help us make decisions about how to make our website better. We may use cookies or other local storage to collect information about you, but not who you are, and remember your settings. For example, Scratch Addons may use cookies to remember if you want to use dark mode.
+
+Scratch Addons may use both persistent and session storage. Persistent storage stays on your computer after you close your browser until you delete it, and your browser deletes session storage when you close it. We use Google Analytics to collect data. For information about how Google may use your data, see https://support.google.com/analytics/answer/6004245 and https://policies.google.com/technologies/partner-sites.
+
+### How we use your information
+
+We will never sell, rent, or share your data, except as needed to operate the service. We do share your information with companies whose services we use, like the company that hosts the servers collecting form responses or the one hosting our website. In general, we use the personal information you give to us to help us communicate with you. For example, we might use personal information to contact you in response to questions or provide technical support. If law enforcement asks for data about a user, we will give it to them.
+
+### How we protect information
+
+We are generally quite careful with your data, using security measures like HTTPS and avoiding the use of insecure code that could allow XSS. However, we ensure that hackers won't. When you use our service, you accept that small have access to your information if we get hacked.
+
+## Links to other websites
+
+As part of the service, we may provide links to or compatibility with other websites or apps. We aren't responsible for the content on those sites or how they might use your data. This Privacy Policy is only about our service.
+
+## Changes to our privacy policy
+
+We might change this policy at any time, but if we do, we will tell you. If we make substantial changes, they will take effect 30 days after we tell you. Small changes or clarifications will take effect immediately. You should periodically check the website and this page for updates.
+
+## How to contact us
+
+If you have any questions, please contact us through our feedback page at https://scratchaddons.com/feedback. This page was last updated on 9/29/2020.
From c3205cb06350e1e8869a186c4da803ab4ee258ce Mon Sep 17 00:00:00 2001
From: easrng
Date: Tue, 29 Sep 2020 14:36:40 -0400
Subject: [PATCH 02/24] Update footer.html
---
_includes/footer.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/_includes/footer.html b/_includes/footer.html
index 0ce5a96..3f53f4d 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -14,6 +14,7 @@
Resources
OrganizationRepositoryDocumentation
+ Privacy Policy
-
\ No newline at end of file
+
From 5380a2b528994c1118b00da5a04b71fd815639a0 Mon Sep 17 00:00:00 2001
From: easrng
Date: Tue, 29 Sep 2020 14:44:37 -0400
Subject: [PATCH 03/24] Update head.html
---
_includes/head.html | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/_includes/head.html b/_includes/head.html
index 9b41999..dc26ca1 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -36,6 +36,47 @@
{% unless page.no-analytics %}
-
+
+
{% endunless %}
From 1f40a9249d1a6d4d7089c842c936ac0b2f18d550 Mon Sep 17 00:00:00 2001
From: easrng
Date: Tue, 29 Sep 2020 14:45:02 -0400
Subject: [PATCH 04/24] Update faq.md
---
faq.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/faq.md b/faq.md
index 6717662..b324c65 100644
--- a/faq.md
+++ b/faq.md
@@ -5,7 +5,7 @@ description:
---
-
-
-
+
{% unless page.no-analytics %}
-
-
+
{% endunless %}
+
\ No newline at end of file
diff --git a/_includes/nav.html b/_includes/nav.html
index 9195c05..7e966dc 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -22,4 +22,13 @@
-
\ No newline at end of file
+
+
+
+
+
By continuing your visit to this site, you accept the use of cookies by Google Analytics to make visits statistics.
\ No newline at end of file
diff --git a/assets/css/base.scss b/assets/css/base.scss
index 9c8f1f5..71d2459 100644
--- a/assets/css/base.scss
+++ b/assets/css/base.scss
@@ -170,6 +170,77 @@ button#dark-toggle {
}
}
+#cookies-eu-banner {
+
+ background: $dark-dp-2;
+ color: #fff;
+ padding: 6px;
+
+ > div {
+ justify-content: center;
+ align-content: center;
+
+ > * {
+ margin: auto 0.125rem;
+ font-size: 0.8rem
+ }
+ }
+
+ p {
+ display: block;
+ margin-left: 0.25rem
+ }
+
+ #cookies-eu-more, #cookies-eu-accept, #cookies-eu-reject {
+ // text-decoration: none;
+ // background: #222;
+ // color: #fff;
+ // border: 1px solid #000;
+ // cursor: pointer;
+ padding: 4px 7px;
+ // font-size: 13px;
+ // font-weight: bold;
+ }
+
+ #cookies-eu-more {
+ color: white;
+ background: inherit;
+ border-color: white
+ }
+
+ // #cookies-eu-more, #cookies-eu-accept {
+
+ // &:hover, &:focus {
+ // border-color: #fff;
+ // background: #222;
+ // color: #fff;
+ // }
+
+ // background: #fff;
+ // color: #222;
+
+ // }
+
+ // #cookies-eu-reject {
+
+ // background: none;
+ // font-weight: normal;
+ // color: #ccc;
+ // cursor: pointer;
+ // padding: 4px 7px;
+ // border: 1px solid #666;
+
+ // &:hover, &:focus {
+ // border-color: #fff;
+ // background: #222;
+ // color: #fff;
+ // }
+
+ // }
+
+}
+
+
body.dark {
background-color: $dark-neutral;
@@ -241,7 +312,7 @@ body.dark.extension-styled {
}
header {
- background-color: #ff7b26;
+ background-color: $scratch-orange;
}
footer {
@@ -266,6 +337,10 @@ body.dark.extension-styled {
}
+ #cookies-eu-banner {
+ background: #2a2a2a
+ }
+
}
.no-animation {
@@ -278,4 +353,4 @@ body:not([data-theme-loaded=true]) {
display: none;
-}
+}
\ No newline at end of file
diff --git a/assets/js/website-base.js b/assets/js/website-base.js
index c091432..6f12030 100644
--- a/assets/js/website-base.js
+++ b/assets/js/website-base.js
@@ -16,7 +16,7 @@ const waitForElement = selector => {
}
})
- observer.observe(document.body, {
+ observer.observe(document.documentElement, {
childList: true,
subtree: true
})
@@ -80,6 +80,40 @@ window.addEventListener('load', () => {
})
+/* =============================================================
+ COOKIE CONSENT
+============================================================= */
+
+var cookiesBanner = new CookiesEuBanner(function () {
+ window.dataLayer = window.dataLayer || []; function gtag() {dataLayer.push(arguments)}; gtag("js", new Date); gtag("config", "UA-144464383-2")
+ let s = document.createElement("script")
+ s.src ="https://www.googletagmanager.com/gtag/js?id=UA-144464383-2";
+ document.head.appendChild(s)
+ // this.deleteCookie(this.cookieName)
+ // window.location.reload()
+}, false)
+
+// cookiesBanner.deleteCookie(cookiesBanner.cookieName);
+// console.log(cookiesBanner.hasConsent())
+
+// function updateCookiesEuState() {
+// var hasConsent = cookiesBanner.hasConsent()
+// var state = '❔ Nor accepted nor rejected';
+
+// if (hasConsent === true) {
+// state = '✅ Accepted';
+// } else if (hasConsent === false) {
+// state = '❌ Rejected';
+// cookiesBanner.deleteCookie(cookiesBanner.cookieName)
+// cookiesBanner.setConsent(false);
+// }
+
+// console.log(state)
+// }
+
+// updateCookiesEuState();
+// setInterval(updateCookiesEuState, 100);
+
/* =============================================================
DARK THEME
============================================================= */
@@ -127,7 +161,7 @@ if (localStorage.getItem("darkTheme") === "true") {
localStorage.setItem("darkTheme", false)
}
-document.body.dataset.themeLoaded = true
+waitForElement("body").then(() => document.body.dataset.themeLoaded = true)
waitForElement("#dark-toggle").then(() => {
diff --git a/privacy.md b/privacy.md
index a350e6a..eabe3f9 100644
--- a/privacy.md
+++ b/privacy.md
@@ -1,12 +1,14 @@
---
layout: markdown
-title: Privacy policy
+title: Privacy Policy
description: This Privacy Policy describes how we collect, use, and safeguard the information you give us.
---
-This Privacy Policy describes how we collect, use, and safeguard the information you give us. In this agreement, website refers to the Scratch Addons website (https://scratchaddons.com/). Extension refers to our browser extension, which you can download from https://chrome.google.com/webstore/detail/fbeffbjdlemaoicjdapfpikkikjoneco or https://addons.mozilla.org/firefox/addon/scratch-messaging-extension/.
+*Effective date: 30 September 2020*
-When we talk about the service, we mean any service provided by us, such as the website or our services used in addons. The terms "we," "us," and "our" refer to the leaders of the Scratch Addons open source project (https://github.com/ScratchAddons). When you use our services, you agree to this privacy policy.
+This Privacy Policy describes how we collect, use, and safeguard the information you give us. In this agreement, website refers to the Scratch Addons website (). Extension refers to our browser extension, which you can download from or
+
+When we talk about the service, we mean any service provided by us, such as the website or our services used in addons. The terms "we," "us," and "our" refer to the leaders of the Scratch Addons open source project (). When you use our services, you agree to this privacy policy.
## Information we collect
@@ -16,7 +18,7 @@ We collect a few different kinds of information about you, like what part of the
When you load our website, your browser automatically sends us some information about you. That information includes what page you were on before you came to our website, what kind of device you use, and your IP address. This information does not let us know who you are, but it can help us make decisions about how to make our website better. We may use cookies or other local storage to collect information about you, but not who you are, and remember your settings. For example, Scratch Addons may use cookies to remember if you want to use dark mode.
-Scratch Addons may use both persistent and session storage. Persistent storage stays on your computer after you close your browser until you delete it, and your browser deletes session storage when you close it. We use Google Analytics to collect data. For information about how Google may use your data, see https://support.google.com/analytics/answer/6004245 and https://policies.google.com/technologies/partner-sites.
+Scratch Addons may use both persistent and session storage. Persistent storage stays on your computer after you close your browser until you delete it, and your browser deletes session storage when you close it. We use Google Analytics to collect data. For information about how Google may use your data, see and .
### How we use your information
@@ -36,4 +38,4 @@ We might change this policy at any time, but if we do, we will tell you. If we m
## How to contact us
-If you have any questions, please contact us through our feedback page at https://scratchaddons.com/feedback. This page was last updated on 9/29/2020.
+If you have any questions, please contact us through our feedback page at This page was last updated on 30 September 2020.
From 3903313be27c10eb0de80fd3ded0690b68fa0539 Mon Sep 17 00:00:00 2001
From: Hans5958
Date: Wed, 30 Sep 2020 15:31:58 +0000
Subject: [PATCH 07/24] Fix black color for extension-styled banner, change
' to single quotes
---
assets/css/base.scss | 12 ++++++++----
privacy.md | 4 ++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/assets/css/base.scss b/assets/css/base.scss
index 71d2459..cf4c241 100644
--- a/assets/css/base.scss
+++ b/assets/css/base.scss
@@ -303,6 +303,14 @@ body.extension-styled {
}
}
+body.extension-styled {
+
+ #cookies-eu-banner {
+ background: #2a2a2a
+ }
+
+}
+
body.dark.extension-styled {
background-color: #222;
@@ -337,10 +345,6 @@ body.dark.extension-styled {
}
- #cookies-eu-banner {
- background: #2a2a2a
- }
-
}
.no-animation {
diff --git a/privacy.md b/privacy.md
index eabe3f9..034af9b 100644
--- a/privacy.md
+++ b/privacy.md
@@ -26,11 +26,11 @@ We will never sell, rent, or share your data, except as needed to operate the se
### How we protect information
-We are generally quite careful with your data, using security measures like HTTPS and avoiding the use of insecure code that could allow XSS. However, we ensure that hackers won't. When you use our service, you accept that small have access to your information if we get hacked.
+We are generally quite careful with your data, using security measures like HTTPS and avoiding the use of insecure code that could allow XSS. However, we ensure that hackers won't. When you use our service, you accept that small have access to your information if we get hacked.
## Links to other websites
-As part of the service, we may provide links to or compatibility with other websites or apps. We aren't responsible for the content on those sites or how they might use your data. This Privacy Policy is only about our service.
+As part of the service, we may provide links to or compatibility with other websites or apps. We aren't responsible for the content on those sites or how they might use your data. This Privacy Policy is only about our service.
## Changes to our privacy policy
From c1842942d60335ef1485b042f22ea357ac69fb08 Mon Sep 17 00:00:00 2001
From: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com>
Date: Tue, 27 Oct 2020 13:54:28 -0400
Subject: [PATCH 08/24] Update faq.md
---
faq.md | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/faq.md b/faq.md
index b324c65..32b9c37 100644
--- a/faq.md
+++ b/faq.md
@@ -1,24 +1,7 @@
---
layout: markdown
title: Frequently Asked Questions
-description:
+description: Coming soon!
---
-
-
-### Question 1
-
-Answer 1
-
-### Question 2
-
-Answer 2
-
-### Question 3
-
-Answer 3
+Coming soon!
From ad32639c7ff04758f4cfc3ac53755e24fc32e739 Mon Sep 17 00:00:00 2001
From: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com>
Date: Tue, 27 Oct 2020 13:55:17 -0400
Subject: [PATCH 09/24] Rename faq.md to site/faq.md
---
faq.md => site/faq.md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename faq.md => site/faq.md (100%)
diff --git a/faq.md b/site/faq.md
similarity index 100%
rename from faq.md
rename to site/faq.md
From 7bc9b4d841e39f51339228f7bddaba663def6dbf Mon Sep 17 00:00:00 2001
From: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com>
Date: Tue, 27 Oct 2020 13:55:36 -0400
Subject: [PATCH 10/24] Rename welcome.html to site/welcome.html
---
welcome.html => site/welcome.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename welcome.html => site/welcome.html (98%)
diff --git a/welcome.html b/site/welcome.html
similarity index 98%
rename from welcome.html
rename to site/welcome.html
index 687a819..e03537f 100644
--- a/welcome.html
+++ b/site/welcome.html
@@ -17,4 +17,4 @@
Welcome!
Coming from Scratch Messaging Extension?
Scratch Messaging Extension (by griffpatch) has been updated and is now called Scratch Addons. Read more.
-
\ No newline at end of file
+
From 753b973fb9209af88478fa1b4ea3165010116727 Mon Sep 17 00:00:00 2001
From: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com>
Date: Tue, 27 Oct 2020 13:55:53 -0400
Subject: [PATCH 11/24] Rename scratch-messaging-transition.html to
site/scratch-messaging-transition.html
---
.../scratch-messaging-transition.html | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename scratch-messaging-transition.html => site/scratch-messaging-transition.html (100%)
diff --git a/scratch-messaging-transition.html b/site/scratch-messaging-transition.html
similarity index 100%
rename from scratch-messaging-transition.html
rename to site/scratch-messaging-transition.html
From b55db9da477aedc1dadb51ef488b3d2e2ac75f0e Mon Sep 17 00:00:00 2001
From: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com>
Date: Tue, 27 Oct 2020 13:56:07 -0400
Subject: [PATCH 12/24] Rename privacy.md to site/privacy.md
---
privacy.md => site/privacy.md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename privacy.md => site/privacy.md (100%)
diff --git a/privacy.md b/site/privacy.md
similarity index 100%
rename from privacy.md
rename to site/privacy.md
From 601b39df7cbed42e2fcd4b7047fcaef688c6f882 Mon Sep 17 00:00:00 2001
From: GrahamSH <64214252+GrahamSH-LLK@users.noreply.github.com>
Date: Tue, 27 Oct 2020 13:56:21 -0400
Subject: [PATCH 13/24] Rename index.html to site/index.html
---
index.html => site/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename index.html => site/index.html (99%)
diff --git a/index.html b/site/index.html
similarity index 99%
rename from index.html
rename to site/index.html
index 71e69c5..3b79880 100644
--- a/index.html
+++ b/site/index.html
@@ -68,4 +68,4 @@
Dissapointed, or have something to say? Tell us here.
+
+
+
+
diff --git a/site/index.html b/site/index.html
index 71ffd4b..678c4f7 100644
--- a/site/index.html
+++ b/site/index.html
@@ -1,158 +1,158 @@
----
-layout: default
-title: Index
-description: Scratch Addons is an browser extension that provides new features and themes for the Scratch (scratch.mit.edu) website and project editor. It has a mission to collect, archive, and put into use userstyles and userscripts, developed by several members of the Scratch community.
----
-
-
-
-
-
All in one browser extension for Scratch
-
Scratch Addons is an browser extension that provides new features and themes for the Scratch website and project editor. It has a mission to collect, archive, and put into use userstyles and userscripts, developed by several members of the Scratch community.
Various features to empower your Scratch website and editor experience
-
-
-
-
-
-
-
-
Easy-to-use interface with various controls for each feature and theme
-
-
-
-
-
-
-
-
Free, open source, and maintained by many users from the Scratch community
-
-
-
-
-
-
Highlights
-
-
-
-
-
-
Scratch Messaging
-
The "grandfather" of Scratch Addons. It is available when clicking the Scratch Addons icon, and provides easy reading and replying to your Scratch messages: groups messages by project, shows full comment text and context, allows direct comment replying.
-
-
-
-
-
-
-
-
Scratch Notifier
-
Notifications on new Scratch messages. You can click the notification to go straight to the message (comment, project, etc.)
-
-
-
-
-
-
-
-
Developer tools
-
From the original extension. It adds a find box and new menu options to the editor: copy/paste blocks, better tidy up, go to custom block definition, and more!
-
-
-
-
+---
+layout: default
+title: Index
+description: Scratch Addons is an browser extension that provides new features and themes for the Scratch (scratch.mit.edu) website and project editor. It has a mission to collect, archive, and put into use userstyles and userscripts, developed by several members of the Scratch community.
+---
+
+
+
+
+
All in one browser extension for Scratch
+
Scratch Addons is an browser extension that provides new features and themes for the Scratch website and project editor. It has a mission to collect, archive, and put into use userstyles and userscripts, developed by several members of the Scratch community.
Various features to empower your Scratch website and editor experience
+
+
+
+
+
+
+
+
Easy-to-use interface with various controls for each feature and theme
+
+
+
+
+
+
+
+
Free, open source, and maintained by many users from the Scratch community
+
+
+
+
+
+
Highlights
+
+
+
+
+
+
Scratch Messaging
+
The "grandfather" of Scratch Addons. It is available when clicking the Scratch Addons icon, and provides easy reading and replying to your Scratch messages: groups messages by project, shows full comment text and context, allows direct comment replying.
+
+
+
+
+
+
+
+
Scratch Notifier
+
Notifications on new Scratch messages. You can click the notification to go straight to the message (comment, project, etc.)
+
+
+
+
+
+
+
+
Developer tools
+
From the original extension. It adds a find box and new menu options to the editor: copy/paste blocks, better tidy up, go to custom block definition, and more!
+
+
+
+
\ No newline at end of file
diff --git a/site/scratch-messaging-transition.html b/site/scratch-messaging-transition.html
new file mode 100644
index 0000000..2dad655
--- /dev/null
+++ b/site/scratch-messaging-transition.html
@@ -0,0 +1,70 @@
+---
+layout: default
+title: Extension Update (Transition)
+description: Scratch Messaging Extension (by griffpatch) has been updated and is now called Scratch Addons. Click the Scratch Addons icon in the extension bar to check out the new redesigned messages summary!
+---
+
+
+
+
+
+
+
+
+
+
+
+
Scratch Messaging Extension is now Scratch Addons!
+
+
+
+
+
What happened?
+
Scratch Messaging Extension (by griffpatch) has been updated and is now called Scratch Addons.
+
Click the Scratch Addons icon in the extension bar to check out the new redesigned messages summary!
+
Scratch Addons also includes many other Scratch related features. To enable them, go to Scratch Addons settings.
+
For example, you can turn on Scratch Notifier to get browser notifications when you get new Scratch messages.
+
Themes and features for the Scratch project editor are also available, like Editor dark mode and Project progress bar.
+
+
+
+
+
+
+
What is Scratch Addons?
+
Scratch Addons is an "all-in-one" browser extension for Scratch. It provides features and themes, both for the Scratch website and the project editor.
+
Scratch Addons is completely free and open source. You can read the source code and contribute on GitHub.
+
Expect weekly or montly updates, including bug fixes, enhanced features, and new features and themes!
+
+
+
+
+
Is there anything that I need to do?
+
Nope.
+
Scratch Messaging Extension was already updated to Scratch Addons on your device. You can keep using Scratch Messaging normally by clicking the Scratch Addons icon in the extension bar.
+
If you'd like to enable more Scratch Addons features, go to its settings page by clicking its icon in the extension bar, then click the options icon.
+
+
+
+
\ No newline at end of file
diff --git a/site/welcome.html b/site/welcome.html
index e69de29..589d34e 100644
--- a/site/welcome.html
+++ b/site/welcome.html
@@ -0,0 +1,57 @@
+---
+layout: default
+title: Welcome!
+description: If you are reading this, then Scratch Addons has been installed successfully! Thank you for installing, and enjoy using the extension!
+---
+
+
+
Welcome!
+
If you are reading this, then Scratch Addons has been installed successfully!
+
Thank you for installing, and enjoy using the extension!
+
+
+
+
Getting started
+
+
+
+ Step 1
+
+
+
+
Click the Scratch Addons extension icon
+
It is on the top-right corner of your browser. Google Chrome users need to click the puzzle icon to find the icon.
+
+
+
+
+ Step 2
+
+
+
+
Press the gear icon to go to the Settings page
+
This will open the Settings page where you can configure how the extension works.
+
+
+
+
+ Step 3
+
+
+
+
Scroll through the addons list and enable the ones that you want
+
You can also configure each of the addons on the bottom section of each addons.