Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

April Fools 2024 easter egg: Scratch Haddocks #7299

Merged
merged 12 commits into from
Mar 28, 2024

Conversation

WorldLanguages
Copy link
Member

@WorldLanguages WorldLanguages commented Mar 25, 2024

Right now only the top part of the popup has any changes at all

(THIS SCREENSHOT IS NOW OUTDATED)
image

const now = Date.now() / 1000;
// TODO: update these timestamps for year 2024
if (/*now < 1648911600 && now > 1648738800 && */ ["popup"].includes(location.pathname.split("/")[2])) {
document.documentElement.style.setProperty("--brand-orange", "#3232fd");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the same blue as the prerelease versions

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the same blue as the prerelease versions

Sorry if this is a dumb question that may be a bit off-topic, but, why did you say that in a review on your own PR while you could've just put that in a comment?

@mybearworld
Copy link
Contributor

mybearworld commented Mar 25, 2024

Timestamps for this year are now < 1712070000 && now > 1711897200
Edit: For 12PM GMT: now < 1712059200 && now > 1711886400

@DNin01
Copy link
Member

DNin01 commented Mar 25, 2024

Is there anything else we could replace with emojis of sea creatures? 😁 Maybe some of the icons?

Or could we just have haddocks swimming/floating around on the popup?

@DNin01
Copy link
Member

DNin01 commented Mar 26, 2024

Or could we just have haddocks swimming/floating around on the popup?

Made it:

Scratch.Addons.but.it.s.a.fish.tank.mp4

These are the fish emoji from Windows 11 (the OS I'm using), BTW

@DNin01
Copy link
Member

DNin01 commented Mar 26, 2024

Code for that available at https://github.com/DNin01/ScratchAddons/tree/afd24-fish-tank

@WorldLanguages You can add it to this PR if you want.

@WorldLanguages
Copy link
Member Author

Or could we just have haddocks swimming/floating around on the popup?

lol! I don't know what to think

@WorldLanguages
Copy link
Member Author

Timestamps for this year are now < 1712070000 && now > 1711897200

I'm not sure if those are 3 hours off or not? Time zones make it confusing
My intention was always to make our April Fools be from March 31 noon UTC+0 to April 2 noon UTC+0

@mybearworld
Copy link
Contributor

mybearworld commented Mar 26, 2024

They're the same as 2022 for me - so 3PM GMT, not 12pm.
image
These should be 12pm GMT: now < 1712059200 && now > 1711886400

@Waakul
Copy link
Contributor

Waakul commented Mar 26, 2024

Timestamps for this year are now < 1712070000 && now > 1711897200

I'm not sure if those are 3 hours off or not? Time zones make it confusing My intention was always to make our April Fools be from March 31 noon UTC+0 to April 2 noon UTC+0

Why use timestamps?

var currentDate = new Date();

var currentMonth = currentDate.getMonth();
var currentDay = currentDate.getDate();

if ((currentMonth === 2 && currentDay >= 31) || (currentMonth === 3 && currentDay <= 2)) {
    // The code to do when the date is march 31st - April 2nd here.
}

Can do the trick..

@mybearworld
Copy link
Contributor

I think we want it to appear at the same time for all users. Timestamps ignore time zones, your code doesn't.

@Samq64

This comment was marked as resolved.

@Samq64 Samq64 added type: enhancement New feature for the project scope: webpages Related to the web pages (settings page, pop-up, etc) labels Mar 26, 2024
@Samq64 Samq64 added this to the v1.37.0 milestone Mar 26, 2024
@Waakul
Copy link
Contributor

Waakul commented Mar 26, 2024

currentMonth === 2 && currentDay >= 31

February 31st, what a leap year!

Months start from 0 in js if you're confused.

@CST1229
Copy link
Member

CST1229 commented Mar 26, 2024

Months start from 0 in js if you're confused.

And days don't?!

@mybearworld
Copy link
Contributor

And days don't?!

Welcome to JavaScript!

@WorldLanguages
Copy link
Member Author

WorldLanguages commented Mar 26, 2024

Or could we just have haddocks swimming/floating around on the popup?

Made it:

Should we add those then? As long as they aren't that annoying, it should be fine...

EDIT: I added the swimming fish to this PR.

@WorldLanguages
Copy link
Member Author

(We wouldn't show the fish animations if reduced-motion was toggled by the user)

@WorldLanguages WorldLanguages mentioned this pull request Mar 26, 2024
@BroJac5246
Copy link
Contributor

I propose that we also temporarily replace the dangos with haddocks because it's easy and why not?

@WorldLanguages
Copy link
Member Author

I propose that we also temporarily replace the dangos with haddocks because it's easy and why not?

Replace which dangos?

@Waakul
Copy link
Contributor

Waakul commented Mar 26, 2024

If we could collect some projects related to haddocks, we could feature them in a separate section under the featured projects section in the homepage like featured dangos?

@mybearworld
Copy link
Contributor

Replace which dangos?

Probably in dango-rain

@mybearworld
Copy link
Contributor

If we could collect some projects related to haddocks, we could feature them in a separate section under the featured projects section in the homepage like featured dangos?

  1. Meh, not sure if we want to reuse that
  2. I'd be very surprised if there are actual good projects about haddocks lol

@WorldLanguages
Copy link
Member Author

WorldLanguages commented Mar 26, 2024

What shade of blue is best to represent fish?

EDIT: I changed it to "Bluetiful" #3C69E7 because it is a lighter blue but it still has enough contrast with white text.

@Waakul
Copy link
Contributor

Waakul commented Mar 26, 2024

What shade of blue is better to represent fish?

Aqua blue in my opinion.

@DNin01
Copy link
Member

DNin01 commented Mar 27, 2024

Okay, the haddocks shouldn't swim through the edges anymore.

@RedGuy12
Copy link
Contributor

Are we still planning to merge this and release 1.37, and expecting CWS to review this before Monday? There's not much time...

@WorldLanguages
Copy link
Member Author

Looks ready to merge @DNin01 @Samq64 @mybearworld Any approvals?

To test it you can replace the 4 instances of const now = Date.now() / 1000; with const now = 1711886401;

@WorldLanguages
Copy link
Member Author

I also tested this with reduced motion enabled.

Copy link
Contributor

@mybearworld mybearworld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The contrast of the fish in the header (when prefers-reduced-motion is enabled) isn't great on Windows 11, but that's not that important.

Scratch Haddocks 🐟🐟🐟 on a blue background where the fish emoji are also blue.

@Waakul
Copy link
Contributor

Waakul commented Mar 28, 2024

The logo is'nt changed yet...

@mybearworld
Copy link
Contributor

I might be wrong on this, but changing the logo would probably delay the process of getting this approved on the web stores further.

@Waakul
Copy link
Contributor

Waakul commented Mar 28, 2024

Frame (3)

I updated my haddocks logo a bit so the icon is visible
EDIT: updated again

@mybearworld
Copy link
Contributor

I might be wrong on this, but changing the logo would probably delay the process of getting this approved on the web stores further.

Also, changing the logo dynamically only on April Fools sounds like a headache...

@Waakul
Copy link
Contributor

Waakul commented Mar 28, 2024

I might be wrong on this, but changing the logo would probably delay the process of getting this approved on the web stores further.

Also, changing the logo dynamically only on April Fools sounds like a headache...

By logo i only meant on the popup. See WorldLanguages#5

@DNin01 DNin01 self-requested a review March 28, 2024 21:42
@WorldLanguages
Copy link
Member Author

Reviews within 1 hour please

Copy link
Member

@Samq64 Samq64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on Firefox

Copy link
Member

@DNin01 DNin01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@WorldLanguages WorldLanguages changed the title Scratch Haddocks April Fools 2024 easter egg: Scratch Haddocks Mar 28, 2024
@WorldLanguages WorldLanguages merged commit 643fca2 into ScratchAddons:master Mar 28, 2024
2 checks passed
@mybearworld
Copy link
Contributor

These haddocks can be kind of obtrusive when reading or writing comments, though.

I don't know, maybe we could hide them or make them transparent while you're writing a comment.

That probably should've been implemented - these haddocks are actually pretty annoying when trying to write a comment.

@DNin01
Copy link
Member

DNin01 commented Mar 31, 2024

These haddocks can be kind of obtrusive when reading or writing comments, though.
I don't know, maybe we could hide them or make them transparent while you're writing a comment.

That probably should've been implemented - these haddocks are actually pretty annoying when trying to write a comment.

Yup...

The good things are:

  1. You can always open the comment on Scratch.
  2. You can also click the small little icon on the Messaging tab to open the whole Messaging popup in a new tab, which doesn't have haddocks swimming around. Not sure how many people will realize that, though...
  3. You could also use a text editor to write your comment without distractions, then paste it in, I suppose.

WorldLanguages added a commit that referenced this pull request Apr 2, 2024
WorldLanguages added a commit that referenced this pull request Apr 2, 2024
Revert "April Fools 2024 easter egg: Scratch Haddocks (#7299)"

This reverts commit 643fca2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
scope: webpages Related to the web pages (settings page, pop-up, etc) type: enhancement New feature for the project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants