From d37107a271b177bc616ffb8d0def3dd07c5dd057 Mon Sep 17 00:00:00 2001
From: Spencer Flagg <work@spencerflagg.com>
Date: Sat, 18 Jun 2022 11:42:18 +0200
Subject: [PATCH] added Al, events, restyled day

---
 src/_data/events.json            | 18 +++++++++++-
 src/_data/guests.json            | 49 ++++++++++++++++++++++++++++----
 src/_data/locations.json         |  8 ++++++
 src/_includes/components/cal.njk | 10 +++++--
 src/assets/styles/main.scss      | 31 +++++++++++---------
 src/index.njk                    |  2 +-
 6 files changed, 94 insertions(+), 24 deletions(-)

diff --git a/src/_data/events.json b/src/_data/events.json
index af14229..c10e0fe 100644
--- a/src/_data/events.json
+++ b/src/_data/events.json
@@ -1,14 +1,30 @@
 [
+    {
+        "name": "Activities in Amsterdam?",
+        "date": 13
+    },
+    {
+        "name": "Activities in Amsterdam?",
+        "date": 14
+    },
+    {
+        "name": "Activities in Amsterdam or Utrecht?",
+        "date": 15
+    },
     {
         "name": "Bachelor Party (TBD)",
         "date": 16
     },
     {
-        "name": "Foreigner Lunch, (TBD)",
+        "name": "Foreigner Dinner, Echteld or Tiel?",
         "date": 17
     },
     {
         "name": "Wedding, Echteld",
         "date": 18
+    },
+    {
+        "name": "Activities in Utrecht?",
+        "date": 19
     }
 ]
\ No newline at end of file
diff --git a/src/_data/guests.json b/src/_data/guests.json
index 59b9c9e..c418515 100644
--- a/src/_data/guests.json
+++ b/src/_data/guests.json
@@ -624,18 +624,18 @@
       },
       {
         "date": 13,
-        "day": "u",
-        "night": "u"
+        "day": "a",
+        "night": "a"
       },
       {
         "date": 14,
-        "day": "u",
-        "night": "u"
+        "day": "a",
+        "night": "a"
       },
       {
         "date": 15,
-        "day": "u",
-        "night": "u"
+        "day": "a",
+        "night": "a"
       },
       {
         "date": 16,
@@ -699,6 +699,43 @@
       }
     ]
   },
+  {
+    "name": "Alfonso & Linsey",
+    "slug": "alfonso-and-linsey",
+    "count": 2,
+    "dates": [
+      {
+        "date": 14,
+        "day": "a",
+        "night": "a"
+      },
+      {
+        "date": 15,
+        "day": "a",
+        "night": "a"
+      },
+      {
+        "date": 16,
+        "day": "a",
+        "night": "b"
+      },
+      {
+        "date": 17,
+        "day": "b",
+        "night": "e"
+      },
+      {
+        "date": 18,
+        "day": "e",
+        "night": "e"
+      },
+      {
+        "date": 19,
+        "day": "e",
+        "night": "d"
+      }
+    ]
+  },
   {
     "name": "Ray & Rebecca",
     "slug": "rayray-and-becs",
diff --git a/src/_data/locations.json b/src/_data/locations.json
index 3300a36..64d304c 100644
--- a/src/_data/locations.json
+++ b/src/_data/locations.json
@@ -18,5 +18,13 @@
     {
         "name": "Echteld",
         "abbr": "e"
+    },
+    {
+        "name": "Brussels",
+        "abbr": "b"
+    },
+    {
+        "name": "Den Haag",
+        "abbr": "d"
     }
 ]
\ No newline at end of file
diff --git a/src/_includes/components/cal.njk b/src/_includes/components/cal.njk
index e8b5a2c..8be0efd 100644
--- a/src/_includes/components/cal.njk
+++ b/src/_includes/components/cal.njk
@@ -1,6 +1,6 @@
 {% if guestslug == null %}
 <h1>{{ title }}</h1>
