mirror of
https://github.com/karl0ss/homepage.git
synced 2025-04-29 12:03:41 +01:00
Merge pull request #1548 from benphelps/fix/issue-1546
Enhancement: support settings layout as a list
This commit is contained in:
commit
6dfddf739e
@ -65,5 +65,20 @@ export function getSettings() {
|
|||||||
const settingsYaml = join(process.cwd(), "config", "settings.yaml");
|
const settingsYaml = join(process.cwd(), "config", "settings.yaml");
|
||||||
const rawFileContents = readFileSync(settingsYaml, "utf8");
|
const rawFileContents = readFileSync(settingsYaml, "utf8");
|
||||||
const fileContents = substituteEnvironmentVars(rawFileContents);
|
const fileContents = substituteEnvironmentVars(rawFileContents);
|
||||||
return yaml.load(fileContents) ?? {};
|
const initialSettings = yaml.load(fileContents) ?? {};
|
||||||
|
|
||||||
|
if (initialSettings.layout) {
|
||||||
|
// support yaml list but old spec was object so convert to that
|
||||||
|
// see https://github.com/benphelps/homepage/issues/1546
|
||||||
|
if (Array.isArray(initialSettings.layout)) {
|
||||||
|
const layoutItems = initialSettings.layout
|
||||||
|
initialSettings.layout = {}
|
||||||
|
layoutItems.forEach(i => {
|
||||||
|
const name = Object.keys(i)[0]
|
||||||
|
initialSettings.layout[name] = i[name]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return initialSettings
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user