cel
/
donetick
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
Mo Tarbin 2024-07-24 23:55:34 -04:00
parent 6ce3bd837d 71f8dfb26c
commit cafc9b6e22
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/dist/index.html vendored Normal file
View File

@ -0,0 +1,9 @@
<html>
<head>
<title>This file will be replaced by the frontend build process</title>
</head>
<body>
<h5>This file will be replaced by the frontend build process</h5>
</body>
</html>

33
frontend/handler.go
View File

@ -23,15 +23,15 @@ func NewHandler(config *config.Config) *Handler {
} }
func Routes(router *gin.Engine, h *Handler) { func Routes(router *gin.Engine, h *Handler) {
if h.ServeFrontend { // this whole logic is walkaround for serving frontend files
router.Use(staticMiddleware("dist")) // TODO: figure out better way to improve it. main issue i run into is failing over to index.html when file does not exist
router.Static("/assets", "dist/assets")
if h.ServeFrontend {
// if file exists in dist folder, serve it
router.Use(staticMiddleware("dist"))
// if file does not exist in dist folder fallback to index.html
router.NoRoute(staticMiddlewareNoRoute("dist"))
// Gzip compression middleware
router.Group("/assets").Use(func(c *gin.Context) {
c.Header("Cache-Control", "max-age=31536000, immutable")
c.Next()
})
} }
} }
@ -40,7 +40,24 @@ func staticMiddleware(root string) gin.HandlerFunc {
fileServer := http.FileServer(getFileSystem(root)) fileServer := http.FileServer(getFileSystem(root))
return func(c *gin.Context) { return func(c *gin.Context) {
_, err := fs.Stat(embeddedFiles, "dist"+c.Request.URL.Path)
if err != nil {
c.Next()
return
}
fileServer.ServeHTTP(c.Writer, c.Request) fileServer.ServeHTTP(c.Writer, c.Request)
}
}
func staticMiddlewareNoRoute(root string) gin.HandlerFunc {
fileServer := http.FileServer(getFileSystem(root))
// always serve index.html for any route does not match:
return func(c *gin.Context) {
// Rewrite all requests to serve index.html
c.Request.URL.Path = "/"
fileServer.ServeHTTP(c.Writer, c.Request)
} }
} }