Skip to content

Commit ab51d57

Browse files
author
Leah Wasser
authored
Merge pull request #506 from earthlab/master
updating bootcamp from master!
2 parents dc89902 + 39b2eee commit ab51d57

File tree

167 files changed

+3755
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+3755
-89
lines changed

‎_data/authors.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,21 @@
44
- name: Carson Farmer
55
slug: carson-farmer
66
bio: ''
7+
- name: Chris Holdgraf
8+
slug: chris-holdgraf
9+
bio: 'Chris is a core member of the Jupyter team at University of California'
710
- name: Data Carpentry
811
slug: data-carpentry
912
bio: ''
13+
- name: Joe McGlinchy
14+
slug: joe-mcglinchy
15+
bio: 'Joe is a Remote Sensing Specialist with the Analytics Hub at Earth Lab.'
1016
- name: Leah Wasser
1117
slug: leah-wasser
1218
bio: 'Leah is the director of the Earth Analytics Education Initiative at Earth Lab and maintains this website.'
19+
- name: Martha Morrissey
20+
slug: martha-morrissey
21+
bio: ''
1322
- name: Matt Oakley
1423
slug: matt-oakley
1524
bio: 'Matt worked with the Analytics Hub as an undergraduate intern in 2016 while pursuing his degree in computer science.'
@@ -33,4 +42,4 @@
3342
bio: ''
3443
- name: Zach Schira
3544
slug: zach-schira
36-
bio: 'Zach worked with the Analytics Hub as an undergraduate intern in 2016 and 2017 while pursuing his degree in aerospace engineering.'
45+
bio: 'Zach worked with the Analytics Hub as an undergraduate intern in 2016 and 2017 while pursuing his degree in aerospace engineering.'

‎_data/navigation.yml

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ main:
77
- title: "Courses"
88
url: /courses/
99

10+
- title: "Workshops"
11+
url: /workshops/
12+
1013
- title: "Tools"
1114
url: /tools/
1215

‎_data/topics.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ spatial-data-and-gis:
1515
reproducible-science-and-programming:
1616
subtopics: ['RStudio', 'literate-expressive-programming','functions',
1717
'r-studio', 'automate-science-workflows', 'git', 'markdown',
18-
'rmarkdown', 'data-management', 'version-control']
18+
'rmarkdown', 'data-management', 'version-control',
19+
'literate expressive programming', 'python']
1920
find-and-manage-data:
2021
subtopics: ['data-management', 'find-data', 'metadata', 'missing-data-nan', 'apis']
2122
file-formats:

‎_includes/course-module-list.html

+3-23
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,14 @@
11

22

3-
4-
<!-- This part will only list workshops -->
5-
6-
{% assign workshops = site.posts | where:"module-type", 'workshop' %}
7-
{% assign workshop_landing_pages = workshops | where:"order", 1 %}
8-
9-
{% for workshop in workshops %}
10-
<div class="list__item">
11-
<article class="archive__item" >
12-
<h2 class="archive__item-title">
13-
<a href="{{ site.url }}{{ workshop.permalink }}">{{ workshop.module-title }} </a></h2>
14-
<p class='archive__item-excerpt'>{{ workshop.module-description | truncatewords:35 }}
15-
<br><i>Last updated: {{ workshop.modified | date_to_string }}</i> </p>
16-
</article>
17-
</div>
18-
19-
{% endfor %}
20-
21-
{% comment %}
22-
<!-- This include will add all modules in the site to the page -->
23-
243
{% assign modules = site.posts | where:"order", 1 %}
254

265
{% for module in modules %}
6+
{% if module.course %}
277

288
<div class="list__item">
299
<article class="archive__item" >
3010
<h2 class="archive__item-title">
31-
<a href="{{ site.url }}{{ module.permalink }}">{{ module.module-title }}link:{{ module.permalink }}</a></h2>
11+
<a href="{{ site.url }}{{ module.permalink }}">{{ module.module-title }}</a></h2>
3212
<p class='archive__item-excerpt'><i>{% if module.course %}This teaching module is a part of the {{ module.course }} course. Last taught: {{ module.date | date_to_string }}{% endif %}</i> </p>
3313
<p class='archive__item-excerpt'>{{ module.module-description | truncatewords:35 }} <a href="{{ site.url }}{{ module.permalink }}">read more.</a> <i>Last updated: {{ module.modified | date_to_string }}</i> </p>
3414

@@ -49,5 +29,5 @@ <h2 class="archive__item-title">
4929
</article>
5030
</div>
5131

32+
{% endif %}
5233
{% endfor %}
53-
{% endcomment %}

