Style/usability enhancement changes

.eleventy.js

@@ -40,8 +40,8 @@ module.exports = function (eleventyConfig) {
   eleventyConfig.addFilter("from", (array, from) => {
     return array.slice(from, array.length);
   });
-  // Check if a date has occured
-  eleventyConfig.addFilter("occured", (date) => {
+  // Check if a date has occurred
+  eleventyConfig.addFilter("occurred", (date) => {
     let dateToCheck = new Date(date);
     let today = new Date();
     return dateToCheck < today;

src/_data/meta.js

@@ -1,5 +1,5 @@
 module.exports = {
-  url: "/",
+  url: "https://not.jsoxford.com/",
   siteName: "MaybeNotJSOxford",
   siteDescription: "A monthly catchup about tech (maybe JS), that's online (not in Oxford)",
   authorName: "JS Oxford",

src/_generate/feed.njk

@@ -24,4 +24,14 @@ eleventyExcludeFromCollections: true
 		<content type="html">{{ page.templateContent | htmlToAbsoluteUrls(absolutePostUrl) }}</content>
 	</entry>
 	{%- endfor %}
+	{%- for page in collections.events %}
+	{% set absolutePostUrl %}{{ page.url | url | absoluteUrl(meta.url) }}{% endset %}
+	<entry>
+		<title>{{ page.data.description  }}</title>
+		<link href="{{ absolutePostUrl }}"/>
+		<updated>{{ page.date | rssDate }}</updated>
+		<id>{{ absolutePostUrl }}</id>
+		<content type="html">{{ page.templateContent | htmlToAbsoluteUrls(absolutePostUrl) }}</content>
+	</entry>
+	{%- endfor %}
 </feed>

src/_includes/layouts/event.njk

@@ -4,4 +4,10 @@ layout: base
 
 {% from 'macros/eventinfo.njk' import eventInfo %}
 
-{{ eventInfo({date:date,speakers:speakers,stream:stream,description:description}, layoutContent) }}
+{{ eventInfo({
+    date:date,
+    speakers:speakers,
+    stream:stream,
+    description:description,
+    happened:happened
+}, layoutContent) }}

src/_includes/macros/eventinfo.njk

@@ -21,15 +21,19 @@
     <h2>{{ event.description }}</h2>
 </header>
 {% if event.stream %}
-    {% if event.date | occured %}
+    {% if event.happened == true %}
     <p>It was ✨ Broadcast Live ✨ on the ✨ Information Superhighway ✨</p>
+    {% else %}
+        {% if event.date | occurred %}
+            <p>Currently live 📣</p>
+        {% endif %}
     {% endif %}
 
     {% yt event.stream %}
 {% else %}
     <h3>[We'll post the video here when we go live]</h3>
 {% endif %}
-<p>🤟 This month, {% if event.date | occured %}we had{% else %}we've got{% endif %}</p>
+<p>🤟 This month, {% if event.happened %}we had{% else %}we've got{% endif %}</p>
 {% if event.speakers %}
 <ul>
 {% for speaker in event.speakers %}

src/_includes/partials/footer.njk

@@ -1,17 +1,16 @@
 <footer class="maybenot-foot">
-    <h1><strong>Not</strong>JSOxford</h1>
+    <h1><a href="{{ "/" | url }}"><strong>Not</strong>JSOxford</a></h1>
     <div>
     <p>
         Not just JS, and not really in Oxford either.
         A chat on the second Wednesday of the month.
     </p>
     <p>
         Join us: <a href="https://www.youtube.com/channel/UCjXR8G5M-iwkHVF26AFFsCQ">YouTube</a> | <a href="https://slack.digitaloxford.com/">Slack</a> (we're in <a href="https://digitaloxford.slack.com/archives/C0UURPG9H">#jsoxford</a>)<br>
-        <a href="/coc">Code of Conduct</a>
+        <a href="{{ "/coc" | url }}">Code of Conduct</a>
         </p>
-    <a class="sponsor" href="https://www.netlify.com">
+        <a class="sponsor" href="https://www.netlify.com">
             <img src="https://www.netlify.com/img/global/badges/netlify-dark.svg" alt="Deploys by Netlify" />
         </a>
-
     </div>
 </footer>

src/events/2021-01.md

@@ -15,6 +15,7 @@ speakers:
    twitter: javorszky
    what: Elixir
 stream: https://www.youtube-nocookie.com/embed/ps_UUldWqHY
+happened: true
 ---
 
 #### Vibe

src/events/2021-02.md

@@ -9,6 +9,7 @@ speakers:
    twitter: spikeheap
    what:  Coaching
 stream: https://www.youtube-nocookie.com/embed/m8iMGFjVgGg
+happened: true
 ---
 
 Marcus [tweeted about what he's thinking of covering](https://twitter.com/Marcus_Noble_/status/1356600550230548481), so feel free to reach out to him and ask him any specific questions! Or drop into the [#jsoxford slack](https://digitaloxford.slack.com/archives/C0UURPG9H/p1612466756040900) to find out more.

src/events/2021-03.md

@@ -9,6 +9,7 @@ speakers:
    twitter: mikerhyssmith
    what:  Backstage and onboarding new developers
 stream: 
+happened: 
 ---
 
 More info to follow!

src/sass/_maybenot.scss

@@ -54,6 +54,14 @@ footer {
     margin-right: 1em;
     font-size: 6vmin;
 
+    a {
+      text-decoration: none;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+
     strong {
       font-weight: 800;
       display: block;