Merge remote-tracking branch 'origin/main' into update-deployment-sec…

…tion * origin/main: (26 commits) fix objective indexing restore js3 prep workshops making site run again now modules are being consumed correctly (CodeYourFuture#541) Feature: replace labs again (CodeYourFuture#540) Update: move netlify tooling (CodeYourFuture#539) feature; stage 2: mounting this repo as modules (CodeYourFuture#538) Feature: stage 1: port labs (CodeYourFuture#537) Feature: Daniel's tooling for local module replacements (CodeYourFuture#535) Update style of the hamburger menu (CodeYourFuture#478) (CodeYourFuture#528) Update content/en/js3/success/index.md Update content/en/js3/success/index.md add step->prep workshops for JS2 & JS3 Add minutes archetypes for all required module views (CodeYourFuture#529) add major change warning (CodeYourFuture#527) parametrize createFilmCard with template (CodeYourFuture#524) link to the module js3 project reference the module js3 project success criteria in the js3 module success page Update index adding PD success.md (CodeYourFuture#518) Update index Prep DB/SQL S4 PD.md (CodeYourFuture#511) ...
sztupy · Jan 25, 2024 · 3d86c97 · 3d86c97
2 parents 522df48 + a2a507b
commit 3d86c97
Show file tree

Hide file tree

Showing 896 changed files with 3,356 additions and 1,085 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,3 +1,7 @@
+# WARNING MAJOR STRUCTURAL CHANGE IN PROGRESS 12 JAN 2024
+
+Hello contributor! In between you opening this PR and you merging it, you may find a large conflict appears. This is because this site will be broken down into Hugo modules in the same way CodeYourFuture/curriculum-labs is currently structured. The platform (features) will move into the common-theme module and the content (text) will move into the common-content module. The pages will move into the organisation directory. (org-cyf for CYF and org-mcb for MigraCode) You will need to find the new location of your content and move it there. If you are unsure, please ask in the comment thread of this ticket.
+
 ## What does this change?
 
 Module:

diff --git a/.github/workflows/check-consistency.yml b/.github/workflows/check-consistency.yml
@@ -0,0 +1,19 @@
+name: Check consistency
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.21
+      - name: Build tooling
+        run: (cd tooling/go && go build ./cmd/local-overrides-enforcer)
+      - name: Check consistency
+        run: ./tooling/go/local-overrides-enforcer
diff --git a/.github/workflows/test-tooling.yml b/.github/workflows/test-tooling.yml
@@ -0,0 +1,17 @@
+name: Test tooling
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.21
+      - name: Run tooling tests
+        run: cd tooling/go && go test ./...
diff --git a/layouts/shortcodes/limit.html → CITATION.cff b/layouts/shortcodes/limit.html → CITATION.cff
diff --git a/README.md b/README.md
diff --git a/archetypes/default.md b/archetypes/default.md
diff --git a/content/en/blocks/afternoon-break/index.md → ...ontent/en/blocks/afternoon-break/index.md b/content/en/blocks/afternoon-break/index.md → ...ontent/en/blocks/afternoon-break/index.md
diff --git a/content/en/blocks/backlog/index.md → common-content/en/blocks/backlog/index.md b/content/en/blocks/backlog/index.md → common-content/en/blocks/backlog/index.md
diff --git a/content/en/blocks/blockers/index.md → common-content/en/blocks/blockers/index.md b/content/en/blocks/blockers/index.md → common-content/en/blocks/blockers/index.md
diff --git a/content/en/blocks/coding-101/index.md → common-content/en/blocks/coding-101/index.md b/content/en/blocks/coding-101/index.md → common-content/en/blocks/coding-101/index.md
diff --git a/content/en/blocks/coursework/index.md → common-content/en/blocks/coursework/index.md b/content/en/blocks/coursework/index.md → common-content/en/blocks/coursework/index.md
diff --git a/content/en/blocks/energiser/index.md → common-content/en/blocks/energiser/index.md b/content/en/blocks/energiser/index.md → common-content/en/blocks/energiser/index.md
diff --git a/content/en/blocks/kata/index.md → common-content/en/blocks/kata/index.md b/content/en/blocks/kata/index.md → common-content/en/blocks/kata/index.md
diff --git a/content/en/blocks/lunch/index.md → common-content/en/blocks/lunch/index.md b/content/en/blocks/lunch/index.md → common-content/en/blocks/lunch/index.md
diff --git a/content/en/blocks/morning-break/index.md → ...-content/en/blocks/morning-break/index.md b/content/en/blocks/morning-break/index.md → ...-content/en/blocks/morning-break/index.md
diff --git a/content/en/blocks/pd-placeholder/index.md → ...content/en/blocks/pd-placeholder/index.md b/content/en/blocks/pd-placeholder/index.md → ...content/en/blocks/pd-placeholder/index.md
diff --git a/content/en/snippets/requirements.md → ...n-content/en/blocks/requirements/index.md b/content/en/snippets/requirements.md → ...n-content/en/blocks/requirements/index.md
@@ -1,3 +1,17 @@
++++
+title = 'Understanding Requirements'
+headless = true
+time = 20
+facilitation = false
+vocabulary=["Requirements", "User Stories"]
+emoji= '🧩'
+[objectives]
+1='Identify described requirements'
+    2='Identify extra requirements from your own experience'
+    3='Resolve trade-offs in conflicting requirements'
+    4='Translate requirements into high-level design outlines'
++++
+
 Communication is _hard_. Today, let’s explore some ways we communicate with each other in software development. It’s not enough to draw a picture of a website and assume the other person will build what you imagine. It’s never a good idea to assume shared context or shared interpretations.
 
 So how do we understand what to do? By understanding **requirements**.
@@ -17,9 +31,3 @@ We're going to think about a few projects and discover some requirements. This i
 {{<note type="tip" title="Remember" >}}
 To make great software, we need to think about people, not just code.
 {{</note>}}
-
-### User Stories
-
-We can discover requirements with something called 'User Stories'. The simplest user story looks like this:
-
-> As a [type of user], I can [achieve some goal].
diff --git a/content/en/blocks/retro/index.md → common-content/en/blocks/retro/index.md b/content/en/blocks/retro/index.md → common-content/en/blocks/retro/index.md
diff --git a/content/en/blocks/search-terms/index.md → ...n-content/en/blocks/search-terms/index.md b/content/en/blocks/search-terms/index.md → ...n-content/en/blocks/search-terms/index.md
diff --git a/content/en/blocks/spaced-repetition/index.md → ...tent/en/blocks/spaced-repetition/index.md b/content/en/blocks/spaced-repetition/index.md → ...tent/en/blocks/spaced-repetition/index.md
diff --git a/content/en/blocks/study-45/index.md → common-content/en/blocks/study-45/index.md b/content/en/blocks/study-45/index.md → common-content/en/blocks/study-45/index.md
diff --git a/content/en/blocks/study-60/index.md → common-content/en/blocks/study-60/index.md b/content/en/blocks/study-60/index.md → common-content/en/blocks/study-60/index.md
diff --git a/content/en/blocks/study-90/index.md → common-content/en/blocks/study-90/index.md b/content/en/blocks/study-90/index.md → common-content/en/blocks/study-90/index.md
diff --git a/content/en/blocks/study-group/index.md → ...on-content/en/blocks/study-group/index.md b/content/en/blocks/study-group/index.md → ...on-content/en/blocks/study-group/index.md
diff --git a/content/en/blocks/success-criteria/index.md → ...ntent/en/blocks/success-criteria/index.md b/content/en/blocks/success-criteria/index.md → ...ntent/en/blocks/success-criteria/index.md
diff --git a/content/en/blocks/telephone/index.md → common-content/en/blocks/telephone/index.md b/content/en/blocks/telephone/index.md → common-content/en/blocks/telephone/index.md
diff --git a/content/en/blocks/useful-links/index.md → ...n-content/en/blocks/useful-links/index.md b/content/en/blocks/useful-links/index.md → ...n-content/en/blocks/useful-links/index.md
diff --git a/content/en/blocks/user-stories/index.md → ...n-content/en/blocks/user-stories/index.md b/content/en/blocks/user-stories/index.md → ...n-content/en/blocks/user-stories/index.md
@@ -12,8 +12,6 @@ emoji= '🧩'
     4='Translate requirements into high-level design outlines'
 +++
 
-{{< snippet "snippets/requirements.md" >}}
-
 #### Imagine a coursework tracker
 
 As trainees, you have coursework to do. Imagine a website which tracks how coursework is going for you all. Thinking about that website, some user stories could be:

diff --git a/content/en/blocks/wordle/index.md → common-content/en/blocks/wordle/index.md b/content/en/blocks/wordle/index.md → common-content/en/blocks/wordle/index.md
diff --git a/...ses/blocks/communicating-with-db/index.md → .../databases/communicating-with-db/index.md b/...ses/blocks/communicating-with-db/index.md → .../databases/communicating-with-db/index.md
diff --git a/...atabases/blocks/creating-a-table/index.md → ...odule/databases/creating-a-table/index.md b/...atabases/blocks/creating-a-table/index.md → ...odule/databases/creating-a-table/index.md
diff --git a/content/en/databases/blocks/crud/crud.png → ...content/en/module/databases/crud/crud.png b/content/en/databases/blocks/crud/crud.png → ...content/en/module/databases/crud/crud.png
diff --git a/content/en/databases/blocks/crud/index.md → ...content/en/module/databases/crud/index.md b/content/en/databases/blocks/crud/index.md → ...content/en/module/databases/crud/index.md
diff --git a/...n/databases/blocks/defining-keys/index.md → ...n/module/databases/defining-keys/index.md b/...n/databases/blocks/defining-keys/index.md → ...n/module/databases/defining-keys/index.md
diff --git a/...ses/blocks/integration-with-node/index.md → .../databases/integration-with-node/index.md b/...ses/blocks/integration-with-node/index.md → .../databases/integration-with-node/index.md
diff --git a/...abases/blocks/introduction-to-db/index.md → ...ule/databases/introduction-to-db/index.md b/...abases/blocks/introduction-to-db/index.md → ...ule/databases/introduction-to-db/index.md
diff --git a/...locks/introduction-to-postgresql/index.md → ...bases/introduction-to-postgresql/index.md b/...locks/introduction-to-postgresql/index.md → ...bases/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 → .../module/databases/joining-tables/index.md b/.../databases/blocks/joining-tables/index.md → .../module/databases/joining-tables/index.md
diff --git a/...es/blocks/joining-tables/join-diagram.png → ...databases/joining-tables/join-diagram.png b/...es/blocks/joining-tables/join-diagram.png → ...databases/joining-tables/join-diagram.png
diff --git a/.../databases/blocks/more-selective/index.md → .../module/databases/more-selective/index.md b/.../databases/blocks/more-selective/index.md → .../module/databases/more-selective/index.md
diff --git a/...t/en/databases/blocks/recap-node/index.md → ...t/en/module/databases/recap-node/index.md b/...t/en/databases/blocks/recap-node/index.md → ...t/en/module/databases/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 → ...bases/recap-node/postman-get-cust-all.odg b/...locks/recap-node/postman-get-cust-all.odg → ...bases/recap-node/postman-get-cust-all.odg
diff --git a/...locks/recap-node/postman-get-cust-all.png → ...bases/recap-node/postman-get-cust-all.png b/...locks/recap-node/postman-get-cust-all.png → ...bases/recap-node/postman-get-cust-all.png
diff --git a/...n/databases/blocks/updating-rows/index.md → ...n/module/databases/updating-rows/index.md b/...n/databases/blocks/updating-rows/index.md → ...n/module/databases/updating-rows/index.md
diff --git a/...blocks/using-aggregate-functions/index.md → ...abases/using-aggregate-functions/index.md b/...blocks/using-aggregate-functions/index.md → ...abases/using-aggregate-functions/index.md
diff --git a/.../en/fundamentals/blocks/blockers/index.md → .../en/module/fundamentals/blockers/index.md b/.../en/fundamentals/blocks/blockers/index.md → .../en/module/fundamentals/blockers/index.md
diff --git a/...fundamentals/blocks/code-dot-org/index.md → ...module/fundamentals/code-dot-org/index.md b/...fundamentals/blocks/code-dot-org/index.md → ...module/fundamentals/code-dot-org/index.md
diff --git a/...tals/blocks/cyf-blocks-iteration/index.md → ...undamentals/cyf-blocks-iteration/index.md b/...tals/blocks/cyf-blocks-iteration/index.md → ...undamentals/cyf-blocks-iteration/index.md
diff --git a/...s/blocks/cyf-blocks-requirements/index.md → ...amentals/cyf-blocks-requirements/index.md b/...s/blocks/cyf-blocks-requirements/index.md → ...amentals/cyf-blocks-requirements/index.md
diff --git a/...ent/en/fundamentals/blocks/goals/index.md → ...ent/en/module/fundamentals/goals/index.md b/...ent/en/fundamentals/blocks/goals/index.md → ...ent/en/module/fundamentals/goals/index.md
diff --git a/content/en/fundamentals/blocks/mvp/index.md → ...ntent/en/module/fundamentals/mvp/index.md b/content/en/fundamentals/blocks/mvp/index.md → ...ntent/en/module/fundamentals/mvp/index.md
diff --git a/...n/fundamentals/blocks/next-steps/index.md → ...n/module/fundamentals/next-steps/index.md b/...n/fundamentals/blocks/next-steps/index.md → ...n/module/fundamentals/next-steps/index.md
diff --git a/...ntals/blocks/overcoming-blockers/index.md → ...fundamentals/overcoming-blockers/index.md b/...ntals/blocks/overcoming-blockers/index.md → ...fundamentals/overcoming-blockers/index.md
diff --git a/...t/en/fundamentals/blocks/pairing/index.md → ...t/en/module/fundamentals/pairing/index.md b/...t/en/fundamentals/blocks/pairing/index.md → ...t/en/module/fundamentals/pairing/index.md
diff --git a/...amentals/blocks/ship-it-delivery/index.md → ...le/fundamentals/ship-it-delivery/index.md b/...amentals/blocks/ship-it-delivery/index.md → ...le/fundamentals/ship-it-delivery/index.md
diff --git a/...mentals/blocks/ship-it-iteration/index.md → ...e/fundamentals/ship-it-iteration/index.md b/...mentals/blocks/ship-it-iteration/index.md → ...e/fundamentals/ship-it-iteration/index.md
diff --git a/...tals/blocks/ship-it-requirements/index.md → ...undamentals/ship-it-requirements/index.md b/...tals/blocks/ship-it-requirements/index.md → ...undamentals/ship-it-requirements/index.md
diff --git a/...tals/blocks/using-the-curriculum/index.md → ...undamentals/using-the-curriculum/index.md b/...tals/blocks/using-the-curriculum/index.md → ...undamentals/using-the-curriculum/index.md
diff --git a/...t/en/fundamentals/blocks/wrap-up/index.md → ...t/en/module/fundamentals/wrap-up/index.md b/...t/en/fundamentals/blocks/wrap-up/index.md → ...t/en/module/fundamentals/wrap-up/index.md
diff --git a/...l-css/blocks/what-are-components/index.md → ...ule/html-css/what-are-components/index.md b/...l-css/blocks/what-are-components/index.md → ...ule/html-css/what-are-components/index.md
diff --git a/...n/html-css/blocks/what-are-forms/index.md → ...n/module/html-css/what-are-forms/index.md b/...n/html-css/blocks/what-are-forms/index.md → ...n/module/html-css/what-are-forms/index.md
diff --git a/...t/en/html-css/blocks/what-is-css/index.md → ...t/en/module/html-css/what-is-css/index.md b/...t/en/html-css/blocks/what-is-css/index.md → ...t/en/module/html-css/what-is-css/index.md
diff --git a/.../en/html-css/blocks/what-is-html/index.md → .../en/module/html-css/what-is-html/index.md b/.../en/html-css/blocks/what-is-html/index.md → .../en/module/html-css/what-is-html/index.md
diff --git a/...ction/blocks/branching/commit-history.png → ...le/induction/branching/commit-history.png b/...ction/blocks/branching/commit-history.png → ...le/induction/branching/commit-history.png
diff --git a/...blocks/branching/highlight-2nd-commit.png → ...uction/branching/highlight-2nd-commit.png b/...blocks/branching/highlight-2nd-commit.png → ...uction/branching/highlight-2nd-commit.png
diff --git a/...nt/en/induction/blocks/branching/index.md → ...nt/en/module/induction/branching/index.md b/...nt/en/induction/blocks/branching/index.md → ...nt/en/module/induction/branching/index.md
diff --git a/...s/branching/lesson1-four-repo-diagram.png → ...n/branching/lesson1-four-repo-diagram.png b/...s/branching/lesson1-four-repo-diagram.png → ...n/branching/lesson1-four-repo-diagram.png
diff --git a/...cks/branching/main-branch-highlighted.png → ...ion/branching/main-branch-highlighted.png b/...cks/branching/main-branch-highlighted.png → ...ion/branching/main-branch-highlighted.png
diff --git a/...on/blocks/check-git-installation/index.md → ...induction/check-git-installation/index.md b/...on/blocks/check-git-installation/index.md → ...induction/check-git-installation/index.md
diff --git a/...en/induction/blocks/check-github/index.md → ...en/module/induction/check-github/index.md b/...en/induction/blocks/check-github/index.md → ...en/module/induction/check-github/index.md
diff --git a/...uction/blocks/check-out-a-commit/index.md → ...ule/induction/check-out-a-commit/index.md b/...uction/blocks/check-out-a-commit/index.md → ...ule/induction/check-out-a-commit/index.md
diff --git a/...ent/en/induction/blocks/cyf-blog/index.md → ...ent/en/module/induction/cyf-blog/index.md b/...ent/en/induction/blocks/cyf-blog/index.md → ...ent/en/module/induction/cyf-blog/index.md
diff --git a/...t/en/induction/blocks/cyf-folder/index.md → ...t/en/module/induction/cyf-folder/index.md b/...t/en/induction/blocks/cyf-folder/index.md → ...t/en/module/induction/cyf-folder/index.md
diff --git a/...pment-process/different-blog-versions.png → ...pment-process/different-blog-versions.png b/...pment-process/different-blog-versions.png → ...pment-process/different-blog-versions.png
diff --git a/...ction/blocks/development-process/index.md → ...le/induction/development-process/index.md b/...ction/blocks/development-process/index.md → ...le/induction/development-process/index.md
diff --git a/...tion/blocks/forking-a-repository/index.md → ...e/induction/forking-a-repository/index.md b/...tion/blocks/forking-a-repository/index.md → ...e/induction/forking-a-repository/index.md
diff --git a/...repository/lesson1-forked-url-anatomy.png → ...repository/lesson1-forked-url-anatomy.png b/...repository/lesson1-forked-url-anatomy.png → ...repository/lesson1-forked-url-anatomy.png
diff --git a/...repository/lesson1-github-url-anatomy.png → ...repository/lesson1-github-url-anatomy.png b/...repository/lesson1-github-url-anatomy.png → ...repository/lesson1-github-url-anatomy.png
diff --git a/...en/induction/blocks/github-poets/index.md → ...en/module/induction/github-poets/index.md b/...en/induction/blocks/github-poets/index.md → ...en/module/induction/github-poets/index.md
diff --git a/content/en/induction/blocks/github/index.md → ...ntent/en/module/induction/github/index.md b/content/en/induction/blocks/github/index.md → ...ntent/en/module/induction/github/index.md
diff --git a/...nt/en/induction/blocks/handshake/index.md → ...nt/en/module/induction/handshake/index.md b/...nt/en/induction/blocks/handshake/index.md → ...nt/en/module/induction/handshake/index.md
diff --git a/.../induction/blocks/install-vscode/index.md → .../module/induction/install-vscode/index.md b/.../induction/blocks/install-vscode/index.md → .../module/induction/install-vscode/index.md
diff --git a/...ion/blocks/learning-as-community/index.md → .../induction/learning-as-community/index.md b/...ion/blocks/learning-as-community/index.md → .../induction/learning-as-community/index.md
diff --git a/...t/en/induction/blocks/next-steps/index.md → ...t/en/module/induction/next-steps/index.md b/...t/en/induction/blocks/next-steps/index.md → ...t/en/module/induction/next-steps/index.md
diff --git a/...duction/blocks/previous-versions/index.md → ...dule/induction/previous-versions/index.md b/...duction/blocks/previous-versions/index.md → ...dule/induction/previous-versions/index.md
diff --git a/...induction/blocks/sharing-history/index.md → ...module/induction/sharing-history/index.md b/...induction/blocks/sharing-history/index.md → ...module/induction/sharing-history/index.md
diff --git a/...control/commit-history-relative-dates.png → ...control/commit-history-relative-dates.png b/...control/commit-history-relative-dates.png → ...control/commit-history-relative-dates.png
diff --git a/...induction/blocks/version-control/index.md → ...module/induction/version-control/index.md b/...induction/blocks/version-control/index.md → ...module/induction/version-control/index.md
diff --git a/.../viewing-files/fork-and-clone-diagram.png → .../viewing-files/fork-and-clone-diagram.png b/.../viewing-files/fork-and-clone-diagram.png → .../viewing-files/fork-and-clone-diagram.png
diff --git a/...n/induction/blocks/viewing-files/index.md → ...n/module/induction/viewing-files/index.md b/...n/induction/blocks/viewing-files/index.md → ...n/module/induction/viewing-files/index.md
diff --git a/...induction/blocks/working-locally/index.md → ...module/induction/working-locally/index.md b/...induction/blocks/working-locally/index.md → ...module/induction/working-locally/index.md
diff --git a/.../en/induction/blocks/wrapping-up/index.md → .../en/module/induction/wrapping-up/index.md b/.../en/induction/blocks/wrapping-up/index.md → .../en/module/induction/wrapping-up/index.md
diff --git a/content/en/js1/blocks/api/index.md → common-content/en/module/js1/api/index.md b/content/en/js1/blocks/api/index.md → common-content/en/module/js1/api/index.md
diff --git a/content/en/js1/blocks/assembly/index.md → ...n-content/en/module/js1/assembly/index.md b/content/en/js1/blocks/assembly/index.md → ...n-content/en/module/js1/assembly/index.md
diff --git a/content/en/js1/blocks/assertions/index.md → ...content/en/module/js1/assertions/index.md b/content/en/js1/blocks/assertions/index.md → ...content/en/module/js1/assertions/index.md
diff --git a/content/en/js1/blocks/cases/index.md → common-content/en/module/js1/cases/index.md b/content/en/js1/blocks/cases/index.md → common-content/en/module/js1/cases/index.md
diff --git a/content/en/js1/blocks/check-unix-os/index.md → ...tent/en/module/js1/check-unix-os/index.md b/content/en/js1/blocks/check-unix-os/index.md → ...tent/en/module/js1/check-unix-os/index.md
diff --git a/content/en/js1/blocks/clocks/index.md → common-content/en/module/js1/clocks/index.md b/content/en/js1/blocks/clocks/index.md → common-content/en/module/js1/clocks/index.md
diff --git a/content/en/js1/blocks/comparison/index.md → ...content/en/module/js1/comparison/index.md b/content/en/js1/blocks/comparison/index.md → ...content/en/module/js1/comparison/index.md
diff --git a/...ent/en/js1/blocks/conditionality/index.md → ...ent/en/module/js1/conditionality/index.md b/...ent/en/js1/blocks/conditionality/index.md → ...ent/en/module/js1/conditionality/index.md
diff --git a/content/en/js1/blocks/data/index.md → common-content/en/module/js1/data/index.md b/content/en/js1/blocks/data/index.md → common-content/en/module/js1/data/index.md
diff --git a/...1/blocks/declarations-statements/index.md → ...dule/js1/declarations-statements/index.md b/...1/blocks/declarations-statements/index.md → ...dule/js1/declarations-statements/index.md
diff --git a/...n/js1/blocks/declaring-functions/index.md → ...n/module/js1/declaring-functions/index.md b/...n/js1/blocks/declaring-functions/index.md → ...n/module/js1/declaring-functions/index.md
diff --git a/.../js1/blocks/declaring-functions/round.gif → .../module/js1/declaring-functions/round.gif b/.../js1/blocks/declaring-functions/round.gif → .../module/js1/declaring-functions/round.gif
diff --git a/content/en/js1/blocks/errors/index.md → common-content/en/module/js1/errors/index.md b/content/en/js1/blocks/errors/index.md → common-content/en/module/js1/errors/index.md
diff --git a/content/en/js1/blocks/feedback/index.md → ...n-content/en/module/js1/feedback/index.md b/content/en/js1/blocks/feedback/index.md → ...n-content/en/module/js1/feedback/index.md
diff --git a/...s1/blocks/feedback/test-feedback-fail.png → ...odule/js1/feedback/test-feedback-fail.png b/...s1/blocks/feedback/test-feedback-fail.png → ...odule/js1/feedback/test-feedback-fail.png
diff --git a/.../blocks/feedback/test-reference-error.png → ...ule/js1/feedback/test-reference-error.png b/.../blocks/feedback/test-reference-error.png → ...ule/js1/feedback/test-reference-error.png
diff --git a/content/en/js1/blocks/framework/index.md → ...-content/en/module/js1/framework/index.md b/content/en/js1/blocks/framework/index.md → ...-content/en/module/js1/framework/index.md
diff --git a/content/en/js1/blocks/functions/index.md → ...-content/en/module/js1/functions/index.md b/content/en/js1/blocks/functions/index.md → ...-content/en/module/js1/functions/index.md
diff --git a/content/en/js1/blocks/functions/round.gif → ...content/en/module/js1/functions/round.gif b/content/en/js1/blocks/functions/round.gif → ...content/en/module/js1/functions/round.gif
diff --git a/content/en/js1/blocks/generalise/index.md → ...content/en/module/js1/generalise/index.md b/content/en/js1/blocks/generalise/index.md → ...content/en/module/js1/generalise/index.md
diff --git a/...s1/blocks/generalise/second-case-fail.png → ...odule/js1/generalise/second-case-fail.png b/...s1/blocks/generalise/second-case-fail.png → ...odule/js1/generalise/second-case-fail.png
diff --git a/content/en/js1/blocks/improving/index.md → ...-content/en/module/js1/improving/index.md b/content/en/js1/blocks/improving/index.md → ...-content/en/module/js1/improving/index.md
diff --git a/content/en/js1/blocks/install-node/index.md → ...ntent/en/module/js1/install-node/index.md b/content/en/js1/blocks/install-node/index.md → ...ntent/en/module/js1/install-node/index.md
diff --git a/content/en/js1/blocks/installing/index.md → ...content/en/module/js1/installing/index.md b/content/en/js1/blocks/installing/index.md → ...content/en/module/js1/installing/index.md
diff --git a/...en/js1/blocks/installing/jest-install.png → ...en/module/js1/installing/jest-install.png b/...en/js1/blocks/installing/jest-install.png → ...en/module/js1/installing/jest-install.png
diff --git a/content/en/js1/blocks/interface/index.md → ...-content/en/module/js1/interface/index.md b/content/en/js1/blocks/interface/index.md → ...-content/en/module/js1/interface/index.md
diff --git a/content/en/js1/blocks/logging/index.md → ...on-content/en/module/js1/logging/index.md b/content/en/js1/blocks/logging/index.md → ...on-content/en/module/js1/logging/index.md
diff --git a/content/en/js1/blocks/ordinal/index.md → ...on-content/en/module/js1/ordinal/index.md b/content/en/js1/blocks/ordinal/index.md → ...on-content/en/module/js1/ordinal/index.md
diff --git a/content/en/js1/blocks/outliers/index.md → ...n-content/en/module/js1/outliers/index.md b/content/en/js1/blocks/outliers/index.md → ...n-content/en/module/js1/outliers/index.md
diff --git a/.../js1/blocks/outliers/second-case-fail.png → .../module/js1/outliers/second-case-fail.png b/.../js1/blocks/outliers/second-case-fail.png → .../module/js1/outliers/second-case-fail.png
diff --git a/content/en/js1/blocks/packages/index.md → ...n-content/en/module/js1/packages/index.md b/content/en/js1/blocks/packages/index.md → ...n-content/en/module/js1/packages/index.md
diff --git a/content/en/js1/blocks/parameters/index.md → ...content/en/module/js1/parameters/index.md b/content/en/js1/blocks/parameters/index.md → ...content/en/module/js1/parameters/index.md
diff --git a/content/en/js1/blocks/percentages/index.md → ...ontent/en/module/js1/percentages/index.md b/content/en/js1/blocks/percentages/index.md → ...ontent/en/module/js1/percentages/index.md
diff --git a/.../blocks/playing-computer/global-frame.png → ...ule/js1/playing-computer/global-frame.png b/.../blocks/playing-computer/global-frame.png → ...ule/js1/playing-computer/global-frame.png
diff --git a/...t/en/js1/blocks/playing-computer/index.md → ...t/en/module/js1/playing-computer/index.md b/...t/en/js1/blocks/playing-computer/index.md → ...t/en/module/js1/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 → ...s1/playing-computer/runtime-diagram-1.png b/...ks/playing-computer/runtime-diagram-1.png → ...s1/playing-computer/runtime-diagram-1.png
diff --git a/content/en/js1/blocks/repl/index.md → common-content/en/module/js1/repl/index.md b/content/en/js1/blocks/repl/index.md → common-content/en/module/js1/repl/index.md
diff --git a/content/en/js1/blocks/return/index.md → common-content/en/module/js1/return/index.md b/content/en/js1/blocks/return/index.md → common-content/en/module/js1/return/index.md
diff --git a/content/en/js1/blocks/reuse/index.md → common-content/en/module/js1/reuse/index.md b/content/en/js1/blocks/reuse/index.md → common-content/en/module/js1/reuse/index.md
diff --git a/content/en/js1/blocks/reuse/round.gif → common-content/en/module/js1/reuse/round.gif b/content/en/js1/blocks/reuse/round.gif → common-content/en/module/js1/reuse/round.gif
diff --git a/content/en/js1/blocks/scope/index.md → common-content/en/module/js1/scope/index.md b/content/en/js1/blocks/scope/index.md → common-content/en/module/js1/scope/index.md
diff --git a/content/en/js1/blocks/scripts/index.md → ...on-content/en/module/js1/scripts/index.md b/content/en/js1/blocks/scripts/index.md → ...on-content/en/module/js1/scripts/index.md
diff --git a/content/en/js1/blocks/setup/index.md → common-content/en/module/js1/setup/index.md b/content/en/js1/blocks/setup/index.md → common-content/en/module/js1/setup/index.md
diff --git a/content/en/js1/blocks/setup/jest-install.png → ...tent/en/module/js1/setup/jest-install.png b/content/en/js1/blocks/setup/jest-install.png → ...tent/en/module/js1/setup/jest-install.png
diff --git a/content/en/js1/blocks/strategy/index.md → ...n-content/en/module/js1/strategy/index.md b/content/en/js1/blocks/strategy/index.md → ...n-content/en/module/js1/strategy/index.md
diff --git a/content/en/js1/blocks/strings/index.md → ...on-content/en/module/js1/strings/index.md b/content/en/js1/blocks/strings/index.md → ...on-content/en/module/js1/strings/index.md
diff --git a/content/en/js1/blocks/sub-goal/index.md → ...n-content/en/module/js1/sub-goal/index.md b/content/en/js1/blocks/sub-goal/index.md → ...n-content/en/module/js1/sub-goal/index.md
diff --git a/content/en/js1/blocks/terminal/index.md → ...n-content/en/module/js1/terminal/index.md b/content/en/js1/blocks/terminal/index.md → ...n-content/en/module/js1/terminal/index.md
diff --git a/content/en/js1/blocks/terminal/terminal.gif → ...ntent/en/module/js1/terminal/terminal.gif b/content/en/js1/blocks/terminal/terminal.gif → ...ntent/en/module/js1/terminal/terminal.gif
diff --git a/content/en/js1/blocks/variables/greeting.gif → ...tent/en/module/js1/variables/greeting.gif b/content/en/js1/blocks/variables/greeting.gif → ...tent/en/module/js1/variables/greeting.gif
diff --git a/content/en/js1/blocks/variables/index.md → ...-content/en/module/js1/variables/index.md b/content/en/js1/blocks/variables/index.md → ...-content/en/module/js1/variables/index.md
diff --git a/content/en/js2/blocks/access/index.md → common-content/en/module/js2/access/index.md b/content/en/js2/blocks/access/index.md → common-content/en/module/js2/access/index.md
diff --git a/content/en/js2/blocks/arrays/index.md → common-content/en/module/js2/arrays/index.md b/content/en/js2/blocks/arrays/index.md → common-content/en/module/js2/arrays/index.md
diff --git a/content/en/js2/blocks/assembly/index.md → ...n-content/en/module/js2/assembly/index.md b/content/en/js2/blocks/assembly/index.md → ...n-content/en/module/js2/assembly/index.md
diff --git a/content/en/js2/blocks/browser/index.md → ...on-content/en/module/js2/browser/index.md b/content/en/js2/blocks/browser/index.md → ...on-content/en/module/js2/browser/index.md
diff --git a/...nt/en/js2/blocks/character-limit/index.md → ...nt/en/module/js2/character-limit/index.md b/...nt/en/js2/blocks/character-limit/index.md → ...nt/en/module/js2/character-limit/index.md
diff --git a/content/en/js2/blocks/check-in/index.md → ...n-content/en/module/js2/check-in/index.md b/content/en/js2/blocks/check-in/index.md → ...n-content/en/module/js2/check-in/index.md
diff --git a/...ent/en/js2/blocks/check-progress/index.md → ...ent/en/module/js2/check-progress/index.md b/...ent/en/js2/blocks/check-progress/index.md → ...ent/en/module/js2/check-progress/index.md
diff --git a/content/en/js2/blocks/demo/index.md → common-content/en/module/js2/demo/index.md b/content/en/js2/blocks/demo/index.md → common-content/en/module/js2/demo/index.md
diff --git a/content/en/js2/blocks/dom/html-tree.png → ...n-content/en/module/js2/dom/html-tree.png b/content/en/js2/blocks/dom/html-tree.png → ...n-content/en/module/js2/dom/html-tree.png
diff --git a/content/en/js2/blocks/dom/index.md → common-content/en/module/js2/dom/index.md b/content/en/js2/blocks/dom/index.md → common-content/en/module/js2/dom/index.md
diff --git a/content/en/js2/blocks/events/index.md → common-content/en/module/js2/events/index.md b/content/en/js2/blocks/events/index.md → common-content/en/module/js2/events/index.md
diff --git a/content/en/js2/blocks/grouping-data/index.md → ...tent/en/module/js2/grouping-data/index.md b/content/en/js2/blocks/grouping-data/index.md → ...tent/en/module/js2/grouping-data/index.md
diff --git a/content/en/js2/blocks/iteration/index.md → ...-content/en/module/js2/iteration/index.md b/content/en/js2/blocks/iteration/index.md → ...-content/en/module/js2/iteration/index.md
diff --git a/content/en/js2/blocks/key-values/index.md → ...content/en/module/js2/key-values/index.md b/content/en/js2/blocks/key-values/index.md → ...content/en/module/js2/key-values/index.md
diff --git a/content/en/js2/blocks/mean/index.md → common-content/en/module/js2/mean/index.md b/content/en/js2/blocks/mean/index.md → common-content/en/module/js2/mean/index.md
diff --git a/content/en/js2/blocks/median/index.md → common-content/en/module/js2/median/index.md b/content/en/js2/blocks/median/index.md → common-content/en/module/js2/median/index.md
diff --git a/...nt/en/js2/blocks/multiple-params/index.md → ...nt/en/module/js2/multiple-params/index.md b/...nt/en/js2/blocks/multiple-params/index.md → ...nt/en/module/js2/multiple-params/index.md
diff --git a/content/en/js2/blocks/mutating/index.md → ...n-content/en/module/js2/mutating/index.md b/content/en/js2/blocks/mutating/index.md → ...n-content/en/module/js2/mutating/index.md
diff --git a/content/en/js2/blocks/mutation/index.md → ...n-content/en/module/js2/mutation/index.md b/content/en/js2/blocks/mutation/index.md → ...n-content/en/module/js2/mutation/index.md
diff --git a/content/en/js2/blocks/no-params/index.md → ...-content/en/module/js2/no-params/index.md b/content/en/js2/blocks/no-params/index.md → ...-content/en/module/js2/no-params/index.md
diff --git a/...s2/blocks/no-params/to-be-check-error.png → ...odule/js2/no-params/to-be-check-error.png b/...s2/blocks/no-params/to-be-check-error.png → ...odule/js2/no-params/to-be-check-error.png
diff --git a/content/en/js2/blocks/one-pair/index.md → ...n-content/en/module/js2/one-pair/index.md b/content/en/js2/blocks/one-pair/index.md → ...n-content/en/module/js2/one-pair/index.md
diff --git a/...nt/en/js2/blocks/one-pair/literal-key.png → ...nt/en/module/js2/one-pair/literal-key.png b/...nt/en/js2/blocks/one-pair/literal-key.png → ...nt/en/module/js2/one-pair/literal-key.png
diff --git a/content/en/js2/blocks/ordered-data/index.md → ...ntent/en/module/js2/ordered-data/index.md b/content/en/js2/blocks/ordered-data/index.md → ...ntent/en/module/js2/ordered-data/index.md
diff --git a/content/en/js2/blocks/pair-up/index.md → ...on-content/en/module/js2/pair-up/index.md b/content/en/js2/blocks/pair-up/index.md → ...on-content/en/module/js2/pair-up/index.md
diff --git a/content/en/js2/blocks/pick-an-app/index.md → ...ontent/en/module/js2/pick-an-app/index.md b/content/en/js2/blocks/pick-an-app/index.md → ...ontent/en/module/js2/pick-an-app/index.md
diff --git a/content/en/js2/blocks/plan/index.md → common-content/en/module/js2/plan/index.md b/content/en/js2/blocks/plan/index.md → common-content/en/module/js2/plan/index.md
diff --git a/content/en/js2/blocks/query-string/index.md → ...ntent/en/module/js2/query-string/index.md b/content/en/js2/blocks/query-string/index.md → ...ntent/en/module/js2/query-string/index.md
diff --git a/content/en/js2/blocks/querying/index.md → ...n-content/en/module/js2/querying/index.md b/content/en/js2/blocks/querying/index.md → ...n-content/en/module/js2/querying/index.md
diff --git a/content/en/js2/blocks/reference/index.md → ...-content/en/module/js2/reference/index.md b/content/en/js2/blocks/reference/index.md → ...-content/en/module/js2/reference/index.md
diff --git a/...n/js2/blocks/reference/point-to-array.png → ...n/module/js2/reference/point-to-array.png b/...n/js2/blocks/reference/point-to-array.png → ...n/module/js2/reference/point-to-array.png
diff --git a/content/en/js2/blocks/response/index.md → ...n-content/en/module/js2/response/index.md b/content/en/js2/blocks/response/index.md → ...n-content/en/module/js2/response/index.md
diff --git a/content/en/js2/blocks/side-effects/index.md → ...ntent/en/module/js2/side-effects/index.md b/content/en/js2/blocks/side-effects/index.md → ...ntent/en/module/js2/side-effects/index.md
diff --git a/content/en/js2/blocks/summing/index.md → ...on-content/en/module/js2/summing/index.md b/content/en/js2/blocks/summing/index.md → ...on-content/en/module/js2/summing/index.md
diff --git a/content/en/js2/blocks/update/index.md → common-content/en/module/js2/update/index.md b/content/en/js2/blocks/update/index.md → common-content/en/module/js2/update/index.md
diff --git a/content/en/js2/blocks/variable-keys/index.md → ...tent/en/module/js2/variable-keys/index.md b/content/en/js2/blocks/variable-keys/index.md → ...tent/en/module/js2/variable-keys/index.md
diff --git a/...riable-keys/parse-query-test-feedback.png → ...riable-keys/parse-query-test-feedback.png b/...riable-keys/parse-query-test-feedback.png → ...riable-keys/parse-query-test-feedback.png
diff --git a/content/en/js3/blocks/async-await/index.md → ...ontent/en/module/js3/async-await/index.md b/content/en/js3/blocks/async-await/index.md → ...ontent/en/module/js3/async-await/index.md
diff --git a/content/en/js3/blocks/asynchrony/index.md → ...content/en/module/js3/asynchrony/index.md b/content/en/js3/blocks/asynchrony/index.md → ...content/en/module/js3/asynchrony/index.md
diff --git a/content/en/js3/blocks/break-down/index.md → ...content/en/module/js3/break-down/index.md b/content/en/js3/blocks/break-down/index.md → ...content/en/module/js3/break-down/index.md
diff --git a/content/en/js3/blocks/callbacks/index.md → ...-content/en/module/js3/callbacks/index.md b/content/en/js3/blocks/callbacks/index.md → ...-content/en/module/js3/callbacks/index.md
diff --git a/...t/en/js3/blocks/capturing-events/index.md → ...t/en/module/js3/capturing-events/index.md b/...t/en/js3/blocks/capturing-events/index.md → ...t/en/module/js3/capturing-events/index.md
diff --git a/content/en/js3/blocks/catch/index.md → common-content/en/module/js3/catch/index.md b/content/en/js3/blocks/catch/index.md → common-content/en/module/js3/catch/index.md
diff --git a/content/en/js3/blocks/chaining/index.md → ...n-content/en/module/js3/chaining/index.md b/content/en/js3/blocks/chaining/index.md → ...n-content/en/module/js3/chaining/index.md
diff --git a/content/en/js3/blocks/components/index.md → ...content/en/module/js3/components/index.md b/content/en/js3/blocks/components/index.md → ...content/en/module/js3/components/index.md
@@ -23,8 +23,8 @@ const film = {
   duration: 112,
 };
 
-const createFilmCard = (film) => {
-  const card = document.getElementById("film-card").content.cloneNode(true);
+const createFilmCard = (template, film) => {
+  const card = template.content.cloneNode(true);
   // Now we are querying our cloned fragment, not the entire page.
   card.querySelector("h3").textContent = film.title;
   card.querySelector("p").textContent = `Director: ${film.director}`;
@@ -33,7 +33,7 @@ const createFilmCard = (film) => {
   // Return the card, rather than directly appending it to the page
   return card;
 };
-const template = document.getElementById("filmCard");
+const template = document.getElementById("film-card");
 const filmCard = createFilmCard(template, film);
 
 // Remember we need to append the card to the DOM for it to appear.

diff --git a/...en/js3/blocks/composing-elements/index.md → ...en/module/js3/composing-elements/index.md b/...en/js3/blocks/composing-elements/index.md → ...en/module/js3/composing-elements/index.md
diff --git a/content/en/js3/blocks/data-ui/index.md → ...on-content/en/module/js3/data-ui/index.md b/content/en/js3/blocks/data-ui/index.md → ...on-content/en/module/js3/data-ui/index.md
diff --git a/content/en/js3/blocks/fetch-films/data.json → ...ntent/en/module/js3/fetch-films/data.json b/content/en/js3/blocks/fetch-films/data.json → ...ntent/en/module/js3/fetch-films/data.json
diff --git a/...n/js3/blocks/fetch-films/filterFilms.html → ...n/module/js3/fetch-films/filterFilms.html b/...n/js3/blocks/fetch-films/filterFilms.html → ...n/module/js3/fetch-films/filterFilms.html
diff --git a/content/en/js3/blocks/fetch-films/index.md → ...ontent/en/module/js3/fetch-films/index.md b/content/en/js3/blocks/fetch-films/index.md → ...ontent/en/module/js3/fetch-films/index.md
diff --git a/content/en/js3/blocks/fetch/index.md → common-content/en/module/js3/fetch/index.md b/content/en/js3/blocks/fetch/index.md → common-content/en/module/js3/fetch/index.md
diff --git a/content/en/js3/blocks/fetching-data/index.md → ...tent/en/module/js3/fetching-data/index.md b/content/en/js3/blocks/fetching-data/index.md → ...tent/en/module/js3/fetching-data/index.md
diff --git a/.../en/js3/blocks/identifying-state/index.md → .../en/module/js3/identifying-state/index.md b/.../en/js3/blocks/identifying-state/index.md → .../en/module/js3/identifying-state/index.md
diff --git a/content/en/js3/blocks/internet/index.md → ...n-content/en/module/js3/internet/index.md b/content/en/js3/blocks/internet/index.md → ...n-content/en/module/js3/internet/index.md
diff --git a/...js3/blocks/introducing-new-state/index.md → ...module/js3/introducing-new-state/index.md b/...js3/blocks/introducing-new-state/index.md → ...module/js3/introducing-new-state/index.md
diff --git a/content/en/js3/blocks/latency/index.md → ...on-content/en/module/js3/latency/index.md b/content/en/js3/blocks/latency/index.md → ...on-content/en/module/js3/latency/index.md
diff --git a/.../en/js3/blocks/now-showing/film-cards.png → .../en/module/js3/now-showing/film-cards.png b/.../en/js3/blocks/now-showing/film-cards.png → .../en/module/js3/now-showing/film-cards.png
diff --git a/content/en/js3/blocks/now-showing/index.md → ...ontent/en/module/js3/now-showing/index.md b/content/en/js3/blocks/now-showing/index.md → ...ontent/en/module/js3/now-showing/index.md
diff --git a/content/en/js3/blocks/one-to-one/index.md → ...content/en/module/js3/one-to-one/index.md b/content/en/js3/blocks/one-to-one/index.md → ...content/en/module/js3/one-to-one/index.md
diff --git a/content/en/js3/blocks/promises/index.md → ...n-content/en/module/js3/promises/index.md b/content/en/js3/blocks/promises/index.md → ...n-content/en/module/js3/promises/index.md
diff --git a/...nt/en/js3/blocks/re-rendering-ui/index.md → ...nt/en/module/js3/re-rendering-ui/index.md b/...nt/en/js3/blocks/re-rendering-ui/index.md → ...nt/en/module/js3/re-rendering-ui/index.md
diff --git a/content/en/js3/blocks/reacting/index.md → ...n-content/en/module/js3/reacting/index.md b/content/en/js3/blocks/reacting/index.md → ...n-content/en/module/js3/reacting/index.md
diff --git a/.../refactoring-to-state-and-render/index.md → .../refactoring-to-state-and-render/index.md b/.../refactoring-to-state-and-render/index.md → .../refactoring-to-state-and-render/index.md
diff --git a/.../blocks/rendering-based-on-state/index.md → ...ule/js3/rendering-based-on-state/index.md b/.../blocks/rendering-based-on-state/index.md → ...ule/js3/rendering-based-on-state/index.md
diff --git a/...cks/simplifying-element-creation/index.md → ...js3/simplifying-element-creation/index.md b/...cks/simplifying-element-creation/index.md → ...js3/simplifying-element-creation/index.md
diff --git a/content/en/js3/blocks/single-datum/index.md → ...ntent/en/module/js3/single-datum/index.md b/content/en/js3/blocks/single-datum/index.md → ...ntent/en/module/js3/single-datum/index.md
diff --git a/...ocks/single-datum/single-film-display.png → .../js3/single-datum/single-film-display.png b/...ocks/single-datum/single-film-display.png → .../js3/single-datum/single-film-display.png
diff --git a/content/en/js3/blocks/template-html/index.md → ...tent/en/module/js3/template-html/index.md b/content/en/js3/blocks/template-html/index.md → ...tent/en/module/js3/template-html/index.md
diff --git a/content/en/js3/blocks/then/index.md → common-content/en/module/js3/then/index.md b/content/en/js3/blocks/then/index.md → common-content/en/module/js3/then/index.md
diff --git a/content/en/js3/blocks/using-fetch/index.md → ...ontent/en/module/js3/using-fetch/index.md b/content/en/js3/blocks/using-fetch/index.md → ...ontent/en/module/js3/using-fetch/index.md
diff --git a/content/en/js3/blocks/using-map/index.md → ...-content/en/module/js3/using-map/index.md b/content/en/js3/blocks/using-map/index.md → ...-content/en/module/js3/using-map/index.md
diff --git a/...n/portfolio/blocks/break-it-down/index.md → ...n/module/portfolio/break-it-down/index.md b/...n/portfolio/blocks/break-it-down/index.md → ...n/module/portfolio/break-it-down/index.md
diff --git a/content/en/portfolio/blocks/data/index.md → ...content/en/module/portfolio/data/index.md b/content/en/portfolio/blocks/data/index.md → ...content/en/module/portfolio/data/index.md
diff --git a/...n/portfolio/blocks/employability/index.md → ...n/module/portfolio/employability/index.md b/...n/portfolio/blocks/employability/index.md → ...n/module/portfolio/employability/index.md
diff --git a/...en/portfolio/blocks/ground-rules/index.md → ...en/module/portfolio/ground-rules/index.md b/...en/portfolio/blocks/ground-rules/index.md → ...en/module/portfolio/ground-rules/index.md
diff --git a/content/en/portfolio/blocks/guest/index.md → ...ontent/en/module/portfolio/guest/index.md b/content/en/portfolio/blocks/guest/index.md → ...ontent/en/module/portfolio/guest/index.md
diff --git a/...t/en/portfolio/blocks/interfaces/index.md → ...t/en/module/portfolio/interfaces/index.md b/...t/en/portfolio/blocks/interfaces/index.md → ...t/en/module/portfolio/interfaces/index.md
diff --git a/...t/en/portfolio/blocks/next-steps/index.md → ...t/en/module/portfolio/next-steps/index.md b/...t/en/portfolio/blocks/next-steps/index.md → ...t/en/module/portfolio/next-steps/index.md
diff --git a/content/en/portfolio/blocks/project/index.md → ...tent/en/module/portfolio/project/index.md b/content/en/portfolio/blocks/project/index.md → ...tent/en/module/portfolio/project/index.md
diff --git a/...en/portfolio/blocks/requirements/index.md → ...en/module/portfolio/requirements/index.md b/...en/portfolio/blocks/requirements/index.md → ...en/module/portfolio/requirements/index.md
@@ -9,8 +9,6 @@ emoji= '🧩'
     2='Identify and explain the key user stories for your project'
 +++
 
-{{< snippet "snippets/requirements.md" >}}
-
 In addition to [who] and [what], good user stories also include [why]
 
 > As a [who], I can [what] so that **[why]**

diff --git a/...ent/en/portfolio/blocks/stand-up/index.md → ...ent/en/module/portfolio/stand-up/index.md b/...ent/en/portfolio/blocks/stand-up/index.md → ...ent/en/module/portfolio/stand-up/index.md
diff --git a/...n/portfolio/blocks/user-feedback/index.md → ...n/module/portfolio/user-feedback/index.md b/...n/portfolio/blocks/user-feedback/index.md → ...n/module/portfolio/user-feedback/index.md
diff --git a/content/en/react/blocks/components/index.md → ...ntent/en/module/react/components/index.md b/content/en/react/blocks/components/index.md → ...ntent/en/module/react/components/index.md
diff --git a/...act/blocks/controlled-components/index.md → ...dule/react/controlled-components/index.md b/...act/blocks/controlled-components/index.md → ...dule/react/controlled-components/index.md
diff --git a/...eact/blocks/embedding-javascript/index.md → ...odule/react/embedding-javascript/index.md b/...eact/blocks/embedding-javascript/index.md → ...odule/react/embedding-javascript/index.md
diff --git a/...locks/fetching-data-with-effects/index.md → ...react/fetching-data-with-effects/index.md b/...locks/fetching-data-with-effects/index.md → ...react/fetching-data-with-effects/index.md
diff --git a/...nt/en/react/blocks/fetching-data/index.md → ...nt/en/module/react/fetching-data/index.md b/...nt/en/react/blocks/fetching-data/index.md → ...nt/en/module/react/fetching-data/index.md
diff --git a/.../en/react/blocks/handling-events/index.md → .../en/module/react/handling-events/index.md b/.../en/react/blocks/handling-events/index.md → .../en/module/react/handling-events/index.md
diff --git a/...nt/en/react/blocks/import-export/index.md → ...nt/en/module/react/import-export/index.md b/...nt/en/react/blocks/import-export/index.md → ...nt/en/module/react/import-export/index.md
diff --git a/content/en/react/blocks/jsx/index.md → common-content/en/module/react/jsx/index.md b/content/en/react/blocks/jsx/index.md → common-content/en/module/react/jsx/index.md
diff --git a/content/en/react/blocks/keys/index.md → common-content/en/module/react/keys/index.md b/content/en/react/blocks/keys/index.md → common-content/en/module/react/keys/index.md
diff --git a/.../en/react/blocks/multiple-fields/index.md → .../en/module/react/multiple-fields/index.md b/.../en/react/blocks/multiple-fields/index.md → .../en/module/react/multiple-fields/index.md
diff --git a/content/en/react/blocks/pokedex/index.md → ...-content/en/module/react/pokedex/index.md b/content/en/react/blocks/pokedex/index.md → ...-content/en/module/react/pokedex/index.md
diff --git a/content/en/react/blocks/props/index.md → ...on-content/en/module/react/props/index.md b/content/en/react/blocks/props/index.md → ...on-content/en/module/react/props/index.md
diff --git a/...ent/en/react/blocks/re-rendering/index.md → ...ent/en/module/react/re-rendering/index.md b/...ent/en/react/blocks/re-rendering/index.md → ...ent/en/module/react/re-rendering/index.md
diff --git a/...ent/en/react/blocks/react-router/index.md → ...ent/en/module/react/react-router/index.md b/...ent/en/react/blocks/react-router/index.md → ...ent/en/module/react/react-router/index.md
diff --git a/content/en/react/blocks/rendering/index.md → ...ontent/en/module/react/rendering/index.md b/content/en/react/blocks/rendering/index.md → ...ontent/en/module/react/rendering/index.md
diff --git a/content/en/react/blocks/state/index.md → ...on-content/en/module/react/state/index.md b/content/en/react/blocks/state/index.md → ...on-content/en/module/react/state/index.md
diff --git a/...locks/synchronizing-with-effects/index.md → ...react/synchronizing-with-effects/index.md b/...locks/synchronizing-with-effects/index.md → ...react/synchronizing-with-effects/index.md
diff --git a/...ent/en/react/blocks/team-project/index.md → ...ent/en/module/react/team-project/index.md b/...ent/en/react/blocks/team-project/index.md → ...ent/en/module/react/team-project/index.md
diff --git a/content/en/react/blocks/vite/index.md → common-content/en/module/react/vite/index.md b/content/en/react/blocks/vite/index.md → common-content/en/module/react/vite/index.md
diff --git a/...nt/en/react/blocks/what-is-react/index.md → ...nt/en/module/react/what-is-react/index.md b/...nt/en/react/blocks/what-is-react/index.md → ...nt/en/module/react/what-is-react/index.md
diff --git a/.../react/blocks/working-with-forms/index.md → .../module/react/working-with-forms/index.md b/.../react/blocks/working-with-forms/index.md → .../module/react/working-with-forms/index.md
diff --git a/...rvers/blocks/building-the-server/index.md → ...dule/servers/building-the-server/index.md b/...rvers/blocks/building-the-server/index.md → ...dule/servers/building-the-server/index.md
diff --git a/...ks/communicating-with-the-server/index.md → ...rs/communicating-with-the-server/index.md b/...ks/communicating-with-the-server/index.md → ...rs/communicating-with-the-server/index.md
diff --git a/content/en/servers/blocks/crud-2/index.md → ...content/en/module/servers/crud-2/index.md b/content/en/servers/blocks/crud-2/index.md → ...content/en/module/servers/crud-2/index.md
diff --git a/...n/servers/blocks/crud-challenges/index.md → ...n/module/servers/crud-challenges/index.md b/...n/servers/blocks/crud-challenges/index.md → ...n/module/servers/crud-challenges/index.md
diff --git a/content/en/servers/blocks/crud/index.md → ...n-content/en/module/servers/crud/index.md b/content/en/servers/blocks/crud/index.md → ...n-content/en/module/servers/crud/index.md
diff --git a/...ent/en/servers/blocks/get-single/index.md → ...ent/en/module/servers/get-single/index.md b/...ent/en/servers/blocks/get-single/index.md → ...ent/en/module/servers/get-single/index.md
diff --git a/content/en/servers/blocks/get/index.md → ...on-content/en/module/servers/get/index.md b/content/en/servers/blocks/get/index.md → ...on-content/en/module/servers/get/index.md
diff --git a/.../servers/blocks/intro-to-express/index.md → .../module/servers/intro-to-express/index.md b/.../servers/blocks/intro-to-express/index.md → .../module/servers/intro-to-express/index.md
diff --git a/...rvers/blocks/make-a-node-project/index.md → ...dule/servers/make-a-node-project/index.md b/...rvers/blocks/make-a-node-project/index.md → ...dule/servers/make-a-node-project/index.md
diff --git a/content/en/servers/blocks/post/index.md → ...n-content/en/module/servers/post/index.md b/content/en/servers/blocks/post/index.md → ...n-content/en/module/servers/post/index.md
diff --git a/content/en/servers/blocks/postman/index.md → ...ontent/en/module/servers/postman/index.md b/content/en/servers/blocks/postman/index.md → ...ontent/en/module/servers/postman/index.md
diff --git a/content/en/servers/blocks/put/index.md → ...on-content/en/module/servers/put/index.md b/content/en/servers/blocks/put/index.md → ...on-content/en/module/servers/put/index.md
diff --git a/.../servers/blocks/query-parameters/index.md → .../module/servers/query-parameters/index.md b/.../servers/blocks/query-parameters/index.md → .../module/servers/query-parameters/index.md
diff --git a/content/en/servers/blocks/render/index.md → ...content/en/module/servers/render/index.md b/content/en/servers/blocks/render/index.md → ...content/en/module/servers/render/index.md
diff --git a/content/en/servers/blocks/routing/index.md → ...ontent/en/module/servers/routing/index.md b/content/en/servers/blocks/routing/index.md → ...ontent/en/module/servers/routing/index.md
diff --git a/.../blocks/test-examples-in-postman/index.md → ...servers/test-examples-in-postman/index.md b/.../blocks/test-examples-in-postman/index.md → ...servers/test-examples-in-postman/index.md
diff --git a/common-content/go.mod b/common-content/go.mod
@@ -0,0 +1,3 @@
+module github.com/CodeYourFuture/curriculum/common-content
+
+go 1.21.3
diff --git a/common-content/hugo.toml b/common-content/hugo.toml
@@ -0,0 +1,5 @@
+
+[module]
+  [module.hugoVersion]
+    extended = true
+    min = "0.116.0"
diff --git a/common-theme/archetypes/backlog.md b/common-theme/archetypes/backlog.md
@@ -0,0 +1,13 @@
++++
+title = 'backlog'
+layout = 'backlog'
+emoji= '🥞'
+menu_level = ['sprint']
+weight = 2
+backlog= 'Module-Template'
+backlog_filter= 'Week 1'
++++
+
+This view lists all the issues for the current sprint. It is looking for a repo in your org named `Module-<module-name>` where it expects issues to live. You can edit this of course.
+
+Organise your issues with labels, like 'Week 1' or 'Week 2' to filter them into the right sprint. Pass the label into the `backlog_filter` in the front matter to filter the issues.
diff --git a/content/en/the-launch/blocks/block1/index.md → common-theme/archetypes/blocks/index.md b/content/en/the-launch/blocks/block1/index.md → common-theme/archetypes/blocks/index.md
@@ -1,11 +1,13 @@
 +++
-title = 'block1'
+title = '{{ replace .Name "-" " " | title }}'
 headless = true
 time = 30
 facilitation = false
+threads = ['to-be-assigned']
 emoji= '🧩'
 [objectives]
     1='Use the Teach Tech Together guide to construct your objectives'
     2='Limit the objectives to 3-5 items'
     3='Write objectives you can measure'
 +++
+
diff --git a/common-theme/archetypes/day-plan.md b/common-theme/archetypes/day-plan.md
@@ -0,0 +1,45 @@
++++
+title = 'day-plan'
+layout = 'day-plan'
+emoji= '📅'
+menu_level = ['sprint']
+weight = 3
+[[blocks]]
+name="Energiser"
+src="blocks/energiser"
+[[blocks]]
+name="PD Placeholder to be replaced with PD link"
+src="blocks/pd-placeholder"
+[[blocks]]
+name="Morning break"
+src="blocks/morning-break"
+[[blocks]]
+name="Placeholder Workshop"
+src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/template"
+time="60"
+[[blocks]]
+name="Lunch"
+src="blocks/lunch"
+[[blocks]]
+name="Study Group 2"
+src="blocks/study-group"
+time="90"
+[[blocks]]
+name="Code Review"
+src="https://github.com/CodeYourFuture/Module-Template/pulls"
+time="0"
+[[blocks]]
+name="Afternoon break"
+src="blocks/afternoon-break"
+[[blocks]]
+name="Study Group 2"
+src="blocks/study-group"
+time="60"
+[[blocks]]
+name="Retro"
+src="blocks/retro"
++++
+
+This example day plan is a template for you to use. It is a good idea to have a consistent structure for your day plans so that everyone knows _what_ to do _when_. The day plan will create a schedule from the time (in minutes) stored on each block using the `time-stamper` web component. You can override this time by adding a `time` parameter in the front matter as shown above.
+
+This view doesn't expect any content in the `.Content` section; delete these instructions. If you want to add a description of the day, add it to a `.Description` parameter in the front matter.
diff --git a/common-theme/archetypes/default.md b/common-theme/archetypes/default.md
@@ -0,0 +1,5 @@
++++
+title = '{{ replace .Name "-" " " | title }}'
++++
+
+This is just a single. You can use this to create an uncomplicated basic page. 
diff --git a/common-theme/archetypes/module-prep.md b/common-theme/archetypes/module-prep.md
@@ -0,0 +1,32 @@
++++
+title = 'prep'
+description = 'This work must be done to prepare for this module'
+layout = 'prep'
+emoji= '🧑🏾‍💻'
+menu_level = ['module']
+weight = 1
+[[blocks]]
+name="Local"
+src="blocks/types/local"
+[[blocks]]
+name="Readme"
+src="https://github.com/CodeYourFuture/Module-Template"
+[[blocks]]
+name="Youtube video or playlist"
+src="https://www.youtube.com/watch?v=P1ww1IXRfTA"
+[[blocks]]
+name="Slide - an image with caption"
+caption="With caption please!"
+src="https://github.com/MaggieAppleton/maggieappleton.com-V2/blob/main/public/images/posts/programming-pictures/PicturesProgramming-26_vnlzye-1100.jpg"
+[[blocks]]
+name="PD syllabus website"
+src="https://cyf-pd.netlify.app/blocks/agreements/readme/"
+[[blocks]]
+name="Issue, just one"
+src="https://github.com/CodeYourFuture/Module-JS1/issues/8"
+[[blocks]]
+name="Pullreqs, list"
+src="https://github.com/CodeYourFuture/Module-JS1"
++++
+## Anything written in .Content needs an h2
+This example prep view has an example of each type of block so you can see how the blocks work. 
diff --git a/common-theme/archetypes/module-success.md b/common-theme/archetypes/module-success.md
@@ -0,0 +1,11 @@
++++
+title = 'success'
+layout = 'success'
+emoji= '✅'
+menu_level = ['module']
+weight = 4
++++
+
+This view compiles learning objectives from the day plan and prep view into a checkbox list to help trainees check in on their progress.
+
+You can initiate a module level success view as well and write in some overall outcomes or success criteria.
diff --git a/common-theme/archetypes/module.md b/common-theme/archetypes/module.md
@@ -0,0 +1,17 @@
++++
+title = '{{ replace .Name "-" " " | title }}'
+description = 'The plan for {{ replace .Name "-" " " | title }}'
+layout = 'module'
+emoji= '📚'
+menu = ['syllabus']
++++
+
+### Quickstart
+
+Generate a template module by running `./module_create.sh <module-name>` in the root of your website. This script produces a complete module structure with all the necessary files and folders from the Hugo archetypes stored in the `archetypes` folder. Create any single archetype by running `hugo new --kind $ARCHETYPE_NAME $PATH_TO_NEW_FILE`.
+
+The template module contains a prep view to express all your entry criteria and setup instructions for the module, 4 template sprints to plan the weekly work, a product folder to organise the module project, and a success view to express the exit criteria and handoff details.
+
+Edit this basic setup to suit your needs. The module folder is located at content/$MODULE_NAME and it creates pages matching the folder structure on your website.
+
+If you don't want this module to show up on the default menu, remove `menu = ['syllabus']` from the front matter. The pages will still be accessible via the URLs.
diff --git a/common-theme/archetypes/prep.md b/common-theme/archetypes/prep.md
@@ -0,0 +1,32 @@
++++
+title = 'prep'
+description = 'Note the general topic'
+layout = 'prep'
+emoji= '🧑🏾‍💻'
+menu_level = ['sprint']
+weight = 1
+[[blocks]]
+name="Local"
+src="blocks/types/local"
+[[blocks]]
+name="Readme"
+src="https://github.com/CodeYourFuture/Module-Template"
+[[blocks]]
+name="Youtube video or playlist"
+src="https://www.youtube.com/watch?v=P1ww1IXRfTA"
+[[blocks]]
+name="Slide - an image with caption"
+caption="With caption please!"
+src="https://github.com/MaggieAppleton/maggieappleton.com-V2/blob/main/public/images/posts/programming-pictures/PicturesProgramming-26_vnlzye-1100.jpg"
+[[blocks]]
+name="PD syllabus website"
+src="https://cyf-pd.netlify.app/blocks/agreements/readme/"
+[[blocks]]
+name="Issue, just one"
+src="https://github.com/CodeYourFuture/Module-JS1/issues/8"
+[[blocks]]
+name="Pullreqs, list"
+src="https://github.com/CodeYourFuture/Module-JS1"
++++
+## Anything written in .Content needs an h2
+This example prep view has an example of each type of block so you can see how the blocks work. 
diff --git a/common-theme/archetypes/product-backlog.md b/common-theme/archetypes/product-backlog.md
@@ -0,0 +1,10 @@
++++
+title = 'backlog'
+layout = 'backlog'
+emoji= '🥞'
+menu_level = ['product']
+weight = 2
+backlog= 'React-Module-Project'
++++
+
+This view lists all the issues for the project. It is looking for a repo in your org named `React-Module-Project` where it expects issues to live. Wire in your actual project repo.
diff --git a/common-theme/archetypes/product-prep.md b/common-theme/archetypes/product-prep.md
@@ -0,0 +1,20 @@
++++
+title = 'prep'
+description = 'Wire in your repo docs, example given'
+layout = 'prep'
+emoji= '🧑🏾‍💻'
+menu_level = ['product']
+weight = 1
+[[blocks]]
+name="Planning and organising your team"
+src="https://github.com/CodeYourFuture/React-Module-Project/tree/main/docs/plan/"
+[[blocks]]
+name="Building your product"
+src="https://github.com/CodeYourFuture/React-Module-Project/tree/main/docs/build/"
+[[blocks]]
+name="Test driven development"
+src="https://github.com/CodeYourFuture/React-Module-Project/tree/main/docs/test/"
+[[blocks]]
+name="Shipping your product"
+src="https://github.com/CodeYourFuture/React-Module-Project/tree/main/docs/ship/"
++++
diff --git a/common-theme/archetypes/product.md b/common-theme/archetypes/product.md
@@ -0,0 +1,11 @@
++++
+title = 'Product'
+description = 'The module project for {{ replace .Name "-" " " | title }}'
+layout = 'product'
+emoji= '🎁'
+menu_level = ['module']
++++
+
+Each module should have a module-length project that produces a tangible product. These products form a starting point for trainee portfolios, and are mandatory for progression. 
+
+The actual instructions are generally pulled from the project repo. 
diff --git a/common-theme/archetypes/sprint.md b/common-theme/archetypes/sprint.md
@@ -0,0 +1,9 @@
++++
+title = 'Sprint {{ replace .Name "-" " " | title }}'
+layout = 'sprint'
+emoji= '🎽'
+menu_level = ['module']
+weight = 2
++++
+
+This is an index to organise the views for a sprint block. If you want to remove this sprint from the menu, remove the `menu_level` parameter from the front matter. We don't use Hugo menus as Hugo doesn't like having duplicate items, but we want all our modules and sprints to have consistent, repeated (predictable) names. 
diff --git a/common-theme/archetypes/success.md b/common-theme/archetypes/success.md
@@ -0,0 +1,11 @@
++++
+title = 'success'
+layout = 'success'
+emoji= '✅'
+menu_level = ['sprint']
+weight = 4
++++
+
+This view compiles learning objectives from the day plan and prep view into a checkbox list to help trainees check in on their progress.
+
+You can initiate a module level success view as well and write in some overall outcomes or success criteria.
diff --git a/common-theme/assets/images/site-logo/logo.svg b/common-theme/assets/images/site-logo/logo.svg
diff --git a/common-theme/assets/jsconfig.json b/common-theme/assets/jsconfig.json
@@ -0,0 +1,10 @@
+{
+ "compilerOptions": {
+  "baseUrl": ".",
+  "paths": {
+   "*": [
+    "*"
+   ]
+  }
+ }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		module github.com/CodeYourFuture/curriculum/common-content

		go 1.21.3