post-conf work

_data/rf2020/events.yml

@@ -238,6 +238,7 @@
 
     In sub-Saharan Africa, foreign corporations are vigorously irrigating vast rural areas for agro-industrial purposes, displacing local smallholders from their land to secure stable supplies for the rest of the western world. Since the global food crisis of 2007-2008, there has been an exponential growth in large-scale land acquisition in Africa. Western, Chinese, and Middle Eastern companies are leading a 21st-century land rush in African farmland where more than a forty million hectares are now under 99-year leases. Greenhouse colonies have become one of many architectural representations of unequal exchanges fostered by global capitalism. This workshop is based on research on the production system of Kenyan floriculture - and uses architectural language as a lens to investigate a speculative rural cooperative system for smallholder farmers. 
   participants: [14]
+  youtube-id: yaCbXWw8R7w
 
 - id : 15
   title_ : Critical thought around computational thinking
@@ -438,6 +439,7 @@
 
     How then can we imagine our relationship to technological products and processes otherwise? How can we imagine their ontological status and our entanglement with them anew?
   participants: [26]
+  peertube-id: 3111369a-698b-4f98-8c38-ef6f9deea215
 
 - id : 27
   title_ : Shock Doctrine as a Service

_data/translations.yml

@@ -27,6 +27,9 @@ participants:
 archive: 
   en: Archive
   fr: Archive
+credits: 
+  en: Credits and Gratitude
+  fr: Credits and Gratitude
 join-discord:
   en: → Join the ReclaimFutures community on Discord.
   fr: → Join the ReclaimFutures community on Discord.

_includes/embeds/peertube.html

@@ -1 +1,3 @@
-<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts allow-popups" src="https://tv.newdesigncongress.org/videos/embed/{{ include.id }}" frameborder="0" allowfullscreen></iframe>
+<div class='embed-container'>
+  <iframe width="560" height="315" sandbox="allow-scripts allow-popups" class="peertube-embed" src="https://tv.newdesigncongress.org/videos/embed/{{ include.id }}" frameborder="0" allowfullscreen></iframe>
+</div>

_includes/embeds/youtube.html

@@ -1 +1,3 @@
-<style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }</style><div class='embed-container'><iframe src='https://www.youtube.com/embed/{{ include.slug }}' frameborder='0' allowfullscreen></iframe></div>
+<div class='embed-container'>
+  <iframe src='https://www.youtube.com/embed/{{ include.slug }}' frameborder='0' allowfullscreen></iframe>
+</div>

_layouts/event.html

@@ -5,6 +5,7 @@ parentEn: /rf2020/archive
 parentFr: /fr/rf2020/archive
 parentNameEn: rf2020/archive
 parentNameFr: rf2020/archive
+className: event
 ---
 
 {% assign format=page.format | downcase %}
@@ -22,11 +23,17 @@ parentNameFr: rf2020/archive
     {% endif %}
 {% endcapture %}
 
-
+{% capture post-class %}
+  {% if page.peertube-id or page.youtube-id %}
+    post-item
+  {% else %}
+    post-item content
+  {% endif %}
+{% endcapture %}
 
 
 <article class="page-content margin-64-bottom event">
-  <div class="content post-item">
+  <div class="{{ post-class }}">
     <header class="post-header flex flex-align-end">
       <div class="flex flex-col">
         <h2>
@@ -40,9 +47,9 @@ parentNameFr: rf2020/archive
     </header>
 
     <div class="flex flex-row flex-justify-space-between flex-wrap-m margin-16-bottom">
-      <div class="textbox margin-16-bottom-m flex-1 hosts">
+      <div class="textbox margin-16-bottom-m hosts">
         <h3>
-          Hosting this {{ format }}:
+          By:
         </h3>
         {% for id in page.participants %}
           {% for participant in site.data.rf2020.participants %}
@@ -53,26 +60,23 @@ parentNameFr: rf2020/archive
         {% endfor %}
       </div>
       {% if time and time != '00:00' %}
-        <div class="textbox">
+        <div class="textbox date-box">
-          <h3 class="text-right">{{ date }}</h3>
+          <h3 class="text-right">Broadcast on:</h3>
-          <h3 class="margin-0 text-right">
+          <p class="text-right margin-0">{{ date }}</p>
-            {{ time }}
-            {% if endTime %}
-              → {{ endTime }}
-            {% endif %}
-            <small class="sup">(CEST)</small> 
-          </h3>
         </div>
       {% endif %}
     </div>
 
+    {% if page.peertube-id %}
+      {% include embeds/peertube.html id=page.peertube-id %}
+    {% elsif page.youtube-id %}
+      {% include embeds/youtube.html slug=page.youtube-id %}
+    {% endif %}
+
     <div class="post-content margin-16-bottom">
       {% if page.youtube %}
         {% include embeds/youtube.html slug=page.youtube %}
       {% endif %}
