diff --git a/docs/courses/downloading-materials.md b/docs/courses/downloading-materials.md
new file mode 100644
index 00000000000..fd4d5507b28
--- /dev/null
+++ b/docs/courses/downloading-materials.md
@@ -0,0 +1,77 @@
+
+
+# Material Access Overview
+
+In an effort to keep educator materials, answer keys, and assessments safe from curious eyes, we do require teachers to be [GitHub Educator Verified](https://makecode.com/github-teacher-verification) before they can access the curriculum.
+
+https://youtu.be/RASnIIAXJaY
+
+
+The Introduction to Computer Science with MakeCode Arcade curriculum is a full academic year course designed to be taught for introductory programming classes in High School. The curriculum is free and uses web-based technology and tools that can be accessed across platforms and devices.
+
+
+# Downloading and Updating Curriculum
+
+Once you are verified, please follow the steps below to [download the course](https://youtu.be/RASnIIAXJaY).
+
+## 1. Find the Curriculum
+
+At the moment, the _Intro to Computer Science with MakeCode Arcade_ course utilizes a GitHub repo for its content. Once you are approved as a GitHub educator, you can join the repo by visiting https://aka.ms/TEALSintroCS. While it’s not possible to open many of these files directly from GitHub, it is fairly simple to either download a copy of the files to your own machine or create a “branch” of the repo that keeps you connected in the case of changes or updates.
+
+When using the Intro to CS with Arcade curriculum on GitHub, an entry-level user will most-likely want to download the entire course onto their own machine so that they can easily access it whenever they like without needing to be connected to the internet.
+
+## 2. Copy the Curriculum
+The simplest way to make that happen is to navigate to the repo and click the green “Code” button above the file navigation pane on the right side. This will open a dialog window that allows you to download the entire package as a ZIP folder. More advanced users can clone the repo using Git using the URL from the same dialog window.
+
+
+
+### Download
+Download the ZIP file to your computer. Once expanded, you will have the complete curriculum on your machine, ready to edit however you see fit!
+
+_Note: Make sure to re-download the zipped file from the repo from time to time (ideally around the end of August) to make sure you have the most up-to-date version of the curriculum._
+
+### Clone (Advanced)
+If you have more experience with GitHub (or you’re itching to learn) then it might benefit you to create your own branch of the curriculum. This will allow you to keep your curriculum up to date more easily, even if you’ve made changes on your side.
+
+#### Install GitHub on VSCode
+
+To do this, we recommend using Visual Studio Code, which is free and has a wealth of online resources for a beginner who might be looking for advice. Simply download the program at https://code.visualstudio.com/download and install these GitHub plug-ins:
+• GitHub Actions
+• GitHub Pull Requests
+• GitHub Codespaces (Optional)
+Now you’re ready to log-in to GitHub and create a branch.
+
+#### Log-in to GitHub on VSCode
+On the bottom right of the VSCode window, you should see a profile icon and a settings gear.
+
+
+Click the profile icon to open the menu that will allow you to sign in to GitHub with your educator account.
+
+
+#### Create a Branch from the Repo
+Pulling files from a branch is easy once you have VSCode set up. Just visit the curriculum repo and click the same green “Code” button mentioned above. This time, instead of downloading the zipped file, you’ll click the button next to the URL to copy the address of the repo you want to clone.
+
+
+There are multiple ways to initiate the branch from VSCode.
+
+
+1. Click “Clone Git Repository…” in the main window
+2. Click the “Clone Repository” button in the sidebar
+3. Open your Command Palette and type Git: Clone into the text box
+
+In all cases, you should then get a text box at the top of the window where you can paste the URL from the repository that you copied in an earlier step.
+
+
+
+VSCode will ask you where you want to copy your files. Choose a location on your computer (local drives work the best.) Remember the folder you chose, because that is where you’ll be accessing the curriculum from as you move forward.
+
+#### Access Your Cloned Files
+
+Your cloned files should now be in the folder you selected. You can use these files in the same way you would have if you had downloaded and unzipped them directly. The main difference with this method is that you are set up to “pull” from that repository again at any time to receive the latest updates.
+
+
+_Caution: Do not attempt to push or commit any changes. While your permissions likely won’t allow commits back into the master branch, there is a possibility that it will interfere with your ability to easily pull again in the future._
+
+## 3. Follow the Intro to CS thread on the Forum
+
+Our user forum contains the most up to date information on all of our activities and curriculum sets. For update notices, tips, tricks, or questions, please visit [https://forum.makecode.com/c/teals-intro-cs] (https://forum.makecode.com/c/teals-intro-cs) and click the bell for notifications.
\ No newline at end of file
diff --git a/docs/courses/educator-trainings.md b/docs/courses/educator-trainings.md
index 6d1c472a6f7..d21a2054293 100644
--- a/docs/courses/educator-trainings.md
+++ b/docs/courses/educator-trainings.md
@@ -11,9 +11,9 @@ _(Click tile to register for free)_
{
"name": "Intro to MakeCode for CSEd Week 2024",
"description": "Join us for an engaging 50-minute webinar where we'll explore the best MakeCode Hour of Code activities, perfect for Computer Science Education Week!",
- "label": "11/14/24 at 4pm PST",
+ "label": "View the Recording",
"labelClass": "purple ribbon large",
- "url":"https://msit.events.teams.microsoft.com/event/5c9177b9-52a5-4aa7-a6ba-a62213830c0e@72f988bf-86f1-41af-91ab-2d7cd011db47",
+ "url":"https://youtu.be/sT5o01rIQZw",
"imageUrl": "/static/tutorials/bubbles/card.jpg"
}, {
"name": "Instant CSEd Week Prep",
@@ -36,9 +36,9 @@ _(Click tile to register for free)_
{
"name": "Tips and Tricks for Intro to CS with Arcade",
"description": "Discover exciting tips, tricks, and features meant to make your classroom experience as smooth as possible",
- "label": "11/07/24 at 4pm PST",
+ "label": "View the Recording",
"labelClass": "purple ribbon large",
- "url":"https://msit.events.teams.microsoft.com/event/081611d2-a02f-4f0f-9d7f-c10b97020acb@72f988bf-86f1-41af-91ab-2d7cd011db47",
+ "url":"https://youtu.be/zFqY9P5KtcA",
"imageUrl": "https://img-prod-cms-rt-microsoft-com.akamaized.net/cms/api/am/imageFileData/RWOYCd?ver=bf04&q=90&m=6&h=291&w=517&b=%23FFFFFFFF&l=f&o=t"
}, {
"name": "Intro to CS - Ask Me Anything",
@@ -61,6 +61,8 @@ In addition to the trainings found here, Arcade and micro:bit occasionally provi
## See also
+[Previous Webinars](https://www.youtube.com/playlist?list=PLUgoavxKsVdWuplcbeKe69efv7EF1m0bO)
+[YouTube Educator Channel](https://www.youtube.com/@MSMakeCode)
[Arcade Courses Home Page](https://arcade.makecode.com/courses)
[micro:bit Courses Home Page](https://makecode.microbit.org/courses)
[Minecraft Lessons Home Page](https://education.minecraft.net/en-us/resources/explore-lessons)
\ No newline at end of file
diff --git a/docs/courses/introcs.md b/docs/courses/introcs.md
index d6f30428366..a4be4c638bd 100644
--- a/docs/courses/introcs.md
+++ b/docs/courses/introcs.md
@@ -12,6 +12,10 @@ The Introduction to Computer Science with MakeCode Arcade curriculum is designed
## Course Outline
+### New!
+Student facing skillmaps and tutorials for Units 0-3 available [here](https://arcade.makecode.com/courses/csintro).
+[https://arcade.makecode.com/courses/csintro](https://arcade.makecode.com/courses/csintro)
+
### Semester 1
* **Unit 0 Beginnings** – Students learn about the course, the classroom environment, algorithms, and the MakeCode Arcade environment.
@@ -46,6 +50,7 @@ The course materials include:
>* Student guide word document
* PowerPoint slide decks for classroom lectures with talking points in the Notes section
* Student projects, labs and activities include Bell Ringers (with solutions where appropriate)
+* NEW: [Student-facing tutorials for Units 0-3](https://arcade.makecode.com/courses/csintro)
### ~ reminder
@@ -56,3 +61,8 @@ You must be a verified educator to download the course materials. Please create
Download the course materials: https://aka.ms/TEALSintroCS
### ~
+
+## Getting Started
+
+For a simple, step-by-step guide to getting started, please visit the [Intro to CS channel on our forum](https://forum.makecode.com/t/getting-started-with-intro-to-cs-with-makecode-arcade/31835).
+
diff --git a/docs/diy-hardware.md b/docs/diy-hardware.md
index 21112e2b9f5..e73dc0589d3 100644
--- a/docs/diy-hardware.md
+++ b/docs/diy-hardware.md
@@ -10,8 +10,7 @@ Choose one of these projects to create your own Arcade game console, cabinet, or
"name": "Arcade cabinet",
"description": "Full size Arcade cabinet powered by a Raspberry Pi.",
"imageUrl": "/static/hardware/raspberry-pi/wooden-cabinet/gallery.jpg",
- "url": "/hardware/raspberry-pi/wooden-cabinet",
- "variant": "hw---rpi"
+ "url": "/hardware/cabinets"
},
{
"name": "Shoebox Controller",
diff --git a/docs/educators.md b/docs/educators.md
index b86d470245f..b708e27c9e8 100644
--- a/docs/educators.md
+++ b/docs/educators.md
@@ -36,8 +36,8 @@ We have gathered all of our best educator resources and collected them all right
"imageUrl": "/static/skillmap/story/story-comp.png"
},{
"name": "Educator Training",
- "description": "Summer trainings are now in session!",
- "url":"/courses/summer-training",
+ "description": "Learn more about MakeCode!",
+ "url":"/courses/educator-trainings",
"imageUrl": "/static/livestream-games/hamlet.png"
}
]
diff --git a/docs/hardware/arcade-cabinets/full-size-kiosk.md b/docs/hardware/arcade-cabinets/full-size-kiosk.md
index bcc6ba6f596..776bc2ce679 100644
--- a/docs/hardware/arcade-cabinets/full-size-kiosk.md
+++ b/docs/hardware/arcade-cabinets/full-size-kiosk.md
@@ -34,28 +34,28 @@ The cabinet is built out of 3 - 8' x 4' plywood sheets of 1/2" thickness.
## Template
-This [SVG template](/hardware/cabinet.svg) will serve as the outline for the top cabinet on your CNC, or you can print out the pieces at full-scale and follow along the outline with a jigsaw.
+This [SVG template](/hardware/arcade-cabinets/cabinet.svg) will serve as the outline for the top cabinet on your CNC, or you can print out the pieces at full-scale and follow along the outline with a jigsaw.
-[Download top of cabinet here...](/hardware/cabinet.svg)
+[Download top of cabinet here...](/hardware/arcade-cabinets/cabinet.svg)
-The following [SVG template](/hardware/control-panel.svg) provides the outline for the cuts in the control panel that allow you to add the two-player buttons and joysticks.
+The following [SVG template](/hardware/arcade-cabinets/control-panel.svg) provides the outline for the cuts in the control panel that allow you to add the two-player buttons and joysticks.
-[Download control panel cuts here...](/hardware/control-panel.svg)
+[Download control panel cuts here...](/hardware/arcade-cabinets/control-panel.svg)
## Kiosk Top Instructions
-* Cut your cabinet pieces from plywood as indicated in the [SVG file](/hardware/control-panel.svg).
+* Cut your cabinet pieces from plywood as indicated in the [SVG file](/hardware/arcade-cabinets/control-panel.svg).
-* Cut the control panel from the second [SVG file](/static/hardware/arcade-kiosks/control-panel-image.png).
+* Cut the control panel from the second [Control panel image](/static/hardware/arcade-kiosks/control-panel-image.png).
diff --git a/docs/hour-of-code/all.md b/docs/hour-of-code/all.md
index 8d52649b6b2..319b291d949 100644
--- a/docs/hour-of-code/all.md
+++ b/docs/hour-of-code/all.md
@@ -31,6 +31,9 @@ Join us in celebrating Computer Science Education Week by playing, designing, an
}
]
```
+
+[Click here to access educator resources for the above activities.](https://1drv.ms/f/s!AqsgsTyHBmRBpVuQI9q-h2yeQD5m?e=O88oeA)
+
## Previous Activities
@@ -70,8 +73,7 @@ Join us in celebrating Computer Science Education Week by playing, designing, an
## See also
-[Sparks Flying](aka.ms/prehistoric)
-[Sparks Flying JR](aka.ms/sparky)
+[Code a Carnival Curriculum](https://aka.ms/carnivalTeacher)
[2022 Hour of Code](/hour-of-code-2022)
[2021 Hour of Code](/hour-of-code-2021)
[2020 Hour of Code](/hour-of-code-2020)
diff --git a/docs/static/educator/create-branch.png b/docs/static/educator/create-branch.png
new file mode 100644
index 00000000000..78f1efa50ab
Binary files /dev/null and b/docs/static/educator/create-branch.png differ
diff --git a/docs/static/educator/download-zip.png b/docs/static/educator/download-zip.png
new file mode 100644
index 00000000000..babe4c32755
Binary files /dev/null and b/docs/static/educator/download-zip.png differ
diff --git a/docs/static/educator/github-login-1.png b/docs/static/educator/github-login-1.png
new file mode 100644
index 00000000000..7ba3f4676f0
Binary files /dev/null and b/docs/static/educator/github-login-1.png differ
diff --git a/docs/static/educator/github-login-2.png b/docs/static/educator/github-login-2.png
new file mode 100644
index 00000000000..217ad717fb7
Binary files /dev/null and b/docs/static/educator/github-login-2.png differ
diff --git a/docs/static/educator/initiate.png b/docs/static/educator/initiate.png
new file mode 100644
index 00000000000..146bfdf6351
Binary files /dev/null and b/docs/static/educator/initiate.png differ
diff --git a/docs/static/educator/paste-url.png b/docs/static/educator/paste-url.png
new file mode 100644
index 00000000000..a851d328f8e
Binary files /dev/null and b/docs/static/educator/paste-url.png differ
diff --git a/docs/static/educator/pull.png b/docs/static/educator/pull.png
new file mode 100644
index 00000000000..e80c4a12cb3
Binary files /dev/null and b/docs/static/educator/pull.png differ
diff --git a/docs/tutorials.md b/docs/tutorials.md
index 451029bec17..1449d9e395b 100644
--- a/docs/tutorials.md
+++ b/docs/tutorials.md
@@ -84,7 +84,7 @@
"imageUrl": "/static/skillmap/backgrounds/target-comp.gif",
"largeImageUrl": "/static/skillmap/backgrounds/target-comp.gif",
"label": "Video tutorial",
- "labelClass": "ribbon"
+ "labelClass": "teal ribbon large"
}, {
"name": "Time Flies",
"description": "Help a frog catch a fly before the timer runs out in this game jam themed tutorial!",
diff --git a/pxtarget.json b/pxtarget.json
index a6252ca1797..a62d7710b96 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -734,7 +734,7 @@
"lockedImage": "/static/badges/badge-jungle-locked.png",
"sourceURL": "https://www.makecode.com/api/md/arcade/skillmap/jungle",
"type": "skillmap-completion",
- "title": "Jungle Monkey"
+ "title": "Jungle Jump"
},
{
"id": "skillmap-completion-space",