vh/homepage
1
0
Fork 0
mirror of https://github.com/gethomepage/homepage.git synced 2025-12-07 09:35:54 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'main' into kubernetes

Browse Source
This commit is contained in:
James Wynn
2022-12-08 09:57:51 -06:00
parent c54374068d 88c437562b
commit 174cb651b4
81 changed files with 2717 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils/config/api-response.js
View File

@@ -94,7 +94,8 @@ export async function servicesResponse() {
].flat()),
];
const mergedGroups = [];
const sortedGroups = [];
const unsortedGroups = [];
const definedLayouts = initialSettings.layout ? Object.keys(initialSettings.layout) : null;
mergedGroupsNames.forEach((groupName) => {
@@ -113,12 +114,12 @@ export async function servicesResponse() {
if (definedLayouts) {
const layoutIndex = definedLayouts.findIndex(layout => layout === mergedGroup.name);
if (layoutIndex > -1) mergedGroups.splice(layoutIndex, 0, mergedGroup);
else mergedGroups.push(mergedGroup);
if (layoutIndex > -1) sortedGroups[layoutIndex] = mergedGroup;
else unsortedGroups.push(mergedGroup);
} else {
mergedGroups.push(mergedGroup);
unsortedGroups.push(mergedGroup);
}
});
return mergedGroups;
return [...sortedGroups.filter(g => g), ...unsortedGroups];
}

2
src/utils/config/config.js
View File

@@ -32,5 +32,5 @@ export function getSettings() {
const settingsYaml = join(process.cwd(), "config", "settings.yaml");
const fileContents = readFileSync(settingsYaml, "utf8");
return yaml.load(fileContents);
return yaml.load(fileContents) ?? {};
}

4
src/utils/config/service-helpers.js
View File

@@ -202,6 +202,7 @@ export function cleanServiceGroups(groups) {
container,
currency, // coinmarketcap widget
symbols,
defaultinterval
namespace, // kubernetes widget
app
} = cleanedService.widget;
@@ -215,6 +216,7 @@ export function cleanServiceGroups(groups) {
if (currency) cleanedService.widget.currency = currency;
if (symbols) cleanedService.widget.symbols = symbols;
if (defaultinterval) cleanedService.widget.defaultinterval = defaultinterval;
if (type === "docker") {
if (server) cleanedService.widget.server = server;
@@ -265,4 +267,4 @@ export default async function getServiceWidget(group, service) {
}
return false;
}
}