Merge branch 'dev' into feature/next-15

.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.*

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,6 +6,7 @@
 ==================== STOP ====
 
 ⚠️ Before opening this pull request please review the guidelines in the checklist below.
+
 If this PR does not meet those guidelines it will not be accepted, and everyone will be sad.
 -->
 
@@ -14,9 +15,6 @@ If this PR does not meet those guidelines it will not be accepted, and everyone
 <!--
 Please include a summary of the change. Screenshots and/or videos can also be helpful if appropriate.
 
-*** Please see the development guidelines for new widgets: https://gethomepage.dev/more/development/#service-widget-guidelines
-*** If you do not follow these guidelines your PR will likely be closed without review.
-
 New service widgets should include example(s) of relevant API output as well as updates to the docs for the new widget.
 -->
 
@@ -30,13 +28,13 @@ What type of change does your PR introduce to Homepage?
 
 - [ ] New service widget
 - [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
+- [ ] New feature or enhancement (non-breaking change which adds functionality)
 - [ ] Documentation only
 - [ ] Other (please explain)
 
 ## Checklist:
 
 - [ ] If applicable, I have added corresponding documentation changes.
-- [ ] If applicable, I have reviewed the [feature](https://gethomepage.dev/more/development/#new-feature-guidelines) and / or [service widget guidelines](https://gethomepage.dev/more/development/#service-widget-guidelines).
+- [ ] If applicable, I have reviewed the [feature / enhancement](https://gethomepage.dev/more/development/#new-feature-guidelines) and / or [service widget guidelines](https://gethomepage.dev/more/development/#service-widget-guidelines).
 - [ ] I have checked that all code style checks pass using [pre-commit hooks](https://gethomepage.dev/more/development/#code-formatting-with-pre-commit-hooks) and [linting checks](https://gethomepage.dev/more/development/#code-linting).
 - [ ] If applicable, I have tested my code for new features & regressions on both mobile & desktop devices, using the latest version of major browsers.

.github/workflows/docker-publish.yml

@@ -46,6 +46,24 @@ jobs:
       -
         name: Check files
         uses: pre-commit/action@v3.0.1
+      -
+        name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+          run_install: false
+      -
+        name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+      -
+        name: Install dependencies
+        run: pnpm install
+      -
+        name: Lint frontend
+        run: pnpm run lint
 
   build:
     name: Docker Build & Push

CONTRIBUTING.md

@@ -63,7 +63,7 @@ The homepage team appreciates all effort and interest from the community in fili
 - Issues, pull requests and discussions that are closed will be locked after 30 days of inactivity.
 - Discussions with a marked answer will be automatically closed.
 - Discussions in the 'General' or 'Support' categories will be closed after 180 days of inactivity.
-- Feature requests that do not meet the following thresholds will be closed: 5 "up-votes" after 180 days of inactivity or 10 "up-votes" after 365 days.
+- Feature requests that do not meet the following thresholds will be closed: 10 "up-votes" after 180 days of inactivity or 20 "up-votes" after 365 days.
 
 In all cases, threads can be re-opened by project maintainers and, of course, users can always create a new discussion for related concerns.
 Finally, remember that all information remains searchable and 'closed' feature requests can still serve as inspiration for new features.

docs/configs/services.md

@@ -134,7 +134,7 @@ Services may have descriptions,
 
 ## Icons
 
-Services may have an icon attached to them, you can use icons from [Dashboard Icons](https://github.com/walkxcode/dashboard-icons) automatically, by passing the name of the icon, with, or without `.png` or with `.svg` to use the svg version.
+Services may have an icon attached to them, you can use icons from [Dashboard Icons](https://github.com/homarr-labs/dashboard-icons) automatically, by passing the name of the icon, with, or without `.png`, `.webp` or `.svg` to specify the desired version.
 
 You can also specify prefixed icons from:
 

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 "/".

docs/installation/source.md

@@ -23,3 +23,5 @@ Finally, run the server:
 ```bash
 pnpm start
 ```
+
+When updating homepage versions you will need to re-build the static files i.e. repeat the process above.

docs/widgets/authoring/getting-started.md

@@ -46,9 +46,9 @@ See the [pre-commit documentation](https://pre-commit.com/#install) to get start
 In general, homepage is meant to be a dashboard for 'self-hosted' services and we believe it is a small way we can help showcase this kind of software. While exceptions are made, mostly when there is no viable
 self-hosted / open-source alternative, we ask that any widgets, etc. are developed primarily for a self-hosted tool.
 
-## New Feature Guidelines
+## New Feature or Enhancement Guidelines {#new-feature-guidelines}
 
-- New features should usually be linked to an existing feature request. The purpose of this requirement is to avoid the addition (and maintenance) of features that might only benefit a small number of users.
+- New features or enhancements, **no matter how small**, must be linked to an existing feature request. The purpose of this requirement is to avoid the addition (and maintenance) of features that might only benefit a small number of users.
 - If you have ideas for a larger feature you may want to open a discussion first.
 
 ## Service Widget Guidelines

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"]`

docs/widgets/services/customapi.md

@@ -62,10 +62,12 @@ widget:
       format: size
 ```
 
-Supported formats for the values are `text`, `number`, `float`, `percent`, `bytes`, `bitrate`, `size`, `date` and `relativeDate`.
+Supported formats for the values are `text`, `number`, `float`, `percent`, `duration`, `bytes`, `bitrate`, `size`, `date` and `relativeDate`.
 
 The `dateStyle` and `timeStyle` options of the `date` format are passed directly to [Intl.DateTimeFormat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat) and the `style` and `numeric` options of `relativeDate` are passed to [Intl.RelativeTimeFormat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat).
 
+The `duration` format expects the duration to be specified in seconds. The `scale` transformation tool can be used if a conversion is required.
+
 The `size` format will return the length of the array or string, or the number of keys in an object. This is then formatted as `number`.
 
 ## Example

docs/widgets/services/gluetun.md

@@ -11,7 +11,7 @@ Learn more about [Gluetun](https://github.com/qdm12/gluetun).
 
 Allowed fields: `["public_ip", "region", "country"]`.
 
-To setup authentication, follow [the official Gluetun documentation](https://github.com/qdm12/gluetun-wiki/blob/main/setup/advanced/control-server.md#authentication).
+To setup authentication, follow [the official Gluetun documentation](https://github.com/qdm12/gluetun-wiki/blob/main/setup/advanced/control-server.md#authentication). Note that to use the api key method, you must add the route `GET /v1/publicip/ip` to the `routes` array in your Gluetun config.toml.
 
 ```yaml
 widget:

docs/widgets/services/unifi-controller.md

@@ -19,7 +19,7 @@ Allowed fields: `["uptime", "wan", "lan", "lan_users", "lan_devices", "wlan", "w
 
 !!! hint
 
-    If you enter e.g. incorrect credentials and receive an "API Error", you may need to recreate the container to clear the cache.
+    If you enter e.g. incorrect credentials and receive an "API Error", you may need to recreate the container or restart the service to clear the cache.
 
 ```yaml
 widget:

package.json

@@ -32,11 +32,11 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-i18next": "^11.18.6",
-    "react-icons": "^4.12.0",
+    "react-icons": "^5.4.0",
     "recharts": "^2.12.7",
     "rrule": "^2.8.1",
     "swr": "^1.3.0",
-    "systeminformation": "^5.23.8",
+    "systeminformation": "^5.24.3",
     "tough-cookie": "^4.1.4",
     "urbackup-server-api": "^0.8.9",
     "winston": "^3.13.0",
@@ -52,12 +52,12 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsx-a11y": "^6.9.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react": "^7.37.3",
     "eslint-plugin-react-hooks": "^4.6.2",
     "postcss": "^8.4.48",
     "prettier": "^3.3.2",
     "tailwind-scrollbar": "^3.0.5",
-    "tailwindcss": "^3.4.14",
+    "tailwindcss": "^3.4.17",
     "typescript": "^5.6.3"
   },
   "optionalDependencies": {

public/locales/af/common.json

@@ -982,6 +982,9 @@
         "name": "Naam",
         "systems": "Stelsels",
         "up": "Op",
+        "down": "Af",
+        "paused": "Onderbreek",
+        "pending": "Afwagtend",
         "status": "Status",
         "updated": "Opgedateer",
         "cpu": "SVE",

public/locales/ar/common.json

@@ -982,6 +982,9 @@
         "name": "الاسم",
         "systems": "Systems",
         "up": "يعمل",
+        "down": "لا يعمل",
+        "paused": "متوقف",
+        "pending": "معلق",
         "status": "الحالة",
         "updated": "محدث",
         "cpu": "المعالج",

public/locales/bg/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Pending",
         "status": "Статус",
         "updated": "Updated",
         "cpu": "Процесор",

public/locales/ca/common.json

@@ -982,6 +982,9 @@
         "name": "Nom",
         "systems": "Sistemes",
         "up": "Actiu",
+        "down": "Inactiu",
+        "paused": "En pausa",
+        "pending": "Pendent",
         "status": "Estat",
         "updated": "Actualitzat",
         "cpu": "CPU",

public/locales/cs/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Pozastaveno",
+        "pending": "Čeká",
         "status": "Stav",
         "updated": "Aktualizováno",
         "cpu": "CPU",

public/locales/da/common.json

@@ -982,6 +982,9 @@
         "name": "Navn",
         "systems": "Systems",
         "up": "Op",
+        "down": "Ned",
+        "paused": "Pause",
+        "pending": "Afventer",
         "status": "Status",
         "updated": "Opdateret",
         "cpu": "CPU",

public/locales/de/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systeme",
         "up": "Senden",
+        "down": "Empfangen",
+        "paused": "Pausiert",
+        "pending": "Ausstehend",
         "status": "Status",
         "updated": "Aktualisiert",
         "cpu": "CPU",

public/locales/el/common.json

@@ -982,6 +982,9 @@
         "name": "Όνομα",
         "systems": "Systems",
         "up": "Ping up",
+        "down": "Ping down",
+        "paused": "Paused",
+        "pending": "Σε εκκρεμότητα",
         "status": "Κατάσταση",
         "updated": "Ενημερώθηκε",
         "cpu": "Επεξεργαστής",

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",

public/locales/eo/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Pending",
         "status": "Stato",
         "updated": "Updated",
         "cpu": "Ĉefprocesoro",

public/locales/es/common.json

@@ -311,13 +311,13 @@
     },
     "suwayomi": {
         "download": "Descargado",
-        "nondownload": "Non-Downloaded",
+        "nondownload": "No descargado",
         "read": "Leer",
         "unread": "Sin leer",
-        "downloadedread": "Downloaded & Read",
+        "downloadedread": "Descargado y leído",
-        "downloadedunread": "Downloaded & Unread",
+        "downloadedunread": "Descargado y no leído",
-        "nondownloadedread": "Non-Downloaded & Read",
+        "nondownloadedread": "No descargado y leído",
-        "nondownloadedunread": "Non-Downloaded & Unread"
+        "nondownloadedunread": "No descargado y no leído"
     },
     "tailscale": {
         "address": "Dirección",
@@ -980,32 +980,35 @@
     },
     "beszel": {
         "name": "Nombre",
-        "systems": "Systems",
+        "systems": "Sistemas",
         "up": "Activo",
+        "down": "Inactivo",
+        "paused": "Pausado",
+        "pending": "Pendiente",
         "status": "Estado",
         "updated": "Actualizado",
         "cpu": "CPU",
         "memory": "MEM",
-        "disk": "Disk",
+        "disk": "Disco",
-        "network": "NET"
+        "network": "RED"
     },
     "argocd": {
         "apps": "Apps",
-        "synced": "Synced",
+        "synced": "Sincronizado",
-        "outOfSync": "Out Of Sync",
+        "outOfSync": "Desincronizado",
         "healthy": "Saludable",
-        "degraded": "Degraded",
+        "degraded": "Degradado",
-        "progressing": "Progressing",
+        "progressing": "Progresando",
         "missing": "Faltantes",
-        "suspended": "Suspended"
+        "suspended": "Suspendido"
     },
     "spoolman": {
         "loading": "Cargando"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Grupos",
         "issues": "Números",
-        "merges": "Merge Requests",
+        "merges": "Solicitudes de fusión",
-        "projects": "Projects"
+        "projects": "Proyectos"
     }
 }

public/locales/eu/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Pending",
         "status": "Status",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/fi/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Vireillä",
         "status": "Tila",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/fr/common.json

@@ -58,7 +58,7 @@
         "wlan": "WLAN",
         "devices": "Équipt.",
         "lan_devices": "Équipt. LAN",
-        "wlan_devices": "Équipt. WLAN",
+        "wlan_devices": "Périphériques WLAN",
         "lan_users": "Utilisateurs LAN",
         "wlan_users": "Utilisateurs WLAN",
         "up": "Up",
@@ -982,6 +982,9 @@
         "name": "Nom",
         "systems": "Systèmes",
         "up": "Up",
+        "down": "Down",
+        "paused": "En Pause",
+        "pending": "En attente",
         "status": "Statut",
         "updated": "Mis à jour",
         "cpu": "CPU",
@@ -990,22 +993,22 @@
         "network": "Réseau"
     },
     "argocd": {
-        "apps": "Apps",
+        "apps": "Applications",
-        "synced": "Synced",
+        "synced": "Synchronisé",
-        "outOfSync": "Out Of Sync",
+        "outOfSync": "Désynchronisé",
         "healthy": "Fonctionnel",
-        "degraded": "Degraded",
+        "degraded": "Dégradé",
-        "progressing": "Progressing",
+        "progressing": "En cours",
         "missing": "Manquant",
-        "suspended": "Suspended"
+        "suspended": "Suspendu"
     },
     "spoolman": {
         "loading": "Chargement"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Groupes",
         "issues": "Anomalies",
-        "merges": "Merge Requests",
+        "merges": "Demandes de fusion de branches",
-        "projects": "Projects"
+        "projects": "Projets"
     }
 }

public/locales/he/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "ממתין",
         "status": "סטטוס",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/hi/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Pending",
         "status": "Status",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/hr/common.json

@@ -982,6 +982,9 @@
         "name": "Ime",
         "systems": "Systems",
         "up": "Dostupno",
+        "down": "Nedostupno",
+        "paused": "Zaustavljeno",
+        "pending": "U tijeku",
         "status": "Stanje",
         "updated": "Aktualizirano",
         "cpu": "CPU",

public/locales/hu/common.json

@@ -982,6 +982,9 @@
         "name": "Név",
         "systems": "Rendszerek",
         "up": "Fel",
+        "down": "Le",
+        "paused": "Szünetel",
+        "pending": "Függőben",
         "status": "Státusz",
         "updated": "Frissített",
         "cpu": "Processzor",

public/locales/id/common.json

@@ -982,6 +982,9 @@
         "name": "Nama",
         "systems": "Systems",
         "up": "Hidup",
+        "down": "Mati",
+        "paused": "Pause",
+        "pending": "Pending",
         "status": "Status",
         "updated": "Terbarui",
         "cpu": "CPU",

public/locales/it/common.json

@@ -335,7 +335,7 @@
     },
     "technitium": {
         "totalQueries": "Richieste",
-        "totalNoError": "Success",
+        "totalNoError": "Successo",
         "totalServerFailure": "Failures",
         "totalNxDomain": "NX Domains",
         "totalRefused": "Refused",
@@ -590,7 +590,7 @@
         "total": "Totale"
     },
     "peanut": {
-        "battery_charge": "Battery Charge",
+        "battery_charge": "Carica Batteria",
         "ups_load": "Carico UPS",
         "ups_status": "Stato UPS",
         "online": "Online",
@@ -854,7 +854,7 @@
     },
     "romm": {
         "platforms": "Piattaforme",
-        "totalRoms": "Games",
+        "totalRoms": "Giochi",
         "saves": "Saves",
         "states": "States",
         "screenshots": "Screenshots",
@@ -890,7 +890,7 @@
         "sceneDuration": "Durata Delle Scene",
         "images": "Immagini",
         "imageSize": "Dimensioni immagine",
-        "galleries": "Galleries",
+        "galleries": "Gallerie",
         "performers": "Esecutori",
         "studios": "Studi",
         "movies": "Film",
@@ -933,7 +933,7 @@
     },
     "stocks": {
         "stocks": "Stocks",
-        "loading": "Loading",
+        "loading": "Caricamento",
         "open": "Open - US Market",
         "closed": "Closed - US Market",
         "invalidConfiguration": "Invalid Configuration"
@@ -944,8 +944,8 @@
         "version": "Versione"
     },
     "linkwarden": {
-        "links": "Links",
+        "links": "Collegamenti",
-        "collections": "Collections",
+        "collections": "Raccolte",
         "tags": "Tag"
     },
     "zabbix": {
@@ -957,12 +957,12 @@
         "disaster": "Disaster"
     },
     "lubelogger": {
-        "vehicle": "Vehicle",
+        "vehicle": "Veicolo",
-        "vehicles": "Vehicles",
+        "vehicles": "Veicoli",
         "serviceRecords": "Service Records",
-        "reminders": "Reminders",
+        "reminders": "Promemoria",
-        "nextReminder": "Next Reminder",
+        "nextReminder": "Promemoria Seguente",
-        "none": "None"
+        "none": "Nessuno"
     },
     "vikunja": {
         "projects": "Active Projects",
@@ -982,6 +982,9 @@
         "name": "Nome",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "In Pausa",
+        "pending": "In attesa",
         "status": "Stato",
         "updated": "Aggiornato",
         "cpu": "CPU",
@@ -1000,7 +1003,7 @@
         "suspended": "Suspended"
     },
     "spoolman": {
-        "loading": "Loading"
+        "loading": "Caricamento"
     },
     "gitlab": {
         "groups": "Groups",

public/locales/ja/common.json

@@ -982,6 +982,9 @@
         "name": "名前",
         "systems": "Systems",
         "up": "稼働",
+        "down": "下へ",
+        "paused": "一時停止中",
+        "pending": "保留中",
         "status": "状態",
         "updated": "更新済",
         "cpu": "CPU",

public/locales/ko/common.json

@@ -982,6 +982,9 @@
         "name": "이름",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "대기 중",
         "status": "상태",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/lv/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Pending",
         "status": "Statuss",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/ms/common.json

@@ -982,6 +982,9 @@
         "name": "Nama",
         "systems": "Systems",
         "up": "Hidup",
+        "down": "Mati",
+        "paused": "Tangguh",
+        "pending": "Tertunda",
         "status": "Status",
         "updated": "Dikemaskini",
         "cpu": "CPU",

public/locales/nl/common.json

@@ -311,13 +311,13 @@
     },
     "suwayomi": {
         "download": "Gedownload",
-        "nondownload": "Non-Downloaded",
+        "nondownload": "Niet gedownload",
         "read": "Gelezen",
         "unread": "Ongelezen",
-        "downloadedread": "Downloaded & Read",
+        "downloadedread": "Gedownload & gelezen",
-        "downloadedunread": "Downloaded & Unread",
+        "downloadedunread": "Gedownload & ongelezen",
-        "nondownloadedread": "Non-Downloaded & Read",
+        "nondownloadedread": "Niet-gedownload & gelezen",
-        "nondownloadedunread": "Non-Downloaded & Unread"
+        "nondownloadedunread": "Niet-gedownload & ongelezen"
     },
     "tailscale": {
         "address": "Adres",
@@ -980,32 +980,35 @@
     },
     "beszel": {
         "name": "Naam",
-        "systems": "Systems",
+        "systems": "Systemen",
         "up": "Online",
+        "down": "Offline",
+        "paused": "Gepauzeerd",
+        "pending": "In afwachting",
         "status": "Status",
         "updated": "Bijgewerkt",
         "cpu": "CPU",
         "memory": "GEH",
-        "disk": "Disk",
+        "disk": "Schijf",
         "network": "NET"
     },
     "argocd": {
         "apps": "Apps",
-        "synced": "Synced",
+        "synced": "Gesynchroniseerd",
-        "outOfSync": "Out Of Sync",
+        "outOfSync": "Niet gesynchroniseerd",
         "healthy": "Gezond",
-        "degraded": "Degraded",
+        "degraded": "Gedegradeerd",
-        "progressing": "Progressing",
+        "progressing": "Doorvoeren",
         "missing": "Ontbreekt",
-        "suspended": "Suspended"
+        "suspended": "Onderbroken"
     },
     "spoolman": {
         "loading": "Laden"
     },
     "gitlab": {
-        "groups": "Groups",
+        "groups": "Groepen",
         "issues": "Problemen",
-        "merges": "Merge Requests",
+        "merges": "Merge Verzoeken",
-        "projects": "Projects"
+        "projects": "Projecten"
     }
 }

public/locales/no/common.json

@@ -982,6 +982,9 @@
         "name": "Navn",
         "systems": "Systems",
         "up": "Oppe",
+        "down": "Nede",
+        "paused": "Pauset",
+        "pending": "Ventende",
         "status": "Status",
         "updated": "Oppdatert",
         "cpu": "CPU",

public/locales/pl/common.json

@@ -13,7 +13,7 @@
         "ms": "{{value, number}}",
         "date": "{{value, date}}",
         "relativeDate": "{{value, relativeDate}}",
-        "duration": "{value, duration}",
+        "duration": "{{value, duration}}",
         "months": "mc",
         "days": "d",
         "hours": "g",
@@ -982,6 +982,9 @@
         "name": "Nazwa",
         "systems": "Systemy",
         "up": "Dostępny",
+        "down": "Niedostępny",
+        "paused": "Zatrzymane",
+        "pending": "Oczekiwane",
         "status": "Stan",
         "updated": "Zaktualizowane",
         "cpu": "Procesor",

public/locales/pt/common.json

@@ -982,6 +982,9 @@
         "name": "Nome",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Pausa",
+        "pending": "Pendente",
         "status": "Estado",
         "updated": "Atualizado",
         "cpu": "CPU",

public/locales/pt_BR/common.json

@@ -982,6 +982,9 @@
         "name": "Nome",
         "systems": "Systems",
         "up": "Ativo",
+        "down": "Inativo",
+        "paused": "Pausado",
+        "pending": "Pendente",
         "status": "Status",
         "updated": "Atualizado",
         "cpu": "CPU",

public/locales/ro/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Sus",
+        "down": "Jos",
+        "paused": "Paused",
+        "pending": "În așteptare",
         "status": "Stare",
         "updated": "Updated",
         "cpu": "Procesor",

public/locales/ru/common.json

@@ -982,6 +982,9 @@
         "name": "Имя",
         "systems": "Системы",
         "up": "Онлайн",
+        "down": "Офлайн",
+        "paused": "Приостановлено",
+        "pending": "В обработке",
         "status": "Статус",
         "updated": "Обновленно",
         "cpu": "ЦП",

public/locales/sk/common.json

@@ -982,6 +982,9 @@
         "name": "Meno",
         "systems": "Systems",
         "up": "Nahrávanie",
+        "down": "Sťahovanie",
+        "paused": "Pozastavené",
+        "pending": "Čakajúce",
         "status": "Stav",
         "updated": "Aktualizované",
         "cpu": "CPU",

public/locales/sl/common.json

@@ -982,6 +982,9 @@
         "name": "Naziv",
         "systems": "Sistemi",
         "up": "Povezan",
+        "down": "Nepovezan",
+        "paused": "Pavziran",
+        "pending": "V teku",
         "status": "Stanje",
         "updated": "Posodobljen",
         "cpu": "CPU",

public/locales/sr/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Pending",
         "status": "Status",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/sv/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Avvaktar",
         "status": "Status",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/te/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "పెండింగ్",
         "status": "హోదా",
         "updated": "నవీకరించబడింది",
         "cpu": "సీపియూ",

public/locales/th/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Pending",
         "status": "สถานะ",
         "updated": "Updated",
         "cpu": "ซีพียู",

public/locales/tr/common.json

@@ -982,6 +982,9 @@
         "name": "İsim",
         "systems": "Systems",
         "up": "Yükleme",
+        "down": "İndirme",
+        "paused": "Duraklatıldı",
+        "pending": "Bekleyen",
         "status": "Durum",
         "updated": "Güncellendi",
         "cpu": "CPU",

public/locales/uk/common.json

@@ -982,6 +982,9 @@
         "name": "Назва",
         "systems": "Системи",
         "up": "Онлайн",
+        "down": "Офлайн",
+        "paused": "Призупинено",
+        "pending": "В очікуванні",
         "status": "Стан",
         "updated": "Оновлено",
         "cpu": "ЦП",

public/locales/vi/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "Paused",
+        "pending": "Đang xử lý",
         "status": "Trạng thái",
         "updated": "Updated",
         "cpu": "CPU",

public/locales/yue/common.json

@@ -982,6 +982,9 @@
         "name": "名稱",
         "systems": "Systems",
         "up": "在線",
+        "down": "離線",
+        "paused": "擱置中",
+        "pending": "待定",
         "status": "狀況",
         "updated": "已更新",
         "cpu": "CPU",

public/locales/zh-Hans/common.json

@@ -982,6 +982,9 @@
         "name": "Name",
         "systems": "Systems",
         "up": "Up",
+        "down": "Down",
+        "paused": "暂停",
+        "pending": "待办的",
         "status": "状态",
         "updated": "已升级",
         "cpu": "CPU",

public/locales/zh-Hant/common.json

@@ -982,6 +982,9 @@
         "name": "名稱",
         "systems": "Systems",
         "up": "在線",
+        "down": "離線",
+        "paused": "擱置中",
+        "pending": "待下載",
         "status": "狀態",
         "updated": "已更新",
         "cpu": "CPU",

src/components/bookmarks/group.jsx

@@ -24,9 +24,9 @@ export default function BookmarksGroup({
     <div
       key={bookmarks.name}
       className={classNames(
-        "bookmark-group",
+        "bookmark-group flex-1 overflow-hidden",
         layout?.style === "row" ? "basis-full" : "basis-full md:basis-1/4 lg:basis-1/5 xl:basis-1/6",
-        layout?.header === false ? "flex-1 px-1 -my-1 overflow-hidden" : "flex-1 p-1 overflow-hidden",
+        layout?.header === false ? "px-1" : "p-1 pb-0",
       )}
     >
       <Disclosure defaultOpen={!(layout?.initiallyCollapsed ?? groupsInitiallyCollapsed) ?? true}>

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 =
+  let classes = layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col bookmark-list";
-    layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col mt-3 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 (
-    <ul className={classNames(classes)} style={style}>
+    <ul className={classNames(classes, "mb-2", layout?.header === false ? "" : "mt-3")} style={style}>
       {bookmarks.map((bookmark) => (
         <Item
           key={`${bookmark.name}-${bookmark.href}`}

src/components/errorboundry.jsx

@@ -14,8 +14,10 @@ export default class ErrorBoundary extends React.Component {
     });
 
     // You can also log error messages to an error reporting service here
-    // eslint-disable-next-line no-console
+    if (error || errorInfo) {
-    console.error(error, errorInfo);
+      // eslint-disable-next-line no-console
+      console.error("component error: %s, info: %s", error, errorInfo);
+    }
   }
 
   render() {

src/components/resolvedicon.jsx

@@ -101,7 +101,26 @@ export default function ResolvedIcon({ icon, width = 32, height = 32, alt = "log
     const iconName = icon.replace(".svg", "");
     return (
       <Image
-        src={`https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/svg/${iconName}.svg`}
+        src={`https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/${iconName}.svg`}
+        width={width}
+        height={height}
+        style={{
+          width,
+          height,
+          objectFit: "contain",
+          maxHeight: "100%",
+          maxWidth: "100%",
+        }}
+        alt={alt}
+      />
+    );
+  }
+
+  if (icon.endsWith(".webp")) {
+    const iconName = icon.replace(".webp", "");
+    return (
+      <Image
+        src={`https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/webp/${iconName}.webp`}
         width={width}
         height={height}
         style={{
@@ -119,7 +138,7 @@ export default function ResolvedIcon({ icon, width = 32, height = 32, alt = "log
   const iconName = icon.replace(".png", "");
   return (
     <Image
-      src={`https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/png/${iconName}.png`}
+      src={`https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/${iconName}.png`}
       width={width}
       height={height}
       style={{

src/components/services/group.jsx

@@ -15,6 +15,7 @@ export default function ServicesGroup({
   disableCollapse,
   useEqualHeights,
   groupsInitiallyCollapsed,
+  isSubgroup,
 }) {
   const panel = useRef();
 
@@ -22,14 +23,18 @@ export default function ServicesGroup({
     if (layout?.initiallyCollapsed ?? groupsInitiallyCollapsed) panel.current.style.height = `0`;
   }, [layout, groupsInitiallyCollapsed]);
 
+  let groupPadding = layout?.header === false ? "px-1" : "p-1 pb-0";
+  if (isSubgroup) groupPadding = "";
+
   return (
     <div
       key={group.name}
       className={classNames(
-        "services-group",
+        "services-group flex-1",
         layout?.style === "row" ? "basis-full" : "basis-full md:basis-1/2 lg:basis-1/3 xl:basis-1/4",
         layout?.style !== "row" && fiveColumns ? "3xl:basis-1/5" : "",
-        layout?.header === false ? "flex-1 px-1 -my-1" : "flex-1 p-1",
+        groupPadding,
+        isSubgroup ? "subgroup" : "",
       )}
     >
       <Disclosure defaultOpen={!(layout?.initiallyCollapsed ?? groupsInitiallyCollapsed) ?? true}>
@@ -80,6 +85,7 @@ export default function ServicesGroup({
                   services={group.services}
                   layout={layout}
                   useEqualHeights={useEqualHeights}
+                  header={layout?.header !== false}
                 />
                 {group.groups?.length > 0 && (
                   <div
@@ -96,6 +102,7 @@ export default function ServicesGroup({
                         disableCollapse={disableCollapse}
                         useEqualHeights={useEqualHeights}
                         groupsInitiallyCollapsed={groupsInitiallyCollapsed}
+                        isSubgroup
                       />
                     ))}
                   </div>

src/components/services/item.jsx

@@ -86,7 +86,7 @@ export default function Item({ service, groupName, useEqualHeights }) {
           <div
             className={`absolute top-0 right-0 flex flex-row justify-end ${
               statusStyle === "dot" ? "gap-0" : "gap-2 mr-2"
-            } z-30 service-tags`}
+            } z-10 service-tags`}
           >
             {service.ping && (
               <div className="flex-shrink-0 flex items-center justify-center service-tag service-ping">

src/components/services/list.jsx

@@ -4,12 +4,13 @@ import { columnMap } from "../../utils/layout/columns";
 
 import Item from "components/services/item";
 
-export default function List({ groupName, services, layout, useEqualHeights }) {
+export default function List({ groupName, services, layout, useEqualHeights, header }) {
   return (
     <ul
       className={classNames(
         layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col",
-        "mt-3 services-list",
+        header ? "mt-3" : "",
+        "services-list",
       )}
     >
       {services.map((service) => (

src/components/widgets/search/search.jsx

@@ -1,7 +1,8 @@
 import { useState, useEffect, Fragment } from "react";
 import { useTranslation } from "next-i18next";
 import { FiSearch } from "react-icons/fi";
-import { SiDuckduckgo, SiMicrosoftbing, SiGoogle, SiBaidu, SiBrave } from "react-icons/si";
+import { SiDuckduckgo, SiGoogle, SiBaidu, SiBrave } from "react-icons/si";
+import { BiLogoBing } from "react-icons/bi";
 import { Listbox, Transition, Combobox } from "@headlessui/react";
 import classNames from "classnames";
 
@@ -25,7 +26,7 @@ export const searchProviders = {
     name: "Bing",
     url: "https://www.bing.com/search?q=",
     suggestionUrl: "https://api.bing.com/osjson.aspx?query=",
-    icon: SiMicrosoftbing,
+    icon: BiLogoBing,
   },
   baidu: {
     name: "Baidu",

src/pages/_document.jsx

@@ -4,10 +4,6 @@ export default function Document() {
   return (
     <Html>
       <Head>
-        <meta
-          name="description"
-          content="A highly customizable homepage (or startpage / application dashboard) with Docker and service API integrations."
-        />
         <meta name="mobile-web-app-capable" content="yes" />
         <link rel="manifest" href="/site.webmanifest?v=4" crossOrigin="use-credentials" />
         <link rel="preload" href="/api/config/custom.css" as="style" />

src/pages/index.jsx

@@ -166,6 +166,18 @@ const headerStyles = {
   boxedWidgets: "m-5 mb-0 sm:m-9 sm:mb-0 sm:mt-1",
 };
 
+function getAllServices(services) {
+  function getServices(group) {
+    let nestedServices = [...group.services];
+    if (group.groups.length > 0) {
+      nestedServices = [...nestedServices, ...group.groups.map(getServices).flat()];
+    }
+    return nestedServices;
+  }
+
+  return [...services.map(getServices).flat()];
+}
+
 function Home({ initialSettings }) {
   const { i18n } = useTranslation();
   const { theme, setTheme } = useContext(ThemeContext);
@@ -182,10 +194,9 @@ function Home({ initialSettings }) {
   const { data: bookmarks } = useSWR("/api/bookmarks");
   const { data: widgets } = useSWR("/api/widgets");
 
-  const servicesAndBookmarks = [
+  const servicesAndBookmarks = [...bookmarks.map((bg) => bg.bookmarks).flat(), ...getAllServices(services)].filter(
-    ...services.map((sg) => sg.services).flat(),
+    (i) => i?.href,
-    ...bookmarks.map((bg) => bg.bookmarks).flat(),
+  );
-  ].filter((i) => i?.href);
 
   useEffect(() => {
     if (settings.language) {
@@ -297,7 +308,6 @@ function Home({ initialSettings }) {
                   disableCollapse={settings.disableCollapse}
                   useEqualHeights={settings.useEqualHeights}
                   groupsInitiallyCollapsed={settings.groupsInitiallyCollapsed}
-                  bookmarksStyle={settings.bookmarksStyle}
                 />
               ) : (
                 <BookmarksGroup
@@ -360,6 +370,13 @@ function Home({ initialSettings }) {
     <>
       <Head>
         <title>{initialSettings.title || "Homepage"}</title>
+        <meta
+          name="description"
+          content={
+            initialSettings.description ||
+            "A highly customizable homepage (or startpage / application dashboard) with Docker and service API integrations."
+          }
+        />
         {settings.base && <base href={settings.base} />}
         {settings.favicon ? (
           <>
@@ -453,7 +470,7 @@ function Home({ initialSettings }) {
 }
 
 export default function Wrapper({ initialSettings, fallback }) {
-  const { theme } = useContext(ThemeContext);
+  const { themeContext } = useContext(ThemeContext);
   const wrappedStyle = {};
   let backgroundBlur = false;
   let backgroundSaturate = false;
@@ -484,9 +501,9 @@ export default function Wrapper({ initialSettings, fallback }) {
       id="page_wrapper"
       className={classNames(
         "relative",
-        theme && theme,
+        initialSettings.theme && initialSettings.theme,
         initialSettings.color && `theme-${initialSettings.color}`,
-        theme === "dark" ? "scheme-dark" : "scheme-light",
+        themeContext === "dark" ? "scheme-dark" : "scheme-light",
       )}
     >
       <div

src/styles/globals.css

@@ -65,5 +65,10 @@ dialog ::-webkit-scrollbar {
 }
 
 .chart + .chart {
-  margin-top: 36px;
+  margin-top: 2em;
+}
+
+.service-container + .chart {
+  margin-top: 2.5rem;
+  margin-bottom: .5rem;
 }

src/utils/config/service-helpers.js

@@ -25,6 +25,10 @@ function parseServicesToGroups(services) {
     const serviceGroupServices = [];
     serviceGroup[name].forEach((entries) => {
       const entryName = Object.keys(entries)[0];
+      if (!entries[entryName]) {
+        logger.warn(`Error parsing service "${entryName}" from config. Ensure required fields are present.`);
+        return;
+      }
       if (Array.isArray(entries[entryName])) {
         groups = groups.concat(parseServicesToGroups([{ [entryName]: entries[entryName] }]));
       } else {

src/utils/proxy/handlers/generic.js

@@ -79,7 +79,7 @@ export default async function genericProxyHandler(req, res, map) {
           error: {
             message: "HTTP Error",
             url: sanitizeErrorURL(url),
-            resultData: Buffer.isBuffer(resultData) ? Buffer.from(resultData).toString() : resultData,
+            data: Buffer.isBuffer(resultData) ? Buffer.from(resultData).toString() : resultData,
           },
         });
       }

src/widgets/beszel/component.jsx

@@ -20,8 +20,20 @@ export default function Component({ service }) {
     widget.fields = widget.fields.slice(0, MAX_ALLOWED_FIELDS);
   }
 
-  if (systemsError) {
+  let system = null;
-    return <Container service={service} error={systemsError} />;
+  let finalError = systemsError;
+
+  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 || item.name === systemId);
+    if (!system) {
+      finalError = { message: `System with id ${systemId} not found` };
+    }
+  }
+
+  if (finalError) {
+    return <Container service={service} error={finalError} />;
   }
 
   if (!systems) {
@@ -33,9 +45,7 @@ export default function Component({ service }) {
     );
   }
 
-  if (systemId) {
+  if (system) {
-    const system = systems.items.find((item) => item.id === systemId);
-
     return (
       <Container service={service}>
         <Block label="beszel.name" value={system.name} />

src/widgets/beszel/proxy.js

@@ -59,7 +59,7 @@ export default async function beszelProxyHandler(req, res) {
       if (!token) {
         [status, token] = await login(loginUrl, widget.username, widget.password, service);
         if (status !== 200) {
-          logger.debug(`HTTP ${status} logging into Beszel: ${token}`);
+          logger.debug(`HTTP ${status} logging into Beszel: ${JSON.stringify(token)}`);
           return res.status(status).send(token);
         }
       }
@@ -72,13 +72,13 @@ export default async function beszelProxyHandler(req, res) {
         },
       });
 
-      if (status === 403) {
+      if ([400, 403].includes(status)) {
         logger.debug(`HTTP ${status} retrieving data from Beszel, logging in and trying again.`);
         cache.del(`${tokenCacheKey}.${service}`);
         [status, token] = await login(loginUrl, widget.username, widget.password, service);
 
         if (status !== 200) {
-          logger.debug(`HTTP ${status} logging into Beszel: ${data}`);
+          logger.debug(`HTTP ${status} logging into Beszel: ${JSON.stringify(data)}`);
           return res.status(status).send(data);
         }
 

src/widgets/calendar/monthly.jsx

@@ -9,7 +9,7 @@ const cellStyle = "relative w-10 flex items-center justify-center flex-col";
 const monthButton = "pl-6 pr-6 ml-2 mr-2 hover:bg-theme-100/20 dark:hover:bg-white/5 rounded-md cursor-pointer";
 
 export function Day({ weekNumber, weekday, events, colorVariants, showDate, setShowDate, currentDate }) {
-  const cellDate = showDate.set({ weekday, weekNumber }).startOf("day");
+  const cellDate = showDate.set({ weekday, weekNumber, weekYear: showDate.year }).startOf("day");
   const filteredEvents = events?.filter((event) => compareDateTimezone(cellDate, event));
 
   const dayStyles = (displayDate) => {
@@ -35,7 +35,7 @@ export function Day({ weekNumber, weekday, events, colorVariants, showDate, setS
       // today style
       style += "text-black-500 bg-theme-100/20 dark:bg-black/20 rounded-md ";
     } else {
-      style += "hover:bg-theme-100/20 dark:hover:bg-white/5 rounded-md cursor-pointer ";
+      style += "hover:bg-theme-100/20 dark:hover:bg-white/5 rounded-md cursor-pointer";
     }
 
     return style;

src/widgets/customapi/component.jsx

@@ -78,6 +78,9 @@ function formatValue(t, mapping, rawValue) {
     case "percent":
       value = t("common.percent", { value });
       break;
+    case "duration":
+      value = t("common.duration", { value });
+      break;
     case "bytes":
       value = t("common.bytes", { value });
       break;

src/widgets/evcc/component.jsx

@@ -29,10 +29,13 @@ export default function Component({ service }) {
     );
   }
 
+  // broken by evcc v0.133.0 https://github.com/evcc-io/evcc/commit/9dcb1fa0a7c08dd926b79309aa1f676a5fc6c8aa
+  const gridPower = stateData.result.gridPower ?? stateData.result.grid?.power ?? 0;
+
   return (
     <Container service={service}>
       <Block label="evcc.pv_power" value={`${toKilowatts(t, stateData.result.pvPower)} ${t("evcc.kilowatt")}`} />
-      <Block label="evcc.grid_power" value={`${toKilowatts(t, stateData.result.gridPower)} ${t("evcc.kilowatt")}`} />
+      <Block label="evcc.grid_power" value={`${toKilowatts(t, gridPower)} ${t("evcc.kilowatt")}`} />
       <Block label="evcc.home_power" value={`${toKilowatts(t, stateData.result.homePower)} ${t("evcc.kilowatt")}`} />
       <Block
         label="evcc.charge_power"

src/widgets/glances/components/chart.jsx

@@ -8,7 +8,7 @@ class Chart extends PureComponent {
     const { dataPoints, formatter, label } = this.props;
 
     return (
-      <div className="absolute -top-1 -left-1 h-[120px] w-[calc(100%+0.5em)] z-0">
+      <div className="absolute -top-10 -left-2 h-[calc(100%+3em)] w-[calc(100%+1em)] z-0">
         <div className="overflow-clip z-10 w-full h-full">
           <ResponsiveContainer width="100%" height="100%">
             <AreaChart data={dataPoints}>

src/widgets/glances/components/chart_dual.jsx

@@ -8,7 +8,7 @@ class ChartDual extends PureComponent {
     const { dataPoints, formatter, stack, label, stackOffset } = this.props;
 
     return (
-      <div className="absolute -top-1 -left-1 h-[120px] w-[calc(100%+0.5em)] z-0">
+      <div className="absolute -top-10 -left-2 h-[calc(100%+3em)] w-[calc(100%+1em)] z-0">
         <div className="overflow-clip z-10 w-full h-full">
           <ResponsiveContainer width="100%" height="100%">
             <AreaChart data={dataPoints} stackOffset={stackOffset ?? "none"}>

src/widgets/glances/components/container.jsx

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

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 (
     <Container chart={chart}>
-      <Block position="top-4 right-3 left-3">
+      <Block position={`${headerYPosition} right-3 left-3`}>
         <div className="flex items-center text-xs">
           <div className="grow" />
           <div className="w-14 text-right italic">{t("resources.cpu")}</div>
@@ -49,7 +55,7 @@ export default function Component({ service }) {
         </div>
       </Block>
 
-      <Block position="bottom-4 right-3 left-3">
+      <Block position={`${listYPosition} right-3 left-3`}>
         <div className="pointer-events-none text-theme-900 dark:text-theme-200">
           {data.map((item) => (
             <div key={item[idKey]} className="text-[0.75rem] h-[0.8rem]">

src/widgets/glances/metrics/fs.jsx

@@ -43,10 +43,10 @@ export default function Component({ service }) {
   return (
     <Container chart={chart}>
       {chart && (
-        <div className="absolute top-0 left-0 right-0 bottom-0">
+        <div className="absolute -top-2 -left-2 -right-2 -bottom-2">
           <div
             style={{
-              height: `${Math.max(20, fsData.size / fsData.free)}%`,
+              height: `${Math.max(20, (140 * (fsData.size - fsData.free)) / fsData.size)}px`,
             }}
             className="absolute bottom-0 border-t border-t-theme-500 bg-gradient-to-b from-theme-500/40 to-theme-500/10 w-full"
           />

src/widgets/glances/metrics/info.jsx

@@ -107,8 +107,12 @@ export default function Component({ service }) {
   }
 
   return (
-    <Container chart={chart} className="bg-gradient-to-br from-theme-500/30 via-theme-600/20 to-theme-700/10">
+    <Container chart={chart}>
-      <Block position="top-3 right-3">
+      {chart && (
+        <div className="bg-gradient-to-br from-theme-500/30 via-theme-600/20 to-theme-700/10 absolute -top-10 -left-2 -right-2 -bottom-2 h-[calc(100%+3em)] w-[calc(100%+1em)]" />
+      )}
+
+      <Block position="-top-6 right-2">
         {quicklookData && quicklookData.cpu_name && chart && (
           <div className="text-[0.6rem] opacity-50">{quicklookData.cpu_name}</div>
         )}
@@ -124,7 +128,7 @@ export default function Component({ service }) {
       </Block>
 
       {chart && (
-        <Block position="bottom-3 left-3">
+        <Block position="bottom-3 left-2">
           {systemData && systemData.linux_distro && <div className="text-xs opacity-50">{systemData.linux_distro}</div>}
           {systemData && systemData.os_version && <div className="text-xs opacity-50">{systemData.os_version}</div>}
           {systemData && systemData.hostname && <div className="text-xs opacity-75">{systemData.hostname}</div>}
@@ -137,7 +141,7 @@ export default function Component({ service }) {
         </Block>
       )}
 
-      <Block position="bottom-3 right-3 w-[4rem]">
+      <Block position="bottom-3 right-2 w-[4rem]">
         {chart && <CPU quicklookData={quicklookData} className="opacity-50" />}
 
         {chart && <Mem quicklookData={quicklookData} className="opacity-50" />}

src/widgets/glances/metrics/process.jsx

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

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"],
     },
   },
 };