Skip to content

Commit 0ce0fb8

Browse files
NeedleInAJayStackNeedleInAJayStack
authored
Merge pull request #1 from NeedleInAJayStack/feat/serve-from-api
Feat/serve from api
2 parents ce06730 + c6beef6 commit 0ce0fb8

16 files changed

+65
-41
lines changed

‎docker-compose.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ services:
99
- DATABASE_HOST=db
1010
ports:
1111
- '8080:80'
12+
volumes:
13+
- .env:/project/.env
14+
depends_on:
15+
- db
1216
db:
1317
image: timescale/timescaledb:latest-pg16
1418
restart: unless-stopped

‎fileServer.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package main
22

3-
import "net/http"
3+
import (
4+
"net/http"
5+
)
46

57
// fileServerWithFallback returns a file server that falls back to a specific file when no matches are found.
68
// This is useful when a frontend app is using a browser-router.
79
func fileServerWithFallback(dir http.Dir, fallbackFile string) http.Handler {
10+
// Note that this fileserver matches the full route, so it should not be pointed to a subdirectory of the public folder.
811
fileserver := http.FileServer(dir)
912
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
1013
_, err := dir.Open(r.URL.Path)

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
func main() {
1616
err := godotenv.Load()
1717
if err != nil {
18-
log.Println("Error loading .env file")
18+
log.Printf("Error loading .env file: %s", err)
1919
}
2020

2121
// Database

‎public/.DS_Store‎

6 KB
Binary file not shown.

public/asset-manifest.json renamed to public/app/asset-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"files": {
33
"main.css": "./static/css/main.8e19cb6b.css",
4-
"main.js": "./static/js/main.95ebc301.js",
4+
"main.js": "./static/js/main.b9fe4519.js",
55
"index.html": "./index.html",
66
"main.8e19cb6b.css.map": "./static/css/main.8e19cb6b.css.map",
7-
"main.95ebc301.js.map": "./static/js/main.95ebc301.js.map"
7+
"main.b9fe4519.js.map": "./static/js/main.b9fe4519.js.map"
88
},
99
"entrypoints": [
1010
"static/css/main.8e19cb6b.css",
11-
"static/js/main.95ebc301.js"
11+
"static/js/main.b9fe4519.js"
1212
]
1313
}

public/favicon.ico renamed to public/app/favicon.ico

File renamed without changes.

public/index.html renamed to public/app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en" style="width:100%;height:100%"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico"><title>Utility Input</title><script defer="defer" src="./static/js/main.95ebc301.js"></script><link href="./static/css/main.8e19cb6b.css" rel="stylesheet"></head><body style="width:100%;height:100%"><div id="root" style="width:100%;height:100%"></div></body></html>
1+
<!doctype html><html lang="en" style="width:100%;height:100%"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico"><title>Utility Input</title><script defer="defer" src="./static/js/main.b9fe4519.js"></script><link href="./static/css/main.8e19cb6b.css" rel="stylesheet"></head><body style="width:100%;height:100%"><div id="root" style="width:100%;height:100%"></div></body></html>

public/manifest.json renamed to public/app/manifest.json

File renamed without changes.

public/static/css/main.8e19cb6b.css renamed to public/app/static/css/main.8e19cb6b.css

File renamed without changes.

public/static/css/main.8e19cb6b.css.map renamed to public/app/static/css/main.8e19cb6b.css.map

File renamed without changes.

0 commit comments

Comments
 (0)