-<h3>(Updated {{ updated }}: not everyone has given us complete travel schedules yet; check back later)</h3>
+<h3>(Updated {{ updated }}: check back later as schedules come in)</h3>
 {% else %}
 <h1>{{guestname | safe}}'s Schedule</h1>
 <a class="back-home" href="/">👈 back to full schedule</a>
@@ -49,9 +49,12 @@
         {% if guestslug == null %}
             <ul class="locations">
                 {% for loc in locations %}
+                    {% set daylen = guests | day(date,loc.abbr) | length %}
+                    {% set nightlen = guests | night(date,loc.abbr) | length %}
+                    {% if (daylen > 0) or (nightlen > 0) %}
                     <li class="location">
                         <div>{{loc.name}}</div>
-                        {% if guests | day(date,loc.abbr) | length > 0 %}
+                        {% if daylen > 0 %}
                         <div class="time-window">
                             <a class="category day hover">{{ guests | day(date,loc.abbr) | total }}</a>
                             <ul class="list">
@@ -63,7 +66,7 @@
                             </ul>
                         </div>
                         {% endif %}
-                        {% if guests | night(date,loc.abbr) | length > 0 %}
+                        {% if nightlen > 0 %}
                         <div>
                             <div class="category night hover">{{ guests | night(date,loc.abbr) | total }}</div>
                             <ul class="list">
@@ -76,6 +79,7 @@
                         </div>
                         {% endif %}
                     </li>
+                    {% endif %}
                 {% endfor %}
             </ul>
         {% else %}
diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss
index 4027fe1..d1bd2f5 100644
--- a/src/assets/styles/main.scss
+++ b/src/assets/styles/main.scss
@@ -1,9 +1,11 @@
 :root {
   font-size: 1vw;
+  --dark-blue: #213563;
+  --teal: #098391;
 }
 
 html {
-  background-color: #213563;
+  background-color: var(--dark-blue);
   font-family: "Courier New", Courier, monospace;
   
 }
@@ -38,7 +40,7 @@ h1 {
 
 h3{
     font-weight: 100;
-    color: #098391;
+    color: var(--teal);
 }
 
 main {
@@ -58,7 +60,7 @@ main {
   border-radius: 1rem;
   background-color: #fff;
   &:hover {
-    background-color: #098391;
+    background-color: var(--teal);
         color: white;
   }
 }
@@ -117,7 +119,7 @@ main {
       background-color: #fff;
       display: inline-block;
       &:hover {
-        background-color: #098391;
+        background-color: var(--teal);
         color: white;
       }
     }
@@ -129,7 +131,7 @@ main {
   display: grid;
   margin-bottom: 5rem;
   grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-  grid-template-rows: 3rem 15rem 15rem 15rem;
+  grid-template-rows: 3rem 16rem 16rem 16rem;
   width: 95vw;
   & > li {
     &:nth-child(-n+7){
@@ -138,27 +140,30 @@ main {
     }
     background-color: #eee;
     margin: 1px;
-    padding: 1.25rem 1rem 1rem 1rem;
     position: relative;
+    display: flex;
+    flex-direction: column;
+
     .event{
         text-transform: uppercase;
-        font-size: .8rem;
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
+        display: block;
         text-align: center;
-        padding: .15rem 0;
-        background-color: #098391;
+        padding: .15rem;
+        background-color: var(--teal);
         color: white;
+        margin: 0 .5rem .5rem .5rem;
     }
+
     .date {
       font-size: 3rem;
       font-weight: 500;
+      margin: .5rem 0 0 1rem;
     }
+
   }
 
   .locations {
+    margin: 0 1rem;
     display: flex;
     flex-direction: column;
     .location {
diff --git a/src/index.njk b/src/index.njk
index 0c9c9f0..91a5080 100644
--- a/src/index.njk
+++ b/src/index.njk
@@ -1,7 +1,7 @@
 ---
 title: The Schedule
 layout: layouts/base.njk
-updated: June 15
+updated: June 18
 ---
 
 {% include "components/cal.njk" %}
\ No newline at end of file