From ee7e30b39102c71903eb34491bf92af70e9453e4 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Fri, 19 Jan 2024 12:45:58 +0000 Subject: [PATCH 01/32] add new blocks for js3 sprint 3 with wm5 --- .../en/blocks/check-in-coordinate/index.md | 14 +++++++ content/en/blocks/diagnose/index.md | 33 +++++++++++++++++ .../en/blocks/morning-orientation/index.md | 37 +++++++++++++++++++ content/en/js3/sprints/3/day-plan/index.md | 13 +++++-- 4 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 content/en/blocks/check-in-coordinate/index.md create mode 100644 content/en/blocks/diagnose/index.md create mode 100644 content/en/blocks/morning-orientation/index.md diff --git a/content/en/blocks/check-in-coordinate/index.md b/content/en/blocks/check-in-coordinate/index.md new file mode 100644 index 000000000..5b841674b --- /dev/null +++ b/content/en/blocks/check-in-coordinate/index.md @@ -0,0 +1,14 @@ ++++ +title = '📝 Check-in ➡️ Coordinate' +headless = true +facilitation = false +time=10 +emoji= '🧩' +[objectives] +1="Perform quick temperature check on the current concepts" +2="Devise strategies for dealing with misconceptions during the week" ++++ + +1. Assemble as group +2. Briefly discuss any particular areas of concern following the diagnose block +3. Devise strategies for addressing misconceptions diff --git a/content/en/blocks/diagnose/index.md b/content/en/blocks/diagnose/index.md new file mode 100644 index 000000000..c87654ed4 --- /dev/null +++ b/content/en/blocks/diagnose/index.md @@ -0,0 +1,33 @@ ++++ +title = '🌡️ Diagnose' +headless = true +facilitation = false +emoji= '🧩' +[objectives] +1='Identify areas of weakness' +2='Address misconceptions from prep work' +3='Step through some code and check how it runs' ++++ + +This is a pairing activity! + +Each pair will need to split into navigator and driver. +Volunteers can pair up too - they need to drive though! +Navigators you can read the instructions for this workshop as you get setup + +This activity will consist of the following steps: + +### 🧑‍💻 Predict ➡️ Explain + +Given a program or piece of code, you’ll have to explain what the code currently does. Not what it should do. + +### 🔍🐛 Find the bug + +Given a target output/behaviour - trainees can identify a bug in the source +code + +### 🪜🧭 Propose a strategy + +Given some problem, you’ll have to think about a strategy for solving the given problem. This doesn’t involve coding but stepping back to think about how you could solve the problem. You might want to talk aloud, draw a flow diagram or write out the steps you’d take to solve the given problem + +For the specific task, check with the facilitator on Saturday. diff --git a/content/en/blocks/morning-orientation/index.md b/content/en/blocks/morning-orientation/index.md new file mode 100644 index 000000000..d6e319837 --- /dev/null +++ b/content/en/blocks/morning-orientation/index.md @@ -0,0 +1,37 @@ ++++ +title="🎡 Morning orientation" +headless="true" +time=15 +[objectives] + 1="Introduce and welcome new volunteers" + 2="Nominate a time keeper" + 3="Check the morning day plan and group structures" ++++ + +# 👣 Steps + +0. Assemble the entire group (all volunteers & all trainees) in a circle +1. Choose someone (volunteer or trainee) to facilitate this morning orientation block +2. Briefly welcome everyone with an announcement. Here is an example announcement to read aloud: + +> 💬 "Morning everyone, Welcome to CYF {REGION}, this week we are working on {MODULE HERE} {SPRINT NUMBER HERE} and we're currently working on {SUMMARISE THE TOPICS OF THE WEEK}" + +4. Ask if there are any new volunteers, + Or if there are some new members who haven't met before + Ask those newcomers to introduce themselves to the group/relevant people + +5. Go through the morning day plan only (typically on the curriculum website) - check the following things: + +- Check the number of Tech-Ed / PD volunteers you have for the morning +- Double-check check someone is leading a given session +- For any new activities ( like workshops or anything unfamiliar) - read out the block to the group +- Decide how best to allocate trainees and volunteers - this might be obvious according to the block or it may be + +5. Nominate a timekeeper from the group - aim for someone who hasn't done it before. + +⏱️ Timekeepers will need to: + +- Announce the start of an activity and how long it will take (check everyone is listening) +- Manage any whole class timers that are used in an activity +- Give people a 10-minute wrap-up warning before the end of an activity +- Announce the end of an activity and what happens next diff --git a/content/en/js3/sprints/3/day-plan/index.md b/content/en/js3/sprints/3/day-plan/index.md index f7c54e0c1..64f4b3dcb 100644 --- a/content/en/js3/sprints/3/day-plan/index.md +++ b/content/en/js3/sprints/3/day-plan/index.md @@ -11,16 +11,23 @@ name="Energiser" src="blocks/energiser" time=10 [[blocks]] +name="Morning orientation" +src="blocks/morning-orientation" +time=15 +[[blocks]] name= "Teamwork Project" src="https://cyf-pd.netlify.app/blocks/teamwork-project-s3" [[blocks]] src="blocks/morning-break" name="Morning break" [[blocks]] -name="Study Group" -src="blocks/study-group" +name="Diagnose" +src="blocks/diagnose" time=60 [[blocks]] +name="Check-in ➡️ Coordinate" +src="blocks/check-in-coordinate" +[[blocks]] name="Code Review" src="https://github.com/CodeYourFuture/Module-JS3/pulls" time="0" @@ -41,7 +48,7 @@ src="blocks/afternoon-break" [[blocks]] name="TV Show Project" src="blocks/study-group" -time=60 +time=15 [[blocks]] name="Code Review" src="https://github.com/CodeYourFuture/Module-JS3/pulls" From 6f64f7306a263d0e1f5b1a0bff23748a70319149 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Tue, 23 Jan 2024 16:17:18 +0000 Subject: [PATCH 02/32] move new js3 blocks to common-content js3 module dir --- .../en/module/js3}/check-in-coordinate/index.md | 0 .../en/blocks => common-content/en/module/js3}/diagnose/index.md | 0 .../en/module/js3}/morning-orientation/index.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {content/en/blocks => common-content/en/module/js3}/check-in-coordinate/index.md (100%) rename {content/en/blocks => common-content/en/module/js3}/diagnose/index.md (100%) rename {content/en/blocks => common-content/en/module/js3}/morning-orientation/index.md (100%) diff --git a/content/en/blocks/check-in-coordinate/index.md b/common-content/en/module/js3/check-in-coordinate/index.md similarity index 100% rename from content/en/blocks/check-in-coordinate/index.md rename to common-content/en/module/js3/check-in-coordinate/index.md diff --git a/content/en/blocks/diagnose/index.md b/common-content/en/module/js3/diagnose/index.md similarity index 100% rename from content/en/blocks/diagnose/index.md rename to common-content/en/module/js3/diagnose/index.md diff --git a/content/en/blocks/morning-orientation/index.md b/common-content/en/module/js3/morning-orientation/index.md similarity index 100% rename from content/en/blocks/morning-orientation/index.md rename to common-content/en/module/js3/morning-orientation/index.md From 11a96828ccbc1a47c0e2e1fb30b0088e048b5855 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Tue, 23 Jan 2024 16:26:56 +0000 Subject: [PATCH 03/32] point to js3 module blocks --- org-cyf/content/js3/sprints/3/day-plan/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org-cyf/content/js3/sprints/3/day-plan/index.md b/org-cyf/content/js3/sprints/3/day-plan/index.md index 920608719..d7df7d5bc 100644 --- a/org-cyf/content/js3/sprints/3/day-plan/index.md +++ b/org-cyf/content/js3/sprints/3/day-plan/index.md @@ -12,7 +12,7 @@ src="blocks/energiser" time=10 [[blocks]] name="Morning orientation" -src="blocks/morning-orientation" +src="module/js3/morning-orientation" time=15 [[blocks]] name= "Teamwork Project" @@ -22,11 +22,11 @@ src="blocks/morning-break" name="Morning break" [[blocks]] name="Diagnose" -src="blocks/diagnose" +src="module/js3/diagnose" time=60 [[blocks]] name="Check-in ➡️ Coordinate" -src="blocks/check-in-coordinate" +src="module/js3/check-in-coordinate" [[blocks]] name="Code Review" src="https://github.com/CodeYourFuture/Module-JS3/pulls" From 209fd576db343ee0db8d03b3f0f0d6aaa970e727 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Tue, 23 Jan 2024 16:36:43 +0000 Subject: [PATCH 04/32] lift morning orientation from js3 to blocks --- .../en/{module/js3 => blocks}/morning-orientation/index.md | 0 org-cyf/content/js3/sprints/3/day-plan/index.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename common-content/en/{module/js3 => blocks}/morning-orientation/index.md (100%) diff --git a/common-content/en/module/js3/morning-orientation/index.md b/common-content/en/blocks/morning-orientation/index.md similarity index 100% rename from common-content/en/module/js3/morning-orientation/index.md rename to common-content/en/blocks/morning-orientation/index.md diff --git a/org-cyf/content/js3/sprints/3/day-plan/index.md b/org-cyf/content/js3/sprints/3/day-plan/index.md index d7df7d5bc..cf1fed701 100644 --- a/org-cyf/content/js3/sprints/3/day-plan/index.md +++ b/org-cyf/content/js3/sprints/3/day-plan/index.md @@ -22,7 +22,7 @@ src="blocks/morning-break" name="Morning break" [[blocks]] name="Diagnose" -src="module/js3/diagnose" +src="blocks/diagnose" time=60 [[blocks]] name="Check-in ➡️ Coordinate" From 8c320f0fa26b556752c366ee5aab0c161fc6dc1e Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Tue, 23 Jan 2024 16:41:44 +0000 Subject: [PATCH 05/32] tweak morning orientation instructions --- common-content/en/blocks/morning-orientation/index.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/common-content/en/blocks/morning-orientation/index.md b/common-content/en/blocks/morning-orientation/index.md index d6e319837..86701d1e5 100644 --- a/common-content/en/blocks/morning-orientation/index.md +++ b/common-content/en/blocks/morning-orientation/index.md @@ -16,16 +16,15 @@ time=15 > 💬 "Morning everyone, Welcome to CYF {REGION}, this week we are working on {MODULE HERE} {SPRINT NUMBER HERE} and we're currently working on {SUMMARISE THE TOPICS OF THE WEEK}" -4. Ask if there are any new volunteers, - Or if there are some new members who haven't met before - Ask those newcomers to introduce themselves to the group/relevant people +4. Ask if there are any new volunteers or if there are some new members who haven't met before. Ask any newcomers to introduce themselves to the group/relevant people 5. Go through the morning day plan only (typically on the curriculum website) - check the following things: - Check the number of Tech-Ed / PD volunteers you have for the morning - Double-check check someone is leading a given session -- For any new activities ( like workshops or anything unfamiliar) - read out the block to the group -- Decide how best to allocate trainees and volunteers - this might be obvious according to the block or it may be +- For any new activities ( like workshops or anything unfamiliar) - describe how this block works for the group. + If there are any new volunteers, then briefly describe how that block works +- Decide how best to allocate trainees and volunteers for a given block - some blocks will make this clear 5. Nominate a timekeeper from the group - aim for someone who hasn't done it before. From 3d6f75727fab3de71bbcd1bcb83a07998bea4ab5 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Tue, 23 Jan 2024 16:54:09 +0000 Subject: [PATCH 06/32] update paths in js3/3 day plan --- org-cyf/content/js3/sprints/3/day-plan/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org-cyf/content/js3/sprints/3/day-plan/index.md b/org-cyf/content/js3/sprints/3/day-plan/index.md index cf1fed701..ad4aa7377 100644 --- a/org-cyf/content/js3/sprints/3/day-plan/index.md +++ b/org-cyf/content/js3/sprints/3/day-plan/index.md @@ -12,7 +12,7 @@ src="blocks/energiser" time=10 [[blocks]] name="Morning orientation" -src="module/js3/morning-orientation" +src="blocks/morning-orientation" time=15 [[blocks]] name= "Teamwork Project" @@ -22,7 +22,7 @@ src="blocks/morning-break" name="Morning break" [[blocks]] name="Diagnose" -src="blocks/diagnose" +src="module/js3/diagnose" time=60 [[blocks]] name="Check-in ➡️ Coordinate" From 3b3f7975f07ee4f5c9189f1224d30a18ffccc8de Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Tue, 23 Jan 2024 17:20:53 +0000 Subject: [PATCH 07/32] add morning orientation to module js3 --- org-cyf/content/js3/sprints/1/day-plan/index.md | 4 ++++ org-cyf/content/js3/sprints/2/day-plan/index.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/org-cyf/content/js3/sprints/1/day-plan/index.md b/org-cyf/content/js3/sprints/1/day-plan/index.md index 84794c7a5..921b06313 100644 --- a/org-cyf/content/js3/sprints/1/day-plan/index.md +++ b/org-cyf/content/js3/sprints/1/day-plan/index.md @@ -10,6 +10,10 @@ backlog_filter= 'Week 1' name="Energiser" src="blocks/energiser" [[blocks]] +name="Morning orientation" +src="blocks/morning-orientation" +time=15 +[[blocks]] name="Teamwork Project Sprint 1" src="https://cyf-pd.netlify.app/blocks/teamwork-project-s1/readme/" [[blocks]] diff --git a/org-cyf/content/js3/sprints/2/day-plan/index.md b/org-cyf/content/js3/sprints/2/day-plan/index.md index ab6892a1d..afe7586ed 100644 --- a/org-cyf/content/js3/sprints/2/day-plan/index.md +++ b/org-cyf/content/js3/sprints/2/day-plan/index.md @@ -11,6 +11,10 @@ name="Energiser" src="blocks/energiser" time="15" [[blocks]] +name="Morning orientation" +src="blocks/morning-orientation" +time=15 +[[blocks]] name= "Teamwork Project Sprint 2" src="https://cyf-pd.netlify.app/blocks/teamwork-project-s2" [[blocks]] From fb4274439c80847694655f6909870a0a0a0e709b Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Wed, 24 Jan 2024 10:49:14 +0000 Subject: [PATCH 08/32] emphasise facilitator role --- common-content/en/blocks/morning-orientation/index.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common-content/en/blocks/morning-orientation/index.md b/common-content/en/blocks/morning-orientation/index.md index 86701d1e5..382a37700 100644 --- a/common-content/en/blocks/morning-orientation/index.md +++ b/common-content/en/blocks/morning-orientation/index.md @@ -11,19 +11,18 @@ time=15 # 👣 Steps 0. Assemble the entire group (all volunteers & all trainees) in a circle -1. Choose someone (volunteer or trainee) to facilitate this morning orientation block -2. Briefly welcome everyone with an announcement. Here is an example announcement to read aloud: +1. Choose someone (volunteer or trainee) to be a **facilitator** for this morning orientation block +2. The **facilitator** should briefly welcome everyone with an announcement. Here is an example announcement to read aloud: > 💬 "Morning everyone, Welcome to CYF {REGION}, this week we are working on {MODULE HERE} {SPRINT NUMBER HERE} and we're currently working on {SUMMARISE THE TOPICS OF THE WEEK}" -4. Ask if there are any new volunteers or if there are some new members who haven't met before. Ask any newcomers to introduce themselves to the group/relevant people +4. Check if there are any new volunteers or if there are some attendees who haven't met before. Ask any newcomers to introduce themselves to the group/relevant people -5. Go through the morning day plan only (typically on the curriculum website) - check the following things: +5. Go through the _morning day plan only_ (typically on the curriculum website) - check the following things: - Check the number of Tech-Ed / PD volunteers you have for the morning - Double-check check someone is leading a given session -- For any new activities ( like workshops or anything unfamiliar) - describe how this block works for the group. - If there are any new volunteers, then briefly describe how that block works +- For any new activities ( like workshops or anything unfamiliar) - describe how this block works for the group. If there are any new volunteers, then briefly describe how that block works - Decide how best to allocate trainees and volunteers for a given block - some blocks will make this clear 5. Nominate a timekeeper from the group - aim for someone who hasn't done it before. From 52a91e9500cae6608e12fec04bc1b086441594d6 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Wed, 24 Jan 2024 11:13:39 +0000 Subject: [PATCH 09/32] add sketch of evaluate block --- common-content/en/blocks/evaluate/index.md | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 common-content/en/blocks/evaluate/index.md diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md new file mode 100644 index 000000000..24844df86 --- /dev/null +++ b/common-content/en/blocks/evaluate/index.md @@ -0,0 +1,24 @@ ++++ +title="Evaluate ✏️" +headless="true" +time= 60 +[objectives] + 1="Evaluate your current progress against previous modules" ++++ + +It is essential to continually check-in with yourself and evaluate your progress as you move through the course. + +One of the best ways of checking your progress against your past self is to go back to and tackle a problem from 4 weeks ago. + +{{}} + +## Activity + +1. Pair up with someone in your class +1. In your pairs, nominate a driver and a navigator. A driver will type out code. A navigator will use the prep to steer you in your solution. +1. Go back to JS1 Week 4 prep and familiarise yourself with the problem/function in that week +1. With the help of the prep, test and implement the function defined in JS1 Week 4 + +Do it without looking at the answer and using any other AI tool. + +{{}} From 0b11052635f92d10f3238ce28e742f980f678d94 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Wed, 24 Jan 2024 11:21:34 +0000 Subject: [PATCH 10/32] swap study group for evalute block --- org-cyf/content/js3/sprints/1/day-plan/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org-cyf/content/js3/sprints/1/day-plan/index.md b/org-cyf/content/js3/sprints/1/day-plan/index.md index 84794c7a5..5bb3e4dbc 100644 --- a/org-cyf/content/js3/sprints/1/day-plan/index.md +++ b/org-cyf/content/js3/sprints/1/day-plan/index.md @@ -17,7 +17,7 @@ src="blocks/morning-break" name="Morning break" [[blocks]] name="Study Group" -src="blocks/study-group" +src="blocks/evaluate" time=60 [[blocks]] name="Code Review" From 9b4d1976cd5b20cb078c179a6e67e8161334c0ce Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Wed, 24 Jan 2024 11:37:21 +0000 Subject: [PATCH 11/32] update block title in menu --- org-cyf/content/js3/sprints/1/day-plan/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org-cyf/content/js3/sprints/1/day-plan/index.md b/org-cyf/content/js3/sprints/1/day-plan/index.md index 5bb3e4dbc..83f4683d6 100644 --- a/org-cyf/content/js3/sprints/1/day-plan/index.md +++ b/org-cyf/content/js3/sprints/1/day-plan/index.md @@ -16,7 +16,7 @@ src="https://cyf-pd.netlify.app/blocks/teamwork-project-s1/readme/" src="blocks/morning-break" name="Morning break" [[blocks]] -name="Study Group" +name="Evaluate" src="blocks/evaluate" time=60 [[blocks]] From db867d7f516a67ddcdb97d099855b04986f95921 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Wed, 24 Jan 2024 11:37:37 +0000 Subject: [PATCH 12/32] tighten up instructions --- common-content/en/blocks/evaluate/index.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index 24844df86..5d04069fc 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -8,17 +8,21 @@ time= 60 It is essential to continually check-in with yourself and evaluate your progress as you move through the course. -One of the best ways of checking your progress against your past self is to go back to and tackle a problem from 4 weeks ago. +One of the best ways of checking your progress against your past self is to go back to and tackle a problem from a previous part of the course. {{}} ## Activity -1. Pair up with someone in your class -1. In your pairs, nominate a driver and a navigator. A driver will type out code. A navigator will use the prep to steer you in your solution. +1. Trainees need to split up into pairs +1. In your pairs, nominate a driver and a navigator. A driver will type out the code. A navigator will use the prep to steer you in your solution. 1. Go back to JS1 Week 4 prep and familiarise yourself with the problem/function in that week -1. With the help of the prep, test and implement the function defined in JS1 Week 4 +1. Using the prep as a guide and reference, test and implement the function defined in JS1 Week 4 -Do it without looking at the answer and using any other AI tool. +## Pay attention ❗🔍 + +- Ensure you write tests first and frequently run your tests your feedback +- Swap driver and navigator roles often - perhaps after every test +- Use the tests to break the problem - don't try implementing everything all at once {{}} From 0e2c8e1fdac4665bc2fdfcf120cb68bfb8166822 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Wed, 24 Jan 2024 11:45:37 +0000 Subject: [PATCH 13/32] change heading level --- common-content/en/blocks/evaluate/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index 5d04069fc..8db4fc51f 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -19,7 +19,7 @@ One of the best ways of checking your progress against your past self is to go b 1. Go back to JS1 Week 4 prep and familiarise yourself with the problem/function in that week 1. Using the prep as a guide and reference, test and implement the function defined in JS1 Week 4 -## Pay attention ❗🔍 +### Pay attention ❗🔍 - Ensure you write tests first and frequently run your tests your feedback - Swap driver and navigator roles often - perhaps after every test From a9cb7ee9e09aa96fcb56d3a8aeba1dcc85de0e09 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Wed, 24 Jan 2024 11:53:22 +0000 Subject: [PATCH 14/32] add setup and refer to learning objectives --- common-content/en/blocks/evaluate/index.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index 8db4fc51f..c2fefd3ef 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -6,16 +6,19 @@ time= 60 1="Evaluate your current progress against previous modules" +++ -It is essential to continually check-in with yourself and evaluate your progress as you move through the course. +It is essential to continually check in with yourself and evaluate your progress as you move through the course. One of the best ways of checking your progress against your past self is to go back to and tackle a problem from a previous part of the course. {{}} -## Activity +## Setup 🧰 1. Trainees need to split up into pairs 1. In your pairs, nominate a driver and a navigator. A driver will type out the code. A navigator will use the prep to steer you in your solution. + +## Activity + 1. Go back to JS1 Week 4 prep and familiarise yourself with the problem/function in that week 1. Using the prep as a guide and reference, test and implement the function defined in JS1 Week 4 @@ -24,5 +27,7 @@ One of the best ways of checking your progress against your past self is to go b - Ensure you write tests first and frequently run your tests your feedback - Swap driver and navigator roles often - perhaps after every test - Use the tests to break the problem - don't try implementing everything all at once +- Outline/discuss your strategy together before writing any code +- Check the learning objectives in each block. Do they make sense? Discuss them together as a pair {{}} From 33fcf5d87b8aeb15ba13d158807bb58d3ebcbe06 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Thu, 25 Jan 2024 14:13:05 +0000 Subject: [PATCH 15/32] add step about checking the module success criteria --- common-content/en/blocks/morning-orientation/index.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common-content/en/blocks/morning-orientation/index.md b/common-content/en/blocks/morning-orientation/index.md index 382a37700..6b060ef56 100644 --- a/common-content/en/blocks/morning-orientation/index.md +++ b/common-content/en/blocks/morning-orientation/index.md @@ -16,7 +16,9 @@ time=15 > 💬 "Morning everyone, Welcome to CYF {REGION}, this week we are working on {MODULE HERE} {SPRINT NUMBER HERE} and we're currently working on {SUMMARISE THE TOPICS OF THE WEEK}" -4. Check if there are any new volunteers or if there are some attendees who haven't met before. Ask any newcomers to introduce themselves to the group/relevant people +3. Check if there are any new volunteers or if there are some attendees who haven't met before. Ask any newcomers to introduce themselves to the group/relevant people + +4. Check if it is the _start of a new module_. In other words, are you working on sprint 1? If so then ask someone to read out the success criteria for the new module you have started. 5. Go through the _morning day plan only_ (typically on the curriculum website) - check the following things: @@ -25,7 +27,7 @@ time=15 - For any new activities ( like workshops or anything unfamiliar) - describe how this block works for the group. If there are any new volunteers, then briefly describe how that block works - Decide how best to allocate trainees and volunteers for a given block - some blocks will make this clear -5. Nominate a timekeeper from the group - aim for someone who hasn't done it before. +6. Nominate a timekeeper from the group - aim for someone who hasn't done it before. ⏱️ Timekeepers will need to: From 597fdb64dac6bc08d45d3b7744e20a00c43c6ef3 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Thu, 25 Jan 2024 17:03:37 +0000 Subject: [PATCH 16/32] add note on planning during the week --- common-content/en/blocks/morning-orientation/index.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common-content/en/blocks/morning-orientation/index.md b/common-content/en/blocks/morning-orientation/index.md index 6b060ef56..017291e37 100644 --- a/common-content/en/blocks/morning-orientation/index.md +++ b/common-content/en/blocks/morning-orientation/index.md @@ -4,10 +4,14 @@ headless="true" time=15 [objectives] 1="Introduce and welcome new volunteers" - 2="Nominate a time keeper" + 2="Nominate a timekeeper" 3="Check the morning day plan and group structures" +++ +{{}} +🧭 Step 1 and step 6 can be done earlier in the week. Create a post on Slack and get some people to take on the roles of **timekeeper** and **facilitator**. Nominate people who've not done it before. +{{}} + # 👣 Steps 0. Assemble the entire group (all volunteers & all trainees) in a circle @@ -27,7 +31,7 @@ time=15 - For any new activities ( like workshops or anything unfamiliar) - describe how this block works for the group. If there are any new volunteers, then briefly describe how that block works - Decide how best to allocate trainees and volunteers for a given block - some blocks will make this clear -6. Nominate a timekeeper from the group - aim for someone who hasn't done it before. +6. Nominate a timekeeper (volunteer or trainee) from the group - aim for someone who hasn't done it before. ⏱️ Timekeepers will need to: From 57078f47d49b3da841337ae8be99f3f58709fcc0 Mon Sep 17 00:00:00 2001 From: Sally McGrath Date: Thu, 25 Jan 2024 16:51:18 -0500 Subject: [PATCH 17/32] common-theme is missing its config (#549) so the markdown is escaping interior HTML and tabs are broken --- common-theme/hugo.toml | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 common-theme/hugo.toml diff --git a/common-theme/hugo.toml b/common-theme/hugo.toml new file mode 100644 index 000000000..95404e41b --- /dev/null +++ b/common-theme/hugo.toml @@ -0,0 +1,70 @@ +baseURL = "/" +title = "Our Platform" +sectionPagesMenu = "main" +enableEmoji = true +defaultContentLanguage = 'en' +defaultContentLanguageInSubdir = false + +[languages] + [languages.en] + contentDir = 'content/en' + languageCode = 'en-GB' + languageName = 'English' + +[menus] + [[menus.secondary]] + name = "Menu 1 👈🏾" + weight = 1 + url = "" + [[menus.secondary]] + name = "Menu 2 👋🏿" + weight = 2 + url = "" + [[menus.secondary]] + name = "Menu 3 🫶🏼" + weight = 3 + url = "" + +[params] +googleFonts="https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@300;500;700&family=Inter:wght@400;600&display=swap" +description = "A free and open source software development programme." +main_website = "" +main_org_name = "eg Code Your Future" +org = "https://github.com/YOUR_ORG_HERE" +repo = "https://github.com/YOUR_ORG_HERE/YOUR_REPO/" +root = "YOUR_REPO_I_THINK" +orgapi = "https://api.github.com/repos/YOUR_ORG_HERE/" +# We use a proxy which concatenates paginated responses, otherwise we miss results. +# Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem. +issuesorgapi = "https://github-issue-proxy.illicitonion.com/repos/CodeYourFuture/" + +[markup] +[markup.tableOfContents] +endLevel = 2 +ordered = true +startLevel = 2 +[markup.highlight] +lineNos = false +codeFences = true +guessSyntax = true +[markup.goldmark.renderer] +# Enable HTML codeblocks, e.g. for
blocks +unsafe = true +hardWraps = true +disableKinds = ["taxonomy", "term"] +footnote= true + +[caches.getjson] +# Disable caching of fetches - we want every build to get up to date content for issues, so that if people make clarifications or fixes to issues, we pick them up. +maxAge = 0 + +[security.funcs] +# Allow accessing a GitHub bearer token to avoid rate limits when doing HTTP fetches to the GitHub API. +# This can be generated at https://github.com/settings/tokens?type=beta and needs read-only access to all public CYF GitHub repos. +getenv = ["^HUGO_CURRICULUM_GITHUB_BEARER_TOKEN$"] + + +[module] + [module.hugoVersion] + extended = false + min = "0.116.0" From f31d50807eb1e4f33b4a14ede8748fff04e68a58 Mon Sep 17 00:00:00 2001 From: Sally McGrath Date: Thu, 25 Jan 2024 17:09:01 -0500 Subject: [PATCH 18/32] missing config on org-cyf to match common-theme (#550) * common-theme is missing its config so the markdown is escaping interior HTML and tabs are broken * include markdown settings in local config It seems like this should be totally inherited, but in #548 the bug doesn't scarper until I also include the settings here. The vital setting is unsafe=true, but let's include it all --- org-cyf/hugo.toml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/org-cyf/hugo.toml b/org-cyf/hugo.toml index aa529cc83..c20c24e17 100644 --- a/org-cyf/hugo.toml +++ b/org-cyf/hugo.toml @@ -46,5 +46,21 @@ maxAge = 0 # This can be generated at https://github.com/settings/tokens?type=beta and needs read-only access to all public CYF GitHub repos. getenv = ["^HUGO_CURRICULUM_GITHUB_BEARER_TOKEN$"] +[markup] +[markup.tableOfContents] +endLevel = 2 +ordered = true +startLevel = 2 +[markup.highlight] +lineNos = false +codeFences = true +guessSyntax = true +[markup.goldmark.renderer] +# Enable HTML codeblocks, e.g. for
blocks +unsafe = true +hardWraps = true +disableKinds = ["taxonomy", "term"] +footnote= true + theme = "common-theme" \ No newline at end of file From 22948a3b08cc51c7ed6565b5409d351f76a65822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20Sz=2E=20Sztup=C3=A1k?= Date: Fri, 26 Jan 2024 16:36:33 +0000 Subject: [PATCH 19/32] Fix environment setup in new structure (#546) The GITHUB TOKEN's environment name has changed recently but this was not reflected in the readme and the .env configs. This change also makes sure that the .env file values are proeprly picked up, and that the README is updated to help new users be able to set up their local dev environment quicker --- .env.example | 4 ++-- README.md | 2 +- org-cyf/README.md | 2 +- org-cyf/package.json | 3 ++- org-mcb/package.json | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index b4884d577..91978e795 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,8 @@ # Allow accessing a GitHub bearer token to avoid rate limits when doing HTTP fetches to the GitHub API. # This can be generated at https://github.com/settings/tokens?type=beta and needs read-only access to all public CYF GitHub repos. -CYF_CURRICULUM_GITHUB_BEARER_TOKEN="" +HUGO_CURRICULUM_GITHUB_BEARER_TOKEN="" # Client ID and secret for the GitHub OAuth app used to authenticate users. GITHUB_CLIENT_ID="clientid" GITHUB_CLIENT_SECRET="clientsecret" # The domain of the site, used for generating redirect URLs. -DOMAIN="http://localhost:8888" \ No newline at end of file +DOMAIN="http://localhost:8888" diff --git a/README.md b/README.md index db9e06df9..cd8264c13 100644 --- a/README.md +++ b/README.md @@ -57,4 +57,4 @@ For each module you import, add a `replace` directive to your `go.mod` file - if ## To locally develop your site -`cd` into the site you wish to develop, and run `hugo server` to get a live preview. +Check [org-cyf/README.md](/org-cyf/README.md) on how to set up your local environment. Once that is done you can `cd` into the site you wish to develop, and run `npm run start:dev` to get a live preview. diff --git a/org-cyf/README.md b/org-cyf/README.md index 63673bf9e..d5871d16b 100644 --- a/org-cyf/README.md +++ b/org-cyf/README.md @@ -38,7 +38,7 @@ The "Repository access" you need is "Public repositories (read-only)", and you d #### Set up `.env` -Copy the `.env.example` file over and name it `.env`. Edit the file and then change the line that says `CYF_CURRICULUM_GITHUB_BEARER_TOKEN` to contain the token that you have generated earlier. +Copy the `.env.example` file over and name it `.env`. Edit the file and then change the line that says `HUGO_CURRICULUM_GITHUB_BEARER_TOKEN` to contain the token that you have generated earlier. #### Run this command diff --git a/org-cyf/package.json b/org-cyf/package.json index 9a1da90c0..33e4df539 100644 --- a/org-cyf/package.json +++ b/org-cyf/package.json @@ -5,7 +5,8 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "start:dev": "dotenv -- hugo server -p 3000 -D" + "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete", + "build:dev": "dotenv -e ../.env -- hugo --environment issues-are-cached-and-incomplete" }, "keywords": [], "author": "", diff --git a/org-mcb/package.json b/org-mcb/package.json index 974d5e95a..33e4df539 100644 --- a/org-mcb/package.json +++ b/org-mcb/package.json @@ -5,8 +5,8 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "start:dev": "dotenv -- hugo server --environment issues-are-cached-and-incomplete", - "build:dev": "dotenv -- hugo --environment issues-are-cached-and-incomplete" + "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete", + "build:dev": "dotenv -e ../.env -- hugo --environment issues-are-cached-and-incomplete" }, "keywords": [], "author": "", From ddfe5d6f83a10dee4d223608ff64f792c37ccdc9 Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Sat, 27 Jan 2024 07:50:43 +0000 Subject: [PATCH 20/32] Update common-content/en/module/js3/diagnose/index.md Co-authored-by: Sally McGrath --- common-content/en/module/js3/diagnose/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-content/en/module/js3/diagnose/index.md b/common-content/en/module/js3/diagnose/index.md index c87654ed4..8e9e9d134 100644 --- a/common-content/en/module/js3/diagnose/index.md +++ b/common-content/en/module/js3/diagnose/index.md @@ -28,6 +28,6 @@ code ### 🪜🧭 Propose a strategy -Given some problem, you’ll have to think about a strategy for solving the given problem. This doesn’t involve coding but stepping back to think about how you could solve the problem. You might want to talk aloud, draw a flow diagram or write out the steps you’d take to solve the given problem +Given a problem, you’ll have to think about a strategy for solving it. This doesn’t involve coding but stepping back to think about how you could solve the problem. You might want to talk aloud, draw a flow diagram or write out the steps you’d take in your solution. For the specific task, check with the facilitator on Saturday. From 45ba93a2957a3289b21bccf4e32308f204b6d9ed Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Sat, 27 Jan 2024 07:52:46 +0000 Subject: [PATCH 21/32] Update common-content/en/module/js3/diagnose/index.md Co-authored-by: Sally McGrath --- common-content/en/module/js3/diagnose/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-content/en/module/js3/diagnose/index.md b/common-content/en/module/js3/diagnose/index.md index 8e9e9d134..f7a068e3c 100644 --- a/common-content/en/module/js3/diagnose/index.md +++ b/common-content/en/module/js3/diagnose/index.md @@ -23,7 +23,7 @@ Given a program or piece of code, you’ll have to explain what the code current ### 🔍🐛 Find the bug -Given a target output/behaviour - trainees can identify a bug in the source +Given a target output/behaviour - trainees can identify a bug in the source code code ### 🪜🧭 Propose a strategy From ad6adb6959fec166cf55a084308f6598708d747c Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Sat, 27 Jan 2024 07:52:53 +0000 Subject: [PATCH 22/32] Update common-content/en/module/js3/diagnose/index.md Co-authored-by: Sally McGrath --- common-content/en/module/js3/diagnose/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/common-content/en/module/js3/diagnose/index.md b/common-content/en/module/js3/diagnose/index.md index f7a068e3c..61d3769e3 100644 --- a/common-content/en/module/js3/diagnose/index.md +++ b/common-content/en/module/js3/diagnose/index.md @@ -24,7 +24,6 @@ Given a program or piece of code, you’ll have to explain what the code current ### 🔍🐛 Find the bug Given a target output/behaviour - trainees can identify a bug in the source code -code ### 🪜🧭 Propose a strategy From 1130eb45386bcfdab52e24c85a90c5cb44eda37f Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Sat, 27 Jan 2024 08:05:36 +0000 Subject: [PATCH 23/32] fix closing shortcode --- common-content/en/blocks/morning-orientation/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common-content/en/blocks/morning-orientation/index.md b/common-content/en/blocks/morning-orientation/index.md index 017291e37..67dbb75f9 100644 --- a/common-content/en/blocks/morning-orientation/index.md +++ b/common-content/en/blocks/morning-orientation/index.md @@ -8,9 +8,9 @@ time=15 3="Check the morning day plan and group structures" +++ -{{}} +{{}} 🧭 Step 1 and step 6 can be done earlier in the week. Create a post on Slack and get some people to take on the roles of **timekeeper** and **facilitator**. Nominate people who've not done it before. -{{}} +{{}} # 👣 Steps From 960662a69fff0e2a2bd9eaf4051c95cd7ee3d183 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Sat, 27 Jan 2024 08:05:47 +0000 Subject: [PATCH 24/32] tweak timings --- org-cyf/content/js3/sprints/1/day-plan/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org-cyf/content/js3/sprints/1/day-plan/index.md b/org-cyf/content/js3/sprints/1/day-plan/index.md index 921b06313..aaf446d57 100644 --- a/org-cyf/content/js3/sprints/1/day-plan/index.md +++ b/org-cyf/content/js3/sprints/1/day-plan/index.md @@ -37,10 +37,11 @@ time=120 [[blocks]] name="Afternoon break" src="blocks/afternoon-break" +time="10" [[blocks]] name="Study Group" src="blocks/study-group" -time=50 +time=30 [[blocks]] name="Code Review" src="https://github.com/CodeYourFuture/Module-JS3/pulls" From 286181f5945b3d6ce3ddf11976b0bf6d1efd2ede Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Sat, 27 Jan 2024 08:06:49 +0000 Subject: [PATCH 25/32] Update common-content/en/blocks/evaluate/index.md Co-authored-by: Sally McGrath --- common-content/en/blocks/evaluate/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index c2fefd3ef..4402347cd 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -6,7 +6,7 @@ time= 60 1="Evaluate your current progress against previous modules" +++ -It is essential to continually check in with yourself and evaluate your progress as you move through the course. +You must check in with yourself and evaluate your progress as you move through the course. One of the best ways of checking your progress against your past self is to go back to and tackle a problem from a previous part of the course. From 2b36f26dc82ef2f248d1fc0e24bf978966a5a2be Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Sat, 27 Jan 2024 08:07:04 +0000 Subject: [PATCH 26/32] Update common-content/en/blocks/evaluate/index.md Co-authored-by: Sally McGrath --- common-content/en/blocks/evaluate/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index 4402347cd..f9facf7bb 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -8,7 +8,7 @@ time= 60 You must check in with yourself and evaluate your progress as you move through the course. -One of the best ways of checking your progress against your past self is to go back to and tackle a problem from a previous part of the course. +Check your progress against your past self: go back to and tackle a problem from a previous part of the course. {{}} From 96fe7e3ca4a8526e8ee97f03105e93cd39ec50ce Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Sat, 27 Jan 2024 08:07:12 +0000 Subject: [PATCH 27/32] Update common-content/en/blocks/evaluate/index.md Co-authored-by: Sally McGrath --- common-content/en/blocks/evaluate/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index f9facf7bb..1a3875eb2 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -24,7 +24,7 @@ Check your progress against your past self: go back to and tackle a problem from ### Pay attention ❗🔍 -- Ensure you write tests first and frequently run your tests your feedback +- Write tests first and run your tests frequently to get feedback - Swap driver and navigator roles often - perhaps after every test - Use the tests to break the problem - don't try implementing everything all at once - Outline/discuss your strategy together before writing any code From 5eb06f9832aefeec5e6ef72a51241aca91352191 Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Sat, 27 Jan 2024 08:07:18 +0000 Subject: [PATCH 28/32] Update common-content/en/blocks/evaluate/index.md Co-authored-by: Sally McGrath --- common-content/en/blocks/evaluate/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index 1a3875eb2..085b18cf6 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -26,7 +26,7 @@ Check your progress against your past self: go back to and tackle a problem from - Write tests first and run your tests frequently to get feedback - Swap driver and navigator roles often - perhaps after every test -- Use the tests to break the problem - don't try implementing everything all at once +- Use your unit tests to break down the problem - don't try implementing everything all at once - Outline/discuss your strategy together before writing any code - Check the learning objectives in each block. Do they make sense? Discuss them together as a pair From 7a5d1141e339598d8c4d76bfca0435cac68e85a2 Mon Sep 17 00:00:00 2001 From: MitchLloyd Date: Sat, 27 Jan 2024 08:07:24 +0000 Subject: [PATCH 29/32] Update common-content/en/blocks/evaluate/index.md Co-authored-by: Sally McGrath --- common-content/en/blocks/evaluate/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index 085b18cf6..e71996d03 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -27,7 +27,7 @@ Check your progress against your past self: go back to and tackle a problem from - Write tests first and run your tests frequently to get feedback - Swap driver and navigator roles often - perhaps after every test - Use your unit tests to break down the problem - don't try implementing everything all at once -- Outline/discuss your strategy together before writing any code +- Discuss your strategy together before writing any code - Check the learning objectives in each block. Do they make sense? Discuss them together as a pair {{}} From 8494b162211b056b3ca948db100a8bed55bd4e26 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Sat, 27 Jan 2024 08:13:36 +0000 Subject: [PATCH 30/32] add morning orientation to js3 sprint 4 --- org-cyf/content/js3/sprints/4/day-plan/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org-cyf/content/js3/sprints/4/day-plan/index.md b/org-cyf/content/js3/sprints/4/day-plan/index.md index 67a786bb4..34c3c8b02 100644 --- a/org-cyf/content/js3/sprints/4/day-plan/index.md +++ b/org-cyf/content/js3/sprints/4/day-plan/index.md @@ -11,6 +11,10 @@ name="Energiser" src="blocks/energiser" time=10 [[blocks]] +name="Morning orientation" +src="blocks/morning-orientation" +time=15 +[[blocks]] name="Progress check-in" src="https://github.com/CodeYourFuture/Module-JS3/issues/245" time="15" From 3c4fca881a622d9cf005f071b5754ff79d28af5e Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Sat, 27 Jan 2024 08:19:01 +0000 Subject: [PATCH 31/32] add retro to js3 sprint 1 --- org-cyf/content/js3/sprints/1/day-plan/index.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org-cyf/content/js3/sprints/1/day-plan/index.md b/org-cyf/content/js3/sprints/1/day-plan/index.md index aaf446d57..220ed3845 100644 --- a/org-cyf/content/js3/sprints/1/day-plan/index.md +++ b/org-cyf/content/js3/sprints/1/day-plan/index.md @@ -41,9 +41,13 @@ time="10" [[blocks]] name="Study Group" src="blocks/study-group" -time=30 +time=20 [[blocks]] name="Code Review" src="https://github.com/CodeYourFuture/Module-JS3/pulls" time="0" +[[blocks]] +name="Retrospective" +src="blocks/retro" +time="20" +++ From 85522be2571e358fa5bf5bee5edb5b23b95d2aa1 Mon Sep 17 00:00:00 2001 From: Dedekind561 Date: Sat, 27 Jan 2024 08:36:27 +0000 Subject: [PATCH 32/32] refer to the problem from 2 modules ago --- common-content/en/blocks/evaluate/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md index c2fefd3ef..5815904fb 100644 --- a/common-content/en/blocks/evaluate/index.md +++ b/common-content/en/blocks/evaluate/index.md @@ -19,8 +19,8 @@ One of the best ways of checking your progress against your past self is to go b ## Activity -1. Go back to JS1 Week 4 prep and familiarise yourself with the problem/function in that week -1. Using the prep as a guide and reference, test and implement the function defined in JS1 Week 4 +1. Find a problem from 2 modules ago and familiarise yourself with it +1. Test and implement a solution to the chosen problem ### Pay attention ❗🔍