Merge branch 'main' of https://git.autonomic.zone/r/lumbung.space

for some reason images with the portrait class weren't displaying.
they don't have display:none set on them. Might be caused by width of container

.gitignore

@@ -1,14 +1,15 @@
 *.lock
+.DS_Store
 .env
+.gitignore
+.todo
 .venv/
 /content/calendar/
 /content/pen/
 /content/shouts/
 /content/social/
+/content/timeline/
 /content/tv/
+/etags/
 /public/
 resources
-/etags/
-.gitignore
-.todo
-.DS_Store

Dockerfile.scripts

@@ -4,7 +4,7 @@ RUN apk add --no-cache git bash
 
 WORKDIR /src/
 
-RUN git clone https://git.autonomic.zone/ruangrupa/lumbunglib /src/
+RUN git clone https://git.autonomic.zone/ruangrupa/konfluks /src/
 
 RUN pip install -U -I setuptools pip
 

README.md

@@ -2,12 +2,11 @@
 
 [![Build Status](https://drone.autonomic.zone/api/badges/ruangrupa/lumbung.space/status.svg?ref=refs/heads/main)](https://drone.autonomic.zone/ruangrupa/lumbung.space)
 
-> A new attempt to bring together the ideas of the "splash" page, "portal" page
-> and a comfortable digital "living room" experience for lumbung[dot]space.
-> This is a work in progress. The end goal of this is to have a new design and
-> implementation for [`lumbung.space`](https://lumbung.space) for January 2022.
+![lumbung.space logo](https://lumbung.space/img/alt-lumbung-logo.jpeg)
 
-## FAQ
+> lumbung.space is an online platform by and for the lumbung-interlokal and lumbung artists. Many of the artists and collectives invited for documenta fifteen are located far away from each other, with their own contextual realities and vulnerabilities. To be able to work together over such distances, the act of documenting the process, writing together, and keeping each other informed within the network is one of the most important parts of the process of building the lumbung. This process is known as harvesting. Thus, lumbung.space was made to provide a number of tools and a collective publishing outlet for this diverse network to experiment and share the collective processes through harvests. Like a vibrant archive and a digital living room, it allows connection, support, and sharing of knowledge. Learn more on [lumbung.space](https://lumbung.sace)...
+
+## Technical FAQ
 
 ### How does the CI/CD work?
 
@@ -50,26 +49,26 @@ Do this manually first:
 ```
 mkdir -p content
 python3 -m venv .venv && source .venv/bin/activate
-pip install git+https://git.autonomic.zone/ruangrupa/lumbunglib
+pip install git+https://git.autonomic.zone/ruangrupa/konfluks
 
 export CALENDAR_URL="https://cloud.lumbung.space/remote.php/dav/public-calendars/WbnHM8YdCkKT6bcT?export"
 export OUTPUT_DIR=content/calendar
-lumbunglib-cal
+konfluks-cal
 
 export OUTPUT_DIR=content/tv
-lumbunglib-vid
+konfluks-vid
 
 export OUTPUT_DIR=content/shouts
-lumbunglib-feed  # reads ./feeds_list.txt
+konfluks-feed  # reads ./feeds_list.txt
 
 export OUTPUT_DIR=content/social
 export MASTODON_AUTH_TOKEN=foobar
-lumbunglib-hash
+konfluks-hash
 ```
 
 Afterwards, you can automatically run it with `make gen`.
 
-After a `git pull`, you may need to run `pip install git+https://git.autonomic.zone/ruangrupa/lumbunglib` again.
+After a `git pull`, you may need to run `pip install git+https://git.autonomic.zone/ruangrupa/konfluks` again.
 
 ### Manually deploying new images
 

compose.yml

@@ -30,7 +30,7 @@ services:
         order: start-first
       labels:
         - "traefik.enable=true"
-        - "traefik.http.routers.coop-cloud-site.rule=Host(`lumbung.space`)"
+        - "traefik.http.routers.coop-cloud-site.rule=Host(`lumbung.space`, `www.lumbung.space`)"
         - "traefik.http.routers.coop-cloud-site.entrypoints=web-secure"
         - "traefik.http.services.coop-cloud-site.loadbalancer.server.port=1313"
         - "traefik.http.routers.coop-cloud-site.tls.certresolver=production"
@@ -46,7 +46,7 @@ services:
         while true
         do
           echo 'generating tv posts...'
-          /usr/local/bin/lumbunglib-vid
+          /usr/local/bin/konfluks-vid
           sleep 300
         done
       "
@@ -63,7 +63,7 @@ services:
         while true
         do
           echo 'generating calendar posts...'
-          /usr/local/bin/lumbunglib-cal
+          /usr/local/bin/konfluks-cal
           sleep 400
         done
       "
@@ -82,7 +82,7 @@ services:
         while true
         do
           echo 'generating shouts posts...'
-          /usr/local/bin/lumbunglib-feed
+          /usr/local/bin/konfluks-feed
           sleep 500
         done
       "
@@ -101,7 +101,7 @@ services:
         while true
         do
           echo 'generating pen posts...'
-          /usr/local/bin/lumbunglib-feed
+          /usr/local/bin/konfluks-feed
           sleep 600
         done
       "
@@ -120,11 +120,30 @@ services:
         while true
         do
           echo 'generating social posts...'
-          /usr/local/bin/lumbunglib-hash
+          /usr/local/bin/konfluks-hash
           sleep 700
         done
       "
 
+  timeline:
+    image: decentral1se/beta.lumbung.space-scripts:latest
+    volumes:
+      - content:/src/content/
+    configs:
+      - source: feeds_list_timeline
+        target: /src/feeds_list_timeline.txt
+    environment:
+      OUTPUT_DIR: /src/content/timeline
+    command: |
+      bash -c "
+        while true
+        do
+          echo 'generating timeline...'
+          /usr/local/bin/konfluks-timeline
+          sleep 500
+        done
+      "
+
 volumes:
   content:
 
@@ -134,11 +153,14 @@ networks:
 
 configs:
   feeds_list:
-    name: beta_lumbung_space_feeds_list_v2
+    name: beta_lumbung_space_feeds_list_v4
     file: feeds_list.txt
   feeds_list_pen:
-    name: beta_lumbung_space_feeds_list_pen_v1
+    name: beta_lumbung_space_feeds_list_pen_v2
     file: feeds_list_pen.txt
+  feeds_list_timeline:
+    name: beta_lumbung_space_feeds_list_timeline_v2
+    file: feeds_list_timeline.txt
 
 secrets:
   masto_key:

config.toml

@@ -7,7 +7,7 @@ pluralizeListTitles = "false"
 [params]
     logo = "/img/logo.svg"
     favicon = "/img/favicon.ico"
-    description = 'a digital living room for artists'
+    description = 'a digital living room for the lumbung ekosistem'
     images = ['/img/logo.png']
     title = 'lumbung dot space'
 

feeds_list.txt

@@ -8,7 +8,7 @@ https://gudskul.art/feed/
 https://inland.org/feed/
 https://jatiwangiartfactory.tumblr.com/rss/
 https://projectartworks.org/feed/
-https://wajukuuarts.wordpress.com/feed/
-https://www.masartemasaccion.org/feed/
 https://ruangrupa.id/feed/
-https://www.ruralschoolofeconomics.info/rss.xml
+https://wajukuuarts.wordpress.com/feed/
+https://www.masartemasaccion.org/feed/?lang=en
+https://www.ruralschoolofeconomics.info/rss.xml

feeds_list_timeline.txt

@@ -0,0 +1 @@
+https://pen.lumbung.space/feed/?post_type=timeline

makefile

@@ -3,13 +3,6 @@ DEFAULT: serve
 serve:
 	@hugo serve --watch
 
-gen:
-	@CALENDAR_URL="https://cloud.lumbung.space/remote.php/dav/public-calendars/WbnHM8YdCkKT6bcT?export"; \
-	OUTPUT_DIR=content/calendar; \
-	lumbunglib-cal && \
-	OUTPUT_DIR=content/tv lumbunglib-vid && \
-	OUTPUT_DIR=content/shouts lumbunglib-feed
-
 push-hugo:
 	@docker build -t decentral1se/beta.lumbung.space -f Dockerfile.hugo . && \
 		docker push decentral1se/beta.lumbung.space

themes/lumbung-theme/layouts/_default/baseof.html

@@ -44,7 +44,7 @@
         // add classes for styling lumbung kios and lumbung gallery cards
         let cards = document.querySelectorAll('.shout.card');
         [...cards].forEach(card => {
-            if (card.querySelector('a[href="/tags/lumbungkios"]')) {
+            if (card.querySelector('a[href="/tags/lumbungkios"]') || card.querySelector('a[href="/tags/lumbungkiosproducts"]')) {
                 card.classList.add('lumbung-kios')
             } else if (card.querySelector('a[href="/tags/lumbunggallery"]')) {
                 card.classList.add('lumbung-gallery')

themes/lumbung-theme/layouts/index.html

@@ -32,6 +32,7 @@
           <path d="M7 4V20L20 12L7 4Z" fill="#CA14D4" stroke="#CA14D4" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
         </svg>
         <span>lumbung radio</span>
+        <img src="/img/lumbung-radio-logo.png" alt="" height="30">
       </div>
   </main>
 {{ end }}

themes/lumbung-theme/layouts/partials/header.html

@@ -34,7 +34,7 @@
             <li><a href="/shouts/">shouts</a></li>
             <li class="has-submenu">ekonomi
                 <ul class="submenu">
-                    <li><a href="/tags/lumbungkios/">kios</a></li>
+                    <li><a href="/tags/lumbungkiosproducts/">kios</a></li>
                     <li><a href="/tags/lumbunggallery/">gallery</a></li>
                 </ul>
             </li>
@@ -59,7 +59,7 @@
             <li><a href="/shouts/">shouts</a></li>
             <li class="has-submenu">ekonomi
                 <ul class="submenu">
-                    <li><a href="/tags/lumbungkios/">kios</a></li>
+                    <li><a href="/tags/lumbungkiosproducts/">kios</a></li>
                     <li><a href="/tags/lumbunggallery/">gallery</a></li>
                 </ul>
             </li>

themes/lumbung-theme/static/css/main.css

@@ -352,10 +352,10 @@ body > iframe {
     width: 100%;
 }
 
-.portrait .h-entry img {
+/* .portrait .h-entry img {
     max-width: unset;
     width: unset;
-}
+} */
 
 .header-metadata .dt-published {
     padding: 0.5em 1.2em 0.5em 1.2em;
@@ -391,6 +391,7 @@ body > iframe {
 footer.post-footer {
     display: flex;
     flex-flow: row-reverse;
+    padding: 0.5em 1em;
 }
 
 .footer-filler {
@@ -466,7 +467,7 @@ footer.post-footer {
 }
 
 .network .p-summary.portrait {
-    flex-direction: row;
+    /* flex-direction: row; */
 }
 
 .network .p-summary.landscape {
@@ -600,7 +601,11 @@ div.network-source {
 }
 
 .pen .p-summary.portrait {
-    flex-direction: row;
+    /* flex-direction: row; */
+    /* 
+     * for some reason images on specific posts aren't appearing with the portrait class
+     */
+    flex-direction: column;
 }
 
 .pen .p-summary.landscape {
@@ -736,7 +741,7 @@ div.pen-source {
     border-top: 2px solid;
 }
 
-.card.shout.lumbung-kios .post-footer {
+.card.shout.lumbung-kios .post-footer a {
     background: none;
     color: var(--kios-dark);
 }
@@ -1305,6 +1310,7 @@ a.timeline-url {
 /* PopUp */
 .popup-container {
     position: fixed;
+    z-index: 999;
     top: 0;
     bottom: 0;
     left: 0;
@@ -1505,6 +1511,15 @@ a.timeline-url {
 
 .single .h-entry img {
     object-fit: contain;
+    height: auto;
+}
+
+.single .h-entry figure{
+    margin: 0 0 20px;
+}
+
+.single .h-entry figure figure{
+    margin: 0;
 }
 
 /* lumbung radio player widget  */
@@ -1772,4 +1787,4 @@ a.timeline-url {
     .menu ul:first-child {
         padding: 0;
     }
-}
+}

themes/lumbung-theme/static/img/timeline-body.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 26.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 338.2 3095.4" style="enable-background:new 0 0 338.2 3095.4;" xml:space="preserve">
+	 viewBox="0 0 338.2 3095.4" width="338px" height="3085px" style="enable-background:new 0 0 338.2 3095.4;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#F67D18;}
 	.st1{fill:#AB15F4;}