Pattern library + RISE theme

cms/systems/bread/alpha/cms/config/bread.cljc

@@ -1,7 +1,8 @@
 (ns systems.bread.alpha.cms.config.bread
   (:require
     [aero.core :as aero]
-    [integrant.core :as ig]))
+    [integrant.core :as ig]
+    [systems.bread.alpha.internal.time :as t]))
 
 (defmethod aero/reader 'ig/ref [_ _ value]
   (ig/ref value))
@@ -11,3 +12,6 @@
     (when-not (var? var*)
       (throw (ex-info (str sym " does not resolve to a var") {:symbol sym})))
     var*))
+
+(defmethod aero/reader 'seconds-ago [_ _ n]
+  (t/seconds-ago n))

cms/systems/bread/alpha/cms/data.cljc

@@ -16,16 +16,42 @@
        :field/content "Le Titre"}
       {:field/key :content
        :field/lang :en
-       :field/format :edn
-       :field/content (pr-str [{:a "some content" :b "more content"}])}
+       :field/format :html
+       :field/content
+       "<h2>Some content</h2>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam vel egestas sapien, vel gravida lacus. Morbi placerat lorem justo, luctus pretium sem mattis ac. Maecenas convallis lorem a enim iaculis luctus. Pellentesque malesuada elit et sodales efficitur. Integer quis blandit felis. Aenean fringilla magna quis lacinia egestas. Praesent neque mauris, aliquam quis elementum quis, sagittis sit amet diam. Nulla eu scelerisque tortor, nec condimentum erat.</p>
+<h2>More content</h2>
+<p>Cras tellus purus, ultricies nec augue ut, lacinia dignissim leo. Quisque eros erat, semper ut ornare et, mattis at ipsum. Pellentesque odio dui, hendrerit sollicitudin ultricies fringilla, feugiat at turpis. Curabitur quam felis, dapibus mollis tellus a, accumsan euismod mauris. Suspendisse dictum commodo arcu, eget pharetra nibh aliquet ut. Duis accumsan nec leo a dignissim. Nam nunc massa, vulputate non neque vel, convallis congue nisi. Maecenas ut cursus orci.</p>
+<p>Duis ipsum nunc, gravida ut est sit amet, facilisis luctus enim. Maecenas eget sapien aliquam odio luctus eleifend sed sit amet metus. Nulla malesuada efficitur odio. Aenean ligula ipsum, faucibus maximus consectetur eget, condimentum placerat nibh. Nunc laoreet luctus velit vel dignissim. Pellentesque hendrerit purus et leo tincidunt, egestas finibus turpis tempor. Curabitur ut ligula sit amet justo vulputate condimentum. Phasellus aliquet magna et est convallis blandit. Nullam eros magna, ornare at tempus et, pellentesque non justo.</p>
+<p>Integer faucibus mauris quis lobortis consequat. Sed ac congue arcu. Nunc convallis, massa non imperdiet consequat, mi nibh iaculis elit, mollis dignissim ipsum quam vitae felis. Aliquam laoreet tellus odio, nec molestie erat pretium sed. Quisque lacus tortor, hendrerit ut nulla at, rhoncus malesuada velit. Nunc rhoncus interdum mi, nec dictum nisi ullamcorper vel. Fusce sed porta felis. Suspendisse sagittis ornare nulla. Suspendisse potenti. Sed sed ligula malesuada, pulvinar mauris sed, vehicula sapien. Vestibulum nec ipsum quis orci condimentum volutpat. Quisque sollicitudin mi in enim mollis, ac pretium enim interdum.</p>
+<p>Aenean nunc nulla, finibus sed tortor eget, lobortis viverra tortor. In in orci maximus, mollis nulla finibus, blandit nunc. Nulla facilisi. Morbi quis nisi a massa consequat porta nec ut turpis. Proin varius porttitor euismod. Vivamus elit felis, suscipit vel ullamcorper luctus, eleifend vel lacus. Vivamus vestibulum elit quis volutpat commodo. Curabitur dapibus porttitor ultrices. Etiam facilisis lorem vitae diam pulvinar, at ullamcorper augue rutrum.</p>
+<h2>And some more...</h2>
+<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
+<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p>
+<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>"
+       ,}
       {:field/key :content
        :field/lang :fr
-       :field/format :edn
-       :field/content (pr-str [{:a "le content" :b "et plus"}])}}}
+       :field/format :html
+       :field/content
+       "<h2>Le content</h2>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam vel egestas sapien, vel gravida lacus. Morbi placerat lorem justo, luctus pretium sem mattis ac. Maecenas convallis lorem a enim iaculis luctus. Pellentesque malesuada elit et sodales efficitur. Integer quis blandit felis. Aenean fringilla magna quis lacinia egestas. Praesent neque mauris, aliquam quis elementum quis, sagittis sit amet diam. Nulla eu scelerisque tortor, nec condimentum erat.</p>
+<h2>Et plus</h2>
+<p>Cras tellus purus, ultricies nec augue ut, lacinia dignissim leo. Quisque eros erat, semper ut ornare et, mattis at ipsum. Pellentesque odio dui, hendrerit sollicitudin ultricies fringilla, feugiat at turpis. Curabitur quam felis, dapibus mollis tellus a, accumsan euismod mauris. Suspendisse dictum commodo arcu, eget pharetra nibh aliquet ut. Duis accumsan nec leo a dignissim. Nam nunc massa, vulputate non neque vel, convallis congue nisi. Maecenas ut cursus orci.</p>
+<p>Duis ipsum nunc, gravida ut est sit amet, facilisis luctus enim. Maecenas eget sapien aliquam odio luctus eleifend sed sit amet metus. Nulla malesuada efficitur odio. Aenean ligula ipsum, faucibus maximus consectetur eget, condimentum placerat nibh. Nunc laoreet luctus velit vel dignissim. Pellentesque hendrerit purus et leo tincidunt, egestas finibus turpis tempor. Curabitur ut ligula sit amet justo vulputate condimentum. Phasellus aliquet magna et est convallis blandit. Nullam eros magna, ornare at tempus et, pellentesque non justo.</p>
+<p>Integer faucibus mauris quis lobortis consequat. Sed ac congue arcu. Nunc convallis, massa non imperdiet consequat, mi nibh iaculis elit, mollis dignissim ipsum quam vitae felis. Aliquam laoreet tellus odio, nec molestie erat pretium sed. Quisque lacus tortor, hendrerit ut nulla at, rhoncus malesuada velit. Nunc rhoncus interdum mi, nec dictum nisi ullamcorper vel. Fusce sed porta felis. Suspendisse sagittis ornare nulla. Suspendisse potenti. Sed sed ligula malesuada, pulvinar mauris sed, vehicula sapien. Vestibulum nec ipsum quis orci condimentum volutpat. Quisque sollicitudin mi in enim mollis, ac pretium enim interdum.</p>
+<p>Aenean nunc nulla, finibus sed tortor eget, lobortis viverra tortor. In in orci maximus, mollis nulla finibus, blandit nunc. Nulla facilisi. Morbi quis nisi a massa consequat porta nec ut turpis. Proin varius porttitor euismod. Vivamus elit felis, suscipit vel ullamcorper luctus, eleifend vel lacus. Vivamus vestibulum elit quis volutpat commodo. Curabitur dapibus porttitor ultrices. Etiam facilisis lorem vitae diam pulvinar, at ullamcorper augue rutrum.</p>
+<h2>Et maintenant, plus...</h2>
+<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus</p>
+<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p>
+<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>"
+       ,}}}
    {:db/id "page.child"
     :post/type :page
     :thing/slug "child-page"
+    :thing/created-at #inst "2026-01-01T04:20:00-08:00"
     :post/status :post.status/published
+    :post/taxons ["tag.two"]
     :thing/children ["page.grandchild"]
     :thing/fields
     #{{:field/key :title
@@ -45,7 +71,9 @@
    {:db/id "page.daughter"
     :post/type :page
     :thing/slug "daughter-page"
+    :thing/created-at #inst "2025-10-10T05:53:00-08:00"
     :post/status :post.status/draft
+    :post/taxons ["tag.one"]
     :thing/fields
     #{{:field/key :title
        :field/lang :en
@@ -56,6 +84,7 @@
    {:db/id "page.parent"
     :post/type :page
     :thing/slug "hello"
+    :thing/created-at #inst "2025-03-16T14:21:22-08:00"
     :thing/children ["page.child" "page.daughter"]
     :post/taxons ["tag.one" "tag.two"]
     :post/status :post.status/published
@@ -98,7 +127,9 @@
    {:db/id "page.grandchild"
     :post/type :page
     :thing/slug "grandchild-page"
+    :thing/created-at #inst "2024-01-15T13:12:42-08:00"
     :post/status :post.status/published
+    :post/taxons ["tag.one" "tag.two"]
     :thing/fields
     #{{:field/key :title
        :field/lang :en
@@ -108,7 +139,7 @@
        :field/content "Petit Enfant Page"}}}
    {:db/id "tag.one"
     :thing/slug "one"
-    :taxon/taxonomy :taxon.taxonomy/tag
+    :taxon/taxonomy :tag
     :thing/fields
     [{:field/key :name
       :field/content "One"
@@ -118,7 +149,7 @@
       :field/lang :fr}]}
    {:db/id "tag.two"
     :thing/slug "two"
-    :taxon/taxonomy :taxon.taxonomy/tag
+    :taxon/taxonomy :tag
     :thing/fields
     [{:field/key :name
       :field/content "Two"
@@ -198,7 +229,7 @@
        :field/content "Doggo"}
       {:field/key :alt-text
        :field/lang :fr
-       :field/content "un chat"}}}
+       :field/content "un chien"}}}
 
    ;; Site-wide translations
    {:field/lang :en

cms/systems/bread/alpha/cms/main.cljc

@@ -16,7 +16,10 @@
     [taoensso.timbre :as log]
 
     [systems.bread.alpha.core :as bread]
+    [systems.bread.alpha.component :as component]
     [systems.bread.alpha.cms.theme :as theme]
+    [systems.bread.alpha.cms.theme.crust :as crust]
+    [systems.bread.alpha.cms.theme.rise :as rise]
     [systems.bread.alpha.cms.data :as data]
     [systems.bread.alpha.i18n :as i18n]
     [systems.bread.alpha.post :as post]
@@ -25,6 +28,7 @@
     [systems.bread.alpha.defaults :as defaults]
     [systems.bread.alpha.ring :as bread.ring]
     [systems.bread.alpha.schema :as schema]
+    [systems.bread.alpha.taxon :as taxon]
     [systems.bread.alpha.user :as user]
     [systems.bread.alpha.util.logging :refer [log-redactor]]
     [systems.bread.alpha.cms.config.bread]
@@ -33,6 +37,9 @@
     [systems.bread.alpha.plugin.datahike]
     [systems.bread.alpha.plugin.email :as email]
     [systems.bread.alpha.plugin.marx :as marx]
+    [systems.bread.alpha.navigation :as navigation]
+    #_ ;; TODO
+    [systems.bread.alpha.plugin.navigation :as navigation]
     [systems.bread.alpha.plugin.reitit]
     [systems.bread.alpha.plugin.rum :as rum]
     [systems.bread.alpha.plugin.signup :as signup]
@@ -45,6 +52,8 @@
     [org.sqlite JDBC])
   (:gen-class))
 
