From 8a4bce838a89e7e46dd17099dabafecaab33091d Mon Sep 17 00:00:00 2001 From: bom Date: Tue, 14 Sep 2021 15:02:13 +0200 Subject: [PATCH] finalizing html refactor --- public/index.html | 50 ------------------------- shadow-cljs.edn | 2 +- src/main/cljs/dda/c4k_jira/browser.cljs | 29 +++++++++----- 3 files changed, 20 insertions(+), 61 deletions(-) diff --git a/public/index.html b/public/index.html index 0f0d145..57b9887 100644 --- a/public/index.html +++ b/public/index.html @@ -12,56 +12,6 @@
-
- - -
- 

-      

-      
-      
-      

-        

-      

-      
-      
-      

-        

-      

-      
-      
-      

-        

-      

-      

-      
-      
-      

-        

-      

-      


-      
-      
-      

-        

-      

-      


-      
-    



-    

-      
-      
-    

-
   

   
 
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index a19fafb..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.10"]
+ :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 0d478fa..d81db74 100644
--- a/src/main/cljs/dda/c4k_jira/browser.cljs
+++ b/src/main/cljs/dda/c4k_jira/browser.cljs
@@ -13,22 +13,30 @@
                                             (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-br)]
                                             (br/generate-input-field "issuer" "(Optional) Your issuer prod/staging:" "")
-                                            (br/generate-br)
-                                            (br/generate-br)
+                                            [(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")
-                                            (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"))))
+                                                                   "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 "container jumbotron" (generate-final))
   (-> js/document
       (.getElementById "generate-button")
       (.addEventListener "click"