diff --git a/deps.edn b/deps.edn
index e5440c4..aaa67c0 100644
--- a/deps.edn
+++ b/deps.edn
@@ -2,8 +2,9 @@
:deps {org.clojure/clojure {:mvn/version "1.10.1"}
aero {:mvn/version "1.1.6"}
http-kit {:mvn/version "2.3.0"}
- compojure {:mvn/version "1.6.1"}
- ring-logger {:mvn/version "1.0.1"}}
+ metosin/reitit {:mvn/version "0.4.2"}
+ ring-logger {:mvn/version "1.0.1"}
+ ring/ring-defaults {:mvn/version "0.3.2"}}
:aliases
;; clojurescript build tool and dependencies (see also shadow-cljs.edn)
diff --git a/resources/public/index.html b/resources/public/index.html
index 1a159d3..d46a4d3 100644
--- a/resources/public/index.html
+++ b/resources/public/index.html
@@ -4,6 +4,7 @@
+ All my friends are made of square shaped blocks
diff --git a/src/heyarne/all_my_friends/server.clj b/src/heyarne/all_my_friends/server.clj
index bcb8624..51b0588 100644
--- a/src/heyarne/all_my_friends/server.clj
+++ b/src/heyarne/all_my_friends/server.clj
@@ -1,20 +1,22 @@
(ns heyarne.all-my-friends.server
(:require [org.httpkit.server :as http]
- [compojure.core :as router]
- [compojure.route :as route]
[clojure.java.io :as io]
- [ring.logger :as logger]
+ [reitit.ring :as ring]
+ [ring.middleware.defaults :refer [wrap-defaults site-defaults]]
[heyarne.all-my-friends.env :refer [env]])
(:gen-class))
-(router/defroutes app
- (router/POST "/upload" [& args]
- (println "/upload" args)
- {:status 400})
- (router/GET "/" []
- (slurp (io/resource "public/index.html")))
- (route/resources "/")
- (route/not-found "Not found."))
+(def app
+ (ring/ring-handler
+ (ring/router
+ [["/"
+ {:get (fn [_]
+ {:status 200
+ :body (io/file (io/resource "public/index.html"))})}]
+ ["/upload"
+ {:post (fn [req]
+ {:status 400
+ :body "To be done"})}]])))
(defonce server (atom nil))
@@ -27,7 +29,7 @@
(defn -main [& args]
(println "Starting server on port" (env :port))
(reset! server (-> #'app
- (logger/wrap-with-logger)
+ (wrap-defaults (assoc site-defaults :static {:resources "public"}))
(http/run-server {:port (env :port)}))))
#_(-main)
diff --git a/src/heyarne/all_my_friends/views.cljs b/src/heyarne/all_my_friends/views.cljs
index 10cf26f..0b9a9d5 100644
--- a/src/heyarne/all_my_friends/views.cljs
+++ b/src/heyarne/all_my_friends/views.cljs
@@ -1,6 +1,5 @@
(ns heyarne.all-my-friends.views
(:require [reagent.core :as r]
- [applied-science.js-interop :as j]
[heyarne.all-my-friends.facemesh :refer [webcam-facemesh]]
[heyarne.all-my-friends.visualize :as vis]))