Merge branch 'master' of gitlab.com:domaindrivenarchitecture/c4k-common

This commit is contained in:
jem 2021-10-01 15:46:10 +02:00
commit 4e16002151
3 changed files with 22 additions and 16 deletions

View file

@ -1,4 +1,4 @@
(defproject org.domaindrivenarchitecture/c4k-common-cljs "0.3.2-SNAPSHOT" (defproject org.domaindrivenarchitecture/c4k-common-cljs "0.3.4-SNAPSHOT"
:description "Contains predicates and tools for c4k" :description "Contains predicates and tools for c4k"
:url "https://domaindrivenarchitecture.org" :url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0" :license {:name "Apache License, Version 2.0"

View file

@ -1,4 +1,4 @@
(defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.2-SNAPSHOT" (defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.4-SNAPSHOT"
:description "Contains predicates and tools for c4k" :description "Contains predicates and tools for c4k"
:url "https://domaindrivenarchitecture.org" :url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0" :license {:name "Apache License, Version 2.0"

View file

@ -83,41 +83,47 @@
label] label]
{:type :element :attrs {:for id-for :class "form-label"} :tag :label :content [label]}) {:type :element :attrs {:for id-for :class "form-label"} :tag :label :content [label]})
(defn generate-br
[]
{:type :element, :attrs nil, :tag :br, :content nil})
(defn generate-input-field (defn generate-input-field
[id [id
label label
default-value] default-value
project-file-path]
[(generate-label id label) [(generate-label id label)
{:type :element :attrs {:class "form-control" :type "text" :name id :value default-value} :tag :input :content nil} {:type :element :attrs {:class "form-control" :type "text" :name id :id id :value default-value :onblur (str project-file-path ".validate_all_BANG_()")} :tag :input :content nil}
(generate-feedback-tag id)]) (generate-feedback-tag id)
(generate-br)])
(defn generate-text-area (defn generate-text-area
[id [id
label label
default-value default-value
rows] rows
project-file-path]
[(generate-label id label) [(generate-label id label)
{:type :element :attrs {:name id :id id :class "form-control" :rows rows} :tag :textarea :content [default-value]} {:type :element :attrs {:name id :id id :class "form-control" :rows rows :onblur (str project-file-path ".validate_all_BANG_()")} :tag :textarea :content [default-value]}
(generate-feedback-tag id)]) (generate-feedback-tag id)
(generate-br)])
(defn generate-button (defn generate-button
[id [id
label] label]
{:type :element [{:type :element
:attrs {:type "button", :id id, :class "btn btn-primary"} :attrs {:type "button", :id id, :class "btn btn-primary"}
:tag :button :tag :button
:content [label]}) :content [label]}
(generate-br)])
(defn generate-br
[]
{:type :element, :attrs nil, :tag :br, :content nil})
(defn generate-output (defn generate-output
[id [id
label label
rows] rows]
{:type :element, :attrs {:id id}, :tag :div, :content [{:type :element, :attrs {:for "output", :class "form-label"}, :tag :label, :content [label]} [{:type :element, :attrs {:id id}, :tag :div, :content [{:type :element, :attrs {:for "output", :class "form-label"}, :tag :label, :content [label]}
{:type :element, :attrs {:name "output", :id "output", :class "form-control", :rows rows}, :tag :textarea, :content []}]}) {:type :element, :attrs {:name "output", :id "output", :class "form-control", :rows rows}, :tag :textarea, :content []}]}
(generate-br)])
(defn generate-needs-validation (defn generate-needs-validation
[] []