From 7fcd661c7746cf5f40486a40b978122e6b3d94fd Mon Sep 17 00:00:00 2001
From: Sally McGrath <sally@codeyourfuture.io>
Date: Sun, 21 Jan 2024 10:32:46 -0600
Subject: [PATCH] making site run again now modules are being consumed
 correctly (#541)

* making site run again now modules are being consumed correctly

- rm erroneous index files
- fix all errors - wrong names, empty src
- move fonts (this was done in the docs branch so I missed it)

* commit local overrides

Sorry I didn't understand I should commit this, not just change it
---
 common-content/en/_index.md                          |  4 ----
 common-content/en/module/fundamentals/_index.md      | 11 -----------
 common-content/en/module/js1/_index.md               |  8 --------
 common-content/en/module/js3/_index.md               |  8 --------
 org-cyf/content/databases/sprints/1/prep/index.md    |  2 +-
 org-cyf/content/html-css/sprints/3/day-plan/index.md |  4 +++-
 org-cyf/content/js1/sprints/1/prep/index.md          |  3 ---
 org-cyf/go.mod                                       |  4 ++++
 org-cyf/hugo.toml                                    |  2 +-
 9 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 common-content/en/_index.md
 delete mode 100644 common-content/en/module/fundamentals/_index.md
 delete mode 100644 common-content/en/module/js1/_index.md
 delete mode 100644 common-content/en/module/js3/_index.md

diff --git a/common-content/en/_index.md b/common-content/en/_index.md
deleted file mode 100644
index 4ccb319e5..000000000
--- a/common-content/en/_index.md
+++ /dev/null
@@ -1,4 +0,0 @@
-+++
-title="Our Curriculum"
-description="This how you find out _what_ to do _when_"
-+++
diff --git a/common-content/en/module/fundamentals/_index.md b/common-content/en/module/fundamentals/_index.md
deleted file mode 100644
index 2f5558906..000000000
--- a/common-content/en/module/fundamentals/_index.md
+++ /dev/null
@@ -1,11 +0,0 @@
-+++
-title = 'Fundamentals'
-description = 'The plan for Fundamentals'
-layout = 'module'
-emoji= '🧱'
-menu = ['syllabus']
-weight='1'
-[[blocks]]
-name="Goals"
-src="fundamentals/blocks/goals"
-+++
diff --git a/common-content/en/module/js1/_index.md b/common-content/en/module/js1/_index.md
deleted file mode 100644
index fbcf3c153..000000000
--- a/common-content/en/module/js1/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-+++
-title = 'JS1'
-description = 'Find meaning behind syntax; Step through functions like a computer; Break problems down into sub-problems; Interpret acceptance criteria to form test cases; Recognise patterns'
-layout = 'module'
-emoji= '🥚'
-menu = ['syllabus']
-weight='3'
-+++
diff --git a/common-content/en/module/js3/_index.md b/common-content/en/module/js3/_index.md
deleted file mode 100644
index 49e060e1e..000000000
--- a/common-content/en/module/js3/_index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-+++
-title = 'JS3'
-description = 'Collaborate in code; Define and manage state; Use asynchronous programming to handle events and data; '
-layout = 'module'
-emoji= '🐥'
-menu = ['syllabus']
-weight='5'
-+++
diff --git a/org-cyf/content/databases/sprints/1/prep/index.md b/org-cyf/content/databases/sprints/1/prep/index.md
index 4022dc18b..0500df9f1 100644
--- a/org-cyf/content/databases/sprints/1/prep/index.md
+++ b/org-cyf/content/databases/sprints/1/prep/index.md
@@ -9,7 +9,7 @@ backlog= 'Module-Databases'
 backlog_filter= 'Week 1'
 [[blocks]]
 name="Introduction to Databases"
-src="module/databases/introduction-to-databases"
+src="module/databases/introduction-to-db"
 [[blocks]]
 name="What is a relational database?"
 src="https://www.youtube.com/watch?v=OqjJjpjDRLc"
diff --git a/org-cyf/content/html-css/sprints/3/day-plan/index.md b/org-cyf/content/html-css/sprints/3/day-plan/index.md
index 84b2fa66b..249309241 100644
--- a/org-cyf/content/html-css/sprints/3/day-plan/index.md
+++ b/org-cyf/content/html-css/sprints/3/day-plan/index.md
@@ -16,7 +16,9 @@ src="https://cyf-pd.netlify.app/blocks/developer-communication/readme/"
 name="Morning break"
 src="blocks/morning-break"
 [[blocks]]
-name="study-60"
+name="Study Group"
+src="blocks/study-group"
+time="60"
 [[blocks]]
 name="lunch"
 src="blocks/lunch"
diff --git a/org-cyf/content/js1/sprints/1/prep/index.md b/org-cyf/content/js1/sprints/1/prep/index.md
index 566b04424..8eb4ce41f 100644
--- a/org-cyf/content/js1/sprints/1/prep/index.md
+++ b/org-cyf/content/js1/sprints/1/prep/index.md
@@ -38,9 +38,6 @@ src="module/js1/logging"
 name="Errors"
 src="module/js1/errors"
 [[blocks]]
-name="Wrapping up"
-src="blocks/wrapping-up"
-[[blocks]]
 name= "Critical Thinking"
 src= "https://cyf-pd.netlify.app/blocks/prep-critical-thinking/readme/"
 +++
diff --git a/org-cyf/go.mod b/org-cyf/go.mod
index 052bbdf73..46364bda8 100644
--- a/org-cyf/go.mod
+++ b/org-cyf/go.mod
@@ -6,3 +6,7 @@ require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240121151641-e52b73ad527d // indirect
 	github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240121151641-e52b73ad527d // indirect
 )
+
+replace github.com/CodeYourFuture/curriculum/common-content => ../common-content
+replace github.com/CodeYourFuture/curriculum/common-theme => ../common-theme
+
diff --git a/org-cyf/hugo.toml b/org-cyf/hugo.toml
index 49542184b..aa529cc83 100644
--- a/org-cyf/hugo.toml
+++ b/org-cyf/hugo.toml
@@ -24,7 +24,7 @@ title = "CYF Curriculum"
         url = "https://codeyourfuture.io/donate/"
 
 [params]
-
+googleFonts="https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@300;500;700&family=Inter:wght@400;600&display=swap"
 description = "A free and open source software development programme."
 main_website = "https://codeyourfuture.io/"
 main_org_name = "Code Your Future"