From 7ea442adaef727d5b48b242fd0baaaf51902d06e Mon Sep 17 00:00:00 2001 From: jerger Date: Fri, 23 Dec 2022 18:50:40 +0100 Subject: [PATCH] groups for webview --- project.clj | 2 +- shadow-cljs.edn | 2 +- src/main/cljs/dda/c4k_jitsi/browser.cljs | 31 ++++++++++++++---------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/project.clj b/project.clj index b33b1b9..a7154e2 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "https://www.apache.org/licenses/LICENSE-2.0.html"} :dependencies [[org.clojure/clojure "1.11.1"] [org.clojure/tools.reader "1.3.6"] - [org.domaindrivenarchitecture/c4k-common-clj "3.2.0"] + [org.domaindrivenarchitecture/c4k-common-clj "3.3.0"] [hickory "0.7.1"]] :target-path "target/%s/" :source-paths ["src/main/cljc" diff --git a/shadow-cljs.edn b/shadow-cljs.edn index f74c0f4..7899e0e 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 "3.2.0"] + :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.3.0"] [hickory "0.7.1"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-jitsi.browser/init}} diff --git a/src/main/cljs/dda/c4k_jitsi/browser.cljs b/src/main/cljs/dda/c4k_jitsi/browser.cljs index 6dfb050..fd166a5 100644 --- a/src/main/cljs/dda/c4k_jitsi/browser.cljs +++ b/src/main/cljs/dda/c4k_jitsi/browser.cljs @@ -3,22 +3,27 @@ [clojure.tools.reader.edn :as edn] [dda.c4k-jitsi.core :as core] [dda.c4k-jitsi.jitsi :as jitsi] - [dda.c4k-common.browser :as br] - [dda.c4k-common.postgres :as pgc])) + [dda.c4k-common.browser :as br])) -(defn generate-content - [] - (into [] (concat [(assoc (br/generate-needs-validation) :content - (into [] (concat (br/generate-input-field "fqdn" "Your fqdn:" "jitsi.prod.meissa-gmbh.de") - (br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "") - [(br/generate-br)] - (br/generate-text-area "auth" "Your auth.edn:" "{:jvb-auth-password \"jitsi\" +(defn generate-content [] + (cm/concat-vec + [(assoc + (br/generate-needs-validation) :content + (cm/concat-vec + (br/generate-group + "domain" + (cm/concat-vec + (br/generate-input-field "fqdn" "Your fqdn:" "jitsi.prod.meissa-gmbh.de") + (br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" ""))) + (br/generate-group + "credentials" + (br/generate-text-area "auth" "Your auth.edn:" "{:jvb-auth-password \"jitsi\" :jicofo-auth-password \"jicofo-password\" :jicofo-component-secret \"jicofo-component-secrect\"}" - "5") - [(br/generate-br)] - (br/generate-button "generate-button" "Generate c4k yaml"))))] - (br/generate-output "c4k-jitsi-output" "Your c4k deployment.yaml:" "25")))) + "5")) + [(br/generate-br)] + (br/generate-button "generate-button" "Generate c4k yaml")))] + (br/generate-output "c4k-jitsi-output" "Your c4k deployment.yaml:" "25"))) (defn generate-content-div []