Refactor: Static HTML for better self hosting

.github/workflows/docker-pub.yml

@@ -1,6 +1,7 @@
 name: Docker Pub
 
-on: workflow_dispatch
+schedule:
+     - cron: '00 06 * * 1-5'
 
 jobs:
   build:

.gitignore

@@ -2,3 +2,7 @@ lab
 .env
 *.patch
 .DS_Store
+
+node_modules
+
+www/assets/*.production.css

Dockerfile

@@ -1,19 +1,18 @@
+FROM node:lts as node-builder
+WORKDIR /app 
+COPY . . 
+RUN npm i; npm run build 
+
 FROM golang:1.19
 WORKDIR /app
-
 COPY go.* ./
 RUN go mod download
 
-ENV GOBLIN_ORIGIN_URL="http://goblin.run"
 ENV ORIGIN_URL="http://goblin.run"
 
 COPY . ./
-RUN cd www \
-    ;make installLinux \
-    ;make build \
-    ;cd .. \
-    ;rm -rf ./static \
-    ;ln -sf ./www/dist ./static
+
+COPY --from=node-builder /app/www/assets /app/www/assets
 
 RUN go build -o ./goblin-api ./cmd/goblin-api 
 

cmd/goblin-api/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"errors"
 	"flag"
 	"fmt"
@@ -15,24 +16,33 @@ import (
 	"github.com/barelyhuman/goblin/build"
 	"github.com/barelyhuman/goblin/resolver"
 	"github.com/joho/godotenv"
+	"github.com/yuin/goldmark"
+	"github.com/yuin/goldmark/extension"
+	"github.com/yuin/goldmark/parser"
+	"github.com/yuin/goldmark/renderer/html"
 )
 
 var shTemplates *template.Template
 var serverURL string
 
+var webTemplates *template.Template
+var webContent template.HTML
+
 // FIXME: Disabled storage and caching for initial version
 // var storageClient *storage.Storage
 
 func HandleRequest(rw http.ResponseWriter, req *http.Request) {
 	path := req.URL.Path
 
 	if path == "/" {
-		path = "./static/index.html"
-		http.ServeFile(rw, req, path)
+		webTemplates.ExecuteTemplate(rw, "HomePage", map[string]interface{}{
+			"Content":    webContent,
+			"ORIGIN_URL": serverURL,
+		})
 		return
 	}
 
-	file := filepath.Join("static", path)
+	file := filepath.Join("www/assets", path)
 	info, err := os.Stat(file)
 	if err == nil && info.Mode().IsRegular() {
 		http.ServeFile(rw, req, file)
@@ -87,9 +97,36 @@ func main() {
 		}
 	}
 
+	webTemplates = template.Must(template.ParseGlob("www/pages/*"))
 	shTemplates = template.Must(template.ParseGlob("templates/*"))
 	serverURL = envDefault("ORIGIN_URL", "http://localhost:3000")
 
+	fileData, _ := os.ReadFile("./www/pages/index.md")
+
+	md := goldmark.New(
+		goldmark.WithExtensions(extension.GFM),
+		goldmark.WithParserOptions(
+			parser.WithAutoHeadingID(),
+		),
+		goldmark.WithRendererOptions(
+			html.WithXHTML(),
+			html.WithUnsafe(),
+		),
+	)
+	var buf bytes.Buffer
+	if err := md.Convert(fileData, &buf); err != nil {
+		panic(err)
+	}
+	templ, _ := template.New("s").Parse(buf.String())
+	buf.Reset()
+	templ.ExecuteTemplate(&buf, "s", struct {
+		ORIGIN_URL string
+	}{
+		ORIGIN_URL: serverURL,
+	})
+
+	webContent = template.HTML(buf.String())
+
 	// FIXME: Disabled storage and caching for initial version
 	// storageClient = &storage.Storage{}
 	// storageClient.BucketName = os.Getenv("BUCKET_NAME")

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/minio/minio-go/v7 v7.0.66
 	github.com/tj/go-semver v1.0.0
+	github.com/yuin/goldmark v1.4.13
 	golang.org/x/oauth2 v0.16.0
 )
 
@@ -27,7 +28,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/rs/xid v1.5.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/stretchr/testify v1.8.1 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect

go.sum

@@ -52,19 +52,16 @@ github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tj/assert v0.0.0-20190920132354-ee03d75cd160 h1:NSWpaDaurcAJY7PkL8Xt0PhZE7qpvbZl5ljd8r6U0bI=
 github.com/tj/assert v0.0.0-20190920132354-ee03d75cd160/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
 github.com/tj/go-semver v1.0.0 h1:vpn6Jmn6Hi3QSmrP1PzYcqScop9IZiGCVOSn18wzu8w=
 github.com/tj/go-semver v1.0.0/go.mod h1:YZuwVc013rh7KDV0k6tPbWrFeEHBHcp8amfJL+nHzjM=
+github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -131,4 +128,3 @@ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=