diff --git a/layouts/shortcodes/limit.html b/CITATION.cff similarity index 100% rename from layouts/shortcodes/limit.html rename to CITATION.cff diff --git a/README.md b/README.md index 63673bf9e..66e473232 100644 --- a/README.md +++ b/README.md @@ -1,175 +1,60 @@ -# Code Your Future Curriculum +# Curriculum Platform -[![Netlify Status](https://api.netlify.com/api/v1/badges/34db2751-bd7a-4828-a54d-787fa17b11e9/deploy-status)](https://app.netlify.com/sites/cyf-curriculum/deploys) +## What is it? -## Tools +This is a white label multi-tenant platform for us and our code school friends to use to manage our curricula. It's built on top of [Hugo](https://gohugo.io/) and [Netlify CMS](https://www.netlifycms.org/). -- [Hugo](https://gohugo.io/) - Static site generator -- [Hugo Pipes](https://gohugo.io/hugo-pipes/introduction/) - Asset pipeline -- [Netlify](https://www.netlify.com/) - Hosting and deployment -- [GitHub](https://github.com/CodeYourFuture/CYF-Signposts) - Source code repository -- [Bash](https://www.gnu.org/software/bash/) - Bash script to create new module structures +The platform, layout, styles and components are all developed in the Hugo module [/common-theme](/common-theme). -## Developing the source website +The content is developed in the Hugo module [/common-content](/common-content). This content is all headless blocks. It doesn't create any pages on your site unless you call it somewhere. -### To install +Multi-language support is provided by [Hugo's i18n support](https://gohugo.io/content-management/multilingual/). -```bash -brew install hugo -``` - -### To run locally - -#### Generate a token - -You'll need to get a fine-grained GitHub API token which allows read-only access to all public CYF repos from [this page](https://github.com/settings/tokens?type=beta). - -Click "Generate new token", enter a token name (can be anything), and how long you want the token to last (if you're doing a one-off contribution, pick a short value; if you're going to be a regular contributor, maybe a longer value). +Each org builds its own Hugo site that uses the common theme and content modules, and then makes any customisations they need and deploys it wherever they want. -Make sure the Resource owner is _your_ account if you have a choice. +## Examples -The "Repository access" you need is "Public repositories (read-only)", and you don't need any account permissions: +- [CodeYourFuture](/org-cyf/) => [https://org-cyf-theme.netlify.app/](https://org-cyf-theme.netlify.app/) +- [MigraCode](/org-mcb/) => [https://org-mcb-theme.netlify.app/](https://org-mcb-theme.netlify.app/) (couldn't find an svg logo) -
-Open to view screenshot of the required permissions +## To build a new site -![screenshot of required permissions](./readme_repository_access.png) -
- -#### Set up `.env` - -Copy the `.env.example` file over and name it `.env`. Edit the file and then change the line that says `CYF_CURRICULUM_GITHUB_BEARER_TOKEN` to contain the token that you have generated earlier. - -#### Run this command - -Run this command in a terminal, substituting in the github API token you generated above: +1. In the root of this repo, run: ```bash -npm i -npm run start:dev +hugo new site org- +cd org- ``` -If you find the build is very slow, and don't care about the issues being pulled into backlogs being precise, you can run: - -```bash -npm run start:dev -- --environment issues-are-cached-and-incomplete -``` - -### To create a new module - -```bash -./create_module -``` - -### Linting - -All CYF repos use the Prettier standard. However, Prettier doesn't have golang by default so you must install a plugin for it to work in VSCode. I've included it in the package.json. - -### Site Search - -PageFind runs the search. https://pagefind.app/ -It's in the build command on Netlify `hugo && npx pagefind --source "public"` -If you need to develop on this locally, run: +2. Initialise your new site as a hugo module, as only modules can import modules: ```zsh -rm -rf public && -hugo && npx pagefind --source "public" --serve +hugo mod init github.com/CodeYourFuture/curriculum-labs/org- ``` -And go to http://localhost:1414/ to see the PageFind-served site with search enabled; but there is no hot reload. You can run hugo on http://localhost:1313/ at the same time. - -## Contributing - -To add content via GitHub, open a PR, following the CONTRIBUTING.md guidelines and PR template. - -[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](./contributing) - - - -[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-) - - - -Code Your Future helps people who need it most to reach their goal of working in tech. Our innovative programme supports people all the way into secure employment as a software engineer. - -**Our trainees are people living in poverty**, disabled people, long term unemployed, refugees, asylum seekers, ex-offenders, single parents, and anyone else facing material barriers to digital education and employment in tech. - -**Our graduates work in great companies** including Capgemini, Deloitte, JP Morgan, Financial Times, AWS, Thoughtworks, the BBC, AND Digital and many more. - -**All our classes are free and our teachers are volunteers.** Our volunteers are professionals working in the local tech sector and they lead our course delivery. - -**We build communities and networks of inclusion everywhere we go**, bringing different worlds together, and integrating people into their local communities, teachers and learners both. We come together for a live session at the weekend, and trainees work through coursework and projects 20 hours a week, independently around their commitments, including day jobs. - -**CYF was founded by migrants for refugees**, and now welcomes everyone facing material barriers to technical education. Starting with a class of 6 people in 2016, and growing every day, we have helped over 240 people start their career in tech. - -## Our Approach - -Our PERN software development programme is part-time, vocational and practical. We teach functional programming with React, Jest, Postgres, Node, Express. We press hard on Agile, teamworking, conflict management, and self-study. We drill with Codewars problems and Codility tech tests for discipline and fluency, and encourage self-directed passion projects for creativity and innovation. - -We do our work in public; our courses are free and open source and we develop them in public as FOSS projects on GitHub. Right here! - -To graduate at CYF our trainees must deliver, deploy, and demo a working MVP of a full-stack web application, typically for a real NGO we partner with, in a cross-functional Agile team. - -## Documentation - -In this curriculum you'll find the content that we teach at CodeYourFuture. For other operational details you should read [our documentation website](https://docs.codeyourfuture.io). - -## Contributing +Then add the common theme and content modules as hugo modules to hugo.toml: + +```toml +[module] + [[module.imports]] + path = "github.com/CodeYourFuture/curriculum-labs/common-theme" + [[module.imports]] + path = "github.com/CodeYourFuture/curriculum-labs/common-content" + [[module.imports.mounts]] + source = "en" + target = "content" +``` -Please read CONTRIBUTING.MD +Look at the [org-cyf](/org-cyf/) and [org-mcb](/org-mcb/) examples for more details and options. -## Contributors ✨ +To customise the css, make a dir `assets/custom-theme` and throw any scss in there. It will be compiled and added last. -Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): +To add site logo/s, make a dir and add svgs to `assets/custom-images/site-logo/`. They will be added to the site header. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

nbogie
πŸ“–
StΓ©phanie Krus
️️️️♿️
Chris Owen
πŸ“–
Mike Hayden
πŸ–‹
Alasdair Smith
πŸ–‹ πŸ“–
Jonathan Sharpe
πŸ–‹ πŸš‡
rc-pm
πŸ“–

Nick Holdsworth
πŸ–‹
Tim Hamrouge
πŸ–‹
MitchLloyd
πŸ‘€ ⚠️ πŸ’»
gregdyke
πŸš‡ ⚠️ πŸ–‹ πŸ’»
Lucy Zidour
πŸ–‹ πŸ’» πŸ‘€
Alessandro
πŸ–‹ πŸ’»
Antigoni Makri
πŸ–‹ πŸ’»

Francesc Rosas
πŸ–‹
Sam Martin
πŸ–‹ πŸ’»
jcholyhead
πŸ–‹ πŸ’»
Mark Farmiloe
πŸ–‹ πŸ’»
MΓ‘tΓ© SzendrΕ‘
πŸ–‹ πŸ’»
Matthew Craven
πŸ›
Daniel Carter
πŸ›

Coung
πŸ–‹ πŸ’»
Lana-Franks-Code
πŸ›
Gintaras
πŸ›
rickscode
πŸ›
Claire Bickley
πŸ–‹
Jack Franklin
πŸ›
Sanyia Saidova
πŸ–‹ πŸ’»

