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

Add expanded view for resource widgets

Browse Source
This commit is contained in:
Ben Phelps 2022-09-12 21:13:57 +03:00
parent 7ae0ba31cb
commit 340b138962
5 changed files with 63 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/locales/en/common.json
View File

@ -27,7 +27,8 @@
"resources": { "resources": {
"total": "Total", "total": "Total",
"free": "Free", "free": "Free",
"used": "Used" "used": "Used",
"load": "Load"
}, },
"docker": { "docker": {
"rx": "RX", "rx": "RX",

28
src/components/widgets/resources/cpu.jsx
View File

@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
import UsageBar from "./usage-bar"; import UsageBar from "./usage-bar";
export default function Cpu() { export default function Cpu({ expanded }) {
const { t } = useTranslation(); const { t } = useTranslation();
const { data, error } = useSWR(`/api/widgets/resources?type=cpu`, { const { data, error } = useSWR(`/api/widgets/resources?type=cpu`, {
@ -39,11 +39,29 @@ export default function Cpu() {
return ( return (
<div className="flex-none flex flex-row items-center mr-3 py-1.5"> <div className="flex-none flex flex-row items-center mr-3 py-1.5">
<FiCpu className="text-theme-800 dark:text-theme-200 w-5 h-5" /> <FiCpu className="text-theme-800 dark:text-theme-200 w-5 h-5" />
<div className="flex flex-col ml-3 text-left font-mono min-w-[80px]"> <div className="flex flex-col ml-3 text-left min-w-[85px]">
<div className="text-theme-800 dark:text-theme-200 text-xs"> <div className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
{t("common.number", { value: data.cpu.usage, style: "unit", unit: "percent", maximumFractionDigits: 0 })}{" "} <div className="pl-0.5">
{t("docker.cpu")} {t("common.number", {
value: data.cpu.usage,
style: "unit",
unit: "percent",
maximumFractionDigits: 0,
})}
</div> </div>
<div className="pr-1">{t("docker.cpu")}</div>
</div>
{expanded && (
<div className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
<div className="pl-0.5">
{t("common.number", {
value: data.cpu.load,
maximumFractionDigits: 2,
})}
</div>
<div className="pr-1">{t("resources.load")}</div>
</div>
)}
<UsageBar percent={percent} /> <UsageBar percent={percent} />
</div> </div>
</div> </div>

18
src/components/widgets/resources/disk.jsx
View File

@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
import UsageBar from "./usage-bar"; import UsageBar from "./usage-bar";
export default function Disk({ options }) { export default function Disk({ options, expanded }) {
const { t } = useTranslation(); const { t } = useTranslation();
const { data, error } = useSWR(`/api/widgets/resources?type=disk&target=${options.disk}`, { const { data, error } = useSWR(`/api/widgets/resources?type=disk&target=${options.disk}`, {
@ -37,15 +37,19 @@ export default function Disk({ options }) {
const percent = Math.round((data.drive.usedGb / data.drive.totalGb) * 100); const percent = Math.round((data.drive.usedGb / data.drive.totalGb) * 100);
return ( return (
<div className="flex-none flex flex-row items-center mr-3 py-1.5 group"> <div className="flex-none flex flex-row items-center mr-3 py-1.5">
<FiHardDrive className="text-theme-800 dark:text-theme-200 w-5 h-5" /> <FiHardDrive className="text-theme-800 dark:text-theme-200 w-5 h-5" />
<div className="flex flex-col ml-3 text-left min-w-[80px]"> <div className="flex flex-col ml-3 text-left min-w-[85px]">
<span className="text-theme-800 dark:text-theme-200 text-xs group-hover:hidden"> <span className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
{t("common.bytes", { value: data.drive.freeGb * 1024 * 1024 * 1024 })} {t("resources.free")} <div className="pl-0.5">{t("common.bytes", { value: data.drive.freeGb * 1024 * 1024 * 1024 })}</div>
<div className="pr-1">{t("resources.free")}</div>
</span> </span>
<span className="text-theme-800 dark:text-theme-200 text-xs hidden group-hover:block"> {expanded && (
{t("common.bytes", { value: data.drive.totalGb * 1024 * 1024 * 1024 })} {t("resources.total")} <span className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
<div className="pl-0.5">{t("common.bytes", { value: data.drive.totalGb * 1024 * 1024 * 1024 })}</div>
<div className="pr-1">{t("resources.total")}</div>
</span> </span>
)}
<UsageBar percent={percent} /> <UsageBar percent={percent} />
</div> </div>
</div> </div>

26
src/components/widgets/resources/memory.jsx
View File

@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
import UsageBar from "./usage-bar"; import UsageBar from "./usage-bar";
export default function Memory() { export default function Memory({ expanded }) {
const { t } = useTranslation(); const { t } = useTranslation();
const { data, error } = useSWR(`/api/widgets/resources?type=memory`, { const { data, error } = useSWR(`/api/widgets/resources?type=memory`, {
@ -37,15 +37,27 @@ export default function Memory() {
const percent = Math.round((data.memory.usedMemMb / data.memory.totalMemMb) * 100); const percent = Math.round((data.memory.usedMemMb / data.memory.totalMemMb) * 100);
return ( return (
<div className="flex-none flex flex-row items-center mr-3 py-1.5 group"> <div className="flex-none flex flex-row items-center mr-3 py-1.5">
<FaMemory className="text-theme-800 dark:text-theme-200 w-5 h-5" /> <FaMemory className="text-theme-800 dark:text-theme-200 w-5 h-5" />
<div className="flex flex-col ml-3 text-left min-w-[80px]"> <div className="flex flex-col ml-3 text-left min-w-[85px]">
<span className="text-theme-800 dark:text-theme-200 text-xs group-hover:hidden"> <span className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
{t("common.bytes", { value: data.memory.freeMemMb * 1024 * 1024 })} {t("resources.free")} <div className="pl-0.5">
{t("common.bytes", { value: data.memory.freeMemMb * 1024 * 1024, maximumFractionDigits: 0, binary: true })}
</div>
<div className="pr-1">{t("resources.free")}</div>
</span> </span>
<span className="text-theme-800 dark:text-theme-200 text-xs hidden group-hover:block"> {expanded && (
{t("common.bytes", { value: data.memory.usedMemMb * 1024 * 1024 })} {t("resources.used")} <span className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
<div className="pl-0.5">
{t("common.bytes", {
value: data.memory.totalMemMb * 1024 * 1024,
maximumFractionDigits: 0,
binary: true,
})}
</div>
<div className="pr-1">{t("resources.total")}</div>
</span> </span>
)}
<UsageBar percent={percent} /> <UsageBar percent={percent} />
</div> </div>
</div> </div>

10
src/components/widgets/resources/resources.jsx
View File

@ -3,14 +3,16 @@ import Cpu from "./cpu";
import Memory from "./memory"; import Memory from "./memory";
export default function Resources({ options }) { export default function Resources({ options }) {
console.log(options);
const { expanded } = options;
return ( return (
<div className="flex flex-col max-w:full sm:basis-auto self-center m-auto flex-wrap"> <div className="flex flex-col max-w:full sm:basis-auto self-center m-auto flex-wrap">
<div className="flex flex-row self-center flex-wrap justify-between"> <div className="flex flex-row self-center flex-wrap justify-between">
{options.cpu && <Cpu />} {options.cpu && <Cpu expanded={expanded} />}
{options.memory && <Memory />} {options.memory && <Memory expanded={expanded} />}
{Array.isArray(options.disk) {Array.isArray(options.disk)
? options.disk.map((disk) => <Disk key={disk} options={{ disk }} />) ? options.disk.map((disk) => <Disk key={disk} options={{ disk }} expanded={expanded} />)
: options.disk && <Disk options={options} />} : options.disk && <Disk options={options} expanded={expanded} />}
</div> </div>
{options.label && ( {options.label && (
<div className="ml-6 pt-1 text-center text-theme-800 dark:text-theme-200 text-xs">{options.label}</div> <div className="ml-6 pt-1 text-center text-theme-800 dark:text-theme-200 text-xs">{options.label}</div>