Read query string in HTML5 router

joshkh · Aug 23, 2018 · e42c309 · e42c309
1 parent 0bd1b94
commit e42c309
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/examples/frontend/project.clj b/examples/frontend/project.clj
@@ -51,4 +51,5 @@
 
   :figwheel {:http-server-root "public"
              :server-port 3449
-             :nrepl-port 7002})
+             :nrepl-port 7002
+             :ring-handler backend.server/handler})
diff --git a/examples/frontend/resources/public/index.html b/examples/frontend/resources/public/index.html
@@ -5,6 +5,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script src="js/app.js"></script>
+    <script src="/js/app.js"></script>
   </body>
 </html>
diff --git a/examples/frontend/src/backend/server.clj b/examples/frontend/src/backend/server.clj
@@ -0,0 +1,11 @@
+(ns backend.server
+  (:require [clojure.java.io :as io]
+            [ring.util.response :as resp]
+            [ring.middleware.content-type :as content-type]))
+
+(def handler
+  (-> (fn [request]
+        (or (resp/resource-response (:uri request) {:root "public"})
+            (-> (resp/resource-response "index.html" {:root "public"})
+                (resp/content-type "text/html"))))
+      content-type/wrap-content-type))
diff --git a/modules/reitit-frontend/src/reitit/frontend/history.cljs b/modules/reitit-frontend/src/reitit/frontend/history.cljs
@@ -96,7 +96,8 @@
     (gevents/unlistenByKey listen-key)
     (gevents/unlistenByKey click-listen-key))
   (-get-path [this]
-    (.. js/window -location -pathname))
+    (str (.. js/window -location -pathname)
+         (.. js/window -location -search)))
   (-href [this path]
     path))