From 5125e6a78559597d6baaa3779821c732321e2e29 Mon Sep 17 00:00:00 2001 From: leewujung Date: Wed, 4 Sep 2019 12:08:47 -0700 Subject: [PATCH 1/2] reorganize pages and add 2019 project page --- _config.yml | 7 +++---- _pages/{applicants.md => 01-applicants.md} | 0 _pages/{hackweek.md => 02-hackweek.md} | 0 _pages/{curriculum.md => 03-curriculum_2019.md} | 2 +- _pages/{projects.md => 04-projects_2019.md} | 6 +++--- _pages/{team.md => 05-team.md} | 10 +++++----- _pages/{z_projects.md => z-projects_2018.md} | 0 _pages/{z_schedule.md => z-schedule_2018.md} | 0 8 files changed, 12 insertions(+), 13 deletions(-) rename _pages/{applicants.md => 01-applicants.md} (100%) rename _pages/{hackweek.md => 02-hackweek.md} (100%) rename _pages/{curriculum.md => 03-curriculum_2019.md} (99%) rename _pages/{projects.md => 04-projects_2019.md} (97%) rename _pages/{team.md => 05-team.md} (93%) rename _pages/{z_projects.md => z-projects_2018.md} (100%) rename _pages/{z_schedule.md => z-schedule_2018.md} (100%) diff --git a/_config.yml b/_config.yml index ffed9d7d..8727d293 100644 --- a/_config.yml +++ b/_config.yml @@ -5,12 +5,11 @@ description: Data Science + Oceanography
University of Washington
Aug 26-30, 2019

