Merge branch 'master' of github.com:usefathom/fathom

usefathom · Dec 17, 2018 · e7b6613 · e7b6613
2 parents c82f27f + 1b7ecfe
commit e7b6613
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ FROM golang:latest AS binarybuilder
 WORKDIR /go/src/github.com/usefathom/fathom
 COPY . /go/src/github.com/usefathom/fathom
 COPY --from=assetbuilder /app/assets/build ./assets/build
-RUN go get -u github.com/gobuffalo/packr/... && make docker
+RUN make docker
 
 FROM alpine:latest
 EXPOSE 8080

diff --git a/assets/src/js/lib/client.js b/assets/src/js/lib/client.js
@@ -22,7 +22,7 @@ Client.request = function(url, args) {
   // trim leading slash from URL
   url = (url[0] === '/') ? url.substring(1) : url;
 
-  return window.fetch(`/api/${url}`, args)
+  return window.fetch(`api/${url}`, args)
     .then(handleRequestErrors)
     .then(parseJSON)
     .then(parseData)

diff --git a/package-lock.json b/package-lock.json