Skip to content

Commit

Permalink
Merge pull request #22 from Openscapes/andy-jun17
Browse files Browse the repository at this point in the history
Coworking w @ateucher trying out & editing workflows
  • Loading branch information
stefaniebutland authored Jun 18, 2024
2 parents 4415dc3 + 8d94032 commit 6e45ffe
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 2 additions & 0 deletions _quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lessons/demo.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file added lessons/images/jupyterhub-openwith-editor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions lessons/part2-github.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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?* <!-- - 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).) -->
<!-- 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).) -->

We can now view the changes in the built Quarto book and concurrently look at the files changed in GitHub.

Expand Down
2 changes: 1 addition & 1 deletion setup-explore.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 6e45ffe

Please sign in to comment.