Merge pull request #2192 from filipesilva/server-web-client

feat: serve web client from athens server
athensresearch · May 24, 2022 · 25338bf · 25338bf
2 parents 3c8cdbc + 5a0bc15
commit 25338bf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -228,6 +228,12 @@ jobs:
        - uses: actions/checkout@v2
        - uses: ./.github/custom-actions/clojure-env
 
+       - name: Download built app
+         uses: actions/download-artifact@v2
+         with:
+           name: app
+           path: resources
+
        - name: Compile server code
          run: yarn server:compile
 

diff --git a/deps.edn b/deps.edn
@@ -1,4 +1,4 @@
-{:paths ["src/clj" "src/cljs" "src/cljc" "src/js" "src/gen" "test"]
+{:paths ["src/clj" "src/cljs" "src/cljc" "src/js" "src/gen" "test" "resources"]
 
  :deps
  {org.clojure/clojure                   #:mvn{:version "1.11.1"}
@@ -40,6 +40,7 @@
   ;; web server
   http-kit/http-kit                     #:mvn{:version "2.5.3"}
   compojure/compojure                   #:mvn{:version "1.6.2"}
+  ring/ring-core                        #:mvn{:version "1.9.5"}
   ;; data validation
   metosin/malli                         #:mvn{:version "0.5.1"}
   ;; networked repl

diff --git a/src/clj/athens/self_hosted/components/web.clj b/src/clj/athens/self_hosted/components/web.clj
@@ -8,7 +8,9 @@
     [athens.self-hosted.web.presence   :as presence]
     [com.stuartsierra.component        :as component]
     [compojure.core                    :as compojure]
-    [org.httpkit.server                :as http]))
+    [org.httpkit.server                :as http]
+    [ring.middleware.resource          :as ring.resource]
+    [ring.util.response                :as ring.response]))
 
 
 ;; WebSocket handlers
@@ -118,9 +120,15 @@
                                                         :body "ok"}))
 
 
+(compojure/defroutes web-client
+                     (-> (compojure/GET "/" [] (ring.response/resource-response "public/index.html"))
+                         (ring.resource/wrap-resource "public")))
+
+
 (defn make-handler
   [datascript fluree config]
-  (compojure/routes health-check-route
+  (compojure/routes web-client
+                    health-check-route
                     (make-ws-route datascript fluree config)))