leeworks-agents/gitea-mobile
5
0
Fork 0
Code Issues 42 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

feat: embed templates and static assets with go:embed #232

Open
AI-Manager wants to merge 1 commits from feat/go-embed-assets-231 into master
pull from: feat/go-embed-assets-231
merge into: leeworks-agents:master
Conversation 4 Commits 1 Files Changed 6
+38 -39
6 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+2 -2
View File
@@ -7,10 +7,10 @@ COPY . .
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /gitea-mobile ./cmd/server
# Stage 2: Runtime
# Templates and static assets are embedded in the binary via go:embed,
# so no COPY steps are needed for them.
FROM gcr.io/distroless/static:nonroot
COPY --from=builder /gitea-mobile /gitea-mobile
COPY static/ /static/
COPY internal/templates/ /templates/
EXPOSE 8080
USER nonroot:nonroot
ENTRYPOINT ["/gitea-mobile"]
internal/handlers/handlers.go
+13 -11
View File
@@ -12,6 +12,8 @@ import (
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/config"
giteaclient "gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/gitea"
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/middleware"
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/templates"
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/static"
)
// Handler holds shared dependencies for all HTTP handlers.
@@ -64,8 +66,8 @@ func (h *Handler) RegisterRoutes(mux *http.ServeMux) {
}
mux.HandleFunc("/settings", settingsHandler.ServeHTTP)
// Static files.
mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
// Static files — served from embedded filesystem.
mux.Handle("/static/", http.StripPrefix("/static/", http.FileServerFS(static.FS)))
}
// isHTMX returns true if the request is an HTMX partial request.
@@ -235,7 +237,7 @@ func (h *Handler) ErrorInternal(w http.ResponseWriter, r *http.Request) {
// renderError renders the error template with the given data and status code.
func (h *Handler) renderError(w http.ResponseWriter, r *http.Request, data errorData) {
tmpl, err := template.ParseFiles("internal/templates/error.html")
tmpl, err := template.ParseFS(templates.FS, "error.html")
if err != nil {
slog.Error("failed to parse error template", "error", err)
http.Error(w, fmt.Sprintf("%d %s", data.Code, data.Title), data.Code)
@@ -298,7 +300,7 @@ func (h *Handler) Dashboard(w http.ResponseWriter, r *http.Request) {
}
}
tmpl, err := template.ParseFiles("internal/templates/dashboard.html")
tmpl, err := template.ParseFS(templates.FS, "dashboard.html")
if err != nil {
slog.Error("failed to parse dashboard template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
@@ -390,7 +392,7 @@ func (h *Handler) ListIssues(w http.ResponseWriter, r *http.Request) {
// For HTMX infinite-scroll requests (page > 1), return only the card fragment.
if isHTMX(r) && page > 1 {
tmpl, err := template.ParseFiles("internal/templates/issues.html")
tmpl, err := template.ParseFS(templates.FS, "issues.html")
if err != nil {
slog.Error("failed to parse issues template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
@@ -407,7 +409,7 @@ func (h *Handler) ListIssues(w http.ResponseWriter, r *http.Request) {
return
}
tmpl, err := template.ParseFiles("internal/templates/issues.html")
tmpl, err := template.ParseFS(templates.FS, "issues.html")
if err != nil {
slog.Error("failed to parse issues template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
@@ -502,7 +504,7 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
// For HTMX infinite-scroll requests (page > 1), return only the card fragment.
if isHTMX(r) && page > 1 {
tmpl, err := template.ParseFiles("internal/templates/pulls.html")
tmpl, err := template.ParseFS(templates.FS, "pulls.html")
if err != nil {
slog.Error("failed to parse pulls template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
@@ -519,7 +521,7 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
return
}
tmpl, err := template.ParseFiles("internal/templates/pulls.html")
tmpl, err := template.ParseFS(templates.FS, "pulls.html")
if err != nil {
slog.Error("failed to parse pulls template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
@@ -587,7 +589,7 @@ func (h *Handler) IssueDetail(w http.ResponseWriter, r *http.Request) {
}
// Build the content HTML using the template.
tmpl, err := template.ParseFiles("internal/templates/issue_detail.html")
tmpl, err := template.ParseFS(templates.FS, "issue_detail.html")
if err != nil {
slog.Error("failed to parse issue_detail template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
@@ -660,7 +662,7 @@ func (h *Handler) PullDetail(w http.ResponseWriter, r *http.Request) {
}
// Build the content HTML using the template.
tmpl, err := template.ParseFiles("internal/templates/pull_detail.html")
tmpl, err := template.ParseFS(templates.FS, "pull_detail.html")
if err != nil {
slog.Error("failed to parse pull_detail template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
@@ -701,7 +703,7 @@ func (h *Handler) NewIssue(w http.ResponseWriter, r *http.Request) {
return
}
tmpl, err := template.ParseFiles("internal/templates/create_issue.html")
tmpl, err := template.ParseFS(templates.FS, "create_issue.html")
if err != nil {
slog.Error("failed to parse create_issue template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
internal/handlers/integration_test.go
+2 -23
View File
@@ -7,9 +7,6 @@ import (
"net/http"
"net/http/httptest"
"net/url"
"os"
"path/filepath"
"runtime"
"strings"
"testing"
@@ -18,26 +15,8 @@ import (
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/middleware"
)
// TestMain changes the working directory to the project root so that
// template files can be found by handlers that use relative paths.
func TestMain(m *testing.M) {
// Walk up from this source file to find the project root (where go.mod lives).
_, filename, _, _ := runtime.Caller(0)
dir := filepath.Dir(filename)
for {
if _, err := os.Stat(filepath.Join(dir, "go.mod")); err == nil {
break
}
parent := filepath.Dir(dir)
if parent == dir {
// Reached filesystem root without finding go.mod; run tests from cwd.
break
}
dir = parent
}
_ = os.Chdir(dir)
os.Exit(m.Run())
}
// Note: TestMain is no longer needed because templates and static assets
// are embedded at compile time via go:embed. Tests work from any directory.
// mockGiteaAPI starts an httptest server that simulates the Gitea API
// endpoints needed by the handlers. Returns the server and a cleanup func.
internal/handlers/settings.go
+2 -3
View File
@@ -8,10 +8,9 @@ import (
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/auth"
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/middleware"
"gitea.leeworks.dev/0xwheatyz/gitea-mobile/internal/templates"
)
const settingsTemplatePath = "internal/templates/settings.html"
// SettingsHandler handles GET and POST requests for the settings page.
type SettingsHandler struct {
SessionSecret string
@@ -101,7 +100,7 @@ func (h *SettingsHandler) renderWithMessage(w http.ResponseWriter, r *http.Reque
}
func (h *SettingsHandler) renderSettings(w http.ResponseWriter, data settingsData) {
tmpl, err := template.ParseFiles(settingsTemplatePath)
tmpl, err := template.ParseFS(templates.FS, "settings.html")
if err != nil {
slog.Error("failed to parse settings template", "error", err)
http.Error(w, "template error", http.StatusInternalServerError)
internal/templates/embed.go
+9
View File
@@ -0,0 +1,9 @@
// Package templates provides embedded HTML template files.
package templates
import "embed"
// FS contains all HTML template files embedded at compile time.
//
//go:embed *.html
var FS embed.FS
static/embed.go
+10
View File
@@ -0,0 +1,10 @@
// Package static provides embedded static asset files (CSS, JS, icons, etc.).
package static
import "embed"
// FS contains all static asset files embedded at compile time.
// Files are served via http.FileServerFS in the handlers package.
//
//go:embed *.css *.js *.json *.png
var FS embed.FS