OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/next-15

Browse Source
This commit is contained in:
shamoon 2024-12-20 19:53:12 -08:00
commit 3697dd7781
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/styles/globals.css
View File

@ -63,3 +63,7 @@ dialog ::-webkit-scrollbar {
::-webkit-details-marker { ::-webkit-details-marker {
display: none; display: none;
} }
.chart + .chart {
margin-top: 36px;
}

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

@ -171,7 +171,7 @@ export async function servicesResponse() {
if (definedLayouts) { if (definedLayouts) {
const layoutIndex = definedLayouts.findIndex((layout) => layout === mergedGroup.name); const layoutIndex = definedLayouts.findIndex((layout) => layout === mergedGroup.name);
if (layoutIndex > -1) sortedGroups[layoutIndex] = mergedGroup; if (layoutIndex > -1) sortedGroups[layoutIndex] = mergedGroup;
else if (configuredGroup.name) { else if (configuredGroup.parent) {
// this is a nested group, so find the parent group and merge the services // this is a nested group, so find the parent group and merge the services
mergeSubgroups(configuredServices, mergedGroup); mergeSubgroups(configuredServices, mergedGroup);
} else unsortedGroups.push(mergedGroup); } else unsortedGroups.push(mergedGroup);

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

@ -699,6 +699,7 @@ export function findGroupByName(groups, name) {
} else if (group.groups) { } else if (group.groups) {
const foundGroup = findGroupByName(group.groups, name); const foundGroup = findGroupByName(group.groups, name);
if (foundGroup) { if (foundGroup) {
foundGroup.parent = group;
return foundGroup; return foundGroup;
} }
} }

2
src/widgets/glances/components/container.jsx
View File

@ -18,7 +18,7 @@ export default function Container({ children, widget, error = null, chart = true
} }
return ( return (
<div className={classNames("service-container relative", chart ? "h-[120px]" : "")}> <div className={classNames("service-container relative", chart ? "chart h-[84px]" : "")}>
{children} {children}
<div className={`absolute top-0 right-0 bottom-0 left-0 overflow-clip pointer-events-none ${className}`} /> <div className={`absolute top-0 right-0 bottom-0 left-0 overflow-clip pointer-events-none ${className}`} />
{chart && <div className="chart h-[68px] overflow-clip" />} {chart && <div className="chart h-[68px] overflow-clip" />}

4
src/widgets/glances/metrics/process.jsx
View File

@ -45,7 +45,7 @@ export default function Component({ service }) {
return ( return (
<Container chart={chart}> <Container chart={chart}>
<Block position="top-4 right-3 left-3"> <Block position="top-0 right-3 left-3">
<div className="flex items-center text-xs"> <div className="flex items-center text-xs">
<div className="grow" /> <div className="grow" />
<div className="w-14 text-right italic">{t("resources.cpu")}</div> <div className="w-14 text-right italic">{t("resources.cpu")}</div>
@ -53,7 +53,7 @@ export default function Component({ service }) {
</div> </div>
</Block> </Block>
<Block position="bottom-4 right-3 left-3"> <Block position="bottom-2 right-3 left-3">
<div className="pointer-events-none text-theme-900 dark:text-theme-200"> <div className="pointer-events-none text-theme-900 dark:text-theme-200">
{data.map((item) => ( {data.map((item) => (
<div key={item.pid} className="text-[0.75rem] h-[0.8rem]"> <div key={item.pid} className="text-[0.75rem] h-[0.8rem]">