diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/config.go | 21 | ||||
| -rw-r--r-- | backend/data.go | 9 | ||||
| -rw-r--r-- | backend/templates/base.html | 12 |
3 files changed, 26 insertions, 16 deletions
diff --git a/backend/config.go b/backend/config.go index 33665ea..8c111ae 100644 --- a/backend/config.go +++ b/backend/config.go @@ -18,14 +18,18 @@ type Logo struct { } type Config struct { - Domain string `toml:"domain"` - Name string `toml:"name"` - Description string `toml:"description"` - Links []Link `toml:"links"` - Logo Logo `toml:"logo"` - LogFolder string `toml:"log_folder"` - RootFolder string `toml:"root_folder"` - Quotes []string `toml:"quotes"` + Domain string `toml:"domain"` + Name string `toml:"name"` + Description string `toml:"description"` + DefaultImage string `toml:"default_image"` + Quotes []string `toml:"quotes"` + + LogFolder string `toml:"log_folder"` + RootFolder string `toml:"root_folder"` + PublicFolder string `toml:"public_folder"` + + Links []Link `toml:"links"` + Logo Logo `toml:"logo"` } func (c *Config) DefaultValues() { @@ -48,6 +52,7 @@ func (c *Config) DefaultValues() { } c.LogFolder = "data/logs" c.RootFolder = "data" + c.PublicFolder = "public" c.Quotes = []string{"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do."} } diff --git a/backend/data.go b/backend/data.go index 741a5c4..3635a7e 100644 --- a/backend/data.go +++ b/backend/data.go @@ -58,6 +58,9 @@ func (d *data) handleGeneric(w http.ResponseWriter, r *http.Request, name string d.Quote = cfg.Quotes[rand.Intn(len(cfg.Quotes))] } } + if d.Image == "" { + d.Image = cfg.DefaultImage + } if d.URL == "" { if !strings.HasPrefix(r.URL.Path, "/") { r.URL.Path = "/" + r.URL.Path @@ -71,6 +74,12 @@ func (d *data) handleGeneric(w http.ResponseWriter, r *http.Request, name string } return fmt.Sprintf("/static/%s", path) }, + "fullStatic": func(path string) string { + if regexIsHttp.MatchString(path) { + return path + } + return fmt.Sprintf("https://%s/static/%s", cfg.Domain, path) + }, "assets": func(path string) string { if regexIsHttp.MatchString(path) { return path diff --git a/backend/templates/base.html b/backend/templates/base.html index a79f4c1..f0ae617 100644 --- a/backend/templates/base.html +++ b/backend/templates/base.html @@ -11,7 +11,7 @@ <meta property="og:title" content="{{ .Title }}" /> <meta property="og:type" content="website" /> <meta property="og:url" content="https://{{ .Domain }}{{ .URL }}" /> - <meta property="og:image" content="https://{{ .Domain }}{{ static .Image }}" /> + <meta property="og:image" content="{{ fullStatic .Image }}" /> <meta property="og:description" content="{{ .Description }}" /> <meta property="og:local" content="fr_FR" /> <meta property="og:site_name" content="{{ .Name }}" /> @@ -19,20 +19,16 @@ <!-- Twitter --> <meta name="twitter:card" content="summary_large_image" /> <meta property="twitter:domain" content="{{ .Domain }}" /> - <meta property="twitter:url" content="https://{{ .Domain }}{{ .URL }}/" /> + <meta property="twitter:url" content="https://{{ .Domain }}{{ .URL }}" /> <meta name="twitter:title" content="{{ .Title }}" /> <meta name="twitter:description" content="{{ .Description }}" /> - <meta name="twitter:image" content="https://{{ .Domain }}{{ static .Image }}" /> + <meta name="twitter:image" content="{{ fullStatic .Image }}" /> </head> <body> <header> <img src="{{ static .Logo.Header }}" alt="Logo"> <nav> - {{ range .Links }} - <a href="{{ .URL }}"> - {{ .Name }} - </a> - {{end}} + {{ range .Links }}<a href="{{ .URL }}">{{ .Name }}</a>{{end}} </nav> </header> {{ template "body" . }} |