diff --git a/.nojekyll b/.nojekyll index 11ae069..3e2a1e6 100644 --- a/.nojekyll +++ b/.nojekyll @@ -1 +1 @@ -2049012a \ No newline at end of file +c057e825 \ No newline at end of file diff --git a/index.html b/index.html index 60a5a9c..b57f535 100644 --- a/index.html +++ b/index.html @@ -137,6 +137,12 @@ <a href="./lessons/part1-quarto.html" class="sidebar-item-text sidebar-link"> <span class="menu-text">Edit a Quarto site</span></a> </div> +</li> + <li class="sidebar-item"> + <div class="sidebar-item-container"> + <a href="./lessons/demo.html" class="sidebar-item-text sidebar-link"> + <span class="menu-text">demo.qmd practice file</span></a> + </div> </li> <li class="sidebar-item"> <div class="sidebar-item-container"> diff --git a/lessons/demo.html b/lessons/demo.html index ade2080..003cf37 100644 --- a/lessons/demo.html +++ b/lessons/demo.html @@ -29,6 +29,8 @@ <script src="../site_libs/quarto-search/fuse.min.js"></script> <script src="../site_libs/quarto-search/quarto-search.js"></script> <meta name="quarto:offset" content="../"> +<link href="../lessons/part2-github.html" rel="next"> +<link href="../lessons/part1-quarto.html" rel="prev"> <script src="../site_libs/quarto-html/quarto.js"></script> <script src="../site_libs/quarto-html/popper.min.js"></script> <script src="../site_libs/quarto-html/tippy.umd.min.js"></script> @@ -80,7 +82,7 @@ <button type="button" class="quarto-btn-toggle btn" data-bs-toggle="collapse" data-bs-target=".quarto-sidebar-collapse-item" aria-controls="quarto-sidebar" aria-expanded="false" aria-label="Toggle sidebar navigation" onclick="if (window.quartoToggleHeadroom) { window.quartoToggleHeadroom(); }"> <i class="bi bi-layout-text-sidebar-reverse"></i> </button> - <nav class="quarto-page-breadcrumbs" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><code>demo.qmd</code> Quarto Practice</li></ol></nav> + <nav class="quarto-page-breadcrumbs" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="../lessons/index.html">Lessons</a></li><li class="breadcrumb-item"><a href="../lessons/demo.html">demo.qmd practice file</a></li></ol></nav> <a class="flex-grow-1" role="button" data-bs-toggle="collapse" data-bs-target=".quarto-sidebar-collapse-item" aria-controls="quarto-sidebar" aria-expanded="false" aria-label="Toggle sidebar navigation" onclick="if (window.quartoToggleHeadroom) { window.quartoToggleHeadroom(); }"> </a> <button type="button" class="btn quarto-search-button" aria-label="" onclick="window.quartoOpenSearch();"> @@ -126,16 +128,22 @@ <div class="sidebar-item-container"> <a href="../lessons/index.html" class="sidebar-item-text sidebar-link"> <span class="menu-text">Lessons</span></a> - <a class="sidebar-item-toggle text-start collapsed" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-1" aria-expanded="false" aria-label="Toggle section"> + <a class="sidebar-item-toggle text-start" data-bs-toggle="collapse" data-bs-target="#quarto-sidebar-section-1" aria-expanded="true" aria-label="Toggle section"> <i class="bi bi-chevron-right ms-2"></i> </a> </div> - <ul id="quarto-sidebar-section-1" class="collapse list-unstyled sidebar-section depth1 "> + <ul id="quarto-sidebar-section-1" class="collapse list-unstyled sidebar-section depth1 show"> <li class="sidebar-item"> <div class="sidebar-item-container"> <a href="../lessons/part1-quarto.html" class="sidebar-item-text sidebar-link"> <span class="menu-text">Edit a Quarto site</span></a> </div> +</li> + <li class="sidebar-item"> + <div class="sidebar-item-container"> + <a href="../lessons/demo.html" class="sidebar-item-text sidebar-link active"> + <span class="menu-text">demo.qmd practice file</span></a> + </div> </li> <li class="sidebar-item"> <div class="sidebar-item-container"> @@ -174,7 +182,7 @@ <h2 id="toc-title">On this page</h2> <!-- main --> <main class="content" id="quarto-document-content"> -<header id="title-block-header" class="quarto-title-block default"> +<header id="title-block-header" class="quarto-title-block default"><nav class="quarto-page-breadcrumbs quarto-title-breadcrumbs d-none d-lg-block" aria-label="breadcrumb"><ol class="breadcrumb"><li class="breadcrumb-item"><a href="../lessons/index.html">Lessons</a></li><li class="breadcrumb-item"><a href="../lessons/demo.html">demo.qmd practice file</a></li></ol></nav> <div class="quarto-title"> <h1 class="title"><code>demo.qmd</code> Quarto Practice</h1> </div> @@ -824,6 +832,18 @@ <h2 class="anchored" data-anchor-id="your-turn">Your turn!</h2> } }); </script> +<nav class="page-navigation"> + <div class="nav-page nav-page-previous"> + <a href="../lessons/part1-quarto.html" class="pagination-link" aria-label="Edit a Quarto site"> + <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">Edit a Quarto site</span> + </a> + </div> + <div class="nav-page nav-page-next"> + <a href="../lessons/part2-github.html" class="pagination-link" aria-label="Contribute via GitHub"> + <span class="nav-page-text">Contribute via GitHub</span> <i class="bi bi-arrow-right-short"></i> + </a> + </div> +</nav> </div> <!-- /content --> <footer class="footer"> <div class="nav-footer"> diff --git a/lessons/index.html b/lessons/index.html index 17055b2..e118a2d 100644 --- a/lessons/index.html +++ b/lessons/index.html @@ -172,6 +172,12 @@ <a href="../lessons/part1-quarto.html" class="sidebar-item-text sidebar-link"> <span class="menu-text">Edit a Quarto site</span></a> </div> +</li> + <li class="sidebar-item"> + <div class="sidebar-item-container"> + <a href="../lessons/demo.html" class="sidebar-item-text sidebar-link"> + <span class="menu-text">demo.qmd practice file</span></a> + </div> </li> <li class="sidebar-item"> <div class="sidebar-item-container"> diff --git a/lessons/part1-quarto.html b/lessons/part1-quarto.html index b565090..95206b9 100644 --- a/lessons/part1-quarto.html +++ b/lessons/part1-quarto.html @@ -63,7 +63,7 @@ <script src="../site_libs/quarto-search/fuse.min.js"></script> <script src="../site_libs/quarto-search/quarto-search.js"></script> <meta name="quarto:offset" content="../"> -<link href="../lessons/part2-github.html" rel="next"> +<link href="../lessons/demo.html" rel="next"> <link href="../lessons/index.html" rel="prev"> <script src="../site_libs/quarto-html/quarto.js"></script> <script src="../site_libs/quarto-html/popper.min.js"></script> @@ -172,6 +172,12 @@ <a href="../lessons/part1-quarto.html" class="sidebar-item-text sidebar-link active"> <span class="menu-text">Edit a Quarto site</span></a> </div> +</li> + <li class="sidebar-item"> + <div class="sidebar-item-container"> + <a href="../lessons/demo.html" class="sidebar-item-text sidebar-link"> + <span class="menu-text">demo.qmd practice file</span></a> + </div> </li> <li class="sidebar-item"> <div class="sidebar-item-container"> @@ -928,8 +934,8 @@ <h2 class="anchored" data-anchor-id="onward">Onward</h2> </a> </div> <div class="nav-page nav-page-next"> - <a href="../lessons/part2-github.html" class="pagination-link" aria-label="Contribute via GitHub"> - <span class="nav-page-text">Contribute via GitHub</span> <i class="bi bi-arrow-right-short"></i> + <a href="../lessons/demo.html" class="pagination-link" aria-label="demo.qmd practice file"> + <span class="nav-page-text">demo.qmd practice file</span> <i class="bi bi-arrow-right-short"></i> </a> </div> </nav> diff --git a/lessons/part2-github.html b/lessons/part2-github.html index ffae188..159927f 100644 --- a/lessons/part2-github.html +++ b/lessons/part2-github.html @@ -30,7 +30,7 @@ <script src="../site_libs/quarto-search/quarto-search.js"></script> <meta name="quarto:offset" content="../"> <link href="../next-steps.html" rel="next"> -<link href="../lessons/part1-quarto.html" rel="prev"> +<link href="../lessons/demo.html" rel="prev"> <script src="../site_libs/quarto-html/quarto.js"></script> <script src="../site_libs/quarto-html/popper.min.js"></script> <script src="../site_libs/quarto-html/tippy.umd.min.js"></script> @@ -138,6 +138,12 @@ <a href="../lessons/part1-quarto.html" class="sidebar-item-text sidebar-link"> <span class="menu-text">Edit a Quarto site</span></a> </div> +</li> + <li class="sidebar-item"> + <div class="sidebar-item-container"> + <a href="../lessons/demo.html" class="sidebar-item-text sidebar-link"> + <span class="menu-text">demo.qmd practice file</span></a> + </div> </li> <li class="sidebar-item"> <div class="sidebar-item-container"> @@ -229,7 +235,6 @@ <h3 class="anchored" data-anchor-id="diff-stage-commit-and-push-your-edits-to-gi <figcaption>Commit and Push</figcaption> </figure> </div> -<p><em>TODO: Add storing GitHub PAT, from 2021 Cloud Hackathon <a href="https://nasa-openscapes.github.io/2021-Cloud-Hackathon/tutorials/00_Setup.html#step-5.1.-configure-git-git-config">Step 5.1. Configure Git (git config)</a>. Add to setup.qmd, or part2-github.qmd when we’re prompted at pushing to GitHub.</em></p> <p>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?</p> </section> </section> @@ -279,7 +284,7 @@ <h2 class="anchored" data-anchor-id="review-a-pull-request">Review a pull reques <li>Go to the Main branch and pull so that we have the most recent changes from remote.</li> <li><code>git checkout</code> 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)</li> <li><code>quarto preview</code> - this will build the book with Andy’s suggested edits. <em>TODO: Is this preview link still an issue?</em> <!-- - At the end of the preview log, it says "Browse at - <!-- https://openscapes.2i2c.cloud..." The Browse URL actually --> <!-- points to the production Hub!! We need it to point to --> <!-- staging since that's where we're working, so we use the URL --> <!-- staging.openscapes.2i2c.cloud.... (See minute 10:06 in the --> <!-- [video](https://youtu.be/2_F5Kr6gM1I?t=606).) --></li> + <!-- https://openscapes.2i2c.cloud..." The Browse URL actually --> <!-- points to the production Hub!! We need it to point to --> <!-- staging since that's where we're working, so we use the URL --> <!-- staging.openscapes.2i2c.cloud.... (See minute 10:06 in the --> <!-- [video](https://youtu.be/2_F5Kr6gM1I?t=606).) --></li> </ul></li> </ul> <p>We can now view the changes in the built Quarto book and concurrently look at the files changed in GitHub.</p> @@ -853,8 +858,8 @@ <h2 class="anchored" data-anchor-id="review-a-pull-request">Review a pull reques </script> <nav class="page-navigation"> <div class="nav-page nav-page-previous"> - <a href="../lessons/part1-quarto.html" class="pagination-link" aria-label="Edit a Quarto site"> - <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">Edit a Quarto site</span> + <a href="../lessons/demo.html" class="pagination-link" aria-label="demo.qmd practice file"> + <i class="bi bi-arrow-left-short"></i> <span class="nav-page-text">demo.qmd practice file</span> </a> </div> <div class="nav-page nav-page-next"> diff --git a/next-steps.html b/next-steps.html index f360667..c50da4e 100644 --- a/next-steps.html +++ b/next-steps.html @@ -137,6 +137,12 @@ <a href="./lessons/part1-quarto.html" class="sidebar-item-text sidebar-link"> <span class="menu-text">Edit a Quarto site</span></a> </div> +</li> + <li class="sidebar-item"> + <div class="sidebar-item-container"> + <a href="./lessons/demo.html" class="sidebar-item-text sidebar-link"> + <span class="menu-text">demo.qmd practice file</span></a> + </div> </li> <li class="sidebar-item"> <div class="sidebar-item-container"> diff --git a/search.json b/search.json index 50a861f..1ca2fa7 100644 --- a/search.json +++ b/search.json @@ -54,21 +54,33 @@ "href": "lessons/demo.html", "title": "demo.qmd Quarto Practice", "section": "", - "text": "Quarto enables you to weave together content and executable code into a finished document.\nThis demo.qmd file has Markdown-formatted text, examples for adding hyperlinks and inserting images with alt-text, and a Python code chunk.\nStef will demo then it’s your turn." + "text": "Quarto enables you to weave together content and executable code into a finished document.\nThis demo.qmd file has Markdown-formatted text, examples for adding hyperlinks and inserting images with alt-text, and a Python code chunk.\nStef will demo then it’s your turn.", + "crumbs": [ + "Lessons", + "demo.qmd practice file" + ] }, { "objectID": "lessons/demo.html#task-1a-edit-a-.qmd-page", "href": "lessons/demo.html#task-1a-edit-a-.qmd-page", "title": "demo.qmd Quarto Practice", "section": "Task 1a: Edit a .qmd page", - "text": "Task 1a: Edit a .qmd page\nTODO: Edit down to what we need, duplicated under each name header\n\n\n\n\n\n\nNote\n\n\n\nOnly make changes to the section under your name header (to prevent conflicts at a later stage)\n\n\nNow let’s practice Markdown in this Quarto file and commit an edit to this file.\nMake an edit, preview, edit etc\n\nStefanie\nYour first edit? Fix this tpyo.\n\nHeaders\nWe can make headers using ## Name, ### Name, etc. Headers are powerful in Quarto because they let you organize your content. You can share a specific subsection of a page by copying its URL.\n\n\nHyperlinks\nWe can make hyperlinks using the []() pattern: you name the hyperlink in [] and put the URL in (). For example, here’s a link to Markdown Basics. Hyperlinking lets us cite and give credit to our sources, like the NASA Earthdata Cloud Cookbook (Barrett et al.).\n\n\nImages\nWe can include an image with the same []() pattern, by adding a preceding exclamation point: ![](). The [] contain the caption and () contain the path to the image file. Other attributes like image size, alt text, and a hyperlink, are also set in this example:\n\n\n\nThe Openscapes logo\n\n\n\n\nCode\nWhen you Render, a document will be generated that includes both content and the output of embedded code. You can embed code like this:\nTODO: day before clinic, make this Python code (don’t add screenshot - fewer files to for folks to get distracted with, lighter weight repo)\n\n\n[1] 4\n\n\nYou can add options to executable code. The echo: false option disables the printing of code (only output is displayed).\n\n\n\nJulie\nFix this tpyo.\nTODO: copy activities text under each participant heading when it’s settled\n\n\nAndy\nFix this tpyo." + "text": "Task 1a: Edit a .qmd page\nTODO: Edit down to what we need, duplicated under each name header\n\n\n\n\n\n\nNote\n\n\n\nOnly make changes to the section under your name header (to prevent conflicts at a later stage)\n\n\nNow let’s practice Markdown in this Quarto file and commit an edit to this file.\nMake an edit, preview, edit etc\n\nStefanie\nYour first edit? Fix this tpyo.\n\nHeaders\nWe can make headers using ## Name, ### Name, etc. Headers are powerful in Quarto because they let you organize your content. You can share a specific subsection of a page by copying its URL.\n\n\nHyperlinks\nWe can make hyperlinks using the []() pattern: you name the hyperlink in [] and put the URL in (). For example, here’s a link to Markdown Basics. Hyperlinking lets us cite and give credit to our sources, like the NASA Earthdata Cloud Cookbook (Barrett et al.).\n\n\nImages\nWe can include an image with the same []() pattern, by adding a preceding exclamation point: ![](). The [] contain the caption and () contain the path to the image file. Other attributes like image size, alt text, and a hyperlink, are also set in this example:\n\n\n\nThe Openscapes logo\n\n\n\n\nCode\nWhen you Render, a document will be generated that includes both content and the output of embedded code. You can embed code like this:\nTODO: day before clinic, make this Python code (don’t add screenshot - fewer files to for folks to get distracted with, lighter weight repo)\n\n\n[1] 4\n\n\nYou can add options to executable code. The echo: false option disables the printing of code (only output is displayed).\n\n\n\nJulie\nFix this tpyo.\nTODO: copy activities text under each participant heading when it’s settled\n\n\nAndy\nFix this tpyo.", + "crumbs": [ + "Lessons", + "demo.qmd practice file" + ] }, { "objectID": "lessons/demo.html#your-turn", "href": "lessons/demo.html#your-turn", "title": "demo.qmd Quarto Practice", "section": "Your turn!", - "text": "Your turn!\nChange or add something to this file under your Name header and save the file." + "text": "Your turn!\nChange or add something to this file under your Name header and save the file.", + "crumbs": [ + "Lessons", + "demo.qmd practice file" + ] }, { "objectID": "lessons/index.html", @@ -145,7 +157,7 @@ "href": "setup-explore.html#setup-part-2-clone-the-quarto-clinic-repo", "title": "Setup and Explore", "section": "Setup Part 2: Clone the Quarto Clinic repo", - "text": "Setup Part 2: Clone the Quarto Clinic repo\nAfter our Hub server has loaded (Setup Part 1), we’ll clone the Quarto Clinic repository into the Hub.\nOption A: In the Hub, use the Git tab to Clone the repo.\n\n\n\nClone a GitHub repository in the Hub\n\n\nOption B: In the Hub, do this by opening a terminal (File > New > Terminal). In the Terminal, git clone your repository and cd into it:\ngit clone https://github.com/openscapes/quarto-clinic\ncd quarto-clinic\n\nCreate a new branch\nWorking in a branch means you have your own version of the Quarto Clinic to edit and preview. Later, we’ll learn how to contribute your edits to the Main branch of the Clinic by making a “Pull Request” on GitHub.\nNavigate into the quarto-clinic folder (In the Terminal: cd quarto-clinic) > click the Git tab > New Branch, with branch name = your name, to make it easy to identify your work in the exercises that follow.\n\n\n\nCreate a branch\n\n\nTODO add cmd line for creating a branch ?git checkout yourname\n\n\nSet up our Git credentials\nTODO: do we need to do Step 5.1. Configure Git (git config)? (but ignore the push file part). Clarify the following text to say see the orange dot. click it to be prompted\nWhen you see the following screenshot, GitHub is asking for you to input your credentials. (Note: you see this screenshot when you have committed work to push to GitHub.com. In this case we have created a new branch in the Hub and it does not yet exist on GitHub.\n\n\n\nPrompt to add your Git credentials\n\n\nWe’ll follow the instructions in the 2021 Cloud Hackathon to Setup your Personal Access Token (PAT).", + "text": "Setup Part 2: Clone the Quarto Clinic repo\nAfter our Hub server has loaded (Setup Part 1), we’ll clone the Quarto Clinic repository into the Hub.\nOption A: In the Hub, use the Git tab to Clone the repo.\n\n\n\nClone a GitHub repository in the Hub\n\n\nOption B: In the Hub, do this by opening a terminal (File > New > Terminal). In the Terminal, git clone your repository and cd into it:\ngit clone https://github.com/openscapes/quarto-clinic\ncd quarto-clinic\n\nCreate a new branch\nWorking in a branch means you have your own version of the Quarto Clinic to edit and preview. Later, we’ll learn how to contribute your edits to the Main branch of the Clinic by making a “Pull Request” on GitHub.\nNavigate into the quarto-clinic folder (In the Terminal: cd quarto-clinic) > click the Git tab > New Branch, with branch name = your name, to make it easy to identify your work in the exercises that follow.\n\n\n\nCreate a branch\n\n\nIn the terminal: git checkout -b yourname\n\n\nSet up our Git credentials\nTODO: do we need to do Step 5.1. Configure Git (git config)? (but ignore the push file part). Clarify the following text to say see the orange dot. click it to be prompted\nWhen you see the following screenshot, GitHub is asking for you to input your credentials. (Note: you see this screenshot when you have committed work to push to GitHub.com. In this case we have created a new branch in the Hub and it does not yet exist on GitHub.\n\n\n\nPrompt to add your Git credentials\n\n\nWe’ll follow the instructions in the 2021 Cloud Hackathon to Setup your Personal Access Token (PAT).", "crumbs": [ "Setup & Explore" ] @@ -220,7 +232,7 @@ "href": "lessons/part2-github.html", "title": "Part 2: Contribute via GitHub", "section": "", - "text": "TODO: use text and some screenshot styles from 2021 Cloud Hackathon Tracking changes section. Those screenshots are so clean and text so clear.\nTODO: do we add this text? “We have set it up so that any modifications (commits) will automatically be republished via GitHub Actions.”\nGitHub commit, push, (move to GitHub.com….) pull request, review PRs, merge\n\nGood commit messages\nPush to GitHub then move to GitHub.com, screenshot yellow banner to compare and make a pull request\nNot finished proposing your updates? Can make Draft PR at the start so folks can see your thinking. Set Ready for Review when ready. Request specific reviewer(s). \nCondense/ adapt Review a pull request from Cookbook; note using “suggesting” and commenting, “Start your Review” instead of adding single comments (fewer notifications)\nDemo: have someone commit and push, PR, tag Stef as reviewer. Screenshare the above steps to review. That person screenshares to commit suggested edits, merge their PR.\nTask: people pair up to review each other’s PRs.\n\n\n\nInspect the differences your edits will introduce\n\n\n\n\n\nIn the Git tab “stage” your saved changes.\n\n\n\nStage your changes\n\n\nCommit your edits with a good commit message and push your edits.\n\n\n\nCommit and Push\n\n\nTODO: Add storing GitHub PAT, from 2021 Cloud Hackathon Step 5.1. Configure Git (git config). Add to setup.qmd, or part2-github.qmd when we’re prompted at pushing to GitHub.\nIn 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?", + "text": "TODO: use text and some screenshot styles from 2021 Cloud Hackathon Tracking changes section. Those screenshots are so clean and text so clear.\nTODO: do we add this text? “We have set it up so that any modifications (commits) will automatically be republished via GitHub Actions.”\nGitHub commit, push, (move to GitHub.com….) pull request, review PRs, merge\n\nGood commit messages\nPush to GitHub then move to GitHub.com, screenshot yellow banner to compare and make a pull request\nNot finished proposing your updates? Can make Draft PR at the start so folks can see your thinking. Set Ready for Review when ready. Request specific reviewer(s). \nCondense/ adapt Review a pull request from Cookbook; note using “suggesting” and commenting, “Start your Review” instead of adding single comments (fewer notifications)\nDemo: have someone commit and push, PR, tag Stef as reviewer. Screenshare the above steps to review. That person screenshares to commit suggested edits, merge their PR.\nTask: people pair up to review each other’s PRs.\n\n\n\nInspect the differences your edits will introduce\n\n\n\n\n\nIn the Git tab “stage” your saved changes.\n\n\n\nStage your changes\n\n\nCommit your edits with a good commit message and push your edits.\n\n\n\nCommit and Push\n\n\nIn 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?", "crumbs": [ "Lessons", "Contribute via GitHub" @@ -231,7 +243,7 @@ "href": "lessons/part2-github.html#contribute-your-updates-using-github", "title": "Part 2: Contribute via GitHub", "section": "", - "text": "TODO: use text and some screenshot styles from 2021 Cloud Hackathon Tracking changes section. Those screenshots are so clean and text so clear.\nTODO: do we add this text? “We have set it up so that any modifications (commits) will automatically be republished via GitHub Actions.”\nGitHub commit, push, (move to GitHub.com….) pull request, review PRs, merge\n\nGood commit messages\nPush to GitHub then move to GitHub.com, screenshot yellow banner to compare and make a pull request\nNot finished proposing your updates? Can make Draft PR at the start so folks can see your thinking. Set Ready for Review when ready. Request specific reviewer(s). \nCondense/ adapt Review a pull request from Cookbook; note using “suggesting” and commenting, “Start your Review” instead of adding single comments (fewer notifications)\nDemo: have someone commit and push, PR, tag Stef as reviewer. Screenshare the above steps to review. That person screenshares to commit suggested edits, merge their PR.\nTask: people pair up to review each other’s PRs.\n\n\n\nInspect the differences your edits will introduce\n\n\n\n\n\nIn the Git tab “stage” your saved changes.\n\n\n\nStage your changes\n\n\nCommit your edits with a good commit message and push your edits.\n\n\n\nCommit and Push\n\n\nTODO: Add storing GitHub PAT, from 2021 Cloud Hackathon Step 5.1. Configure Git (git config). Add to setup.qmd, or part2-github.qmd when we’re prompted at pushing to GitHub.\nIn 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?", + "text": "TODO: use text and some screenshot styles from 2021 Cloud Hackathon Tracking changes section. Those screenshots are so clean and text so clear.\nTODO: do we add this text? “We have set it up so that any modifications (commits) will automatically be republished via GitHub Actions.”\nGitHub commit, push, (move to GitHub.com….) pull request, review PRs, merge\n\nGood commit messages\nPush to GitHub then move to GitHub.com, screenshot yellow banner to compare and make a pull request\nNot finished proposing your updates? Can make Draft PR at the start so folks can see your thinking. Set Ready for Review when ready. Request specific reviewer(s). \nCondense/ adapt Review a pull request from Cookbook; note using “suggesting” and commenting, “Start your Review” instead of adding single comments (fewer notifications)\nDemo: have someone commit and push, PR, tag Stef as reviewer. Screenshare the above steps to review. That person screenshares to commit suggested edits, merge their PR.\nTask: people pair up to review each other’s PRs.\n\n\n\nInspect the differences your edits will introduce\n\n\n\n\n\nIn the Git tab “stage” your saved changes.\n\n\n\nStage your changes\n\n\nCommit your edits with a good commit message and push your edits.\n\n\n\nCommit and Push\n\n\nIn 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?", "crumbs": [ "Lessons", "Contribute via GitHub" diff --git a/setup-explore.html b/setup-explore.html index ed4fdea..bd23e3c 100644 --- a/setup-explore.html +++ b/setup-explore.html @@ -172,6 +172,12 @@ <a href="./lessons/part1-quarto.html" class="sidebar-item-text sidebar-link"> <span class="menu-text">Edit a Quarto site</span></a> </div> +</li> + <li class="sidebar-item"> + <div class="sidebar-item-container"> + <a href="./lessons/demo.html" class="sidebar-item-text sidebar-link"> + <span class="menu-text">demo.qmd practice file</span></a> + </div> </li> <li class="sidebar-item"> <div class="sidebar-item-container"> @@ -332,7 +338,7 @@ <h3 class="anchored" data-anchor-id="create-a-new-branch">Create a new branch</h <figcaption>Create a branch</figcaption> </figure> </div> -<p><em>TODO add cmd line for creating a branch ?git checkout yourname</em></p> +<p>In the terminal: <code>git checkout -b yourname</code></p> </section> <section id="set-up-our-git-credentials" class="level3"> <h3 class="anchored" data-anchor-id="set-up-our-git-credentials">Set up our Git credentials</h3> diff --git a/sitemap.xml b/sitemap.xml index e8a28ef..10d4cab 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2,30 +2,30 @@ <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <url> <loc>https://openscapes.github.io/quarto-clinic/index.html</loc> - <lastmod>2024-06-17T18:56:15.171Z</lastmod> + <lastmod>2024-06-18T16:20:51.984Z</lastmod> </url> <url> <loc>https://openscapes.github.io/quarto-clinic/lessons/demo.html</loc> - <lastmod>2024-06-17T18:56:15.171Z</lastmod> + <lastmod>2024-06-18T16:20:51.988Z</lastmod> </url> <url> <loc>https://openscapes.github.io/quarto-clinic/lessons/index.html</loc> - <lastmod>2024-06-17T18:56:15.195Z</lastmod> + <lastmod>2024-06-18T16:20:52.012Z</lastmod> </url> <url> <loc>https://openscapes.github.io/quarto-clinic/setup-explore.html</loc> - <lastmod>2024-06-17T18:56:15.199Z</lastmod> + <lastmod>2024-06-18T16:20:52.016Z</lastmod> </url> <url> <loc>https://openscapes.github.io/quarto-clinic/lessons/part1-quarto.html</loc> - <lastmod>2024-06-17T18:56:15.195Z</lastmod> + <lastmod>2024-06-18T16:20:52.012Z</lastmod> </url> <url> <loc>https://openscapes.github.io/quarto-clinic/lessons/part2-github.html</loc> - <lastmod>2024-06-17T18:56:15.199Z</lastmod> + <lastmod>2024-06-18T16:20:52.012Z</lastmod> </url> <url> <loc>https://openscapes.github.io/quarto-clinic/next-steps.html</loc> - <lastmod>2024-06-17T18:56:15.199Z</lastmod> + <lastmod>2024-06-18T16:20:52.012Z</lastmod> </url> </urlset>