+(set! *print-namespace-maps* false)
+
 (defn not-found [req]
   {:body "not found"
    :status 404})
@@ -57,6 +66,16 @@
     {:root "marx"
      :path "/marx"}))
 
+(def crust-handler
+  (reitit.ring/create-resource-handler
+    {:root "crust"
+     :path "/crust"}))
+
+(def rise-handler
+  (reitit.ring/create-resource-handler
+    {:root "rise"
+     :path "/rise"}))
+
 (def router
   (reitit/router
     ["/"
@@ -65,19 +84,15 @@
       ["/login"
        {:name :login
         :dispatcher/type ::auth/login=>
-        :dispatcher/component #'auth/LoginPage}]
-      ["/signup"
-       {:name :signup
-        :dispatcher/type ::signup/signup=>
-        :dispatcher/component #'signup/SignupPage}]
+        :dispatcher/component #'rise/LoginPage}]
       ["/account"
        {:name :account
         :dispatcher/type ::account/account=>
-        :dispatcher/component #'account/AccountPage}]
+        :dispatcher/component #'rise/AccountPage}]
       ["/email"
        {:name :email
         :dispatcher/type ::email/settings=>
-        :dispatcher/component #'email/EmailPage}]
+        :dispatcher/component #'rise/EmailPage}]
       ["/edit"
        {:name :edit
         :dispatcher/type ::marx/edit=>}]
@@ -89,34 +104,42 @@
      ["_"
       ["/confirm-email"
        {:name :confirm-email
-         :dispatcher/type ::email/confirm=>
-         :dispatcher/component #'email/ConfirmPage}]]
+        :dispatcher/type ::email/confirm=>
+        :dispatcher/component #'rise/ConfirmPage}]
+      ["/patterns"
+       ["/rise"
+        {:name :patterns.rise
+         :dispatcher/type ::component/standalone=>
+         :dispatcher/component #'rise/PatternLibrary}]]
+      ["/signup"
+       {:name :signup
+        :dispatcher/type ::signup/signup=>
+        :dispatcher/component #'rise/SignupPage}]]
      ["assets/*"
       (reitit.ring/create-resource-handler
         {})]
      ;; TODO publish to assets?
      ["marx/*" marx-handler]
+     ["crust/*" crust-handler]
+     ["rise/*" rise-handler]
      ["{field/lang}"
       [""
        {:name :home
         :dispatcher/type ::post/page=>
-        :dispatcher/component #'theme/HomePage}]
+        :dispatcher/component #'crust/HomePage}]
       ["/i/{db/id}"
        {:name :id
         :dispatcher/type ::thing/by-id=>
-        :dispatcher/component #'theme/InteriorPage}]
+        :dispatcher/component #'crust/InteriorPage}]
       ["/tag/{thing/slug}"
        {:name :tag
-        :dispatcher/type ::post/tag ;; TODO
-        :dispatcher/component #'theme/Tag}]
-      ["/{thing/slug*}"
+        :dispatcher/type ::taxon/tag=>
+        :dispatcher/component #'crust/Tag
+        :post/type :page}]
+      ["/*slugs"
        {:name :page
         :dispatcher/type ::post/page=>
-        :dispatcher/component #'theme/InteriorPage}]
-      ["/page/{thing/slug*}" ;; TODO
-       {:name :page!
-        :dispatcher/type ::post/page=>
-        :dispatcher/component #'theme/InteriorPage}]]]
+        :dispatcher/component #'crust/InteriorPage}]]]
     {:conflicts nil}))
 
 (def cli-options
@@ -348,8 +371,10 @@
                    (signup/plugin (:signup app-config))
                    (account/plugin (:account app-config))
                    (marx/plugin (:marx app-config))
+                   (navigation/plugin (:navigation app-config))
                    (rum/plugin (:renderer app-config))
-                   (email/plugin (:email app-config))])]
+                   (email/plugin (:email app-config))
+                   (theme/plugin (:theme app-config))])]
     (bread/load-app (bread/app {:plugins plugins}))))
 
 (defmethod ig/halt-key! :bread/app [_ app]
@@ -364,8 +389,6 @@
   true)
 
 (comment
-  (set! *print-namespace-maps* false)
-
   (require '[flow-storm.api :as flow])
   (flow/local-connect)
 
@@ -613,24 +636,27 @@
      :thing/_children [{:thing/slug "b"
                         :thing/_children [{:thing/slug "a"}]}]})
 
-  (def $router (route/router (->app $req)))
-
+  (reitit/match-by-path router "/en/a")
+  (reitit/match-by-path router "/en/a/b/c")
+  (-> router
+      (reitit/match-by-path "/en/tag/two")
+      :data :name)
   (reitit/match->path
-    (reitit/match-by-path $router "/en/a/b/c")
-    {:field/lang :en :thing/slug* "a/b/c"})
+    (reitit/match-by-path router "/en/a/b/c")
+    {:field/lang :en :slugs "a/b/c"})
   (reitit/match->path
-    (reitit/match-by-name $router :page {:field/lang :en :thing/slug* "x"}))
+    (reitit/match-by-name router :page {:field/lang :en :slugs "x"}))
 
-  (bread/routes $router)
-  (bread/route-params $router $req)
+  (bread/routes router)
+  (bread/route-params router $req)
 
   ;; route/uri infers params and then just calls bread/path under the hood...
-  (bread/path $router :page {:field/lang :en :thing/slug* "a/b/c"})
+  (bread/path router :page {:field/lang :en :slugs "a/b/c"})
   (route/uri (->app $req) :page (merge {:field/lang :en} grandchild))
   (route/uri (->app $req) :page! (merge {:field/lang :en} grandchild))
 
   (route/ancestry grandchild)
-  (bread/infer-param :thing/slug* grandchild)
+  (bread/infer-param :slugs grandchild)
   (bread/routes (route/router (->app $req)))
 
   (route/uri (->app $req) :page (merge {:field/lang :en} grandchild))
@@ -693,13 +719,43 @@
     (find-path adjacents seen :thing/slug))
   (def full-path
     (vec (concat [:field/lang] path)))
+  ;; -> [:field/lang :thing/fields :thing/slug]
 
   ;; We've now found the path between :field/lang and :thing/slug, the only two
   ;; attrs in our route definition. So, we can stop looking in this case. But,
   ;; if there were more attrs in the route or if we hadn't found it, we could
   ;; simply add the adjacent attrs we just found to seen, and explore each of
   ;; those (via references) recursively...
 
+  [:field/lang :thing/fields :thing/slug]
+
+  (defn- ->sym [k] (symbol (str "?" (name k))))
+  (map vector (butlast full-path) (rest full-path))
+
+  ;; Now that we have the path, we can construct a query from it:
+  ;; TODO
+  (def query
+    '{:find [(pull ?e [{:thing/fields [:field/lang]}
+                       :thing/slug
+                       {:thing/_children ...}])]
+      :in [$]
+      :where [[?field :field/lang ?lang]
+              [?e :thing/fields ?field]
+              [?e :thing/slug ?slug]]})
+
+  ;; TODO how do we go from :slugs => :thing/slug + {:thing/children ...} ?
+
+  ;; Now we infer values from route-spec, and we have out list of uris...
+  ;; TODO how do we get to lang?
+  (bread/infer-param :field/lang [{:thing/slug "two",
+                                   :thing/fields
+                                   [{:field/lang :en}
+                                    {:field/lang :fr}]}])
+  (map (fn [[thing]]
+         (map #(bread/infer-param % thing) route-spec)
+         )
+       (q query))
+
   ;; /experiment
 
   (require '[kaocha.repl :as k])