Merge branch 'main' into bug/857-cached-link

CodeYourFuture · Oct 24, 2024 · a56e37b · a56e37b
2 parents e883219 + a832a51
commit a56e37b
Show file tree

Hide file tree

Showing 14 changed files with 163 additions and 15 deletions.
diff --git a/common-content/en/module/js1/interpreting-errors/index.md b/common-content/en/module/js1/interpreting-errors/index.md
@@ -56,11 +56,11 @@ Your output was probably different. But it will have the same parts. Some text,
 
 {{<note type="exercise" title="Exercise">}}
 
-Work out what the parts of this line mean.
+1. Work out what the parts of this line mean.
 
-Why are they different on my computer than yours?
+2. Why are they different on my computer than yours?
 
-How can we use both pieces of information?
+3. How can we use both pieces of information?
 
 {{</note>}}
 
@@ -92,9 +92,7 @@ Node.js v22.4.1
 
 {{<note type="exercise" title="Exercise">}}
 
-What does this line mean?
-
-Why might it be useful to know this information?
+What does this line mean? Why might it be useful to know this information?
 
 Add your answer to your spaced repetition calendar. Your understanding of this will grow over time. Answer the question again in the future, and compare it to your previous answer.
 

diff --git a/common-theme/assets/styles/04-components/tooltip.scss b/common-theme/assets/styles/04-components/tooltip.scss
@@ -3,7 +3,7 @@ tool-tip-container {
   display: inline-block;
   cursor: help;
   text-decoration: 1px var(--theme-color--brand) wavy underline;
-  z-index: 2;
+  z-index: 3;
 }
 
 .tooltip {

diff --git a/common-theme/layouts/shortcodes/note.html b/common-theme/layouts/shortcodes/note.html
@@ -14,13 +14,13 @@
   "tip" ":bulb:"
   "warning" ":warning:"
 }}
-{{$title := .Get "title" | default "Note"}}
+{{$title := .Get "title" | default (.Get "type") | default "Note"}}
 {{$noteType := .Get "type" | default "note"}}
 
 <section class="c-note c-note--{{$noteType}}">
   <h4 class="c-note__title e-heading__4">
     {{ transform.Emojify (index $emojis $noteType) }}
-      {{ or (i18n $noteType) ($noteType) }}</span>
+      {{ or (i18n $noteType) ($title) }}</span>
   </h4>
   <div class="c-note__text ">{{ printf "%s" .Inner | markdownify }}</div>
 </section>
diff --git a/org-cyf-guides/content/contributing/minutes/index.md b/org-cyf-guides/content/contributing/minutes/index.md
@@ -17,6 +17,75 @@ Attendees:
 
 ---
 
+## 2024-10-22
+
+Attendees: Ali Smith, Daniel Wagner-Hall, Sally McGrath
+
+### ❗Actions from last time
+
+- [x] Daniel: Check in on availability for first round of Piscine
+- [x] Sally: Communicate the decision about "strictness of gatekeeping" to ITP team by commenting on a ticket
+- [x] Ali: Review Daniel's Piscine PR
+- [x] Sally: Come up with ideas for Ali to write up
+- [x] Ali: Respond to feedback on Piscine PR
+- [ ] Ali: Check in with the Dashboard team about Piscine reqs (write up a ticket for this)
+- [x] Daniel: Ask Barath to get him to post in remote-volunteering channel
+- [ ] All: Think about useful resources for SDC
+
+### 📝 Agenda points
+
+We did a big big project board clean-up and sprint-planning.
+
+#### React and tracks
+
+Three kinds of tracks:
+* Independent study tracks
+* Employer/Job/Role-focused tracks after ITP
+* Employer/Job/Role-focused tracks after SDC
+
+Need to be clear what is a direct path to a job, and also that we won't support poeple indefinitely to just keep doing more learning without goals.
+
+Daniel will action this on the tracks website.
+
+#### Missing Piscine prereqs
+
+How overloaded is ITP?
+* Intro module: Can't add anything meaningful in there.
+* Structuring and Testing Data: Pretty dense
+* Data Groups: Probably has some space
+* Data Flows: Already incredibly dense
+
+* Errors, error handling, and try/catch - we could probably insert this into Data Groups somewhere.
+  * The concept that there _are_ errors and they need handling in some way is more important than try/catch.
+* Working in groups
+  * Breaking down a project into things that can be done in parallel
+  * Merge conflicts and stuff
+    * This needs to be done in a standalone project - we can't expect people to learn anything else while they're fighting with merge conflicts.
+
+We should make tickets for:
+* Reduce prereqs on Piscine - remove everything from Daniel's list _not_ listed above.
+* ITP team to introduce errors in Data Groups
+* ITP team to introduce a group-work project in Data Groups where the desired LO is resolving merge conflicts
+* Ticket to require the object+array methods Codewars library in ITP at some point
+
+#### Parsing projects for Piscine?
+
+Probably too hard.
+
+#### Sally's Piscine project ideas
+
+We discussed a few. Codewars leaderboard, Swatches, Speak and Spell.
+
+Speak and Spell maybe doesn't have enough logicy content for Piscine, but could possibly be useful for a new group project?
+
+### ❗Actions
+
+- [ ] Ali (Carry-over): Check in with the Dashboard team about Piscine reqs (write up a ticket for this)
+- [ ] All (Carry-over): Think about useful resources for SDC
+- [ ] Daniel: Make a bunch of tickets described above
+
+---
+
 ## 2024-10-08
 
 Attendees: Ali, Sally, Daniel

