diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff7ea71..b767d9b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,22 +17,22 @@ jobs: uses: actions/setup-go@v4 with: go-version: '1.22' - # - uses: actions/setup-python@v5 - # with: - # python-version: '3.11' + - uses: actions/setup-python@v5 + with: + python-version: '3.11' - # - name: Build - # run: go build -v ./... + - name: Build + run: go build -v ./... - # - name: Test - # run: go test -v ./... + - name: Test + run: go test -v ./... - # - name: E2E Test - # run: | - # cd e2e_tests - # docker compose -f docker-compose.ci.yml up -d - # pip install -r requirements.txt - # pytest + - name: E2E Test + run: | + cd e2e_tests + docker compose -f docker-compose.ci.yml up -d + pip install -r requirements.txt + pytest - name: Build Release env: diff --git a/app/site_config_service.go b/app/site_config_service.go index b433a20..2c35723 100644 --- a/app/site_config_service.go +++ b/app/site_config_service.go @@ -25,7 +25,6 @@ func (svc *SiteConfigService) defaultConfig() model.SiteConfig { return model.SiteConfig{ Title: "My Owl-Blog", SubTitle: "A freshly created blog", - HeaderColor: "#efc48c", PrimaryColor: "#d37f12", AuthorName: "", Me: []model.MeLinks{}, diff --git a/cmd/owl/import_v1.go b/cmd/owl/import_v1.go index d545d12..6b62173 100644 --- a/cmd/owl/import_v1.go +++ b/cmd/owl/import_v1.go @@ -92,7 +92,6 @@ var importCmd = &cobra.Command{ } v2Config.Title = v1Config.Title v2Config.SubTitle = v1Config.SubTitle - v2Config.HeaderColor = v1Config.HeaderColor v2Config.AuthorName = v1Config.AuthorName v2Config.Me = mes v2Config.Lists = lists diff --git a/domain/model/siteconfig.go b/domain/model/siteconfig.go index 3ca0ced..d2f636e 100644 --- a/domain/model/siteconfig.go +++ b/domain/model/siteconfig.go @@ -22,7 +22,6 @@ type MenuItem struct { type SiteConfig struct { Title string SubTitle string - HeaderColor string PrimaryColor string AuthorName string Me []MeLinks diff --git a/render/templates/base.tmpl b/render/templates/base.tmpl index c17528b..40e6824 100644 --- a/render/templates/base.tmpl +++ b/render/templates/base.tmpl @@ -13,7 +13,12 @@ - + + {{ .SiteConfig.HtmlHeadExtra }} diff --git a/render/templates/views/site_config.tmpl b/render/templates/views/site_config.tmpl index 3662964..12bd302 100644 --- a/render/templates/views/site_config.tmpl +++ b/render/templates/views/site_config.tmpl @@ -14,9 +14,6 @@ - - - diff --git a/web/app.go b/web/app.go index 0deed3e..dc1d50b 100644 --- a/web/app.go +++ b/web/app.go @@ -39,7 +39,8 @@ func NewWebApp( apService *app.ActivityPubService, ) *WebApp { fiberApp := fiber.New(fiber.Config{ - BodyLimit: 50 * 1024 * 1024, // 50MB in bytes + BodyLimit: 50 * 1024 * 1024, // 50MB in bytes + DisableStartupMessage: true, }) fiberApp.Use(middleware.NewUserMiddleware(authorService).Handle) diff --git a/web/siteconfig_handler.go b/web/siteconfig_handler.go index 07807a6..c0b929b 100644 --- a/web/siteconfig_handler.go +++ b/web/siteconfig_handler.go @@ -38,7 +38,6 @@ func (h *SiteConfigHandler) HandlePost(c *fiber.Ctx) error { siteConfig.Title = c.FormValue("Title") siteConfig.SubTitle = c.FormValue("SubTitle") - siteConfig.HeaderColor = c.FormValue("HeaderColor") siteConfig.PrimaryColor = c.FormValue("PrimaryColor") siteConfig.AuthorName = c.FormValue("AuthorName") siteConfig.AvatarUrl = c.FormValue("AvatarUrl")