add: Support CSS styling of rendered content

Author: cluttrdev

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+ - Support CSS styling of rendered content
+
 ## [0.3.1] - 2023-11-09
 
 ### Added

cmd/root.go

@@ -22,6 +22,8 @@ import (
 type RootCmdConfig struct {
 	host string
 	port string
+
+	style string
 }
 
 func NewRootCmd() *command.Command {
@@ -44,6 +46,8 @@ func NewRootCmd() *command.Command {
 func (c *RootCmdConfig) RegisterFlags(fs *flag.FlagSet) {
 	fs.StringVar(&c.host, "host", "127.0.0.1", "The address the server listens to.")
 	fs.StringVar(&c.port, "port", "1337", "The port the server listens on.")
+
+	fs.StringVar(&c.style, "style", "plain", "The CSS style to use.")
 }
 
 func (c *RootCmdConfig) Exec(ctx context.Context, args []string) error {
@@ -64,7 +68,10 @@ func (c *RootCmdConfig) run(ctx context.Context, file string) error {
 	}
 
 	srv := server.Server{
-		Title:    r.File,
+		Config: server.ServerConfig{
+			Title: file,
+			Style: c.style,
+		},
 		Renderer: r,
 	}
 

pkg/server/.gitignore

@@ -0,0 +1 @@
+assets/

pkg/server/files.go

@@ -4,19 +4,79 @@ import (
 	"embed"
 	"fmt"
 	"io/fs"
+	"log"
 	"net/http"
+	"strings"
+	"text/template"
 )
 
-//go:generate cp -r ../../web/static/ ./assets
-//go:embed assets/index.html
-//go:embed assets/js/client.js
-var assets embed.FS
+//go:generate mkdir -p assets
+//go:generate cp -r ../../web/static/ ./assets/static
+//go:generate cp -r ../../web/templates/ ./assets/templates
 
-func fileServer() (http.Handler, error) {
-	fsys, err := fs.Sub(assets, "assets")
+var (
+	//go:embed assets/static
+	staticFS  embed.FS
+	staticDir string = "assets/static"
+
+	//go:embed assets/templates
+	templatesFS  embed.FS
+	templatesDir string = "assets/templates"
+)
+
+func staticFileServer() (http.Handler, error) {
+	fsys, err := fs.Sub(staticFS, staticDir)
 	if err != nil {
 		return nil, fmt.Errorf("error creating filesystem subtree: %w", err)
 	}
 
 	return http.FileServer(http.FS(fsys)), nil
 }
+
+type Style struct {
+	Name    string
+	Variant string
+}
+
+func rootHandler(s string) http.Handler {
+	unpack := func(vals []string, vars ...*string) {
+		for i, val := range vals {
+			*vars[i] = val
+		}
+	}
+
+	var style Style
+	unpack(strings.Split(s, ":"), &style.Name, &style.Variant)
+
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/" {
+			http.NotFound(w, r)
+			return
+		}
+
+		templateFiles := []string{
+			templatesDir + "/" + "index.html",
+			templatesDir + "/" + "styles" + "/" + style.Name + ".html",
+		}
+
+		ts, err := template.ParseFS(templatesFS, templateFiles...)
+		if err != nil {
+			log.Println(err.Error())
+			status := http.StatusInternalServerError
+			http.Error(w, http.StatusText(status), status)
+			return
+		}
+
+		data := struct {
+			Style Style
+		}{
+			Style: style,
+		}
+		if err := ts.Execute(w, data); err != nil {
+			log.Println(err.Error())
+			status := http.StatusInternalServerError
+			http.Error(w, http.StatusText(status), status)
+			return
+		}
+	})
+}

pkg/server/server.go

@@ -11,8 +11,13 @@ import (
 	"github.com/cluttrdev/showdown/pkg/content"
 )
 
+type ServerConfig struct {
+	Title string
+	Style string
+}
+
 type Server struct {
-	Title    string
+	Config   ServerConfig
 	Renderer content.Renderer
 
 	sockets map[*websocket.Conn]context.CancelFunc
@@ -57,14 +62,15 @@ func (s *Server) Serve(ctx context.Context, addr string) error {
 }
 
 func (s *Server) routes() (*http.ServeMux, error) {
-	fs, err := fileServer()
+	sfs, err := staticFileServer()
 	if err != nil {
 		return nil, err
 	}
 
 	mux := http.NewServeMux()
 
-	mux.Handle("/", fs)
+	mux.Handle("/", rootHandler(s.Config.Style))
+	mux.Handle("/static/", http.StripPrefix("/static", sfs))
 	mux.Handle("/ws", websocket.Handler(s.handleWebSocket))
 	mux.HandleFunc("/shutdown", s.handleShutdown)
 

pkg/server/sockets.go

@@ -33,7 +33,7 @@ func (s *Server) handleWebSocket(ws *websocket.Conn) {
 		}
 	}()
 
-	if err := sendMessage(ws, MessageTypeTitle, s.Title); err != nil {
+	if err := sendMessage(ws, MessageTypeTitle, s.Config.Title); err != nil {
 		log.Printf("error sending title: %v\n", err)
 	}