diff --git a/common-theme/assets/styles/04-components/block.scss b/common-theme/assets/styles/04-components/block.scss index 3d2391a62..3abe39e95 100644 --- a/common-theme/assets/styles/04-components/block.scss +++ b/common-theme/assets/styles/04-components/block.scss @@ -79,4 +79,9 @@ color: var(--theme-color--pop); } } + + &--codewars-workshop iframe { + width: 100%; + height: 90vh; + } } diff --git a/common-theme/layouts/partials/block/block.html b/common-theme/layouts/partials/block/block.html index 4b6253498..220151ef8 100644 --- a/common-theme/layouts/partials/block/block.html +++ b/common-theme/layouts/partials/block/block.html @@ -20,6 +20,8 @@ {{ partial "block/slide.html" . }} {{ else if eq $blockData.type "link" }} {{ partial "block/link.html" . }} +{{ else if eq $blockData.type "codewars-workshop" }} + {{ partial "block/codewars-workshop.html" . }} {{ else }} {{ errorf "Unrecognized block type %s" $blockData.type }} {{ end }} diff --git a/common-theme/layouts/partials/block/codewars-workshop.html b/common-theme/layouts/partials/block/codewars-workshop.html new file mode 100644 index 000000000..15d99ed78 --- /dev/null +++ b/common-theme/layouts/partials/block/codewars-workshop.html @@ -0,0 +1,19 @@ +{{ $blockData := .Page.Scratch.Get "blockData" }} + +
+
+

+ 🔗 {{ $blockData.name }} +

+ + {{ partial "time.html" . }} +
+ +

In groups, we will work through this Codewars problem. Split into groups, one per volunteer.

+ +

Remember: Our goals are to: Understand the problem and make a plan to solve it. These are more important steps than actually writing the code (though we should do that too, after we have a plan).

+ + +
diff --git a/common-theme/layouts/partials/block/data.html b/common-theme/layouts/partials/block/data.html index f1cfa55e0..7e43d0166 100644 --- a/common-theme/layouts/partials/block/data.html +++ b/common-theme/layouts/partials/block/data.html @@ -64,6 +64,10 @@ {{/* TODO pull time from commented out front matter in Github readmes */}} {{ end }} + {{ if "codewars-workshops." | in $src }} + {{ .Scratch.SetInMap "blockData" "type" "codewars-workshop" }} + {{ end }} + {{/* TODO get rid of the old way of bringing in cyf pd and remove hardcoded CYF stuff here */}} {{ if or ("cyf-pd.netlify.app" | in $src) ("/pd/"| in $src) }} {{ .Scratch.SetInMap "blockData" "type" "pd" }} diff --git a/org-cyf-itp/content/structuring-data/sprints/1/day-plan/index.md b/org-cyf-itp/content/structuring-data/sprints/1/day-plan/index.md index 3ef539bc6..095bceece 100644 --- a/org-cyf-itp/content/structuring-data/sprints/1/day-plan/index.md +++ b/org-cyf-itp/content/structuring-data/sprints/1/day-plan/index.md @@ -12,8 +12,8 @@ time=10 name="Energiser: Popcorn" src="energisers/popcorn-screen-share" [[blocks]] -name="Javascript Test Your Understanding" -src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/js1-wk1-eval" +name="Problem Solving Workshop" +src="https://codewars-workshops.codeyourfuture.io/problem-01/" time=65 [[blocks]] name="Morning break" diff --git a/org-cyf-itp/content/structuring-data/sprints/2/day-plan/index.md b/org-cyf-itp/content/structuring-data/sprints/2/day-plan/index.md index 07119e3bb..d17c2aec8 100644 --- a/org-cyf-itp/content/structuring-data/sprints/2/day-plan/index.md +++ b/org-cyf-itp/content/structuring-data/sprints/2/day-plan/index.md @@ -13,8 +13,8 @@ name="Morning orientation" src="blocks/morning-orientation" time=15 [[blocks]] -name="Questions and Review Workshop" -src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/questions-and-reviews" +name="Problem Solving Workshop" +src="https://codewars-workshops.codeyourfuture.io/problem-02/" time=60 [[blocks]] name="Morning break" diff --git a/org-cyf-itp/content/structuring-data/sprints/3/day-plan/index.md b/org-cyf-itp/content/structuring-data/sprints/3/day-plan/index.md index 136658058..4883ce0a5 100644 --- a/org-cyf-itp/content/structuring-data/sprints/3/day-plan/index.md +++ b/org-cyf-itp/content/structuring-data/sprints/3/day-plan/index.md @@ -15,7 +15,14 @@ time=20 [[blocks]] name="Workshop:Playing Computer" src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/playing-computer" -time=140 +time=65 +[[blocks]] +name="Morning break" +src="blocks/morning-break" +[[blocks]] +name="Problem Solving Workshop" +src="https://codewars-workshops.codeyourfuture.io/problem-03/" +time=60 [[blocks]] name="lunch" src="blocks/lunch" diff --git a/org-cyf-itp/go.mod b/org-cyf-itp/go.mod index 5b23ac929..09322c6da 100644 --- a/org-cyf-itp/go.mod +++ b/org-cyf-itp/go.mod @@ -4,8 +4,8 @@ go 1.24.5 require ( github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240905150045-7be086ff6886 // indirect - github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241022142707-ee3974f18eb2 // indirect - github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20241022142707-ee3974f18eb2 // indirect + github.com/CodeYourFuture/curriculum/common-content v0.0.0-20250801130816-705636729ea4 // indirect + github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20250801130816-705636729ea4 // indirect github.com/CodeYourFuture/curriculum/org-cyf-guides v0.0.0-20241022142707-ee3974f18eb2 // indirect github.com/CodeYourFuture/curriculum/org-cyf-how-this-works v0.0.0-20241022142707-ee3974f18eb2 // indirect github.com/CodeYourFuture/curriculum/org-cyf-piscine v0.0.0-20241022142707-ee3974f18eb2 // indirect