diff --git a/.github/workflows/build-hugo.yml b/.github/workflows/build-hugo.yml new file mode 100644 index 0000000..fc80bb0 --- /dev/null +++ b/.github/workflows/build-hugo.yml @@ -0,0 +1,28 @@ +name: Build site with Hugo + +on: + push: + pull_request: + workflow_dispatch: + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + + - name: Set up Hugo + uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3, pinned for security + with: + hugo-version: '0.160.1' + extended: true + + - name: Build site with Hugo + run: | + hugo --minify + + - name: Upload artifacts + uses: actions/upload-artifact@v7 + with: + name: hugo-public + path: public/* diff --git a/README.md b/README.md index 1b2e971..2a8c077 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![](https://i.creativecommons.org/l/by/3.0/80x15.png)](https://creativecommons.org/licenses/by/4.0/) -This repo contains the source code of the website of the ***Git & Github through GitKraken Client - From Zero to Hero!*** course. +This repo contains the source code of the website of the ***Git & GitHub through GitKraken Client - From Zero to Hero!*** course. ## Prepation for course: @@ -76,15 +76,15 @@ Start building sites … hugo v0.123.7+extended linux/amd64 BuildDate=2025-07-18T03:41:49Z VendorInfo=ubuntu:0.123.7-1ubuntu0.3 - | EN + | EN -------------------+------ - Pages | 72 - Paginator pages | 0 - Non-page files | 0 - Static files | 395 - Processed images | 0 - Aliases | 0 - Cleaned | 0 + Pages | 72 + Paginator pages | 0 + Non-page files | 0 + Static files | 395 + Processed images | 0 + Aliases | 0 + Cleaned | 0 Built in 343 ms Environment: "development" @@ -112,7 +112,9 @@ Also, because slides are in the content, they are indexed by the Hugo learn them ## Credits -The workshop materials website template is based on the +The workshop materials website template was originally based on the [hugo-theme-learn](https://github.com/matcornic/hugo-theme-learn), [reveal-hugo](https://github.com/dzello/reveal-hugo) Hugo themes and further work and configuration by Maëlle Salmon for her course site on [**Scientific blogging with R Markdown**](https://github.com/maelle/rmd-blogging-course). + +The current version uses [hugo-theme-relearn](https://github.com/McShelby/hugo-theme-relearn). diff --git a/static/css/pygments.css b/assets/css/pygments.css similarity index 100% rename from static/css/pygments.css rename to assets/css/pygments.css diff --git a/static/css/theme-rse-learn.css b/assets/css/theme-rse-learn.css similarity index 100% rename from static/css/theme-rse-learn.css rename to assets/css/theme-rse-learn.css diff --git a/static/images/01-00-sd-gitkraken_init_repo.png b/assets/images/01-00-sd-gitkraken_init_repo.png similarity index 100% rename from static/images/01-00-sd-gitkraken_init_repo.png rename to assets/images/01-00-sd-gitkraken_init_repo.png diff --git a/static/images/01-01-sd-gitkraken_init_modal.png b/assets/images/01-01-sd-gitkraken_init_modal.png similarity index 100% rename from static/images/01-01-sd-gitkraken_init_modal.png rename to assets/images/01-01-sd-gitkraken_init_modal.png diff --git a/static/images/01-02-sd-gitkraken_init_filled.png b/assets/images/01-02-sd-gitkraken_init_filled.png similarity index 100% rename from static/images/01-02-sd-gitkraken_init_filled.png rename to assets/images/01-02-sd-gitkraken_init_filled.png diff --git a/static/images/01-03-sd-gitkraken_initial_commit_screenshot.png b/assets/images/01-03-sd-gitkraken_initial_commit_screenshot.png similarity index 100% rename from static/images/01-03-sd-gitkraken_initial_commit_screenshot.png rename to assets/images/01-03-sd-gitkraken_initial_commit_screenshot.png diff --git a/static/images/01-030405-sd-combined.png b/assets/images/01-030405-sd-combined.png similarity index 100% rename from static/images/01-030405-sd-combined.png rename to assets/images/01-030405-sd-combined.png diff --git a/static/images/01-04-sd-github_git_lesson_repo.png b/assets/images/01-04-sd-github_git_lesson_repo.png similarity index 100% rename from static/images/01-04-sd-github_git_lesson_repo.png rename to assets/images/01-04-sd-github_git_lesson_repo.png diff --git a/static/images/01-05-sd-repo_folder.png b/assets/images/01-05-sd-repo_folder.png similarity index 100% rename from static/images/01-05-sd-repo_folder.png rename to assets/images/01-05-sd-repo_folder.png diff --git a/static/images/01-06-sd-gitkraken_open_in_file_exporer.png b/assets/images/01-06-sd-gitkraken_open_in_file_exporer.png similarity index 100% rename from static/images/01-06-sd-gitkraken_open_in_file_exporer.png rename to assets/images/01-06-sd-gitkraken_open_in_file_exporer.png diff --git a/static/images/01-07-sd-repo_folder_with_todo.png b/assets/images/01-07-sd-repo_folder_with_todo.png similarity index 100% rename from static/images/01-07-sd-repo_folder_with_todo.png rename to assets/images/01-07-sd-repo_folder_with_todo.png diff --git a/static/images/01-08-sd-gitkraken_unstaged.png b/assets/images/01-08-sd-gitkraken_unstaged.png similarity index 100% rename from static/images/01-08-sd-gitkraken_unstaged.png rename to assets/images/01-08-sd-gitkraken_unstaged.png diff --git a/static/images/01-09-sd-gitkraken_commit.png b/assets/images/01-09-sd-gitkraken_commit.png similarity index 100% rename from static/images/01-09-sd-gitkraken_commit.png rename to assets/images/01-09-sd-gitkraken_commit.png diff --git a/static/images/01-10-sd-gitkraken_push_to_repo.png b/assets/images/01-10-sd-gitkraken_push_to_repo.png similarity index 100% rename from static/images/01-10-sd-gitkraken_push_to_repo.png rename to assets/images/01-10-sd-gitkraken_push_to_repo.png diff --git a/static/images/01-11-sd-gitkraken_history.png b/assets/images/01-11-sd-gitkraken_history.png similarity index 100% rename from static/images/01-11-sd-gitkraken_history.png rename to assets/images/01-11-sd-gitkraken_history.png diff --git a/static/images/01-12-sd-gitkraken_with_changes_staged.png b/assets/images/01-12-sd-gitkraken_with_changes_staged.png similarity index 100% rename from static/images/01-12-sd-gitkraken_with_changes_staged.png rename to assets/images/01-12-sd-gitkraken_with_changes_staged.png diff --git a/static/images/01-13-sd-gitkraken_history2.png b/assets/images/01-13-sd-gitkraken_history2.png similarity index 100% rename from static/images/01-13-sd-gitkraken_history2.png rename to assets/images/01-13-sd-gitkraken_history2.png diff --git a/static/images/01-14-sd-github_highlight_readme_edit.png b/assets/images/01-14-sd-github_highlight_readme_edit.png similarity index 100% rename from static/images/01-14-sd-github_highlight_readme_edit.png rename to assets/images/01-14-sd-github_highlight_readme_edit.png diff --git a/static/images/01-15-sd-github_readme_edits.png b/assets/images/01-15-sd-github_readme_edits.png similarity index 100% rename from static/images/01-15-sd-github_readme_edits.png rename to assets/images/01-15-sd-github_readme_edits.png diff --git a/static/images/01-16-sd-github_with_commit_message.png b/assets/images/01-16-sd-github_with_commit_message.png similarity index 100% rename from static/images/01-16-sd-github_with_commit_message.png rename to assets/images/01-16-sd-github_with_commit_message.png diff --git a/static/images/01-17-sd-gitkraken_pulls.png b/assets/images/01-17-sd-gitkraken_pulls.png similarity index 100% rename from static/images/01-17-sd-gitkraken_pulls.png rename to assets/images/01-17-sd-gitkraken_pulls.png diff --git a/static/images/01-18-sd-gitkraken_post_pull.png b/assets/images/01-18-sd-gitkraken_post_pull.png similarity index 100% rename from static/images/01-18-sd-gitkraken_post_pull.png rename to assets/images/01-18-sd-gitkraken_post_pull.png diff --git a/static/images/TUOS-RSE-logos-small.png b/assets/images/TUOS-RSE-logos-small.png similarity index 100% rename from static/images/TUOS-RSE-logos-small.png rename to assets/images/TUOS-RSE-logos-small.png diff --git a/static/images/ag-br-protect-rule-add.png b/assets/images/ag-br-protect-rule-add.png similarity index 100% rename from static/images/ag-br-protect-rule-add.png rename to assets/images/ag-br-protect-rule-add.png diff --git a/static/images/ag-br-protect-rule.png b/assets/images/ag-br-protect-rule.png similarity index 100% rename from static/images/ag-br-protect-rule.png rename to assets/images/ag-br-protect-rule.png diff --git a/static/images/ag-cfg-pr-inspect.png b/assets/images/ag-cfg-pr-inspect.png similarity index 100% rename from static/images/ag-cfg-pr-inspect.png rename to assets/images/ag-cfg-pr-inspect.png diff --git a/static/images/ag-cfg-pr-merge-clean.png b/assets/images/ag-cfg-pr-merge-clean.png similarity index 100% rename from static/images/ag-cfg-pr-merge-clean.png rename to assets/images/ag-cfg-pr-merge-clean.png diff --git a/static/images/ag-cfg-pr-merge-cmpl.png b/assets/images/ag-cfg-pr-merge-cmpl.png similarity index 100% rename from static/images/ag-cfg-pr-merge-cmpl.png rename to assets/images/ag-cfg-pr-merge-cmpl.png diff --git a/static/images/ag-cfg-pr-merge-init.png b/assets/images/ag-cfg-pr-merge-init.png similarity index 100% rename from static/images/ag-cfg-pr-merge-init.png rename to assets/images/ag-cfg-pr-merge-init.png diff --git a/static/images/ag-cfg-pr-rev-code-init.png b/assets/images/ag-cfg-pr-rev-code-init.png similarity index 100% rename from static/images/ag-cfg-pr-rev-code-init.png rename to assets/images/ag-cfg-pr-rev-code-init.png diff --git a/static/images/ag-cfg-pr-rev-gen-init.png b/assets/images/ag-cfg-pr-rev-gen-init.png similarity index 100% rename from static/images/ag-cfg-pr-rev-gen-init.png rename to assets/images/ag-cfg-pr-rev-gen-init.png diff --git a/static/images/ag-cfg-pr-review-cmpl.png b/assets/images/ag-cfg-pr-review-cmpl.png similarity index 100% rename from static/images/ag-cfg-pr-review-cmpl.png rename to assets/images/ag-cfg-pr-review-cmpl.png diff --git a/static/images/ag-collaborator-new-add.png b/assets/images/ag-collaborator-new-add.png similarity index 100% rename from static/images/ag-collaborator-new-add.png rename to assets/images/ag-collaborator-new-add.png diff --git a/static/images/ag-collaborator-new-pending.png b/assets/images/ag-collaborator-new-pending.png similarity index 100% rename from static/images/ag-collaborator-new-pending.png rename to assets/images/ag-collaborator-new-pending.png diff --git a/static/images/ag-collaborator-new-search.png b/assets/images/ag-collaborator-new-search.png similarity index 100% rename from static/images/ag-collaborator-new-search.png rename to assets/images/ag-collaborator-new-search.png diff --git a/static/images/ag-collaborator-new.png b/assets/images/ag-collaborator-new.png similarity index 100% rename from static/images/ag-collaborator-new.png rename to assets/images/ag-collaborator-new.png diff --git a/static/images/ag-collaborators-all.png b/assets/images/ag-collaborators-all.png similarity index 100% rename from static/images/ag-collaborators-all.png rename to assets/images/ag-collaborators-all.png diff --git a/static/images/ag-create-tmpl.png b/assets/images/ag-create-tmpl.png similarity index 100% rename from static/images/ag-create-tmpl.png rename to assets/images/ag-create-tmpl.png diff --git a/static/images/ag-github-flow.png b/assets/images/ag-github-flow.png similarity index 100% rename from static/images/ag-github-flow.png rename to assets/images/ag-github-flow.png diff --git a/static/images/ag-gk-branch-metadata.png b/assets/images/ag-gk-branch-metadata.png similarity index 100% rename from static/images/ag-gk-branch-metadata.png rename to assets/images/ag-gk-branch-metadata.png diff --git a/static/images/ag-gk-branch-new.png b/assets/images/ag-gk-branch-new.png similarity index 100% rename from static/images/ag-gk-branch-new.png rename to assets/images/ag-gk-branch-new.png diff --git a/static/images/ag-gk-cfg-commit-cmpl.png b/assets/images/ag-gk-cfg-commit-cmpl.png similarity index 100% rename from static/images/ag-gk-cfg-commit-cmpl.png rename to assets/images/ag-gk-cfg-commit-cmpl.png diff --git a/static/images/ag-gk-cfg-commit.png b/assets/images/ag-gk-cfg-commit.png similarity index 100% rename from static/images/ag-gk-cfg-commit.png rename to assets/images/ag-gk-cfg-commit.png diff --git a/static/images/ag-gk-cfg-edit-details.png b/assets/images/ag-gk-cfg-edit-details.png similarity index 100% rename from static/images/ag-gk-cfg-edit-details.png rename to assets/images/ag-gk-cfg-edit-details.png diff --git a/static/images/ag-gk-cfg-edit-init.png b/assets/images/ag-gk-cfg-edit-init.png similarity index 100% rename from static/images/ag-gk-cfg-edit-init.png rename to assets/images/ag-gk-cfg-edit-init.png diff --git a/static/images/ag-gk-cfg-pr-cmpl-details.png b/assets/images/ag-gk-cfg-pr-cmpl-details.png similarity index 100% rename from static/images/ag-gk-cfg-pr-cmpl-details.png rename to assets/images/ag-gk-cfg-pr-cmpl-details.png diff --git a/static/images/ag-gk-cfg-pr-details-br.png b/assets/images/ag-gk-cfg-pr-details-br.png similarity index 100% rename from static/images/ag-gk-cfg-pr-details-br.png rename to assets/images/ag-gk-cfg-pr-details-br.png diff --git a/static/images/ag-gk-cfg-pr-details-rev.png b/assets/images/ag-gk-cfg-pr-details-rev.png similarity index 100% rename from static/images/ag-gk-cfg-pr-details-rev.png rename to assets/images/ag-gk-cfg-pr-details-rev.png diff --git a/static/images/ag-gk-cfg-pr-gh-view-init.png b/assets/images/ag-gk-cfg-pr-gh-view-init.png similarity index 100% rename from static/images/ag-gk-cfg-pr-gh-view-init.png rename to assets/images/ag-gk-cfg-pr-gh-view-init.png diff --git a/static/images/ag-gk-cfg-pr-gh-view.png b/assets/images/ag-gk-cfg-pr-gh-view.png similarity index 100% rename from static/images/ag-gk-cfg-pr-gh-view.png rename to assets/images/ag-gk-cfg-pr-gh-view.png diff --git a/static/images/ag-gk-cfg-pr-init.png b/assets/images/ag-gk-cfg-pr-init.png similarity index 100% rename from static/images/ag-gk-cfg-pr-init.png rename to assets/images/ag-gk-cfg-pr-init.png diff --git a/static/images/ag-gk-cfg-push-cmpl.png b/assets/images/ag-gk-cfg-push-cmpl.png similarity index 100% rename from static/images/ag-gk-cfg-push-cmpl.png rename to assets/images/ag-gk-cfg-push-cmpl.png diff --git a/static/images/ag-gk-cfg-push-init.png b/assets/images/ag-gk-cfg-push-init.png similarity index 100% rename from static/images/ag-gk-cfg-push-init.png rename to assets/images/ag-gk-cfg-push-init.png diff --git a/static/images/ag-gk-cfg-stage.png b/assets/images/ag-gk-cfg-stage.png similarity index 100% rename from static/images/ag-gk-cfg-stage.png rename to assets/images/ag-gk-cfg-stage.png diff --git a/static/images/ag-gk-clone-pc.png b/assets/images/ag-gk-clone-pc.png similarity index 100% rename from static/images/ag-gk-clone-pc.png rename to assets/images/ag-gk-clone-pc.png diff --git a/static/images/ag-gk-clone.png b/assets/images/ag-gk-clone.png similarity index 100% rename from static/images/ag-gk-clone.png rename to assets/images/ag-gk-clone.png diff --git a/static/images/ag-gk-open.png b/assets/images/ag-gk-open.png similarity index 100% rename from static/images/ag-gk-open.png rename to assets/images/ag-gk-open.png diff --git a/static/images/ag-issue-init.png b/assets/images/ag-issue-init.png similarity index 100% rename from static/images/ag-issue-init.png rename to assets/images/ag-issue-init.png diff --git a/static/images/ag-issue-sub-assign.png b/assets/images/ag-issue-sub-assign.png similarity index 100% rename from static/images/ag-issue-sub-assign.png rename to assets/images/ag-issue-sub-assign.png diff --git a/static/images/ag-issue-sub-cmpl.png b/assets/images/ag-issue-sub-cmpl.png similarity index 100% rename from static/images/ag-issue-sub-cmpl.png rename to assets/images/ag-issue-sub-cmpl.png diff --git a/static/images/ag-issue-sub-init.png b/assets/images/ag-issue-sub-init.png similarity index 100% rename from static/images/ag-issue-sub-init.png rename to assets/images/ag-issue-sub-init.png diff --git a/static/images/ag-issue-sub-list.png b/assets/images/ag-issue-sub-list.png similarity index 100% rename from static/images/ag-issue-sub-list.png rename to assets/images/ag-issue-sub-list.png diff --git a/static/images/ag-issue-sub-preview.png b/assets/images/ag-issue-sub-preview.png similarity index 100% rename from static/images/ag-issue-sub-preview.png rename to assets/images/ag-issue-sub-preview.png diff --git a/static/images/ag-issue-sub.png b/assets/images/ag-issue-sub.png similarity index 100% rename from static/images/ag-issue-sub.png rename to assets/images/ag-issue-sub.png diff --git a/static/images/ag-issues-tab.png b/assets/images/ag-issues-tab.png similarity index 100% rename from static/images/ag-issues-tab.png rename to assets/images/ag-issues-tab.png diff --git a/static/images/ag-pr-2-review-approve.png b/assets/images/ag-pr-2-review-approve.png similarity index 100% rename from static/images/ag-pr-2-review-approve.png rename to assets/images/ag-pr-2-review-approve.png diff --git a/static/images/ag-pr-2-review-merge-confilct-resolve-cmpl.png b/assets/images/ag-pr-2-review-merge-confilct-resolve-cmpl.png similarity index 100% rename from static/images/ag-pr-2-review-merge-confilct-resolve-cmpl.png rename to assets/images/ag-pr-2-review-merge-confilct-resolve-cmpl.png diff --git a/static/images/ag-pr-2-review-merge-confilct-resolve-commit.png b/assets/images/ag-pr-2-review-merge-confilct-resolve-commit.png similarity index 100% rename from static/images/ag-pr-2-review-merge-confilct-resolve-commit.png rename to assets/images/ag-pr-2-review-merge-confilct-resolve-commit.png diff --git a/static/images/ag-pr-2-review-merge-confilct-resolve-init.png b/assets/images/ag-pr-2-review-merge-confilct-resolve-init.png similarity index 100% rename from static/images/ag-pr-2-review-merge-confilct-resolve-init.png rename to assets/images/ag-pr-2-review-merge-confilct-resolve-init.png diff --git a/static/images/ag-pr-2-review-merge-confilct.png b/assets/images/ag-pr-2-review-merge-confilct.png similarity index 100% rename from static/images/ag-pr-2-review-merge-confilct.png rename to assets/images/ag-pr-2-review-merge-confilct.png diff --git a/static/images/ag-pr-2-review-merge-issue-closed.png b/assets/images/ag-pr-2-review-merge-issue-closed.png similarity index 100% rename from static/images/ag-pr-2-review-merge-issue-closed.png rename to assets/images/ag-pr-2-review-merge-issue-closed.png diff --git a/static/images/ag-pr-2-review-merge-pre.png b/assets/images/ag-pr-2-review-merge-pre.png similarity index 100% rename from static/images/ag-pr-2-review-merge-pre.png rename to assets/images/ag-pr-2-review-merge-pre.png diff --git a/static/images/ag-pr-2-review-merge.png b/assets/images/ag-pr-2-review-merge.png similarity index 100% rename from static/images/ag-pr-2-review-merge.png rename to assets/images/ag-pr-2-review-merge.png diff --git a/static/images/ag-pr-sub-review-approve.png b/assets/images/ag-pr-sub-review-approve.png similarity index 100% rename from static/images/ag-pr-sub-review-approve.png rename to assets/images/ag-pr-sub-review-approve.png diff --git a/static/images/ag-pr-sub-review-codeline.png b/assets/images/ag-pr-sub-review-codeline.png similarity index 100% rename from static/images/ag-pr-sub-review-codeline.png rename to assets/images/ag-pr-sub-review-codeline.png diff --git a/static/images/ag-pr-sub-review-detail.png b/assets/images/ag-pr-sub-review-detail.png similarity index 100% rename from static/images/ag-pr-sub-review-detail.png rename to assets/images/ag-pr-sub-review-detail.png diff --git a/static/images/ag-pr-sub-review-merge-cmpl.png b/assets/images/ag-pr-sub-review-merge-cmpl.png similarity index 100% rename from static/images/ag-pr-sub-review-merge-cmpl.png rename to assets/images/ag-pr-sub-review-merge-cmpl.png diff --git a/static/images/ag-pr-sub-review-merge-confirm.png b/assets/images/ag-pr-sub-review-merge-confirm.png similarity index 100% rename from static/images/ag-pr-sub-review-merge-confirm.png rename to assets/images/ag-pr-sub-review-merge-confirm.png diff --git a/static/images/ag-pr-sub-review-merge-init.png b/assets/images/ag-pr-sub-review-merge-init.png similarity index 100% rename from static/images/ag-pr-sub-review-merge-init.png rename to assets/images/ag-pr-sub-review-merge-init.png diff --git a/static/images/ag-pr-sub-review-response-checks.png b/assets/images/ag-pr-sub-review-response-checks.png similarity index 100% rename from static/images/ag-pr-sub-review-response-checks.png rename to assets/images/ag-pr-sub-review-response-checks.png diff --git a/static/images/ag-pr-sub-review-response-resolve.png b/assets/images/ag-pr-sub-review-response-resolve.png similarity index 100% rename from static/images/ag-pr-sub-review-response-resolve.png rename to assets/images/ag-pr-sub-review-response-resolve.png diff --git a/static/images/ag-pr-sub-review-response.png b/assets/images/ag-pr-sub-review-response.png similarity index 100% rename from static/images/ag-pr-sub-review-response.png rename to assets/images/ag-pr-sub-review-response.png diff --git a/static/images/ag-pr-sub-review-submitted.png b/assets/images/ag-pr-sub-review-submitted.png similarity index 100% rename from static/images/ag-pr-sub-review-submitted.png rename to assets/images/ag-pr-sub-review-submitted.png diff --git a/static/images/ag-pr-sub-test-fail-detail.png b/assets/images/ag-pr-sub-test-fail-detail.png similarity index 100% rename from static/images/ag-pr-sub-test-fail-detail.png rename to assets/images/ag-pr-sub-test-fail-detail.png diff --git a/static/images/ag-pr-sub-test-fail.png b/assets/images/ag-pr-sub-test-fail.png similarity index 100% rename from static/images/ag-pr-sub-test-fail.png rename to assets/images/ag-pr-sub-test-fail.png diff --git a/static/images/ag-sub-branch-init.png b/assets/images/ag-sub-branch-init.png similarity index 100% rename from static/images/ag-sub-branch-init.png rename to assets/images/ag-sub-branch-init.png diff --git a/static/images/ag-sub-branch.png b/assets/images/ag-sub-branch.png similarity index 100% rename from static/images/ag-sub-branch.png rename to assets/images/ag-sub-branch.png diff --git a/static/images/ag-sub-file-create.png b/assets/images/ag-sub-file-create.png similarity index 100% rename from static/images/ag-sub-file-create.png rename to assets/images/ag-sub-file-create.png diff --git a/static/images/ag-sub-file-fun-commit.png b/assets/images/ag-sub-file-fun-commit.png similarity index 100% rename from static/images/ag-sub-file-fun-commit.png rename to assets/images/ag-sub-file-fun-commit.png diff --git a/static/images/ag-sub-file-fun-create.png b/assets/images/ag-sub-file-fun-create.png similarity index 100% rename from static/images/ag-sub-file-fun-create.png rename to assets/images/ag-sub-file-fun-create.png diff --git a/static/images/ag-sub-file-fun-edit.png b/assets/images/ag-sub-file-fun-edit.png similarity index 100% rename from static/images/ag-sub-file-fun-edit.png rename to assets/images/ag-sub-file-fun-edit.png diff --git a/static/images/ag-sub-file-fun-stage.png b/assets/images/ag-sub-file-fun-stage.png similarity index 100% rename from static/images/ag-sub-file-fun-stage.png rename to assets/images/ag-sub-file-fun-stage.png diff --git a/static/images/ag-sub-file-init-commit.png b/assets/images/ag-sub-file-init-commit.png similarity index 100% rename from static/images/ag-sub-file-init-commit.png rename to assets/images/ag-sub-file-init-commit.png diff --git a/static/images/ag-sub-file-init-edit-init.png b/assets/images/ag-sub-file-init-edit-init.png similarity index 100% rename from static/images/ag-sub-file-init-edit-init.png rename to assets/images/ag-sub-file-init-edit-init.png diff --git a/static/images/ag-sub-file-init-edit.png b/assets/images/ag-sub-file-init-edit.png similarity index 100% rename from static/images/ag-sub-file-init-edit.png rename to assets/images/ag-sub-file-init-edit.png diff --git a/static/images/ag-sub-file-test-commit.png b/assets/images/ag-sub-file-test-commit.png similarity index 100% rename from static/images/ag-sub-file-test-commit.png rename to assets/images/ag-sub-file-test-commit.png diff --git a/static/images/ag-sub-file-test-create.png b/assets/images/ag-sub-file-test-create.png similarity index 100% rename from static/images/ag-sub-file-test-create.png rename to assets/images/ag-sub-file-test-create.png diff --git a/static/images/ag-sub-file-test-edit.png b/assets/images/ag-sub-file-test-edit.png similarity index 100% rename from static/images/ag-sub-file-test-edit.png rename to assets/images/ag-sub-file-test-edit.png diff --git a/static/images/ag-sub-pr-cmpl.png b/assets/images/ag-sub-pr-cmpl.png similarity index 100% rename from static/images/ag-sub-pr-cmpl.png rename to assets/images/ag-sub-pr-cmpl.png diff --git a/static/images/ag-sub-pr-init.png b/assets/images/ag-sub-pr-init.png similarity index 100% rename from static/images/ag-sub-pr-init.png rename to assets/images/ag-sub-pr-init.png diff --git a/static/images/ag-sub-push.png b/assets/images/ag-sub-push.png similarity index 100% rename from static/images/ag-sub-push.png rename to assets/images/ag-sub-push.png diff --git a/static/images/ag-synch-local-checkout-main.png b/assets/images/ag-synch-local-checkout-main.png similarity index 100% rename from static/images/ag-synch-local-checkout-main.png rename to assets/images/ag-synch-local-checkout-main.png diff --git a/static/images/ag-synch-local-clean.png b/assets/images/ag-synch-local-clean.png similarity index 100% rename from static/images/ag-synch-local-clean.png rename to assets/images/ag-synch-local-clean.png diff --git a/static/images/ag-synch-local-pull.png b/assets/images/ag-synch-local-pull.png similarity index 100% rename from static/images/ag-synch-local-pull.png rename to assets/images/ag-synch-local-pull.png diff --git a/static/images/ag-synch-local-view.png b/assets/images/ag-synch-local-view.png similarity index 100% rename from static/images/ag-synch-local-view.png rename to assets/images/ag-synch-local-view.png diff --git a/static/images/ag-use-tmpl.png b/assets/images/ag-use-tmpl.png similarity index 100% rename from static/images/ag-use-tmpl.png rename to assets/images/ag-use-tmpl.png diff --git a/static/images/bb_comms.png b/assets/images/bb_comms.png similarity index 100% rename from static/images/bb_comms.png rename to assets/images/bb_comms.png diff --git a/static/images/clone-1-gk.png b/assets/images/clone-1-gk.png similarity index 100% rename from static/images/clone-1-gk.png rename to assets/images/clone-1-gk.png diff --git a/static/images/clone-2-gk.png b/assets/images/clone-2-gk.png similarity index 100% rename from static/images/clone-2-gk.png rename to assets/images/clone-2-gk.png diff --git a/static/images/clone-3-gk.png b/assets/images/clone-3-gk.png similarity index 100% rename from static/images/clone-3-gk.png rename to assets/images/clone-3-gk.png diff --git a/static/images/clone-4-gk.png b/assets/images/clone-4-gk.png similarity index 100% rename from static/images/clone-4-gk.png rename to assets/images/clone-4-gk.png diff --git a/static/images/clone-5-gk.png b/assets/images/clone-5-gk.png similarity index 100% rename from static/images/clone-5-gk.png rename to assets/images/clone-5-gk.png diff --git a/static/images/clone.jpg b/assets/images/clone.jpg similarity index 100% rename from static/images/clone.jpg rename to assets/images/clone.jpg diff --git a/static/images/collab.png b/assets/images/collab.png similarity index 100% rename from static/images/collab.png rename to assets/images/collab.png diff --git a/static/images/command-symbol.png b/assets/images/command-symbol.png similarity index 100% rename from static/images/command-symbol.png rename to assets/images/command-symbol.png diff --git a/static/images/commit-param.png b/assets/images/commit-param.png similarity index 100% rename from static/images/commit-param.png rename to assets/images/commit-param.png diff --git a/static/images/commit-pre.png b/assets/images/commit-pre.png similarity index 100% rename from static/images/commit-pre.png rename to assets/images/commit-pre.png diff --git a/static/images/commit-push.png b/assets/images/commit-push.png similarity index 100% rename from static/images/commit-push.png rename to assets/images/commit-push.png diff --git a/static/images/copy-param-tmpl.png b/assets/images/copy-param-tmpl.png similarity index 100% rename from static/images/copy-param-tmpl.png rename to assets/images/copy-param-tmpl.png diff --git a/static/images/favicon.png b/assets/images/favicon.png similarity index 100% rename from static/images/favicon.png rename to assets/images/favicon.png diff --git a/static/images/fork-1.png b/assets/images/fork-1.png similarity index 100% rename from static/images/fork-1.png rename to assets/images/fork-1.png diff --git a/static/images/gif.gif b/assets/images/gif.gif similarity index 100% rename from static/images/gif.gif rename to assets/images/gif.gif diff --git a/static/images/git-commit-workflow.png b/assets/images/git-commit-workflow.png similarity index 100% rename from static/images/git-commit-workflow.png rename to assets/images/git-commit-workflow.png diff --git a/static/images/git-logo-small.png b/assets/images/git-logo-small.png similarity index 100% rename from static/images/git-logo-small.png rename to assets/images/git-logo-small.png diff --git a/static/images/git-profile-complete.png b/assets/images/git-profile-complete.png similarity index 100% rename from static/images/git-profile-complete.png rename to assets/images/git-profile-complete.png diff --git a/static/images/git-profile-complete_old.png b/assets/images/git-profile-complete_old.png similarity index 100% rename from static/images/git-profile-complete_old.png rename to assets/images/git-profile-complete_old.png diff --git a/static/images/git-profile-edit.png b/assets/images/git-profile-edit.png similarity index 100% rename from static/images/git-profile-edit.png rename to assets/images/git-profile-edit.png diff --git a/static/images/git_logo.png b/assets/images/git_logo.png similarity index 100% rename from static/images/git_logo.png rename to assets/images/git_logo.png diff --git a/static/images/git_logo_small.png b/assets/images/git_logo_small.png similarity index 100% rename from static/images/git_logo_small.png rename to assets/images/git_logo_small.png diff --git a/static/images/github-manage-access.png b/assets/images/github-manage-access.png similarity index 100% rename from static/images/github-manage-access.png rename to assets/images/github-manage-access.png diff --git a/static/images/github_logo.png b/assets/images/github_logo.png similarity index 100% rename from static/images/github_logo.png rename to assets/images/github_logo.png diff --git a/static/images/gitkraken-interface.png b/assets/images/gitkraken-interface.png similarity index 100% rename from static/images/gitkraken-interface.png rename to assets/images/gitkraken-interface.png diff --git a/static/images/gitkraken_logo.png b/assets/images/gitkraken_logo.png similarity index 100% rename from static/images/gitkraken_logo.png rename to assets/images/gitkraken_logo.png diff --git a/static/images/gitkraken_logo_old.png b/assets/images/gitkraken_logo_old.png similarity index 100% rename from static/images/gitkraken_logo_old.png rename to assets/images/gitkraken_logo_old.png diff --git a/static/images/gk-add-remote.png b/assets/images/gk-add-remote.png similarity index 100% rename from static/images/gk-add-remote.png rename to assets/images/gk-add-remote.png diff --git a/static/images/gk-all-synched.png b/assets/images/gk-all-synched.png similarity index 100% rename from static/images/gk-all-synched.png rename to assets/images/gk-all-synched.png diff --git a/static/images/gk-fast-forward.png b/assets/images/gk-fast-forward.png similarity index 100% rename from static/images/gk-fast-forward.png rename to assets/images/gk-fast-forward.png diff --git a/static/images/gk-hover-add-remote.png b/assets/images/gk-hover-add-remote.png similarity index 100% rename from static/images/gk-hover-add-remote.png rename to assets/images/gk-hover-add-remote.png diff --git a/static/images/gk-local-synched-files.png b/assets/images/gk-local-synched-files.png similarity index 100% rename from static/images/gk-local-synched-files.png rename to assets/images/gk-local-synched-files.png diff --git a/static/images/gk-local-synched.png b/assets/images/gk-local-synched.png similarity index 100% rename from static/images/gk-local-synched.png rename to assets/images/gk-local-synched.png diff --git a/static/images/gk-pull-upstream.gif b/assets/images/gk-pull-upstream.gif similarity index 100% rename from static/images/gk-pull-upstream.gif rename to assets/images/gk-pull-upstream.gif diff --git a/static/images/gk-remote-added.png b/assets/images/gk-remote-added.png similarity index 100% rename from static/images/gk-remote-added.png rename to assets/images/gk-remote-added.png diff --git a/static/images/gk-remote-view.png b/assets/images/gk-remote-view.png similarity index 100% rename from static/images/gk-remote-view.png rename to assets/images/gk-remote-view.png diff --git a/static/images/gk-upstream-merged.png b/assets/images/gk-upstream-merged.png similarity index 100% rename from static/images/gk-upstream-merged.png rename to assets/images/gk-upstream-merged.png diff --git a/static/images/gk01.jpg b/assets/images/gk01.jpg similarity index 100% rename from static/images/gk01.jpg rename to assets/images/gk01.jpg diff --git a/static/images/gk01a.png b/assets/images/gk01a.png similarity index 100% rename from static/images/gk01a.png rename to assets/images/gk01a.png diff --git a/static/images/gpg_off.png b/assets/images/gpg_off.png similarity index 100% rename from static/images/gpg_off.png rename to assets/images/gpg_off.png diff --git a/static/images/init-1-gk.png b/assets/images/init-1-gk.png similarity index 100% rename from static/images/init-1-gk.png rename to assets/images/init-1-gk.png diff --git a/static/images/init-2-gk.png b/assets/images/init-2-gk.png similarity index 100% rename from static/images/init-2-gk.png rename to assets/images/init-2-gk.png diff --git a/static/images/init-3-gk.png b/assets/images/init-3-gk.png similarity index 100% rename from static/images/init-3-gk.png rename to assets/images/init-3-gk.png diff --git a/static/images/init-4-gk.png b/assets/images/init-4-gk.png similarity index 100% rename from static/images/init-4-gk.png rename to assets/images/init-4-gk.png diff --git a/static/images/init-5-gk.png b/assets/images/init-5-gk.png similarity index 100% rename from static/images/init-5-gk.png rename to assets/images/init-5-gk.png diff --git a/static/images/init-5a-gk.png b/assets/images/init-5a-gk.png similarity index 100% rename from static/images/init-5a-gk.png rename to assets/images/init-5a-gk.png diff --git a/static/images/init-5b-gk.png b/assets/images/init-5b-gk.png similarity index 100% rename from static/images/init-5b-gk.png rename to assets/images/init-5b-gk.png diff --git a/static/images/init-5c-gk.png b/assets/images/init-5c-gk.png similarity index 100% rename from static/images/init-5c-gk.png rename to assets/images/init-5c-gk.png diff --git a/static/images/merged-params.png b/assets/images/merged-params.png similarity index 100% rename from static/images/merged-params.png rename to assets/images/merged-params.png diff --git a/static/images/merged-repo.png b/assets/images/merged-repo.png similarity index 100% rename from static/images/merged-repo.png rename to assets/images/merged-repo.png diff --git a/static/images/param-complete.png b/assets/images/param-complete.png similarity index 100% rename from static/images/param-complete.png rename to assets/images/param-complete.png diff --git a/static/images/param-folder.png b/assets/images/param-folder.png similarity index 100% rename from static/images/param-folder.png rename to assets/images/param-folder.png diff --git a/static/images/pr-1.png b/assets/images/pr-1.png similarity index 100% rename from static/images/pr-1.png rename to assets/images/pr-1.png diff --git a/static/images/pr-3.png b/assets/images/pr-3.png similarity index 100% rename from static/images/pr-3.png rename to assets/images/pr-3.png diff --git a/static/images/pr-filechanges.png b/assets/images/pr-filechanges.png similarity index 100% rename from static/images/pr-filechanges.png rename to assets/images/pr-filechanges.png diff --git a/static/images/pr-merged.png b/assets/images/pr-merged.png similarity index 100% rename from static/images/pr-merged.png rename to assets/images/pr-merged.png diff --git a/static/images/pr-response.png b/assets/images/pr-response.png similarity index 100% rename from static/images/pr-response.png rename to assets/images/pr-response.png diff --git a/static/images/remotes.jpg b/assets/images/remotes.jpg similarity index 100% rename from static/images/remotes.jpg rename to assets/images/remotes.jpg diff --git a/static/images/repo.png b/assets/images/repo.png similarity index 100% rename from static/images/repo.png rename to assets/images/repo.png diff --git a/static/images/rse-logoonly-stroke.png b/assets/images/rse-logoonly-stroke.png similarity index 100% rename from static/images/rse-logoonly-stroke.png rename to assets/images/rse-logoonly-stroke.png diff --git a/static/images/work-1-gk.png b/assets/images/work-1-gk.png similarity index 100% rename from static/images/work-1-gk.png rename to assets/images/work-1-gk.png diff --git a/static/images/work-10-gk.png b/assets/images/work-10-gk.png similarity index 100% rename from static/images/work-10-gk.png rename to assets/images/work-10-gk.png diff --git a/static/images/work-11-gk.png b/assets/images/work-11-gk.png similarity index 100% rename from static/images/work-11-gk.png rename to assets/images/work-11-gk.png diff --git a/static/images/work-12-gk.png b/assets/images/work-12-gk.png similarity index 100% rename from static/images/work-12-gk.png rename to assets/images/work-12-gk.png diff --git a/static/images/work-13-gk.png b/assets/images/work-13-gk.png similarity index 100% rename from static/images/work-13-gk.png rename to assets/images/work-13-gk.png diff --git a/static/images/work-2-gk.png b/assets/images/work-2-gk.png similarity index 100% rename from static/images/work-2-gk.png rename to assets/images/work-2-gk.png diff --git a/static/images/work-3-gk.png b/assets/images/work-3-gk.png similarity index 100% rename from static/images/work-3-gk.png rename to assets/images/work-3-gk.png diff --git a/static/images/work-4-gk.png b/assets/images/work-4-gk.png similarity index 100% rename from static/images/work-4-gk.png rename to assets/images/work-4-gk.png diff --git a/static/images/work-5-gk.png b/assets/images/work-5-gk.png similarity index 100% rename from static/images/work-5-gk.png rename to assets/images/work-5-gk.png diff --git a/static/images/work-6-gk.png b/assets/images/work-6-gk.png similarity index 100% rename from static/images/work-6-gk.png rename to assets/images/work-6-gk.png diff --git a/static/images/work-7-gk.png b/assets/images/work-7-gk.png similarity index 100% rename from static/images/work-7-gk.png rename to assets/images/work-7-gk.png diff --git a/static/images/work-8-gk.png b/assets/images/work-8-gk.png similarity index 100% rename from static/images/work-8-gk.png rename to assets/images/work-8-gk.png diff --git a/static/images/work-9-gk.png b/assets/images/work-9-gk.png similarity index 100% rename from static/images/work-9-gk.png rename to assets/images/work-9-gk.png diff --git a/static/images/work-9a-gk.png b/assets/images/work-9a-gk.png similarity index 100% rename from static/images/work-9a-gk.png rename to assets/images/work-9a-gk.png diff --git a/static/images/work-9b-gk.png b/assets/images/work-9b-gk.png similarity index 100% rename from static/images/work-9b-gk.png rename to assets/images/work-9b-gk.png diff --git a/static/images/workflows.png b/assets/images/workflows.png similarity index 100% rename from static/images/workflows.png rename to assets/images/workflows.png diff --git a/static/rmarkdown-libs/header-attrs/header-attrs.js b/assets/rmarkdown-libs/header-attrs/header-attrs.js similarity index 100% rename from static/rmarkdown-libs/header-attrs/header-attrs.js rename to assets/rmarkdown-libs/header-attrs/header-attrs.js diff --git a/config.toml b/config.toml index fef452a..ad2f415 100644 --- a/config.toml +++ b/config.toml @@ -9,7 +9,7 @@ ignoreFiles = ["\\.Rmd$", "\\.Rmarkdown$", "_files$", "_cache$", "index\\.html", [module] [[module.imports]] - path = "github.com/matcornic/hugo-theme-learn" + path = "github.com/McShelby/hugo-theme-relearn" [[module.imports]] path = "github.com/dzello/reveal-hugo" @@ -55,13 +55,17 @@ weight = 50 [params] editURL = "https://github.com/RSE-Sheffield/git-github-zero-to-hero/edit/master/content/" - description = "Git & Github through GitKraken Client - From Zero to Hero!" - author = "Anna Krystalli, Sheffield RSE" showVisitedLinks = true disableBreadcrumb = false disableNextPrev = false themeVariant = "rse-learn" + linkTitle = " " +[params.author] + name = "Anna Krystalli, Sheffield RSE" + +[params.logo] + src = "/images/TUOS-RSE-logos-small.png" [markup] diff --git a/content/00-intro-to-version-control/03-what-is-github.en.md b/content/00-intro-to-version-control/03-what-is-github.en.md index fdb5ec5..8d6cd32 100644 --- a/content/00-intro-to-version-control/03-what-is-github.en.md +++ b/content/00-intro-to-version-control/03-what-is-github.en.md @@ -1,5 +1,5 @@ --- -title: Github +title: GitHub weight: 3 --- diff --git a/content/00-intro-to-version-control/04a-anatomy-repo.en.md b/content/00-intro-to-version-control/04a-anatomy-repo.en.md index 0406cfc..882da60 100644 --- a/content/00-intro-to-version-control/04a-anatomy-repo.en.md +++ b/content/00-intro-to-version-control/04a-anatomy-repo.en.md @@ -11,10 +11,10 @@ weight: 5 - **License**. Without some sort of licence, the contents of the repository are technically closed. Some allow users of the code to do anything they like with their code - these are known as permissive licences. Examples are the [MIT Licence](https://tldrlegal.com/license/mit-license) or [Apache](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)). + [https://choosealicense.com/](https://choosealicense.com/) - does what it says on the tin and helps you choose a licence. Here are some resources to help you choose: + [https://tldrlegal.com/](https://tldrlegal.com/) - plain english explanations of licences in bullet form. - + - **Contributing guide** - make a file called CONTRIBUTING.md and guidelines for contributors so they know what they should do if they want to help you out. -- **Code of Conduct** - good projects have codes of conduct to make sure that people are treated well. Github has an [Code of Conduct wizard](https://help.github.com/articles/adding-a-code-of-conduct-to-your-project/) to make it easy to add one. +- **Code of Conduct** - good projects have codes of conduct to make sure that people are treated well. GitHub has an [Code of Conduct wizard](https://help.github.com/articles/adding-a-code-of-conduct-to-your-project/) to make it easy to add one. - **Issues** - use GitHub issues to record and discuss tasks. diff --git a/content/00-intro-to-version-control/05-recap.en.md b/content/00-intro-to-version-control/05-recap.en.md index fd10c70..b7bbe43 100644 --- a/content/00-intro-to-version-control/05-recap.en.md +++ b/content/00-intro-to-version-control/05-recap.en.md @@ -7,13 +7,13 @@ weight: 5
-> Git, GitKraken Client, and Github are three separate things. Git is the system used for version control, but you don't have to use it with GitHub or GitKraken Client. +> Git, GitKraken Client, and GitHub are three separate things. Git is the system used for version control, but you don't have to use it with GitHub or GitKraken Client.
#### - **Git** allows you to effectively "save" your work at important points in time and come back to any of the save points. - -#### - Sharing our work on GitHub allows others to inspect our work, make copies and contribute back changes. + +#### - Sharing our work on GitHub allows others to inspect our work, make copies and contribute back changes. #### - GitKraken Client allows you to work with both from a single graphical user interface. diff --git a/content/00-intro-to-version-control/_index.en.md b/content/00-intro-to-version-control/_index.en.md index 8675c30..5f951fb 100644 --- a/content/00-intro-to-version-control/_index.en.md +++ b/content/00-intro-to-version-control/_index.en.md @@ -5,8 +5,3 @@ pre: 00. title: Introduction to Version Control weight: 1 --- - - -# Introduction to Version Control - - diff --git a/content/01-getting-started-with-git-and-github/_index.en.md b/content/01-getting-started-with-git-and-github/_index.en.md index 04b9725..ce2e153 100644 --- a/content/01-getting-started-with-git-and-github/_index.en.md +++ b/content/01-getting-started-with-git-and-github/_index.en.md @@ -2,10 +2,9 @@ chapter: true date: "2020-08-05T17:40:37+01:00" pre: 01. -title: Getting Started With Git and Github +title: Getting Started With Git and GitHub weight: 2 --- -# Getting Started With Git and Github ### Let's start with some practical exercises! diff --git a/content/02-websites-with-github-pages/_index.en.md b/content/02-websites-with-github-pages/_index.en.md index c30160a..a8bf98c 100644 --- a/content/02-websites-with-github-pages/_index.en.md +++ b/content/02-websites-with-github-pages/_index.en.md @@ -2,14 +2,12 @@ chapter: true date: "2020-08-05T17:55:45+01:00" pre: 02. -title: Websites With Github Pages +title: Websites With GitHub Pages weight: 3 --- -# Websites With Github Pages +Still not convinced that GitHub is something you should be using? There's another great feature: -Still not convinced that GitHub is something you should be using? There's another great feature: - -**They make it relatively straightforward to create a website for free**, using [markdown](https://help.github.com/categories/writing-on-github/) and [GitHub pages](https://pages.github.com/). +**They make it relatively straightforward to create a website for free**, using [markdown](https://help.github.com/categories/writing-on-github/) and [GitHub pages](https://pages.github.com/). diff --git a/content/03-collaborative_github_basics/_index.en.md b/content/03-collaborative_github_basics/_index.en.md index 7bf9f6d..cacf848 100644 --- a/content/03-collaborative_github_basics/_index.en.md +++ b/content/03-collaborative_github_basics/_index.en.md @@ -1,10 +1,9 @@ --- chapter: true +date: "2020-08-05T17:55:45+01:00" pre: 03. title: Cloning and Collaborating with GitKraken Client weight: 4 --- -# Cloning and Collaborating - In this Chapter we'll be exploring how to **clone** (copy) other people's repositories from GitHub and contribute content back as well as how to sync local repositories with upstream changes. diff --git a/content/04-collaborative_github_advanced/00-intro.md b/content/04-collaborative_github_advanced/00-intro.md index c1865e6..df8496c 100644 --- a/content/04-collaborative_github_advanced/00-intro.md +++ b/content/04-collaborative_github_advanced/00-intro.md @@ -15,7 +15,7 @@ We'll be: -## Github Workflow +## GitHub Workflow diff --git a/content/04-collaborative_github_advanced/03-resolve-issues-in-branches.md b/content/04-collaborative_github_advanced/03-resolve-issues-in-branches.md index 8955e4d..f1cd8f6 100644 --- a/content/04-collaborative_github_advanced/03-resolve-issues-in-branches.md +++ b/content/04-collaborative_github_advanced/03-resolve-issues-in-branches.md @@ -1,6 +1,6 @@ +++ title = "Resolve Issues in Branches" -date = 2021-05-13T17:58:45+03:00 +date = 2021-05-13T17:58:45+03:00 weight = 3 +++ @@ -8,7 +8,7 @@ weight = 3 A **powerful tool for keeping track of tasks, enhancements, and bugs for your projects is the issues** feature of GitHub. You can access the issues associated with a repository through the **Issues** tab. -They allow **storing conversations about tasks in the project repository**, visible to the whole team throughout the life cycle of the project, rather that them being buried in hard to navigate email chains! 💯 +They allow **storing conversations about tasks in the project repository**, visible to the whole team throughout the life cycle of the project, rather that them being buried in hard to navigate email chains! 💯 It's also **easy to see the status of tasks** as issues can be closed when completed, leaving the tasks still pending visible by default. @@ -40,15 +40,15 @@ For more information, check out [Configuring issue templates for your repository ### Open issue from templates -To create a new issue navigate to the **Issues** tab +To create a new issue navigate to the **Issues** tab {{< figure src="/images/ag-issues-tab.png" >}} -Click {{% button href="" %}} **New issue** {{% /button %}} +Click {{% button href="" %}} **New issue** {{% /button %}} {{< figure src="/images/ag-issue-init.png" >}} -Because we are using GitHub Issue templates, we are immediatelly presented with the 3 issue templates I've created. +Because we are using GitHub Issue templates, we are immediatelly presented with the 3 issue templates I've created. To demonstrate, I'm going to open the **Add subtraction function** issue. To initiate the process, I click on {{% button href="" %}} **Get started** {{% /button %}} next to the issue template I want to open. @@ -67,15 +67,15 @@ The **special `-[ ]` list notation** means the **checkboxes will be interactive* When we're creating our issue, the main body contains two tabs: - **Write:** were you enter the contents of the issue in markdown -- **Preview:** were you can preview what the content will look like when it is rendered once the issue is submited. +- **Preview:** were you can preview what the content will look like when it is rendered once the issue is submited. Toggle the tabs below to explore this feature. Note how the checklist is rendered in the Preview tab. -{{< tabs groupId="issues" >}} -{{% tab name="Write" %}} +{{< tabs groupid="issues" >}} +{{% tab title="Write" %}} {{< figure src="/images/ag-issue-sub.png" >}} {{% /tab %}} -{{% tab name="Preview" %}} +{{% tab title="Preview" %}} {{< figure src="/images/ag-issue-sub-preview.png" >}} {{% /tab %}} {{% /tabs %}} @@ -93,7 +93,7 @@ To do this, I click on **Assignees** on the top-right which launches a drop-down {{% notice tip %}} -You can **assign an issue to a team mate, add more or remove assignees at any point**, even after you've opened the issue. If your repo is public, **you can also assign issues to users who are not collaborators** on your repo. Just type in their username in the drop down menu textbox. +You can **assign an issue to a team mate, add more or remove assignees at any point**, even after you've opened the issue. If your repo is public, **you can also assign issues to users who are not collaborators** on your repo. Just type in their username in the drop down menu textbox. {{% /notice %}} @@ -101,7 +101,7 @@ You can **assign an issue to a team mate, add more or remove assignees at any po Once I've assigned the issue to a team mate, I click {{% button href="" %}} **Submit new issue** {{% /button %}} to create it. -The issue has now been **opened** and given a unique number (in this case #2). +The issue has now been **opened** and given a unique number (in this case #2). {{< figure src="/images/ag-issue-sub-cmpl.png" >}} @@ -118,7 +118,7 @@ The issue is also now listed under the {{% notice warning %}} -Make sure you have opened and assigned a unique issue to each member of your team! +Make sure you have opened and assigned a unique issue to each member of your team! {{% /notice %}} @@ -159,7 +159,7 @@ Start by clicking the {{% button href="" %}} **Branch**
**}} -The **`subtract` branch has now been created and been checked out** (indicated by the fact that the the ** subtract** branch in the ** local** repository is now checked). +The **`subtract` branch has now been created and been checked out** (indicated by the fact that the the ** subtract** branch in the ** local** repository is now checked). {{< figure src="/images/ag-sub-branch.png" >}} @@ -169,7 +169,7 @@ The next step in Bob's instructions is to create a new `subtract.py` file in the A nice feature of GitKraken Client is that, as well as a basic text editor, it also **allows us to create new files!** -To create a new file, **first launch GitKraken Client's Command Palette** with +To create a new file, **first launch GitKraken Client's Command Palette** with **| Ctrl + P** Next, type **File**. This launches a dropdown menu of action you can perform on files. Select **Create file**. @@ -241,7 +241,7 @@ Once the file is open for editing, **add the import line of code from your issue The next step in Bob's instructions is to create a new `test_subtract.py` file in the `tests/` directory and paste the code for the `subtract` function test. -To create the new file, **launch GitKraken Client's Command Palette** again with +To create the new file, **launch GitKraken Client's Command Palette** again with **| Ctrl + P** Next, type **File** to launches the file action dropdown menu. Select **Create file** and **type in the path to the new file you want to create**, In Bob's case it's `tests/test_subtract.py` and hit **Enter|Return**. diff --git a/content/04-collaborative_github_advanced/_index.en.md b/content/04-collaborative_github_advanced/_index.en.md index 78bb108..31bc7ee 100644 --- a/content/04-collaborative_github_advanced/_index.en.md +++ b/content/04-collaborative_github_advanced/_index.en.md @@ -1,12 +1,9 @@ -+++ -title = "Advanced Collaboration through Github" -date = 2021-05-13T17:25:55+03:00 -weight = 5 -chapter = true -pre = "04. " -+++ - - -# Advanced Collaboration through Github +--- +chapter: true +date: "2021-05-13T17:25:55+03:00" +pre: "04. " +title: "Advanced Collaboration through GitHub" +weight: 5 +--- In this chapter we will learn how to set up a GitHub repo for team collaboration, add collaborators, use issues to administer tasks, contribute code through branches, review contributions and handle merge conflicts. diff --git a/content/_index.en.md b/content/_index.en.md index 09e012d..c3ab99a 100644 --- a/content/_index.en.md +++ b/content/_index.en.md @@ -1,9 +1,7 @@ --- -title: "Git & Github through GitKraken Client - From Zero to Hero! " +title: "Git & GitHub through GitKraken Client - From Zero to Hero!" --- -# Git & Github through GitKraken Client - From Zero to Hero! - In this course you'll be learning version control and collaboration through Git, GitHub & GitKraken Client * Version controlling your own project through Git & GitHub. diff --git a/content/credits.en.md b/content/credits.en.md index 1a86227..43de7f0 100644 --- a/content/credits.en.md +++ b/content/credits.en.md @@ -1,7 +1,10 @@ --- date: "2020-08-05T14:40:58+01:00" title: Credits -weight: 5 +weight: 100 +hidden: true +chapter: false +disableToc: false --- ## Content diff --git a/content/faq-glossary-links/01-faq.en.md b/content/faq-glossary-links/01-faq.en.md index b801a17..95e2d01 100644 --- a/content/faq-glossary-links/01-faq.en.md +++ b/content/faq-glossary-links/01-faq.en.md @@ -94,7 +94,7 @@ as unit, integration and regression tests, linting of code to ensure it complies releasing packages. This, along with careful code review of Pull Requests, helps ensure that newly submitted code does not break software. -### Does Github not have a staging area? +### Does GitHub not have a staging area? Not when making edits directly to a single file online via GitHub as typically you are only changing a single file so there is no need to choose which files to stage. However, rather than committing them directly to the branch you are diff --git a/content/faq-glossary-links/_index.en.md b/content/faq-glossary-links/_index.en.md index 8206747..f9dee1e 100644 --- a/content/faq-glossary-links/_index.en.md +++ b/content/faq-glossary-links/_index.en.md @@ -5,6 +5,3 @@ pre: title: FAQ, Glossary and Links weight: 6 --- - - -# FAQ, Glossary and Links diff --git a/content/platforms.en.md b/content/platforms.en.md index c3a7fc1..b6ddbbe 100644 --- a/content/platforms.en.md +++ b/content/platforms.en.md @@ -1,7 +1,10 @@ --- date: "2022-10-31T09:47:00+01:00" title: Online Learning Platforms -weight: 5 +weight: 100 +hidden: true +chapter: false +disableToc: false --- This page is for keeping some useful resources in running this course online. diff --git a/content/setup/_index.md b/content/setup/_index.md index b877e85..fd26139 100644 --- a/content/setup/_index.md +++ b/content/setup/_index.md @@ -1,6 +1,6 @@ --- title: Setup -weight: 100 +weight: 7 chapter: true pre:   menuTitle: Setup diff --git a/content/setup/github/_index.en.md b/content/setup/github/_index.en.md index 40de436..708eb97 100644 --- a/content/setup/github/_index.en.md +++ b/content/setup/github/_index.en.md @@ -1,10 +1,10 @@ --- -title: Github +title: GitHub weight: 5 --- -You will also need an account at [github.com](https://github.com/). +You will also need an account at [github.com](https://github.com/). #### Getting a GitHub account diff --git a/content/setup/gitkraken/_index.en.html b/content/setup/gitkraken/_index.en.html index 0c8fbe9..bc8e155 100644 --- a/content/setup/gitkraken/_index.en.html +++ b/content/setup/gitkraken/_index.en.html @@ -10,8 +10,7 @@

Install GitKraken Client

To install GitKraken Client download the correct binary for your system.

- +Link to GitKraken downloads

Then follow the installation instructions provided on their website.

{{% notice note %}} In the installation instructions you’ll see diff --git a/content/snippets.en.md b/content/snippets.en.md index 28511de..f349fd0 100644 --- a/content/snippets.en.md +++ b/content/snippets.en.md @@ -1,6 +1,6 @@ --- title: Snippets -weight: 1 +weight: 100 hidden: true chapter: false disableToc: false diff --git a/go.mod b/go.mod index 4ed1e3b..2744850 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/annakrystalli/rse-workshop-materials-template go 1.14 require ( + github.com/McShelby/hugo-theme-relearn v0.0.0-20260310200521-93d7f257d1a3 // indirect github.com/dzello/reveal-hugo v0.0.0-20210413081415-39511a646b9c // indirect github.com/matcornic/hugo-theme-learn v0.0.0-20210331234833-d198cbe65f06 // indirect ) diff --git a/go.sum b/go.sum index fdedf60..7d758af 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/McShelby/hugo-theme-relearn v0.0.0-20260310200521-93d7f257d1a3 h1:3ACeOWQ6bJSUsRl7eOKeSNjh6erVeVEy1cxhLoMzZQA= +github.com/McShelby/hugo-theme-relearn v0.0.0-20260310200521-93d7f257d1a3/go.mod h1:mKQQdxZNIlLvAj8X3tMq+RzntIJSr9z7XdzuMomt0IM= 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= diff --git a/layouts/partials/custom-header.html b/layouts/partials/custom-header.html new file mode 100644 index 0000000..6e43a4b --- /dev/null +++ b/layouts/partials/custom-header.html @@ -0,0 +1,5 @@ + diff --git a/layouts/partials/logo.html b/layouts/partials/logo.html deleted file mode 100644 index 28a5d77..0000000 --- a/layouts/partials/logo.html +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html deleted file mode 100644 index 225311e..0000000 --- a/layouts/partials/menu.html +++ /dev/null @@ -1,158 +0,0 @@ -

- - -{{ define "section-tree-nav" }} -{{ $showvisitedlinks := .showvisitedlinks }} -{{ $currentNode := .currentnode }} -{{ $currentFileUniqueID := "" }} -{{ with $currentNode.File }}{{ $currentFileUniqueID = .UniqueID }}{{ end }} - {{with .sect}} - {{if and .IsSection (or (not .Params.hidden) $.showhidden)}} - {{safeHTML .Params.head}} -
  • - - {{safeHTML .Params.Pre}}{{or .Params.menuTitle .LinkTitle .Title}}{{safeHTML .Params.Post}} - {{ if $showvisitedlinks}} - - {{ end }} - - {{ $numberOfPages := (add (len .Pages) (len .Sections)) }} - {{ if ne $numberOfPages 0 }} -
      - {{ if .Params.slides }} -
    • - - Slides - -
      • - {{ end }} - {{ $currentNode.Scratch.Set "pages" .Pages }} - {{ if .Sections}} - {{ $currentNode.Scratch.Set "pages" (.Pages | union .Sections) }} - {{end}} - {{ $pages := ($currentNode.Scratch.Get "pages") }} - - {{if eq .Site.Params.ordersectionsby "title"}} - {{ range $pages.ByTitle }} - {{ if and .Params.hidden (not $.showhidden) }} - {{else}} - {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }} - {{end}} - {{ end }} - {{else}} - {{ range $pages.ByWeight }} - {{ if and .Params.hidden (not $.showhidden) }} - {{else}} - {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }} - {{end}} - {{ end }} - {{end}} -
    - {{ end }} -
    • - {{else}} - {{ if not .Params.Hidden }} -
  • - - {{safeHTML .Params.Pre}}{{or .Params.menuTitle .LinkTitle .Title}}{{safeHTML .Params.Post}} - {{ if $showvisitedlinks}}{{end}} - -
    • - {{ end }} - {{end}} - {{ end }} -{{ end }} \ No newline at end of file diff --git a/netlify.toml b/netlify.toml index dd43071..edfa114 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,15 +3,15 @@ publish = "/public" command = "hugo -d public" [context.production.environment] - HUGO_VERSION = "0.73.0" - GO_VERSION="1.12" + HUGO_VERSION = "0.160.1" + GO_VERSION="1.26" [context.deploy-preview] command = "hugo --gc -b $DEPLOY_PRIME_URL" [context.deploy-preview.environment] - HUGO_VERSION = "0.73.0" - GO_VERSION="1.12" + HUGO_VERSION = "0.160.1" + GO_VERSION="1.26" [context.branch-deploy] command = "hugo --gc -b $DEPLOY_PRIME_URL"