Merge branch 'main' into feature/solo-view

CodeYourFuture · Dec 15, 2023 · 5c00f16 · 5c00f16
2 parents c72ade5 + 6378c9e
commit 5c00f16
Show file tree

Hide file tree

Showing 593 changed files with 982 additions and 351 deletions.
diff --git a/config.toml b/config.toml
@@ -1,10 +1,18 @@
 baseURL = "/"
-languageCode = "en-us"
 title = "CodeYourFuture Curriculum"
-languageLang = "en"
 sectionPagesMenu = "main"
 enableEmoji = true
 
+defaultContentLanguage = 'en'
+defaultContentLanguageInSubdir = false
+
+[languages]
+  [languages.en]
+    baseURL = "/"
+    contentDir = 'content/en'
+    languageCode = 'en-GB'
+    languageName = 'English'
+
 [menus]
     [[menus.secondary]]
         name = "Guides 👈🏾"
@@ -27,6 +35,9 @@ tree = "https://github.com/CodeYourFuture/curriculum/tree/main/"
 edit = "https://github.com/CodeYourFuture/curriculum/edit/main/"
 root = "curriculum"
 orgapi = "https://api.github.com/repos/CodeYourFuture/"
+# 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]

diff --git a/config/issues-are-cached-and-incomplete/config.toml b/config/issues-are-cached-and-incomplete/config.toml
@@ -0,0 +1,12 @@
+# This config is optimised for speed of local interation of general Hugo set-up without worrying about issue freshness or completeness.
+# To build with this config, run `hugo server --environment issues-are-cached-and-incomplete`.
+
+[params]
+# Don't use the paginating proxy, because it's slow.
+# This means some issues will be missing when fetched.
+issuesorgapi = "https://api.github.com/repos/CodeYourFuture/"
+
+[caches.getjson]
+# Cache JSON responses because making fetches is slow when iterating.
+# This means updates to issues (or newly created ones) won't be picked up when rebuilding.
+maxAge = "4h"
diff --git a/content/_index.md → content/en/_index.md b/content/_index.md → content/en/_index.md
diff --git a/content/blocks/afternoon-break/index.md → content/en/blocks/afternoon-break/index.md b/content/blocks/afternoon-break/index.md → content/en/blocks/afternoon-break/index.md
diff --git a/content/blocks/backlog/index.md → content/en/blocks/backlog/index.md b/content/blocks/backlog/index.md → content/en/blocks/backlog/index.md
diff --git a/content/blocks/blockers/index.md → content/en/blocks/blockers/index.md b/content/blocks/blockers/index.md → content/en/blocks/blockers/index.md
diff --git a/content/blocks/coding-101/index.md → content/en/blocks/coding-101/index.md b/content/blocks/coding-101/index.md → content/en/blocks/coding-101/index.md
diff --git a/content/blocks/coursework/index.md → content/en/blocks/coursework/index.md b/content/blocks/coursework/index.md → content/en/blocks/coursework/index.md
diff --git a/content/blocks/energiser/index.md → content/en/blocks/energiser/index.md b/content/blocks/energiser/index.md → content/en/blocks/energiser/index.md
diff --git a/content/blocks/kata/index.md → content/en/blocks/kata/index.md b/content/blocks/kata/index.md → content/en/blocks/kata/index.md
diff --git a/content/blocks/lunch/index.md → content/en/blocks/lunch/index.md b/content/blocks/lunch/index.md → content/en/blocks/lunch/index.md
diff --git a/content/blocks/morning-break/index.md → content/en/blocks/morning-break/index.md b/content/blocks/morning-break/index.md → content/en/blocks/morning-break/index.md
diff --git a/content/blocks/pd-placeholder/index.md → content/en/blocks/pd-placeholder/index.md b/content/blocks/pd-placeholder/index.md → content/en/blocks/pd-placeholder/index.md
diff --git a/content/blocks/requirements/index.md → content/en/blocks/requirements/index.md b/content/blocks/requirements/index.md → content/en/blocks/requirements/index.md
diff --git a/content/blocks/retro/index.md → content/en/blocks/retro/index.md b/content/blocks/retro/index.md → content/en/blocks/retro/index.md
diff --git a/content/blocks/search-terms/index.md → content/en/blocks/search-terms/index.md b/content/blocks/search-terms/index.md → content/en/blocks/search-terms/index.md
diff --git a/content/blocks/spaced-repetition/index.md → content/en/blocks/spaced-repetition/index.md b/content/blocks/spaced-repetition/index.md → content/en/blocks/spaced-repetition/index.md
diff --git a/content/blocks/study-45/index.md → content/en/blocks/study-45/index.md b/content/blocks/study-45/index.md → content/en/blocks/study-45/index.md
diff --git a/content/blocks/study-60/index.md → content/en/blocks/study-60/index.md b/content/blocks/study-60/index.md → content/en/blocks/study-60/index.md
diff --git a/content/blocks/study-90/index.md → content/en/blocks/study-90/index.md b/content/blocks/study-90/index.md → content/en/blocks/study-90/index.md
diff --git a/content/blocks/study-group/index.md → content/en/blocks/study-group/index.md b/content/blocks/study-group/index.md → content/en/blocks/study-group/index.md
diff --git a/content/blocks/success-criteria/index.md → content/en/blocks/success-criteria/index.md b/content/blocks/success-criteria/index.md → content/en/blocks/success-criteria/index.md
diff --git a/content/blocks/telephone/index.md → content/en/blocks/telephone/index.md b/content/blocks/telephone/index.md → content/en/blocks/telephone/index.md
diff --git a/content/blocks/useful-links/index.md → content/en/blocks/useful-links/index.md b/content/blocks/useful-links/index.md → content/en/blocks/useful-links/index.md
diff --git a/content/blocks/user-stories/index.md → content/en/blocks/user-stories/index.md b/content/blocks/user-stories/index.md → content/en/blocks/user-stories/index.md
diff --git a/content/databases/_index.md → content/en/databases/_index.md b/content/databases/_index.md → content/en/databases/_index.md
diff --git a/...ses/blocks/communicating-with-db/index.md → ...ses/blocks/communicating-with-db/index.md b/...ses/blocks/communicating-with-db/index.md → ...ses/blocks/communicating-with-db/index.md
diff --git a/...atabases/blocks/creating-a-table/index.md → ...atabases/blocks/creating-a-table/index.md b/...atabases/blocks/creating-a-table/index.md → ...atabases/blocks/creating-a-table/index.md
diff --git a/content/databases/blocks/crud/crud.png → content/en/databases/blocks/crud/crud.png b/content/databases/blocks/crud/crud.png → content/en/databases/blocks/crud/crud.png
diff --git a/content/databases/blocks/crud/index.md → content/en/databases/blocks/crud/index.md b/content/databases/blocks/crud/index.md → content/en/databases/blocks/crud/index.md
diff --git a/...t/databases/blocks/defining-keys/index.md → ...n/databases/blocks/defining-keys/index.md b/...t/databases/blocks/defining-keys/index.md → ...n/databases/blocks/defining-keys/index.md
diff --git a/...ses/blocks/integration-with-node/index.md → ...ses/blocks/integration-with-node/index.md b/...ses/blocks/integration-with-node/index.md → ...ses/blocks/integration-with-node/index.md
diff --git a/...abases/blocks/introduction-to-db/index.md → ...abases/blocks/introduction-to-db/index.md b/...abases/blocks/introduction-to-db/index.md → ...abases/blocks/introduction-to-db/index.md
diff --git a/...locks/introduction-to-postgresql/index.md → ...locks/introduction-to-postgresql/index.md b/...locks/introduction-to-postgresql/index.md → ...locks/introduction-to-postgresql/index.md
diff --git a/...roduction-to-postgresql/table-diagram.png → ...roduction-to-postgresql/table-diagram.png b/...roduction-to-postgresql/table-diagram.png → ...roduction-to-postgresql/table-diagram.png
diff --git a/.../databases/blocks/joining-tables/index.md → .../databases/blocks/joining-tables/index.md b/.../databases/blocks/joining-tables/index.md → .../databases/blocks/joining-tables/index.md
diff --git a/...es/blocks/joining-tables/join-diagram.png → ...es/blocks/joining-tables/join-diagram.png b/...es/blocks/joining-tables/join-diagram.png → ...es/blocks/joining-tables/join-diagram.png
diff --git a/.../databases/blocks/more-selective/index.md → .../databases/blocks/more-selective/index.md b/.../databases/blocks/more-selective/index.md → .../databases/blocks/more-selective/index.md
diff --git a/content/databases/blocks/recap-node/index.md → ...t/en/databases/blocks/recap-node/index.md b/content/databases/blocks/recap-node/index.md → ...t/en/databases/blocks/recap-node/index.md
diff --git a/...cap-node/postman-get-cust-all-results.png → ...cap-node/postman-get-cust-all-results.png b/...cap-node/postman-get-cust-all-results.png → ...cap-node/postman-get-cust-all-results.png
diff --git a/...locks/recap-node/postman-get-cust-all.odg → ...locks/recap-node/postman-get-cust-all.odg b/...locks/recap-node/postman-get-cust-all.odg → ...locks/recap-node/postman-get-cust-all.odg
diff --git a/...locks/recap-node/postman-get-cust-all.png → ...locks/recap-node/postman-get-cust-all.png b/...locks/recap-node/postman-get-cust-all.png → ...locks/recap-node/postman-get-cust-all.png
diff --git a/...t/databases/blocks/updating-rows/index.md → ...n/databases/blocks/updating-rows/index.md b/...t/databases/blocks/updating-rows/index.md → ...n/databases/blocks/updating-rows/index.md
diff --git a/...blocks/using-aggregate-functions/index.md → ...blocks/using-aggregate-functions/index.md b/...blocks/using-aggregate-functions/index.md → ...blocks/using-aggregate-functions/index.md
diff --git a/...tabases/prep/Screenshot_Postgres_disk.png → ...tabases/prep/Screenshot_Postgres_disk.png b/...tabases/prep/Screenshot_Postgres_disk.png → ...tabases/prep/Screenshot_Postgres_disk.png
diff --git a/...s/prep/Screenshot_Postgres_initialise.png → ...s/prep/Screenshot_Postgres_initialise.png b/...s/prep/Screenshot_Postgres_initialise.png → ...s/prep/Screenshot_Postgres_initialise.png
diff --git a/...ases/prep/Screenshot_Postgres_running.png → ...ases/prep/Screenshot_Postgres_running.png b/...ases/prep/Screenshot_Postgres_running.png → ...ases/prep/Screenshot_Postgres_running.png
diff --git a/content/databases/prep/index.md → content/en/databases/prep/index.md b/content/databases/prep/index.md → content/en/databases/prep/index.md
diff --git a/content/databases/product/_index.md → content/en/databases/product/_index.md b/content/databases/product/_index.md → content/en/databases/product/_index.md
diff --git a/content/databases/product/build/index.md → content/en/databases/product/build/index.md b/content/databases/product/build/index.md → content/en/databases/product/build/index.md
diff --git a/content/databases/product/plan/index.md → content/en/databases/product/plan/index.md b/content/databases/product/plan/index.md → content/en/databases/product/plan/index.md
diff --git a/content/databases/product/ship/index.md → content/en/databases/product/ship/index.md b/content/databases/product/ship/index.md → content/en/databases/product/ship/index.md
diff --git a/content/databases/product/test/index.md → content/en/databases/product/test/index.md b/content/databases/product/test/index.md → content/en/databases/product/test/index.md
diff --git a/content/databases/sprints/1/_index.md → content/en/databases/sprints/1/_index.md b/content/databases/sprints/1/_index.md → content/en/databases/sprints/1/_index.md
diff --git a/content/databases/sprints/1/backlog/index.md → ...t/en/databases/sprints/1/backlog/index.md b/content/databases/sprints/1/backlog/index.md → ...t/en/databases/sprints/1/backlog/index.md
diff --git a/...ent/databases/sprints/1/day-plan/index.md → .../en/databases/sprints/1/day-plan/index.md b/...ent/databases/sprints/1/day-plan/index.md → .../en/databases/sprints/1/day-plan/index.md
diff --git a/content/databases/sprints/1/prep/index.md → content/en/databases/sprints/1/prep/index.md b/content/databases/sprints/1/prep/index.md → content/en/databases/sprints/1/prep/index.md
diff --git a/content/databases/sprints/1/success/index.md → ...t/en/databases/sprints/1/success/index.md b/content/databases/sprints/1/success/index.md → ...t/en/databases/sprints/1/success/index.md
diff --git a/content/databases/sprints/2/_index.md → content/en/databases/sprints/2/_index.md b/content/databases/sprints/2/_index.md → content/en/databases/sprints/2/_index.md
diff --git a/content/databases/sprints/2/backlog/index.md → ...t/en/databases/sprints/2/backlog/index.md b/content/databases/sprints/2/backlog/index.md → ...t/en/databases/sprints/2/backlog/index.md
diff --git a/...ent/databases/sprints/2/day-plan/index.md → .../en/databases/sprints/2/day-plan/index.md b/...ent/databases/sprints/2/day-plan/index.md → .../en/databases/sprints/2/day-plan/index.md
diff --git a/content/databases/sprints/2/prep/index.md → content/en/databases/sprints/2/prep/index.md b/content/databases/sprints/2/prep/index.md → content/en/databases/sprints/2/prep/index.md
diff --git a/content/databases/sprints/2/success/index.md → ...t/en/databases/sprints/2/success/index.md b/content/databases/sprints/2/success/index.md → ...t/en/databases/sprints/2/success/index.md
diff --git a/content/databases/sprints/3/_index.md → content/en/databases/sprints/3/_index.md b/content/databases/sprints/3/_index.md → content/en/databases/sprints/3/_index.md
diff --git a/content/databases/sprints/3/backlog/index.md → ...t/en/databases/sprints/3/backlog/index.md b/content/databases/sprints/3/backlog/index.md → ...t/en/databases/sprints/3/backlog/index.md
diff --git a/...ent/databases/sprints/3/day-plan/index.md → .../en/databases/sprints/3/day-plan/index.md b/...ent/databases/sprints/3/day-plan/index.md → .../en/databases/sprints/3/day-plan/index.md
diff --git a/content/databases/sprints/3/prep/index.md → content/en/databases/sprints/3/prep/index.md b/content/databases/sprints/3/prep/index.md → content/en/databases/sprints/3/prep/index.md
diff --git a/content/databases/sprints/3/success/index.md → ...t/en/databases/sprints/3/success/index.md b/content/databases/sprints/3/success/index.md → ...t/en/databases/sprints/3/success/index.md
diff --git a/content/databases/sprints/4/_index.md → content/en/databases/sprints/4/_index.md b/content/databases/sprints/4/_index.md → content/en/databases/sprints/4/_index.md
diff --git a/content/databases/sprints/4/backlog/index.md → ...t/en/databases/sprints/4/backlog/index.md b/content/databases/sprints/4/backlog/index.md → ...t/en/databases/sprints/4/backlog/index.md
diff --git a/...ent/databases/sprints/4/day-plan/index.md → .../en/databases/sprints/4/day-plan/index.md b/...ent/databases/sprints/4/day-plan/index.md → .../en/databases/sprints/4/day-plan/index.md
diff --git a/content/databases/sprints/4/prep/index.md → content/en/databases/sprints/4/prep/index.md b/content/databases/sprints/4/prep/index.md → content/en/databases/sprints/4/prep/index.md
diff --git a/content/databases/sprints/4/success/index.md → ...t/en/databases/sprints/4/success/index.md b/content/databases/sprints/4/success/index.md → ...t/en/databases/sprints/4/success/index.md
diff --git a/content/databases/success/index.md → content/en/databases/success/index.md b/content/databases/success/index.md → content/en/databases/success/index.md
diff --git a/content/fundamentals/_index.md → content/en/fundamentals/_index.md b/content/fundamentals/_index.md → content/en/fundamentals/_index.md
diff --git a/...ent/fundamentals/blocks/blockers/index.md → .../en/fundamentals/blocks/blockers/index.md b/...ent/fundamentals/blocks/blockers/index.md → .../en/fundamentals/blocks/blockers/index.md
diff --git a/...fundamentals/blocks/code-dot-org/index.md → ...fundamentals/blocks/code-dot-org/index.md b/...fundamentals/blocks/code-dot-org/index.md → ...fundamentals/blocks/code-dot-org/index.md
diff --git a/...tals/blocks/cyf-blocks-iteration/index.md → ...tals/blocks/cyf-blocks-iteration/index.md b/...tals/blocks/cyf-blocks-iteration/index.md → ...tals/blocks/cyf-blocks-iteration/index.md
diff --git a/...s/blocks/cyf-blocks-requirements/index.md → ...s/blocks/cyf-blocks-requirements/index.md b/...s/blocks/cyf-blocks-requirements/index.md → ...s/blocks/cyf-blocks-requirements/index.md
diff --git a/content/fundamentals/blocks/goals/index.md → ...ent/en/fundamentals/blocks/goals/index.md b/content/fundamentals/blocks/goals/index.md → ...ent/en/fundamentals/blocks/goals/index.md
diff --git a/content/fundamentals/blocks/mvp/index.md → content/en/fundamentals/blocks/mvp/index.md b/content/fundamentals/blocks/mvp/index.md → content/en/fundamentals/blocks/mvp/index.md
diff --git a/...t/fundamentals/blocks/next-steps/index.md → ...n/fundamentals/blocks/next-steps/index.md b/...t/fundamentals/blocks/next-steps/index.md → ...n/fundamentals/blocks/next-steps/index.md
diff --git a/...ntals/blocks/overcoming-blockers/index.md → ...ntals/blocks/overcoming-blockers/index.md b/...ntals/blocks/overcoming-blockers/index.md → ...ntals/blocks/overcoming-blockers/index.md
diff --git a/content/fundamentals/blocks/pairing/index.md → ...t/en/fundamentals/blocks/pairing/index.md b/content/fundamentals/blocks/pairing/index.md → ...t/en/fundamentals/blocks/pairing/index.md
diff --git a/...amentals/blocks/ship-it-delivery/index.md → ...amentals/blocks/ship-it-delivery/index.md b/...amentals/blocks/ship-it-delivery/index.md → ...amentals/blocks/ship-it-delivery/index.md
diff --git a/...mentals/blocks/ship-it-iteration/index.md → ...mentals/blocks/ship-it-iteration/index.md b/...mentals/blocks/ship-it-iteration/index.md → ...mentals/blocks/ship-it-iteration/index.md
diff --git a/...tals/blocks/ship-it-requirements/index.md → ...tals/blocks/ship-it-requirements/index.md b/...tals/blocks/ship-it-requirements/index.md → ...tals/blocks/ship-it-requirements/index.md
diff --git a/...tals/blocks/using-the-curriculum/index.md → ...tals/blocks/using-the-curriculum/index.md b/...tals/blocks/using-the-curriculum/index.md → ...tals/blocks/using-the-curriculum/index.md
diff --git a/content/fundamentals/blocks/wrap-up/index.md → ...t/en/fundamentals/blocks/wrap-up/index.md b/content/fundamentals/blocks/wrap-up/index.md → ...t/en/fundamentals/blocks/wrap-up/index.md
diff --git a/content/fundamentals/prep/index.md → content/en/fundamentals/prep/index.md b/content/fundamentals/prep/index.md → content/en/fundamentals/prep/index.md
diff --git a/content/fundamentals/product/_index.md → content/en/fundamentals/product/_index.md b/content/fundamentals/product/_index.md → content/en/fundamentals/product/_index.md
diff --git a/content/fundamentals/product/build/index.md → ...nt/en/fundamentals/product/build/index.md b/content/fundamentals/product/build/index.md → ...nt/en/fundamentals/product/build/index.md
diff --git a/content/fundamentals/product/plan/index.md → ...ent/en/fundamentals/product/plan/index.md b/content/fundamentals/product/plan/index.md → ...ent/en/fundamentals/product/plan/index.md
diff --git a/content/fundamentals/product/ship/index.md → ...ent/en/fundamentals/product/ship/index.md b/content/fundamentals/product/ship/index.md → ...ent/en/fundamentals/product/ship/index.md
diff --git a/content/fundamentals/product/test/index.md → ...ent/en/fundamentals/product/test/index.md b/content/fundamentals/product/test/index.md → ...ent/en/fundamentals/product/test/index.md
diff --git a/content/fundamentals/sprints/1/_index.md → content/en/fundamentals/sprints/1/_index.md b/content/fundamentals/sprints/1/_index.md → content/en/fundamentals/sprints/1/_index.md
diff --git a/...t/fundamentals/sprints/1/backlog/index.md → ...n/fundamentals/sprints/1/backlog/index.md b/...t/fundamentals/sprints/1/backlog/index.md → ...n/fundamentals/sprints/1/backlog/index.md
diff --git a/.../fundamentals/sprints/1/day-plan/index.md → .../fundamentals/sprints/1/day-plan/index.md b/.../fundamentals/sprints/1/day-plan/index.md → .../fundamentals/sprints/1/day-plan/index.md
diff --git a/content/fundamentals/sprints/1/prep/index.md → ...t/en/fundamentals/sprints/1/prep/index.md b/content/fundamentals/sprints/1/prep/index.md → ...t/en/fundamentals/sprints/1/prep/index.md
diff --git a/...t/fundamentals/sprints/1/success/index.md → ...n/fundamentals/sprints/1/success/index.md b/...t/fundamentals/sprints/1/success/index.md → ...n/fundamentals/sprints/1/success/index.md
diff --git a/content/fundamentals/sprints/2/_index.md → content/en/fundamentals/sprints/2/_index.md b/content/fundamentals/sprints/2/_index.md → content/en/fundamentals/sprints/2/_index.md
diff --git a/...t/fundamentals/sprints/2/backlog/index.md → ...n/fundamentals/sprints/2/backlog/index.md b/...t/fundamentals/sprints/2/backlog/index.md → ...n/fundamentals/sprints/2/backlog/index.md
diff --git a/.../fundamentals/sprints/2/day-plan/index.md → .../fundamentals/sprints/2/day-plan/index.md b/.../fundamentals/sprints/2/day-plan/index.md → .../fundamentals/sprints/2/day-plan/index.md
diff --git a/content/fundamentals/sprints/2/prep/index.md → ...t/en/fundamentals/sprints/2/prep/index.md b/content/fundamentals/sprints/2/prep/index.md → ...t/en/fundamentals/sprints/2/prep/index.md
diff --git a/...t/fundamentals/sprints/2/success/index.md → ...n/fundamentals/sprints/2/success/index.md b/...t/fundamentals/sprints/2/success/index.md → ...n/fundamentals/sprints/2/success/index.md
diff --git a/content/fundamentals/sprints/3/_index.md → content/en/fundamentals/sprints/3/_index.md b/content/fundamentals/sprints/3/_index.md → content/en/fundamentals/sprints/3/_index.md
diff --git a/...t/fundamentals/sprints/3/backlog/index.md → ...n/fundamentals/sprints/3/backlog/index.md b/...t/fundamentals/sprints/3/backlog/index.md → ...n/fundamentals/sprints/3/backlog/index.md
diff --git a/.../fundamentals/sprints/3/day-plan/index.md → .../fundamentals/sprints/3/day-plan/index.md b/.../fundamentals/sprints/3/day-plan/index.md → .../fundamentals/sprints/3/day-plan/index.md
diff --git a/content/fundamentals/sprints/3/prep/index.md → ...t/en/fundamentals/sprints/3/prep/index.md b/content/fundamentals/sprints/3/prep/index.md → ...t/en/fundamentals/sprints/3/prep/index.md
diff --git a/...t/fundamentals/sprints/3/success/index.md → ...n/fundamentals/sprints/3/success/index.md b/...t/fundamentals/sprints/3/success/index.md → ...n/fundamentals/sprints/3/success/index.md
diff --git a/content/fundamentals/success/index.md → content/en/fundamentals/success/index.md b/content/fundamentals/success/index.md → content/en/fundamentals/success/index.md
diff --git a/content/guides/_index.md → content/en/guides/_index.md b/content/guides/_index.md → content/en/guides/_index.md
diff --git a/content/guides/asking-questions/index.md → content/en/guides/asking-questions/index.md b/content/guides/asking-questions/index.md → content/en/guides/asking-questions/index.md
diff --git a/content/guides/code-review/index.md → content/en/guides/code-review/index.md b/content/guides/code-review/index.md → content/en/guides/code-review/index.md
diff --git a/content/guides/code-style-guide/index.md → content/en/guides/code-style-guide/index.md b/content/guides/code-style-guide/index.md → content/en/guides/code-style-guide/index.md
diff --git a/...uides/code-style-guide/prettier-error.png → ...uides/code-style-guide/prettier-error.png b/...uides/code-style-guide/prettier-error.png → ...uides/code-style-guide/prettier-error.png
diff --git a/content/guides/contributing/_index.md → content/en/guides/contributing/_index.md b/content/guides/contributing/_index.md → content/en/guides/contributing/_index.md
diff --git a/...guides/contributing/contributors/index.md → ...guides/contributing/contributors/index.md b/...guides/contributing/contributors/index.md → ...guides/contributing/contributors/index.md
diff --git a/content/guides/contributing/minutes/index.md → ...t/en/guides/contributing/minutes/index.md b/content/guides/contributing/minutes/index.md → ...t/en/guides/contributing/minutes/index.md
@@ -17,6 +17,168 @@ Attendees:
 
 ---
 
