Merge pull request #82 from NASA-Openscapes/mini-updates-day1

Mini updates day1
NASA-Openscapes · Nov 15, 2021 · acb41ad · acb41ad
2 parents e31532f + f816a08
commit acb41ad
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/_quarto.yml b/_quarto.yml
@@ -28,12 +28,13 @@ site:
          - cloud-paradigm.md
       - section: "Logistics"
         contents:
-          - logistics/for-participants-helpers.md
+          - logistics/index.md
           - logistics/schedule.md
           - logistics/prerequisites.md
           - logistics/github-workflows.md
       - section: "Tutorials"
         contents: 
+          - tutorials/index.md
           - tutorials/00_Setup.md  ## tutorial 0
           - tutorials/01_Data_Discovery_CMR.ipynb ## tutorial 1
           - tutorials/02_Data_Discovery_CMR-STAC_API.ipynb ## tutorial 2
@@ -49,8 +50,7 @@ site:
           - tutorials-templates/index.md 
       - section: "Projects"
         contents:
-          - projects/projects-overview.md
-          - projects/workflow.md
+          - projects/index.md
           - projects/hackathon-projects.md
       - section: "Further Resources"
         contents:

diff --git a/logistics/_schedule-day1.md b/logistics/_schedule-day1.md
@@ -4,7 +4,7 @@
 | 9:25 am | Cloud Paradigm Overview | Catalina Oaida, PO.DAAC |
 | 9:45 am | Tutorial 0: Getting set up and connected | Luis Lopez, NSIDC and Makhan Virdi, ASDC |
 | 10:45 am | Q&A and Break|  |
-| 11:00 am | Tutorial 1: Data discovery with CMR | Andy Barrett, NSIDC |
+| 11:00 am | Tutorial 1: Data discovery with CMR | Andy Barrett and Luis Lopez, NSIDC |
 | 11:30 am | Tutorial 2: Data discovery with CMR-STAC API | Aaron Friesz, LP DAAC |
 | 12:00 pm | Q&A and Break|  |
 | 12:15 pm | Projects Pitchfest | Catalina Oaida, PO.DAAC |

diff --git a/logistics/github-workflows.md b/logistics/github-workflows.md
@@ -28,6 +28,9 @@ git clone https://github.com/YOUR-USERNAME/2021-Cloud-Hackathon
 
 ## Daily Setup
 
+If you have any conflicts with the following steps, you will likely need to commit your work, or clear your work if you don't want to keep anything you've done. See below for [Git update, revert, etc](#git-update-revert-etc)
+
+
 #### GitHub: Get the latest 
 
 This has 2 steps: 
@@ -38,10 +41,13 @@ This has 2 steps:
 
 2. From the terminal in Jupyterhub: `git pull`
 
-<https://openscapes.2i2c.cloud/hub/>
+Go to <https://openscapes.2i2c.cloud/hub/>
+
+Go to your terminal and make sure you are in the `2021-Cloud-Hackathon` directory (double check with `pwd` and move with `cd`)
+
+Then git pull the repository: 
 
 ```{.bash}
-cd 2021-Cloud-Hackathon
 git pull
 ```
 
@@ -57,16 +63,18 @@ There are several ways to delete your local changes if you were playing around a
 
 If you've got changes saved, but not yet staged, committed, or pushed, you'll delete unstaged changes in the working directory with clean:
 
+You'll need to make sure you're in the github repository (use `pwd` to check your present working directory and `cd` to change directory)
+
 ```{.bash}
-cd YOUR-REPO
 git clean -df
 git checkout -- .
 ```
 
 **Burn it all down** - delete the whole repo that you have locally, and then reclone. 
 
+You'll need to make sure you're in the github repository (use `pwd` to check your present working directory and `cd` to change directory)
+
 ```{.bash}
-cd YOUR-REPO
 rm -rf YOUR-REPO
 ```
 

diff --git a/logistics/for-participants-helpers.md → logistics/index.md b/logistics/for-participants-helpers.md → logistics/index.md
@@ -1,5 +1,5 @@
 ---
-title: For participants & helpers
+title: Logistics overview
 ---
 
 ## For Hackathon Participants

diff --git a/projects/projects-overview.md → projects/index.md b/projects/projects-overview.md → projects/index.md
diff --git a/tutorials/00_Setup.md b/tutorials/00_Setup.md
@@ -59,6 +59,8 @@ Go to <https://github.com/nasa-openscapes/2021-Cloud-Hackathon> and fork the rep
 
 ![](../clinic/img/fork-tutorials.png)
 
+**Note:** if you've already done this in the Pre-Hackathon Clinic, you'll need to make sure you have the latest, following the [daily setup](https://nasa-openscapes.github.io/2021-Cloud-Hackathon/logistics/github-workflows.html#daily-setup) instructions.
+
 ## Discussion: Python and Conda environments
 
 [**Why Python?**](https://foundations.projectpythia.org/foundations/why-python.html)

diff --git a/tutorials/index.md b/tutorials/index.md
@@ -0,0 +1,9 @@
+---
+title: Tutorials Overview
+---
+
+These tutorials are a combination of narrative, links, code, and outputs. They have been developed for live-coding during the Hackathon, and are available for self-paced learning. 
+
+Tutorials are markdown (`.md`) and Jupyter (`.ipynb`) notebooks, and are available on GitHub:
+
+<https://github.com/NASA-Openscapes/2021-Cloud-Hackathon/tree/main/tutorials>.