diff --git a/public/index.html b/public/index.html index 0f0d145..6a4ed4a 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,7 @@ - c4k-keycloak + c4k-jira @@ -11,58 +11,7 @@ -
-
- - -
- 

-      

-      
-      
-      

-        

-      

-      
-      
-      

-        

-      

-      
-      
-      

-        

-      

-      

-      
-      
-      

-        

-      

-      


-      
-      
-      

-        

-      

-      


-      
-    



-    

-      
-      
-    

-
-  

+  

   
 
 
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index 7e72179..887a7c9 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.2.8"]
+ :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "0.3.1"]
                 [hickory "0.7.1"]]
  :builds {:frontend {:target :browser
                      :modules {:main {:init-fn dda.c4k-jira.browser/init}}
diff --git a/src/main/cljs/dda/c4k_jira/browser.cljs b/src/main/cljs/dda/c4k_jira/browser.cljs
index 4ce05b0..054dda9 100644
--- a/src/main/cljs/dda/c4k_jira/browser.cljs
+++ b/src/main/cljs/dda/c4k_jira/browser.cljs
@@ -8,27 +8,35 @@
 
 (defn generate-content
   []
-  (into [] (concat [(assoc (generate-needs-validation) :content
-                           (into [] (concat (generate-input-field "fqdn" "Your fqdn:" "jira-neu.prod.meissa-gmbh.de")
-                                            (generate-input-field "jira-data-volume-path" "(Optional) Your jira-data-volume-path:" "/var/jira")
-                                            (generate-input-field "postgres-data-volume-path" "(Optional) Your postgres-data-volume-path:" "/var/postgres")
-                                            (generate-input-field "restic-repository" "(Optional) Your restic-repository:" "restic-repository")
-                                            (generate-br)
-                                            (generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "")
-                                            (generate-br)
-                                            (generate-br)
-                                            (generate-text-area "auth" "Your auth.edn:" "{:postgres-db-user \" jira \"
+  (into [] (concat [(assoc (br/generate-needs-validation) :content
+                           (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")
+                                            (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-br)]
+                                            (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 \"
          :postgres-db-password \" jira-db-password \"
          :aws-access-key-id \" aws-id \"
          :aws-secret-access-key \" aws-secret \"
          :restic-password \" restic-password \"}"
-                                                                "5")
-                                            (generate-br)
-                                            (generate-br)
-                                            (generate-button "generate-button" "Generate c4k yaml"))))]
-                   (generate-br)
-                   (generate-br)
-                   (generate-output "c4k-keycloak-output" "Your c4k deployment.yaml:" "25"))))
+                                                                   "5")
+                                            [(br/generate-br)]
+                                            [(br/generate-br)]
+                                            [(br/generate-button "generate-button" "Generate c4k yaml")])))]
+                   [(br/generate-br)
+                    (br/generate-br)
+                    (br/generate-output "c4k-keycloak-output" "Your c4k deployment.yaml:" "25")])))
+
+(defn generate-final
+  []
+  {:type :element
+   :attrs {:class "container jumbotron"}
+   :tag :div
+   :content
+   (generate-content)})
 
 (defn config-from-document []
   (let [jira-data-volume-path (br/get-content-from-element "jira-data-volume-path" :optional true)
@@ -61,6 +69,7 @@
       (.addEventListener "blur" #(do (validate-all!)))))
 
 (defn init []
+  (br/replace-element-content "app" (generate-final))
   (-> js/document
       (.getElementById "generate-button")
       (.addEventListener "click"