near/heyarne.all-my-friends.app
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switch routing from compojure to reitit

Browse source
This commit is contained in:
heyarne 2020-05-09 09:39:20 +02:00
commit 0469f59e80
4 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
deps.edn
View file

@ -2,8 +2,9 @@
:deps {org.clojure/clojure {:mvn/version "1.10.1"} :deps {org.clojure/clojure {:mvn/version "1.10.1"}
aero {:mvn/version "1.1.6"} aero {:mvn/version "1.1.6"}
http-kit {:mvn/version "2.3.0"} http-kit {:mvn/version "2.3.0"}
compojure {:mvn/version "1.6.1"} metosin/reitit {:mvn/version "0.4.2"}
ring-logger {:mvn/version "1.0.1"}} ring-logger {:mvn/version "1.0.1"}
ring/ring-defaults {:mvn/version "0.3.2"}}
:aliases :aliases
;; clojurescript build tool and dependencies (see also shadow-cljs.edn) ;; clojurescript build tool and dependencies (see also shadow-cljs.edn)

1
resources/public/index.html
View file

@ -4,6 +4,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="style.css" /> <link rel="stylesheet" href="style.css" />
<title>All my friends are made of square shaped blocks</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

26
src/heyarne/all_my_friends/server.clj
View file

@ -1,20 +1,22 @@
(ns heyarne.all-my-friends.server (ns heyarne.all-my-friends.server
(:require [org.httpkit.server :as http] (:require [org.httpkit.server :as http]
[compojure.core :as router]
[compojure.route :as route]
[clojure.java.io :as io] [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]]) [heyarne.all-my-friends.env :refer [env]])
(:gen-class)) (:gen-class))
(router/defroutes app (def app
(router/POST "/upload" [& args] (ring/ring-handler
(println "/upload" args) (ring/router
{:status 400}) [["/"
(router/GET "/" [] {:get (fn [_]
(slurp (io/resource "public/index.html"))) {:status 200
(route/resources "/") :body (io/file (io/resource "public/index.html"))})}]
(route/not-found "Not found.")) ["/upload"
{:post (fn [req]
{:status 400
:body "To be done"})}]])))
(defonce server (atom nil)) (defonce server (atom nil))
@ -27,7 +29,7 @@
(defn -main [& args] (defn -main [& args]
(println "Starting server on port" (env :port)) (println "Starting server on port" (env :port))
(reset! server (-> #'app (reset! server (-> #'app
(logger/wrap-with-logger) (wrap-defaults (assoc site-defaults :static {:resources "public"}))
(http/run-server {:port (env :port)})))) (http/run-server {:port (env :port)}))))
#_(-main) #_(-main)

1
src/heyarne/all_my_friends/views.cljs
View file

@ -1,6 +1,5 @@
(ns heyarne.all-my-friends.views (ns heyarne.all-my-friends.views
(:require [reagent.core :as r] (:require [reagent.core :as r]
[applied-science.js-interop :as j]
[heyarne.all-my-friends.facemesh :refer [webcam-facemesh]] [heyarne.all-my-friends.facemesh :refer [webcam-facemesh]]
[heyarne.all-my-friends.visualize :as vis])) [heyarne.all-my-friends.visualize :as vis]))