From 0cfdf803d4b49afe86f5ac651fb6149d63dcff3b Mon Sep 17 00:00:00 2001
From: Kevin Lin <kevinl@cs.uw.edu>
Date: Wed, 1 Jul 2020 09:54:47 -0700
Subject: [PATCH] Simplify module data format
---
_layouts/module.html | 6 ++++--
_modules/week-01.md | 43 +++++++++++++++++++------------------------
_modules/week-02.md | 43 +++++++++++++++++++------------------------
3 files changed, 42 insertions(+), 50 deletions(-)
diff --git a/_layouts/module.html b/_layouts/module.html
index 835e882..6e21f32 100644
--- a/_layouts/module.html
+++ b/_layouts/module.html
@@ -3,8 +3,10 @@
{% if page.days %}
<dl class="module-days">
{% for day in page.days %}
- <dt class="module-day">{{ day.date | date: '%b %e' }}</dt>
- {% for event in day.events %}
+ {% assign date = day | first %}
+ {% assign events = day | last %}
+ <dt class="module-day">{{ date | date: '%b %e' }}</dt>
+ {% for event in events %}
{% assign main = event | first %}
{% assign info = event | last %}
{% capture main %}{% include eval.liquid content=main %}{% endcapture %}
diff --git a/_modules/week-01.md b/_modules/week-01.md
index c22a62f..5098b87 100644
--- a/_modules/week-01.md
+++ b/_modules/week-01.md
@@ -2,28 +2,23 @@
week: 1
title: Introduction to Java
days:
- - date: 2019-04-01
- events:
- "[Java & Git](#)":
- "[1.1](#)"
- "**HW 1 out**{: .label .label-hw-out }":
- null
- - date: 2019-04-02
- events:
- "**Section**{: .label .label-section } [Intro to Java](#)":
- "Solution"
- - date: 2019-04-03
- events:
- "[Variables & Objects](#)":
- "[1.2](#), [2.1](#)"
- - date: 2019-04-04
- events:
- "**Lab**{: .label } [Intro to Java](#)":
- null
- - date: 2019-04-05
- events:
- "[Tracing, IntLists, & Recursion](#)":
- "[2.1](#)"
- "**HW 1 due**{: .label .label-hw-due }":
- null
+ 2019-04-01:
+ "[Java & Git](#)":
+ "[1.1](#)"
+ "**HW 1 out**{: .label .label-hw-out }":
+ null
+ 2019-04-02:
+ "**Section**{: .label .label-section } [Intro to Java](#)":
+ "Solution"
+ 2019-04-03:
+ "[Variables & Objects](#)":
+ "[1.2](#), [2.1](#)"
+ 2019-04-04:
+ "**Lab**{: .label } [Intro to Java](#)":
+ null
+ 2019-04-05:
+ "[Tracing, IntLists, & Recursion](#)":
+ "[2.1](#)"
+ "**HW 1 due**{: .label .label-hw-due }":
+ null
---
diff --git a/_modules/week-02.md b/_modules/week-02.md
index b2e08d5..e8bc4fc 100644
--- a/_modules/week-02.md
+++ b/_modules/week-02.md
@@ -2,28 +2,23 @@
week: 2
title: Basic Data Structures
days:
- - date: 2019-04-08
- events:
- "[Linked Lists & Encapsulation](#)":
- "[3.1](#), [2.2](#), [2.3](#)"
- "**HW 2 out**{: .label .label-hw-out }":
- null
- - date: 2019-04-09
- events:
- "**Section**{: .label .label-section } [Linked Lists](#)":
- "Solution"
- - date: 2019-04-10
- events:
- "[Resizing Arrays](#)":
- "[2.4](#), [2.5](#)"
- - date: 2019-04-11
- events:
- "**Lab**{: .label } [Resizing Arrays](#)":
- null
- - date: 2019-04-12
- events:
- "[Runtime Analysis](#)":
- "[8.1](#), [8.2](#), [8.3](#), [8.4](#)"
- "**HW 2 due**{: .label .label-hw-due }":
- null
+ 2019-04-08:
+ "[Linked Lists & Encapsulation](#)":
+ "[3.1](#), [2.2](#), [2.3](#)"
+ "**HW 2 out**{: .label .label-hw-out }":
+ null
+ 2019-04-09:
+ "**Section**{: .label .label-section } [Linked Lists](#)":
+ "Solution"
+ 2019-04-10:
+ "[Resizing Arrays](#)":
+ "[2.4](#), [2.5](#)"
+ 2019-04-11:
+ "**Lab**{: .label } [Resizing Arrays](#)":
+ null
+ 2019-04-12:
+ "[Runtime Analysis](#)":
+ "[8.1](#), [8.2](#), [8.3](#), [8.4](#)"
+ "**HW 2 due**{: .label .label-hw-due }":
+ null
---
--
GitLab