+## 2023-12-05
+
+Attendees: Ali Smith, Daniel Wagner-Hall, Isar Fridriksson, Sally McGrath
+
+### ❗Actions from last time
+
+- [x] Put together a "giving demos" workshop
+  - Which maybe involves giving different presentations about the same project with different audiences in mind.
+- [x] Ellie to capture lessons learnt from the London 10 Portfolio module.
+- [x] Daniel to put together a discussion thread about moving/splitting SQL module.
+- [ ] Ali to put together a proposed ordering of training videos to watch, and arrange a time for discussion.
+- [x] Ali to file a ticket about not setting innerHTML
+- [ ] Ali (Carry-over): Review JS1 & 2 content
+
+### 📝 Agenda points
+
+#### Barcelona debrief
+
+* We met with Isar, Hugo, Simon
+* We attended class for a few hours
+  * Felt very CYF-before-flipped-classroom
+    * A range of understandings and confidences
+  * Ordinarily class has 1-2 teachers and few TAs, but this session we had a load of volunteers so did some interview practice style pairing
+  * Did a lot of pairing with people
+    * Similarly a range of understandings and confidences
+  * They have a regular (well-equipped) space
+  * Currently have two classes - one in English, one in Spanish
+    * Considering the next cohort only offering English - there are other similar bootcamps offering Spanish but none offer English
+* General agreements to:
+  * Identify all the work we need to do for MigraCode's class in April 2024 to run with the new CYF curriculum
+    * Being collected in [a GitHub Milestone](https://github.com/CodeYourFuture/curriculum/milestone/12)
+    * Need to make a parent theme in Hugo, then two child themes which are siblings
+      * Split content into modules, also move around files with Hugo's internationalisation support (which we will not actually be using in the foreseeable future)
+    * We may end up changing some timings things - MigraCode is currently a shorter course, MigraCode currently do two shorter sessions in a week rather than one longer one - not sure how all of these things are going to change, but they're differences we identified.
+    * Audit some content:
+      * Mentions of CYF - remove any that aren't necessary, split any that need re-implementing
+      * Remove mentions of "last week", "next" week, etc - weeks may change
+  * Points of uncertainty for MigraCode to resolve internally:
+    * Goal alignment - right now CYF's goals are around employment and MigraCode's are around graduation - we need to explore how we can align these with MigraCode's parent organisation and funders.
+    * Timings - MigraCode run a shorter course, and more shorter sessions in a week. Need to work out how things will be arranged.
+  * Netlify: It would be useful for MigraCode to get their own Netlify, but they're welcome to share ours until then.
+* Description of CYF Products
+* Need to decide what to do about Fundamentals
+  * What would we lose if we removed it?
+    * Some amount of cohort building
+    * It's a filter in the application process
+    * Trying to instill a culture of shipping things early
+* Blockly doesn't seem to be directly transferring to JS1/2 - something to muse on
+
+### ❗Actions
+
+- [ ] Ali (Carry-over): to put together a proposed ordering of training videos to watch, and arrange a time for discussion.
+- [ ] Ali (Carry-over): Review JS1 & 2 content
+- [ ] Ali: Update meeting reminder bot to happen on Tuesdays not Thursdays
+- [ ] Ali: Find/Make ticket about reworking React
+- [ ] Daniel: Read up on Zsolt's discussion about backend hosting platforms and engage (and also see if he's interested in reworking the full-stack assessment to be more feature-based)
+- [ ] Sally: Share application process details with MigraCode folks
+- [ ] Isar: Triage JS1+JS2 Iteration and Snagging issues - add any needed to the MigraCode milestone
+- [ ] Isar: Get all the relevant MigraCode people to fill in [this form](https://docs.google.com/forms/d/1sp2MTsU0eEAr4HCKXfDPxUXXZROWN8UyHIrDk7dRSJk/edit) to join CYF GitHub teams.
+- [ ] Sally: Provide a repro case for https://github.com/CodeYourFuture/curriculum/issues/222
+- [ ] Ali: Write up a ticket for Sally to document the architecture of the curriculum website
+
+---
+
+## 2023-11-23
+
+Attendees: Ali, Daniel, Ellie Tahmasebi, Isar, Sally
+
+### ❗Actions from last time
+
+- [ ] Ali: Review Sally's JS3 PRs on components and JS1 & 2 content
+- [x] Daniel (Carry-over): Try to write up some general ideas for the portfolio track into the curriculum.
+- [x] Mitch & Daniel (Carry-over): to coordinate on visiting WM in person to support
+- [x] Daniel: (Carry-over) Look through the MigraCode curriculum and understand strengths and gaps
+
+### 📝 Agenda points
+
+#### Meeting timings
+
+* HYF Belgium would like to join us - let's make our meeting earlier so it's easier for them to.
+* Proposal: Tuesday: 18:30 or 19:00, start with planning then move into discussion.
+* Decision: Tuesdays at 18:30.
+
+#### Planning
+
+#### Portfolio module
+
+* We'd like a curriculum module for the portfolio module.
+  * Right now in London 9 things are very ad-hoc.
+  * More formal plans would help both graduates and volunteers know what to do.
+* https://curriculum.codeyourfuture.io/portfolio/ already exists - need to flesh out the content.
+* Created https://github.com/CodeYourFuture/curriculum/discussions/386 to capture insights from currently running modules.
+* London 9 Portfolios feels a bit like a final project because of the build-up to a particular demo.
+  * Ali would rather frame this as "We want you to portfolio-build" not "We want you to complete this project".
+  * Motivation for this was that many attendees weren't taking the project very seriously, weren't committing very much, so this was a way to try to drive motivation.
+    * Maybe this isn't as much of a problem outside of London? But we have post-graduation engagement problems everywhere.
+  * Sally would like shorter, pithier demos - right now demos are really long and drawn out.
+    * We probably need to give workshops about how to give a good demo.
+      * Need to be aware of the goals of different kinds of demos (e.g. "Show off a thing I've done" vs "Show something I've learnt" vs "Show what's useful to a user")
+      * Sally shared a [pitch camp template](https://docs.google.com/document/d/1gfkKPAHNKCdrS3A7nai51iK4gkJcna4B1tOk98ZKCUw/edit).
+  * [Folder of project ideas](https://drive.google.com/drive/folders/1UocnK_dRUkMCuwI6aytZ0Z9a12322EOx)
+
+* What do MigraCode Barcelona do "after" the course?
+  * Historically: Not much, and not enough
+  * Now have a two-month module
+    * Assign each graduate a buddy to have weekly meetings with - work on their linkedin, do practice interviews, etc
+    * Also have events for hackathons, job speed dating, etc.
+
+#### Barcelona trip
+
+* Do we have an agenda? Do we have goals?
+* Dinner on Friday - Isar will share link
+* Class in English on Saturday 10:30 - 14:30 - JS1W3
+  * We're very welcome to TA!
+  * We have a very large office we can use until 17:30
+    * Want to draft a plan for how to merge
+      * Have energy from volunteers to actually merge
+      * Study feasibility of moving to the new curriculum system
+      * Work out how to overcome the language barrier - half of MigraCode trainees don't speak English
+      * Enumerate dependencies on outside tools, e.g. integration with student database, homework setting, etc.
+* Sunday - we'll make a plan.
+* Making sure everyone is in the WhatsApp group - expecting Isar, Carlos, Hugo.
+* Next cohort starts April 2024 - good timing for starting a major change.
+  * Biggest change to plan for is how to make sure class time is well facilitated to make flipped classroom really work well.
+  * Really want the curriculum to be a shared community curriculum - everyone needs to help evolve it forwards together!
+
+#### JS3: Should groups be pairs?
+
+* Yes from the tech-ed side we want pairs
+* Need to check with PD to make sure they don't have plans that rely on larger groups
+
+#### Database module timings
+
+* Daniel proposes moving it to very close to the start of the class
+  * Partially it's a really good framing for problem-solving (e.g. "I need to join before I can select")
+  * Partially because it's a useful skill for people who leave the course early (much more useful than intro to programming)
+  * Partially because SQL has no dependencies on having learnt other things.
+* Sally: Want to have HTML+CSS first because there's a lot of non-technical faffing that goes on (getting people into planners, getting used to a new operating system, etc).
+* We'd still need a "Node + SQL" integration module (but may be a shorter module).
+* Would need to break into:
+  * A SQL module without programming
+  * How to do the Node+SQL integration
+* Does it need to be SQL? Could we do this with spreadsheets?
+  * We could mix different formats, but should definitely culminate in actual SQL.
+
+#### Nonprofit ready training courses
+
+* Ali would like to actually organise this.
+* So he will.
+
+### ❗Actions
+
+- [ ] Put together a "giving demos" workshop
+  - Which maybe involves giving different presentations about the same project with different audiences in mind.
+- [ ] Ellie to capture lessons learnt from the London 10 Portfolio module.
+- [ ] Daniel to put together a discussion thread about moving/splitting SQL module.
+- [ ] Ali to put together a proposed ordering of training videos to watch, and arrange a time for discussion.
+- [ ] Ali to file a ticket about not setting innerHTML
+- [ ] Ali (Carry-over): Review JS1 & 2 content
+
+---
+
 ## 2023-11-09
 
 Attendees: Ali, Sally

diff --git a/...t/guides/contributing/supporters/index.md → ...n/guides/contributing/supporters/index.md b/...t/guides/contributing/supporters/index.md → ...n/guides/contributing/supporters/index.md
diff --git a/...e-a-pull-request/github-branches-view.png → ...e-a-pull-request/github-branches-view.png b/...e-a-pull-request/github-branches-view.png → ...e-a-pull-request/github-branches-view.png
diff --git a/...equest/github-fork-highlight-branches.png → ...equest/github-fork-highlight-branches.png b/...equest/github-fork-highlight-branches.png → ...equest/github-fork-highlight-branches.png
diff --git a/...-a-pull-request/github-fork-main-page.png → ...-a-pull-request/github-fork-main-page.png b/...-a-pull-request/github-fork-main-page.png → ...-a-pull-request/github-fork-main-page.png
diff --git a/...ll-request/highlight-new-pull-request.png → ...ll-request/highlight-new-pull-request.png b/...ll-request/highlight-new-pull-request.png → ...ll-request/highlight-new-pull-request.png
diff --git a/...ent/guides/create-a-pull-request/index.md → .../en/guides/create-a-pull-request/index.md b/...ent/guides/create-a-pull-request/index.md → .../en/guides/create-a-pull-request/index.md
diff --git a/...te-a-pull-request/new-pr-landing-page.png → ...te-a-pull-request/new-pr-landing-page.png b/...te-a-pull-request/new-pr-landing-page.png → ...te-a-pull-request/new-pr-landing-page.png
diff --git a/...a-pull-request/open-pull-request-page.png → ...a-pull-request/open-pull-request-page.png b/...a-pull-request/open-pull-request-page.png → ...a-pull-request/open-pull-request-page.png
diff --git a/...l-request/update-pr-title-description.png → ...l-request/update-pr-title-description.png b/...l-request/update-pr-title-description.png → ...l-request/update-pr-title-description.png
diff --git a/...create-a-pull-request/update-pr-title.png → ...create-a-pull-request/update-pr-title.png b/...create-a-pull-request/update-pr-title.png → ...create-a-pull-request/update-pr-title.png
diff --git a/...pull-request/update-pr-using-template.png → ...pull-request/update-pr-using-template.png b/...pull-request/update-pr-using-template.png → ...pull-request/update-pr-using-template.png
diff --git a/...-app/create-react-app-started-browser.png → ...-app/create-react-app-started-browser.png b/...-app/create-react-app-started-browser.png → ...-app/create-react-app-started-browser.png
diff --git a/...app/create-react-app-started-terminal.png → ...app/create-react-app-started-terminal.png b/...app/create-react-app-started-terminal.png → ...app/create-react-app-started-terminal.png
diff --git a/content/guides/create-a-react-app/index.md → ...ent/en/guides/create-a-react-app/index.md b/content/guides/create-a-react-app/index.md → ...ent/en/guides/create-a-react-app/index.md
diff --git a/content/guides/deployment-netlify/_index.md → ...nt/en/guides/deployment-netlify/_index.md b/content/guides/deployment-netlify/_index.md → ...nt/en/guides/deployment-netlify/_index.md
diff --git a/...ify/another-site/01-netlify-dashboard.png → ...ify/another-site/01-netlify-dashboard.png b/...ify/another-site/01-netlify-dashboard.png → ...ify/another-site/01-netlify-dashboard.png
diff --git a/...nt-netlify/another-site/02-sites-page.png → ...nt-netlify/another-site/02-sites-page.png b/...nt-netlify/another-site/02-sites-page.png → ...nt-netlify/another-site/02-sites-page.png
diff --git a/...-netlify/another-site/03-git-provider.png → ...-netlify/another-site/03-git-provider.png b/...-netlify/another-site/03-git-provider.png → ...-netlify/another-site/03-git-provider.png
diff --git a/...t-netlify/another-site/04-choose-repo.png → ...t-netlify/another-site/04-choose-repo.png b/...t-netlify/another-site/04-choose-repo.png → ...t-netlify/another-site/04-choose-repo.png
diff --git a/...netlify/another-site/05-choose-branch.png → ...netlify/another-site/05-choose-branch.png b/...netlify/another-site/05-choose-branch.png → ...netlify/another-site/05-choose-branch.png
diff --git a/...-netlify/another-site/06-site-is-live.png → ...-netlify/another-site/06-site-is-live.png b/...-netlify/another-site/06-site-is-live.png → ...-netlify/another-site/06-site-is-live.png
diff --git a/.../deployment-netlify/another-site/index.md → .../deployment-netlify/another-site/index.md b/.../deployment-netlify/another-site/index.md → .../deployment-netlify/another-site/index.md
diff --git a/...des/deployment-netlify/common-problems.md → ...des/deployment-netlify/common-problems.md b/...des/deployment-netlify/common-problems.md → ...des/deployment-netlify/common-problems.md
diff --git a/...etlify/first-site/01-netlify-homepage.png → ...etlify/first-site/01-netlify-homepage.png b/...etlify/first-site/01-netlify-homepage.png → ...etlify/first-site/01-netlify-homepage.png
diff --git a/...-netlify/first-site/02-netlify-signup.png → ...-netlify/first-site/02-netlify-signup.png b/...-netlify/first-site/02-netlify-signup.png → ...-netlify/first-site/02-netlify-signup.png
diff --git a/...st-site/03-github-account-permissions.png → ...st-site/03-github-account-permissions.png b/...st-site/03-github-account-permissions.png → ...st-site/03-github-account-permissions.png
diff --git a/...fy/first-site/04-deploy-first-project.png → ...fy/first-site/04-deploy-first-project.png b/...fy/first-site/04-deploy-first-project.png → ...fy/first-site/04-deploy-first-project.png
diff --git a/...nt-netlify/first-site/05-git-provider.png → ...nt-netlify/first-site/05-git-provider.png b/...nt-netlify/first-site/05-git-provider.png → ...nt-netlify/first-site/05-git-provider.png
diff --git a/...st-site/06-github-further-permissions.png → ...st-site/06-github-further-permissions.png b/...st-site/06-github-further-permissions.png → ...st-site/06-github-further-permissions.png
diff --git a/...netlify/first-site/07-install-netlify.png → ...netlify/first-site/07-install-netlify.png b/...netlify/first-site/07-install-netlify.png → ...netlify/first-site/07-install-netlify.png
diff --git a/...ent-netlify/first-site/08-choose-repo.png → ...ent-netlify/first-site/08-choose-repo.png b/...ent-netlify/first-site/08-choose-repo.png → ...ent-netlify/first-site/08-choose-repo.png
diff --git a/...t-netlify/first-site/09-choose-branch.png → ...t-netlify/first-site/09-choose-branch.png b/...t-netlify/first-site/09-choose-branch.png → ...t-netlify/first-site/09-choose-branch.png
diff --git a/...nt-netlify/first-site/10-site-is-live.png → ...nt-netlify/first-site/10-site-is-live.png b/...nt-netlify/first-site/10-site-is-live.png → ...nt-netlify/first-site/10-site-is-live.png
diff --git a/...es/deployment-netlify/first-site/index.md → ...es/deployment-netlify/first-site/index.md b/...es/deployment-netlify/first-site/index.md → ...es/deployment-netlify/first-site/index.md
diff --git a/...fy/renaming-site/01-netlify-dashboard.png → ...fy/renaming-site/01-netlify-dashboard.png b/...fy/renaming-site/01-netlify-dashboard.png → ...fy/renaming-site/01-netlify-dashboard.png
diff --git a/...etlify/renaming-site/02-list-of-sites.png → ...etlify/renaming-site/02-list-of-sites.png b/...etlify/renaming-site/02-list-of-sites.png → ...etlify/renaming-site/02-list-of-sites.png
diff --git a/...etlify/renaming-site/03-site-overview.png → ...etlify/renaming-site/03-site-overview.png b/...etlify/renaming-site/03-site-overview.png → ...etlify/renaming-site/03-site-overview.png
diff --git a/...etlify/renaming-site/04-site-settings.png → ...etlify/renaming-site/04-site-settings.png b/...etlify/renaming-site/04-site-settings.png → ...etlify/renaming-site/04-site-settings.png
diff --git a/...lify/renaming-site/05-site-name-input.png → ...lify/renaming-site/05-site-name-input.png b/...lify/renaming-site/05-site-name-input.png → ...lify/renaming-site/05-site-name-input.png
diff --git a/...deployment-netlify/renaming-site/index.md → ...deployment-netlify/renaming-site/index.md b/...deployment-netlify/renaming-site/index.md → ...deployment-netlify/renaming-site/index.md
diff --git a/...oyment-netlify/site-naming-conventions.md → ...oyment-netlify/site-naming-conventions.md b/...oyment-netlify/site-naming-conventions.md → ...oyment-netlify/site-naming-conventions.md
diff --git a/content/guides/deployment-render/_index.md → ...ent/en/guides/deployment-render/_index.md b/content/guides/deployment-render/_index.md → ...ent/en/guides/deployment-render/_index.md
diff --git a/...er/connecting-a-dbms/connection-error.png → ...er/connecting-a-dbms/connection-error.png b/...er/connecting-a-dbms/connection-error.png → ...er/connecting-a-dbms/connection-error.png
diff --git a/...nnecting-a-dbms/connection-successful.png → ...nnecting-a-dbms/connection-successful.png b/...nnecting-a-dbms/connection-successful.png → ...nnecting-a-dbms/connection-successful.png
diff --git a/...der/connecting-a-dbms/connection-test.png → ...der/connecting-a-dbms/connection-test.png b/...der/connecting-a-dbms/connection-test.png → ...der/connecting-a-dbms/connection-test.png
diff --git a/...nder/connecting-a-dbms/db-credentials.png → ...nder/connecting-a-dbms/db-credentials.png b/...nder/connecting-a-dbms/db-credentials.png → ...nder/connecting-a-dbms/db-credentials.png
diff --git a/...t-render/connecting-a-dbms/db-drivers.png → ...t-render/connecting-a-dbms/db-drivers.png b/...t-render/connecting-a-dbms/db-drivers.png → ...t-render/connecting-a-dbms/db-drivers.png
diff --git a/...loyment-render/connecting-a-dbms/index.md → ...loyment-render/connecting-a-dbms/index.md b/...loyment-render/connecting-a-dbms/index.md → ...loyment-render/connecting-a-dbms/index.md
diff --git a/...nder/connecting-a-dbms/new-connection.png → ...nder/connecting-a-dbms/new-connection.png b/...nder/connecting-a-dbms/new-connection.png → ...nder/connecting-a-dbms/new-connection.png
diff --git a/...er/connecting-a-dbms/render-dashboard.png → ...er/connecting-a-dbms/render-dashboard.png b/...er/connecting-a-dbms/render-dashboard.png → ...er/connecting-a-dbms/render-dashboard.png
diff --git a/.../connecting-a-dbms/selecting-postgres.png → .../connecting-a-dbms/selecting-postgres.png b/.../connecting-a-dbms/selecting-postgres.png → .../connecting-a-dbms/selecting-postgres.png
diff --git a/.../connecting-a-dbms/show-all-databases.png → .../connecting-a-dbms/show-all-databases.png b/.../connecting-a-dbms/show-all-databases.png → .../connecting-a-dbms/show-all-databases.png
diff --git a/...loyment-render/connecting-github/index.md → ...loyment-render/connecting-github/index.md b/...loyment-render/connecting-github/index.md → ...loyment-render/connecting-github/index.md
diff --git a/...connecting-github/sign-in-with-github.png → ...connecting-github/sign-in-with-github.png b/...connecting-github/sign-in-with-github.png → ...connecting-github/sign-in-with-github.png
diff --git a/...ment-render/connecting-github/sign-in.png → ...ment-render/connecting-github/sign-in.png b/...ment-render/connecting-github/sign-in.png → ...ment-render/connecting-github/sign-in.png
diff --git a/...er/connecting-github/sign-up-complete.png → ...er/connecting-github/sign-up-complete.png b/...er/connecting-github/sign-up-complete.png → ...er/connecting-github/sign-up-complete.png
diff --git a/...ecting-github/verification-email-link.png → ...ecting-github/verification-email-link.png b/...ecting-github/verification-email-link.png → ...ecting-github/verification-email-link.png
diff --git a/...ng-github/verification-email-received.png → ...ng-github/verification-email-received.png b/...ng-github/verification-email-received.png → ...ng-github/verification-email-received.png
diff --git a/...ecting-github/verification-email-sent.png → ...ecting-github/verification-email-sent.png b/...ecting-github/verification-email-sent.png → ...ecting-github/verification-email-sent.png
diff --git a/...creating-a-postgres-db/connect-button.png → ...creating-a-postgres-db/connect-button.png b/...creating-a-postgres-db/connect-button.png → ...creating-a-postgres-db/connect-button.png
diff --git a/...reating-a-postgres-db/database-active.png → ...reating-a-postgres-db/database-active.png b/...reating-a-postgres-db/database-active.png → ...reating-a-postgres-db/database-active.png
diff --git a/...ating-a-postgres-db/database-creating.png → ...ating-a-postgres-db/database-creating.png b/...ating-a-postgres-db/database-creating.png → ...ating-a-postgres-db/database-creating.png
diff --git a/.../creating-a-postgres-db/database-name.png → .../creating-a-postgres-db/database-name.png b/.../creating-a-postgres-db/database-name.png → .../creating-a-postgres-db/database-name.png
diff --git a/...g-a-postgres-db/environment-variables.png → ...g-a-postgres-db/environment-variables.png b/...g-a-postgres-db/environment-variables.png → ...g-a-postgres-db/environment-variables.png
diff --git a/...gres-db/free-plan-and-create-database.png → ...gres-db/free-plan-and-create-database.png b/...gres-db/free-plan-and-create-database.png → ...gres-db/free-plan-and-create-database.png
diff --git a/...nt-render/creating-a-postgres-db/index.md → ...nt-render/creating-a-postgres-db/index.md b/...nt-render/creating-a-postgres-db/index.md → ...nt-render/creating-a-postgres-db/index.md
diff --git a/...r/creating-a-postgres-db/new-postgres.png → ...r/creating-a-postgres-db/new-postgres.png b/...r/creating-a-postgres-db/new-postgres.png → ...r/creating-a-postgres-db/new-postgres.png
diff --git a/...der/deploying-server/authorise-render.png → ...der/deploying-server/authorise-render.png b/...der/deploying-server/authorise-render.png → ...der/deploying-server/authorise-render.png
diff --git a/...der/deploying-server/build-successful.jpg → ...der/deploying-server/build-successful.jpg b/...der/deploying-server/build-successful.jpg → ...der/deploying-server/build-successful.jpg
diff --git a/...der/deploying-server/complete-sign-up.png → ...der/deploying-server/complete-sign-up.png b/...der/deploying-server/complete-sign-up.png → ...der/deploying-server/complete-sign-up.png
diff --git a/...-render/deploying-server/connect-repo.jpg → ...-render/deploying-server/connect-repo.jpg b/...-render/deploying-server/connect-repo.jpg → ...-render/deploying-server/connect-repo.jpg
diff --git a/...r/deploying-server/create-web-service.jpg → ...r/deploying-server/create-web-service.jpg b/...r/deploying-server/create-web-service.jpg → ...r/deploying-server/create-web-service.jpg
diff --git a/...deploying-server/dashboard-new-button.png → ...deploying-server/dashboard-new-button.png b/...deploying-server/dashboard-new-button.png → ...deploying-server/dashboard-new-button.png
diff --git a/...ployment-render/deploying-server/index.md → ...ployment-render/deploying-server/index.md b/...ployment-render/deploying-server/index.md → ...ployment-render/deploying-server/index.md
diff --git a/...der/deploying-server/name-web-service.jpg → ...der/deploying-server/name-web-service.jpg b/...der/deploying-server/name-web-service.jpg → ...der/deploying-server/name-web-service.jpg
diff --git a/...nder/deploying-server/new-web-service.jpg → ...nder/deploying-server/new-web-service.jpg b/...nder/deploying-server/new-web-service.jpg → ...nder/deploying-server/new-web-service.jpg
diff --git a/...der/deploying-server/render-dashboard.png → ...der/deploying-server/render-dashboard.png b/...der/deploying-server/render-dashboard.png → ...der/deploying-server/render-dashboard.png
diff --git a/...render/deploying-server/start-command.jpg → ...render/deploying-server/start-command.jpg b/...render/deploying-server/start-command.jpg → ...render/deploying-server/start-command.jpg
diff --git a/...ng-server/url-to-deployed-web-service.jpg → ...ng-server/url-to-deployed-web-service.jpg b/...ng-server/url-to-deployed-web-service.jpg → ...ng-server/url-to-deployed-web-service.jpg
diff --git a/content/guides/intro-to-tests/index.md → content/en/guides/intro-to-tests/index.md b/content/guides/intro-to-tests/index.md → content/en/guides/intro-to-tests/index.md
diff --git a/content/guides/intro-to-tests/test-case.png → ...nt/en/guides/intro-to-tests/test-case.png b/content/guides/intro-to-tests/test-case.png → ...nt/en/guides/intro-to-tests/test-case.png
diff --git a/.../guides/intro-to-tests/test-fail-case.png → .../guides/intro-to-tests/test-fail-case.png b/.../guides/intro-to-tests/test-fail-case.png → .../guides/intro-to-tests/test-fail-case.png
diff --git a/.../guides/intro-to-tests/test-pass-case.png → .../guides/intro-to-tests/test-pass-case.png b/.../guides/intro-to-tests/test-pass-case.png → .../guides/intro-to-tests/test-pass-case.png
diff --git a/content/guides/paradigm/index.md → content/en/guides/paradigm/index.md b/content/guides/paradigm/index.md → content/en/guides/paradigm/index.md
diff --git a/content/html-css/_index.md → content/en/html-css/_index.md b/content/html-css/_index.md → content/en/html-css/_index.md
diff --git a/...l-css/blocks/what-are-components/index.md → ...l-css/blocks/what-are-components/index.md b/...l-css/blocks/what-are-components/index.md → ...l-css/blocks/what-are-components/index.md
diff --git a/...t/html-css/blocks/what-are-forms/index.md → ...n/html-css/blocks/what-are-forms/index.md b/...t/html-css/blocks/what-are-forms/index.md → ...n/html-css/blocks/what-are-forms/index.md
diff --git a/content/html-css/blocks/what-is-css/index.md → ...t/en/html-css/blocks/what-is-css/index.md b/content/html-css/blocks/what-is-css/index.md → ...t/en/html-css/blocks/what-is-css/index.md
diff --git a/...ent/html-css/blocks/what-is-html/index.md → .../en/html-css/blocks/what-is-html/index.md b/...ent/html-css/blocks/what-is-html/index.md → .../en/html-css/blocks/what-is-html/index.md
diff --git a/content/html-css/prep/index.md → content/en/html-css/prep/index.md b/content/html-css/prep/index.md → content/en/html-css/prep/index.md
diff --git a/content/html-css/product/_index.md → content/en/html-css/product/_index.md b/content/html-css/product/_index.md → content/en/html-css/product/_index.md
diff --git a/content/html-css/product/build/index.md → content/en/html-css/product/build/index.md b/content/html-css/product/build/index.md → content/en/html-css/product/build/index.md
diff --git a/content/html-css/product/plan/index.md → content/en/html-css/product/plan/index.md b/content/html-css/product/plan/index.md → content/en/html-css/product/plan/index.md
diff --git a/content/html-css/product/ship/index.md → content/en/html-css/product/ship/index.md b/content/html-css/product/ship/index.md → content/en/html-css/product/ship/index.md
diff --git a/content/html-css/product/test/index.md → content/en/html-css/product/test/index.md b/content/html-css/product/test/index.md → content/en/html-css/product/test/index.md
diff --git a/content/html-css/sprints/1/_index.md → content/en/html-css/sprints/1/_index.md b/content/html-css/sprints/1/_index.md → content/en/html-css/sprints/1/_index.md
diff --git a/content/html-css/sprints/1/backlog/index.md → ...nt/en/html-css/sprints/1/backlog/index.md b/content/html-css/sprints/1/backlog/index.md → ...nt/en/html-css/sprints/1/backlog/index.md
diff --git a/content/html-css/sprints/1/day-plan/index.md → ...t/en/html-css/sprints/1/day-plan/index.md b/content/html-css/sprints/1/day-plan/index.md → ...t/en/html-css/sprints/1/day-plan/index.md
@@ -12,6 +12,7 @@ src="blocks/energiser"
 [[blocks]]
 name="Devtools Workshop"
 src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/devtools"
+time="120"
 [[blocks]]
 name="lunch"
 src="blocks/lunch"

diff --git a/content/html-css/sprints/1/prep/index.md → content/en/html-css/sprints/1/prep/index.md b/content/html-css/sprints/1/prep/index.md → content/en/html-css/sprints/1/prep/index.md
diff --git a/content/html-css/sprints/1/success/index.md → ...nt/en/html-css/sprints/1/success/index.md b/content/html-css/sprints/1/success/index.md → ...nt/en/html-css/sprints/1/success/index.md
diff --git a/content/html-css/sprints/2/_index.md → content/en/html-css/sprints/2/_index.md b/content/html-css/sprints/2/_index.md → content/en/html-css/sprints/2/_index.md
diff --git a/content/html-css/sprints/2/backlog/index.md → ...nt/en/html-css/sprints/2/backlog/index.md b/content/html-css/sprints/2/backlog/index.md → ...nt/en/html-css/sprints/2/backlog/index.md
diff --git a/content/html-css/sprints/2/day-plan/index.md → ...t/en/html-css/sprints/2/day-plan/index.md b/content/html-css/sprints/2/day-plan/index.md → ...t/en/html-css/sprints/2/day-plan/index.md
diff --git a/content/html-css/sprints/2/prep/index.md → content/en/html-css/sprints/2/prep/index.md b/content/html-css/sprints/2/prep/index.md → content/en/html-css/sprints/2/prep/index.md
diff --git a/content/html-css/sprints/2/success/index.md → ...nt/en/html-css/sprints/2/success/index.md b/content/html-css/sprints/2/success/index.md → ...nt/en/html-css/sprints/2/success/index.md
diff --git a/content/html-css/sprints/3/_index.md → content/en/html-css/sprints/3/_index.md b/content/html-css/sprints/3/_index.md → content/en/html-css/sprints/3/_index.md
diff --git a/content/html-css/sprints/3/backlog/index.md → ...nt/en/html-css/sprints/3/backlog/index.md b/content/html-css/sprints/3/backlog/index.md → ...nt/en/html-css/sprints/3/backlog/index.md
diff --git a/content/html-css/sprints/3/day-plan/index.md → ...t/en/html-css/sprints/3/day-plan/index.md b/content/html-css/sprints/3/day-plan/index.md → ...t/en/html-css/sprints/3/day-plan/index.md
diff --git a/content/html-css/sprints/3/prep/index.md → content/en/html-css/sprints/3/prep/index.md b/content/html-css/sprints/3/prep/index.md → content/en/html-css/sprints/3/prep/index.md
diff --git a/content/html-css/sprints/3/success/index.md → ...nt/en/html-css/sprints/3/success/index.md b/content/html-css/sprints/3/success/index.md → ...nt/en/html-css/sprints/3/success/index.md
diff --git a/content/html-css/sprints/4/_index.md → content/en/html-css/sprints/4/_index.md b/content/html-css/sprints/4/_index.md → content/en/html-css/sprints/4/_index.md
diff --git a/content/html-css/sprints/4/backlog/index.md → ...nt/en/html-css/sprints/4/backlog/index.md b/content/html-css/sprints/4/backlog/index.md → ...nt/en/html-css/sprints/4/backlog/index.md
diff --git a/content/html-css/sprints/4/day-plan/index.md → ...t/en/html-css/sprints/4/day-plan/index.md b/content/html-css/sprints/4/day-plan/index.md → ...t/en/html-css/sprints/4/day-plan/index.md
diff --git a/content/html-css/sprints/4/prep/index.md → content/en/html-css/sprints/4/prep/index.md b/content/html-css/sprints/4/prep/index.md → content/en/html-css/sprints/4/prep/index.md
diff --git a/content/html-css/sprints/4/success/index.md → ...nt/en/html-css/sprints/4/success/index.md b/content/html-css/sprints/4/success/index.md → ...nt/en/html-css/sprints/4/success/index.md
diff --git a/content/html-css/success/index.md → content/en/html-css/success/index.md b/content/html-css/success/index.md → content/en/html-css/success/index.md
diff --git a/content/induction/_index.md → content/en/induction/_index.md b/content/induction/_index.md → content/en/induction/_index.md
diff --git a/...on/blocks/check-git-installation/index.md → ...on/blocks/check-git-installation/index.md b/...on/blocks/check-git-installation/index.md → ...on/blocks/check-git-installation/index.md
diff --git a/...nt/induction/blocks/check-github/index.md → ...en/induction/blocks/check-github/index.md b/...nt/induction/blocks/check-github/index.md → ...en/induction/blocks/check-github/index.md
diff --git a/content/induction/blocks/cyf-folder/index.md → ...t/en/induction/blocks/cyf-folder/index.md b/content/induction/blocks/cyf-folder/index.md → ...t/en/induction/blocks/cyf-folder/index.md
diff --git a/...nt/induction/blocks/github-poets/index.md → ...en/induction/blocks/github-poets/index.md b/...nt/induction/blocks/github-poets/index.md → ...en/induction/blocks/github-poets/index.md
diff --git a/content/induction/blocks/github/index.md → content/en/induction/blocks/github/index.md b/content/induction/blocks/github/index.md → content/en/induction/blocks/github/index.md
diff --git a/content/induction/blocks/handshake/index.md → ...nt/en/induction/blocks/handshake/index.md b/content/induction/blocks/handshake/index.md → ...nt/en/induction/blocks/handshake/index.md
diff --git a/.../induction/blocks/install-vscode/index.md → .../induction/blocks/install-vscode/index.md b/.../induction/blocks/install-vscode/index.md → .../induction/blocks/install-vscode/index.md
diff --git a/...ion/blocks/learning-as-community/index.md → ...ion/blocks/learning-as-community/index.md b/...ion/blocks/learning-as-community/index.md → ...ion/blocks/learning-as-community/index.md
diff --git a/content/induction/blocks/next-steps/index.md → ...t/en/induction/blocks/next-steps/index.md b/content/induction/blocks/next-steps/index.md → ...t/en/induction/blocks/next-steps/index.md
diff --git a/content/induction/prep/index.md → content/en/induction/prep/index.md b/content/induction/prep/index.md → content/en/induction/prep/index.md
diff --git a/content/induction/sprints/1/_index.md → content/en/induction/sprints/1/_index.md b/content/induction/sprints/1/_index.md → content/en/induction/sprints/1/_index.md
diff --git a/content/induction/sprints/1/backlog/index.md → ...t/en/induction/sprints/1/backlog/index.md b/content/induction/sprints/1/backlog/index.md → ...t/en/induction/sprints/1/backlog/index.md
diff --git a/...ent/induction/sprints/1/day-plan/index.md → .../en/induction/sprints/1/day-plan/index.md b/...ent/induction/sprints/1/day-plan/index.md → .../en/induction/sprints/1/day-plan/index.md
diff --git a/.../1/prep/commit-history-relative-dates.png → .../1/prep/commit-history-relative-dates.png b/.../1/prep/commit-history-relative-dates.png → .../1/prep/commit-history-relative-dates.png
diff --git a/...duction/sprints/1/prep/commit-history.png → ...duction/sprints/1/prep/commit-history.png b/...duction/sprints/1/prep/commit-history.png → ...duction/sprints/1/prep/commit-history.png
diff --git a/...prints/1/prep/different-blog-versions.png → ...prints/1/prep/different-blog-versions.png b/...prints/1/prep/different-blog-versions.png → ...prints/1/prep/different-blog-versions.png
diff --git a/...sprints/1/prep/fork-and-clone-diagram.png → ...sprints/1/prep/fork-and-clone-diagram.png b/...sprints/1/prep/fork-and-clone-diagram.png → ...sprints/1/prep/fork-and-clone-diagram.png
diff --git a/...n/sprints/1/prep/highlight-2nd-commit.png → ...n/sprints/1/prep/highlight-2nd-commit.png b/...n/sprints/1/prep/highlight-2nd-commit.png → ...n/sprints/1/prep/highlight-2nd-commit.png
diff --git a/content/induction/sprints/1/prep/index.md → content/en/induction/sprints/1/prep/index.md b/content/induction/sprints/1/prep/index.md → content/en/induction/sprints/1/prep/index.md
diff --git a/...nts/1/prep/lesson1-forked-url-anatomy.png → ...nts/1/prep/lesson1-forked-url-anatomy.png b/...nts/1/prep/lesson1-forked-url-anatomy.png → ...nts/1/prep/lesson1-forked-url-anatomy.png
diff --git a/...ints/1/prep/lesson1-four-repo-diagram.png → ...ints/1/prep/lesson1-four-repo-diagram.png b/...ints/1/prep/lesson1-four-repo-diagram.png → ...ints/1/prep/lesson1-four-repo-diagram.png
diff --git a/...nts/1/prep/lesson1-github-url-anatomy.png → ...nts/1/prep/lesson1-github-url-anatomy.png b/...nts/1/prep/lesson1-github-url-anatomy.png → ...nts/1/prep/lesson1-github-url-anatomy.png
diff --git a/...prints/1/prep/main-branch-highlighted.png → ...prints/1/prep/main-branch-highlighted.png b/...prints/1/prep/main-branch-highlighted.png → ...prints/1/prep/main-branch-highlighted.png
diff --git a/content/induction/sprints/1/success/index.md → ...t/en/induction/sprints/1/success/index.md b/content/induction/sprints/1/success/index.md → ...t/en/induction/sprints/1/success/index.md
diff --git a/content/induction/success/index.md → content/en/induction/success/index.md b/content/induction/success/index.md → content/en/induction/success/index.md
diff --git a/content/js1/_index.md → content/en/js1/_index.md b/content/js1/_index.md → content/en/js1/_index.md
diff --git a/content/js1/blocks/api/index.md → content/en/js1/blocks/api/index.md b/content/js1/blocks/api/index.md → content/en/js1/blocks/api/index.md
diff --git a/content/js1/blocks/assembly/index.md → content/en/js1/blocks/assembly/index.md b/content/js1/blocks/assembly/index.md → content/en/js1/blocks/assembly/index.md
diff --git a/content/js1/blocks/assertions/index.md → content/en/js1/blocks/assertions/index.md b/content/js1/blocks/assertions/index.md → content/en/js1/blocks/assertions/index.md
diff --git a/content/js1/blocks/cases/index.md → content/en/js1/blocks/cases/index.md b/content/js1/blocks/cases/index.md → content/en/js1/blocks/cases/index.md
diff --git a/content/js1/blocks/check-unix-os/index.md → content/en/js1/blocks/check-unix-os/index.md b/content/js1/blocks/check-unix-os/index.md → content/en/js1/blocks/check-unix-os/index.md
diff --git a/content/js1/blocks/clocks/index.md → content/en/js1/blocks/clocks/index.md b/content/js1/blocks/clocks/index.md → content/en/js1/blocks/clocks/index.md
diff --git a/content/js1/blocks/comparison/index.md → content/en/js1/blocks/comparison/index.md b/content/js1/blocks/comparison/index.md → content/en/js1/blocks/comparison/index.md
diff --git a/content/js1/blocks/conditionality/index.md → ...ent/en/js1/blocks/conditionality/index.md b/content/js1/blocks/conditionality/index.md → ...ent/en/js1/blocks/conditionality/index.md
diff --git a/content/js1/blocks/data/index.md → content/en/js1/blocks/data/index.md b/content/js1/blocks/data/index.md → content/en/js1/blocks/data/index.md
diff --git a/...1/blocks/declarations-statements/index.md → ...1/blocks/declarations-statements/index.md b/...1/blocks/declarations-statements/index.md → ...1/blocks/declarations-statements/index.md
diff --git a/...t/js1/blocks/declaring-functions/index.md → ...n/js1/blocks/declaring-functions/index.md b/...t/js1/blocks/declaring-functions/index.md → ...n/js1/blocks/declaring-functions/index.md
diff --git a/.../js1/blocks/declaring-functions/round.gif → .../js1/blocks/declaring-functions/round.gif b/.../js1/blocks/declaring-functions/round.gif → .../js1/blocks/declaring-functions/round.gif
diff --git a/content/js1/blocks/errors/index.md → content/en/js1/blocks/errors/index.md b/content/js1/blocks/errors/index.md → content/en/js1/blocks/errors/index.md
diff --git a/content/js1/blocks/feedback/index.md → content/en/js1/blocks/feedback/index.md b/content/js1/blocks/feedback/index.md → content/en/js1/blocks/feedback/index.md
diff --git a/...s1/blocks/feedback/test-feedback-fail.png → ...s1/blocks/feedback/test-feedback-fail.png b/...s1/blocks/feedback/test-feedback-fail.png → ...s1/blocks/feedback/test-feedback-fail.png
diff --git a/.../blocks/feedback/test-reference-error.png → .../blocks/feedback/test-reference-error.png b/.../blocks/feedback/test-reference-error.png → .../blocks/feedback/test-reference-error.png
diff --git a/content/js1/blocks/framework/index.md → content/en/js1/blocks/framework/index.md b/content/js1/blocks/framework/index.md → content/en/js1/blocks/framework/index.md
diff --git a/content/js1/blocks/functions/index.md → content/en/js1/blocks/functions/index.md b/content/js1/blocks/functions/index.md → content/en/js1/blocks/functions/index.md
diff --git a/content/js1/blocks/functions/round.gif → content/en/js1/blocks/functions/round.gif b/content/js1/blocks/functions/round.gif → content/en/js1/blocks/functions/round.gif
diff --git a/content/js1/blocks/generalise/index.md → content/en/js1/blocks/generalise/index.md b/content/js1/blocks/generalise/index.md → content/en/js1/blocks/generalise/index.md
diff --git a/...s1/blocks/generalise/second-case-fail.png → ...s1/blocks/generalise/second-case-fail.png b/...s1/blocks/generalise/second-case-fail.png → ...s1/blocks/generalise/second-case-fail.png
diff --git a/content/js1/blocks/improving/index.md → content/en/js1/blocks/improving/index.md b/content/js1/blocks/improving/index.md → content/en/js1/blocks/improving/index.md
diff --git a/content/js1/blocks/install-node/index.md → content/en/js1/blocks/install-node/index.md b/content/js1/blocks/install-node/index.md → content/en/js1/blocks/install-node/index.md
diff --git a/content/js1/blocks/installing/index.md → content/en/js1/blocks/installing/index.md b/content/js1/blocks/installing/index.md → content/en/js1/blocks/installing/index.md
diff --git a/...nt/js1/blocks/installing/jest-install.png → ...en/js1/blocks/installing/jest-install.png b/...nt/js1/blocks/installing/jest-install.png → ...en/js1/blocks/installing/jest-install.png
diff --git a/content/js1/blocks/interface/index.md → content/en/js1/blocks/interface/index.md b/content/js1/blocks/interface/index.md → content/en/js1/blocks/interface/index.md
diff --git a/content/js1/blocks/logging/index.md → content/en/js1/blocks/logging/index.md b/content/js1/blocks/logging/index.md → content/en/js1/blocks/logging/index.md
diff --git a/content/js1/blocks/ordinal/index.md → content/en/js1/blocks/ordinal/index.md b/content/js1/blocks/ordinal/index.md → content/en/js1/blocks/ordinal/index.md
diff --git a/content/js1/blocks/outliers/index.md → content/en/js1/blocks/outliers/index.md b/content/js1/blocks/outliers/index.md → content/en/js1/blocks/outliers/index.md
diff --git a/.../js1/blocks/outliers/second-case-fail.png → .../js1/blocks/outliers/second-case-fail.png b/.../js1/blocks/outliers/second-case-fail.png → .../js1/blocks/outliers/second-case-fail.png
diff --git a/content/js1/blocks/packages/index.md → content/en/js1/blocks/packages/index.md b/content/js1/blocks/packages/index.md → content/en/js1/blocks/packages/index.md
diff --git a/content/js1/blocks/parameters/index.md → content/en/js1/blocks/parameters/index.md b/content/js1/blocks/parameters/index.md → content/en/js1/blocks/parameters/index.md
diff --git a/content/js1/blocks/percentages/index.md → content/en/js1/blocks/percentages/index.md b/content/js1/blocks/percentages/index.md → content/en/js1/blocks/percentages/index.md
diff --git a/.../blocks/playing-computer/global-frame.png → .../blocks/playing-computer/global-frame.png b/.../blocks/playing-computer/global-frame.png → .../blocks/playing-computer/global-frame.png
diff --git a/content/js1/blocks/playing-computer/index.md → ...t/en/js1/blocks/playing-computer/index.md b/content/js1/blocks/playing-computer/index.md → ...t/en/js1/blocks/playing-computer/index.md
diff --git a/.../playing-computer/make-greeting-frame.png → .../playing-computer/make-greeting-frame.png b/.../playing-computer/make-greeting-frame.png → .../playing-computer/make-greeting-frame.png
diff --git a/...ks/playing-computer/runtime-diagram-1.png → ...ks/playing-computer/runtime-diagram-1.png b/...ks/playing-computer/runtime-diagram-1.png → ...ks/playing-computer/runtime-diagram-1.png
diff --git a/content/js1/blocks/repl/index.md → content/en/js1/blocks/repl/index.md b/content/js1/blocks/repl/index.md → content/en/js1/blocks/repl/index.md