feat: CI/CD setup

.drone.yml

@@ -1,17 +1,18 @@
 ---
 kind: pipeline
-name: deploy beta.lumbung.space
+name: continuous deployment
 steps:
-  - name: bundle static
+  - name: build image
     image: plugins/docker
     settings:
-      username: decentral1se
+      username:
+        from_secret: docker_reg_username
       password:
         from_secret: docker_reg_passwd
       repo: decentral1se/beta.lumbung.space
       tags: latest
 
-  - name: deployment
+  - name: deploy stack
     image: decentral1se/stack-ssh-deploy:latest
     settings:
       stack: beta_lumbung_space
@@ -21,3 +22,6 @@ steps:
 trigger:
   branch:
     - main
+  event:
+    exclude:
+      - pull_request

.gitignore

@@ -1,3 +1,5 @@
+*.lock
 .env
-/public/
+.venv/
 /content/
+/public/

Dockerfile

@@ -1,11 +0,0 @@
-FROM klakegg/hugo:alpine
-
-RUN apk add --no-cache curl git
-
-EXPOSE 1313
-
-COPY . /src/
-
-ENTRYPOINT ["/bin/bash"]
-
-CMD ["-c", "hugo server --appendPort='false' --bind 0.0.0.0 --baseUrl='https://beta.lumbung.space' --port='1313' -F"]

Dockerfile.hugo

@@ -0,0 +1,7 @@
+FROM klakegg/hugo:alpine
+
+RUN apk add --no-cache curl git
+
+EXPOSE 1313
+
+COPY . /src/

README.md

@@ -1,5 +1,7 @@
 # living room
 
+[![Build Status](https://drone.autonomic.zone/api/badges/ruangrupa/living-room/status.svg?ref=refs/heads/main)](https://drone.autonomic.zone/ruangrupa/living-room)
+
 > 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
@@ -11,10 +13,12 @@
 
 ### Generate the site
 
-`hugo serve`
+`hugo serve --watch`
 
 ### Generate `lumbung[dot]space` posts
 
+Do this manually first:
+
 ```
 mkdir -p content
 python3 -m venv .venv && source .venv/bin/activate
@@ -27,3 +31,5 @@ lumbunglib-cal
 export OUTPUT_DIR=content/video
 lumbunglib-vid
 ```
+
+Afterwards, you can automatically run it with `make gen`.

compose.yml

@@ -14,6 +14,14 @@ services:
       start_period: 15s
     volumes:
       - content:/src/content
+    command: |
+      server
+      --appendPort='false'
+      --bind 0.0.0.0
+      --baseUrl='https://beta.lumbung.space'
+      --port='1313'
+      --buildFuture
+      --watch
     deploy:
       update_config:
         failure_action: rollback

makefile

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

themes/lumbung-theme/README.md

@@ -1,18 +0,0 @@
-# lumbung-theme
-
-A Hugo theme for lumbung.space
-
-### Installation
-
-`cd /my/hugosite/themes`
-`git clone https://git.vvvvvvaria.org/rra/lumbung-theme`
-
-edit `/my/hugosite/config.toml`:
-
-```
-cat config.toml 
-baseURL = "http://localhost/"
-languageCode = "en-us"
-title = "lumbung.space"
-theme = 'lumbung-theme'
-```

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

@@ -42,84 +42,83 @@ body {
   color: maroon;
 }
 
-  a {
+a {
-    color: #1B4C8A;
+  color: #1B4C8A;
-  }
+}
 
 * {
   box-sizing: border-box;
 }
 
 #content {
-      margin: 2em auto;
+  margin: 2em auto;
-      max-width: 80%;
+  max-width: 80%;
-      margin-bottom: 0;
+  margin-bottom: 0;
-    }
+}
 
-.card{
+.card {
+  border: 2px solid var(--border-color);
+  box-shadow:1em 1em 0 #d2d1c8;
+  background-color: #fff09d;
+  max-width: 600px;
+  margin-bottom: 2em;
+  flex: auto;
+  margin:  0 3em 3em 0;
+  align-self: start;
   
-        border: 2px solid var(--border-color);
+}
-        box-shadow:1em 1em 0 #d2d1c8;
-        background-color: #fff09d;
-        max-width: 600px;
-        margin-bottom: 2em;
-        flex: auto;
-        margin:  0 3em 3em 0;
-        align-self: start;
 
-      }
+.card {
+  background-color: peachpuff;
+}
 
