From 3f15a750640832d16c0163f0faebc41d01b95fee Mon Sep 17 00:00:00 2001 From: bom Date: Tue, 7 Sep 2021 18:21:22 +0200 Subject: [PATCH 1/5] Version 0.2.11 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 88139a4..3424335 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-clj "0.2.11-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-common-clj "0.2.11" :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 8badf7792231dc9548e730bc0c5a712fddb01289 Mon Sep 17 00:00:00 2001 From: bom Date: Tue, 14 Sep 2021 14:42:09 +0200 Subject: [PATCH 2/5] fixes in browser --- project.clj | 4 ---- src/main/cljs/dda/c4k_common/browser.cljs | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/project.clj b/project.clj index acf22c2..a041e99 100644 --- a/project.clj +++ b/project.clj @@ -1,8 +1,4 @@ -<<<<<<< HEAD -(defproject org.domaindrivenarchitecture/c4k-common-clj "0.2.11" -======= (defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.1-SNAPSHOT" ->>>>>>> 8b5c33183cbe8e324b69ee5150f5cc40add9a2b4 :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" diff --git a/src/main/cljs/dda/c4k_common/browser.cljs b/src/main/cljs/dda/c4k_common/browser.cljs index 155c807..056b488 100644 --- a/src/main/cljs/dda/c4k_common/browser.cljs +++ b/src/main/cljs/dda/c4k_common/browser.cljs @@ -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 [] From 952412b74d7d566f26d685f8a939fa4276e0df54 Mon Sep 17 00:00:00 2001 From: bom Date: Tue, 14 Sep 2021 14:45:32 +0200 Subject: [PATCH 3/5] fixed wrong imports in postgres --- src/main/cljc/dda/c4k_common/postgres.cljc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/cljc/dda/c4k_common/postgres.cljc b/src/main/cljc/dda/c4k_common/postgres.cljc index b7a7738..c7e2667 100644 --- a/src/main/cljc/dda/c4k_common/postgres.cljc +++ b/src/main/cljc/dda/c4k_common/postgres.cljc @@ -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?) From ec26dbac4a930ba1504cc9e79ccfa3e6a41c2943 Mon Sep 17 00:00:00 2001 From: bom Date: Tue, 14 Sep 2021 14:45:43 +0200 Subject: [PATCH 4/5] Version 0.3.1 --- project-cljs.clj | 2 +- project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project-cljs.clj b/project-cljs.clj index 7456352..2580574 100644 --- a/project-cljs.clj +++ b/project-cljs.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-cljs "0.3.1-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-common-cljs "0.3.1" :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" diff --git a/project.clj b/project.clj index a041e99..effab19 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.1-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.1" :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From ff27502fe41610043dae15ed726fd353c2ce688c Mon Sep 17 00:00:00 2001 From: bom Date: Tue, 14 Sep 2021 14:47:08 +0200 Subject: [PATCH 5/5] version bump --- project-cljs.clj | 2 +- project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project-cljs.clj b/project-cljs.clj index 2580574..a53a755 100644 --- a/project-cljs.clj +++ b/project-cljs.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-cljs "0.3.1" +(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" diff --git a/project.clj b/project.clj index effab19..9b35490 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.1" +(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"