increased common version, fixed blur listeners
This commit is contained in:
parent
3a16f90b6e
commit
86c22fa7cf
3 changed files with 23 additions and 14 deletions
|
@ -11,7 +11,6 @@
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
|
||||||
<script src="js/main.js"></script>
|
<script src="js/main.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"src/test/cljc"
|
"src/test/cljc"
|
||||||
"src/test/cljs"
|
"src/test/cljs"
|
||||||
"src/test/resources"]
|
"src/test/resources"]
|
||||||
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "0.4.0"]
|
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "0.4.2"]
|
||||||
[hickory "0.7.1"]]
|
[hickory "0.7.1"]]
|
||||||
:builds {:frontend {:target :browser
|
:builds {:frontend {:target :browser
|
||||||
:modules {:main {:init-fn dda.c4k-jira.browser/init}}
|
:modules {:main {:init-fn dda.c4k-jira.browser/init}}
|
||||||
|
|
|
@ -9,26 +9,25 @@
|
||||||
(defn generate-content
|
(defn generate-content
|
||||||
[]
|
[]
|
||||||
(into [] (concat [(assoc (br/generate-needs-validation) :content
|
(into [] (concat [(assoc (br/generate-needs-validation) :content
|
||||||
(into [] (concat (br/generate-input-field "fqdn" "Your fqdn:" "jira-neu.prod.meissa-gmbh.de" "dda.c4k_jira.browser")
|
(into [] (concat (br/generate-input-field "fqdn" "Your fqdn:" "jira-neu.prod.meissa-gmbh.de")
|
||||||
(br/generate-input-field "jira-data-volume-path" "(Optional) Your jira-data-volume-path:" "/var/jira" "dda.c4k_jira.browser")
|
(br/generate-input-field "jira-data-volume-path" "(Optional) Your jira-data-volume-path:" "/var/jira")
|
||||||
(br/generate-input-field "postgres-data-volume-path" "(Optional) Your postgres-data-volume-path:" "/var/postgres" "dda.c4k_jira.browser")
|
(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" "dda.c4k_jira.browser")
|
(br/generate-input-field "restic-repository" "(Optional) Your restic-repository:" "restic-repository")
|
||||||
(br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "" "dda.c4k_jira.browser")
|
(br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "")
|
||||||
[(br/generate-br)]
|
[(br/generate-br)]
|
||||||
(br/generate-text-area "auth" "Your auth.edn:" "{:postgres-db-user \"jira\"
|
(br/generate-text-area "auth" "Your auth.edn:" "{:postgres-db-user \"jira\"
|
||||||
:postgres-db-password \"jira-db-password\"
|
:postgres-db-password \"jira-db-password\"
|
||||||
:aws-access-key-id \"aws-id\"
|
:aws-access-key-id \"aws-id\"
|
||||||
:aws-secret-access-key \"aws-secret\"
|
:aws-secret-access-key \"aws-secret\"
|
||||||
:restic-password \"restic-password\"}"
|
:restic-password \"restic-password\"}"
|
||||||
"5" "dda.c4k_jira.browser")
|
"5")
|
||||||
[(br/generate-br)]
|
[(br/generate-br)]
|
||||||
(br/generate-button "generate-button" "Generate c4k yaml"))))]
|
(br/generate-button "generate-button" "Generate c4k yaml"))))]
|
||||||
(br/generate-output "c4k-keycloak-output" "Your c4k deployment.yaml:" "25"))))
|
(br/generate-output "c4k-keycloak-output" "Your c4k deployment.yaml:" "25"))))
|
||||||
|
|
||||||
(defn generate-container-jumbotron
|
(defn generate-content-div
|
||||||
[]
|
[]
|
||||||
{:type :element
|
{:type :element
|
||||||
:attrs {:class "container jumbotron"}
|
|
||||||
:tag :div
|
:tag :div
|
||||||
:content
|
:content
|
||||||
(generate-content)})
|
(generate-content)})
|
||||||
|
@ -59,13 +58,24 @@
|
||||||
(br/validate! "auth" core/auth? :deserializer edn/read-string)
|
(br/validate! "auth" core/auth? :deserializer edn/read-string)
|
||||||
(br/set-validated!))
|
(br/set-validated!))
|
||||||
|
|
||||||
|
(defn add-validate-listener [name]
|
||||||
|
(-> (br/get-element-by-id name)
|
||||||
|
(.addEventListener "blur" #(do (validate-all!)))))
|
||||||
|
|
||||||
|
|
||||||
(defn init []
|
(defn init []
|
||||||
(br/replace-element-content "app" (generate-container-jumbotron))
|
(br/append-hickory (generate-content-div))
|
||||||
(-> js/document
|
(-> js/document
|
||||||
(.getElementById "generate-button")
|
(.getElementById "generate-button")
|
||||||
(.addEventListener "click"
|
(.addEventListener "click"
|
||||||
#(do (validate-all!)
|
#(do (validate-all!)
|
||||||
(-> (core/generate
|
(-> (core/generate
|
||||||
(config-from-document)
|
(config-from-document)
|
||||||
(br/get-content-from-element "auth" :deserializer edn/read-string))
|
(br/get-content-from-element "auth" :deserializer edn/read-string))
|
||||||
(br/set-output!))))))
|
(br/set-output!)))))
|
||||||
|
(add-validate-listener "fqdn")
|
||||||
|
(add-validate-listener "jira-data-volume-path")
|
||||||
|
(add-validate-listener "postgres-data-volume-path")
|
||||||
|
(add-validate-listener "restic-repository")
|
||||||
|
(add-validate-listener "issuer")
|
||||||
|
(add-validate-listener "auth"))
|
Reference in a new issue