-  .card{
+.side-bar {
-    background-color: peachpuff;
+  border: 2px solid var(--border-color);
-  }
+  max-width: 400px;
-
+}
-  .side-bar {
-    border: 2px solid var(--border-color);
-    max-width: 400px;
-  }
 
 
-  .card:nth-child(even){
+.card:nth-child(even) {
-    transform: rotate(-1deg);
+  transform: rotate(-1deg);
-  }
+}
 
-  .card:nth-child(odd){
+.card:nth-child(odd) {
-    transform: rotate(1deg);
+  transform: rotate(1deg);
-  }
+}
 
-  .card:nth-child(5){
+.card:nth-child(5) {
-    transform: rotate(2deg);
+  transform: rotate(2deg);
-  }
+}
 
 
-  .video.box{
+.video.box {
-    margin-top:3em;
+  margin-top:3em;
-  }
+}
 
-  .bar{
+.bar {
-        border: 2px solid var(--border-color);
+  border: 2px solid var(--border-color);
-        box-shadow: 0.6em 0.6em 0 #d2d1c8;
+  box-shadow: 0.6em 0.6em 0 #d2d1c8;
-        margin-bottom: 2em;
+  margin-bottom: 2em;
-        margin-top:3em;
+  margin-top:3em;
-        display: inline-block;
+  display: inline-block;
-        background-color: #fff09d;
+  background-color: #fff09d;
-      }
+}
 
