🚸 校验自定义主题、将 Theme 列表插入所有页面

cmd/dashboard/controller/member_page.go

@@ -81,7 +81,6 @@ func (mp *memberPage) setting(c *gin.Context) {
 	c.HTML(http.StatusOK, "dashboard-"+singleton.Conf.Site.DashboardTheme+"/setting", mygin.CommonEnvironment(c, gin.H{
 		"Title":           singleton.Localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "Settings"}),
 		"Languages":       model.Languages,
-		"Themes":          model.Themes,
 		"DashboardThemes": model.DashboardThemes,
 	}))
 }

pkg/mygin/mygin.go

@@ -24,6 +24,7 @@ func CommonEnvironment(c *gin.Context, data map[string]interface{}) gin.H {
 	data["MatchedPath"] = c.MustGet("MatchedPath")
 	data["Version"] = singleton.Version
 	data["Conf"] = singleton.Conf
+	data["Themes"] = model.Themes
 	// 是否是管理页面
 	data["IsAdminPage"] = adminPage[data["MatchedPath"].(string)]
 	// 站点标题

pkg/mygin/preferred_theme.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/naiba/nezha/model"
+	"github.com/naiba/nezha/pkg/utils"
 	"github.com/naiba/nezha/service/singleton"
 )
 
@@ -12,6 +13,10 @@ func PreferredTheme(c *gin.Context) {
 	// 采用前端传入的主题
 	if theme, err := c.Cookie("preferred_theme"); err == nil {
 		if _, has := model.Themes[theme]; has {
+			// 检验自定义主题
+			if theme == "custom" && singleton.Conf.Site.Theme != "custom" && !utils.IsFileExists("resource/template/custom/home.html") {
+				return
+			}
 			c.Set(model.CtxKeyPreferredTheme, theme)
 		}
 	}