frontend move-out

demo-webly/deps.edn

@@ -3,8 +3,11 @@
          "resources"]
  :deps {org.pinkgorilla/webly {:local/root "../webly" :deps/manifest :deps}
         ; lazy ui modules:
-        org.pinkgorilla/ui-highcharts {:mvn/version "0.0.26"}
-        org.pinkgorilla/ui-vega {:mvn/version "0.0.31"}}
+        org.pinkgorilla/ui-highcharts {:mvn/version "0.0.27"}
+        org.pinkgorilla/ui-vega {:mvn/version "0.0.31"}
+        org.pinkgorilla/ui-tailwind {:mvn/version "0.0.5"}
+        org.pinkgorilla/oauth2 {:mvn/version "0.0.25"}
+        }
  :aliases
  {:test-clj {:extra-paths ["src"
                            "resources"
@@ -26,7 +29,7 @@
 
   ; BUILD BUNDLE (then exit)
   :webly {:extra-deps {org.pinkgorilla/ui-repl {:mvn/version "0.1.92"}  ; http cors test
-                       org.pinkgorilla/ui-tailwind {:mvn/version "0.0.5"}}
+                       }
           :extra-paths ["src" "resources" "test" "test/resources"]
           :exec-fn webly.app.app/webly-build
           :exec-args {:config ["demo.edn"

demo-webly/src/demo/page/help.cljs

@@ -20,26 +20,24 @@
 (def data-config (r/atom {:data nil}))
 (def firstt (r/atom true))
 
-
 (defn help [_route]
   (let [url-moon (str (get-resource-path) "demo/moon.jpg")
-        url-config (str (get-resource-path) "config.edn")
-        ]
-  [:div
-   [:h1 "webly help"]
-   (when @firstt
-     (reset! firstt false)
-     (get-json "http://api.open-notify.org/iss-now.json" data-iss [:data]) ;cors test
-     (get-json url-config data-config [:data])
-     nil)
-   [:p [link-dispatch [:bidi/goto  :demo/main] "main"]]
-   [:p "url config: " url-config]
-   [:h1 "help!"]
-   [:div.bg-blue-300 "iss data (cors test - there should be data coming!):" (pr-str @data-iss)]
-   [:div.bg-red-300 "config data:" (pr-str @data-config)]
-
-   [:p "a moon image should show below. this is a test for webly resource handler."]
-   [:p "moon url: " url-moon]
-   [:img {:src url-moon }]]))
+        url-config (str (get-resource-path) "config.edn")]
+    [:div
+     [:h1 "webly help"]
+     (when @firstt
+       (reset! firstt false)
+       (get-json "http://api.open-notify.org/iss-now.json" data-iss [:data]) ;cors test
+       (get-json url-config data-config [:data])
+       nil)
+     [:p [link-dispatch [:bidi/goto  :demo/main] "main"]]
+     [:p "url config: " url-config]
+     [:h1 "help!"]
+     [:div.bg-blue-300 "iss data (cors test - there should be data coming!):" (pr-str @data-iss)]
+     [:div.bg-red-300 "config data:" (pr-str @data-config)]
+
+     [:p "a moon image should show below. this is a test for webly resource handler."]
+     [:p "moon url: " url-moon]
+     [:img {:src url-moon}]]))
 
 

demo-webly/src/demo/page/main/lazy.cljs

@@ -34,7 +34,7 @@
                   (println "*** NS LOAD ERROR: err: " x)))))
 
 (defn load-namespace-highcharts [& _]
-  (let [rp (load-namespace 'ui.highcharts )]
+  (let [rp (load-namespace 'ui.highcharts)]
     (p/then rp (fn [r]
                  (println "*** NS HIGHCHARTS LOAD SUCCESS: " r)))
     (p/catch rp (fn [x]

demo-webly/src/demo/test.clj

@@ -1,12 +1,11 @@
 (ns demo.test
   (:require
    [extension :refer [discover write-service]]
-    [bidi.bidi :as bidi]
+   [bidi.bidi :as bidi]
 
    [webly.module.build :refer [create-modules shadow-module-config
-                               create-modules 
-                               get-lazy-ns
-                               ]]))
+                               create-modules
+                               get-lazy-ns]]))
 
 (defn test [& _]
   (println "creating modules..")
@@ -16,23 +15,17 @@
     (write-service exts :shadow-modules shadow-modules)
     (println "creating modules..done!")))
 
+(comment
 
-(comment 
-
   (->> (bidi/tag :demo/job :wunderbar)
-       pr-str
-   )
-
-
-
+       pr-str)
 
   (def exts (discover))
 
   (def modules (create-modules exts))
-
 
   (get-lazy-ns)
   (macroexpand (get-lazy-ns))
-  
+
  ; 
   )

demo-webly/test/webly/resource_test.clj

@@ -53,8 +53,8 @@
 ; routing is tested in routes-test
 
 #_(deftest app-html []
-  (is (= "text/html; charset=utf-8"
-         (-> "/" GET content-type)))) ; the url can be any valid frontend route
+    (is (= "text/html; charset=utf-8"
+           (-> "/" GET content-type)))) ; the url can be any valid frontend route
 
 ; cljs-bundle
 

demo-webly/test/webly/routes_test.clj

@@ -27,8 +27,8 @@
 #_(deftest path->handler []
   ;(is (= (:handler (GET "/")) :demo/main))
   ;(is (= (:handler (GET "/help")) :demo/help))
-  (is (= (:handler (GET "/api/time")) 'demo.handler/time-handler))
-  (is (= (:handler (POST "/api/test")) 'demo.handler.test/test-handler)))
+    (is (= (:handler (GET "/api/time")) 'demo.handler/time-handler))
+    (is (= (:handler (POST "/api/test")) 'demo.handler.test/test-handler)))
 
 (deftest resource-routes []
   (is (not (= (:handler (GET "/r/webly/icon/silver.ico")) nil)))