Konfigurer bygg og servering av søkeklient

Co-authored-by: Magnar Sveen <magnar.sveen@mattilsynet.no>

.gitignore

@@ -9,3 +9,5 @@
 /datomic-transactor
 /datomic-pro-*.zip
 /datomic-data/
+/target/
+/dev-resources/dev-assets/js/compiled

deps.edn

@@ -7,9 +7,11 @@
         datomic-type-extensions/datomic-type-extensions {:mvn/version "2023.09.26"}
         no.anteo/broch {:mvn/version "0.1.83"}
         no.cjohansen/powerpack {:git/url "https://github.com/cjohansen/powerpack.git"
-                                :sha "0d4b226ab0d2df76df0c3b6d3b7486f18f63aa62"}
+                                :sha "736ced6559a580b9102f79051a5b2ff47b17be84"}
         superstring/superstring {:mvn/version "3.2.0"}}
  :aliases {:dev
-           {:extra-paths ["dev"]
-            :extra-deps {lambdaisland/kaocha {:mvn/version "1.87.1366"}
-                         kaocha-noyoda/kaocha-noyoda {:mvn/version "2019-06-03"}}}}}
+           {:extra-paths ["dev" "target" "dev-resources"]
+            :extra-deps {cider/piggieback {:mvn/version "0.5.3"}
+                         com.bhauman/figwheel-main {:mvn/version "0.2.18"}
+                         kaocha-noyoda/kaocha-noyoda {:mvn/version "2019-06-03"}
+                         lambdaisland/kaocha {:mvn/version "1.87.1366"}}}}}

dev.cljs.edn

@@ -0,0 +1,8 @@
+^{:watch-dirs ["src"]}
+{:main matvaretabellen.ui.main
+ :optimizations :none
+ :pretty-print true
+ :source-map true
+ :asset-path "/js/compiled/dev"
+ :output-to "dev-resources/dev-assets/js/compiled/app.js"
+ :output-dir "dev-resources/dev-assets/js/compiled/dev"}

figwheel-main.edn

@@ -0,0 +1,2 @@
+{:ring-server-options {:port 5054}
+ :open-url false}

src/matvaretabellen/core.clj

@@ -4,43 +4,49 @@
             [matvaretabellen.ingest :as ingest]
             [matvaretabellen.pages :as pages]))
 
-(def app
+(defn on-started [conn powerpack-app]
+  (ingest/on-started conn powerpack-app))
+
+(defn create-app [env foods-conn]
   {:config
    {:site/default-language "no"
     :site/title "Matvaretabellen"
+    :powerpack/base-url (when (= :prod env)
+                          "https://matvaretabellen.mattilsynet.io")
 
     :stasis/build-dir "build"
     :powerpack/content-dir "resources/content"
     :powerpack/source-dirs ["src" "ui/src" "dev"]
     :powerpack/resource-dirs ["resources" "ui/resources"]
     :powerpack/db "datomic:mem://matvaretabellen"
     :powerpack.server/port 5053
+    :powerpack/dev-assets-root-path (when (= :dev env)
+                                      "dev-assets")
 
     :optimus/bundles {"styles.css"
                       {:public-dir "public"
                        :paths ["/css/mt-designsystem.css"
-                               "/css/matvaretabellen.css"]}}
+                               "/css/matvaretabellen.css"]}
+
+                      "/app.js"
+                      {:public-dir (case env
+                                     :prod "public"
+                                     :dev "dev-assets")
+                       :paths ["/js/compiled/app.js"]}}
 
     :imagine/config {:prefix "/imagines"}
 
     :datomic/schema-file "resources/app-schema.edn"}
    :create-ingest-tx #'ingest/create-tx
-   :render-page #'pages/render-page})
-
-(defn on-started [conn powerpack-app]
-  (ingest/on-started conn powerpack-app))
+   :render-page #'pages/render-page
+   :get-context (fn [] {:foods/db (d/db foods-conn)})
+   :on-started #(on-started foods-conn %)})
 
 (defn ^:to-be-continued create-build-app []
   (let [uri "datomic:mem://foods-export"
         conn (d/connect uri)]
     (foodcase-import/create-database-from-scratch uri)
-    (-> app
-        (assoc :powerpack/base-url "https://matvaretabellen.mattilsynet.io")
-        (assoc :get-context (fn [] {:foods/db (d/db conn)}))
-        (assoc :on-started #(on-started conn %)))))
+    (create-app :prod conn)))
 
 (defn create-dev-app [config]
-  (let [conn (d/connect (:foods/datomic-uri config))]
-    (-> app
-        (assoc :get-context (fn [] {:foods/db (d/db conn)}))
-        (assoc :on-started #(on-started conn %)))))
+  (create-app :dev (d/connect (:foods/datomic-uri config))))

src/matvaretabellen/ui/main.cljs

@@ -0,0 +1,7 @@
+(ns ^:figwheel-hooks matvaretabellen.ui.main)
+
+(defn ^:after-load main []
+  (prn "The client is ready to do the server's bidding"))
+
+(defn ^:export boot []
+  (main))