mirror of
https://github.com/glanceapp/glance.git
synced 2025-06-21 18:31:24 +02:00
Update branding config
This commit is contained in:
parent
9899f6b761
commit
f57bdeec12
@ -660,6 +660,16 @@ kbd:active {
|
|||||||
padding-right: var(--widget-content-horizontal-padding);
|
padding-right: var(--widget-content-horizontal-padding);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.logo:has(img) {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo img {
|
||||||
|
aspect-ratio: 1;
|
||||||
|
max-width: 2.7rem;
|
||||||
|
}
|
||||||
|
|
||||||
.nav {
|
.nav {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
gap: var(--header-items-gap);
|
gap: var(--header-items-gap);
|
||||||
|
@ -12,9 +12,8 @@
|
|||||||
<meta name="apple-mobile-web-app-title" content="Glance">
|
<meta name="apple-mobile-web-app-title" content="Glance">
|
||||||
<meta name="theme-color" content="{{ if ne nil .App.Config.Theme.BackgroundColor }}{{ .App.Config.Theme.BackgroundColor }}{{ else }}hsl(240, 8%, 9%){{ end }}">
|
<meta name="theme-color" content="{{ if ne nil .App.Config.Theme.BackgroundColor }}{{ .App.Config.Theme.BackgroundColor }}{{ else }}hsl(240, 8%, 9%){{ end }}">
|
||||||
<link rel="apple-touch-icon" sizes="512x512" href="{{ .App.AssetPath "app-icon.png" }}">
|
<link rel="apple-touch-icon" sizes="512x512" href="{{ .App.AssetPath "app-icon.png" }}">
|
||||||
<link rel="icon" type="image/png" sizes="50x50" href="{{ .App.AssetPath "favicon.png" }}">
|
|
||||||
<link rel="manifest" href="{{ .App.AssetPath "manifest.json" }}">
|
<link rel="manifest" href="{{ .App.AssetPath "manifest.json" }}">
|
||||||
<link rel="icon" type="image/png" href="{{ .App.AssetPath "favicon.png" }}" />
|
<link rel="icon" type="image/png" href="{{ .App.Config.Branding.FaviconURL }}" />
|
||||||
<link rel="stylesheet" href="{{ .App.AssetPath "main.css" }}">
|
<link rel="stylesheet" href="{{ .App.AssetPath "main.css" }}">
|
||||||
<script type="module" src="{{ .App.AssetPath "main.js" }}"></script>
|
<script type="module" src="{{ .App.AssetPath "main.js" }}"></script>
|
||||||
{{ block "document-head-after" . }}{{ end }}
|
{{ block "document-head-after" . }}{{ end }}
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
<div class="header-container content-bounds">
|
<div class="header-container content-bounds">
|
||||||
<div class="header flex padding-inline-widget widget-content-frame">
|
<div class="header flex padding-inline-widget widget-content-frame">
|
||||||
<!-- TODO: Replace G with actual logo, first need an actual logo -->
|
<!-- TODO: Replace G with actual logo, first need an actual logo -->
|
||||||
<div class="logo">G</div>
|
<div class="logo">{{ if ne "" .App.Config.Branding.LogoURL }}<img src="{{ .App.Config.Branding.LogoURL }}" alt="">{{ else if ne "" .App.Config.Branding.LogoText }}{{ .App.Config.Branding.LogoText }}{{ else }}{{ end }}</div>
|
||||||
<div class="nav flex grow">
|
<div class="nav flex grow">
|
||||||
{{ template "navigation-links" . }}
|
{{ template "navigation-links" . }}
|
||||||
</div>
|
</div>
|
||||||
@ -63,7 +63,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{ if not .App.Config.Branding.Show }}
|
{{ if not .App.Config.Branding.HideFooter }}
|
||||||
<div class="footer flex items-center flex-column">
|
<div class="footer flex items-center flex-column">
|
||||||
<div>
|
<div>
|
||||||
<a class="size-h3" href="https://github.com/glanceapp/glance" target="_blank" rel="noreferrer">Glance</a> {{ if ne "dev" .App.Version }}<a class="visited-indicator" title="Release notes" href="https://github.com/glanceapp/glance/releases/tag/{{ .App.Version }}" target="_blank" rel="noreferrer">{{ .App.Version }}</a>{{ else }}({{ .App.Version }}){{ end }}
|
<a class="size-h3" href="https://github.com/glanceapp/glance" target="_blank" rel="noreferrer">Glance</a> {{ if ne "dev" .App.Version }}<a class="visited-indicator" title="Release notes" href="https://github.com/glanceapp/glance/releases/tag/{{ .App.Version }}" target="_blank" rel="noreferrer">{{ .App.Version }}</a>{{ else }}({{ .App.Version }}){{ end }}
|
||||||
|
@ -8,10 +8,10 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Server Server `yaml:"server"`
|
Server Server `yaml:"server"`
|
||||||
Theme Theme `yaml:"theme"`
|
Theme Theme `yaml:"theme"`
|
||||||
Pages []Page `yaml:"pages"`
|
Branding Branding `yaml:"branding"`
|
||||||
Branding Branding `yaml:"branding"`
|
Pages []Page `yaml:"pages"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewConfigFromYml(contents io.Reader) (*Config, error) {
|
func NewConfigFromYml(contents io.Reader) (*Config, error) {
|
||||||
@ -51,9 +51,7 @@ func NewConfig() *Config {
|
|||||||
|
|
||||||
config.Server.Host = ""
|
config.Server.Host = ""
|
||||||
config.Server.Port = 8080
|
config.Server.Port = 8080
|
||||||
config.Branding.Show = true
|
config.Branding.LogoText = "G"
|
||||||
config.Branding.Name = "Glance"
|
|
||||||
config.Branding.ShortName = "G"
|
|
||||||
|
|
||||||
return config
|
return config
|
||||||
}
|
}
|
||||||
|
@ -49,9 +49,10 @@ type Server struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Branding struct {
|
type Branding struct {
|
||||||
Show bool `yaml:show`
|
HideFooter bool `yaml:"hide-footer"`
|
||||||
Name string `yaml:name`
|
LogoText string `yaml:"logo-text"`
|
||||||
ShortName string `yaml:"short-name"`
|
LogoURL string `yaml:"logo-url"`
|
||||||
|
FaviconURL string `yaml:"favicon-url"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Column struct {
|
type Column struct {
|
||||||
@ -108,6 +109,14 @@ func titleToSlug(s string) string {
|
|||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *Application) TransformUserDefinedAssetPath(path string) string {
|
||||||
|
if strings.HasPrefix(path, "/assets/") {
|
||||||
|
return a.Config.Server.BaseURL + path
|
||||||
|
}
|
||||||
|
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
|
||||||
func NewApplication(config *Config) (*Application, error) {
|
func NewApplication(config *Config) (*Application, error) {
|
||||||
if len(config.Pages) == 0 {
|
if len(config.Pages) == 0 {
|
||||||
return nil, fmt.Errorf("no pages configured")
|
return nil, fmt.Errorf("no pages configured")
|
||||||
@ -120,6 +129,7 @@ func NewApplication(config *Config) (*Application, error) {
|
|||||||
widgetByID: make(map[uint64]widget.Widget),
|
widgetByID: make(map[uint64]widget.Widget),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
app.Config.Server.AssetsHash = assets.PublicFSHash
|
||||||
app.slugToPage[""] = &config.Pages[0]
|
app.slugToPage[""] = &config.Pages[0]
|
||||||
|
|
||||||
for p := range config.Pages {
|
for p := range config.Pages {
|
||||||
@ -140,13 +150,16 @@ func NewApplication(config *Config) (*Application, error) {
|
|||||||
config = &app.Config
|
config = &app.Config
|
||||||
|
|
||||||
config.Server.BaseURL = strings.TrimRight(config.Server.BaseURL, "/")
|
config.Server.BaseURL = strings.TrimRight(config.Server.BaseURL, "/")
|
||||||
|
config.Theme.CustomCSSFile = app.TransformUserDefinedAssetPath(config.Theme.CustomCSSFile)
|
||||||
|
|
||||||
if config.Server.BaseURL != "" &&
|
if config.Branding.FaviconURL == "" {
|
||||||
config.Theme.CustomCSSFile != "" &&
|
config.Branding.FaviconURL = app.AssetPath("favicon.png")
|
||||||
strings.HasPrefix(config.Theme.CustomCSSFile, "/assets/") {
|
} else {
|
||||||
config.Theme.CustomCSSFile = config.Server.BaseURL + config.Theme.CustomCSSFile
|
config.Branding.FaviconURL = app.TransformUserDefinedAssetPath(config.Branding.FaviconURL)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
config.Branding.LogoURL = app.TransformUserDefinedAssetPath(config.Branding.LogoURL)
|
||||||
|
|
||||||
return app, nil
|
return app, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -244,8 +257,6 @@ func (a *Application) AssetPath(asset string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *Application) Serve() error {
|
func (a *Application) Serve() error {
|
||||||
a.Config.Server.AssetsHash = assets.PublicFSHash
|
|
||||||
|
|
||||||
// TODO: add gzip support, static files must have their gzipped contents cached
|
// TODO: add gzip support, static files must have their gzipped contents cached
|
||||||
// TODO: add HTTPS support
|
// TODO: add HTTPS support
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user