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): integrate MDN Curriculum #10433

Merged
merged 113 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
47c2363
wip
fiji-flo Jan 25, 2024
597ef29
wip
fiji-flo Jan 30, 2024
714682c
wip
fiji-flo Jan 31, 2024
8479d92
add colors
fiji-flo Jan 31, 2024
7b1b845
fix(curriculum): correct CURRICULUM_ROOT
caugner Jan 31, 2024
aa81f67
fix(curriculum): style lists like in content
caugner Jan 31, 2024
d89db88
fix(curriculum): align learning outcomes with list items
caugner Jan 31, 2024
6be7dbc
chore(observatory): add color to toc
caugner Jan 31, 2024
7948401
fix(curriculum): remove margin-bottom from last blockquote child
caugner Jan 31, 2024
ade8300
move colors
fiji-flo Jan 31, 2024
389caed
fix modules-list
fiji-flo Jan 31, 2024
1dd9d60
cleanup
fiji-flo Jan 31, 2024
1f937d2
chore(curriculum): style header
caugner Jan 31, 2024
6f92d66
fix(curriculum): align resources items with other items
caugner Jan 31, 2024
2fe9806
svg colors
fiji-flo Jan 31, 2024
44c1329
fixup! chore(curriculum): style header
caugner Jan 31, 2024
650baf3
move colors
fiji-flo Jan 31, 2024
aedf423
chore(curriculum): reduce margin-top of first h2
caugner Jan 31, 2024
ef0a71e
fix(curriculum): pull up vars to .curriculum
caugner Jan 31, 2024
8334589
chore(curriculum): style category
caugner Jan 31, 2024
a24a380
chore(curriculum): improve header layout
caugner Jan 31, 2024
3e46674
feat(curriculum): highlight current page in sidebar
caugner Jan 31, 2024
ef8a090
fix(curriculum): set document.title
caugner Jan 31, 2024
0faa82e
fix(curriculum): style header without .topic-icon
caugner Jan 31, 2024
025254b
fix(curriculum): center breadcrumbs vertically
caugner Jan 31, 2024
4afc72b
fix(curriculum): indent only nested sidebar items
caugner Jan 31, 2024
9495f5c
chore(curriculum): emphasize first sidebar item
caugner Jan 31, 2024
e8d7938
chore(curriculum): use vars for TOC colors
caugner Jan 31, 2024
699e8d6
fix(curriculum): ignore ssr/dist warning
caugner Jan 31, 2024
3147173
wip
fiji-flo Jan 31, 2024
2c37d9e
module grid
fiji-flo Jan 31, 2024
17746c0
lint
fiji-flo Feb 1, 2024
7f3ebdc
lists, next and fixes
fiji-flo Feb 1, 2024
1d7a45d
colors and shadow
fiji-flo Feb 1, 2024
3760e63
about
fiji-flo Feb 1, 2024
f9bb7be
overview prev next
fiji-flo Feb 1, 2024
fb48443
landing
fiji-flo Feb 1, 2024
707e3fe
lint
fiji-flo Feb 1, 2024
fada636
colors
fiji-flo Feb 2, 2024
1b2073f
center module copy
fiji-flo Feb 2, 2024
c1fb57f
landing about
fiji-flo Feb 2, 2024
6889033
fix landing about
fiji-flo Feb 2, 2024
bcb3274
wip(curriculum): rm colon from module contents
LeoMcA Feb 2, 2024
2ad0280
wip(curriculum): remove phantom empty item from TOC
LeoMcA Feb 2, 2024
d8388dd
wip(curriculum): fix weird spacing in nested lists
LeoMcA Feb 2, 2024
0afaab0
wip(curriculum): show 'in this module' above toc
LeoMcA Feb 2, 2024
7ea3eee
wip(curriculum): hacky fix to broken about and overview pages
LeoMcA Feb 2, 2024
55d4cf5
wip(curriculum): add toc to about and overview pages
LeoMcA Feb 2, 2024
1520403
getting started
fiji-flo Feb 2, 2024
846ae53
ladder
fiji-flo Feb 2, 2024
3821fe2
fix anchor links
fiji-flo Feb 2, 2024
75dbc5e
mobile fixes
fiji-flo Feb 3, 2024
5ceb14b
landing color and mobile
fiji-flo Feb 3, 2024
1fa74f5
rename modules title and landing
fiji-flo Feb 4, 2024
f3737f0
begin
fiji-flo Feb 4, 2024
7190d20
clean up react
fiji-flo Feb 5, 2024
3db37a1
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 5, 2024
6893100
more clean up
fiji-flo Feb 5, 2024
0def9e3
css clean up
fiji-flo Feb 5, 2024
45b7408
rm
fiji-flo Feb 5, 2024
4e5af47
more css
fiji-flo Feb 5, 2024
bdd2533
styles 1
fiji-flo Feb 6, 2024
14e942b
style fixes
fiji-flo Feb 7, 2024
8643231
more svg
fiji-flo Feb 7, 2024
3263119
minor
fiji-flo Feb 7, 2024
dc9dbc4
reuse layout
fiji-flo Feb 7, 2024
89c172e
styles
fiji-flo Feb 7, 2024
be339f5
mobile 1
fiji-flo Feb 7, 2024
f30e957
dark and mobile
fiji-flo Feb 9, 2024
f0e3d1c
landing grid
fiji-flo Feb 9, 2024
7c3dabb
svgo
fiji-flo Feb 9, 2024
fce8536
misc
fiji-flo Feb 9, 2024
426806d
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 9, 2024
f993351
lint
fiji-flo Feb 9, 2024
0b98b52
dark mode fixes
fiji-flo Feb 10, 2024
1de3c86
no sidebar on mobile landing
fiji-flo Feb 10, 2024
3b2f21d
sidebar details
fiji-flo Feb 10, 2024
70d2369
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 10, 2024
5901d08
content anchor
fiji-flo Feb 11, 2024
b23e0db
sidebar overview
fiji-flo Feb 12, 2024
e24a4ea
dark mode
fiji-flo Feb 12, 2024
2f7924d
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 13, 2024
226960c
fixes
fiji-flo Feb 13, 2024
363d35a
more fixes
fiji-flo Feb 14, 2024
c6b8d62
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 14, 2024
56fdf3c
align button
fiji-flo Feb 15, 2024
a9e0ad1
colors and svgs
fiji-flo Feb 15, 2024
5a31326
links, top padding
fiji-flo Feb 15, 2024
fda55b4
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 15, 2024
851071e
links
fiji-flo Feb 15, 2024
17a069e
responsive ladder
fiji-flo Feb 19, 2024
3baea2c
remove underline
fiji-flo Feb 19, 2024
740b4bd
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 19, 2024
33a9fd8
fix links and clean up
fiji-flo Feb 19, 2024
24ca190
responsive stairs
fiji-flo Feb 19, 2024
35c4ac6
stairway
fiji-flo Feb 19, 2024
cac277f
fixes
fiji-flo Feb 19, 2024
cce9db4
fix test
fiji-flo Feb 19, 2024
e098644
escape regexp
fiji-flo Feb 19, 2024
503c3b6
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 19, 2024
03a623c
colors wip
fiji-flo Feb 21, 2024
d7aef7e
dark mode colors
fiji-flo Feb 21, 2024
3d8dbb4
fix dark mode colors
fiji-flo Feb 22, 2024
aa44f4a
feedback 1
fiji-flo Feb 23, 2024
2336999
feedback 2
fiji-flo Feb 23, 2024
1d14fd9
feedback 3
fiji-flo Feb 23, 2024
e601474
more feedback
fiji-flo Feb 26, 2024
5a14544
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 26, 2024
d3c72a0
more feedback
fiji-flo Feb 26, 2024
827236d
Merge remote-tracking branch 'upstream/main' into MP-739-curriculum-b…
fiji-flo Feb 26, 2024
2c373d1
fix
fiji-flo Feb 26, 2024
d630f1b
Merge branch 'main' into MP-739-curriculum-builder
fiji-flo Feb 27, 2024
17ed7f7
feedback
fiji-flo Feb 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/prod-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ jobs:
lfs: true
token: ${{ secrets.MDN_STUDIO_PAT }}

