Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-04-29 12:03:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change to server-side implementation

Browse Source
This commit is contained in:
GodD6366 2022-10-09 09:55:36 +00:00 committed by Michael Shamoon
parent 82c69ff68d
commit 3740426bb5
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pages/index.jsx
View File

@ -177,20 +177,6 @@ function Home({ initialSettings }) {
const servicesAndBookmarks = [...services.map(sg => sg.services).flat(), ...bookmarks.map(bg => bg.bookmarks).flat()] const servicesAndBookmarks = [...services.map(sg => sg.services).flat(), ...bookmarks.map(bg => bg.bookmarks).flat()]
// sort layout
const layouts = Object.keys(initialSettings.layout);
let sortedServices = [];
const copiedServices = services.slice();
layouts.forEach((currentServer) => {
if (initialSettings.layout[currentServer]?.sort) {
const idx = copiedServices.findIndex((service) => service.name === currentServer);
sortedServices.push(...copiedServices.splice(idx, 1));
}
});
if (copiedServices.length) {
sortedServices = sortedServices.concat(copiedServices);
}
useEffect(() => { useEffect(() => {
if (settings.language) { if (settings.language) {
@ -278,9 +264,9 @@ function Home({ initialSettings }) {
)} )}
</div> </div>
{sortedServices && ( {services && (
<div className="flex flex-wrap p-4 sm:p-8 sm:pt-4 items-start pb-2"> <div className="flex flex-wrap p-4 sm:p-8 sm:pt-4 items-start pb-2">
{sortedServices.map((group) => ( {services.map((group) => (
<ServicesGroup key={group.name} services={group} layout={initialSettings.layout?.[group.name]} /> <ServicesGroup key={group.name} services={group} layout={initialSettings.layout?.[group.name]} />
))} ))}
</div> </div>

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

@ -4,7 +4,7 @@ import path from "path";
import yaml from "js-yaml"; import yaml from "js-yaml";
import checkAndCopyConfig from "utils/config/config"; import checkAndCopyConfig, { getSettings } from "utils/config/config";
import { servicesFromConfig, servicesFromDocker, cleanServiceGroups } from "utils/config/service-helpers"; import { servicesFromConfig, servicesFromDocker, cleanServiceGroups } from "utils/config/service-helpers";
import { cleanWidgetGroups, widgetsFromConfig } from "utils/config/widget-helpers"; import { cleanWidgetGroups, widgetsFromConfig } from "utils/config/widget-helpers";
@ -46,6 +46,7 @@ export async function widgetsResponse() {
export async function servicesResponse() { export async function servicesResponse() {
let discoveredServices; let discoveredServices;
let configuredServices; let configuredServices;
let initialSettings;
try { try {
discoveredServices = cleanServiceGroups(await servicesFromDocker()); discoveredServices = cleanServiceGroups(await servicesFromDocker());
@ -63,6 +64,14 @@ export async function servicesResponse() {
configuredServices = []; configuredServices = [];
} }
try {
initialSettings = await getSettings();
} catch (e) {
console.error("Failed to load settings.yaml, please check for errors");
if (e) console.error(e);
initialSettings = {};
}
const mergedGroupsNames = [ const mergedGroupsNames = [
...new Set([discoveredServices.map((group) => group.name), configuredServices.map((group) => group.name)].flat()), ...new Set([discoveredServices.map((group) => group.name), configuredServices.map((group) => group.name)].flat()),
]; ];
@ -81,5 +90,18 @@ export async function servicesResponse() {
mergedGroups.push(mergedGroup); mergedGroups.push(mergedGroup);
}); });
return mergedGroups; let sortedServices = [];
const layouts = Object.keys(initialSettings.layout);
layouts.forEach((currentServer) => {
if (initialSettings.layout[currentServer]?.sort) {
const idx = mergedGroups.findIndex((service) => service.name === currentServer);
sortedServices.push(...mergedGroups.splice(idx, 1));
}
});
if (mergedGroups.length) {
sortedServices = sortedServices.concat(mergedGroups);
}
return sortedServices;
} }