‎_includes/workshop-list.html

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
2+
<!-- This part will only list workshops -->
3+
4+
{% assign workshops = site.posts | where:"module-type", 'workshop' %}
5+
{% assign workshop_landing_pages = workshops | where:"order", 1 %}
6+
7+
{% for workshop in workshop_landing_pages %}
8+
<div class="list__item">
9+
<article class="archive__item" >
10+
<h2 class="archive__item-title">
11+
<a href="{{ site.url }}{{ workshop.permalink }}">{{ workshop.module-title }} </a></h2>
12+
<p class='archive__item-excerpt'>{{ workshop.module-description | truncatewords:35 }}
13+
<br><i>Last updated: {{ workshop.modified | date_to_string }}</i> </p>
14+
</article>
15+
</div>
16+
17+
{% endfor %}
18+
19+
{% comment %}
20+
<!-- This include will add all modules in the site to the page -->
21+
22+
{% assign modules = site.posts | where:"order", 1 %}
23+
24+
{% for module in modules %}
25+
26+
<div class="list__item">
27+
<article class="archive__item" >
28+
<h2 class="archive__item-title">
29+
<a href="{{ site.url }}{{ module.permalink }}">{{ module.module-title }}link:{{ module.permalink }}</a></h2>
30+
<p class='archive__item-excerpt'><i>{% if module.course %}This teaching module is a part of the {{ module.course }} course. Last taught: {{ module.date | date_to_string }}{% endif %}</i> </p>
31+
<p class='archive__item-excerpt'>{{ module.module-description | truncatewords:35 }} <a href="{{ site.url }}{{ module.permalink }}">read more.</a> <i>Last updated: {{ module.modified | date_to_string }}</i> </p>
32+
33+
{% assign counter = 0 %}
34+
{% for post in site.categories.[page.category] %}
35+
{% if post.class-lesson == module.class-lesson %}
36+
{% assign counter = counter | plus: 1 %}
37+
{% endif %}
38+
{% endfor %}
39+
40+
{% assign slideCounter = 0 %}
41+
{% for slides in site.slide-shows %}
42+
{% if slides.class-lesson == module.class-lesson %}
43+
{% assign slideCounter = slideCounter | plus: 1 %}
44+
{% endif %}
45+
{% endfor %}
46+
<p class="page__meta">lessons: {{ counter }}, presentations {{ slideCounter }}</p>
47+
</article>
48+
</div>
49+
50+
{% endfor %}
51+
{% endcomment %}

