diff --git a/docs/courses/summer-training.md b/docs/courses/summer-training.md
index 020bc17ac77..4b7d5817191 100644
--- a/docs/courses/summer-training.md
+++ b/docs/courses/summer-training.md
@@ -1,19 +1,42 @@
-
+
+
+
# MakeCode Summer Training Schedule
## MakeCode Trainings for micro:bit
-We will be hosting a special training in Las Vegas in the days leading up to CSTA. Please click the card below to register.
+We will be hosting three **free** online trainings, leading up to a special in-person training in Las Vegas in the days before CSTA. Please click the cards below to register.
```codecard
[
{
+ "name": "Getting Started",
+ "description": "Join 'Making and Coding with micro:bit - Get started with free curriculum' for a look at Microsoft’s free Introduction to Computer Science: Making with the micro:bit curriculum for middle school. ",
+ "url":"https://msit.events.teams.microsoft.com/event/40f9ed5f-8d72-4494-bbe2-42005441f4e6@72f988bf-86f1-41af-91ab-2d7cd011db47",
+ "imageUrl": "https://github.com/microsoft/pxt-microbit/blob/master/docs/static/mb/projects/clap-lights.png?raw=true",
+ "label": "Online 4/30 @ 3pm PDT",
+ "labelClass": "orange ribbon large"
+ },{
+ "name": "Making and Coding",
+ "description": "Join 'Making and Coding with micro:bit - Modeling, coaching and skill building' for a look at Microsoft’s free Introduction to Computer Science: making with the micro:bit curriculum for middle school. ",
+ "url":"https://msit.events.teams.microsoft.com/event/762cfe3c-ef1a-40ec-87fd-73eacc6f1a77@72f988bf-86f1-41af-91ab-2d7cd011db47",
+ "imageUrl": "https://github.com/microsoft/pxt-microbit/blob/master/docs/static/download/connect.png?raw=true",
+ "label": "Online 5/14 @ 3pm PDT",
+ "labelClass": "orange ribbon large"
+ },{
+ "name": "Supporting Projects",
+ "description": "Join 'Making and Coding with micro:bit - Supporting independent projects' for a look at Microsoft’s free Introduction to Computer Science: making with the micro:bit curriculum for middle school.",
+ "url":"https://msit.events.teams.microsoft.com/event/52ef14cd-07de-41be-83bc-c664d4a98aa5@72f988bf-86f1-41af-91ab-2d7cd011db47",
+ "imageUrl": "https://github.com/microsoft/pxt-microbit/blob/master/docs/static/download/firmware.png?raw=true",
+ "label": "Online 5/28 @ 3pm PDT",
+ "labelClass": "orange ribbon large"
+ },{
"name": "Micro:bit at CSTA",
"description": "Join us in Vegas on 6/16/24 for an introduction to using micro:bit in the classroom",
"url":"https://aka.ms/CSTA24reg",
- "imageUrl": "https://pxt.azureedge.net/blob/ce157b871e8d7330375d8dc8ade57d7426259ef4/static/courses/csintro.jpg",
+ "imageUrl": "https://pxt.azureedge.net/blob/ce157b871e8d7330375d8dc8ade57d7426259ef4/static/electron-icons.icns",
"label": "In Person on 6/16/24",
"labelClass": "black ribbon large"
}
@@ -45,15 +68,15 @@ This year, we will be hosting two separate cohorts of each session for both the
```codecard
[
{
- "name": "AP CS Prinicpals #1",
- "description": "Click here to register through the College Board to experience this online professional learning opportunity for the MakeCode Arcade AP CS Principals course",
+ "name": "AP CS Prinicples #1",
+ "description": "Click here to register for this online professional learning opportunity for the MakeCode AP CS Principles course. (Session #1)",
"url": "https://events.teams.microsoft.com/event/068ed173-0075-493a-be29-8d9784b2717f@38dd6634-1031-4c50-a9b4-d16cd9d97d57",
"imageUrl": "https://pxt.azureedge.net/blob/2f29e06f0ce78fc647a0f19ea4acadd0ea29563c/static/courses/csp.png",
"label": "Online 6/17/24 - 6/22/24",
"labelClass": "orange ribbon large"
},{
- "name": "AP CS Prinicpals #2",
- "description": "Click here to register through the College Board to experience this online professional learning opportunity for the MakeCode Arcade AP CS Principals course",
+ "name": "AP CS Prinicples #2",
+ "description": "Click here to register for this online professional learning opportunity for the MakeCode AP CS Principles course. (Session #2)",
"url": "https://events.teams.microsoft.com/event/ee217aa0-7581-432b-b828-b0972328b25d@38dd6634-1031-4c50-a9b4-d16cd9d97d57",
"imageUrl": "https://pxt.azureedge.net/blob/2f29e06f0ce78fc647a0f19ea4acadd0ea29563c/static/courses/csp.png",
"label": "Online 7/22/24 - 7/26/24",
diff --git a/docs/educators/skillmaps.md b/docs/educators/skillmaps.md
index 0bd47a654ea..92538c63b3d 100644
--- a/docs/educators/skillmaps.md
+++ b/docs/educators/skillmaps.md
@@ -1,3 +1,63 @@
-#Skillmap Classroom Resources
-Looking to run a skillmap in your classroom? These resources will help get you prepared to lead the activities.
\ No newline at end of file
+# Skillmap Classroom Resources
+
+Looking to run a skillmap in your classroom? These resources will help you get prepared to lead the activities.
+
+
+## Full of Stories
+Full of Stories is a fantastic beginner skillmap that is easy to blend into nearly any lesson in any classroom.
+
+| **Full of Stories Skillmap** | **Full of Stories Teacher Guide** | **Full of Stories Help Video** |
+| ----------- | ----------- | ----------- |
+|  |  |  |
+| **URL:** https://aka.ms/new-story
**Level:** Beginner | The learning outcomes page for the skillmap, complete with pacing and answer keys. | A YouTube video meant to introduce educators to the skillmap, which can also be used to provide deeper understanding to students. |
+
+
+
+
+```codecard
+[
+ {
+ "name": "Full of Stories Skillmap",
+ "url":"/skillmap/story",
+ "imageUrl": "",
+ "description": ""
+ },{
+ "name": "",
+ "description": "",
+ "url":"https://arcade.makecode.com/skillmap/educator-info/story-map-info",
+ "imageUrl": ""
+ },{
+ "name": "",
+ "description": "",
+ "url":"https://youtu.be/DE_-0flM324",
+ "imageUrl": ""
+ }
+]
+```
+
+
+## Whack-the-Mole
+Whack-the-Mole is a fantastic beginner
+
+
+```codecard
+[
+ {
+ "name": "Whack-the-Mole Skillmap",
+ "description": "Level: Beginner, URL: https://aka.ms/whack-the-mole",
+ "url":"/skillmap/mole",
+ "imageUrl": "/static/skillmap/backgrounds/mole.gif"
+ },{
+ "name": "Whack-the-Mole Teacher Guide",
+ "description": "The learning outcomes page for the skillmap, complete with pacing and answer keys.",
+ "url":"/educators#skillmaps",
+ "imageUrl": "/static/educator/lessonplan.png"
+ },{
+ "name": "Whack-the-Mole Help Video",
+ "description": "A YouTube video meant to introduce educators to the skillmap, which can also be used to provide deeper understanding to students.",
+ "url":"https://youtu.be/DE_-0flM324",
+ "imageUrl": "http://img.youtube.com/vi/DE_-0flM324/2.jpg"
+ }
+]
+```
diff --git a/docs/skillmap/educator-info/story-map-info.md b/docs/skillmap/educator-info/story-map-info.md
index 749b84d1fda..afb511d0dd3 100644
--- a/docs/skillmap/educator-info/story-map-info.md
+++ b/docs/skillmap/educator-info/story-map-info.md
@@ -50,7 +50,7 @@ In this learning path, students will learn how to use background images, music,
| Activity | Greeting Card (15 min) |
|---|---|
|  | Design a simple greeting card to send to friends and family. |
-| Blocks used | **[On Start](/blocks/on-start)**
``[scene.setBackgroundImage(img`.`)]``
``[effects.confetti.startScreenEffect()]``|
+| Blocks used | ``[scene.setBackgroundImage(img`.`)]``
``[effects.confetti.startScreenEffect()]``|
| Solution option | [Greeting Card Project](https://arcade.makecode.com/S21073-89960-25393-61916) |
#### 2. Bigger Greeting
@@ -58,7 +58,7 @@ In this learning path, students will learn how to use background images, music,
| Activity | Bigger Greeting (15 min) |
|---|---|
|  | This activity builds off the previous Greeting Card activity.
Students will add text that is revealed with the press of a
button. |
-| Blocks used | ``[carnival.addLabelTo("", carnival.Areas.Top, 2)]``
``[music.play(music.createSong()music.PlaybackMode.LoopingInBackground)]``
``[music.setVolume(20)]``
``[controller.A.onEvent(ControllerButtonEvent.Pressed, function () {})]``
``[game.setDialogFrame(img`.`)]``
``[game.setDialogTextColor(0)]``
``[game.showLongText("", DialogLayout.Bottom)]`` |
+| Blocks used | ``[carnival.addLabelTo("", carnival.Areas.Top, 2)]``
``[music.play(music.createSong()music.PlaybackMode.LoopingInBackground)]``
``[music.setVolume(20)]``
``[controller.A.onEvent(ControllerButtonEvent.Pressed, function () {})]``
``[game.setDialogFrame(img`.`)]``
``[game.setDialogTextColor(0)]``
``[game.showLongText("", DialogLayout.Bottom)]`` |
| Solution option | [Bigger Greeting Project](https://arcade.makecode.com/S38456-47249-27054-15853) |
#### 3. Joking Around
@@ -66,7 +66,7 @@ In this learning path, students will learn how to use background images, music,
| Activity | Joking Around (45 min) |
|---|---|
|  | This activity introduces students to characters and dialog,
as they bring thier favorite jokes to life. |
-| Blocks used | ``[game.showLongText("", DialogLayout.Top)]``
``[game.splash("")]``
``[sprites.create(img`.`).setPosition(0, 0)]``
``[effects.bubbles.startScreenEffect()]``
``[sprites.create(img`.`).setImage(img`.`)]``
``[scene.cameraShake(4, 500)]``
``[animation.runImageAnimation()]``|
+| Blocks used | ``[game.showLongText("", DialogLayout.Top)]``
``[game.splash("")]``
``[sprites.create(img`.`).setPosition(0, 0)]``
``[effects.bubbles.startScreenEffect()]``
``[sprites.create(img`.`).setImage(img`.`)]``
``[scene.cameraShake(4, 500)]``
``[animation.runImageAnimation()]``|
| Solution option | [Joking Around Project](https://arcade.makecode.com/S05893-52939-88219-32873) |
@@ -74,8 +74,8 @@ In this learning path, students will learn how to use background images, music,
| Activity | The Shortest Story (45 min) |
|---|---|
-|  | This activity allows students to follow their own creativity,
as they develop short stories that they can share with friends. |
-| Blocks used | ``[music.play(music.createSong()music.PlaybackMode.LoopingInBackground)]``
``[music.setVolume(20)]``
``[scene.setBackgroundImage()]``
``[effects.bubbles.startScreenEffect()]`` |
+|  | This activity allows students to follow their own creativity,
as they develop short stories that they can share with friends. |
+| Blocks used | ``[music.play(music.createSong()music.PlaybackMode.LoopingInBackground)]``
``[music.setVolume(20)]``
``[scene.setBackgroundImage()]``
``[effects.bubbles.startScreenEffect()]`` |
| Solution option | [The Shortest Story Project](https://arcade.makecode.com/S33219-62880-94664-42434) |
@@ -98,5 +98,5 @@ After completing the **Full of Stories** skillmap, students can move on to the f
```package
-carnival=github:microsoft/arcade-tutorial-extensions/carnival/
+carnival=github:microsoft/arcade-carnival#v0.0.7
```
\ No newline at end of file
diff --git a/docs/static/educator/lessonplan.png b/docs/static/educator/lessonplan.png
new file mode 100644
index 00000000000..a1ebca0a577
Binary files /dev/null and b/docs/static/educator/lessonplan.png differ