-      {% if page.event-link %}
-        <strong><a href="{{ page.event-link }}">click here</a> to join us on for a play-along and Q&A with the artist on {{ date }} at {{ time }} -> {{ endTime }}.</strong>
-      {% endif %}
       <p>
         {{ page.description | markdownify }}
       </p>
@@ -80,7 +84,6 @@ parentNameFr: rf2020/archive
         <a class="block with-url-arrow" href="{{ link }}">{{ link | remove_first: "https://" | remove_first: "http://" | remove_first: "www." }}</a>
       {% endfor %}
     </div>
-    {{ regLink }}
   </div>
 
 

_layouts/page.html

@@ -18,4 +18,3 @@ layout: default
 </span>
 
 {% include common/footer.html %}
-<!-- {% include common/banner.html %} -->

_sass/includes/embed-container.scss

@@ -0,0 +1,17 @@
+.embed-container {
+  position: relative;
+  padding-bottom: 56.25%;
+  height: 0;
+  overflow: hidden;
+  max-width: 100%;
+  margin-bottom: var(--size-16);
+}
+.embed-container iframe,
+.embed-container object,
+.embed-container embed {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}

_sass/includes/header.scss

@@ -78,7 +78,7 @@ header.page-header {
 
   h1.logo {
     font-family: var(--font-logo);
-    margin: var(--size-128) 0;
+    margin: var(--size-128) 0 var(--size-64) 0;
     color: var(--colour-text, var(--colour-graphite));
     display: inline-block;
     filter: drop-shadow(0px 0px 8px var(--colour-grey-light));

_sass/pages/event.scss

@@ -0,0 +1,7 @@
+#page-event {
+  .date-box {
+    p {
+      line-height: 1;
+    }
+  }
+}

_sass/pages/home.scss

@@ -3,6 +3,10 @@
     margin-bottom: var(--size-32);
   }
 
+  h1.logo {
+    margin: var(--size-128) 0;
+  }
+
   h2,
   h3 {
     @include textbox;

assets/css/index.scss

@@ -28,6 +28,7 @@
 @import 'includes/clock';
 @import 'includes/archive';
 @import 'includes/donors-list';
+@import 'includes/embed-container';
 @import 'pages/home';
 @import 'pages/about';
 @import 'pages/how-to-participate';
@@ -36,3 +37,4 @@
 @import 'pages/gallery';
 @import 'pages/watch';
 @import 'pages/credits';
+@import 'pages/event';

assets/js/index.js

@@ -4439,7 +4439,7 @@ var parent = module.bundle.parent;
 if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
   var hostname = "" || location.hostname;
   var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
-  var ws = new WebSocket(protocol + '://' + hostname + ':' + "61615" + '/');
+  var ws = new WebSocket(protocol + '://' + hostname + ':' + "57179" + '/');
 
   ws.onmessage = function (event) {
     checkedAssets = {};

package.json

@@ -10,8 +10,8 @@
     "start-parcel": "parcel src/index.js -d assets/js",
     "build-jekyll": "JEKYLL_ENV=production jekyll build",
     "build-parcel": "parcel build src/index.js -d ./_site/assets/js",
-    "deploy-dev": "npm run build && rsync -a -e 'ssh -p 7833' ./_site/* amemasu@185.203.114.165:/var/www/dev.reclaimfutures.org",
+    "deploy-dev": "npm run build && rsync -a -e 'ssh -p 7833' ./_site/* amemasu@185.203.114.165:/var/www/dev.reclaimfutures.org && open https://dev.reclaimfutures.org/",
-    "deploy-prod": "npm run build && rsync -a -e 'ssh -p 7833' ./_site/* amemasu@185.203.114.165:/var/www/reclaimfutures.org"
+    "deploy-prod": "npm run build && rsync -a -e 'ssh -p 7833' ./_site/* amemasu@185.203.114.165:/var/www/reclaimfutures.org && open https://reclaimfutures.org/"
   },
   "author": "",
   "license": "ISC",

rf2020/credits/index.md

@@ -1,14 +1,14 @@
 ---
 layout: text-page
 author: ReclaimFutures
-title: Credits & Thanks
+title: Credits & Gratitude
 className: credits
 ref: credits
 lang: en
 
 ---
 <div>
-  <h2>Credits & Thanks</h2>
+  <h2>{{ page.title }}</h2>
 </div>
 
 ReclaimFutures 2020 would not have been possible without community effort, financial donations and ___ for which we are extremely grateful.

rf2020/index.html

@@ -22,5 +22,6 @@ className: rf2020
   <div class="rf2020-nav content">
     <a class="textbox uppercase" href="/rf2020/archive">{{ site.data.translations.archive[page.lang] }}</a>
     <a class="textbox uppercase" href="/rf2020/participants/">{{ site.data.translations.participants[page.lang] }}</a>
+    <a class="textbox uppercase" href="/rf2020/credits/">{{ site.data.translations.credits[page.lang] }}</a>
   </div>
 </article>