Merge pull request 'develop' (#25) from develop into main

Reviewed-on: #25

core.go

@@ -113,6 +113,26 @@ func (app *App) Run(router *httprouter.Router) {
 		router.ServeFiles("/public/*filepath", http.Dir("storage/public"))
 	}
 
+	// check if app engine is enable
+	AppEnableStr := os.Getenv("APP_ENABLE")
+	if "" == AppEnableStr {
+		AppEnableStr = "false"
+	}
+	AppEnable, _ := strconv.ParseBool(AppEnableStr)
+	if AppEnable {
+		router.ServeFiles("/app/*filepath", http.Dir("storage/app"))
+	}
+
+	// check if app engine is enable
+	CDNEnableStr := os.Getenv("CDN_ENABLE")
+	if "" == CDNEnableStr {
+		CDNEnableStr = "false"
+	}
+	CDNEnable, _ := strconv.ParseBool(CDNEnableStr)
+	if CDNEnable {
+		router.ServeFiles("/cdn/*filepath", http.Dir("storage/cdn"))
+	}
+
 	useHttpsStr := os.Getenv("App_USE_HTTPS")
 	if useHttpsStr == "" {
 		useHttpsStr = "false"

go.mod

@@ -4,7 +4,7 @@ replace git.smarteching.com/goffee/core/logger => ./logger
 
 replace git.smarteching.com/goffee/core/env => ./env
 
-go 1.23.1
+go 1.24.1
 
 require (
 	git.smarteching.com/zeni/go-chart/v2 v2.1.4
@@ -23,8 +23,10 @@ require (
 )
 
 require (
+	git.smarteching.com/zeni/go-charts/v2 v2.6.11 // indirect
 	github.com/SparkPost/gosparkpost v0.2.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/go-chi/chi/v5 v5.0.8 // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect

go.sum

@@ -1,5 +1,7 @@
 git.smarteching.com/zeni/go-chart/v2 v2.1.4 h1:pF06+F6eqJLIG8uMiTVPR5TygPGMjM/FHMzTxmu5V/Q=
 git.smarteching.com/zeni/go-chart/v2 v2.1.4/go.mod h1:b3ueW9h3pGGXyhkormZAvilHaG4+mQti+bMNPdQBeOQ=
+git.smarteching.com/zeni/go-charts/v2 v2.6.11 h1:9udzlv3uxGXszpplfkL5IaTUrgkNj++KwhbaN1vVEqI=
+git.smarteching.com/zeni/go-charts/v2 v2.6.11/go.mod h1:3OpRPSXg7Qx4zcgsmwsC9ZFB9/wAkGSbnXf1wIbHYCg=
 github.com/SparkPost/gosparkpost v0.2.0 h1:yzhHQT7cE+rqzd5tANNC74j+2x3lrPznqPJrxC1yR8s=
 github.com/SparkPost/gosparkpost v0.2.0/go.mod h1:S9WKcGeou7cbPpx0kTIgo8Q69WZvUmVeVzbD+djalJ4=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
@@ -19,6 +21,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
@@ -100,6 +104,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
 golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=

template/components/page_nav.go

@@ -10,6 +10,7 @@ type PageNav struct {
 type PageNavItem struct {
 	Text       string
 	Link       string
+	ID         string
 	IsDisabled bool
 	IsActive   bool
 	ChildItems []PageNavItem

template/components/page_nav.html

@@ -1,11 +1,16 @@
 {{define "page_nav"}}
     <ul class="nav justify-content-center {{.NavClass}} {{if eq .IsVertical true}}flex-column{{end}}{{if eq .IsTab true}}nav-tabs{{end}}" {{if eq .IsTab true}}role="tablist"{{end}}>
         {{range $item := .NavItems}}
-        
             {{if gt (len $item.ChildItems) 0}}
+              {{ $hasActiveChild := false }}
+              {{range $child := $item.ChildItems}}
+                  {{if $child.IsActive}}
+                      {{ $hasActiveChild = true }}
+                  {{end}}
+              {{end}}
                 <li class="nav-item dropdown">
                     <a href="{{$item.Link}}" {{if eq .IsDisabled true}}disabled{{end}} data-bs-toggle="dropdown" 
-                        class="nav-link  dropdown-toggle {{if eq .IsActive true}}active{{end}} {{if eq .IsDisabled true}}disabled{{end}}">{{$item.Text}}</a>
+                        class="nav-link  dropdown-toggle {{if or $item.IsActive $hasActiveChild}}active{{end}} {{if eq .IsDisabled true}}disabled{{end}}">{{$item.Text}}</a>
                     <ul class="dropdown-menu">
                         {{ range $item.ChildItems}}
                             {{template "content_dropdown_item" .}}