From 29d4a6a6c706c3f883bd55ab13d1fc5d6478e84f Mon Sep 17 00:00:00 2001 From: Laurence Chen Date: Fri, 26 Jul 2024 18:35:55 +0800 Subject: [PATCH] markdown rendering on issue 3 --- deps.edn | 6 ++++-- src/co/gaiwan/compass/html/sessions.clj | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/deps.edn b/deps.edn index fbd7e30..88d64a2 100644 --- a/deps.edn +++ b/deps.edn @@ -15,7 +15,7 @@ com.lambdaisland/hiccup {:mvn/version "0.9.48"} com.lambdaisland/ornament {:git/sha "0af129132bfbfeba940705031f83b60250e71dcf" ;; ornament-next with defprop/defrules/import-tokens :git/url "https://github.com/lambdaisland/ornament.git"} - #_ {:local/root "/home/arne/github/lambdaisland/ornament"} + #_{:local/root "/home/arne/github/lambdaisland/ornament"} io.pedestal/pedestal.log {:mvn/version "0.7.0"} ch.qos.logback/logback-classic {:mvn/version "1.5.6"} @@ -31,7 +31,9 @@ java-time-literals/java-time-literals {:mvn/version "2018-04-06"} potemkin/potemkin {:mvn/version "0.4.7"} ; def-map-type - } + + ;; Markdown + markdown-to-hiccup {:mvn/version "0.6.2"}} :aliases {:dev diff --git a/src/co/gaiwan/compass/html/sessions.clj b/src/co/gaiwan/compass/html/sessions.clj index bba8fc3..c7b7c2e 100644 --- a/src/co/gaiwan/compass/html/sessions.clj +++ b/src/co/gaiwan/compass/html/sessions.clj @@ -5,7 +5,8 @@ [clojure.string :as str] [co.gaiwan.compass.css.tokens :as t :refer :all] [java-time.api :as time] - [lambdaisland.ornament :as o])) + [lambdaisland.ornament :as o] + [markdown-to-hiccup.core :as m])) (o/defprop --arc-degrees "240deg") (o/defprop --arc-thickness "30px") @@ -154,19 +155,18 @@ [:div (subs (str/capitalize (str (time/day-of-week time))) 0 3) " " (time/format "dd.MM" time)]] + [:div.description + [:div (m/component (m/md->hiccup description))]] [:div.loc (:location/name location)] [:div.capacity [:div "Location capacity:"] [:div capacity]] [:div.signup-count - [:div "Current Signup count:"] + [:div "Current Signup:"] [:div signup-count]] [:div.participants [:div "Participants:"] [:div participants]] - [:div.description - [:div "Description:"] - [:div description]] [:p.host "Organized by " organized]]])) (o/defstyled session-list :main#sessions