- uses: actions/checkout@v4
if: ${{ ! vars.SKIP_BUILD }}
with:
repository: mdn/curriculum
path: mdn/curriculum

# Our usecase is a bit complicated. When the cron schedule runs this workflow,
# we rely on the env vars defined at the top of the file. But if it's a manual
# trigger we rely on the inputs and only the inputs. That way, the user can
Expand Down Expand Up @@ -278,6 +284,9 @@ jobs:
# Build the blog
yarn build:blog

# Build the curriculum
yarn build:curriculum

# Generate whatsdeployed files.
yarn tool whatsdeployed --output client/build/_whatsdeployed/code.json
yarn tool whatsdeployed $CONTENT_ROOT --output client/build/_whatsdeployed/content.json
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/stage-build.yml
caugner marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ jobs:
lfs: true
token: ${{ secrets.MDN_STUDIO_PAT }}

- uses: actions/checkout@v4
fiji-flo marked this conversation as resolved.
Show resolved Hide resolved
if: ${{ ! vars.SKIP_BUILD }}
with:
repository: mdn/curriculum
path: mdn/curriculum

# Our usecase is a bit complicated. When the cron schedule runs this workflow,
# we rely on the env vars defined at the top of the file. But if it's a manual
# trigger we rely on the inputs and only the inputs. That way, the user can
Expand Down Expand Up @@ -169,6 +175,7 @@ jobs:
CONTENT_TRANSLATED_ROOT: ${{ github.workspace }}/mdn/translated-content/files
CONTRIBUTOR_SPOTLIGHT_ROOT: ${{ github.workspace }}/mdn/mdn-contributor-spotlight/contributors
BLOG_ROOT: ${{ github.workspace }}/mdn/mdn-studio/content/posts
CURRICULUM_ROOT: ${{ github.workspace }}/mdn/curriculum
BASE_URL: "https://developer.allizom.org"

# The default for this environment variable is geared for writers
Expand Down Expand Up @@ -271,6 +278,9 @@ jobs:
# Build the blog
yarn build:blog

# Build the curriculum
yarn build:curriculum

# Generate whatsdeployed files.
yarn tool whatsdeployed --output client/build/_whatsdeployed/code.json
yarn tool whatsdeployed $CONTENT_ROOT --output client/build/_whatsdeployed/content.json
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/xyz-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ jobs:
lfs: true
token: ${{ secrets.MDN_STUDIO_PAT }}

- uses: actions/checkout@v4
if: ${{ ! vars.SKIP_BUILD }}
with:
repository: mdn/curriculum
path: mdn/curriculum

- uses: actions/checkout@v4
if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }}
with:
Expand Down Expand Up @@ -190,6 +196,9 @@ jobs:
# Build the blog
yarn build:blog

# Build the curriculum
yarn build:curriculum

# Generate whatsdeployed files.
yarn tool whatsdeployed --output client/build/_whatsdeployed/code.json
yarn tool whatsdeployed $CONTENT_ROOT --output client/build/_whatsdeployed/content.json
Expand Down
4 changes: 4 additions & 0 deletions build/build-curriculum.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env node
import { buildCurriculum } from "./curriculum.js";

buildCurriculum({ verbose: true });
caugner marked this conversation as resolved.
Show resolved Hide resolved
Loading
Loading