Merge branch 'main' into add-timeout-section

.github/workflows/check-consistency.yml

@@ -14,9 +14,11 @@ jobs:
         with:
           go-version: 1.21
       - name: Build tooling
-        run: (cd tooling/go && go build ./cmd/local-overrides-enforcer && go build ./cmd/sprint-consistency)
+        run: (cd tooling/go && go build ./cmd/local-overrides-enforcer && go build ./cmd/sprint-consistency && go build ./cmd/site-consistency)
       - name: Check override consistency
         run: ./tooling/go/local-overrides-enforcer
       - name: Check sprint consistency
         # TODO: The Launch should probably have themes, but for now we'll ignore it so we can be checking the rest of the repo without having to fix this.
         run: ./tooling/go/sprint-consistency --exclude-roots org-cyf-launch
+      - name: Check site consistency
+        run: ./tooling/go/site-consistency

README.md

@@ -14,7 +14,7 @@ Code Your Future is a volunteer-led community of tech professionals, and we teac
 
 Our curriculum content is all open source, and our teaching style is [flipped classroom](https://teachingcommons.stanford.edu/teaching-guides/blended-and-hybrid-teaching-guide/frameworks-blended-and-hybrid-teaching/flipped). This means that anyone should be able to follow the curriculum content independently. We offer mentoring and support to help people work through it, but the content does not assume a teacher/mentor will be present for programme delivery.
 
-Our Global Syllabus Team is responsible for the overall direction of the main curriculum. They decide the strategy and accept new tested content into the core. Find out more by learning [how to contribute](/contributing.md). 
+Our Global Syllabus Team is responsible for the overall direction of the main curriculum. They decide the strategy and accept new tested content into the core. Find out more by learning [how to contribute](/CONTRIBUTING.md). 
 
 Our curriculum and our curriculum platform are tightly integrated with GitHub. We want our learners to know how to use Git and GitHub and how modern development practices work, so we do almost everything right on GitHub. Learners submit their work by creating a pull request to the project repo. They plan their work using GitHub Projects, and they track their progress on the issues. We code review via the GitHub PR interface, and we have some automation and unit testing on quizzes and exercises/problems. 
 

common-content/config

@@ -0,0 +1 @@
+../tooling/common-config/config

common-content/deploy-netlify.sh

@@ -1 +1 @@
-../deploy-netlify.sh
+../tooling/common-config/deploy-netlify.sh

common-content/en/blocks/backlog/index.md

@@ -4,7 +4,7 @@ title="Backlog"
 time= 30
 vocabulary="Backlog"
 hide_from_overview=true
-[objectives]
+[tasks]
     1="Find the backlog"
     2="Copy your tickets to your own backlog"
     3="Manage your tickets on your board"
@@ -20,7 +20,7 @@ In software development, we break down complex projects into smaller, manageable
 
 A sprint backlog is like a to-do list. It lists what the team has decided to work on this sprint. It's chosen from a larger list, usually called the "product backlog," which holds the entire project to-do list.
 
-The backlog is a set of work designed to build understanding beyond the concepts introduced in the course prep. For your course, we have prepared a backlog of mandatory work for each sprint. You will copy these tasks into your own backlog. You can also add any other tickets you want to work on to your backlog, and schedule all of the tasks according to your own goals and capacity. Use your planning board to do this.
+In this course, the backlog is a set of work designed to build understanding beyond the concepts introduced in the course prep. For your course, we have prepared a backlog of mandatory work for each sprint. You will copy these tasks into your own backlog. You can also add any other tickets you want to work on to your backlog, and schedule all of the tasks according to your own goals and capacity. Use your planning board to do this.
 
 You will find the backlog in the **Backlog** view on every sprint.
 

common-content/en/blocks/coming-soon/index.md

@@ -4,7 +4,7 @@ description = 'This content is coming soon'
 time = 20
 facilitation = false
 emoji= '🌫️'
-[objectives]
+[tasks]
     1='Find the plan in Slack instead'
 [build]
   list = 'never'

common-content/en/blocks/evaluate/index.md

@@ -2,7 +2,7 @@
 title="Evaluate ✏️"
 
 time= 60
-[objectives]
+[tasks]
     1="Evaluate your current progress against previous modules"
 [build]
   render = 'never'

common-content/en/blocks/get-how-computers-really-work/index.md

@@ -0,0 +1,15 @@
++++
+title = "Get a copy of How Computers Really Work"
+time = 5
+hide_from_overview = true
+[build]
+  render = "never"
+  list = "local"
+  publishResources = false
++++
+
+Throughout this course, we will reference the book [How Computers Really Work](https://www.howcomputersreallywork.com/) by Matthew Justice.
+
+You will need a copy. {{<our-name>}} is working out how to get you a copy if you can't afford one.
+
+If you buy your own copy [from e.g. Amazon](https://www.amazon.co.uk/How-Computers-Work-Hands-Workings/dp/1718500661), {{<our-name>}} cannot pay for this. 

common-content/en/blocks/house-rules/index.md

@@ -28,7 +28,7 @@ We teach you how to look things up. Try to use Google to answer your own questio
 
 #### Use the computer yourself
 
-Don't let volunteers or peers type for you. Ask for help, but do the work on your own.
+Don't let volunteers or peers type for you. Ask for help, but do the work yourself.
 
 #### Help each other out
 

common-content/en/blocks/mentored-code-review/index.md

@@ -0,0 +1,40 @@
++++
+title="Mentored code review"
+
+time = 20
+[objectives]
+    1="Explain what a code reviewer is looking for in a PR."
+    2="Describe elements of the GitHub code review interface."
+    3="List ways someone writing code can make it easier to review."
+[build]
+  render = "never"
+  list = "local"
+  publishResources = false
+
++++
+
+Our learners get feedback on their work through code review.
+At work, colleagues review each others code to understand code, look for problems, and both share and learn better ways of doing things.
+
+At {{<our-name>}} every learner should get code review on their work every week.
+
+{{<note type="activity" title="Live Code Review">}}
+
+Pair up a volunteer with one or more learners. 
+
+- The volunteer will review a pull request, and talk out loud about what they're looking for and doing.
+- The learner(s) will ask questions as they do.
+
+{{</note>}}
+
+<details>
+
+<summary>Hints and tips</summary>
+
+1. How did you understand what the goal of the PR is? Reading the title and description, looking at the coursework exercises, etc.
+2. The uses of the different tabs in a PR: Conversation, Commits, Files changed.
+3. What made a PR easy or hard to review:
+   1. Where unrelated files/lines changed?
+   2. Was code consistently formatted? Did indentation help or hurt understanding?
+4. How did you review the code? Did you read top-to-bottom? Did you jump around into and out-of functions? Did you look at tests? Did you clone the code locally and try running it?
+</details>

common-content/en/blocks/morning-orientation/index.md

@@ -2,7 +2,7 @@
 title="🎡 Morning orientation"
 
 time=15
-[objectives]
+[tasks]
     1="Introduce and welcome new volunteers"
     2="Nominate a timekeeper"
     3="Check the morning day plan and group structures"

common-content/en/blocks/standup/index.md

@@ -0,0 +1,19 @@
++++
+title="Standup"
+time=15
+[build]
+  render = 'never'
+  list = 'local'
+  publishResources = false
++++
+
+It's time to [stand up](https://www.atlassian.com/agile/scrum/standups). Split into groups of no more than 6 people.
+
+Stand in a circle and share for no more than 60 seconds each:
+
+- 📛 your name
+- 💪🏽 What you worked on yesterday
+- 🛟 What issues are blocking you / What problems you encountered
+- 👷🏾 What you will work on today
+
+After everyone has given an update, reflect on next steps together. Can you team up on shared blockers? Is someone working on something interesting that you want to know more about?

common-content/en/blocks/study-group/index.md

@@ -1,6 +1,6 @@
 +++
 title="Study Group"
-objectives=["Resolve blockers in your coursework", "Express and resolve problems effectively by writing tickets and asking questions", "Give and receive code review", "Develop your personal portfolio", "Pair programme", "Evaluate your progress with peers and mentors"]
+tasks=["Resolve blockers in your coursework", "Express and resolve problems effectively by writing tickets and asking questions", "Give and receive code review", "Develop your personal portfolio", "Pair programme", "Evaluate your progress with peers and mentors"]
 time=60
 [build]
   render = 'never'

common-content/en/blocks/workshop/index.md

@@ -3,7 +3,7 @@ title = '🧰 Workshop Activity'
 
 time = 120
 emoji= '🧰'
-[objectives]
+[tasks]
     1='Apply concepts from study to a practical example'
     2='Work together on exercises and activities to find gaps in understanding'
     3='Describe and resolve mental model errors'

common-content/en/blocks/wrap-party/index.md

@@ -0,0 +1,18 @@
++++
+title="Wrap Party"
+time=180
+[build]
+  render = 'never'
+  list = 'local'
+  publishResources = false
++++
+
+You made it! 🎉
+
+Thank you so much for your hard work. You've learned a lot and built some amazing things.
+
+Whether you're continuing with another course at {{<our-name>}} or moving on to employment, we're proud of you. 🌟
+
+Now, join the wrap party and celebrate your achievements with your community. 🎈
+
+Can you bring a snack or drink to share? 🍪🥤 Or a board game? We love Dixit, Codenames, and Rush Hour in particular.

common-content/en/blocks/wrap/index.md

@@ -0,0 +1,19 @@
++++
+title="Wrap"
+time=20
+[build]
+  render = 'never'
+  list = 'local'
+  publishResources = false
++++
+
+You are done for the day. Take a moment to reflect on what you have learned and achieved.
+
+Stand in a circle and share:
+
+- 📛 your name
+- 💪🏽 one thing you achieved today
+- 👷🏾 the task you are going to work on next
+- 🛟 one thing you need help with
+
+Give yourselves a round of applause. Now you have earned your rest. Usually people go for a cup of tea or a pint after class. You are welcome to join and wind down together.

common-content/en/energisers/18-and-unders/index.md

@@ -2,7 +2,7 @@
 title="18 and under" 
 emoji="🧒"
 time=10 
-[objectives] 
+[tasks] 
 1="Share any interesting fact about you when you were young" 
 2="Discover hidden skills of your peers"
 [build] 

common-content/en/energisers/bad-interview-answers/index.md

@@ -3,7 +3,7 @@ title="Bad Interview Answers"
 emoji="🤦‍♂️"
 hide_from_overview=true
 time=15
-[objectives]
+[tasks]
 1="Wake up"
 3="Have a laugh"
 [build]

common-content/en/energisers/blockers/index.md

@@ -2,7 +2,7 @@
 title="Blockers!"
 emoji="🚗"
 time=25
-[objectives]
+[tasks]
     1="Use the driver and navigator pattern"
     2="Break down a problem into steps"
     3="Negotiate a strategy with your team"

common-content/en/energisers/confident-presenting/index.md

@@ -1,7 +1,7 @@
 +++
 title="Confident Presenting!"
 time=15
-[objectives]
+[tasks]
     1="Trainee can strike a power pose"
     2="Trainee has experience with confidently introducing themselves"
 [build]
@@ -15,15 +15,18 @@ time=15
 Get everyone standing for this exercise!
 
 1. Start by everyone demonstrating unconfident poses
-2. Get everyone moving with a quick stretch or power pose to break the ice and release tension. 
- - Superman pose – feet shoulder-width apart, hands on hips, chest out.
- - The victor - hands up in the air in a V and feet apart
- - Any others?
-3. In a power pose of your choosing go around the room and ask everyone to say their name in the most exaggerated, enthusiastic way possible, like they’re introducing themselves to a stadium of people. 
+2. Get everyone moving with a quick stretch or power pose to break the ice and release tension.
+
+- Superman pose – feet shoulder-width apart, hands on hips, chest out.
+- The victor - hands up in the air in a V and feet apart
+- Any others?
+
+3. In a power pose of your choosing go around the room and ask everyone to say their name in the most exaggerated, enthusiastic way possible, like they’re introducing themselves to a stadium of people.
 
 > [!WARNING]  
 > This is not proven science. This is just a fun game to get everyone up and moving around!
 
 # Resources on Confident Presenting
+
 - [Make Body Language Your Superpower](https://www.youtube.com/watch?v=cFLjudWTuGQ&ab_channel=StanfordGraduateSchoolofBusiness)
 - [Alter Ego: How having an alter ego empowers you](https://www.bbc.com/worklife/article/20200817-the-batman-effect-how-having-an-alter-ego-empowers-you)

common-content/en/energisers/fizz-buzz/index.md

@@ -3,7 +3,7 @@ title="Fizz Buzz"
 emoji="🔢"
 hide_from_overview=true
 time=20
-[objectives]
+[tasks]
 1="Execute mental arithmetic and divisibility rules"
 3="Listen actively and coordinate with others"
 [build]

common-content/en/energisers/in-person-and-online/index.md

@@ -0,0 +1,16 @@
++++
+title="Energiser!"
+emoji="🔋"
+time=25
+[tasks]
+    1="Energise the group with a fun game"
+    2="Get everyone to participate"
+[build]
+  render = 'never'
+  list = 'local'
+  publishResources = false
++++
+
+Energisers are a big part of {{<our-name>}}'s culture! Even as adults, we all feel a bit shy and uncertain when we join a new group. But when we let ourselves be silly together, we start to feel more at home.
+
+Here follows one energiser for in-person and one for online.

common-content/en/energisers/introduce-yourself/index.md

@@ -2,7 +2,7 @@
 title=" Introduce Yourself!" 
 emoji="🎙️"
 time=20 
-objectives=["Introduce yourself in 30 seconds", "Learn two key facts about each other"]
+tasks=["Introduce yourself in 30 seconds", "Learn two key facts about each other"]
 [build] 
     render = 'never' 
     list = 'local' 
@@ -13,22 +13,33 @@ objectives=["Introduce yourself in 30 seconds", "Learn two key facts about each
 
 In your professional life, you will often be asked to introduce yourself. It is a good idea to have an [elevator pitch](https://careerdevelopment.princeton.edu/sites/g/files/toruqf1041/files/media/elevator_pitch.pdf) ready, a brief (30 seconds) way of introducing yourself, getting across a key point or two, and making a connection with someone.
 
-Today we will be going around the room and introducing ourselves!     `
+Today we will be going around the room and introducing ourselves! `
 
 Facilitator(s) start by sharing your elevator pitch and then popcorn around the room.
 
-Some tips:
-- Your response should be around 30 seconds.
-- Have a list of items ready but tailor what you say to your audience. For example, at a technical conference focus on your technical interests rather than your love of making cupcakes, but on the first day of a new job introducing yourself to your new team feel free to add 1-2 personal details.
-- Try to structure your response, 
-    - Who are you? Where are you from? Where have you worked? Have you studied somewhere and what subjects?
-    - What do you do? What are your skills, passions, or hobbies? What motivates you?
+<details>
+<summary>
+
+#### Some tips:
+
+</summary>
+
+- Your response should be around 30 seconds. Think: What do you do? What are your skills, passions, or hobbies? What motivates you?
+- Have a list of items ready but tailor what you say to your audience. For example, at a technical conference focus on your technical interests rather than your love of making cupcakes, but on the first day of a new job introducing yourself to your new team, add 1-2 personal details.
+- Structure your response: Who are you? Where are you from? Where have you worked? Have you studied somewhere and what subjects?
 - Try to be enthusiastic, let your personality and confidence shine
 - Allow space for follow-up questions
 - It will feel awkward and nerve-wracking the first couple of times, practice-practice-practice to feel confident
+</details>
+<details>
+<summary>
 
 #### Facilitator Check-in questions
 
+</summary>
+
 - How did you feel about public speaking?
 - What are some strategies to feel more confident when public speaking?
 - What activities could you share to create a connection? Ex. Sports, Hobbies
+
+</details>

common-content/en/energisers/popcorn-screen-share/index.md

@@ -0,0 +1,36 @@
++++
+title="Screen Safari"
+emoji="🖥️"
+time=15
+[tasks]
+1="Practice screen sharing functionality"
+2="Build comfort with sharing digital workspace"
+[build]
+render = 'never'
+list = 'local'
+publishResources = false
++++
+
+A playful way to practice screen sharing while sharing something personal.
+
+Facilitator, please begin by sharing your screen. Talk through what you are doing and show your favorite website, digital photo, or bookmark. Explain why it's meaningful to you. On gallery view, choose the person "next" to you to share next.
+
+Each participant will have {{<timer>}}1{{</timer>}} minute to:
+
+1. Share their screen
+1. Show their favorite website, digital photo, or bookmark
+1. Explain why it's meaningful to them
+
+Practice stopping screen share before the next person begins!
+
+Go around the group until everyone has shared.
+
+#### Facilitator Check in questions
+
+<details><summary>Guide participants on technical comfort</summary>
+
+- What was challenging about the screen sharing process?
+- What would make you feel more confident sharing your screen?
+- What did you learn about your colleagues through their shares?
+
+</details>