Jo
πŸ–‹ πŸ’»
+Add your content to `content/` and customise the site config in `config.toml`. Please contribute any improvements you make back to the common theme and content modules. - - +For each module you import, add a `replace` directive to your `go.mod` file - if you forget to do this, you won't get live updates to your site when shared content changes. CI will remind you if you forget. - +## To locally develop your site -This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! +`cd` into the site you wish to develop, and run `hugo server` to get a live preview. diff --git a/content/en/_index.md b/common-content/en/_index.md similarity index 100% rename from content/en/_index.md rename to common-content/en/_index.md diff --git a/content/en/blocks/afternoon-break/index.md b/common-content/en/blocks/afternoon-break/index.md similarity index 100% rename from content/en/blocks/afternoon-break/index.md rename to common-content/en/blocks/afternoon-break/index.md diff --git a/content/en/blocks/backlog/index.md b/common-content/en/blocks/backlog/index.md similarity index 100% rename from content/en/blocks/backlog/index.md rename to common-content/en/blocks/backlog/index.md diff --git a/content/en/blocks/blockers/index.md b/common-content/en/blocks/blockers/index.md similarity index 100% rename from content/en/blocks/blockers/index.md rename to common-content/en/blocks/blockers/index.md diff --git a/content/en/blocks/coding-101/index.md b/common-content/en/blocks/coding-101/index.md similarity index 100% rename from content/en/blocks/coding-101/index.md rename to common-content/en/blocks/coding-101/index.md diff --git a/content/en/blocks/coursework/index.md b/common-content/en/blocks/coursework/index.md similarity index 100% rename from content/en/blocks/coursework/index.md rename to common-content/en/blocks/coursework/index.md diff --git a/content/en/blocks/energiser/index.md b/common-content/en/blocks/energiser/index.md similarity index 100% rename from content/en/blocks/energiser/index.md rename to common-content/en/blocks/energiser/index.md diff --git a/content/en/blocks/kata/index.md b/common-content/en/blocks/kata/index.md similarity index 100% rename from content/en/blocks/kata/index.md rename to common-content/en/blocks/kata/index.md diff --git a/content/en/blocks/lunch/index.md b/common-content/en/blocks/lunch/index.md similarity index 100% rename from content/en/blocks/lunch/index.md rename to common-content/en/blocks/lunch/index.md diff --git a/content/en/blocks/morning-break/index.md b/common-content/en/blocks/morning-break/index.md similarity index 100% rename from content/en/blocks/morning-break/index.md rename to common-content/en/blocks/morning-break/index.md diff --git a/content/en/blocks/pd-placeholder/index.md b/common-content/en/blocks/pd-placeholder/index.md similarity index 100% rename from content/en/blocks/pd-placeholder/index.md rename to common-content/en/blocks/pd-placeholder/index.md diff --git a/content/en/snippets/requirements.md b/common-content/en/blocks/requirements/index.md similarity index 76% rename from content/en/snippets/requirements.md rename to common-content/en/blocks/requirements/index.md index f0e1a3f06..3bb0b4b59 100644 --- a/content/en/snippets/requirements.md +++ b/common-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**. diff --git a/content/en/blocks/retro/index.md b/common-content/en/blocks/retro/index.md similarity index 100% rename from content/en/blocks/retro/index.md rename to common-content/en/blocks/retro/index.md diff --git a/content/en/blocks/search-terms/index.md b/common-content/en/blocks/search-terms/index.md similarity index 100% rename from content/en/blocks/search-terms/index.md rename to common-content/en/blocks/search-terms/index.md diff --git a/content/en/blocks/spaced-repetition/index.md b/common-content/en/blocks/spaced-repetition/index.md similarity index 100% rename from content/en/blocks/spaced-repetition/index.md rename to common-content/en/blocks/spaced-repetition/index.md diff --git a/content/en/blocks/study-45/index.md b/common-content/en/blocks/study-45/index.md similarity index 100% rename from content/en/blocks/study-45/index.md rename to common-content/en/blocks/study-45/index.md diff --git a/content/en/blocks/study-60/index.md b/common-content/en/blocks/study-60/index.md similarity index 100% rename from content/en/blocks/study-60/index.md rename to common-content/en/blocks/study-60/index.md diff --git a/content/en/blocks/study-90/index.md b/common-content/en/blocks/study-90/index.md similarity index 100% rename from content/en/blocks/study-90/index.md rename to common-content/en/blocks/study-90/index.md diff --git a/content/en/blocks/study-group/index.md b/common-content/en/blocks/study-group/index.md similarity index 100% rename from content/en/blocks/study-group/index.md rename to common-content/en/blocks/study-group/index.md diff --git a/content/en/blocks/success-criteria/index.md b/common-content/en/blocks/success-criteria/index.md similarity index 100% rename from content/en/blocks/success-criteria/index.md rename to common-content/en/blocks/success-criteria/index.md diff --git a/content/en/blocks/telephone/index.md b/common-content/en/blocks/telephone/index.md similarity index 100% rename from content/en/blocks/telephone/index.md rename to common-content/en/blocks/telephone/index.md diff --git a/content/en/blocks/useful-links/index.md b/common-content/en/blocks/useful-links/index.md similarity index 100% rename from content/en/blocks/useful-links/index.md rename to common-content/en/blocks/useful-links/index.md diff --git a/content/en/blocks/user-stories/index.md b/common-content/en/blocks/user-stories/index.md similarity index 100% rename from content/en/blocks/user-stories/index.md rename to common-content/en/blocks/user-stories/index.md diff --git a/content/en/blocks/wordle/index.md b/common-content/en/blocks/wordle/index.md similarity index 100% rename from content/en/blocks/wordle/index.md rename to common-content/en/blocks/wordle/index.md diff --git a/content/en/databases/blocks/communicating-with-db/index.md b/common-content/en/module/databases/communicating-with-db/index.md similarity index 100% rename from content/en/databases/blocks/communicating-with-db/index.md rename to common-content/en/module/databases/communicating-with-db/index.md diff --git a/content/en/databases/blocks/creating-a-table/index.md b/common-content/en/module/databases/creating-a-table/index.md similarity index 100% rename from content/en/databases/blocks/creating-a-table/index.md rename to common-content/en/module/databases/creating-a-table/index.md diff --git a/content/en/databases/blocks/crud/crud.png b/common-content/en/module/databases/crud/crud.png similarity index 100% rename from content/en/databases/blocks/crud/crud.png rename to common-content/en/module/databases/crud/crud.png diff --git a/content/en/databases/blocks/crud/index.md b/common-content/en/module/databases/crud/index.md similarity index 100% rename from content/en/databases/blocks/crud/index.md rename to common-content/en/module/databases/crud/index.md diff --git a/content/en/databases/blocks/defining-keys/index.md b/common-content/en/module/databases/defining-keys/index.md similarity index 100% rename from content/en/databases/blocks/defining-keys/index.md rename to common-content/en/module/databases/defining-keys/index.md diff --git a/content/en/databases/blocks/integration-with-node/index.md b/common-content/en/module/databases/integration-with-node/index.md similarity index 100% rename from content/en/databases/blocks/integration-with-node/index.md rename to common-content/en/module/databases/integration-with-node/index.md diff --git a/content/en/databases/blocks/introduction-to-db/index.md b/common-content/en/module/databases/introduction-to-db/index.md similarity index 100% rename from content/en/databases/blocks/introduction-to-db/index.md rename to common-content/en/module/databases/introduction-to-db/index.md diff --git a/content/en/databases/blocks/introduction-to-postgresql/index.md b/common-content/en/module/databases/introduction-to-postgresql/index.md similarity index 100% rename from content/en/databases/blocks/introduction-to-postgresql/index.md rename to common-content/en/module/databases/introduction-to-postgresql/index.md diff --git a/content/en/databases/blocks/introduction-to-postgresql/table-diagram.png b/common-content/en/module/databases/introduction-to-postgresql/table-diagram.png similarity index 100% rename from content/en/databases/blocks/introduction-to-postgresql/table-diagram.png rename to common-content/en/module/databases/introduction-to-postgresql/table-diagram.png diff --git a/content/en/databases/blocks/joining-tables/index.md b/common-content/en/module/databases/joining-tables/index.md similarity index 100% rename from content/en/databases/blocks/joining-tables/index.md rename to common-content/en/module/databases/joining-tables/index.md diff --git a/content/en/databases/blocks/joining-tables/join-diagram.png b/common-content/en/module/databases/joining-tables/join-diagram.png similarity index 100% rename from content/en/databases/blocks/joining-tables/join-diagram.png rename to common-content/en/module/databases/joining-tables/join-diagram.png diff --git a/content/en/databases/blocks/more-selective/index.md b/common-content/en/module/databases/more-selective/index.md similarity index 100% rename from content/en/databases/blocks/more-selective/index.md rename to common-content/en/module/databases/more-selective/index.md diff --git a/content/en/databases/blocks/recap-node/index.md b/common-content/en/module/databases/recap-node/index.md similarity index 100% rename from content/en/databases/blocks/recap-node/index.md rename to common-content/en/module/databases/recap-node/index.md diff --git a/content/en/databases/blocks/recap-node/postman-get-cust-all-results.png b/common-content/en/module/databases/recap-node/postman-get-cust-all-results.png similarity index 100% rename from content/en/databases/blocks/recap-node/postman-get-cust-all-results.png rename to common-content/en/module/databases/recap-node/postman-get-cust-all-results.png diff --git a/content/en/databases/blocks/recap-node/postman-get-cust-all.odg b/common-content/en/module/databases/recap-node/postman-get-cust-all.odg similarity index 100% rename from content/en/databases/blocks/recap-node/postman-get-cust-all.odg rename to common-content/en/module/databases/recap-node/postman-get-cust-all.odg diff --git a/content/en/databases/blocks/recap-node/postman-get-cust-all.png b/common-content/en/module/databases/recap-node/postman-get-cust-all.png similarity index 100% rename from content/en/databases/blocks/recap-node/postman-get-cust-all.png rename to common-content/en/module/databases/recap-node/postman-get-cust-all.png diff --git a/content/en/databases/blocks/updating-rows/index.md b/common-content/en/module/databases/updating-rows/index.md similarity index 100% rename from content/en/databases/blocks/updating-rows/index.md rename to common-content/en/module/databases/updating-rows/index.md diff --git a/content/en/databases/blocks/using-aggregate-functions/index.md b/common-content/en/module/databases/using-aggregate-functions/index.md similarity index 100% rename from content/en/databases/blocks/using-aggregate-functions/index.md rename to common-content/en/module/databases/using-aggregate-functions/index.md diff --git a/content/en/fundamentals/_index.md b/common-content/en/module/fundamentals/_index.md similarity index 100% rename from content/en/fundamentals/_index.md rename to common-content/en/module/fundamentals/_index.md diff --git a/content/en/fundamentals/blocks/blockers/index.md b/common-content/en/module/fundamentals/blockers/index.md similarity index 100% rename from content/en/fundamentals/blocks/blockers/index.md rename to common-content/en/module/fundamentals/blockers/index.md diff --git a/content/en/fundamentals/blocks/code-dot-org/index.md b/common-content/en/module/fundamentals/code-dot-org/index.md similarity index 100% rename from content/en/fundamentals/blocks/code-dot-org/index.md rename to common-content/en/module/fundamentals/code-dot-org/index.md diff --git a/content/en/fundamentals/blocks/cyf-blocks-iteration/index.md b/common-content/en/module/fundamentals/cyf-blocks-iteration/index.md similarity index 100% rename from content/en/fundamentals/blocks/cyf-blocks-iteration/index.md rename to common-content/en/module/fundamentals/cyf-blocks-iteration/index.md diff --git a/content/en/fundamentals/blocks/cyf-blocks-requirements/index.md b/common-content/en/module/fundamentals/cyf-blocks-requirements/index.md similarity index 100% rename from content/en/fundamentals/blocks/cyf-blocks-requirements/index.md rename to common-content/en/module/fundamentals/cyf-blocks-requirements/index.md diff --git a/content/en/fundamentals/blocks/goals/index.md b/common-content/en/module/fundamentals/goals/index.md similarity index 100% rename from content/en/fundamentals/blocks/goals/index.md rename to common-content/en/module/fundamentals/goals/index.md diff --git a/content/en/fundamentals/blocks/mvp/index.md b/common-content/en/module/fundamentals/mvp/index.md similarity index 100% rename from content/en/fundamentals/blocks/mvp/index.md rename to common-content/en/module/fundamentals/mvp/index.md diff --git a/content/en/fundamentals/blocks/next-steps/index.md b/common-content/en/module/fundamentals/next-steps/index.md similarity index 100% rename from content/en/fundamentals/blocks/next-steps/index.md rename to common-content/en/module/fundamentals/next-steps/index.md diff --git a/content/en/fundamentals/blocks/overcoming-blockers/index.md b/common-content/en/module/fundamentals/overcoming-blockers/index.md similarity index 100% rename from content/en/fundamentals/blocks/overcoming-blockers/index.md rename to common-content/en/module/fundamentals/overcoming-blockers/index.md diff --git a/content/en/fundamentals/blocks/pairing/index.md b/common-content/en/module/fundamentals/pairing/index.md similarity index 100% rename from content/en/fundamentals/blocks/pairing/index.md rename to common-content/en/module/fundamentals/pairing/index.md diff --git a/content/en/fundamentals/blocks/ship-it-delivery/index.md b/common-content/en/module/fundamentals/ship-it-delivery/index.md similarity index 100% rename from content/en/fundamentals/blocks/ship-it-delivery/index.md rename to common-content/en/module/fundamentals/ship-it-delivery/index.md diff --git a/content/en/fundamentals/blocks/ship-it-iteration/index.md b/common-content/en/module/fundamentals/ship-it-iteration/index.md similarity index 100% rename from content/en/fundamentals/blocks/ship-it-iteration/index.md rename to common-content/en/module/fundamentals/ship-it-iteration/index.md diff --git a/content/en/fundamentals/blocks/ship-it-requirements/index.md b/common-content/en/module/fundamentals/ship-it-requirements/index.md similarity index 100% rename from content/en/fundamentals/blocks/ship-it-requirements/index.md rename to common-content/en/module/fundamentals/ship-it-requirements/index.md diff --git a/content/en/fundamentals/blocks/using-the-curriculum/index.md b/common-content/en/module/fundamentals/using-the-curriculum/index.md similarity index 100% rename from content/en/fundamentals/blocks/using-the-curriculum/index.md rename to common-content/en/module/fundamentals/using-the-curriculum/index.md diff --git a/content/en/fundamentals/blocks/wrap-up/index.md b/common-content/en/module/fundamentals/wrap-up/index.md similarity index 100% rename from content/en/fundamentals/blocks/wrap-up/index.md rename to common-content/en/module/fundamentals/wrap-up/index.md diff --git a/content/en/html-css/blocks/what-are-components/index.md b/common-content/en/module/html-css/what-are-components/index.md similarity index 100% rename from content/en/html-css/blocks/what-are-components/index.md rename to common-content/en/module/html-css/what-are-components/index.md diff --git a/content/en/html-css/blocks/what-are-forms/index.md b/common-content/en/module/html-css/what-are-forms/index.md similarity index 100% rename from content/en/html-css/blocks/what-are-forms/index.md rename to common-content/en/module/html-css/what-are-forms/index.md diff --git a/content/en/html-css/blocks/what-is-css/index.md b/common-content/en/module/html-css/what-is-css/index.md similarity index 100% rename from content/en/html-css/blocks/what-is-css/index.md rename to common-content/en/module/html-css/what-is-css/index.md diff --git a/content/en/html-css/blocks/what-is-html/index.md b/common-content/en/module/html-css/what-is-html/index.md similarity index 100% rename from content/en/html-css/blocks/what-is-html/index.md rename to common-content/en/module/html-css/what-is-html/index.md diff --git a/content/en/induction/blocks/branching/commit-history.png b/common-content/en/module/induction/branching/commit-history.png similarity index 100% rename from content/en/induction/blocks/branching/commit-history.png rename to common-content/en/module/induction/branching/commit-history.png diff --git a/content/en/induction/blocks/branching/highlight-2nd-commit.png b/common-content/en/module/induction/branching/highlight-2nd-commit.png similarity index 100% rename from content/en/induction/blocks/branching/highlight-2nd-commit.png rename to common-content/en/module/induction/branching/highlight-2nd-commit.png diff --git a/content/en/induction/blocks/branching/index.md b/common-content/en/module/induction/branching/index.md similarity index 100% rename from content/en/induction/blocks/branching/index.md rename to common-content/en/module/induction/branching/index.md diff --git a/content/en/induction/blocks/branching/lesson1-four-repo-diagram.png b/common-content/en/module/induction/branching/lesson1-four-repo-diagram.png similarity index 100% rename from content/en/induction/blocks/branching/lesson1-four-repo-diagram.png rename to common-content/en/module/induction/branching/lesson1-four-repo-diagram.png diff --git a/content/en/induction/blocks/branching/main-branch-highlighted.png b/common-content/en/module/induction/branching/main-branch-highlighted.png similarity index 100% rename from content/en/induction/blocks/branching/main-branch-highlighted.png rename to common-content/en/module/induction/branching/main-branch-highlighted.png diff --git a/content/en/induction/blocks/check-git-installation/index.md b/common-content/en/module/induction/check-git-installation/index.md similarity index 100% rename from content/en/induction/blocks/check-git-installation/index.md rename to common-content/en/module/induction/check-git-installation/index.md diff --git a/content/en/induction/blocks/check-github/index.md b/common-content/en/module/induction/check-github/index.md similarity index 100% rename from content/en/induction/blocks/check-github/index.md rename to common-content/en/module/induction/check-github/index.md diff --git a/content/en/induction/blocks/check-out-a-commit/index.md b/common-content/en/module/induction/check-out-a-commit/index.md similarity index 100% rename from content/en/induction/blocks/check-out-a-commit/index.md rename to common-content/en/module/induction/check-out-a-commit/index.md diff --git a/content/en/induction/blocks/cyf-blog/index.md b/common-content/en/module/induction/cyf-blog/index.md similarity index 100% rename from content/en/induction/blocks/cyf-blog/index.md rename to common-content/en/module/induction/cyf-blog/index.md diff --git a/content/en/induction/blocks/cyf-folder/index.md b/common-content/en/module/induction/cyf-folder/index.md similarity index 100% rename from content/en/induction/blocks/cyf-folder/index.md rename to common-content/en/module/induction/cyf-folder/index.md diff --git a/content/en/induction/blocks/development-process/different-blog-versions.png b/common-content/en/module/induction/development-process/different-blog-versions.png similarity index 100% rename from content/en/induction/blocks/development-process/different-blog-versions.png rename to common-content/en/module/induction/development-process/different-blog-versions.png diff --git a/content/en/induction/blocks/development-process/index.md b/common-content/en/module/induction/development-process/index.md similarity index 100% rename from content/en/induction/blocks/development-process/index.md rename to common-content/en/module/induction/development-process/index.md diff --git a/content/en/induction/blocks/forking-a-repository/index.md b/common-content/en/module/induction/forking-a-repository/index.md similarity index 100% rename from content/en/induction/blocks/forking-a-repository/index.md rename to common-content/en/module/induction/forking-a-repository/index.md diff --git a/content/en/induction/blocks/forking-a-repository/lesson1-forked-url-anatomy.png b/common-content/en/module/induction/forking-a-repository/lesson1-forked-url-anatomy.png similarity index 100% rename from content/en/induction/blocks/forking-a-repository/lesson1-forked-url-anatomy.png rename to common-content/en/module/induction/forking-a-repository/lesson1-forked-url-anatomy.png diff --git a/content/en/induction/blocks/forking-a-repository/lesson1-github-url-anatomy.png b/common-content/en/module/induction/forking-a-repository/lesson1-github-url-anatomy.png similarity index 100% rename from content/en/induction/blocks/forking-a-repository/lesson1-github-url-anatomy.png rename to common-content/en/module/induction/forking-a-repository/lesson1-github-url-anatomy.png diff --git a/content/en/induction/blocks/github-poets/index.md b/common-content/en/module/induction/github-poets/index.md similarity index 100% rename from content/en/induction/blocks/github-poets/index.md rename to common-content/en/module/induction/github-poets/index.md diff --git a/content/en/induction/blocks/github/index.md b/common-content/en/module/induction/github/index.md similarity index 100% rename from content/en/induction/blocks/github/index.md rename to common-content/en/module/induction/github/index.md diff --git a/content/en/induction/blocks/handshake/index.md b/common-content/en/module/induction/handshake/index.md similarity index 100% rename from content/en/induction/blocks/handshake/index.md rename to common-content/en/module/induction/handshake/index.md diff --git a/content/en/induction/blocks/install-vscode/index.md b/common-content/en/module/induction/install-vscode/index.md similarity index 100% rename from content/en/induction/blocks/install-vscode/index.md rename to common-content/en/module/induction/install-vscode/index.md diff --git a/content/en/induction/blocks/learning-as-community/index.md b/common-content/en/module/induction/learning-as-community/index.md similarity index 100% rename from content/en/induction/blocks/learning-as-community/index.md rename to common-content/en/module/induction/learning-as-community/index.md diff --git a/content/en/induction/blocks/next-steps/index.md b/common-content/en/module/induction/next-steps/index.md similarity index 100% rename from content/en/induction/blocks/next-steps/index.md rename to common-content/en/module/induction/next-steps/index.md diff --git a/content/en/induction/blocks/previous-versions/index.md b/common-content/en/module/induction/previous-versions/index.md similarity index 100% rename from content/en/induction/blocks/previous-versions/index.md rename to common-content/en/module/induction/previous-versions/index.md diff --git a/content/en/induction/blocks/sharing-history/index.md b/common-content/en/module/induction/sharing-history/index.md similarity index 100% rename from content/en/induction/blocks/sharing-history/index.md rename to common-content/en/module/induction/sharing-history/index.md diff --git a/content/en/induction/blocks/version-control/commit-history-relative-dates.png b/common-content/en/module/induction/version-control/commit-history-relative-dates.png similarity index 100% rename from content/en/induction/blocks/version-control/commit-history-relative-dates.png rename to common-content/en/module/induction/version-control/commit-history-relative-dates.png diff --git a/content/en/induction/blocks/version-control/index.md b/common-content/en/module/induction/version-control/index.md similarity index 100% rename from content/en/induction/blocks/version-control/index.md rename to common-content/en/module/induction/version-control/index.md diff --git a/content/en/induction/blocks/viewing-files/fork-and-clone-diagram.png b/common-content/en/module/induction/viewing-files/fork-and-clone-diagram.png similarity index 100% rename from content/en/induction/blocks/viewing-files/fork-and-clone-diagram.png rename to common-content/en/module/induction/viewing-files/fork-and-clone-diagram.png diff --git a/content/en/induction/blocks/viewing-files/index.md b/common-content/en/module/induction/viewing-files/index.md similarity index 100% rename from content/en/induction/blocks/viewing-files/index.md rename to common-content/en/module/induction/viewing-files/index.md diff --git a/content/en/induction/blocks/working-locally/index.md b/common-content/en/module/induction/working-locally/index.md similarity index 100% rename from content/en/induction/blocks/working-locally/index.md rename to common-content/en/module/induction/working-locally/index.md diff --git a/content/en/induction/blocks/wrapping-up/index.md b/common-content/en/module/induction/wrapping-up/index.md similarity index 100% rename from content/en/induction/blocks/wrapping-up/index.md rename to common-content/en/module/induction/wrapping-up/index.md diff --git a/content/en/js1/_index.md b/common-content/en/module/js1/_index.md similarity index 100% rename from content/en/js1/_index.md rename to common-content/en/module/js1/_index.md diff --git a/content/en/js1/blocks/api/index.md b/common-content/en/module/js1/api/index.md similarity index 100% rename from content/en/js1/blocks/api/index.md rename to common-content/en/module/js1/api/index.md diff --git a/content/en/js1/blocks/assembly/index.md b/common-content/en/module/js1/assembly/index.md similarity index 100% rename from content/en/js1/blocks/assembly/index.md rename to common-content/en/module/js1/assembly/index.md diff --git a/content/en/js1/blocks/assertions/index.md b/common-content/en/module/js1/assertions/index.md similarity index 100% rename from content/en/js1/blocks/assertions/index.md rename to common-content/en/module/js1/assertions/index.md diff --git a/content/en/js1/blocks/cases/index.md b/common-content/en/module/js1/cases/index.md similarity index 100% rename from content/en/js1/blocks/cases/index.md rename to common-content/en/module/js1/cases/index.md diff --git a/content/en/js1/blocks/check-unix-os/index.md b/common-content/en/module/js1/check-unix-os/index.md similarity index 100% rename from content/en/js1/blocks/check-unix-os/index.md rename to common-content/en/module/js1/check-unix-os/index.md diff --git a/content/en/js1/blocks/clocks/index.md b/common-content/en/module/js1/clocks/index.md similarity index 100% rename from content/en/js1/blocks/clocks/index.md rename to common-content/en/module/js1/clocks/index.md diff --git a/content/en/js1/blocks/comparison/index.md b/common-content/en/module/js1/comparison/index.md similarity index 100% rename from content/en/js1/blocks/comparison/index.md rename to common-content/en/module/js1/comparison/index.md diff --git a/content/en/js1/blocks/conditionality/index.md b/common-content/en/module/js1/conditionality/index.md similarity index 100% rename from content/en/js1/blocks/conditionality/index.md rename to common-content/en/module/js1/conditionality/index.md diff --git a/content/en/js1/blocks/data/index.md b/common-content/en/module/js1/data/index.md similarity index 100% rename from content/en/js1/blocks/data/index.md rename to common-content/en/module/js1/data/index.md diff --git a/content/en/js1/blocks/declarations-statements/index.md b/common-content/en/module/js1/declarations-statements/index.md similarity index 100% rename from content/en/js1/blocks/declarations-statements/index.md rename to common-content/en/module/js1/declarations-statements/index.md diff --git a/content/en/js1/blocks/declaring-functions/index.md b/common-content/en/module/js1/declaring-functions/index.md similarity index 100% rename from content/en/js1/blocks/declaring-functions/index.md rename to common-content/en/module/js1/declaring-functions/index.md diff --git a/content/en/js1/blocks/declaring-functions/round.gif b/common-content/en/module/js1/declaring-functions/round.gif similarity index 100% rename from content/en/js1/blocks/declaring-functions/round.gif rename to common-content/en/module/js1/declaring-functions/round.gif diff --git a/content/en/js1/blocks/errors/index.md b/common-content/en/module/js1/errors/index.md similarity index 100% rename from content/en/js1/blocks/errors/index.md rename to common-content/en/module/js1/errors/index.md diff --git a/content/en/js1/blocks/feedback/index.md b/common-content/en/module/js1/feedback/index.md similarity index 100% rename from content/en/js1/blocks/feedback/index.md rename to common-content/en/module/js1/feedback/index.md diff --git a/content/en/js1/blocks/feedback/test-feedback-fail.png b/common-content/en/module/js1/feedback/test-feedback-fail.png similarity index 100% rename from content/en/js1/blocks/feedback/test-feedback-fail.png rename to common-content/en/module/js1/feedback/test-feedback-fail.png diff --git a/content/en/js1/blocks/feedback/test-reference-error.png b/common-content/en/module/js1/feedback/test-reference-error.png similarity index 100% rename from content/en/js1/blocks/feedback/test-reference-error.png rename to common-content/en/module/js1/feedback/test-reference-error.png diff --git a/content/en/js1/blocks/framework/index.md b/common-content/en/module/js1/framework/index.md similarity index 100% rename from content/en/js1/blocks/framework/index.md rename to common-content/en/module/js1/framework/index.md diff --git a/content/en/js1/blocks/functions/index.md b/common-content/en/module/js1/functions/index.md similarity index 100% rename from content/en/js1/blocks/functions/index.md rename to common-content/en/module/js1/functions/index.md diff --git a/content/en/js1/blocks/functions/round.gif b/common-content/en/module/js1/functions/round.gif similarity index 100% rename from content/en/js1/blocks/functions/round.gif rename to common-content/en/module/js1/functions/round.gif diff --git a/content/en/js1/blocks/generalise/index.md b/common-content/en/module/js1/generalise/index.md similarity index 100% rename from content/en/js1/blocks/generalise/index.md rename to common-content/en/module/js1/generalise/index.md diff --git a/content/en/js1/blocks/generalise/second-case-fail.png b/common-content/en/module/js1/generalise/second-case-fail.png similarity index 100% rename from content/en/js1/blocks/generalise/second-case-fail.png rename to common-content/en/module/js1/generalise/second-case-fail.png diff --git a/content/en/js1/blocks/improving/index.md b/common-content/en/module/js1/improving/index.md similarity index 100% rename from content/en/js1/blocks/improving/index.md rename to common-content/en/module/js1/improving/index.md diff --git a/content/en/js1/blocks/install-node/index.md b/common-content/en/module/js1/install-node/index.md similarity index 100% rename from content/en/js1/blocks/install-node/index.md rename to common-content/en/module/js1/install-node/index.md diff --git a/content/en/js1/blocks/installing/index.md b/common-content/en/module/js1/installing/index.md similarity index 100% rename from content/en/js1/blocks/installing/index.md rename to common-content/en/module/js1/installing/index.md diff --git a/content/en/js1/blocks/installing/jest-install.png b/common-content/en/module/js1/installing/jest-install.png similarity index 100% rename from content/en/js1/blocks/installing/jest-install.png rename to common-content/en/module/js1/installing/jest-install.png diff --git a/content/en/js1/blocks/interface/index.md b/common-content/en/module/js1/interface/index.md similarity index 100% rename from content/en/js1/blocks/interface/index.md rename to common-content/en/module/js1/interface/index.md diff --git a/content/en/js1/blocks/logging/index.md b/common-content/en/module/js1/logging/index.md similarity index 100% rename from content/en/js1/blocks/logging/index.md rename to common-content/en/module/js1/logging/index.md diff --git a/content/en/js1/blocks/ordinal/index.md b/common-content/en/module/js1/ordinal/index.md similarity index 100% rename from content/en/js1/blocks/ordinal/index.md rename to common-content/en/module/js1/ordinal/index.md diff --git a/content/en/js1/blocks/outliers/index.md b/common-content/en/module/js1/outliers/index.md similarity index 100% rename from content/en/js1/blocks/outliers/index.md rename to common-content/en/module/js1/outliers/index.md diff --git a/content/en/js1/blocks/outliers/second-case-fail.png b/common-content/en/module/js1/outliers/second-case-fail.png similarity index 100% rename from content/en/js1/blocks/outliers/second-case-fail.png rename to common-content/en/module/js1/outliers/second-case-fail.png diff --git a/content/en/js1/blocks/packages/index.md b/common-content/en/module/js1/packages/index.md similarity index 100% rename from content/en/js1/blocks/packages/index.md rename to common-content/en/module/js1/packages/index.md diff --git a/content/en/js1/blocks/parameters/index.md b/common-content/en/module/js1/parameters/index.md similarity index 100% rename from content/en/js1/blocks/parameters/index.md rename to common-content/en/module/js1/parameters/index.md diff --git a/content/en/js1/blocks/percentages/index.md b/common-content/en/module/js1/percentages/index.md similarity index 100% rename from content/en/js1/blocks/percentages/index.md rename to common-content/en/module/js1/percentages/index.md diff --git a/content/en/js1/blocks/playing-computer/global-frame.png b/common-content/en/module/js1/playing-computer/global-frame.png similarity index 100% rename from content/en/js1/blocks/playing-computer/global-frame.png rename to common-content/en/module/js1/playing-computer/global-frame.png diff --git a/content/en/js1/blocks/playing-computer/index.md b/common-content/en/module/js1/playing-computer/index.md similarity index 100% rename from content/en/js1/blocks/playing-computer/index.md rename to common-content/en/module/js1/playing-computer/index.md diff --git a/content/en/js1/blocks/playing-computer/make-greeting-frame.png b/common-content/en/module/js1/playing-computer/make-greeting-frame.png similarity index 100% rename from content/en/js1/blocks/playing-computer/make-greeting-frame.png rename to common-content/en/module/js1/playing-computer/make-greeting-frame.png diff --git a/content/en/js1/blocks/playing-computer/runtime-diagram-1.png b/common-content/en/module/js1/playing-computer/runtime-diagram-1.png similarity index 100% rename from content/en/js1/blocks/playing-computer/runtime-diagram-1.png rename to common-content/en/module/js1/playing-computer/runtime-diagram-1.png diff --git a/content/en/js1/blocks/repl/index.md b/common-content/en/module/js1/repl/index.md similarity index 100% rename from content/en/js1/blocks/repl/index.md rename to common-content/en/module/js1/repl/index.md diff --git a/content/en/js1/blocks/return/index.md b/common-content/en/module/js1/return/index.md similarity index 100% rename from content/en/js1/blocks/return/index.md rename to common-content/en/module/js1/return/index.md diff --git a/content/en/js1/blocks/reuse/index.md b/common-content/en/module/js1/reuse/index.md similarity index 100% rename from content/en/js1/blocks/reuse/index.md rename to common-content/en/module/js1/reuse/index.md diff --git a/content/en/js1/blocks/reuse/round.gif b/common-content/en/module/js1/reuse/round.gif similarity index 100% rename from content/en/js1/blocks/reuse/round.gif rename to common-content/en/module/js1/reuse/round.gif diff --git a/content/en/js1/blocks/scope/index.md b/common-content/en/module/js1/scope/index.md similarity index 100% rename from content/en/js1/blocks/scope/index.md rename to common-content/en/module/js1/scope/index.md diff --git a/content/en/js1/blocks/scripts/index.md b/common-content/en/module/js1/scripts/index.md similarity index 100% rename from content/en/js1/blocks/scripts/index.md rename to common-content/en/module/js1/scripts/index.md diff --git a/content/en/js1/blocks/setup/index.md b/common-content/en/module/js1/setup/index.md similarity index 100% rename from content/en/js1/blocks/setup/index.md rename to common-content/en/module/js1/setup/index.md diff --git a/content/en/js1/blocks/setup/jest-install.png b/common-content/en/module/js1/setup/jest-install.png similarity index 100% rename from content/en/js1/blocks/setup/jest-install.png rename to common-content/en/module/js1/setup/jest-install.png diff --git a/content/en/js1/blocks/strategy/index.md b/common-content/en/module/js1/strategy/index.md similarity index 100% rename from content/en/js1/blocks/strategy/index.md rename to common-content/en/module/js1/strategy/index.md diff --git a/content/en/js1/blocks/strings/index.md b/common-content/en/module/js1/strings/index.md similarity index 100% rename from content/en/js1/blocks/strings/index.md rename to common-content/en/module/js1/strings/index.md diff --git a/content/en/js1/blocks/sub-goal/index.md b/common-content/en/module/js1/sub-goal/index.md similarity index 100% rename from content/en/js1/blocks/sub-goal/index.md rename to common-content/en/module/js1/sub-goal/index.md diff --git a/content/en/js1/blocks/terminal/index.md b/common-content/en/module/js1/terminal/index.md similarity index 100% rename from content/en/js1/blocks/terminal/index.md rename to common-content/en/module/js1/terminal/index.md diff --git a/content/en/js1/blocks/terminal/terminal.gif b/common-content/en/module/js1/terminal/terminal.gif similarity index 100% rename from content/en/js1/blocks/terminal/terminal.gif rename to common-content/en/module/js1/terminal/terminal.gif diff --git a/content/en/js1/blocks/variables/greeting.gif b/common-content/en/module/js1/variables/greeting.gif similarity index 100% rename from content/en/js1/blocks/variables/greeting.gif rename to common-content/en/module/js1/variables/greeting.gif diff --git a/content/en/js1/blocks/variables/index.md b/common-content/en/module/js1/variables/index.md similarity index 100% rename from content/en/js1/blocks/variables/index.md rename to common-content/en/module/js1/variables/index.md diff --git a/content/en/js2/blocks/access/index.md b/common-content/en/module/js2/access/index.md similarity index 100% rename from content/en/js2/blocks/access/index.md rename to common-content/en/module/js2/access/index.md diff --git a/content/en/js2/blocks/arrays/index.md b/common-content/en/module/js2/arrays/index.md similarity index 100% rename from content/en/js2/blocks/arrays/index.md rename to common-content/en/module/js2/arrays/index.md diff --git a/content/en/js2/blocks/assembly/index.md b/common-content/en/module/js2/assembly/index.md similarity index 100% rename from content/en/js2/blocks/assembly/index.md rename to common-content/en/module/js2/assembly/index.md diff --git a/content/en/js2/blocks/browser/index.md b/common-content/en/module/js2/browser/index.md similarity index 100% rename from content/en/js2/blocks/browser/index.md rename to common-content/en/module/js2/browser/index.md diff --git a/content/en/js2/blocks/character-limit/index.md b/common-content/en/module/js2/character-limit/index.md similarity index 100% rename from content/en/js2/blocks/character-limit/index.md rename to common-content/en/module/js2/character-limit/index.md diff --git a/content/en/js2/blocks/check-in/index.md b/common-content/en/module/js2/check-in/index.md similarity index 100% rename from content/en/js2/blocks/check-in/index.md rename to common-content/en/module/js2/check-in/index.md diff --git a/content/en/js2/blocks/check-progress/index.md b/common-content/en/module/js2/check-progress/index.md similarity index 100% rename from content/en/js2/blocks/check-progress/index.md rename to common-content/en/module/js2/check-progress/index.md diff --git a/content/en/js2/blocks/demo/index.md b/common-content/en/module/js2/demo/index.md similarity index 100% rename from content/en/js2/blocks/demo/index.md rename to common-content/en/module/js2/demo/index.md diff --git a/content/en/js2/blocks/dom/html-tree.png b/common-content/en/module/js2/dom/html-tree.png similarity index 100% rename from content/en/js2/blocks/dom/html-tree.png rename to common-content/en/module/js2/dom/html-tree.png diff --git a/content/en/js2/blocks/dom/index.md b/common-content/en/module/js2/dom/index.md similarity index 100% rename from content/en/js2/blocks/dom/index.md rename to common-content/en/module/js2/dom/index.md diff --git a/content/en/js2/blocks/events/index.md b/common-content/en/module/js2/events/index.md similarity index 100% rename from content/en/js2/blocks/events/index.md rename to common-content/en/module/js2/events/index.md diff --git a/content/en/js2/blocks/grouping-data/index.md b/common-content/en/module/js2/grouping-data/index.md similarity index 100% rename from content/en/js2/blocks/grouping-data/index.md rename to common-content/en/module/js2/grouping-data/index.md diff --git a/content/en/js2/blocks/iteration/index.md b/common-content/en/module/js2/iteration/index.md similarity index 100% rename from content/en/js2/blocks/iteration/index.md rename to common-content/en/module/js2/iteration/index.md diff --git a/content/en/js2/blocks/key-values/index.md b/common-content/en/module/js2/key-values/index.md similarity index 100% rename from content/en/js2/blocks/key-values/index.md rename to common-content/en/module/js2/key-values/index.md diff --git a/content/en/js2/blocks/mean/index.md b/common-content/en/module/js2/mean/index.md similarity index 100% rename from content/en/js2/blocks/mean/index.md rename to common-content/en/module/js2/mean/index.md diff --git a/content/en/js2/blocks/median/index.md b/common-content/en/module/js2/median/index.md similarity index 100% rename from content/en/js2/blocks/median/index.md rename to common-content/en/module/js2/median/index.md diff --git a/content/en/js2/blocks/multiple-params/index.md b/common-content/en/module/js2/multiple-params/index.md similarity index 100% rename from content/en/js2/blocks/multiple-params/index.md rename to common-content/en/module/js2/multiple-params/index.md diff --git a/content/en/js2/blocks/mutating/index.md b/common-content/en/module/js2/mutating/index.md similarity index 100% rename from content/en/js2/blocks/mutating/index.md rename to common-content/en/module/js2/mutating/index.md diff --git a/content/en/js2/blocks/mutation/index.md b/common-content/en/module/js2/mutation/index.md similarity index 100% rename from content/en/js2/blocks/mutation/index.md rename to common-content/en/module/js2/mutation/index.md diff --git a/content/en/js2/blocks/no-params/index.md b/common-content/en/module/js2/no-params/index.md similarity index 100% rename from content/en/js2/blocks/no-params/index.md rename to common-content/en/module/js2/no-params/index.md diff --git a/content/en/js2/blocks/no-params/to-be-check-error.png b/common-content/en/module/js2/no-params/to-be-check-error.png similarity index 100% rename from content/en/js2/blocks/no-params/to-be-check-error.png rename to common-content/en/module/js2/no-params/to-be-check-error.png diff --git a/content/en/js2/blocks/one-pair/index.md b/common-content/en/module/js2/one-pair/index.md similarity index 100% rename from content/en/js2/blocks/one-pair/index.md rename to common-content/en/module/js2/one-pair/index.md diff --git a/content/en/js2/blocks/one-pair/literal-key.png b/common-content/en/module/js2/one-pair/literal-key.png similarity index 100% rename from content/en/js2/blocks/one-pair/literal-key.png rename to common-content/en/module/js2/one-pair/literal-key.png diff --git a/content/en/js2/blocks/ordered-data/index.md b/common-content/en/module/js2/ordered-data/index.md similarity index 100% rename from content/en/js2/blocks/ordered-data/index.md rename to common-content/en/module/js2/ordered-data/index.md diff --git a/content/en/js2/blocks/pair-up/index.md b/common-content/en/module/js2/pair-up/index.md similarity index 100% rename from content/en/js2/blocks/pair-up/index.md rename to common-content/en/module/js2/pair-up/index.md diff --git a/content/en/js2/blocks/pick-an-app/index.md b/common-content/en/module/js2/pick-an-app/index.md similarity index 100% rename from content/en/js2/blocks/pick-an-app/index.md rename to common-content/en/module/js2/pick-an-app/index.md diff --git a/content/en/js2/blocks/plan/index.md b/common-content/en/module/js2/plan/index.md similarity index 100% rename from content/en/js2/blocks/plan/index.md rename to common-content/en/module/js2/plan/index.md diff --git a/content/en/js2/blocks/query-string/index.md b/common-content/en/module/js2/query-string/index.md similarity index 100% rename from content/en/js2/blocks/query-string/index.md rename to common-content/en/module/js2/query-string/index.md diff --git a/content/en/js2/blocks/querying/index.md b/common-content/en/module/js2/querying/index.md similarity index 100% rename from content/en/js2/blocks/querying/index.md rename to common-content/en/module/js2/querying/index.md diff --git a/content/en/js2/blocks/reference/index.md b/common-content/en/module/js2/reference/index.md similarity index 100% rename from content/en/js2/blocks/reference/index.md rename to common-content/en/module/js2/reference/index.md diff --git a/content/en/js2/blocks/reference/point-to-array.png b/common-content/en/module/js2/reference/point-to-array.png similarity index 100% rename from content/en/js2/blocks/reference/point-to-array.png rename to common-content/en/module/js2/reference/point-to-array.png diff --git a/content/en/js2/blocks/response/index.md b/common-content/en/module/js2/response/index.md similarity index 100% rename from content/en/js2/blocks/response/index.md rename to common-content/en/module/js2/response/index.md diff --git a/content/en/js2/blocks/side-effects/index.md b/common-content/en/module/js2/side-effects/index.md similarity index 100% rename from content/en/js2/blocks/side-effects/index.md rename to common-content/en/module/js2/side-effects/index.md diff --git a/content/en/js2/blocks/summing/index.md b/common-content/en/module/js2/summing/index.md similarity index 100% rename from content/en/js2/blocks/summing/index.md rename to common-content/en/module/js2/summing/index.md diff --git a/content/en/js2/blocks/update/index.md b/common-content/en/module/js2/update/index.md similarity index 100% rename from content/en/js2/blocks/update/index.md rename to common-content/en/module/js2/update/index.md diff --git a/content/en/js2/blocks/variable-keys/index.md b/common-content/en/module/js2/variable-keys/index.md similarity index 100% rename from content/en/js2/blocks/variable-keys/index.md rename to common-content/en/module/js2/variable-keys/index.md diff --git a/content/en/js2/blocks/variable-keys/parse-query-test-feedback.png b/common-content/en/module/js2/variable-keys/parse-query-test-feedback.png similarity index 100% rename from content/en/js2/blocks/variable-keys/parse-query-test-feedback.png rename to common-content/en/module/js2/variable-keys/parse-query-test-feedback.png diff --git a/content/en/js3/_index.md b/common-content/en/module/js3/_index.md similarity index 100% rename from content/en/js3/_index.md rename to common-content/en/module/js3/_index.md diff --git a/content/en/js3/blocks/async-await/index.md b/common-content/en/module/js3/async-await/index.md similarity index 100% rename from content/en/js3/blocks/async-await/index.md rename to common-content/en/module/js3/async-await/index.md diff --git a/content/en/js3/blocks/asynchrony/index.md b/common-content/en/module/js3/asynchrony/index.md similarity index 100% rename from content/en/js3/blocks/asynchrony/index.md rename to common-content/en/module/js3/asynchrony/index.md diff --git a/content/en/js3/blocks/break-down/index.md b/common-content/en/module/js3/break-down/index.md similarity index 100% rename from content/en/js3/blocks/break-down/index.md rename to common-content/en/module/js3/break-down/index.md diff --git a/content/en/js3/blocks/callbacks/index.md b/common-content/en/module/js3/callbacks/index.md similarity index 100% rename from content/en/js3/blocks/callbacks/index.md rename to common-content/en/module/js3/callbacks/index.md diff --git a/content/en/js3/blocks/capturing-events/index.md b/common-content/en/module/js3/capturing-events/index.md similarity index 100% rename from content/en/js3/blocks/capturing-events/index.md rename to common-content/en/module/js3/capturing-events/index.md diff --git a/content/en/js3/blocks/catch/index.md b/common-content/en/module/js3/catch/index.md similarity index 100% rename from content/en/js3/blocks/catch/index.md rename to common-content/en/module/js3/catch/index.md diff --git a/content/en/js3/blocks/chaining/index.md b/common-content/en/module/js3/chaining/index.md similarity index 100% rename from content/en/js3/blocks/chaining/index.md rename to common-content/en/module/js3/chaining/index.md diff --git a/content/en/js3/blocks/components/index.md b/common-content/en/module/js3/components/index.md similarity index 100% rename from content/en/js3/blocks/components/index.md rename to common-content/en/module/js3/components/index.md diff --git a/content/en/js3/blocks/composing-elements/index.md b/common-content/en/module/js3/composing-elements/index.md similarity index 100% rename from content/en/js3/blocks/composing-elements/index.md rename to common-content/en/module/js3/composing-elements/index.md diff --git a/content/en/js3/blocks/data-ui/index.md b/common-content/en/module/js3/data-ui/index.md similarity index 100% rename from content/en/js3/blocks/data-ui/index.md rename to common-content/en/module/js3/data-ui/index.md diff --git a/content/en/js3/blocks/fetch-films/data.json b/common-content/en/module/js3/fetch-films/data.json similarity index 100% rename from content/en/js3/blocks/fetch-films/data.json rename to common-content/en/module/js3/fetch-films/data.json diff --git a/content/en/js3/blocks/fetch-films/filterFilms.html b/common-content/en/module/js3/fetch-films/filterFilms.html similarity index 100% rename from content/en/js3/blocks/fetch-films/filterFilms.html rename to common-content/en/module/js3/fetch-films/filterFilms.html diff --git a/content/en/js3/blocks/fetch-films/index.md b/common-content/en/module/js3/fetch-films/index.md similarity index 100% rename from content/en/js3/blocks/fetch-films/index.md rename to common-content/en/module/js3/fetch-films/index.md diff --git a/content/en/js3/blocks/fetch/index.md b/common-content/en/module/js3/fetch/index.md similarity index 100% rename from content/en/js3/blocks/fetch/index.md rename to common-content/en/module/js3/fetch/index.md diff --git a/content/en/js3/blocks/fetching-data/index.md b/common-content/en/module/js3/fetching-data/index.md similarity index 100% rename from content/en/js3/blocks/fetching-data/index.md rename to common-content/en/module/js3/fetching-data/index.md diff --git a/content/en/js3/blocks/identifying-state/index.md b/common-content/en/module/js3/identifying-state/index.md similarity index 100% rename from content/en/js3/blocks/identifying-state/index.md rename to common-content/en/module/js3/identifying-state/index.md diff --git a/content/en/js3/blocks/internet/index.md b/common-content/en/module/js3/internet/index.md similarity index 100% rename from content/en/js3/blocks/internet/index.md rename to common-content/en/module/js3/internet/index.md diff --git a/content/en/js3/blocks/introducing-new-state/index.md b/common-content/en/module/js3/introducing-new-state/index.md similarity index 100% rename from content/en/js3/blocks/introducing-new-state/index.md rename to common-content/en/module/js3/introducing-new-state/index.md diff --git a/content/en/js3/blocks/latency/index.md b/common-content/en/module/js3/latency/index.md similarity index 100% rename from content/en/js3/blocks/latency/index.md rename to common-content/en/module/js3/latency/index.md diff --git a/content/en/js3/blocks/now-showing/film-cards.png b/common-content/en/module/js3/now-showing/film-cards.png similarity index 100% rename from content/en/js3/blocks/now-showing/film-cards.png rename to common-content/en/module/js3/now-showing/film-cards.png diff --git a/content/en/js3/blocks/now-showing/index.md b/common-content/en/module/js3/now-showing/index.md similarity index 100% rename from content/en/js3/blocks/now-showing/index.md rename to common-content/en/module/js3/now-showing/index.md diff --git a/content/en/js3/blocks/one-to-one/index.md b/common-content/en/module/js3/one-to-one/index.md similarity index 100% rename from content/en/js3/blocks/one-to-one/index.md rename to common-content/en/module/js3/one-to-one/index.md diff --git a/content/en/js3/blocks/promises/index.md b/common-content/en/module/js3/promises/index.md similarity index 100% rename from content/en/js3/blocks/promises/index.md rename to common-content/en/module/js3/promises/index.md diff --git a/content/en/js3/blocks/re-rendering-ui/index.md b/common-content/en/module/js3/re-rendering-ui/index.md similarity index 100% rename from content/en/js3/blocks/re-rendering-ui/index.md rename to common-content/en/module/js3/re-rendering-ui/index.md diff --git a/content/en/js3/blocks/reacting/index.md b/common-content/en/module/js3/reacting/index.md similarity index 100% rename from content/en/js3/blocks/reacting/index.md rename to common-content/en/module/js3/reacting/index.md diff --git a/content/en/js3/blocks/refactoring-to-state-and-render/index.md b/common-content/en/module/js3/refactoring-to-state-and-render/index.md similarity index 100% rename from content/en/js3/blocks/refactoring-to-state-and-render/index.md rename to common-content/en/module/js3/refactoring-to-state-and-render/index.md diff --git a/content/en/js3/blocks/rendering-based-on-state/index.md b/common-content/en/module/js3/rendering-based-on-state/index.md similarity index 100% rename from content/en/js3/blocks/rendering-based-on-state/index.md rename to common-content/en/module/js3/rendering-based-on-state/index.md diff --git a/content/en/js3/blocks/simplifying-element-creation/index.md b/common-content/en/module/js3/simplifying-element-creation/index.md similarity index 100% rename from content/en/js3/blocks/simplifying-element-creation/index.md rename to common-content/en/module/js3/simplifying-element-creation/index.md diff --git a/content/en/js3/blocks/single-datum/index.md b/common-content/en/module/js3/single-datum/index.md similarity index 100% rename from content/en/js3/blocks/single-datum/index.md rename to common-content/en/module/js3/single-datum/index.md diff --git a/content/en/js3/blocks/single-datum/single-film-display.png b/common-content/en/module/js3/single-datum/single-film-display.png similarity index 100% rename from content/en/js3/blocks/single-datum/single-film-display.png rename to common-content/en/module/js3/single-datum/single-film-display.png diff --git a/content/en/js3/blocks/template-html/index.md b/common-content/en/module/js3/template-html/index.md similarity index 100% rename from content/en/js3/blocks/template-html/index.md rename to common-content/en/module/js3/template-html/index.md diff --git a/content/en/js3/blocks/then/index.md b/common-content/en/module/js3/then/index.md similarity index 100% rename from content/en/js3/blocks/then/index.md rename to common-content/en/module/js3/then/index.md diff --git a/content/en/js3/blocks/using-fetch/index.md b/common-content/en/module/js3/using-fetch/index.md similarity index 100% rename from content/en/js3/blocks/using-fetch/index.md rename to common-content/en/module/js3/using-fetch/index.md diff --git a/content/en/js3/blocks/using-map/index.md b/common-content/en/module/js3/using-map/index.md similarity index 100% rename from content/en/js3/blocks/using-map/index.md rename to common-content/en/module/js3/using-map/index.md diff --git a/content/en/portfolio/blocks/break-it-down/index.md b/common-content/en/module/portfolio/break-it-down/index.md similarity index 100% rename from content/en/portfolio/blocks/break-it-down/index.md rename to common-content/en/module/portfolio/break-it-down/index.md diff --git a/content/en/portfolio/blocks/data/index.md b/common-content/en/module/portfolio/data/index.md similarity index 100% rename from content/en/portfolio/blocks/data/index.md rename to common-content/en/module/portfolio/data/index.md diff --git a/content/en/portfolio/blocks/employability/index.md b/common-content/en/module/portfolio/employability/index.md similarity index 100% rename from content/en/portfolio/blocks/employability/index.md rename to common-content/en/module/portfolio/employability/index.md diff --git a/content/en/portfolio/blocks/ground-rules/index.md b/common-content/en/module/portfolio/ground-rules/index.md similarity index 100% rename from content/en/portfolio/blocks/ground-rules/index.md rename to common-content/en/module/portfolio/ground-rules/index.md diff --git a/content/en/portfolio/blocks/guest/index.md b/common-content/en/module/portfolio/guest/index.md similarity index 100% rename from content/en/portfolio/blocks/guest/index.md rename to common-content/en/module/portfolio/guest/index.md diff --git a/content/en/portfolio/blocks/interfaces/index.md b/common-content/en/module/portfolio/interfaces/index.md similarity index 100% rename from content/en/portfolio/blocks/interfaces/index.md rename to common-content/en/module/portfolio/interfaces/index.md diff --git a/content/en/portfolio/blocks/next-steps/index.md b/common-content/en/module/portfolio/next-steps/index.md similarity index 100% rename from content/en/portfolio/blocks/next-steps/index.md rename to common-content/en/module/portfolio/next-steps/index.md diff --git a/content/en/portfolio/blocks/project/index.md b/common-content/en/module/portfolio/project/index.md similarity index 100% rename from content/en/portfolio/blocks/project/index.md rename to common-content/en/module/portfolio/project/index.md diff --git a/content/en/portfolio/blocks/requirements/index.md b/common-content/en/module/portfolio/requirements/index.md similarity index 100% rename from content/en/portfolio/blocks/requirements/index.md rename to common-content/en/module/portfolio/requirements/index.md diff --git a/content/en/portfolio/blocks/stand-up/index.md b/common-content/en/module/portfolio/stand-up/index.md similarity index 100% rename from content/en/portfolio/blocks/stand-up/index.md rename to common-content/en/module/portfolio/stand-up/index.md diff --git a/content/en/portfolio/blocks/user-feedback/index.md b/common-content/en/module/portfolio/user-feedback/index.md similarity index 100% rename from content/en/portfolio/blocks/user-feedback/index.md rename to common-content/en/module/portfolio/user-feedback/index.md diff --git a/content/en/react/blocks/components/index.md b/common-content/en/module/react/components/index.md similarity index 100% rename from content/en/react/blocks/components/index.md rename to common-content/en/module/react/components/index.md diff --git a/content/en/react/blocks/controlled-components/index.md b/common-content/en/module/react/controlled-components/index.md similarity index 100% rename from content/en/react/blocks/controlled-components/index.md rename to common-content/en/module/react/controlled-components/index.md diff --git a/content/en/react/blocks/embedding-javascript/index.md b/common-content/en/module/react/embedding-javascript/index.md similarity index 100% rename from content/en/react/blocks/embedding-javascript/index.md rename to common-content/en/module/react/embedding-javascript/index.md diff --git a/content/en/react/blocks/fetching-data-with-effects/index.md b/common-content/en/module/react/fetching-data-with-effects/index.md similarity index 100% rename from content/en/react/blocks/fetching-data-with-effects/index.md rename to common-content/en/module/react/fetching-data-with-effects/index.md diff --git a/content/en/react/blocks/fetching-data/index.md b/common-content/en/module/react/fetching-data/index.md similarity index 100% rename from content/en/react/blocks/fetching-data/index.md rename to common-content/en/module/react/fetching-data/index.md diff --git a/content/en/react/blocks/handling-events/index.md b/common-content/en/module/react/handling-events/index.md similarity index 100% rename from content/en/react/blocks/handling-events/index.md rename to common-content/en/module/react/handling-events/index.md diff --git a/content/en/react/blocks/import-export/index.md b/common-content/en/module/react/import-export/index.md similarity index 100% rename from content/en/react/blocks/import-export/index.md rename to common-content/en/module/react/import-export/index.md diff --git a/content/en/react/blocks/jsx/index.md b/common-content/en/module/react/jsx/index.md similarity index 100% rename from content/en/react/blocks/jsx/index.md rename to common-content/en/module/react/jsx/index.md diff --git a/content/en/react/blocks/keys/index.md b/common-content/en/module/react/keys/index.md similarity index 100% rename from content/en/react/blocks/keys/index.md rename to common-content/en/module/react/keys/index.md diff --git a/content/en/react/blocks/multiple-fields/index.md b/common-content/en/module/react/multiple-fields/index.md similarity index 100% rename from content/en/react/blocks/multiple-fields/index.md rename to common-content/en/module/react/multiple-fields/index.md diff --git a/content/en/react/blocks/pokedex/index.md b/common-content/en/module/react/pokedex/index.md similarity index 100% rename from content/en/react/blocks/pokedex/index.md rename to common-content/en/module/react/pokedex/index.md diff --git a/content/en/react/blocks/props/index.md b/common-content/en/module/react/props/index.md similarity index 100% rename from content/en/react/blocks/props/index.md rename to common-content/en/module/react/props/index.md diff --git a/content/en/react/blocks/re-rendering/index.md b/common-content/en/module/react/re-rendering/index.md similarity index 100% rename from content/en/react/blocks/re-rendering/index.md rename to common-content/en/module/react/re-rendering/index.md diff --git a/content/en/react/blocks/react-router/index.md b/common-content/en/module/react/react-router/index.md similarity index 100% rename from content/en/react/blocks/react-router/index.md rename to common-content/en/module/react/react-router/index.md diff --git a/content/en/react/blocks/rendering/index.md b/common-content/en/module/react/rendering/index.md similarity index 100% rename from content/en/react/blocks/rendering/index.md rename to common-content/en/module/react/rendering/index.md diff --git a/content/en/react/blocks/state/index.md b/common-content/en/module/react/state/index.md similarity index 100% rename from content/en/react/blocks/state/index.md rename to common-content/en/module/react/state/index.md diff --git a/content/en/react/blocks/synchronizing-with-effects/index.md b/common-content/en/module/react/synchronizing-with-effects/index.md similarity index 100% rename from content/en/react/blocks/synchronizing-with-effects/index.md rename to common-content/en/module/react/synchronizing-with-effects/index.md diff --git a/content/en/react/blocks/team-project/index.md b/common-content/en/module/react/team-project/index.md similarity index 100% rename from content/en/react/blocks/team-project/index.md rename to common-content/en/module/react/team-project/index.md diff --git a/content/en/react/blocks/vite/index.md b/common-content/en/module/react/vite/index.md similarity index 100% rename from content/en/react/blocks/vite/index.md rename to common-content/en/module/react/vite/index.md diff --git a/content/en/react/blocks/what-is-react/index.md b/common-content/en/module/react/what-is-react/index.md similarity index 100% rename from content/en/react/blocks/what-is-react/index.md rename to common-content/en/module/react/what-is-react/index.md diff --git a/content/en/react/blocks/working-with-forms/index.md b/common-content/en/module/react/working-with-forms/index.md similarity index 100% rename from content/en/react/blocks/working-with-forms/index.md rename to common-content/en/module/react/working-with-forms/index.md diff --git a/content/en/servers/blocks/building-the-server/index.md b/common-content/en/module/servers/building-the-server/index.md similarity index 100% rename from content/en/servers/blocks/building-the-server/index.md rename to common-content/en/module/servers/building-the-server/index.md diff --git a/content/en/servers/blocks/communicating-with-the-server/index.md b/common-content/en/module/servers/communicating-with-the-server/index.md similarity index 100% rename from content/en/servers/blocks/communicating-with-the-server/index.md rename to common-content/en/module/servers/communicating-with-the-server/index.md diff --git a/content/en/servers/blocks/crud-2/index.md b/common-content/en/module/servers/crud-2/index.md similarity index 100% rename from content/en/servers/blocks/crud-2/index.md rename to common-content/en/module/servers/crud-2/index.md diff --git a/content/en/servers/blocks/crud-challenges/index.md b/common-content/en/module/servers/crud-challenges/index.md similarity index 100% rename from content/en/servers/blocks/crud-challenges/index.md rename to common-content/en/module/servers/crud-challenges/index.md diff --git a/content/en/servers/blocks/crud/index.md b/common-content/en/module/servers/crud/index.md similarity index 100% rename from content/en/servers/blocks/crud/index.md rename to common-content/en/module/servers/crud/index.md diff --git a/content/en/servers/blocks/get-single/index.md b/common-content/en/module/servers/get-single/index.md similarity index 100% rename from content/en/servers/blocks/get-single/index.md rename to common-content/en/module/servers/get-single/index.md diff --git a/content/en/servers/blocks/get/index.md b/common-content/en/module/servers/get/index.md similarity index 100% rename from content/en/servers/blocks/get/index.md rename to common-content/en/module/servers/get/index.md diff --git a/content/en/servers/blocks/intro-to-express/index.md b/common-content/en/module/servers/intro-to-express/index.md similarity index 100% rename from content/en/servers/blocks/intro-to-express/index.md rename to common-content/en/module/servers/intro-to-express/index.md diff --git a/content/en/servers/blocks/make-a-node-project/index.md b/common-content/en/module/servers/make-a-node-project/index.md similarity index 100% rename from content/en/servers/blocks/make-a-node-project/index.md rename to common-content/en/module/servers/make-a-node-project/index.md diff --git a/content/en/servers/blocks/post/index.md b/common-content/en/module/servers/post/index.md similarity index 100% rename from content/en/servers/blocks/post/index.md rename to common-content/en/module/servers/post/index.md diff --git a/content/en/servers/blocks/postman/index.md b/common-content/en/module/servers/postman/index.md similarity index 100% rename from content/en/servers/blocks/postman/index.md rename to common-content/en/module/servers/postman/index.md diff --git a/content/en/servers/blocks/put/index.md b/common-content/en/module/servers/put/index.md similarity index 100% rename from content/en/servers/blocks/put/index.md rename to common-content/en/module/servers/put/index.md diff --git a/content/en/servers/blocks/query-parameters/index.md b/common-content/en/module/servers/query-parameters/index.md similarity index 100% rename from content/en/servers/blocks/query-parameters/index.md rename to common-content/en/module/servers/query-parameters/index.md diff --git a/content/en/servers/blocks/render/index.md b/common-content/en/module/servers/render/index.md similarity index 100% rename from content/en/servers/blocks/render/index.md rename to common-content/en/module/servers/render/index.md diff --git a/content/en/servers/blocks/routing/index.md b/common-content/en/module/servers/routing/index.md similarity index 100% rename from content/en/servers/blocks/routing/index.md rename to common-content/en/module/servers/routing/index.md diff --git a/content/en/servers/blocks/test-examples-in-postman/index.md b/common-content/en/module/servers/test-examples-in-postman/index.md similarity index 100% rename from content/en/servers/blocks/test-examples-in-postman/index.md rename to common-content/en/module/servers/test-examples-in-postman/index.md diff --git a/common-content/go.mod b/common-content/go.mod new file mode 100644 index 000000000..aae35c0c0 --- /dev/null +++ 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 new file mode 100644 index 000000000..d24b83be8 --- /dev/null +++ b/common-content/hugo.toml @@ -0,0 +1,5 @@ + +[module] + [module.hugoVersion] + extended = true + min = "0.116.0" \ No newline at end of file diff --git a/archetypes/backlog.md b/common-theme/archetypes/backlog.md similarity index 100% rename from archetypes/backlog.md rename to common-theme/archetypes/backlog.md diff --git a/archetypes/blocks/index.md b/common-theme/archetypes/blocks/index.md similarity index 100% rename from archetypes/blocks/index.md rename to common-theme/archetypes/blocks/index.md diff --git a/archetypes/day-plan.md b/common-theme/archetypes/day-plan.md similarity index 100% rename from archetypes/day-plan.md rename to common-theme/archetypes/day-plan.md diff --git a/archetypes/default.md b/common-theme/archetypes/default.md similarity index 100% rename from archetypes/default.md rename to common-theme/archetypes/default.md diff --git a/archetypes/module-prep.md b/common-theme/archetypes/module-prep.md similarity index 100% rename from archetypes/module-prep.md rename to common-theme/archetypes/module-prep.md diff --git a/archetypes/module-success.md b/common-theme/archetypes/module-success.md similarity index 100% rename from archetypes/module-success.md rename to common-theme/archetypes/module-success.md diff --git a/archetypes/module.md b/common-theme/archetypes/module.md similarity index 100% rename from archetypes/module.md rename to common-theme/archetypes/module.md diff --git a/archetypes/prep.md b/common-theme/archetypes/prep.md similarity index 100% rename from archetypes/prep.md rename to common-theme/archetypes/prep.md diff --git a/archetypes/product-backlog.md b/common-theme/archetypes/product-backlog.md similarity index 100% rename from archetypes/product-backlog.md rename to common-theme/archetypes/product-backlog.md diff --git a/archetypes/product-prep.md b/common-theme/archetypes/product-prep.md similarity index 100% rename from archetypes/product-prep.md rename to common-theme/archetypes/product-prep.md diff --git a/archetypes/product.md b/common-theme/archetypes/product.md similarity index 100% rename from archetypes/product.md rename to common-theme/archetypes/product.md diff --git a/archetypes/sprint.md b/common-theme/archetypes/sprint.md similarity index 100% rename from archetypes/sprint.md rename to common-theme/archetypes/sprint.md diff --git a/archetypes/success.md b/common-theme/archetypes/success.md similarity index 100% rename from archetypes/success.md rename to common-theme/archetypes/success.md diff --git a/common-theme/assets/images/site-logo/logo.svg b/common-theme/assets/images/site-logo/logo.svg new file mode 100644 index 000000000..a0eca3cf7 --- /dev/null +++ b/common-theme/assets/images/site-logo/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/common-theme/assets/jsconfig.json b/common-theme/assets/jsconfig.json new file mode 100644 index 000000000..377218ccb --- /dev/null +++ b/common-theme/assets/jsconfig.json @@ -0,0 +1,10 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "*": [ + "*" + ] + } + } +} \ No newline at end of file diff --git a/assets/scripts/alert-message.js b/common-theme/assets/scripts/alert-message.js similarity index 100% rename from assets/scripts/alert-message.js rename to common-theme/assets/scripts/alert-message.js diff --git a/assets/scripts/app.js b/common-theme/assets/scripts/app.js similarity index 100% rename from assets/scripts/app.js rename to common-theme/assets/scripts/app.js diff --git a/assets/scripts/cm6.ts b/common-theme/assets/scripts/cm6.ts similarity index 100% rename from assets/scripts/cm6.ts rename to common-theme/assets/scripts/cm6.ts diff --git a/assets/scripts/confetti-checkboxes.js b/common-theme/assets/scripts/confetti-checkboxes.js similarity index 100% rename from assets/scripts/confetti-checkboxes.js rename to common-theme/assets/scripts/confetti-checkboxes.js diff --git a/assets/scripts/dark-mode.js b/common-theme/assets/scripts/dark-mode.js similarity index 100% rename from assets/scripts/dark-mode.js rename to common-theme/assets/scripts/dark-mode.js diff --git a/assets/scripts/highlight-lines.ts b/common-theme/assets/scripts/highlight-lines.ts similarity index 100% rename from assets/scripts/highlight-lines.ts rename to common-theme/assets/scripts/highlight-lines.ts diff --git a/assets/scripts/solo-view.js b/common-theme/assets/scripts/solo-view.js similarity index 100% rename from assets/scripts/solo-view.js rename to common-theme/assets/scripts/solo-view.js diff --git a/assets/scripts/tab-panels.js b/common-theme/assets/scripts/tab-panels.js similarity index 100% rename from assets/scripts/tab-panels.js rename to common-theme/assets/scripts/tab-panels.js diff --git a/assets/scripts/time-stamper.js b/common-theme/assets/scripts/time-stamper.js similarity index 100% rename from assets/scripts/time-stamper.js rename to common-theme/assets/scripts/time-stamper.js diff --git a/assets/scripts/word-limit.js b/common-theme/assets/scripts/word-limit.js similarity index 100% rename from assets/scripts/word-limit.js rename to common-theme/assets/scripts/word-limit.js diff --git a/assets/scripts/youtube-player.js b/common-theme/assets/scripts/youtube-player.js similarity index 100% rename from assets/scripts/youtube-player.js rename to common-theme/assets/scripts/youtube-player.js diff --git a/assets/styles/01-mixins/backdrop.scss b/common-theme/assets/styles/01-mixins/backdrop.scss similarity index 100% rename from assets/styles/01-mixins/backdrop.scss rename to common-theme/assets/styles/01-mixins/backdrop.scss diff --git a/assets/styles/01-mixins/block.scss b/common-theme/assets/styles/01-mixins/block.scss similarity index 100% rename from assets/styles/01-mixins/block.scss rename to common-theme/assets/styles/01-mixins/block.scss diff --git a/assets/styles/01-mixins/grid-assign.scss b/common-theme/assets/styles/01-mixins/grid-assign.scss similarity index 100% rename from assets/styles/01-mixins/grid-assign.scss rename to common-theme/assets/styles/01-mixins/grid-assign.scss diff --git a/assets/styles/01-mixins/offscreen.scss b/common-theme/assets/styles/01-mixins/offscreen.scss similarity index 100% rename from assets/styles/01-mixins/offscreen.scss rename to common-theme/assets/styles/01-mixins/offscreen.scss diff --git a/assets/styles/01-mixins/offset.scss b/common-theme/assets/styles/01-mixins/offset.scss similarity index 100% rename from assets/styles/01-mixins/offset.scss rename to common-theme/assets/styles/01-mixins/offset.scss diff --git a/assets/styles/01-mixins/on-event.scss b/common-theme/assets/styles/01-mixins/on-event.scss similarity index 100% rename from assets/styles/01-mixins/on-event.scss rename to common-theme/assets/styles/01-mixins/on-event.scss diff --git a/assets/styles/01-mixins/patterns.scss b/common-theme/assets/styles/01-mixins/patterns.scss similarity index 100% rename from assets/styles/01-mixins/patterns.scss rename to common-theme/assets/styles/01-mixins/patterns.scss diff --git a/assets/styles/01-mixins/screen.scss b/common-theme/assets/styles/01-mixins/screen.scss similarity index 100% rename from assets/styles/01-mixins/screen.scss rename to common-theme/assets/styles/01-mixins/screen.scss diff --git a/assets/styles/02-variables/borders.scss b/common-theme/assets/styles/02-variables/borders.scss similarity index 100% rename from assets/styles/02-variables/borders.scss rename to common-theme/assets/styles/02-variables/borders.scss diff --git a/assets/styles/02-variables/colors.scss b/common-theme/assets/styles/02-variables/colors.scss similarity index 100% rename from assets/styles/02-variables/colors.scss rename to common-theme/assets/styles/02-variables/colors.scss diff --git a/assets/styles/02-variables/fonts.scss b/common-theme/assets/styles/02-variables/fonts.scss similarity index 100% rename from assets/styles/02-variables/fonts.scss rename to common-theme/assets/styles/02-variables/fonts.scss diff --git a/assets/styles/02-variables/shadows.scss b/common-theme/assets/styles/02-variables/shadows.scss similarity index 100% rename from assets/styles/02-variables/shadows.scss rename to common-theme/assets/styles/02-variables/shadows.scss diff --git a/assets/styles/02-variables/spacing.scss b/common-theme/assets/styles/02-variables/spacing.scss similarity index 100% rename from assets/styles/02-variables/spacing.scss rename to common-theme/assets/styles/02-variables/spacing.scss diff --git a/assets/styles/02-variables/type-scale.scss b/common-theme/assets/styles/02-variables/type-scale.scss similarity index 100% rename from assets/styles/02-variables/type-scale.scss rename to common-theme/assets/styles/02-variables/type-scale.scss diff --git a/assets/styles/03-elements/base.scss b/common-theme/assets/styles/03-elements/base.scss similarity index 100% rename from assets/styles/03-elements/base.scss rename to common-theme/assets/styles/03-elements/base.scss diff --git a/assets/styles/03-elements/buttons.scss b/common-theme/assets/styles/03-elements/buttons.scss similarity index 100% rename from assets/styles/03-elements/buttons.scss rename to common-theme/assets/styles/03-elements/buttons.scss diff --git a/assets/styles/03-elements/headings.scss b/common-theme/assets/styles/03-elements/headings.scss similarity index 100% rename from assets/styles/03-elements/headings.scss rename to common-theme/assets/styles/03-elements/headings.scss diff --git a/assets/styles/03-elements/images.scss b/common-theme/assets/styles/03-elements/images.scss similarity index 100% rename from assets/styles/03-elements/images.scss rename to common-theme/assets/styles/03-elements/images.scss diff --git a/assets/styles/03-elements/links.scss b/common-theme/assets/styles/03-elements/links.scss similarity index 100% rename from assets/styles/03-elements/links.scss rename to common-theme/assets/styles/03-elements/links.scss diff --git a/assets/styles/03-elements/misc-phrasing.scss b/common-theme/assets/styles/03-elements/misc-phrasing.scss similarity index 100% rename from assets/styles/03-elements/misc-phrasing.scss rename to common-theme/assets/styles/03-elements/misc-phrasing.scss diff --git a/assets/styles/03-elements/table.scss b/common-theme/assets/styles/03-elements/table.scss similarity index 100% rename from assets/styles/03-elements/table.scss rename to common-theme/assets/styles/03-elements/table.scss diff --git a/assets/styles/04-components/alert.scss b/common-theme/assets/styles/04-components/alert.scss similarity index 100% rename from assets/styles/04-components/alert.scss rename to common-theme/assets/styles/04-components/alert.scss diff --git a/assets/styles/04-components/block.scss b/common-theme/assets/styles/04-components/block.scss similarity index 100% rename from assets/styles/04-components/block.scss rename to common-theme/assets/styles/04-components/block.scss diff --git a/assets/styles/04-components/breadcrumbs.scss b/common-theme/assets/styles/04-components/breadcrumbs.scss similarity index 100% rename from assets/styles/04-components/breadcrumbs.scss rename to common-theme/assets/styles/04-components/breadcrumbs.scss diff --git a/assets/styles/04-components/card.scss b/common-theme/assets/styles/04-components/card.scss similarity index 100% rename from assets/styles/04-components/card.scss rename to common-theme/assets/styles/04-components/card.scss diff --git a/assets/styles/04-components/codemirror.scss b/common-theme/assets/styles/04-components/codemirror.scss similarity index 100% rename from assets/styles/04-components/codemirror.scss rename to common-theme/assets/styles/04-components/codemirror.scss diff --git a/assets/styles/04-components/columns.scss b/common-theme/assets/styles/04-components/columns.scss similarity index 100% rename from assets/styles/04-components/columns.scss rename to common-theme/assets/styles/04-components/columns.scss diff --git a/assets/styles/04-components/contributor.scss b/common-theme/assets/styles/04-components/contributor.scss similarity index 100% rename from assets/styles/04-components/contributor.scss rename to common-theme/assets/styles/04-components/contributor.scss diff --git a/assets/styles/04-components/copy.scss b/common-theme/assets/styles/04-components/copy.scss similarity index 100% rename from assets/styles/04-components/copy.scss rename to common-theme/assets/styles/04-components/copy.scss diff --git a/assets/styles/04-components/issue.scss b/common-theme/assets/styles/04-components/issue.scss similarity index 100% rename from assets/styles/04-components/issue.scss rename to common-theme/assets/styles/04-components/issue.scss diff --git a/assets/styles/04-components/logos.scss b/common-theme/assets/styles/04-components/logos.scss similarity index 100% rename from assets/styles/04-components/logos.scss rename to common-theme/assets/styles/04-components/logos.scss diff --git a/assets/styles/04-components/note.scss b/common-theme/assets/styles/04-components/note.scss similarity index 100% rename from assets/styles/04-components/note.scss rename to common-theme/assets/styles/04-components/note.scss diff --git a/assets/styles/04-components/objectives.scss b/common-theme/assets/styles/04-components/objectives.scss similarity index 100% rename from assets/styles/04-components/objectives.scss rename to common-theme/assets/styles/04-components/objectives.scss diff --git a/assets/styles/04-components/page-header.scss b/common-theme/assets/styles/04-components/page-header.scss similarity index 100% rename from assets/styles/04-components/page-header.scss rename to common-theme/assets/styles/04-components/page-header.scss diff --git a/assets/styles/04-components/skip-link.scss b/common-theme/assets/styles/04-components/skip-link.scss similarity index 100% rename from assets/styles/04-components/skip-link.scss rename to common-theme/assets/styles/04-components/skip-link.scss diff --git a/assets/styles/04-components/tabs.scss b/common-theme/assets/styles/04-components/tabs.scss similarity index 100% rename from assets/styles/04-components/tabs.scss rename to common-theme/assets/styles/04-components/tabs.scss diff --git a/assets/styles/04-components/timeline.scss b/common-theme/assets/styles/04-components/timeline.scss similarity index 100% rename from assets/styles/04-components/timeline.scss rename to common-theme/assets/styles/04-components/timeline.scss diff --git a/assets/styles/04-components/toc.scss b/common-theme/assets/styles/04-components/toc.scss similarity index 100% rename from assets/styles/04-components/toc.scss rename to common-theme/assets/styles/04-components/toc.scss diff --git a/assets/styles/04-components/tooltip.scss b/common-theme/assets/styles/04-components/tooltip.scss similarity index 100% rename from assets/styles/04-components/tooltip.scss rename to common-theme/assets/styles/04-components/tooltip.scss diff --git a/assets/styles/layout/footer.scss b/common-theme/assets/styles/layout/footer.scss similarity index 100% rename from assets/styles/layout/footer.scss rename to common-theme/assets/styles/layout/footer.scss diff --git a/assets/styles/layout/header.scss b/common-theme/assets/styles/layout/header.scss similarity index 100% rename from assets/styles/layout/header.scss rename to common-theme/assets/styles/layout/header.scss diff --git a/assets/styles/layout/layout.scss b/common-theme/assets/styles/layout/layout.scss similarity index 100% rename from assets/styles/layout/layout.scss rename to common-theme/assets/styles/layout/layout.scss diff --git a/assets/styles/layout/main.scss b/common-theme/assets/styles/layout/main.scss similarity index 100% rename from assets/styles/layout/main.scss rename to common-theme/assets/styles/layout/main.scss diff --git a/assets/styles/layout/menu.scss b/common-theme/assets/styles/layout/menu.scss similarity index 100% rename from assets/styles/layout/menu.scss rename to common-theme/assets/styles/layout/menu.scss diff --git a/assets/styles/states/dark.scss b/common-theme/assets/styles/states/dark.scss similarity index 100% rename from assets/styles/states/dark.scss rename to common-theme/assets/styles/states/dark.scss diff --git a/assets/styles/states/invisible.scss b/common-theme/assets/styles/states/invisible.scss similarity index 100% rename from assets/styles/states/invisible.scss rename to common-theme/assets/styles/states/invisible.scss diff --git a/assets/styles/states/light.scss b/common-theme/assets/styles/states/light.scss similarity index 100% rename from assets/styles/states/light.scss rename to common-theme/assets/styles/states/light.scss diff --git a/assets/styles/states/none.scss b/common-theme/assets/styles/states/none.scss similarity index 100% rename from assets/styles/states/none.scss rename to common-theme/assets/styles/states/none.scss diff --git a/assets/styles/states/visible.scss b/common-theme/assets/styles/states/visible.scss similarity index 100% rename from assets/styles/states/visible.scss rename to common-theme/assets/styles/states/visible.scss diff --git a/common-theme/data/funding.json b/common-theme/data/funding.json new file mode 100644 index 000000000..833af8169 --- /dev/null +++ b/common-theme/data/funding.json @@ -0,0 +1,20 @@ +[ + { + "name": "GitHub", + "website": "https://github.com/", + "logo": "logos/github.png", + "support_type": ["Product"] + }, + { + "name": "Netlify", + "website": "https://www.netlify.com/", + "logo": "logos/netlify.svg", + "support_type": ["Product"] + }, + { + "name": "Slack", + "website": "https://slack.com/", + "logo": "logos/slack.png", + "support_type": ["Product"] + } +] diff --git a/common-theme/go.mod b/common-theme/go.mod new file mode 100644 index 000000000..449d71296 --- /dev/null +++ b/common-theme/go.mod @@ -0,0 +1,3 @@ +module github.com/CodeYourFuture/curriculum/common-theme + +go 1.21.3 diff --git a/layouts/_default/_markup/render-codeblock-mermaid.html.html b/common-theme/layouts/_default/_markup/render-codeblock-mermaid.html.html similarity index 100% rename from layouts/_default/_markup/render-codeblock-mermaid.html.html rename to common-theme/layouts/_default/_markup/render-codeblock-mermaid.html.html diff --git a/layouts/_default/_markup/render-codeblock-objectives.html b/common-theme/layouts/_default/_markup/render-codeblock-objectives.html similarity index 100% rename from layouts/_default/_markup/render-codeblock-objectives.html rename to common-theme/layouts/_default/_markup/render-codeblock-objectives.html diff --git a/layouts/_default/_markup/render-codeblock-runkit.html b/common-theme/layouts/_default/_markup/render-codeblock-runkit.html similarity index 100% rename from layouts/_default/_markup/render-codeblock-runkit.html rename to common-theme/layouts/_default/_markup/render-codeblock-runkit.html diff --git a/layouts/_default/_markup/render-image.html b/common-theme/layouts/_default/_markup/render-image.html similarity index 100% rename from layouts/_default/_markup/render-image.html rename to common-theme/layouts/_default/_markup/render-image.html diff --git a/layouts/_default/_markup/render-link.html b/common-theme/layouts/_default/_markup/render-link.html similarity index 100% rename from layouts/_default/_markup/render-link.html rename to common-theme/layouts/_default/_markup/render-link.html diff --git a/layouts/_default/backlog.html b/common-theme/layouts/_default/backlog.html similarity index 68% rename from layouts/_default/backlog.html rename to common-theme/layouts/_default/backlog.html index 29e8c6359..558922bc6 100644 --- a/layouts/_default/backlog.html +++ b/common-theme/layouts/_default/backlog.html @@ -1,7 +1,5 @@ {{ define "main" }}
- - {{ .Scratch.Set "emoji" "πŸ“…" }} {{ partial "page-header.html" . }} {{ with .Content }}
{{ . }}
diff --git a/layouts/_default/baseof.html b/common-theme/layouts/_default/baseof.html similarity index 100% rename from layouts/_default/baseof.html rename to common-theme/layouts/_default/baseof.html diff --git a/layouts/_default/day-plan.html b/common-theme/layouts/_default/day-plan.html similarity index 91% rename from layouts/_default/day-plan.html rename to common-theme/layouts/_default/day-plan.html index 550bda699..b25bad4a6 100644 --- a/layouts/_default/day-plan.html +++ b/common-theme/layouts/_default/day-plan.html @@ -1,6 +1,5 @@ {{ define "main" }}
- {{ .Scratch.Set "emoji" "πŸ§‘πŸΏβ€πŸ€β€πŸ§‘πŸΎ" }} {{ .Scratch.Set "headerClass" "c-page-header--toc" }} diff --git a/layouts/_default/list.html b/common-theme/layouts/_default/list.html similarity index 100% rename from layouts/_default/list.html rename to common-theme/layouts/_default/list.html diff --git a/layouts/_default/module.html b/common-theme/layouts/_default/module.html similarity index 100% rename from layouts/_default/module.html rename to common-theme/layouts/_default/module.html diff --git a/layouts/_default/prep.html b/common-theme/layouts/_default/prep.html similarity index 95% rename from layouts/_default/prep.html rename to common-theme/layouts/_default/prep.html index 97a33eafd..9dd5fcf0b 100644 --- a/layouts/_default/prep.html +++ b/common-theme/layouts/_default/prep.html @@ -1,6 +1,5 @@ {{ define "main" }} - {{ .Scratch.Set "emoji" "πŸ§‘πŸΎβ€πŸ’»" }} {{ .Scratch.Set "headerClass" "c-page-header--solo" }} diff --git a/layouts/_default/product.html b/common-theme/layouts/_default/product.html similarity index 100% rename from layouts/_default/product.html rename to common-theme/layouts/_default/product.html diff --git a/layouts/_default/single.html b/common-theme/layouts/_default/single.html similarity index 100% rename from layouts/_default/single.html rename to common-theme/layouts/_default/single.html diff --git a/layouts/_default/sprint.html b/common-theme/layouts/_default/sprint.html similarity index 100% rename from layouts/_default/sprint.html rename to common-theme/layouts/_default/sprint.html diff --git a/layouts/_default/success.html b/common-theme/layouts/_default/success.html similarity index 96% rename from layouts/_default/success.html rename to common-theme/layouts/_default/success.html index 76a5ff162..44e0af599 100644 --- a/layouts/_default/success.html +++ b/common-theme/layouts/_default/success.html @@ -1,8 +1,6 @@ {{ define "main" }} {{ $pageContext := . }}
- {{/* reset emoji from page matter to checkbox emoji */}} - {{ .Scratch.Set "emoji" "βœ…" }} {{ partial "page-header.html" . }} {{ with .Content }}
{{ . }}
diff --git a/layouts/index.html b/common-theme/layouts/index.html similarity index 86% rename from layouts/index.html rename to common-theme/layouts/index.html index f2c3d3f24..36dd9f6c6 100644 --- a/layouts/index.html +++ b/common-theme/layouts/index.html @@ -1,6 +1,6 @@ {{ define "main" }}
- {{- .Scratch.Set "emoji" "πŸ§‘πŸΏβ€πŸ«πŸ‘¨πŸ½β€πŸŽ“" }} + {{- .Scratch.Set "headerClass" "c-page-header--splash" }} diff --git a/layouts/partials/block/block.html b/common-theme/layouts/partials/block/block.html similarity index 100% rename from layouts/partials/block/block.html rename to common-theme/layouts/partials/block/block.html diff --git a/layouts/partials/block/data.html b/common-theme/layouts/partials/block/data.html similarity index 96% rename from layouts/partials/block/data.html rename to common-theme/layouts/partials/block/data.html index 043e51c1d..c3c9a9b84 100644 --- a/layouts/partials/block/data.html +++ b/common-theme/layouts/partials/block/data.html @@ -32,8 +32,8 @@ {{/* Now let's do our headers */}} {{ $headers := (dict) }} -{{ if ne (os.Getenv "CYF_CURRICULUM_GITHUB_BEARER_TOKEN") "" }} - {{ $headers = merge $headers (dict "Authorization" (printf "Bearer %s" (getenv "CYF_CURRICULUM_GITHUB_BEARER_TOKEN"))) }} +{{ if ne (os.Getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN") "" }} + {{ $headers = merge $headers (dict "Authorization" (printf "Bearer %s" (getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN"))) }} {{ end }} {{ .Scratch.SetInMap "blockData" "headers" $headers }} diff --git a/layouts/partials/block/issue.html b/common-theme/layouts/partials/block/issue.html similarity index 100% rename from layouts/partials/block/issue.html rename to common-theme/layouts/partials/block/issue.html diff --git a/layouts/partials/block/local.html b/common-theme/layouts/partials/block/local.html similarity index 100% rename from layouts/partials/block/local.html rename to common-theme/layouts/partials/block/local.html diff --git a/layouts/partials/block/pd.html b/common-theme/layouts/partials/block/pd.html similarity index 100% rename from layouts/partials/block/pd.html rename to common-theme/layouts/partials/block/pd.html diff --git a/layouts/partials/block/pullreq.html b/common-theme/layouts/partials/block/pullreq.html similarity index 100% rename from layouts/partials/block/pullreq.html rename to common-theme/layouts/partials/block/pullreq.html diff --git a/layouts/partials/block/readme.html b/common-theme/layouts/partials/block/readme.html similarity index 100% rename from layouts/partials/block/readme.html rename to common-theme/layouts/partials/block/readme.html diff --git a/layouts/partials/block/slide.html b/common-theme/layouts/partials/block/slide.html similarity index 100% rename from layouts/partials/block/slide.html rename to common-theme/layouts/partials/block/slide.html diff --git a/layouts/partials/block/youtube.html b/common-theme/layouts/partials/block/youtube.html similarity index 100% rename from layouts/partials/block/youtube.html rename to common-theme/layouts/partials/block/youtube.html diff --git a/layouts/partials/breadcrumbs.html b/common-theme/layouts/partials/breadcrumbs.html similarity index 100% rename from layouts/partials/breadcrumbs.html rename to common-theme/layouts/partials/breadcrumbs.html diff --git a/layouts/partials/card.html b/common-theme/layouts/partials/card.html similarity index 100% rename from layouts/partials/card.html rename to common-theme/layouts/partials/card.html diff --git a/layouts/partials/foot.html b/common-theme/layouts/partials/foot.html similarity index 93% rename from layouts/partials/foot.html rename to common-theme/layouts/partials/foot.html index eb9ab774b..acc073eff 100644 --- a/layouts/partials/foot.html +++ b/common-theme/layouts/partials/foot.html @@ -9,7 +9,7 @@ This free and open source programme is a project of - Code Your Future + {{ $.Site.Params.main_org_name }}
Creative Commons Attribution-ShareAlike 4.0

