Skip to content

Commit

Permalink
Unify on just one How This Works module (from ITP) (#1040)
Browse files Browse the repository at this point in the history
Currently we have several copies that are intended to be in sync.

If we want to have them diverge in the future, we can do that.

Also, run lots of `hugo mod tidy`, and clean up the resulting
go.mod files.
  • Loading branch information
illicitonion authored Oct 8, 2024
1 parent 0b8f101 commit 51f30ef
Show file tree
Hide file tree
Showing 67 changed files with 98 additions and 463 deletions.
1 change: 0 additions & 1 deletion common-docs/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.22.6
require (
github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 // indirect
github.com/CodeYourFuture/CYF-Projects/micro-front-end v0.0.0-20240817190624-149d97c26abe // indirect
github.com/CodeYourFuture/CYF-Workshops v0.0.0-20240730222326-e91ae6d11f47 // indirect
github.com/CodeYourFuture/CYF-Workshops/micro-front-end v0.0.0-20240802103453-e77217be1596 // indirect
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240818070728-e8702788f7cb // indirect
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240818070728-e8702788f7cb // indirect
Expand Down
8 changes: 0 additions & 8 deletions common-docs/go.sum
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 h1:QkyzRerSZyumZ4gxoE7gehj86zWdDY7O4K9pqW8OLtg=
github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278/go.mod h1:DJj2pdPceTBoHErILtnZMEYPZZuC8W9Fmt/faaW2tcw=
github.com/CodeYourFuture/CYF-Projects/micro-front-end v0.0.0-20240802103347-3eb0ebf8ad9b h1:iQyvh1DWWbx55Qvs923X2liMosQmQNlFumOrEmgq7c8=
github.com/CodeYourFuture/CYF-Projects/micro-front-end v0.0.0-20240802103347-3eb0ebf8ad9b/go.mod h1:MutmCRXM0wOmDQrZGMmn6jSWHHst5j1AUuf7hwrbILI=
github.com/CodeYourFuture/CYF-Projects/micro-front-end v0.0.0-20240817190624-149d97c26abe h1:3Kjzzk+6UCspKrEv4eTwhlGRisGsRoBR4P03UtC2Yic=
github.com/CodeYourFuture/CYF-Projects/micro-front-end v0.0.0-20240817190624-149d97c26abe/go.mod h1:MutmCRXM0wOmDQrZGMmn6jSWHHst5j1AUuf7hwrbILI=
github.com/CodeYourFuture/CYF-Workshops v0.0.0-20240730222326-e91ae6d11f47 h1:mDxz8UhJ5HUgOfKQSXgAxQ3VRYPe3MrKgj24awTFsqY=
github.com/CodeYourFuture/CYF-Workshops v0.0.0-20240730222326-e91ae6d11f47/go.mod h1:boAUC/K1YXRsqYHTgJwP7REMXh+p7jzEwj5FHAlKyBs=
github.com/CodeYourFuture/CYF-Workshops/micro-front-end v0.0.0-20240802103453-e77217be1596 h1:Vc2ngGyiLYK9mKVk+HQokU5YVuSvcuOKV/VdxGb2MOE=
github.com/CodeYourFuture/CYF-Workshops/micro-front-end v0.0.0-20240802103453-e77217be1596/go.mod h1:KL+gB+sD1SdzQ8Z7fMA74gluqKpsw9rGWNDnJKM07P8=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240730234110-686ee61f166f h1:vZubdDqpQ2Pr/DYx7Aa2akWakIODFKy5+v9nwx/ZO9s=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240730234110-686ee61f166f/go.mod h1:e3J+XphCBJJ8kf6S9ykVxNY1VKPWJoYuDFXEizlDpCI=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240730234110-686ee61f166f h1:SmxmBC8zpU1cUuHWlb1Gk254V5olSzhjYB9g75GJIyk=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240730234110-686ee61f166f/go.mod h1:kzt+J4JYp5C3GD1dX0rf7vY5fsTUc6Drrn+7p7pjmLg=
File renamed without changes.
17 changes: 17 additions & 0 deletions org-cyf-how-this-works/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module github.com/CodeYourFuture/curriculum/org-cyf-how-this-works

go 1.22.6

toolchain go1.22.8

require (
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20241008095008-281a5517463f // indirect
github.com/CodeYourFuture/curriculum/org-cyf-theme v0.0.0-20241008095008-281a5517463f // indirect
)

replace github.com/CodeYourFuture/curriculum/common-content => ../common-content

replace github.com/CodeYourFuture/curriculum/common-theme => ../common-theme

replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme
6 changes: 6 additions & 0 deletions org-cyf-how-this-works/go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f h1:OExhF51yL+NOLFSZVzrnP/sazCLw56jt8rNBRQBsHqY=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f/go.mod h1:e3J+XphCBJJ8kf6S9ykVxNY1VKPWJoYuDFXEizlDpCI=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20241008095008-281a5517463f h1:MWuTYYr6gD93tdU5yrukRW3lA0RZNOYT9YUleG6MXNs=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20241008095008-281a5517463f/go.mod h1:kzt+J4JYp5C3GD1dX0rf7vY5fsTUc6Drrn+7p7pjmLg=
github.com/CodeYourFuture/curriculum/org-cyf-theme v0.0.0-20241008095008-281a5517463f h1:r9Oor/1DBzHeEZunbUtKt4oWifH/BaSLkxz1v0aAHOw=
github.com/CodeYourFuture/curriculum/org-cyf-theme v0.0.0-20241008095008-281a5517463f/go.mod h1:Wv6VAMOIp5v0eZiHWSGzanDAIfK+prnnPK0hUPeFvwk=
7 changes: 7 additions & 0 deletions org-cyf-how-this-works/hugo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
title = "How this works"
description="An introductory course explaining the curriculum and day-to-day flow of life at Code Your Future."
baseURL = "https://curriculum.codeyourfuture.io/"

[module]
[[module.imports]]
path = "github.com/CodeYourFuture/curriculum/org-cyf-theme"
4 changes: 3 additions & 1 deletion org-cyf-itd/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ require (
)

replace github.com/CodeYourFuture/curriculum/common-content => ../common-content
replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme

replace github.com/CodeYourFuture/curriculum/common-theme => ../common-theme

replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme
11 changes: 6 additions & 5 deletions org-cyf-itp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,19 @@ go 1.22.6

require (
github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 // indirect
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240818070728-e8702788f7cb // indirect
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240818070728-e8702788f7cb // indirect
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20241008095008-281a5517463f // indirect
github.com/CodeYourFuture/curriculum/org-cyf-guides v0.0.0-20240721115017-ac0d39b0bbe3 // indirect
github.com/CodeYourFuture/curriculum/org-cyf-how-this-works v0.0.0-00010101000000-000000000000 // indirect
github.com/CodeYourFuture/curriculum/org-cyf-piscine v0.0.0-20240818070728-e8702788f7cb // indirect
)

replace github.com/CodeYourFuture/curriculum/common-content => ../common-content

replace github.com/CodeYourFuture/curriculum/common-theme => ../common-theme

replace github.com/CodeYourFuture/curriculum/org-cyf-piscine => ../org-cyf-piscine

replace github.com/CodeYourFuture/curriculum/org-cyf-guides => ../org-cyf-guides

replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme
replace github.com/CodeYourFuture/curriculum/org-cyf-how-this-works => ../org-cyf-how-this-works

replace github.com/CodeYourFuture/curriculum/org-cyf-piscine => ../org-cyf-piscine
10 changes: 0 additions & 10 deletions org-cyf-itp/go.sum
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
github.com/CodeYourFuture/CYF-PD v1.0.0 h1:/zivfP1G3bwv/+R+wog151/we3BfNlMHhlsVA1u/XW0=
github.com/CodeYourFuture/CYF-PD v1.0.0/go.mod h1:DHl0hTj4HVlLaNcIfwLx3ZkO8R0B08CpvVj2KCJgzpg=
github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 h1:QkyzRerSZyumZ4gxoE7gehj86zWdDY7O4K9pqW8OLtg=
github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278/go.mod h1:DJj2pdPceTBoHErILtnZMEYPZZuC8W9Fmt/faaW2tcw=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240121151641-e52b73ad527d h1:WfPdLoNvxOrNx3GB+DpYlpEH57v98h0KWXpidN+xdOo=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240121151641-e52b73ad527d/go.mod h1:e3J+XphCBJJ8kf6S9ykVxNY1VKPWJoYuDFXEizlDpCI=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240121151641-e52b73ad527d h1:ILE8f9gXLEPEyrJVBdFRVa0Uszf9OVdK4LjXZjCLUag=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240121151641-e52b73ad527d/go.mod h1:kzt+J4JYp5C3GD1dX0rf7vY5fsTUc6Drrn+7p7pjmLg=
github.com/CodeYourFuture/curriculum/org-cyf-guides v0.0.0-20240606160122-fc5c72085f6b h1:GHzTJJAonmevEAYcLIz8E9D8t0GuvfU9Ke+98cDQnws=
github.com/CodeYourFuture/curriculum/org-cyf-guides v0.0.0-20240606160122-fc5c72085f6b/go.mod h1:Suv+qMxRbE8arUU9j3BLg05NLyitSpwgdKacTuSvdu0=
github.com/CodeYourFuture/curriculum/org-cyf-piscine v0.0.0-20240606140350-5d544563778a h1:Gi+xzMDa4xIY/7eBoFJSPu0n7w3zecgUMZmXNKieW5I=
github.com/CodeYourFuture/curriculum/org-cyf-piscine v0.0.0-20240606140350-5d544563778a/go.mod h1:vHl1mi2VfjpfTs0yiqpsq5GxHFBnstBiOrrkxb9Ido4=
7 changes: 6 additions & 1 deletion org-cyf-itp/hugo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ baseURL = "https://programming.codeyourfuture.io/"
[[module.imports.mounts]]
source = "content/blocks"
target = "content/pd/blocks"
[[module.imports]]
path = "github.com/CodeYourFuture/curriculum/org-cyf-how-this-works"
[[module.imports.mounts]]
source = "content"
target = "content/how-this-works"


[markup]
Expand All @@ -39,4 +44,4 @@ baseURL = "https://programming.codeyourfuture.io/"
# because of this 'unexpected behaviour' https://gohugo.io/methods/page/nextinsection/
[page]
nextPrevInSectionSortOrder = 'asc'
nextPrevSortOrder = 'asc'
nextPrevSortOrder = 'asc'
4 changes: 2 additions & 2 deletions org-cyf-launch/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (

replace github.com/CodeYourFuture/curriculum/common-content => ../common-content

replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme

replace github.com/CodeYourFuture/curriculum/common-theme => ../common-theme

replace github.com/CodeYourFuture/curriculum/org-cyf-guides => ../org-cyf-guides

replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme
4 changes: 0 additions & 4 deletions org-cyf-launch/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 h1:QkyzRer
github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278/go.mod h1:DJj2pdPceTBoHErILtnZMEYPZZuC8W9Fmt/faaW2tcw=
github.com/CodeYourFuture/CYF-Projects/micro-front-end v0.0.0-20240802103347-3eb0ebf8ad9b h1:iQyvh1DWWbx55Qvs923X2liMosQmQNlFumOrEmgq7c8=
github.com/CodeYourFuture/CYF-Projects/micro-front-end v0.0.0-20240802103347-3eb0ebf8ad9b/go.mod h1:MutmCRXM0wOmDQrZGMmn6jSWHHst5j1AUuf7hwrbILI=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240121151641-e52b73ad527d h1:WfPdLoNvxOrNx3GB+DpYlpEH57v98h0KWXpidN+xdOo=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240121151641-e52b73ad527d/go.mod h1:e3J+XphCBJJ8kf6S9ykVxNY1VKPWJoYuDFXEizlDpCI=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240121151641-e52b73ad527d h1:ILE8f9gXLEPEyrJVBdFRVa0Uszf9OVdK4LjXZjCLUag=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240121151641-e52b73ad527d/go.mod h1:kzt+J4JYp5C3GD1dX0rf7vY5fsTUc6Drrn+7p7pjmLg=
github.com/CodeYourFuture/curriculum/org-cyf-guides v0.0.0-20240820155314-7287ff7c75f9 h1:bFPocaQD67r+RbrU9xDA9R9uavn10myYzwZvKBG/iqU=
github.com/CodeYourFuture/curriculum/org-cyf-guides v0.0.0-20240820155314-7287ff7c75f9/go.mod h1:7EBadJB9OQSvx72Xhm4wN8reQYSwFNzbsiXtMhLuUQ4=
github.com/CodeYourFuture/curriculum/org-cyf-theme v0.0.0-20240818070728-e8702788f7cb h1:P0mRDAC+Sh+7D+8Mlcyb6Sqid3w0asdincQMS9QLvpI=
Expand Down
2 changes: 2 additions & 0 deletions org-cyf-piscine/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ require (
)

replace github.com/CodeYourFuture/curriculum/common-content => ../common-content

replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme

replace github.com/CodeYourFuture/curriculum/common-theme => ../common-theme
4 changes: 0 additions & 4 deletions org-cyf-piscine/go.sum
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240114132825-493a89648721 h1:txnduLXqSKf3XHb/g74uhpGltb9FgyrdrMeC/Ce3vr0=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240114132825-493a89648721/go.mod h1:w5rIm9hJlHD+CYpQEVMWE/6WaE/EiLmYVs18Kw/iH0s=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240121151641-e52b73ad527d h1:WfPdLoNvxOrNx3GB+DpYlpEH57v98h0KWXpidN+xdOo=
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240121151641-e52b73ad527d/go.mod h1:e3J+XphCBJJ8kf6S9ykVxNY1VKPWJoYuDFXEizlDpCI=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240114132825-493a89648721 h1:GSd+9AsvXJEjy2AvsP79YBpmMRhxydDhVvlbD5x5DKg=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240114132825-493a89648721/go.mod h1:lWiQfXWr0Uc517tksx7D5p5ZoXo9bxRoJ0or+z9mRyk=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240121151641-e52b73ad527d h1:ILE8f9gXLEPEyrJVBdFRVa0Uszf9OVdK4LjXZjCLUag=
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240121151641-e52b73ad527d/go.mod h1:kzt+J4JYp5C3GD1dX0rf7vY5fsTUc6Drrn+7p7pjmLg=
github.com/CodeYourFuture/curriculum/org-cyf-theme v0.0.0-20240818070728-e8702788f7cb h1:P0mRDAC+Sh+7D+8Mlcyb6Sqid3w0asdincQMS9QLvpI=
Expand Down
8 changes: 0 additions & 8 deletions org-cyf-sdc/content/how-our-curriculum-works/_index.md

This file was deleted.

26 changes: 0 additions & 26 deletions org-cyf-sdc/content/how-our-curriculum-works/prep/index.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions org-cyf-sdc/content/how-our-curriculum-works/success/index.md

This file was deleted.

14 changes: 10 additions & 4 deletions org-cyf-sdc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@ go 1.22.6

require (
github.com/CodeYourFuture/CYF-PD v1.0.0 // indirect
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240818070728-e8702788f7cb // indirect
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240818070728-e8702788f7cb // indirect
github.com/CodeYourFuture/curriculum/org-cyf-guides v0.0.0-20240627192034-258d6c60ef9c // indirect
github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20241008095008-281a5517463f // indirect
github.com/CodeYourFuture/curriculum/org-cyf-guides v0.0.0-20241008095008-281a5517463f // indirect
github.com/CodeYourFuture/curriculum/org-cyf-how-this-works v0.0.0-00010101000000-000000000000 // indirect
github.com/CodeYourFuture/curriculum/org-cyf-theme v0.0.0-20241008095008-281a5517463f // indirect
)

replace github.com/CodeYourFuture/curriculum/common-content => ../common-content
replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme

replace github.com/CodeYourFuture/curriculum/common-theme => ../common-theme

replace github.com/CodeYourFuture/curriculum/org-cyf-guides => ../org-cyf-guides

replace github.com/CodeYourFuture/curriculum/org-cyf-how-this-works => ../org-cyf-how-this-works

replace github.com/CodeYourFuture/curriculum/org-cyf-theme => ../org-cyf-theme
Loading

0 comments on commit 51f30ef

Please sign in to comment.