feat: embed static assets (#8)

* build(makefile): add target command to download htmx and bootstrap * build(static): add a directory to contain the static assets * feat(main): add embed pkg to embed static assest into the go binary * feat(templates): replace the cdn links to the assets with the static ones
danvergara · Oct 31, 2023 · aed9b0e · aed9b0e
1 parent 9f6d6bd
commit aed9b0e
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,18 @@
+HTMX_VERSION=1.9.6
+BOOTSTRAP_VERSION=5.3.2
+
 .PHONY: run
 ## run: Runs the air command.
 run:
 	air -c .air.toml
+
+.PHONY: download-htmx
+## download-htmx: Downloads HTMX minified js file
+download-htmx:
+	curl -o static/htmx.min.js https://unpkg.com/htmx.org@${HTMX_VERSION}/dist/htmx.min.js
+
+.PHONY: download-bootstrap
+## download-bootstrap: Downloads Bootstrap minified css/js file
+download-bootstrap:
+	curl -o static/bootstrap.min.css https://cdn.jsdelivr.net/npm/bootstrap@${BOOTSTRAP_VERSION}/dist/css/bootstrap.min.css
+	curl -o static/bootstrap.min.js https://cdn.jsdelivr.net/npm/bootstrap@${BOOTSTRAP_VERSION}/dist/js/bootstrap.bundle.min.js
diff --git a/main.go b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"embed"
 	"fmt"
 	"html/template"
 	"io"
@@ -21,6 +22,14 @@ const (
 	uploadFileFormField = "uploadFile"
 )
 
+var (
+	//go:embed all:templates
+	templatesHTML embed.FS
+
+	//go:embed all:static
+	staticFiles embed.FS
+)
+
 type ConvertedFile struct {
 	Filename string
 }
@@ -32,16 +41,16 @@ type FileFormat struct {
 
 func index(w http.ResponseWriter, _ *http.Request) {
 	files := []string{
-		"./templates/base.tmpl",
-		"./templates/partials/htmx.tmpl",
-		"./templates/partials/style.tmpl",
-		"./templates/partials/nav.tmpl",
-		"./templates/partials/form.tmpl",
-		"./templates/partials/modal.tmpl",
-		"./templates/partials/js.tmpl",
+		"templates/base.tmpl",
+		"templates/partials/htmx.tmpl",
+		"templates/partials/style.tmpl",
+		"templates/partials/nav.tmpl",
+		"templates/partials/form.tmpl",
+		"templates/partials/modal.tmpl",
+		"templates/partials/js.tmpl",
 	}
 
-	tmpl, err := template.ParseFiles(files...)
+	tmpl, err := template.ParseFS(templatesHTML, files...)
 	if err != nil {
 		log.Printf("error ocurred parsing templates: %v", err)
 		renderError(w, "INTERNAL_ERROR", http.StatusInternalServerError)
@@ -123,11 +132,11 @@ func handleUploadFile(w http.ResponseWriter, r *http.Request) {
 	}
 
 	files := []string{
-		"./templates/partials/card_file.tmpl",
-		"./templates/partials/modal.tmpl",
+		"templates/partials/card_file.tmpl",
+		"templates/partials/modal.tmpl",
 	}
 
-	tmpl, err := template.ParseFiles(files...)
+	tmpl, err := template.ParseFS(templatesHTML, files...)
 	if err != nil {
 		log.Printf("error occurred parsing template files: %v", err)
 		renderError(w, "INTERNAL_ERROR", http.StatusInternalServerError)
@@ -162,10 +171,10 @@ func handleFileFormat(w http.ResponseWriter, r *http.Request) {
 	detectedFileType := http.DetectContentType(fileBytes)
 
 	files := []string{
-		"./templates/partials/form.tmpl",
+		"templates/partials/form.tmpl",
 	}
 
-	tmpl, err := template.ParseFiles(files...)
+	tmpl, err := template.ParseFS(templatesHTML, files...)
 	switch detectedFileType {
 	case "image/jpeg", "image/jpg":
 		formats = map[string][]FileFormat{
@@ -193,10 +202,10 @@ func handleModal(w http.ResponseWriter, r *http.Request) {
 	filename := r.URL.Query().Get("filename")
 
 	files := []string{
-		"./templates/partials/active_modal.tmpl",
+		"templates/partials/active_modal.tmpl",
 	}
 
-	tmpl, err := template.ParseFiles(files...)
+	tmpl, err := template.ParseFS(templatesHTML, files...)
 	if err != nil {
 		log.Printf("error occurred parsing template files: %v", err)
 		renderError(w, "INTERNAL_ERROR", http.StatusInternalServerError)
@@ -215,9 +224,13 @@ func main() {
 	r := chi.NewRouter()
 	r.Use(middleware.Logger)
 
-	fs := http.FileServer(http.Dir(uploadPath))
+	fsUpload := http.FileServer(http.Dir(uploadPath))
+
+	var staticFS = http.FS(staticFiles)
+	fs := http.FileServer(staticFS)
 
-	r.Handle("/files/*", http.StripPrefix("/files", fs))
+	r.Handle("/static/*", fs)
+	r.Handle("/files/*", http.StripPrefix("/files", fsUpload))
 	r.Get("/", index)
 	r.Post("/upload", handleUploadFile)
 	r.Post("/format", handleFileFormat)

diff --git a/static/bootstrap.min.css b/static/bootstrap.min.css
diff --git a/static/bootstrap.min.js b/static/bootstrap.min.js
diff --git a/static/htmx.min.js b/static/htmx.min.js
diff --git a/templates/partials/htmx.tmpl b/templates/partials/htmx.tmpl
@@ -1,3 +1,3 @@
 {{define "htmx"}}
-    <script src="https://unpkg.com/htmx.[email protected]" integrity="sha384-FhXw7b6AlE/jyjlZH5iHa/tTe9EpJ1Y55RjcgPbjeWMskSxZt1v9qkxLJWNJaGni" crossorigin="anonymous"></script>
+  <script src="/static/htmx.min.js"></script>
 {{end}}
diff --git a/templates/partials/js.tmpl b/templates/partials/js.tmpl
@@ -4,5 +4,5 @@
       htmx.find('#progress').setAttribute('value', evt.detail.loaded/evt.detail.total * 100)
     });
   </script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
+  <script src="/static/bootstrap.min.js"></script>
 {{end}}
diff --git a/templates/partials/style.tmpl b/templates/partials/style.tmpl
@@ -1,3 +1,3 @@
 {{define "style"}}
-  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+  <link href="/static/bootstrap.min.css" rel="stylesheet"></link>
 {{end}}