Skip to content

Commit

Permalink
Fix: Adjust HTML page title to customized AppTitle (#107)
Browse files Browse the repository at this point in the history
Co-authored-by: Knut Ahlers <[email protected]>
  • Loading branch information
sorcix and Luzifer committed Aug 10, 2023
1 parent f768beb commit ff29af2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ In order to be adjustable to your needs there are some ways to customize your OT
appIcon: ''

# Override the app-title, if unset or empty the default app-title
# "OTS - One Time Secret" will be used
# "OTS - One Time Secrets" will be used
appTitle: ''

# Disable display of the app-title (for example if you included the
Expand Down
24 changes: 16 additions & 8 deletions customize.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ type (
}
)

func loadCustomize(filename string) (customize, error) {
func loadCustomize(filename string) (cust customize, err error) {
if filename == "" {
// None given, take a shortcut
return customize{}, nil
cust.applyFixes()
return cust, nil
}

var cust customize

cf, err := os.Open(filename)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
Expand All @@ -43,13 +42,22 @@ func loadCustomize(filename string) (customize, error) {
}
defer cf.Close()

return cust, errors.Wrap(
yaml.NewDecoder(cf).Decode(&cust),
"decoding customize file",
)
if err = yaml.NewDecoder(cf).Decode(&cust); err != nil {
return cust, errors.Wrap(err, "decoding customize file")
}

cust.applyFixes()

return cust, nil
}

func (c customize) ToJSON() (string, error) {
j, err := json.Marshal(c)
return string(j), errors.Wrap(err, "marshalling JSON")
}

func (c *customize) applyFixes() {
if len(c.AppTitle) == 0 {
c.AppTitle = "OTS - One Time Secrets"
}
}
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
rel="stylesheet"
>

<title>OTS - One Time Secrets</title>
<title>{{ .Customize.AppTitle }}</title>

<script nonce="{{ .InlineContentNonce }}">
window.getTheme = () => localStorage.getItem('set-color-scheme') || (window.matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'dark')
Expand Down
2 changes: 1 addition & 1 deletion src/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class="mr-1"
:src="customize.appIcon"
>
<span v-if="!customize.disableAppTitle">{{ customize.appTitle || 'OTS - One Time Secrets' }}</span>
<span v-if="!customize.disableAppTitle">{{ customize.appTitle }}</span>
</b-navbar-brand>

<b-navbar-toggle target="nav-collapse" />
Expand Down

0 comments on commit ff29af2

Please sign in to comment.