‎_layouts/single.html

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ <h1 class="page__title" itemprop="headline">
6060
{% if page.title %}<h1 class="page__title" itemprop="headline">
6161
{% if page.order %}Lesson {{ page.order }}. {% endif %}
6262
{% if page.header1 %}{{ page.header1 | markdownify | remove: "<p>" | remove: "</p>" }}{% else %} {{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}{% endif %} </h1>
63+
{% if page.module %} {{ page.module | replace: '-', ' ' | capitalize }} {{ page.module-type | capitalize }} {% endif %}
6364
{% endif %}
6465

6566
{% if page.authors %}

‎_pages/home.md

+11-44
Original file line numberDiff line numberDiff line change
@@ -68,68 +68,34 @@ and data intensive science. Currently, we have 124 lessons
6868
</div>
6969

7070

71-
## Online courses
71+
## Online Earth Data Science Courses
7272

7373
{% assign courses = site.posts | where:"overview-order", 1 %}
7474
{% for course in courses %}
7575
* <a href="{{ site.url }}{{ course.permalink }}">{{ course.module-title }}</a>
7676
{% endfor %}
7777

78-
## Newest lessons
7978

80-
<div class="list__item">
81-
We are always adding to our course lesson materials. Below are the top 3
82-
newest lessons that we've added to our courses.
83-
</div>
84-
85-
{% assign lesson_posts = site.posts | where:"module-type", "class" or "homework" %}
86-
{% for post in lesson_posts limit:3 %}
87-
<div class="list__item">
88-
<article class="archive__item">
89-
<h2 class="archive__item-title"><a href="{{ site.baseurl }}{{ post.url}}">{{ post.title }}</a></h2>
90-
<p class="archive__item-excerpt">{{ post.excerpt }}</p>
91-
<p class="archive__item-excerpt"><i>{% if post.course %}Course: {{ post.course }},{% endif %} {% if post.modified %}last updated: {{ post.modified | date_to_string }}{% endif %}</i></p>
92-
</article>
93-
</div>
94-
95-
{% endfor %}
96-
97-
## Recent course lesson sets
79+
## Earth Analytics Workshops
9880

99-
<div class="list__item">
100-
Below, are the most recently develop course units. These units include a series
101-
of lessons that are developed around a particular topic. You may want to take
102-
the entire lesson set.
103-
</div>
104-
105-
{% assign modules = site.posts | where:"order", 1 %}
106-
{% for module in modules limit:3 %}
81+
{% assign workshops = site.posts | where:"module-type", 'workshop' %}
82+
{% assign workshop_landing_pages = workshops | where:"order", 1 %}
10783

84+
{% for workshop in workshop_landing_pages limit:3 %}
10885
<div class="list__item">
10986
<article class="archive__item" >
11087
<h2 class="archive__item-title">
111-
<a href="{{ site.url }}{{ module.permalink }}">{{ module.module-title }}</a></h2>
112-
<p class='archive__item-excerpt'>{{ module.module-description | truncatewords:35 }} <a href="{{ site.url }}{{ module.permalink }}">read more.</a> </p>
113-
114-
{% assign counter = 0 %}
115-
116-
<!-- this may not work -->
117-
{% assign module_posts = site.posts | where:"class-lesson", {{ module.class-lesson }} %}
118-
{% for post in site.posts %}
119-
{% if post.class-lesson == module.class-lesson %}
120-
{% assign counter = counter | plus: 1 %}
121-
{% endif %}
122-
{% endfor %}
123-
124-
<p class="archive__item-excerpt"><i>lessons: {{ counter }}, last updated: {{ module.modified | date_to_string }}</i></p>
88+
<a href="{{ site.url }}{{ workshop.permalink }}">{{ workshop.module-title }} </a></h2>
89+
<p class='archive__item-excerpt'>{{ workshop.module-description | truncatewords:35 }}
90+
<br><i>Last updated: {{ workshop.modified | date_to_string }}</i> </p>
12591
</article>
12692
</div>
12793

12894
{% endfor %}
12995

130-
<a href="{{ site.url}}/courses/">View all modules </a>
96+
<a href="{{ site.url}}/workshops/">View all earth analytics workshops. </a>
13197

132-
## Recent tutorials
98+
## Recent Tutorials
13399

134100
{% for post in site.categories['tutorials'] limit:3 %}
135101
<!-- List the most recent 3 tutorials -->
@@ -141,6 +107,7 @@ the entire lesson set.
141107
</div>
142108
{% endfor %}
143109

110+
144111
</div>
145112
{% include feature_row id="intro" type="center" %}
146113

‎_posts/workshops/clean-code-tidyverse-r/2018-01-29-clcode-01-clean-code-workshop-landing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: "Learn to Use tidyverse and Clean Code to Work With Data in R"
55
excerpt: 'When working with data, you often spend the most amount of time cleaning your data. Learn how to write more efficient code using the tidyverse in R.'
66
modified: '2018-02-02'
77
nav-title: "Tidyverse Workshop Setup"
8-
permalink: /courses/clean-coding-tidyverse-intro/
8+
permalink: /workshops/clean-coding-tidyverse-intro/
99
module: "clean-coding-tidyverse-intro"
1010
module-type: 'workshop'
1111
module-title: "Introduction to Clean Coding and the tidyverse in R"
@@ -79,7 +79,7 @@ and use during the workshop!
7979

8080
| time | topic | instructor |
8181
|:------------|:----------------------------------------------------|:-----------|
82-
| 1:00 - 1:30 | Welcome / Clean Code Group Activity | Leah / Max |
82+
| 1:00 - 1:30 | Welcome / Clean Code Group Activity | Leah / Max |
8383
| 1:30 - 2:20 | Intro to Pseudocode, Tidyverse & NA values | Max |
8484
| 2:30 - 2:40 | Break | |
8585
| 2:40 - 3:20 | Automate Code with Loops | Leah |

‎_posts/workshops/python-open-science-tool-setup/2018-07-20-setup-01-landing-earth-analytics-python-setup.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
layout: single
3+
category: courses
4+
title: "Setup Your Earth Analytics Python, Git, Bash Environment On Your Computer"
5+
excerpt: 'There are several core tools that are required to work with data. These include Shell / Bash, Git and github and Python. Learn how to set all of these tools up on your computer so you can work with different types of data using open science workflows.'
6+
modified: 2018-07-17
7+
nav-title: "Setup the Earth Analytics Python"
8+
permalink: /workshops/setup-earth-analytics-python/
9+
module: "setup-earth-analytics-environment"
10+
module-type: 'workshop'
11+
module-title: "Setup the Earth Analytics Python Environment On Your Computer"
12+
module-description: 'There are several core tools that are required to work with data. These include Shell / Bash, Git and github and Python. Learn how to set all of these tools up on your computer so you can work with different types of data using open science workflows.'
13+
sidebar:
14+
nav:
15+
comments: false
16+
author_profile: false
17+
order: 1
18+
---
19+
{% include toc title="This Week" icon="file-text" %}
20+
21+
22+
<div class="notice--info" markdown="1">
23+
24+
## <i class="fa fa-ship" aria-hidden="true"></i> Course Setup
25+
26+
Welcome to week one of Earth Analytics! In week 1 we will explore data together
27+
in class related to the 2013 Colorado Floods. In your homework, you will set up
28+
`Python` and `Jupyter Notebook` on your laptop and learn how to create an Jupyter Notebook
29+
document and convert it to an .html.
30+
31+
32+
</div>
33+
34+
Please review the lessons in this section to get your computer setup for working on class activities.
35+
Important: We also have a cloud environment available for you to use for your homework assignments. However we encourage you to practice getting things setup on your own computer as well as it's a good skill to have!
36+

0 commit comments

Comments
 (0)