diff --git a/_quarto.yml b/_quarto.yml index ac1538b..5583106 100644 --- a/_quarto.yml +++ b/_quarto.yml @@ -41,6 +41,8 @@ website: contents: - href: lessons/part1-quarto.qmd text: Edit a Quarto site + - href: lessons/demo.qmd + text: demo.qmd practice file - href: lessons/part2-github.qmd text: Contribute via GitHub - href: next-steps.qmd diff --git a/lessons/demo.qmd b/lessons/demo.qmd index b303775..9431baa 100644 --- a/lessons/demo.qmd +++ b/lessons/demo.qmd @@ -21,7 +21,7 @@ Stef will demo then it's your turn. Only make changes to the section under your name header (to prevent conflicts at a later stage) ::: -Now let's practice Markdown in this Quarto file and commit an edit to this file. +Now let's practice Markdown in this Quarto file and commit an edit to this file. Open the `demo.qmd` Make an edit, preview, edit etc diff --git a/lessons/images/jupyterhub-openwith-editor.png b/lessons/images/jupyterhub-openwith-editor.png new file mode 100644 index 0000000..274cc97 Binary files /dev/null and b/lessons/images/jupyterhub-openwith-editor.png differ diff --git a/lessons/part2-github.qmd b/lessons/part2-github.qmd index e0ae4a7..34a39cd 100644 --- a/lessons/part2-github.qmd +++ b/lessons/part2-github.qmd @@ -31,8 +31,6 @@ Commit your edits with a good commit message and push your edits. ![Commit and Push](images/jupyterhub-git-commit-push.png){fig-align="left" width="50%"} -*TODO: Add storing GitHub PAT, from 2021 Cloud Hackathon [Step 5.1. Configure Git (git config)](https://nasa-openscapes.github.io/2021-Cloud-Hackathon/tutorials/00_Setup.html#step-5.1.-configure-git-git-config). Add to setup.qmd, or part2-github.qmd when we’re prompted at pushing to GitHub.* - In the Hub, in our own branch of the Quarto Clinic repo, we have made one or more edits to the Clinic files, committed those updates, and pushed those commit(s) to GitHub. How do our suggested contributions get incorporated into the main Quarto Clinic repo and website? ## Make a Pull Request @@ -76,7 +74,7 @@ Now, switch to the 2i2c Hub to view the Cookbook preview as it would appear if t - Go to the Main branch and pull so that we have the most recent changes from remote. - `git checkout` to the branch that has the PR: reorg_how_to_guides (note, this PR has been merged and the branch deleted so you won't see this one; apply this example to your own) - `quarto preview` - this will build the book with Andy's suggested edits. *TODO: Is this preview link still an issue?* + We can now view the changes in the built Quarto book and concurrently look at the files changed in GitHub. diff --git a/setup-explore.qmd b/setup-explore.qmd index 4b21900..98df25c 100644 --- a/setup-explore.qmd +++ b/setup-explore.qmd @@ -85,7 +85,7 @@ Navigate into the `quarto-clinic` folder (In the Terminal: `cd quarto-clinic)` \ ![Create a branch](images/jupyterhub-git-branch.png) -*TODO add cmd line for creating a branch ?git checkout yourname* +In the terminal: `git checkout -b yourname` ### Set up our Git credentials