diff --git a/layouts/partials/github-icon.html b/common-theme/layouts/partials/github-icon.html similarity index 98% rename from layouts/partials/github-icon.html rename to common-theme/layouts/partials/github-icon.html index 999be1402..f6f865d3e 100644 --- a/layouts/partials/github-icon.html +++ b/common-theme/layouts/partials/github-icon.html @@ -2,6 +2,7 @@ focusable="false" class="e-button__icon" role="presentation" + width="96" viewbox="0 0 98 96" xmlns="http://www.w3.org/2000/svg"> - {{ .Title }} | {{ .Site.Title }} + {{.Section }} | {{ .Title }} | {{ .Site.Title }} {{ if .Page.Params.description }} {{ else }} @@ -35,13 +35,25 @@ href="{{ $style.RelPermalink }}" media="print" onload="this.media='all'" /> + + {{ $customCSS := resources.Match "custom-theme/**.scss" | resources.Concat + "custom.css"}} + {{ with $customCSS }} + {{ $customCSS := $customCSS | toCSS | minify | fingerprint "md5" }} + + {{ end }} + diff --git a/common-theme/layouts/partials/header.html b/common-theme/layouts/partials/header.html new file mode 100644 index 000000000..b764c2084 --- /dev/null +++ b/common-theme/layouts/partials/header.html @@ -0,0 +1,25 @@ +
+
+