diff --git a/org-cyf-itd/content/blocks/step-0/acceptance/index.md b/org-cyf-itd/content/blocks/step-0/acceptance/index.md
@@ -0,0 +1,23 @@
++++
+title ="Step 0: How to check your work"
+description= "Acceptance criteria for step zero"
+emoji= "✅"
+time= 10
+[build]
+  render = 'never'
+  list = 'local'
+  publishResources = false 
++++
+
+A volunteer will review your submission and check it meets the acceptance criteria. They will give you feedback on your submission and help you make any changes to meet the criteria.
+
+Here is the criteria you need to meet:
+
+```objectives
+- You have joined the CodeYourFuture ITD Slack
+- You have added a profile picture to your Slack profile 
+- You have used your real name on your Slack profile
+- You have introduced yourself on the #introduce-yourself-to-codeyourfuture channel
+- You have taken a screenshot of your introduction on the channel
+- You have uploaded the screenshot to this platform
+```
diff --git a/org-cyf-itd/content/blocks/step-0/instructions/index.md b/org-cyf-itd/content/blocks/step-0/instructions/index.md
@@ -0,0 +1,21 @@
++++
+title ="Step 0: What to do"
+description= "Join the CodeYourFuture Intro To Digital Slack"
+emoji= "🗨"
+time= 60
+[build]
+  render = 'never'
+  list = 'local'
+  publishResources = false 
++++
+
+#### Join the CodeYourFuture Intro To Digital Slack  
+We have an environment in which you can ask for help and build your local community. Slack helps us have asynchronous conversations with our community. It is used by most tech teams.
+
+Please use your real name on Slack and add a consistent profile picture. We ask this so we can recognise each other.
+
+1. Accept this invite (invite to Slack intentionally omitted) to our Introduction to Digital Slack
+2. [Understand how Slack works with their tutorial](https://slack.com/intl/en-gb/help/articles/360059928654-How-to-use-Slack--your-quick-start-guide)
+3. Introduce yourself on the [#introduce-yourself-to-codeyourfuture channel](https://cyf-introtodigital.slack.com/archives/CQ8HYL25C)
+4. Make a screenshot of your introduction on our Slack channel. [This website](https://www.take-a-screenshot.org/android.html) can help you if you don't know how to take a screenshot from your device.
+5. Upload the screenshot to this platform
diff --git a/org-cyf-itd/content/blocks/step-0/submission/index.md b/org-cyf-itd/content/blocks/step-0/submission/index.md
@@ -0,0 +1,16 @@
++++
+title ="Step 0: How to show us"
+description= "Submit your work for review"
+emoji= "📩"
+time= 5
+[build]
+  render = 'never'
+  list = 'local'
+  publishResources = false 
++++
+
+### Submission
+
+You must do this in CYF Course platform
+
+1. Upload the screenshot of your introduction on Slack
diff --git a/org-cyf-itd/content/steps/five/index.md b/org-cyf-itd/content/steps/five/index.md
@@ -5,7 +5,7 @@ layout = 'prep'
 emoji= '🧱'
 menu_level = ['module']
 menu=[ 'steps']
-weight = 5
+weight = 6
 [[blocks]]
 name="Instructions"
 src="blocks/step-5/instructions"

diff --git a/org-cyf-itd/content/steps/four/index.md b/org-cyf-itd/content/steps/four/index.md
@@ -5,7 +5,7 @@ layout = 'prep'
 emoji= '🧑🏾‍🚀'
 menu_level = ['module']
 menu=[ 'steps']
-weight = 4
+weight = 5
 [[blocks]]
 name="Instructions"
 src="blocks/step-4/instructions"

diff --git a/org-cyf-itd/content/steps/one/index.md b/org-cyf-itd/content/steps/one/index.md
@@ -5,7 +5,7 @@ layout = 'prep'
 emoji= '🤖'
 menu_level = ['module']
 menu=[ 'steps']
-weight = 1
+weight = 2
 [[blocks]]
 name="Instructions"
 src="blocks/step-1/instructions"

diff --git a/org-cyf-itd/content/steps/six/index.md b/org-cyf-itd/content/steps/six/index.md
@@ -5,7 +5,7 @@ layout = 'prep'
 emoji= '🏴󠁧󠁢󠁥󠁮󠁧󠁿'
 menu_level = ['module']
 menu=[ 'steps']
-weight = 5
+weight = 7
 [[blocks]]
 name="Instructions"
 src="blocks/step-6/instructions"

diff --git a/org-cyf-itd/content/steps/three/index.md b/org-cyf-itd/content/steps/three/index.md
@@ -5,7 +5,7 @@ layout = 'prep'
 emoji= '🚀'
 menu_level = ['module']
 menu=[ 'steps']
-weight = 3
+weight = 4
 [[blocks]]
 name="Instructions"
 src="blocks/step-3/instructions"

diff --git a/org-cyf-itd/content/steps/two/index.md b/org-cyf-itd/content/steps/two/index.md
@@ -5,7 +5,7 @@ layout = 'prep'
 emoji= '📊'
 menu_level = ['module']
 menu=[ 'steps']
-weight = 2
+weight = 3
 [[blocks]]
 name="Instructions"
 src="blocks/step-2/instructions"

diff --git a/org-cyf-itd/content/steps/zero/index.md b/org-cyf-itd/content/steps/zero/index.md
@@ -0,0 +1,21 @@
++++
+title = 'Zero'
+description = 'Join the CodeYourFuture Intro to Digital Slack'
+layout = 'prep'
+emoji= '🗨'
+menu_level = ['module']
+menu=[ 'steps']
+weight = 1
+[[blocks]]
+name="Instructions"
+src="blocks/step-0/instructions"
+[[blocks]]
+name="Acceptance Criteria"
+src="blocks/step-0/acceptance"
+[[blocks]]
+name="Submission"
+src="blocks/step-0/submission"
+[[blocks]]
+name="Help"
+src="blocks/help"
++++