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 'dev' into pr/4643

Browse Source
This commit is contained in:
shamoon
2025-02-11 06:54:49 -08:00
parent d0f7520a3d 0615799c6c
commit 02b29ced94
28 changed files with 3184 additions and 3419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,6 +175,9 @@ export async function servicesResponse() {
// this is a nested group, so find the parent group and merge the services
mergeSubgroups(configuredServices, mergedGroup);
} else unsortedGroups.push(mergedGroup);
} else if (configuredGroup.parent) {
// this is a nested group, so find the parent group and merge the services
mergeSubgroups(configuredServices, mergedGroup);
} else {
unsortedGroups.push(mergedGroup);
}

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

@@ -304,7 +304,7 @@ export function cleanServiceGroups(groups) {
// frigate
enableRecentEvents,
// beszel, glances, immich, mealie, pihole, pfsense
// beszel, glances, immich, mealie, pihole, pfsense, speedtest
version,
// glances
@@ -482,7 +482,7 @@ export function cleanServiceGroups(groups) {
if (snapshotHost) widget.snapshotHost = snapshotHost;
if (snapshotPath) widget.snapshotPath = snapshotPath;
}
if (["beszel", "glances", "immich", "mealie", "pfsense", "pihole"].includes(type)) {
if (["beszel", "glances", "immich", "mealie", "pfsense", "pihole", "speedtest"].includes(type)) {
if (version) widget.version = parseInt(version, 10);
}
if (type === "glances") {
@@ -575,7 +575,7 @@ export function findGroupByName(groups, name) {
} else if (group.groups) {
const foundGroup = findGroupByName(group.groups, name);
if (foundGroup) {
foundGroup.parent = group;
foundGroup.parent = group.name;
return foundGroup;
}
}

6
src/utils/proxy/handlers/credentialed.js
View File

@@ -48,6 +48,7 @@ export default async function credentialedProxyHandler(req, res, map) {
"tandoor",
"pterodactyl",
"vikunja",
"firefly",
].includes(widget.type)
) {
headers.Authorization = `Bearer ${widget.key}`;
@@ -98,6 +99,11 @@ export default async function credentialedProxyHandler(req, res, map) {
headers.Authorization = widget.password;
} else if (widget.type === "gitlab") {
headers["PRIVATE-TOKEN"] = widget.key;
} else if (widget.type === "speedtest") {
if (widget.key) {
// v1 does not require a key
headers.Authorization = `Bearer ${widget.key}`;
}
} else {
headers["X-API-Key"] = `${widget.key}`;
}