adjust to the "return a hickup vector" convention

This commit is contained in:
jerger 2022-02-10 18:08:26 +01:00
parent 2d3e097703
commit 0a12bed545
2 changed files with 27 additions and 27 deletions

View file

@ -14,7 +14,7 @@
(defn generate-group (defn generate-group
[name [name
content] content]
{:type :element [{:type :element
:tag :div :tag :div
:attrs {:class "rounded border border-3 m-3 p-2"} :attrs {:class "rounded border border-3 m-3 p-2"}
:content [{:type :element :content [{:type :element
@ -23,14 +23,14 @@
:content name} :content name}
{:type :element {:type :element
:tag :fieldset :tag :fieldset
:content content}]}) :content content}]}])
(defn generate-content [] (defn generate-content []
(concat-vec (concat-vec
[(assoc [(assoc
(br/generate-needs-validation) :content (br/generate-needs-validation) :content
(concat-vec (concat-vec
[(generate-group (generate-group
"domain" "domain"
(concat-vec (concat-vec
(br/generate-input-field "fqdn" "Your fqdn:" "shynet.prod.meissa-gmbh.de") (br/generate-input-field "fqdn" "Your fqdn:" "shynet.prod.meissa-gmbh.de")
@ -47,7 +47,7 @@
"{:postgres-db-user \"shynet\" "{:postgres-db-user \"shynet\"
:postgres-db-password \"shynet-db-password\" :postgres-db-password \"shynet-db-password\"
:django-secret-key \"djangosecretkey\"}" :django-secret-key \"djangosecretkey\"}"
"5"))] "5"))
[(br/generate-br)] [(br/generate-br)]
(br/generate-button "generate-button" "Generate c4k yaml")))] (br/generate-button "generate-button" "Generate c4k yaml")))]
(br/generate-output "c4k-shynet-output" "Your c4k deployment.yaml:" "25"))) (br/generate-output "c4k-shynet-output" "Your c4k deployment.yaml:" "25")))

View file

@ -7,5 +7,5 @@
(deftest should-generate-group (deftest should-generate-group
(is (= "<div class=\"rounded border border-3 m-3 p-2\"><b style=\"z-index: 1; position: relative; top: -1.3rem;\">id1</b><fieldset>content</fieldset></div>" (is (= "<div class=\"rounded border border-3 m-3 p-2\"><b style=\"z-index: 1; position: relative; top: -1.3rem;\">id1</b><fieldset>content</fieldset></div>"
(hr/hickory-to-html (apply hr/hickory-to-html
(cut/generate-group "id1" "content"))))) (cut/generate-group "id1" "content")))))