-.h-feed{
+.h-feed {
   display: flex;
   flex-flow: row wrap;
   width: 100%;
   
 }
 
-.entries{
+.entries {
   padding-top: 10%;
 }
 
 
 /* base header & menu */
 
-#top-menu{
+#top-menu {
   position: fixed;
   left: 5%;
   transform: translate(-50%);
@@ -156,7 +155,7 @@ body {
   
 }
 
-.menu ul{
+.menu ul {
   list-style-type: none;
   margin: 0;
   padding: 0;
@@ -176,7 +175,7 @@ body {
   justify-content: space-between;
 }
 
-.h-entry header h2{
+.h-entry header h2 {
   padding: 0.2em;
   margin: 0;
   padding-right: 0.3em;
@@ -185,9 +184,9 @@ body {
   flex-grow: 1;
 }
 
-.h-entry header h2:hover{
+.h-entry header h2:hover {
-    box-shadow: inset 4px 4px 0px tomato;
+  box-shadow: inset 4px 4px 0px tomato;
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .h-entry header h2 a {
@@ -196,7 +195,7 @@ body {
 }
 
 
-.h-entry header .header-metadata{
+.h-entry header .header-metadata {
   margin: 0;
   display: flex;
   flex-flow: column wrap;
@@ -232,9 +231,9 @@ body {
 }
 
 .summary-image > img {
-/*    height: 100%;
+  /*    height: 100%;
-    object-fit: cover;
+  object-fit: cover;
-    max-width: 100%;*/
+  max-width: 100%;*/
   
 }
 
@@ -242,7 +241,7 @@ body {
   display: flex;
 }
 
-.summary-image{
+.summary-image {
   border-right: 2px solid var(--border-color);
 }
 
@@ -255,6 +254,7 @@ footer.post-footer {
   border-top:  2px solid var(--border-color);
   flex-grow: 1;
 }
+
 .read-more {
   border-top: 2px solid var(--border-color);
   border-left: 2px solid var(--border-color);
@@ -265,18 +265,17 @@ footer.post-footer {
 
 /* network cards */
 
-.card.network{
+.card.network {
-
+  border: 2px solid darkcyan;
-      border: 2px solid darkcyan;
+  box-shadow:1em 1em 0 #d2d1c8;
-      box-shadow:1em 1em 0 #d2d1c8;
+  background-color: lightgreen;
-      background-color: lightgreen;
+  max-width: min-content;
-      max-width: min-content;
+  margin-bottom: 2em;
-      margin-bottom: 2em;
+  flex: auto;
-      flex: auto;
+  margin:  0 3em 3em 0;
-      margin:  0 3em 3em 0;
+  align-self: start;
-      align-self: start;
+  color: darkcyan;
-      color: darkcyan;
+}
-    }
 
 .h-entry.network header {
   display: flex;
@@ -284,15 +283,15 @@ footer.post-footer {
   flex-direction: row-reverse;
 }
 
-.h-entry.network header h2{
+.h-entry.network header h2 {
   padding: 0.2em 0.5em 0.2em 0.5em;
   margin: 0;
   border: none;
 }
 
-.h-entry.network header h2:hover{
+.h-entry.network header h2:hover {
-    box-shadow: inset 4px 4px 0px darkcyan;
+  box-shadow: inset 4px 4px 0px darkcyan;
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .h-entry.network header h2 a {
@@ -344,7 +343,7 @@ footer.post-footer {
   font-size: 18px;
 }
 
-div.network-source{
+div.network-source {
   padding: 0.5em 1em 0.5em 1em;
   border-bottom: 2px solid darkcyan;
   font-size: 14px;
@@ -357,12 +356,12 @@ div.network-source{
   color: darkcyan;
 }
 
-.network .footer-filler{
+.network .footer-filler {
   border-left: 2px solid darkcyan;
   border-top: none;
 }
 
-.network footer.post-footer{
+.network footer.post-footer {
   border-top: 2px solid darkcyan;
   flex-flow: row;
   font-size: 0.9rem;
@@ -380,31 +379,31 @@ div.network-source{
 
 /* shouts cards */
 
-.card.shout{
+.card.shout {
-      border-color: steelblue;
+  border-color: steelblue;
-      border: 2px solid;
+  border: 2px solid;
-      box-shadow:1em 1em 0 #d2d1c8;
+  box-shadow:1em 1em 0 #d2d1c8;
-      background-color: aliceblue;
+  background-color: aliceblue;
-      max-width: min-content;
+  max-width: min-content;
-      margin-bottom: 2em;
+  margin-bottom: 2em;
-      flex: auto;
+  flex: auto;
-      margin:  0 3em 3em 0;
+  margin:  0 3em 3em 0;
-      align-self: start;
+  align-self: start;
-      color: steelblue;
+  color: steelblue;
-    }
+}
 
 /* calendar cards */
 
 .card.calendar {
-      border: 2px solid cornflowerblue;
+  border: 2px solid cornflowerblue;
-      box-shadow:1em 1em 0 #d2d1c8;
+  box-shadow:1em 1em 0 #d2d1c8;
-      background-color: lightblue;
+  background-color: lightblue;
-      max-width: 360px;
+  max-width: 360px;
-      margin-bottom: 2em;
+  margin-bottom: 2em;
-      flex: auto;
+  flex: auto;
-      margin:  0 3em 3em 0;
+  margin:  0 3em 3em 0;
-      align-self: start;
+  align-self: start;
-      color: royalblue;
+  color: royalblue;
   
 }
 
@@ -421,15 +420,15 @@ div.network-source{
   border-bottom: 2px solid cornflowerblue;
 }
 
-.h-event.calendar header h2{
+.h-event.calendar header h2 {
   padding: 0.2em 0.5em 0.2em 0.5em;
   margin: 0;
   border-right: none;
 }
 
-.h-event.calendar header h2:hover{
+.h-event.calendar header h2:hover {
-    box-shadow: inset 4px 4px 0px royalblue;
+  box-shadow: inset 4px 4px 0px royalblue;
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .h-event.calendar header h2 a {
@@ -438,17 +437,17 @@ div.network-source{
 }
 
 .header-filler {
-    min-width: 10%;
+  min-width: 10%;
 }
 
-.calendar-location{
+.calendar-location {
   font-size: 0.8rem;
   min-width: 20%;
   padding: 0.5em 0.9em 0.5em 0.9em;
   border-left: 2px solid cornflowerblue;
 }
 
-.calendar-duration{
+.calendar-duration {
   font-size: 0.8rem;
   border-right: 2px solid cornflowerblue;
   padding: 0.5em 0.9em 0.5em 0.9em;
@@ -499,13 +498,13 @@ div.network-source{
 }
 
 input + label +.calendar-location+.description{
-    display: none;
+  display: none;
-  }
+}
 
 input:checked + label +.calendar-location+.description {
-    display: block;
+  display: block;
-    transition: ease .5s;
+  transition: ease .5s;
-  }
+}
 
 .metadata label {
   text-align: center;
@@ -521,7 +520,7 @@ label:hover {
   box-shadow: inset 2px 2px 0px #95948c;
 }
 
-.description{
+.description {
   padding: 0.5em 0.7em 0.7em 0.5em;
   overflow: hidden;
   flex-basis: 100%;
@@ -535,59 +534,58 @@ label:hover {
 
 /* Paginator */
 
-nav.pagination{
+nav.pagination {
   width: 60%;
   margin: auto;
   margin-top: 2em;
   margin-bottom: 2em;
 }
 
-ul.pagination{
+ul.pagination {
   display: flex;
   justify-content: space-evenly; /* align horizontal */
   align-items: center; /* align vertical */
 }
 
-.page-item{
+.page-item {
   display: block;
   text-align: center;
-  vertical-align: middle;
   font-size: 38px;
   border: 2px solid #1B4C8A;
   box-shadow:0.4em 0.4em 0 #d2d1c8;
   
 }
 
-li.page-item{
+li.page-item {
   background-color: lightblue;
   padding: 0.4em;
 }
 
-li.page-item.active{
+li.page-item.active {
   background-color: peachpuff;
   border: 2px solid tomato;
   padding: 0.4em;
 }
 
-li.page-item.disabled{
+li.page-item.disabled {
   display: none;
 }
 
-  li.page-item:nth-child(even){
+li.page-item:nth-child(even) {
-    transform: rotate(-1deg);
+  transform: rotate(-1deg);
-  }
+}
 
-  li.page-item:nth-child(odd){
+li.page-item:nth-child(odd) {
-    transform: rotate(1deg);
+  transform: rotate(1deg);
-  }
+}
 
-  li.page-item:nth-child(5){
+li.page-item:nth-child(5) {
-    transform: rotate(2deg);
+  transform: rotate(2deg); 
-  }
+}
 
-  li.page-item:nth-child(8){
+li.page-item:nth-child(8) {
-    transform: rotate(-3deg);
+  transform: rotate(-3deg);
-  }
+}
 
 
 

themes/lumbung-theme/static/css/video-box.css

@@ -2,121 +2,121 @@
   --video-border-color: burlywood;
   --video-background-color: antiquewhite;
 }
-  .video-box {
+.video-box {
-      border:2px solid var(--video-border-color);
+  border:2px solid var(--video-border-color);
-      max-width:560px;
+  max-width:560px;
-      margin:auto;
+  margin:auto;
-      box-shadow:1em 1em 0 #d2d1c8;
+  box-shadow:1em 1em 0 #d2d1c8;
-      margin-bottom: 2em;
+  margin-bottom: 2em;
-      color: chocolate;
+  color: chocolate;
-    }
-
-  .video-box:nth-child(even){
-    transform: rotate(-1deg);
-  }
-
-  .video-box:nth-child(odd){
-    transform: rotate(1deg);
-  }
-
-  .video-box:nth-child(5){
-    transform: rotate(3deg);
-  }
-
-
-  .video-box img {
-    max-width: 100%;
-  }
-
-  .video-box iframe {
-    max-width: 100%;
 }
 
-  .video-box .media {
+.video-box:nth-child(even){
-    line-height: 0;
+  transform: rotate(-1deg);
-  }
+}
 
-  .video {
+.video-box:nth-child(odd){
-    background-color: var(--video-background-color);
+  transform: rotate(1deg);
-  }
+}
 
-  .video .metadata{
+.video-box:nth-child(5){
-    font-size:0.9rem;
+  transform: rotate(3deg);
-    justify-content: space-between;
+}
-    flex-wrap: wrap;
-  }
 
-  .metadata .title{
-    margin-top:0;
-    border-top: 2px solid var(--video-border-color);
-    border-bottom: 2px solid var(--video-border-color);
-    padding:0.5em;
-    font-weight:700;
-    font-size:1.3rem;
-    flex-basis: 100%;
-  }
 
-  .video.channel{
+.video-box img {
-    border-right: 2px solid var(--video-border-color);
+  max-width: 100%;
-    padding: 0.5em 0.9em 0.5em 0.9em;
+}
-    font-size: 0.8rem;
-  }
 
-  .video.date {
+.video-box iframe {
-    float:right;
+  max-width: 100%;
-    border-left: 2px solid var(--video-border-color);
+}
-    padding: 0.5em 0.9em 0.5em 0.9em;
-    font-size: 0.8rem;
-  }
 
-  .video.description {
+.video-box .media {
-    border-top: 2px solid var(--video-border-color);
+  line-height: 0;
-    padding: 0.8em 0.8em 0.8em 0.8em;
+}
 
-  }
+.video {
-  .descr_button a {
+  background-color: var(--video-background-color);
-    color:inherit;
+}
-    text-decoration: inherit;
-  }
 
-  input.descr_button {
+.video .metadata{
-    display: none;
+  font-size:0.9rem;
-  }
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
 
-  input + label + .video.date + .description{
+.metadata .title{
-    display: none;
+  margin-top:0;
-  }
+  border-top: 2px solid var(--video-border-color);
+  border-bottom: 2px solid var(--video-border-color);
+  padding:0.5em;
+  font-weight:700;
+  font-size:1.3rem;
+  flex-basis: 100%;
+}
 
-  input:checked + label + .video.date +.description {
+.video.channel{
-    display: block;
+  border-right: 2px solid var(--video-border-color);
-  }
+  padding: 0.5em 0.9em 0.5em 0.9em;
+  font-size: 0.8rem;
+}
 
-  .play-icon {
+.video.date {
-      width: 0;
+  float:right;
-      height: 0;
+  border-left: 2px solid var(--video-border-color);
-      position: absolute;
+  padding: 0.5em 0.9em 0.5em 0.9em;
-      left: 50%;
+  font-size: 0.8rem;
-      top: 50%;
+}
-      transform: translate(-50%,-50%) scale(.5);
-      border-top: 13px solid transparent;
-      border-bottom: 13px solid transparent;
-      border-left: 18px solid hsla(0,0%,100%,.95);
-  }
 
-  .video-thumbnail {
+.video.description {
-    position: absolute;
+  border-top: 2px solid var(--video-border-color);
-    width: 100%;
+  padding: 0.8em 0.8em 0.8em 0.8em;
-    height: 100%;
+  
-    top: 0;
+}
-  }
+.descr_button a {
-    .video-thumbnail {
+  color:inherit;
-    display: flex;
+  text-decoration: inherit;
-    flex-direction: column;
+}
-    position: relative;
+
-    overflow: hidden;
+input.descr_button {
-    background-color: #ececec;
+  display: none;
-    transition: filter .2s ease;
+}
-  }
+
+input + label + .video.date + .description{
+  display: none;
+}
+
+input:checked + label + .video.date +.description {
+  display: block;
+}
+
+.play-icon {
+  width: 0;
+  height: 0;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%) scale(.5);
+  border-top: 13px solid transparent;
+  border-bottom: 13px solid transparent;
+  border-left: 18px solid hsla(0,0%,100%,.95);
+}
+
+.video-thumbnail {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+}
+.video-thumbnail {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  overflow: hidden;
+  background-color: #ececec;
+  transition: filter .2s ease;
+}
 
 .video-thumbnail-duration-overlay {
   display: inline-block;
@@ -130,26 +130,26 @@
   right: 5px;
   bottom: 5px;
   border: 2px solid var(--video-border-color);
-  }
+}
 
-  .play-overlay {
+.play-overlay {
-    transition: all .2s ease;
+  transition: all .2s ease;
-    position: absolute;
+  position: absolute;
-    right: 0;
+  right: 0;
-    bottom: 0;
+  bottom: 0;
-    width: inherit;
+  width: inherit;
-    height: inherit;
+  height: inherit;
-    opacity: 0;
+  opacity: 0;
-    background-color: rgba(0,0,0,.3);
+  background-color: rgba(0,0,0,.3);
-    cursor: pointer;
+  cursor: pointer;
-  }
+}
 
 .video-thumbnail:hover {
-  text-decoration:none!important
+  text-decoration:none !important;
 }
 .video-thumbnail:hover .play-overlay {
-opacity:1
+  opacity: 1;
 }
 .video-thumbnail:hover .play-overlay .play-icon {
-transform:translate(-50%,-50%) scale(1)
+  transform:translate(-50%,-50%) scale(1);
 }

themes/lumbung-theme/theme.toml

@@ -1,6 +1,3 @@
-# theme.toml template for a Hugo theme
-# See https://github.com/gohugoio/hugoThemes#themetoml for an example
-
 name = "Lumbung"
 license = "AGPL3"
 licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE"
@@ -9,12 +6,9 @@ homepage = "http://example.com/"
 tags = []
 features = []
 min_version = "0.41.0"
-
 [author]
   name = ""
   homepage = ""
-
-# If porting an existing theme
 [original]
   name = ""
   homepage = ""