From 4f21e74fc71b00cf4eff89a0e9a6fe225bde5884 Mon Sep 17 00:00:00 2001 From: davidwilby Date: Tue, 4 Oct 2022 16:00:21 +0100 Subject: [PATCH 1/3] add mermaid graphs using latest version of mermaid; needed to override outdated default version from learn theme --- config.toml | 3 ++- go.mod | 4 ++-- go.sum | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config.toml b/config.toml index 12b58fa..91f6314 100644 --- a/config.toml +++ b/config.toml @@ -56,7 +56,8 @@ weight = 40 disableBreadcrumb = false disableNextPrev = false themeVariant = "rse-learn" - + disableMermaid = false + customMermaidURL = "https://unpkg.com/mermaid@9.1.7/dist/mermaid.min.js" [markup] diff --git a/go.mod b/go.mod index 4ed1e3b..3f47879 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/annakrystalli/rse-workshop-materials-template go 1.14 require ( - github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c // indirect - github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06 // indirect + github.com/dzello/reveal-hugo v0.0.0-20220710134748-1c7822db0cf2 // indirect + github.com/matcornic/hugo-theme-learn v0.0.0-20211028190410-e817f53d690d // indirect ) diff --git a/go.sum b/go.sum index fdedf60..d3c0e0e 100644 --- a/go.sum +++ b/go.sum @@ -2,7 +2,11 @@ github.com/dzello/reveal-hugo v0.0.0-20200513004858-ff9f389743ae h1:x2cMxkgkOshG github.com/dzello/reveal-hugo v0.0.0-20200513004858-ff9f389743ae/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8= github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c h1:MqLk4B4fKbRMECHQAMY0S5RFovEtjXS9TTMLsB/NWJU= github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8= +github.com/dzello/reveal-hugo v0.0.0-20220710134748-1c7822db0cf2 h1:8HLH/Bt9+oK+/hu/HxPUlyMbo3WUUxrDkM2aw7IzBXg= +github.com/dzello/reveal-hugo v0.0.0-20220710134748-1c7822db0cf2/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8= github.com/matcornic/hugo-theme-learn v0.0.0-20200911135725-023fe7ef2b4c h1:wuILQJPvX0BYvxuvktvToxtOxAcELdnPS0ppKJ4f9Dw= github.com/matcornic/hugo-theme-learn v0.0.0-20200911135725-023fe7ef2b4c/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY= github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06 h1:Vxgl1/dyKpZDstVWmxNL9BauEGxLXrcbe1T09/dEzTY= github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY= +github.com/matcornic/hugo-theme-learn v0.0.0-20211028190410-e817f53d690d h1:p7ktiW/GnHccjB9oO5YGY7us5v/oHmkyF0C7EDZFM3s= +github.com/matcornic/hugo-theme-learn v0.0.0-20211028190410-e817f53d690d/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY= From e87a191a7fd0d698693bc09b3e284b15d6083aa2 Mon Sep 17 00:00:00 2001 From: davidwilby Date: Tue, 4 Oct 2022 16:00:44 +0100 Subject: [PATCH 2/3] add example branch gitgraph to chapter 4 --- .../00-intro.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/content/04-collaborative_github_advanced/00-intro.md b/content/04-collaborative_github_advanced/00-intro.md index c1865e6..2872d33 100644 --- a/content/04-collaborative_github_advanced/00-intro.md +++ b/content/04-collaborative_github_advanced/00-intro.md @@ -27,4 +27,20 @@ Branching is a core concept in Git. There's only one rule: **anything in the `ma -it's extremely important that your new branch is created off of main when working on a feature or a fix. Your branch name should be descriptive, so that others can see what is being worked on. \ No newline at end of file +it's extremely important that your new branch is created off of main when working on a feature or a fix. Your branch name should be descriptive, so that others can see what is being worked on. + + +{{}} +%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true,'showCommitLabel': false}} }%% +gitGraph + commit + commit + commit + commit + commit + branch feature + checkout feature + commit + commit + checkout main +{{}} From 01932b6d40af4532c2dc0111dd1e8c5d1fa6015b Mon Sep 17 00:00:00 2001 From: davidwilby Date: Mon, 19 Dec 2022 11:16:34 +0000 Subject: [PATCH 3/3] tidy up modules --- go.sum | 8 -------- 1 file changed, 8 deletions(-) diff --git a/go.sum b/go.sum index d3c0e0e..19d5372 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,4 @@ -github.com/dzello/reveal-hugo v0.0.0-20200513004858-ff9f389743ae h1:x2cMxkgkOshGVuUswcYK1Nda6s0QFff8QDOIt3eCfKA= -github.com/dzello/reveal-hugo v0.0.0-20200513004858-ff9f389743ae/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8= -github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c h1:MqLk4B4fKbRMECHQAMY0S5RFovEtjXS9TTMLsB/NWJU= -github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8= github.com/dzello/reveal-hugo v0.0.0-20220710134748-1c7822db0cf2 h1:8HLH/Bt9+oK+/hu/HxPUlyMbo3WUUxrDkM2aw7IzBXg= github.com/dzello/reveal-hugo v0.0.0-20220710134748-1c7822db0cf2/go.mod h1:0S5eDEdHBx8tSj8veo9lUnuJRXa8WqmpANd0Lz7CLc8= -github.com/matcornic/hugo-theme-learn v0.0.0-20200911135725-023fe7ef2b4c h1:wuILQJPvX0BYvxuvktvToxtOxAcELdnPS0ppKJ4f9Dw= -github.com/matcornic/hugo-theme-learn v0.0.0-20200911135725-023fe7ef2b4c/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY= -github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06 h1:Vxgl1/dyKpZDstVWmxNL9BauEGxLXrcbe1T09/dEzTY= -github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY= github.com/matcornic/hugo-theme-learn v0.0.0-20211028190410-e817f53d690d h1:p7ktiW/GnHccjB9oO5YGY7us5v/oHmkyF0C7EDZFM3s= github.com/matcornic/hugo-theme-learn v0.0.0-20211028190410-e817f53d690d/go.mod h1:YoToDcvQxmAFhpEuapKUysBDEBckqDEssqTrmeZ2+uY=