From f717e5908577f8fdbb55dec10c1c320e07579809 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 26 Dec 2024 11:07:33 -0800 Subject: [PATCH 1/7] Enhancement: support 'nice name' for beszel system ID (#4495) --- docs/widgets/services/beszel.md | 2 +- src/widgets/beszel/component.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/widgets/services/beszel.md b/docs/widgets/services/beszel.md index c5391568..99715191 100644 --- a/docs/widgets/services/beszel.md +++ b/docs/widgets/services/beszel.md @@ -7,7 +7,7 @@ Learn more about [Beszel](https://github.com/henrygd/beszel) The widget has two modes, a single system with detailed info if `systemId` is provided, or an overview of all systems if `systemId` is not provided. -The `systemID` in the `id` field on the collections page of Beszel. +The `systemID` is the `id` field on the collections page of Beszel under the PocketBase admin panel. You can also use the 'nice name' from the Beszel UI. Allowed fields for 'overview' mode: `["systems", "up"]` Allowed fields for a single system: `["name", "status", "updated", "cpu", "memory", "disk", "network"]` diff --git a/src/widgets/beszel/component.jsx b/src/widgets/beszel/component.jsx index 493a169e..da1b7a48 100644 --- a/src/widgets/beszel/component.jsx +++ b/src/widgets/beszel/component.jsx @@ -26,7 +26,7 @@ export default function Component({ service }) { if (systems && !systems.items) { finalError = { message: "No items returned from beszel API" }; } else if (systems && systems.items && systemId) { - system = systems.items.find((item) => item.id === systemId); + system = systems.items.find((item) => item.id === systemId || item.name === systemId); if (!system) { finalError = { message: `System with id ${systemId} not found` }; } From e4d42b5393a1cd6d191d8ba7bca926ccdc8947e0 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 26 Dec 2024 14:51:11 -0800 Subject: [PATCH 2/7] FIx: glances containers header position (#4496) --- src/widgets/glances/metrics/containers.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/widgets/glances/metrics/containers.jsx b/src/widgets/glances/metrics/containers.jsx index dac52be3..1f408d3e 100644 --- a/src/widgets/glances/metrics/containers.jsx +++ b/src/widgets/glances/metrics/containers.jsx @@ -38,10 +38,16 @@ export default function Component({ service }) { } data.splice(chart ? 5 : 1); + let headerYPosition = "top-4"; + let listYPosition = "bottom-4"; + if (chart) { + headerYPosition = "-top-6"; + listYPosition = "-top-3"; + } return ( - +
{t("resources.cpu")}
@@ -49,7 +55,7 @@ export default function Component({ service }) {
- +
{data.map((item) => (
From 43decb0ed943e6f414d8ffa9c172f32ae55d524f Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 27 Dec 2024 16:11:47 -0800 Subject: [PATCH 3/7] Fix: correct iconsOnly bookmark group spacing (#4502) --- src/components/bookmarks/group.jsx | 4 ++-- src/components/bookmarks/list.jsx | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/bookmarks/group.jsx b/src/components/bookmarks/group.jsx index 9deb1b6a..b90ac8db 100644 --- a/src/components/bookmarks/group.jsx +++ b/src/components/bookmarks/group.jsx @@ -24,9 +24,9 @@ export default function BookmarksGroup({
diff --git a/src/components/bookmarks/list.jsx b/src/components/bookmarks/list.jsx index 194bb43a..8f41afdf 100644 --- a/src/components/bookmarks/list.jsx +++ b/src/components/bookmarks/list.jsx @@ -5,15 +5,14 @@ import { columnMap } from "../../utils/layout/columns"; import Item from "components/bookmarks/item"; export default function List({ bookmarks, layout, bookmarksStyle }) { - let classes = - layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col mt-3 bookmark-list"; + let classes = layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col bookmark-list"; const style = {}; if (layout?.iconsOnly || bookmarksStyle === "icons") { - classes = "grid gap-3 mt-3 bookmark-list"; + classes = "grid gap-2 bookmark-list"; style.gridTemplateColumns = "repeat(auto-fill, minmax(60px, 1fr))"; } return ( -
    +
      {bookmarks.map((bookmark) => ( Date: Sat, 28 Dec 2024 16:35:22 +0100 Subject: [PATCH 4/7] Fix: include all Beszel status localization strings (#4504) --- public/locales/en/common.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index e3670e80..1d738089 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -982,6 +982,9 @@ "name": "Name", "systems": "Systems", "up": "Up", + "down": "Down", + "paused": "Paused", + "pending": "Pending", "status": "Status", "updated": "Updated", "cpu": "CPU", From 10bc8a15a9a93966a3ca7e18d68fdbef46a195c7 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 28 Dec 2024 16:46:15 -0800 Subject: [PATCH 5/7] Update support.yml --- .github/DISCUSSION_TEMPLATE/support.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/DISCUSSION_TEMPLATE/support.yml b/.github/DISCUSSION_TEMPLATE/support.yml index 2493df22..8b68f69e 100644 --- a/.github/DISCUSSION_TEMPLATE/support.yml +++ b/.github/DISCUSSION_TEMPLATE/support.yml @@ -54,3 +54,11 @@ body: description: Please include output from your [troubleshooting tests](https://gethomepage.dev/more/troubleshooting/#service-widget-errors), if relevant. validations: required: true + - type: markdown + attributes: + value: | + ## ⚠️ STOP ⚠️ + + Before you submit this support request, please ensure you have entered your configuration files and actually followed the steps from the troubleshooting guide linked above, if relevant. The troubleshooting steps often help to solve the problem. + + *Please remember that this project is maintained by regular people **just like you**, so if you don't take the time to fill out the requested information, don't expect a reply back.* From 4f27ffbe2d32e8dc1ccde87b7612984c67d3f323 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 28 Dec 2024 20:53:43 -0800 Subject: [PATCH 6/7] Change: make region optional for gluetun api response (#4512) --- src/widgets/gluetun/widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/gluetun/widget.js b/src/widgets/gluetun/widget.js index 91c7d1ed..2733cec6 100644 --- a/src/widgets/gluetun/widget.js +++ b/src/widgets/gluetun/widget.js @@ -7,7 +7,7 @@ const widget = { mappings: { ip: { endpoint: "publicip/ip", - validate: ["public_ip", "region", "country"], + validate: ["public_ip", "country"], }, }, }; From a158866ca1d27415ee898bab80640cd840cba577 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 28 Dec 2024 21:12:20 -0800 Subject: [PATCH 7/7] Feature: meta description setting (#4513) --- docs/configs/settings.md | 8 ++++++++ src/pages/_document.jsx | 4 ---- src/pages/index.jsx | 7 +++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/configs/settings.md b/docs/configs/settings.md index 5fe30874..5a32c139 100644 --- a/docs/configs/settings.md +++ b/docs/configs/settings.md @@ -13,6 +13,14 @@ You can customize the title of the page if you'd like. title: My Awesome Homepage ``` +## Description + +You can customize the description of the page if you'd like. + +```yaml +description: A description of my awesome homepage +``` + ## Start URL You can customize the start_url as required for installable apps. The default is "/". diff --git a/src/pages/_document.jsx b/src/pages/_document.jsx index e69ca007..31083438 100644 --- a/src/pages/_document.jsx +++ b/src/pages/_document.jsx @@ -4,10 +4,6 @@ export default function Document() { return ( - diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 78af7999..7dbadbf1 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -359,6 +359,13 @@ function Home({ initialSettings }) { <> {initialSettings.title || "Homepage"} + {settings.base && } {settings.favicon ? ( <>