Merge branch 'master' of gitlab.com:domaindrivenarchitecture/c4k-common
This commit is contained in:
commit
1873813e7f
4 changed files with 13 additions and 12 deletions
|
@ -1,4 +1,4 @@
|
|||
(defproject org.domaindrivenarchitecture/c4k-common-cljs "0.3.1-SNAPSHOT"
|
||||
(defproject org.domaindrivenarchitecture/c4k-common-cljs "0.3.2-SNAPSHOT"
|
||||
:description "Contains predicates and tools for c4k"
|
||||
:url "https://domaindrivenarchitecture.org"
|
||||
:license {:name "Apache License, Version 2.0"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
(defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.1-SNAPSHOT"
|
||||
(defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.2-SNAPSHOT"
|
||||
:description "Contains predicates and tools for c4k"
|
||||
:url "https://domaindrivenarchitecture.org"
|
||||
:license {:name "Apache License, Version 2.0"
|
||||
|
|
|
@ -4,14 +4,15 @@
|
|||
#?(:cljs [shadow.resource :as rc])
|
||||
[dda.c4k-common.yaml :as yaml]
|
||||
[dda.c4k-common.base64 :as b64]
|
||||
[dda.c4k-common.prefixes :as cm]))
|
||||
[dda.c4k-common.prefixes :as cp]
|
||||
[dda.c4k-common.common :as cm]))
|
||||
|
||||
(defn postgres-size?
|
||||
[input]
|
||||
(contains? #{:2gb :4gb :8gb :16gb} input))
|
||||
|
||||
(s/def ::postgres-db-user cm/bash-env-string?)
|
||||
(s/def ::postgres-db-password cm/bash-env-string?)
|
||||
(s/def ::postgres-db-user cp/bash-env-string?)
|
||||
(s/def ::postgres-db-password cp/bash-env-string?)
|
||||
(s/def ::postgres-data-volume-path string?)
|
||||
(s/def ::postgres-size postgres-size?)
|
||||
|
||||
|
|
|
@ -87,18 +87,18 @@
|
|||
[id
|
||||
label
|
||||
default-value]
|
||||
(str (generate-label id label)
|
||||
{:type :element :attrs {:class "form-control" :type "text" :name id :value default-value} :tag :input :content nil}
|
||||
(generate-feedback-tag id)))
|
||||
[(generate-label id label)
|
||||
{:type :element :attrs {:class "form-control" :type "text" :name id :value default-value} :tag :input :content nil}
|
||||
(generate-feedback-tag id)])
|
||||
|
||||
(defn generate-text-area
|
||||
[id
|
||||
label
|
||||
default-value
|
||||
rows]
|
||||
(str (generate-label id label)
|
||||
{:type :element :attrs {:name id :id id :class "form-control" :rows rows} :tag :textarea :content [default-value]}
|
||||
(generate-feedback-tag id)))
|
||||
[(generate-label id label)
|
||||
{:type :element :attrs {:name id :id id :class "form-control" :rows rows} :tag :textarea :content [default-value]}
|
||||
(generate-feedback-tag id)])
|
||||
|
||||
(defn generate-button
|
||||
[id
|
||||
|
@ -117,7 +117,7 @@
|
|||
label
|
||||
rows]
|
||||
{: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 []}]})
|
||||
|
||||
(defn generate-needs-validation
|
||||
[]
|
||||
|
|
Loading…
Reference in a new issue