From 9e19855493b95c766748023f0bc720060e9298fd Mon Sep 17 00:00:00 2001 From: bom Date: Mon, 31 Jan 2022 21:11:36 +0100 Subject: [PATCH] fixed browser.cljs --- shadow-cljs.edn | 2 +- src/main/cljs/dda/c4k_shynet/browser.cljs | 21 ++++----------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/shadow-cljs.edn b/shadow-cljs.edn index bab68ff..f80082a 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ "src/test/cljc" "src/test/cljs" "src/test/resources"] - :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "0.4.3"] + :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "1.0.0"] [hickory "0.7.1"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-shynet.browser/init}} diff --git a/src/main/cljs/dda/c4k_shynet/browser.cljs b/src/main/cljs/dda/c4k_shynet/browser.cljs index a36184e..1d75b78 100644 --- a/src/main/cljs/dda/c4k_shynet/browser.cljs +++ b/src/main/cljs/dda/c4k_shynet/browser.cljs @@ -9,21 +9,17 @@ (defn generate-content [] (into [] (concat [(assoc (br/generate-needs-validation) :content - (into [] (concat (br/generate-input-field "fqdn" "Your fqdn:" "shynet-neu.prod.meissa-gmbh.de") - (br/generate-input-field "shynet-data-volume-path" "(Optional) Your shynet-data-volume-path:" "/var/shynet") + (into [] (concat (br/generate-input-field "fqdn" "Your fqdn:" "shynet.prod.meissa-gmbh.de") (br/generate-input-field "postgres-data-volume-path" "(Optional) Your postgres-data-volume-path:" "/var/postgres") - (br/generate-input-field "restic-repository" "(Optional) Your restic-repository:" "restic-repository") (br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "") [(br/generate-br)] (br/generate-text-area "auth" "Your auth.edn:" "{:postgres-db-user \"shynet\" :postgres-db-password \"shynet-db-password\" - :aws-access-key-id \"aws-id\" - :aws-secret-access-key \"aws-secret\" - :restic-password \"restic-password\"}" + :django-secret-key \"djangosecretkey\"}" "5") [(br/generate-br)] (br/generate-button "generate-button" "Generate c4k yaml"))))] - (br/generate-output "c4k-nextcloud-output" "Your c4k deployment.yaml:" "25")))) + (br/generate-output "c4k-shynet-output" "Your c4k deployment.yaml:" "25")))) (defn generate-content-div [] @@ -33,25 +29,18 @@ (generate-content)}) (defn config-from-document [] - (let [shynet-data-volume-path (br/get-content-from-element "shynet-data-volume-path" :optional true) - postgres-data-volume-path (br/get-content-from-element "postgres-data-volume-path" :optional true) - restic-repository (br/get-content-from-element "restic-repository" :optional true) + (let [postgres-data-volume-path (br/get-content-from-element "postgres-data-volume-path" :optional true) issuer (br/get-content-from-element "issuer" :optional true :deserializer keyword)] (merge {:fqdn (br/get-content-from-element "fqdn")} - (when (some? shynet-data-volume-path) - {:shynet-data-volume-path shynet-data-volume-path}) (when (some? postgres-data-volume-path) {:postgres-data-volume-path postgres-data-volume-path}) - (when (some? restic-repository) - {:restic-repository restic-repository}) (when (some? issuer) {:issuer issuer}) ))) (defn validate-all! [] (br/validate! "fqdn" ::shynet/fqdn) - (br/validate! "shynet-data-volume-path" ::shynet/shynet-data-volume-path :optional true) (br/validate! "postgres-data-volume-path" ::pgc/postgres-data-volume-path :optional true) (br/validate! "issuer" ::shynet/issuer :optional true :deserializer keyword) (br/validate! "auth" core/auth? :deserializer edn/read-string) @@ -73,8 +62,6 @@ (br/get-content-from-element "auth" :deserializer edn/read-string)) (br/set-output!))))) (add-validate-listener "fqdn") - (add-validate-listener "shynet-data-volume-path") (add-validate-listener "postgres-data-volume-path") - (add-validate-listener "restic-repository") (add-validate-listener "issuer") (add-validate-listener "auth")) \ No newline at end of file