6 files changed, 166 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 186a58c..ac6aae3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,19 @@
-deploy:
+provision:
+        cd ~/Junk
+        git clone https://git.sr.ht/~sircmpwn/openring
+        cd openring
+        go build
+        go install
+
+build:
+        openring -n 4 -p 2 \
+                -s https://drewdevault.com/feed.xml \
+                -s https://danluu.com/atom.xml \
+                < template/openring.tmpl \
+                > template/openring-build.html
+
         alternator --build
-        cd public && scp -r * root@165.22.87.180:/var/www/html/mitjafelicijan.com/
\ No newline at end of file
+        rm template/openring-build.html
+
+deploy: build
+        cd public && scp -r * root@165.22.87.180:/var/www/html/mitjafelicijan.com/
diff --git a/openring-build.html b/openring-build.html
new file mode 100644
index 0000000..12e0589
--- /dev/null
+++ b/openring-build.html
@@ -0,0 +1,52 @@
+<section class="webring">
+  <h3>Articles from blogs I follow around the net</h3>
+  <section class="articles">
+    
+    <div class="article">
+      <h4 class="title">
+        <a href="https://drewdevault.com/2021/01/20/FOSS-is-to-surrender-your-monopoly.html" target="_blank" rel="noopener">Open source means surrendering your monopoly over commercial exploitation</a>
+      </h4>
+      <p class="summary">Participation in open source requires you to surrender your monopoly over
+commercial exploitation. This is a profound point about free and open source
+software which seems to be causing a lot of companies to struggle with their
+understanding of the philosoph…</p>
+      <small class="source">
+        via <a href="https://drewdevault.com">Drew DeVault&#39;s blog</a>
+      </small>
+      <small class="date">January 20, 2021</small>
+    </div>
+    
+  </section>
+  <p class="attribution">
+    Generated by
+    <a href="https://git.sr.ht/~sircmpwn/openring">openring</a>
+  </p>
+</section>
+<style>
+.webring .articles {
+  display: flex;
+  flex-wrap: wrap;
+  margin: -0.5rem;
+}
+.webring .title {
+  margin: 0;
+}
+.webring .article {
+  flex: 1 1 0;
+  display: flex;
+  flex-direction: column;
+  margin: 0.5rem;
+  padding: 0.5rem;
+  background: #eee;
+  min-width: 10rem;
+}
+.webring .summary {
+  font-size: 0.8rem;
+  flex: 1 1 0;
+}
+.webring .attribution {
+  text-align: right;
+  font-size: 0.8rem;
+  color: #555;
+}
+</style>
diff --git a/template/index.html b/template/index.html
index 7727f3b..a566d95 100755
--- a/template/index.html
+++ b/template/index.html
@@ -21,20 +21,23 @@
 
         <ul class="post-list">
           {{range $index, $post := .Posts}}
-          <li>
-            <time>{{.CreatedFormatted}}</time>
-
-            <a href="/{{$post.Slug}}" title="{{$post.Title}}" itemprop="url">
-              <h2>{{$post.Title}}</h2>
-            </a>
-
-          </li>
+            {{if $post.Listing}}
+            <li>
+              <time>{{.CreatedFormatted}}</time>
+
+              <a href="/{{$post.Slug}}" title="{{$post.Title}}" itemprop="url">
+                <h2>{{$post.Title}}</h2>
+              </a>
+            </li>
+            {{end}}
           {{end}}
         </ul>
       </nav>
 
+      <hr class="top-margin">
+
       <section class="project-list">
-        <h2>Side projects</h2>
+        <h4>Side projects I work on</h4>
         <ul>
           <li><a href="https://github.com/mitjafelicijan/redis-marshal" target="_blank" rel="noopener nofollow">redis-marshal - Lightweight Redis data exploration tool</a></li>
           <li><a href="https://github.com/mitjafelicijan/dna-encoding" target="_blank" rel="noopener nofollow">dna-encoding - Tools for encoding files to DNA sequence</a></li>
@@ -44,6 +47,10 @@
           <li><a href="https://github.com/mitjafelicijan/scarecrow" target="_blank" rel="noopener nofollow">scarecrow - Minimal configuration reverse proxy</a></li>
         </ul>
       </section>
+
+      <hr class="top-margin">
+
+      {{template "openring-build.html"}}
     </main>
 
     {{template "_includes.html"}}
diff --git a/template/openring.tmpl b/template/openring.tmpl
new file mode 100644
index 0000000..43ad6a2
--- /dev/null
+++ b/template/openring.tmpl
@@ -0,0 +1,34 @@
+<section class="webring top-margin">
+  <h4>Articles from blogs I follow around the net</h3>
+  <section>
+    {{range .Articles}}
+    <article>
+      <a href="{{.Link}}" target="_blank" rel="noopener">{{.Title}}</a>
+      <p class="summary">{{.Summary}}</p>
+      <small>
+        via <a href="{{.SourceLink}}">{{.SourceTitle}}</a>
+      </small>
+      <small>{{.Date | datef "January 2, 2006"}}</small>
+    </article>
+    {{end}}
+  </section>
+  <p class="attribution">
+    Generated by
+    <a href="https://git.sr.ht/~sircmpwn/openring">openring</a>
+  </p>
+</section>
+
+<style>
+  .webring article {
+    margin-block-end: 30px;
+  }
+  .webring article:last-child {
+    margin-block-end: 10px;
+  }
+  .webring article .summary {
+    margin: 0;
+  }
+  .webring .attribution {
+    font-size: small;
+  }
+</style>
diff --git a/template/post.html b/template/post.html
index b59bb38..3247d8f 100755
--- a/template/post.html
+++ b/template/post.html
@@ -24,6 +24,35 @@
           {{.Content}}
         </div>
       </article>
+
+      {{if .Listing}}
+        <section class="top-margin">
+          <a href="mailto:m@mitjafelicijan.com">➝ Get in contact with me via email.</a>
+        </section>
+
+        <hr class="top-margin">
+
+        {{if .Posts}}
+          <nav class="top-margin">
+            <h4>Read more from this site</h4>
+            {{range $index, $post := .Posts}}
+              {{if (lt $index 5)}}
+              <p>
+                <time>{{$post.CreatedFormatted}}</time><br>
+                <a href="/{{$post.Slug}}" title="{{$post.Title}}" itemprop="url">
+                  {{$post.Title}}
+                </a>
+              </p>
+              {{end}}
+            {{end}}
+          </nav>
+        {{end}}
+
+        <hr class="top-margin">
+
+        {{template "openring-build.html"}}
+      {{end}}
+
     </main>
 
     {{template "_includes.html"}}
diff --git a/template/style.css b/template/style.css
index 5aee568..26913fb 100755
--- a/template/style.css
+++ b/template/style.css
@@ -6,7 +6,7 @@
   --link-color: #111111;
   --link-color-hover: #111111;
 
-  --label-color: #828282;
+  --label-color: #5f5f5f;
 
   --border-color: #eeeeee;
 
@@ -222,6 +222,10 @@ blockquote p {
   margin-top: 60px;
 }
 
+.top-margin-huge {
+  margin-top: 100px;
+}
+
 code {
   background: rgb(255, 241, 177);
   padding: 2px 5px;
@@ -249,6 +253,18 @@ time {
   font-size: 90%;
 }
 
+/* article */
+
+article a {
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+  -webkit-hyphens: auto;
+  -ms-hyphens: auto;
+  -moz-hyphens: auto;
+  hyphens: auto;
+}
+
+
 /* footer */
 
 .footer {