+ + {{ $logos := resources.Match "custom-images/site-logo/*.svg" }} + {{ range $logos }}{{ .Content | safeHTML }}{{ end}} + +

+ {{ partial "search.html" }} + +
+
diff --git a/layouts/partials/issues.html b/common-theme/layouts/partials/issues.html similarity index 94% rename from layouts/partials/issues.html rename to common-theme/layouts/partials/issues.html index b138aed1f..c5db86b96 100644 --- a/layouts/partials/issues.html +++ b/common-theme/layouts/partials/issues.html @@ -4,8 +4,8 @@ {{ $currentPath := .Page.RelPermalink }} {{ $headers := (dict) }} -{{ if ne (os.Getenv "CYF_CURRICULUM_GITHUB_BEARER_TOKEN") "" }} - {{ $headers = merge $headers (dict "Authorization" (printf "Bearer %s" (getenv "CYF_CURRICULUM_GITHUB_BEARER_TOKEN"))) }} +{{ if ne (os.Getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN") "" }} + {{ $headers = merge $headers (dict "Authorization" (printf "Bearer %s" (getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN"))) }} {{ end }} {{ $issues := getJSON $issuesUrl $headers }} diff --git a/layouts/partials/menu.html b/common-theme/layouts/partials/menu.html similarity index 100% rename from layouts/partials/menu.html rename to common-theme/layouts/partials/menu.html diff --git a/layouts/partials/module-tabs.html b/common-theme/layouts/partials/module-tabs.html similarity index 100% rename from layouts/partials/module-tabs.html rename to common-theme/layouts/partials/module-tabs.html diff --git a/layouts/partials/objectives/block.html b/common-theme/layouts/partials/objectives/block.html similarity index 100% rename from layouts/partials/objectives/block.html rename to common-theme/layouts/partials/objectives/block.html diff --git a/layouts/partials/objectives/lookup.html b/common-theme/layouts/partials/objectives/lookup.html similarity index 100% rename from layouts/partials/objectives/lookup.html rename to common-theme/layouts/partials/objectives/lookup.html diff --git a/layouts/partials/objectives/parsed.html b/common-theme/layouts/partials/objectives/parsed.html similarity index 100% rename from layouts/partials/objectives/parsed.html rename to common-theme/layouts/partials/objectives/parsed.html diff --git a/layouts/partials/page-header.html b/common-theme/layouts/partials/page-header.html similarity index 100% rename from layouts/partials/page-header.html rename to common-theme/layouts/partials/page-header.html diff --git a/layouts/partials/scripts.html b/common-theme/layouts/partials/scripts.html similarity index 100% rename from layouts/partials/scripts.html rename to common-theme/layouts/partials/scripts.html diff --git a/layouts/partials/search.html b/common-theme/layouts/partials/search.html similarity index 100% rename from layouts/partials/search.html rename to common-theme/layouts/partials/search.html diff --git a/layouts/partials/time.html b/common-theme/layouts/partials/time.html similarity index 100% rename from layouts/partials/time.html rename to common-theme/layouts/partials/time.html diff --git a/layouts/shortcodes/columns.html b/common-theme/layouts/shortcodes/columns.html similarity index 100% rename from layouts/shortcodes/columns.html rename to common-theme/layouts/shortcodes/columns.html diff --git a/layouts/shortcodes/contributors.html b/common-theme/layouts/shortcodes/contributors.html similarity index 66% rename from layouts/shortcodes/contributors.html rename to common-theme/layouts/shortcodes/contributors.html index 73422e568..b3fa7db90 100644 --- a/layouts/shortcodes/contributors.html +++ b/common-theme/layouts/shortcodes/contributors.html @@ -1,9 +1,9 @@ {{ $repo := .Get 0 }} {{ $headers := (dict) }} -{{ if ne (os.Getenv "CYF_CURRICULUM_GITHUB_BEARER_TOKEN") "" }} - {{ $headers = merge $headers (dict "Authorization" (printf "Bearer %s" (getenv "CYF_CURRICULUM_GITHUB_BEARER_TOKEN"))) }} +{{ if ne (os.Getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN") "" }} + {{ $headers = merge $headers (dict "Authorization" (printf "Bearer %s" (getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN"))) }} {{ end }} -{{ $contributors := getJSON (printf "https://api.github.com/repos/CodeYourFuture/%s/contributors" $repo) $headers }} +{{ $contributors := getJSON (printf "%s%s/contributors" $.Site.Params.orgapi $repo) $headers }}
    diff --git a/layouts/shortcodes/details.html b/common-theme/layouts/shortcodes/details.html similarity index 100% rename from layouts/shortcodes/details.html rename to common-theme/layouts/shortcodes/details.html diff --git a/layouts/shortcodes/iframe.html b/common-theme/layouts/shortcodes/iframe.html similarity index 100% rename from layouts/shortcodes/iframe.html rename to common-theme/layouts/shortcodes/iframe.html diff --git a/layouts/shortcodes/logos.html b/common-theme/layouts/shortcodes/logos.html similarity index 100% rename from layouts/shortcodes/logos.html rename to common-theme/layouts/shortcodes/logos.html diff --git a/layouts/shortcodes/note.html b/common-theme/layouts/shortcodes/note.html similarity index 100% rename from layouts/shortcodes/note.html rename to common-theme/layouts/shortcodes/note.html diff --git a/layouts/shortcodes/snippet.html b/common-theme/layouts/shortcodes/snippet.html similarity index 100% rename from layouts/shortcodes/snippet.html rename to common-theme/layouts/shortcodes/snippet.html diff --git a/layouts/shortcodes/tab.html b/common-theme/layouts/shortcodes/tab.html similarity index 100% rename from layouts/shortcodes/tab.html rename to common-theme/layouts/shortcodes/tab.html diff --git a/layouts/shortcodes/tabs.html b/common-theme/layouts/shortcodes/tabs.html similarity index 100% rename from layouts/shortcodes/tabs.html rename to common-theme/layouts/shortcodes/tabs.html diff --git a/layouts/shortcodes/tooltip.html b/common-theme/layouts/shortcodes/tooltip.html similarity index 100% rename from layouts/shortcodes/tooltip.html rename to common-theme/layouts/shortcodes/tooltip.html diff --git a/layouts/shortcodes/wordlimit.html b/common-theme/layouts/shortcodes/wordlimit.html similarity index 100% rename from layouts/shortcodes/wordlimit.html rename to common-theme/layouts/shortcodes/wordlimit.html diff --git a/layouts/shortcodes/youtube.html b/common-theme/layouts/shortcodes/youtube.html similarity index 100% rename from layouts/shortcodes/youtube.html rename to common-theme/layouts/shortcodes/youtube.html diff --git a/package-lock.json b/common-theme/package-lock.json similarity index 100% rename from package-lock.json rename to common-theme/package-lock.json diff --git a/package.json b/common-theme/package.json similarity index 100% rename from package.json rename to common-theme/package.json diff --git a/prettierignore b/common-theme/prettierignore similarity index 100% rename from prettierignore rename to common-theme/prettierignore diff --git a/common-theme/static/favicon.ico b/common-theme/static/favicon.ico new file mode 100644 index 000000000..67f8b7778 Binary files /dev/null and b/common-theme/static/favicon.ico differ diff --git a/static/logos/github.png b/common-theme/static/logos/github.png similarity index 100% rename from static/logos/github.png rename to common-theme/static/logos/github.png diff --git a/static/logos/netlify.svg b/common-theme/static/logos/netlify.svg similarity index 100% rename from static/logos/netlify.svg rename to common-theme/static/logos/netlify.svg diff --git a/static/logos/slack.png b/common-theme/static/logos/slack.png similarity index 100% rename from static/logos/slack.png rename to common-theme/static/logos/slack.png diff --git a/content/en/blocks/requirements/index.md b/content/en/blocks/requirements/index.md deleted file mode 100644 index 45a326c8d..000000000 --- a/content/en/blocks/requirements/index.md +++ /dev/null @@ -1,15 +0,0 @@ -+++ -title = 'Understanding Requirements' -headless = true -time = 60 -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' -+++ - -{{< snippet "snippets/requirements.md" >}} diff --git a/content/en/databases/sprints/4/prep/index.md b/content/en/databases/sprints/4/prep/index.md deleted file mode 100644 index 988107c78..000000000 --- a/content/en/databases/sprints/4/prep/index.md +++ /dev/null @@ -1,17 +0,0 @@ -+++ -title = 'prep' -layout = 'prep' -emoji= 'πŸ“' -menu_level = ['sprint'] -weight = 1 -backlog= 'Module-Databases' -backlog_filter= 'Week 4' -[[blocks]] -name="Collaborative Job Hunting" -src="https://cyf-pd.netlify.app/blocks/prep-collaborative-job-hunt/readme/" -[[blocks]] -name="Understanding employers needs" -src="https://cyf-pd.netlify.app/blocks/understanding-employers-needs/readme/" -+++ - - diff --git a/content/en/induction/_index.md b/content/en/induction/_index.md deleted file mode 100644 index 09a4f9f86..000000000 --- a/content/en/induction/_index.md +++ /dev/null @@ -1,8 +0,0 @@ -+++ -title = 'Induction' -description = 'Join the CodeYourFuture Software Development Course; Explore version control with Git and GitHub; fork, branch, and clone in the VSCode interface' -layout = 'module' -emoji= '🀝' -menu = ['syllabus'] -weight='1' -+++ diff --git a/content/en/induction/sprints/1/prep/index.md b/content/en/induction/sprints/1/prep/index.md deleted file mode 100644 index 39024df5e..000000000 --- a/content/en/induction/sprints/1/prep/index.md +++ /dev/null @@ -1,41 +0,0 @@ -+++ -title = 'prep' -description = 'Work through these notes and activities to prepare for class. You will have a prep page for every sprint (week) of the course.' -layout = 'prep' -emoji= 'πŸ“' -menu_level = ['sprint'] -weight = 1 -[[blocks]] -name="πŸ“ CYF blog" -src="induction/blocks/cyf-blog" -[[blocks]] -name="🧰 Development process" -src="induction/blocks/development-process" -[[blocks]] -name="βŒ› Version control software" -src="induction/blocks/version-control" -[[blocks]] -name="πŸ—„οΈ 🌐 Sharing history" -src="induction/blocks/sharing-history" -[[blocks]] -name="πŸ” Check out a commit" -src="induction/blocks/check-out-a-commit" -[[blocks]] -name="πŸ“œ Previous versions" -src="induction/blocks/previous-versions" -[[blocks]] -name="🍴 Forking a repository" -src="induction/blocks/forking-a-repository" -[[blocks]] -name="πŸ’» Working locally" -src="induction/blocks/working-locally" -[[blocks]] -name="πŸ“˜ Viewing the files" -src="induction/blocks/viewing-files" -[[blocks]] -name="🌳 Branching" -src="induction/blocks/branching" -[[blocks]] -name="🎁 Wrapping up" -src="induction/blocks/wrapping-up" -+++ diff --git a/content/en/induction/success/index.md b/content/en/induction/success/index.md deleted file mode 100644 index d2cb58a34..000000000 --- a/content/en/induction/success/index.md +++ /dev/null @@ -1,19 +0,0 @@ -+++ -title = 'success' -description = 'success description' -layout = 'success' -emoji= 'πŸ“' -menu_level = ['module'] -weight = 11 -backlog= 'Module-Induction' -backlog_filter= 'Induction' -[[objectives]] -1="Every trainee has understood the goals of the Software Development course and what is expected of them" -2="Every trainee has shared their availability on a shared spreadsheet" -3="Every trainee has paired up with another trainee to work together at least once" -+++ - -Every module, you must review your progress to understand if your cohort can progress to the next stage. The conditions for success are listed below. If your cohort has met all of these conditions, you can progress to the next module. If you have not met them yet, what actions will you take to meet them? - -Discuss your plan in your class channel. -+++ diff --git a/content/en/js1/sprints/4/prep/index.md b/content/en/js1/sprints/4/prep/index.md deleted file mode 100644 index 2db20bb20..000000000 --- a/content/en/js1/sprints/4/prep/index.md +++ /dev/null @@ -1,42 +0,0 @@ -+++ -title = 'prep' -layout = 'prep' -emoji= 'πŸ“' -menu_level = ['sprint'] -weight = 1 -backlog= 'Module-JS1' -backlog_filter= 'Week 4' -[[blocks]] -src="js1/blocks/ordinal" -name="ordinal" -[[blocks]] -name="Step-through-prep workshop" -src="https://www.youtube.com/watch?v=2k_EtdVbb4c" -[[blocks]] -src="js1/blocks/framework" -name="framework" -[[blocks]] -src="js1/blocks/setup" -name="setup" -[[blocks]] -src="js1/blocks/packages" -name="packages" -[[blocks]] -src="js1/blocks/installing" -name="installing" -[[blocks]] -src="js1/blocks/api" -name="api" -[[blocks]] -src="js1/blocks/cases" -name="cases" -[[blocks]] -src="js1/blocks/feedback" -name="feedback" -[[blocks]] -src="js1/blocks/generalise" -name="generalise" -[[blocks]] -name= "Asking good questions" -src= "https://cyf-pd.netlify.app/blocks/prep-asking-good-questions/readme/" -+++ diff --git a/content/en/js3/sprints/1/prep/index.md b/content/en/js3/sprints/1/prep/index.md deleted file mode 100644 index a39782feb..000000000 --- a/content/en/js3/sprints/1/prep/index.md +++ /dev/null @@ -1,42 +0,0 @@ -+++ -title = 'prep' -layout = 'prep' -emoji= 'πŸ“' -menu_level = ['sprint'] -weight = 1 -backlog= 'Module-JS3' -backlog_filter= 'Week 1' -[[blocks]] -name="data to ui" -src="js3/blocks/data-ui" -[[blocks]] -name="Step-through-prep workshop" -src="https://www.youtube.com/watch?v=HgbzMhJgdbU" -[[blocks]] -name="now-showing" -src="js3/blocks/now-showing" -[[blocks]] -name="single-datum" -src="js3/blocks/single-datum" -[[blocks]] -name="composing elements" -src="js3/blocks/composing-elements" -[[blocks]] -name="Simplifying element creation" -src="js3/blocks/simplifying-element-creation" -[[blocks]] -name="