Skip to content

Commit 1d4aae7

Browse files
authored
Merge pull request #733 from rgantzos/main
2 parents 296de9f + fc63de3 commit 1d4aae7

File tree

8 files changed

+34
-10
lines changed

8 files changed

+34
-10
lines changed

extras/feedback/page.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ document.body.style.backgroundColor = "white";
55
document.body.style.textAlign = "center";
66
document.body.style.padding = "3rem";
77
var h1 = document.createElement("h1");
8-
h1.textContent = "ScratchTools Authentication";
8+
h1.textContent = "Unavailable";
99
document.body.appendChild(h1);
1010
h1.style.fontFamily = "Inter";
1111
h1.style.color = "#ff9f00";
@@ -14,7 +14,7 @@ style.textContent =
1414
'@import url("https://fonts.googleapis.com/css2?family=Inter&display=swap");';
1515
document.body.appendChild(style);
1616
var p = document.createElement("p");
17-
p.textContent = "Thank you for your patience while we authorize you.";
17+
p.textContent = "Due to bugs with the Scratch website, we are unfortunately unable to verify you at this time. We are working to fix this.";
1818
p.style.color = "black";
1919
p.style.opacity = ".5";
2020
p.style.fontSize = "1rem";

extras/popup/popup.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,4 +454,11 @@ span.new-feature-tag.beta {
454454
opacity: 0;
455455
width: 0;
456456
height: 0;
457+
}
458+
.welcome p {
459+
font-size: .85rem;
460+
}
461+
.welcome {
462+
background-color: #fc8c4f20;
463+
border-bottom-color: #fc8c4f;
457464
}

extras/popup/popup.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
<hr class="bar" />
2020
<div class="welcome">
2121
<center>
22-
<img src="/extras/icons/mini-logo.svg" class="minilogo" id="minilogo" />
23-
<h3 class="count" id="popupnote">
24-
Welcome to your settings! You can find all features here!
25-
</h3>
22+
<img src="/extras/icons/warning.svg" class="minilogo" id="minilogo" />
23+
<h2 class="count" id="popupnote">
24+
Important
25+
</h2>
26+
<p>The Scratch website is currently having issues with cloud data. For this reason, the ScratchTools support system and feedback center will not work. In addition, features such as Display Names and Emoji Statuses are temporarily down.</p>
2627
</center>
2728
</div>
2829
<div class="settings"></div>

extras/support/page.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ document.body.style.backgroundColor = "white";
55
document.body.style.textAlign = "center";
66
document.body.style.padding = "3rem";
77
var h1 = document.createElement("h1");
8-
h1.textContent = "ScratchTools Authentication";
8+
h1.textContent = "Unavailable";
99
document.body.appendChild(h1);
1010
h1.style.fontFamily = "Inter";
1111
h1.style.color = "#ff9f00";
@@ -14,7 +14,7 @@ style.textContent =
1414
'@import url("https://fonts.googleapis.com/css2?family=Inter&display=swap");';
1515
document.body.appendChild(style);
1616
var p = document.createElement("p");
17-
p.textContent = "Thank you for your patience while we authorize you.";
17+
p.textContent = "Due to bugs with the Scratch website, we are unfortunately unable to verify you at this time. We are working to fix this.";
1818
p.style.color = "black";
1919
p.style.opacity = ".5";
2020
p.style.fontSize = "1rem";

features/display-name/data.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@
1212
"styles": [
1313
{ "file": "profile.css", "runOn": "/users/*" }
1414
],
15-
"similar": ["isonline", "emoji-status"]
15+
"similar": ["isonline", "emoji-status"],
16+
"components": [
17+
{
18+
"type": "warning",
19+
"content": "Due to issues with Scratch's cloud data system, the ability to change your display name is temporarily unavailable."
20+
}
21+
]
1622
}

features/display-name/profile.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ if (
3333
span.textContent = "Set Display Name";
3434
span.className = "ste-set-display-name";
3535
span.addEventListener("click", function () {
36+
alert("Due to issues with Scratch's cloud data system, the ability to set your display name is temporarily unavailable at this time.")
37+
return;
3638
var newDisplayName = prompt(
3739
"Please enter in your desired display name.\n\nPlease make sure that it's appropriate, other users will see it too. Leave this blank if you wish to change your mind. Set the display name to your username if you want to delete your display name."
3840
);

features/emoji-status/data.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,11 @@
88
"tags": ["New", "Featured"],
99
"styles": [{ "file": "style.css", "runOn": "/users/*" }],
1010
"scripts": [{ "file": "script.js", "runOn": "/users/*" }],
11-
"similar": ["isonline", "display-name"]
11+
"similar": ["isonline", "display-name"],
12+
"components": [
13+
{
14+
"type": "warning",
15+
"content": "Due to issues with Scratch's cloud data system, the ability to change your emoji status is temporarily unavailable."
16+
}
17+
]
1218
}

features/emoji-status/script.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ async function getStatus() {
1616
Scratch.INIT_DATA.PROFILE.model.username === ScratchTools.Auth.user.username
1717
) {
1818
span.addEventListener("click", async function () {
19+
alert("Due to issues with Scratch's cloud data system, the ability to set your emoji status is temporarily unavailable at this time.")
20+
return;
1921
if (confirm("Would you like to set your emoji status?")) {
2022
var status = prompt(
2123
"What would you like your status to be?\n\nIt must be one single emoji."

0 commit comments

Comments
 (0)