use zd config in api, fix keystore, add margin

src/zd/api.clj

@@ -27,6 +27,7 @@
        (zen/get-symbol ztx)))
 
 ;; ISSUE mw does not work for / request
+;; TODO remove this mw
 (defmethod web/middleware-in 'zd/append-doc
   [ztx _cfg {{id :id} :route-params :as req} & opts]
   (when (some? id)
@@ -39,7 +40,7 @@
                uri :uri
                hs :headers
                doc :doc :as req} & opts]
-  (let [{r :root ps :paths} (zendoc-config ztx)]
+  (let [{r :root ps :paths :as config} (zendoc-config ztx)]
     (cond
       (= uri "/")
       {:status 301
@@ -53,11 +54,11 @@
 
       (get hs "x-body")
       {:status 200
-       :body (hiccup/html (render/render-doc ztx {:request req :paths ps :doc doc :root r} doc))}
+       :body (hiccup/html (render/render-doc ztx {:request req :paths ps :doc doc :root r :config config} doc))}
 
       :else
       {:status 200
-       :body (render/doc-view ztx {:request req :paths ps :doc doc :root r} doc)})))
+       :body (render/doc-view ztx {:request req :paths ps :doc doc :root r :config config} doc)})))
 
 (defmethod web/middleware-out 'zd/layout
   [ztx config {page :page :as req} {bdy :body :as resp} & args]
@@ -114,11 +115,12 @@
      :body (render/editor ztx {:root r :request req :doc doc} doc)}))
 
 (defmethod zen/op 'zd/render-preview
-  [ztx _ {{id :id} :route-params r :zd/root :as req} & opts]
-  {:headers {"Content-Type" "text/html"}
-   :body (-> (render/preview ztx {:request req :root r} (slurp (:body req)))
-             (hiccup/html))
-   :status 200})
+  [ztx _ {{id :id} :route-params :as req} & opts]
+  (let [{r :root ps :paths :as config} (zendoc-config ztx)]
+    {:headers {"Content-Type" "text/html"}
+     :body (-> (render/preview ztx {:request req :paths ps :config config :root r} (slurp (:body req)))
+               (hiccup/html))
+     :status 200}))
 
 (defmethod zen/op 'zd.events/logger
   [ztx config {ev-name :ev :as ev} & opts]

src/zd/blocks/anns.clj

@@ -12,7 +12,7 @@
 (defmethod methods/renderann :title
   [ztx {doc :doc} {{title :title} :ann cnt :content k :key :as block}]
   [:div {:class (c [:py 4])}
-   [:h2 {:class (c :flex :items-center [:m 0] [:py 4]) :id k}
+   [:h2 {:class (c :flex :items-center [:mb 0.8] [:py 4]) :id k}
     title]
    cnt])
 

src/zd/gitsync.clj

@@ -47,10 +47,10 @@
             {:status :updated}))))))
 
 (defn init-remote [ztx {:keys [from branch keystore to] k :key :as remote}]
-  (let [ident {:name "pubkey"#_(or k ["id_rsa" "id_dsa" "id_ecdsa" "id_ed25519"])
+  (let [ident {:name (or k ["id_rsa" "id_dsa" "id_ecdsa" "id_ed25519"])
                ;; TODO support for other os
                :trust-all? true
-               :key-dir (or keystore "~/.ssh")}]
+               :key-dir (or keystore (str (System/getProperty "user.home") "/.ssh"))}]
     (when (string? to)
       (git/with-identity ident
         (let [pulled? (.exists (io/file to))