From 9c21ee7d8623ac5e17181f66c2782023e34b30ab Mon Sep 17 00:00:00 2001 From: Arne Brasseur Date: Wed, 12 Jul 2023 10:57:14 +0200 Subject: [PATCH] Fix feed, bring back logos --- blog/growing-our-team.md | 2 +- repl_sessions/.#markdown.clj | 1 + src/co/gaiwan/site/blog.clj | 39 +++++++++++++++-------- src/co/gaiwan/site/components/footer.cljc | 4 +-- src/co/gaiwan/site/data.clj | 31 ++++++++++-------- 5 files changed, 47 insertions(+), 30 deletions(-) create mode 120000 repl_sessions/.#markdown.clj diff --git a/blog/growing-our-team.md b/blog/growing-our-team.md index 0b922d7..a5de81b 100644 --- a/blog/growing-our-team.md +++ b/blog/growing-our-team.md @@ -2,7 +2,7 @@ date: 2020-11-01 title: "Growing the Gaiwan team" slug: "growing-our-team" -author: "Mitesh (@oxalorg)" +author: "Mitesh (@oxalorg@twitter.com)" --- We have some great news to share today. Our Gaiwan team has officially expanded diff --git a/repl_sessions/.#markdown.clj b/repl_sessions/.#markdown.clj new file mode 120000 index 0000000..d62dff3 --- /dev/null +++ b/repl_sessions/.#markdown.clj @@ -0,0 +1 @@ +arne@marceline.45555:1652162339 \ No newline at end of file diff --git a/src/co/gaiwan/site/blog.clj b/src/co/gaiwan/site/blog.clj index 8da3370..be71259 100644 --- a/src/co/gaiwan/site/blog.clj +++ b/src/co/gaiwan/site/blog.clj @@ -1,8 +1,10 @@ (ns co.gaiwan.site.blog - (:require [clj-rss.core :as rss] - [co.gaiwan.site.layout :as layout] - [co.gaiwan.site.md-files :as md-files] - [co.gaiwan.site.open-graph :as og])) + (:require + [clj-rss.core :as rss] + [co.gaiwan.site.layout :as layout] + [co.gaiwan.site.md-files :as md-files] + [co.gaiwan.site.open-graph :as og] + [lambdaisland.hiccup :as hiccup])) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Components @@ -65,16 +67,25 @@ (def posts (delay (md-files/slurp-dir "blog"))) (defn get-blog-rss [_] - {:status 200 - :body (apply rss/channel-xml - {:title "Gaiwan Blog" :link "https://gaiwan.co/blog" :description "The Gaiwan Blog"} - (for [{:keys [meta html]} (vals @posts) - :let [{:keys [title slug author date]} meta]] - {:title title - :link (str "https://gaiwan.co/blog/" slug) - :description html - :author author - :pubDate (.toInstant date)}))}) + (let [posts (vals @posts)] + {:status 200 + :body (rss/channel-xml + {:title "Gaiwan Blog" + :link "https://gaiwan.co/blog" + :description "The Gaiwan Blog" + :language "en-us" + :copyright (str "© " (+ 1900 (.getYear (java.util.Date.))) " Gaiwan GmbH") + :pubDate (.toInstant (last (sort (map (comp :date :meta) posts)))) + :image "https://gaiwan.co/assets/imgs/Gaiwan-logo-transparent-bg.png"} + (for [{:keys [meta hiccup]} posts + :let [{:keys [title slug author date]} meta]] + {:title title + :link (str "https://gaiwan.co/blog/" slug) + :description (str "") + :author author + :pubDate (.toInstant date)}))})) (defn get-blog-item [request] (let [{:keys [slug]} (:path-params request) diff --git a/src/co/gaiwan/site/components/footer.cljc b/src/co/gaiwan/site/components/footer.cljc index 7587137..71176e0 100755 --- a/src/co/gaiwan/site/components/footer.cljc +++ b/src/co/gaiwan/site/components/footer.cljc @@ -74,8 +74,8 @@ ;; ["/About/" "About us"] ["https://gaiwan.notion.site/Gaiwan-Strategic-Objective-d40123054382433fb75422b77cc4b25e" "Company objectives"] ["https://gaiwan.notion.site/Gaiwan-operating-principles-3f74a7fd1ee2425eb918879fc55dbfb8" "Company values"] - #_["https://gaiwan.co/assets/imgs/Gaiwan-logo-transparent-bg.png" "Logo transparent"] - #_["https://gaiwan.co/assets/imgs/Gaiwan-logo-white-bg-with-border.png" "Logo white"]]] + ["https://gaiwan.co/assets/imgs/Gaiwan-logo-transparent-bg.png" "Logo transparent"] + ["https://gaiwan.co/assets/imgs/Gaiwan-logo-white-bg-with-border.png" "Logo white"]]] [:li {:class "mb-2"} [:a {:class "text-gray-600 hover:text-gray-900 transition duration-150 ease-in-out" :href link} caption]])]] diff --git a/src/co/gaiwan/site/data.clj b/src/co/gaiwan/site/data.clj index 9da404d..f8fae22 100644 --- a/src/co/gaiwan/site/data.clj +++ b/src/co/gaiwan/site/data.clj @@ -3,7 +3,7 @@ (def team-members [{:title "Arne Brasseur (Berlin)" - :subtitle "@plexus" + :subtitle "@plexus@toot.cat" :link "https://github.com/plexus" :image "https://avatars.githubusercontent.com/u/32212?v=4" :description '([:p "Arne has been delivering software solutions for well @@ -15,22 +15,22 @@ them as a series of simple solutions."] [:p "He loves a nice cup of tea, and likes to to go for runs."])} #_{:title "Felipe Barros (Recife)" - :subtitle "@barrosfelipe" - :link "https://github.com/barrosfelipe" - :image "https://avatars.githubusercontent.com/u/9657386?v=4" - :description '([:p "While still at school, GNU/Linux liberated Felipe from + :subtitle "@barrosfelipe" + :link "https://github.com/barrosfelipe" + :image "https://avatars.githubusercontent.com/u/9657386?v=4" + :description '([:p "While still at school, GNU/Linux liberated Felipe from the shackles of digital oblivion and corporate abuse."] - [:p "Being a keyboard enthusiast who follows the Dvorak + [:p "Being a keyboard enthusiast who follows the Dvorak branch of the Emacs faith, he already manipulated text in Vim and Emacs way before his renewed interest in computer programming and cherry-picked the Clojure/ClojureScript path after falling in love with Rich Hickey’s capillary parentheses/curls."] - #_[:p "An arts person, likes to spend free time writing or + #_[:p "An arts person, likes to spend free time writing or drawing and can often be caught talking about interfaces as handcrafted, artisanal work."])} {:title "Ariel Alexi (Rosh HaAyin)" - :subtitle "@ArielA147" + :subtitle "@ArielA147@twitter.com" :link "https://github.com/ArielA147" :image "https://avatars.githubusercontent.com/u/43312651?v=4" :description '([:p "Ariel is a master's student with an insatiable thirst for knowledge. @@ -40,13 +40,13 @@ [:p "Oh, and one more thing: if you challenge her to a game of Mario Kart, be prepared for a fierce competition!."])} {:title "Alys Brooks (Madison)" - :subtitle "@alysbrooks" + :subtitle "@alysbrooks@journa.host" :link "https://github.com/alysbrooks" :image (utils/img "avatars/alys.jpg") :description '([:p "Alyss is a professional writer and editor by day and a programmer by night. She has worked as a technical writer at Epic."] [:p "She loves open source and photography."])} {:title "Mitesh Shah (Mumbai)" - :subtitle "@oxalorg" + :subtitle "@oxalorg@twitter.com" :link "https://github.com/oxalorg" :image (utils/img "avatars/mitesh-oxalorg.jpg") :description '([:p "Mitesh learnt coding because of his desire to hack video @@ -58,7 +58,7 @@ :href "https://youtube.com/c/oxalorg"} "YouTube Channel"] "."])} {:title "Laurence Chen (Taipei)" - :subtitle "@humorless" + :subtitle "@replware@g0v.social" :link "https://github.com/humorless" :image "https://avatars.githubusercontent.com/u/3061798?v=4" :description '([:p "Laurence is an experienced developer with a knack for @@ -66,7 +66,7 @@ He has created bespoke systems for Taiwan-based SMBs, and offers consulting to the LINE corporation."])} {:title "Joshua Ballanco (Miami)" - :subtitle "@jballanc" + :subtitle "@jballanc@twitter.com" :link "https://github.com/jballanc" :image (utils/img "avatars/jballanc.jpg") :description @@ -90,7 +90,12 @@ :description '([:p "As a product manager / owner, Bettina has helped users relocate, learn languages, and get shopping deals online and in mobile apps."] [:p "People have told her that her deep user insight and pragmatic approach to technical solutions are her superpowers."] - [:p "To balance all the screen time, Bettina practices yoga and meditate."])}]) + [:p "To balance all the screen time, Bettina practices yoga and meditate."])} + {:title "Gabriel do Nascimento Ribeiro" + :subtitle "" + :link "" + :image "" + :description '()}]) (def faqs [{:question ""}])