cleanup + primary color usage
This commit is contained in:
parent
ec13fffbe9
commit
a5f24427a1
|
@ -17,22 +17,22 @@ jobs:
|
||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: '1.22'
|
go-version: '1.22'
|
||||||
# - uses: actions/setup-python@v5
|
- uses: actions/setup-python@v5
|
||||||
# with:
|
with:
|
||||||
# python-version: '3.11'
|
python-version: '3.11'
|
||||||
|
|
||||||
# - name: Build
|
- name: Build
|
||||||
# run: go build -v ./...
|
run: go build -v ./...
|
||||||
|
|
||||||
# - name: Test
|
- name: Test
|
||||||
# run: go test -v ./...
|
run: go test -v ./...
|
||||||
|
|
||||||
# - name: E2E Test
|
- name: E2E Test
|
||||||
# run: |
|
run: |
|
||||||
# cd e2e_tests
|
cd e2e_tests
|
||||||
# docker compose -f docker-compose.ci.yml up -d
|
docker compose -f docker-compose.ci.yml up -d
|
||||||
# pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
# pytest
|
pytest
|
||||||
|
|
||||||
- name: Build Release
|
- name: Build Release
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -25,7 +25,6 @@ func (svc *SiteConfigService) defaultConfig() model.SiteConfig {
|
||||||
return model.SiteConfig{
|
return model.SiteConfig{
|
||||||
Title: "My Owl-Blog",
|
Title: "My Owl-Blog",
|
||||||
SubTitle: "A freshly created blog",
|
SubTitle: "A freshly created blog",
|
||||||
HeaderColor: "#efc48c",
|
|
||||||
PrimaryColor: "#d37f12",
|
PrimaryColor: "#d37f12",
|
||||||
AuthorName: "",
|
AuthorName: "",
|
||||||
Me: []model.MeLinks{},
|
Me: []model.MeLinks{},
|
||||||
|
|
|
@ -92,7 +92,6 @@ var importCmd = &cobra.Command{
|
||||||
}
|
}
|
||||||
v2Config.Title = v1Config.Title
|
v2Config.Title = v1Config.Title
|
||||||
v2Config.SubTitle = v1Config.SubTitle
|
v2Config.SubTitle = v1Config.SubTitle
|
||||||
v2Config.HeaderColor = v1Config.HeaderColor
|
|
||||||
v2Config.AuthorName = v1Config.AuthorName
|
v2Config.AuthorName = v1Config.AuthorName
|
||||||
v2Config.Me = mes
|
v2Config.Me = mes
|
||||||
v2Config.Lists = lists
|
v2Config.Lists = lists
|
||||||
|
|
|
@ -22,7 +22,6 @@ type MenuItem struct {
|
||||||
type SiteConfig struct {
|
type SiteConfig struct {
|
||||||
Title string
|
Title string
|
||||||
SubTitle string
|
SubTitle string
|
||||||
HeaderColor string
|
|
||||||
PrimaryColor string
|
PrimaryColor string
|
||||||
AuthorName string
|
AuthorName string
|
||||||
Me []MeLinks
|
Me []MeLinks
|
||||||
|
|
|
@ -14,6 +14,11 @@
|
||||||
|
|
||||||
<link rel='stylesheet' href='/static/owl.css'>
|
<link rel='stylesheet' href='/static/owl.css'>
|
||||||
<link rel='stylesheet' href='/static/style.css'>
|
<link rel='stylesheet' href='/static/style.css'>
|
||||||
|
<style>
|
||||||
|
:root {
|
||||||
|
--primary: {{.SiteConfig.PrimaryColor}};
|
||||||
|
}
|
||||||
|
</style>
|
||||||
{{ .SiteConfig.HtmlHeadExtra }}
|
{{ .SiteConfig.HtmlHeadExtra }}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
|
@ -14,9 +14,6 @@
|
||||||
<label for="SubTitle">SubTitle</label>
|
<label for="SubTitle">SubTitle</label>
|
||||||
<input type="text" name="SubTitle" id="SubTitle" value="{{.SubTitle}}"/>
|
<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>
|
<label for="PrimaryColor">PrimaryColor</label>
|
||||||
<input type="color" name="PrimaryColor" id="PrimaryColor" value="{{.PrimaryColor}}"/>
|
<input type="color" name="PrimaryColor" id="PrimaryColor" value="{{.PrimaryColor}}"/>
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,7 @@ func NewWebApp(
|
||||||
) *WebApp {
|
) *WebApp {
|
||||||
fiberApp := fiber.New(fiber.Config{
|
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)
|
fiberApp.Use(middleware.NewUserMiddleware(authorService).Handle)
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,6 @@ func (h *SiteConfigHandler) HandlePost(c *fiber.Ctx) error {
|
||||||
|
|
||||||
siteConfig.Title = c.FormValue("Title")
|
siteConfig.Title = c.FormValue("Title")
|
||||||
siteConfig.SubTitle = c.FormValue("SubTitle")
|
siteConfig.SubTitle = c.FormValue("SubTitle")
|
||||||
siteConfig.HeaderColor = c.FormValue("HeaderColor")
|
|
||||||
siteConfig.PrimaryColor = c.FormValue("PrimaryColor")
|
siteConfig.PrimaryColor = c.FormValue("PrimaryColor")
|
||||||
siteConfig.AuthorName = c.FormValue("AuthorName")
|
siteConfig.AuthorName = c.FormValue("AuthorName")
|
||||||
siteConfig.AvatarUrl = c.FormValue("AvatarUrl")
|
siteConfig.AvatarUrl = c.FormValue("AvatarUrl")
|
||||||
|
|
Loading…
Reference in New Issue