remove fancy js fuckup

env/dev/clj/user.clj

@@ -1,11 +0,0 @@
-(ns user
- (:require [figwheel-sidecar.repl-api :as ra]))
-
-(defn start-fw []
- (ra/start-figwheel!))
-
-(defn stop-fw []
- (ra/stop-figwheel!))
-
-(defn cljs []
- (ra/cljs-repl))

env/dev/cljs/wanijo/frontend/dev.cljs

@@ -1,11 +0,0 @@
-(ns ^:figwheel-no-load wanijo.frontend.dev
-  (:require
-    [wanijo.frontend.core :as core]
-    [devtools.core :as devtools]))
-
-
-(enable-console-print!)
-
-(devtools/install!)
-
-(core/init!)

env/prod/cljs/wanijo/frontend/prod.cljs

@@ -1,8 +0,0 @@
-(ns wanijo.frontend.prod
-  (:require
-    [wanijo.frontend.core :as core]))
-
-;;ignore println statements in prod
-(set! *print-fn* (fn [& _]))
-
-(core/init!)

project.clj

@@ -28,11 +28,7 @@
                   :exclusions [commons-codec]]
                  [clj-time "0.15.1"]
                  [markdown-clj "1.0.7"]
-                 [dorothy "0.0.7"]
+                 [dorothy "0.0.7"]]
-
-                 ;; fancy js fuckup
-                 [org.clojure/clojurescript "1.10.520"]
-                 [reagent "0.8.1"]]
 
   :profiles {:dev {:dependencies [;; webserver stuff
                                   [javax.servlet/servlet-api "2.5"]
@@ -41,13 +37,7 @@
                                    :exclusions [ring/ring-core
                                                 ring/ring-codec
                                                 commons-io
-                                                commons-codec]]
+                                                commons-codec]]]
-
-                                  ;; fancy js fuckup
-                                  [binaryage/devtools "0.9.10"]
-                                  [figwheel-sidecar "0.5.18"]
-                                  [nrepl "0.6.0"]
-                                  [cider/piggieback "0.4.0"]]
                    :plugins [;; neo4j db
                              [joshavg/lein-neo4j "0.5.0"]
 
@@ -61,11 +51,7 @@
                              [lein-bikeshed "0.5.1"]
                              [lein-cloverage "1.1.0"]
                              [cider/cider-nrepl "LATEST"]
-                             [lein-kibit "LATEST"]
+                             [lein-kibit "LATEST"]]
-
-                             ;; fancy js fuckup
-                             [lein-cljsbuild "1.1.7"]
-                             [lein-figwheel "0.5.18"]]
                    :source-paths ["src" "env/dev/clj"]}
              :uberjar {:aot :all
                        :main wanijo.main}}
@@ -76,40 +62,4 @@
   :less {:source-paths ["resources/app/stylesheets"]
          :target-path "resources/public/css"}
   :hiera {:cluster-depth 2}
-  :eastwood {:namespaces [:source-paths]}
+  :eastwood {:namespaces [:source-paths]})
-
-  :aliases {"package" ["do"
-                       "clean"
-                       ["cljsbuild" "once" "release"]
-                       ["less" "once"]]}
-
-  ;;fancy js fuckup
-  :clean-targets ^{:protect false}
-  [:target-path
-   [:cljsbuild :builds :app :compiler :output-dir]
-   [:cljsbuild :builds :app :compiler :output-to]]
-  :figwheel {;;:http-server-root "resources"
-             :nrepl-port 7002
-             :nrepl-middleware [cider.piggieback/wrap-cljs-repl]
-             :css-dirs ["resources/public/css"]
-
-             :ring-handler wanijo.handler/app}
-  :cljsbuild {:builds
-              {:app
-               {:source-paths ["src" "env/dev/cljs"]
-                :compiler {:main "wanijo.frontend.dev"
-                           :output-to "resources/public/js/app.js"
-                           :output-dir "resources/public/js/out"
-                           :asset-path "/js/out"
-                           :source-map true
-                           :optimizations :none
-                           :pretty-print true}
-                :figwheel {:on-jsload "wanijo.frontend.core/mount-root"
-                           :open-urls ["http://localhost:3449/index.html"]}}
-               :release
-               {:source-paths ["src" "env/prod/cljs"]
-                :compiler {:output-to "resources/public/js/app.js"
-                           :output-dir "resources/public/js/out-release"
-                           :optimizations :advanced
-                           :infer-externs true
-                           :pretty-print false}}}})

resources/public/js/app.js

@@ -1,11 +0,0 @@
-var CLOSURE_UNCOMPILED_DEFINES = {};
-var CLOSURE_NO_DEPS = true;
-if(typeof goog == "undefined") document.write('<script src="/js/out/goog/base.js"></script>');
-document.write('<script src="/js/out/goog/deps.js"></script>');
-document.write('<script src="/js/out/cljs_deps.js"></script>');
-document.write('<script>if (typeof goog == "undefined") console.warn("ClojureScript could not load :main, did you forget to specify :asset-path?");</script>');
-document.write('<script>goog.require("figwheel.connect");</script>');
-document.write('<script>goog.require("process.env");</script>');
-document.write('<script>goog.require("wanijo.frontend.dev");</script>');
-
-document.write("<script>figwheel.connect.start();</script>");

src/wanijo/framework/view.clj

@@ -23,13 +23,18 @@
    content])
 
 (defn layout!
-  [& {:keys [content title session request head bottom]
+  [& {:keys [content
+             title
+             session
+             request
+             head
+             bottom]
       :or {content []
            title nil
            request {}
            session nil
-           head nil
+           bottom nil
-           bottom nil}}]
+           head nil}}]
   (let [session (or session (:session request))
         ident (:ident session)
         authed? (some? ident)

src/wanijo/visualisation/view.clj

@@ -5,7 +5,7 @@
 (defn index [req]
   (view/layout!
    :request req
-   :bottom (list (include-js "/js/app.js"))
+   :bottom nil
    :content
    [[:h1 "Visualisation"]
     [:div#visualisation]]))