- Check out our Wiki -
for logistics and pre-event preparation! + Useful resources on the Wiki! # Banner button to lead to form, then schedule, then next year's website. -banner_button_url: https://columbiauniversity.zoom.us/j/318805257 -banner_button_text: Join remotely during the event (via Zoom)! +banner_button_url: projects_2019.html +banner_button_text: 2019 Hack Projects! baseurl: "" # the subpath of your site, e.g. /blog diff --git a/_pages/applicants.md b/_pages/01-applicants.md similarity index 100% rename from _pages/applicants.md rename to _pages/01-applicants.md diff --git a/_pages/hackweek.md b/_pages/02-hackweek.md similarity index 100% rename from _pages/hackweek.md rename to _pages/02-hackweek.md diff --git a/_pages/curriculum.md b/_pages/03-curriculum_2019.md similarity index 99% rename from _pages/curriculum.md rename to _pages/03-curriculum_2019.md index e19968b7..f1906a0b 100644 --- a/_pages/curriculum.md +++ b/_pages/03-curriculum_2019.md @@ -1,7 +1,7 @@ --- layout: page title: 2019 Curriculum -permalink: curriculum.html +permalink: curriculum_2019.html --- **Oceanhackweek curriculum consists of hands-on tutorials, visual presentations and collaborative hack projects.** Tutorials and presentations will take place mostly in the mornings, with the afternoons devoted to project work. The tutorials will be based on the scientific Python stack, which is an ecosystem of interrelated Python packages for scientific computing and analysis. This year we focus on access strategies for diverse data systems and workflow for interoperating different types of ocean data and models. diff --git a/_pages/projects.md b/_pages/04-projects_2019.md similarity index 97% rename from _pages/projects.md rename to _pages/04-projects_2019.md index 64294345..b3d236db 100644 --- a/_pages/projects.md +++ b/_pages/04-projects_2019.md @@ -1,7 +1,7 @@ --- layout: page -title: 2019 HackWeek Projects -permalink: projects.html +title: 2019 Hackweek Projects +permalink: projects_2019.html --- OceanHackWeek is not just about learning, it is also about using what is learned to create exciting new tools in collaboration with others. The OceanHackWeek organizing committee worked hard to foster an inclusive and supportive learning environment based on the shared interests of its members. They were awed by the creativity and dedication of the eleven groups that worked and presented a project during the conclusion of OceanHackWeek, and are proud to be able to share these projects here. @@ -85,4 +85,4 @@ Notebooks demonstrating how to work with chlorophyll data including how to remot A learning tool used to show Amazon data including bushfires, daily surface temperature over 10 years, El Nino events, and signals in river discharge. -**Presentation**: [video](https://www.dropbox.com/sh/lqvin95rcqyq4tq/AAAbrhKHy-ZUDA9F47LUKFj-a?dl=0&preview=proj11_FIRES.mp4) \ No newline at end of file +**Presentation**: [video](https://www.dropbox.com/sh/lqvin95rcqyq4tq/AAAbrhKHy-ZUDA9F47LUKFj-a?dl=0&preview=proj11_FIRES.mp4) diff --git a/_pages/team.md b/_pages/05-team.md similarity index 93% rename from _pages/team.md rename to _pages/05-team.md index a180d41d..cebf9d46 100644 --- a/_pages/team.md +++ b/_pages/05-team.md @@ -1,6 +1,6 @@ --- layout: page -title: Organizing committee and instructors +title: Organizing committee permalink: our-team.html description: team: @@ -29,7 +29,7 @@ team: github_user: ocefpaf - name: Emilio Mayorga - title: Ocean data systems, IOOS + title: Ocean data systems, IOOS affiliate: Senior Oceanographer, APL, UW image_url: https://geohackweek.github.io/ghw2017/images/742403.jpg github_user: emiliom @@ -40,13 +40,13 @@ team: image_url: https://avatars2.githubusercontent.com/u/1197350?s=400&v=4 github_user: rabernat - - - name: Joseph Gum + - - name: Joseph Gum title: Data science education, ship data affiliate: Data Analyst, Scripps - image_url: https://oceanhackweek.github.io/assets/images/jgum.jpg + image_url: https://oceanhackweek.github.io/assets/images/jgum.jpg github_user: asx- - - name: Timothy Crone + - name: Timothy Crone title: Pangeo, OOI affiliate: Associate Research Professor, LDEO, Columbia University image_url: https://avatars1.githubusercontent.com/u/5667194?s=400&v=4 diff --git a/_pages/z_projects.md b/_pages/z-projects_2018.md similarity index 100% rename from _pages/z_projects.md rename to _pages/z-projects_2018.md diff --git a/_pages/z_schedule.md b/_pages/z-schedule_2018.md similarity index 100% rename from _pages/z_schedule.md rename to _pages/z-schedule_2018.md From 892ac1e152e5fd9f906dbbea78f50248642caf6a Mon Sep 17 00:00:00 2001 From: leewujung Date: Wed, 4 Sep 2019 12:47:45 -0700 Subject: [PATCH 2/2] udpate 2019 projec page language --- .gitignore | 4 +++- _config.yml | 2 +- _pages/04-projects_2019.md | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 66a81529..9c8caf6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +_site/ .idea/ -_site/ \ No newline at end of file +.DS_Store +.gitignore~ diff --git a/_config.yml b/_config.yml index 8727d293..182de3fa 100644 --- a/_config.yml +++ b/_config.yml @@ -9,7 +9,7 @@ description: Data Science + Oceanography
# Banner button to lead to form, then schedule, then next year's website. banner_button_url: projects_2019.html -banner_button_text: 2019 Hack Projects! +banner_button_text: 2019 Hack Projects baseurl: "" # the subpath of your site, e.g. /blog diff --git a/_pages/04-projects_2019.md b/_pages/04-projects_2019.md index b3d236db..679875b5 100644 --- a/_pages/04-projects_2019.md +++ b/_pages/04-projects_2019.md @@ -4,9 +4,9 @@ title: 2019 Hackweek Projects permalink: projects_2019.html --- -OceanHackWeek is not just about learning, it is also about using what is learned to create exciting new tools in collaboration with others. The OceanHackWeek organizing committee worked hard to foster an inclusive and supportive learning environment based on the shared interests of its members. They were awed by the creativity and dedication of the eleven groups that worked and presented a project during the conclusion of OceanHackWeek, and are proud to be able to share these projects here. +Oceanhackweek is not just about learning, it is also about using what is learned to create exciting new tools in collaboration with others. We strive to foster an inclusive and supportive learning environment based on the shared interests of all participants, and are proud to share outcome of the hack projects here. -Will Update with YouTube links soon +YouTube links to the final presentations are coming soon. ---