change(backend): serve static file from /static and serve index.html for /

2023-10-02 19:22:56 +02:00 · 2023-10-02 19:22:56 +02:00 · d6f90977e1
commit d6f90977e1
parent 0977e8d064
6 changed files with 32 additions and 9 deletions
--- a/config.go
+++ b/config.go
@ -12,6 +12,7 @@ type config struct {
 	redisUser     string
 	redisPassword string
 	redisDB       int
+	urlLength     int
 }

 func setConfig() config {
@ -33,6 +34,10 @@ func setConfig() config {
 		redisDB = 0
 	}

+	urlLength, err := strconv.Atoi("PLAKKEN_URL_LENGTH")
+	if err != nil {
+		urlLength = 3
+	}
 	s := config{
 		host:          host,
 		port:          port,
@ -40,6 +45,7 @@ func setConfig() config {
 		redisUser:     redisUser,
 		redisPassword: redisPassword,
 		redisDB:       redisDB,
+		urlLength:     urlLength,
 	}

 	return s
--- a/go.mod
+++ b/go.mod
@ -1,3 +1,9 @@
 module plakken

 go 1.21
+
+require (
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/redis/go-redis/v9 v9.2.1 // indirect
+)
--- a/main.go
+++ b/main.go
@ -1,19 +1,30 @@
 package main

 import (
-	"fmt"
 	"net/http"
+	"strings"
 )

-func main() {
-	currentConfig := setConfig()
-	listen := currentConfig.host + ":" + currentConfig.port
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		_, err := fmt.Fprintf(w, "Hello, you're at %s", r.URL.Path)
-		if err != nil {
-			return
+var currentConfig config
+
+func handleRequest(w http.ResponseWriter, r *http.Request) {
+	path := r.URL.Path
+	if path == "/" {
+		http.ServeFile(w, r, "./static/index.html")
+
+	} else if strings.HasPrefix(path, "/static/") {
+		fs := http.FileServer(http.Dir("./static"))
+		http.Handle("/static/", http.StripPrefix("/static/", fs))
+	} else {
+		w.WriteHeader(http.StatusNotFound)
 	}
-	})
+
+}
+
+func main() {
+	currentConfig = setConfig()
+	listen := currentConfig.host + ":" + currentConfig.port
+	http.HandleFunc("/", handleRequest)

 	err := http.ListenAndServe(listen, nil)
 	if err != nil {
--- a/static/app.js
+++ b/static/app.js
--- a/static/index.html
+++ b/static/index.html
@ -6,7 +6,7 @@
          name="viewport">
    <meta content="ie=edge" http-equiv="X-UA-Compatible">
    <title>Your plak • Plakken</title>
-    <link href="style.css" rel="stylesheet">
+    <link href="/static/style.css" rel="stylesheet">
 </head>
 <body>
 <label for="content"></label>
--- a/static/style.css
+++ b/static/style.css