cleanup + primary color usage

This commit is contained in:
Niko Abeler 2024-05-18 21:59:32 +02:00
parent ec13fffbe9
commit a5f24427a1
8 changed files with 21 additions and 22 deletions

View File

@ -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:

View File

@ -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{},

View File

@ -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

View File

@ -22,7 +22,6 @@ type MenuItem struct {
type SiteConfig struct {
Title string
SubTitle string
HeaderColor string
PrimaryColor string
AuthorName string
Me []MeLinks

View File

@ -14,6 +14,11 @@
<link rel='stylesheet' href='/static/owl.css'>
<link rel='stylesheet' href='/static/style.css'>
<style>
:root {
--primary: {{.SiteConfig.PrimaryColor}};
}
</style>
{{ .SiteConfig.HtmlHeadExtra }}
</head>
<body>

View File

@ -14,9 +14,6 @@
<label for="SubTitle">SubTitle</label>
<input type="text" name="SubTitle" id="SubTitle" value="{{.SubTitle}}"/>
<label for="HeaderColor">HeaderColor</label>
<input type="color" name="HeaderColor" id="HeaderColor" value="{{.HeaderColor}}"/>
<label for="PrimaryColor">PrimaryColor</label>
<input type="color" name="PrimaryColor" id="PrimaryColor" value="{{.PrimaryColor}}"/>

View File

@ -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)

View File

@ -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")