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

feat(curriculum): update curriculum #11426

Merged
merged 29 commits into from
Jul 9, 2024
Merged

Conversation

fiji-flo
Copy link
Contributor

@fiji-flo fiji-flo commented Jul 8, 2024

Summary

Some updates to the curriculum.

@fiji-flo fiji-flo requested a review from a team as a code owner July 8, 2024 10:04
Copy link
Contributor

@caugner caugner left a comment

Choose a reason for hiding this comment

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

Initial pass. Overall the changes look okay to me, but I have some comments:

client/src/curriculum/landing.tsx Outdated Show resolved Hide resolved
client/src/curriculum/landing.tsx Outdated Show resolved Hide resolved
client/src/curriculum/partner-banner.scss Outdated Show resolved Hide resolved
client/src/curriculum/partner-banner.tsx Outdated Show resolved Hide resolved
client/src/curriculum/scrim.tsx Outdated Show resolved Hide resolved
libs/constants/index.js Outdated Show resolved Hide resolved
client/src/curriculum/utils.ts Show resolved Hide resolved
client/src/curriculum/scrim.tsx Outdated Show resolved Hide resolved
client/src/curriculum/scrim.tsx Outdated Show resolved Hide resolved
client/src/ui/base/_themes.scss Outdated Show resolved Hide resolved
@caugner caugner changed the title feat(curriclum): update curriculum feat(curriculum): update curriculum Jul 8, 2024
@fiji-flo fiji-flo requested a review from caugner July 9, 2024 10:23
Copy link
Contributor

@caugner caugner left a comment

Choose a reason for hiding this comment

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

LGTM, just some nits.

Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: It would be better to name these fullscreen-{enter,exit}.svg so they're next to each other.

.curriculum-partner-banner-container {
.partner-banner {
background-color: var(--curriculum-bg-color-partner);
background-image: var(--curriculum-partner-bg);
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: --curriculum-bg-image-partner would be a better name, to be consistent with --curriculum-bg-color-partner, and to avoid confusion with other -bg- variables omitting -color- that refer to a color.

Suggested change
background-image: var(--curriculum-partner-bg);
background-image: var(--curriculum-bg-image-partner);

align-items: center;
display: flex;
flex-direction: column;
grid-area: scrim;
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: The assignment to the grid-area would make more sense to do in the parent component's CSS.

dialog.current?.close();
setShowDialog(false);
gleanClick(
`${CURRICULUM_PARTNER}: landing_page_scrim_exit_fullscreen`
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: landing_page can be derived from the current page url.

Suggested change
`${CURRICULUM_PARTNER}: landing_page_scrim_exit_fullscreen`
`${CURRICULUM}: scrim fullscreen -> 0`

import { ReactComponent as EnterFullscreen } from "../../public/assets/curriculum/enter-fullscreen.svg";

import "./scrim.scss";
import { CURRICULUM_PARTNER } from "../telemetry/constants";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
import { CURRICULUM_PARTNER } from "../telemetry/constants";
import { CURRICULUM } from "../telemetry/constants";

dialog.current?.showModal();
setShowDialog(true);
gleanClick(
`${CURRICULUM_PARTNER}: landing_page_scrim_enter_fullscreen`
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
`${CURRICULUM_PARTNER}: landing_page_scrim_enter_fullscreen`
`${CURRICULUM}: scrim fullscreen -> 1`

dialog.current?.showModal();
setShowDialog(true);
gleanClick(
`${CURRICULUM_PARTNER}: landing_page_scrim_loaded`
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
`${CURRICULUM_PARTNER}: landing_page_scrim_loaded`
`${CURRICULUM}: scrim engage`

@@ -25,6 +25,7 @@ export const PLAYGROUND = "play_action";
export const AI_EXPLAIN = "ai_explain";
export const SETTINGS = "settings";
export const OBSERVATORY = "observatory";
export const CURRICULUM_PARTNER = "curriculum_partner";
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's keep it simple:

Suggested change
export const CURRICULUM_PARTNER = "curriculum_partner";
export const CURRICULUM = "curriculum";

Comment on lines 11 to 16
max-width: 24rem;
width: 100%;

@media (min-width: $screen-lg) {
justify-self: end;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I would recommend adding margin-top: 1rem to .scrim on mobile:

Before After
image image

/cc @AnujaRajput727

@fiji-flo fiji-flo merged commit 4cb0e63 into main Jul 9, 2024
15 checks passed
@fiji-flo fiji-flo deleted the MP-970-curriculum-partner-2 branch July 9, 2024 12:37
ferdnyc pushed a commit to ferdnyc/yari that referenced this pull request Jul 13, 2024
* feat(curriculum): update curriculum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants