Merge pull request #1335 from benphelps/5th-column-setting

Move 5th column behind setting

public/locales/el/common.json

@@ -1,25 +1,25 @@
 {
     "resources": {
-        "used": "Used",
+        "used": "χρησιμοποιημένο",
-        "load": "Load",
+        "load": "Φόρτωση",
         "cpu": "CPU",
         "mem": "MEM",
-        "temp": "TEMP",
+        "temp": "ΘΕΡΜΟΚΡΑΣΪΑ",
-        "total": "Total",
+        "total": "Σύνολο",
-        "free": "Free",
+        "free": "Δωρεάν",
-        "max": "Max",
+        "max": "Μέγιστο",
-        "uptime": "UP",
+        "uptime": "ΠΑΝΩ",
         "months": "mo",
         "days": "d",
         "hours": "h",
         "minutes": "m"
     },
     "omada": {
-        "activeUser": "Active devices",
+        "activeUser": "Ενεργές συσκευές",
-        "alerts": "Alerts",
+        "alerts": "Ειδοποιήσεις",
-        "connectedAp": "Connected APs",
+        "connectedAp": "Συνδεδεμένα APs",
-        "connectedGateway": "Connected gateways",
+        "connectedGateway": "Συνδεδεμένα gateways",
-        "connectedSwitches": "Connected switches"
+        "connectedSwitches": "Συνδεδεμένα switches"
     },
     "wmo": {
         "0-night": "Clear",
@@ -84,120 +84,120 @@
         "bibitrate": "{{value, rate(bits: true; binary: true)}}"
     },
     "widget": {
-        "missing_type": "Missing Widget Type: {{type}}",
+        "missing_type": "Λείπει ο τύπος widget: {{type}}",
-        "api_error": "API Error",
+        "api_error": "Σφάλμα API",
-        "information": "Information",
+        "information": "Πληροφορία",
-        "status": "Status",
+        "status": "Κατάσταση",
         "url": "URL",
-        "raw_error": "Raw Error",
+        "raw_error": "Ανεπεξέργαστο σφάλμα",
-        "response_data": "Response Data"
+        "response_data": "Δεδομένα απόκρισης"
     },
     "weather": {
-        "current": "Current Location",
+        "current": "Τωρινή τοποθεσία",
-        "allow": "Click to allow",
+        "allow": "Κάντε κλικ για να επιτρέψετε",
-        "updating": "Updating",
+        "updating": "Ενημέρωση",
-        "wait": "Please wait"
+        "wait": "Παρακαλώ περιμένετε"
     },
     "search": {
-        "placeholder": "Search…"
+        "placeholder": "Αναζήτηση…"
     },
     "unifi": {
-        "users": "Users",
+        "users": "Χρήστες",
-        "uptime": "System Uptime",
+        "uptime": "Χρόνος λειτουργίας συστήματος",
-        "days": "Days",
+        "days": "Ημέρες",
         "wan": "WAN",
         "lan": "LAN",
         "wlan": "WLAN",
-        "devices": "Devices",
+        "devices": "Συσκευές",
-        "lan_devices": "LAN Devices",
+        "lan_devices": "LAN Συσκευές",
-        "wlan_devices": "WLAN Devices",
+        "wlan_devices": "WLAN Συσκευές",
-        "lan_users": "LAN Users",
+        "lan_users": "LAN Χρήστες",
-        "wlan_users": "WLAN Users",
+        "wlan_users": "WLAN Χρήστες",
-        "up": "UP",
+        "up": "ΠΑΝΩ",
-        "down": "DOWN",
+        "down": "ΚΑΤΩ",
-        "wait": "Please wait",
+        "wait": "Παρακαλώ περιμένετε",
-        "empty_data": "Subsystem status unknown"
+        "empty_data": "Άγνωστη κατάσταση υποσυστήματος"
     },
     "docker": {
         "rx": "RX",
         "tx": "TX",
         "mem": "MEM",
         "cpu": "CPU",
-        "running": "Running",
+        "running": "Τρέχων",
-        "offline": "Offline",
+        "offline": "Εκτός σύνδεσης",
-        "error": "Error",
+        "error": "Σφάλμα",
-        "unknown": "Unknown",
+        "unknown": "Άγνωστο",
-        "healthy": "Healthy",
+        "healthy": "Υγειές",
-        "exited": "Exited",
+        "exited": "Έκλεισε",
-        "starting": "Starting",
+        "starting": "Ξεκινάει",
-        "partial": "Partial",
+        "partial": "Μερικό",
-        "unhealthy": "Unhealthy",
+        "unhealthy": "Άρρωστο",
-        "not_found": "Not Found"
+        "not_found": "Δεν βρέθηκε"
     },
     "ping": {
-        "error": "Error",
+        "error": "Σφάλμα",
         "ping": "Ping"
     },
     "emby": {
-        "playing": "Playing",
+        "playing": "Παίζει",
-        "transcoding": "Transcoding",
+        "transcoding": "Διακωδικοποίηση",
-        "bitrate": "Bitrate",
+        "bitrate": "Ρυθμός bit",
-        "no_active": "No Active Streams",
+        "no_active": "Δεν υπάρχουν ενεργές ροές",
-        "movies": "Movies",
+        "movies": "Ταινίες",
-        "series": "Series",
+        "series": "Σειρές",
-        "episodes": "Episodes",
+        "episodes": "Επεισόδια",
-        "songs": "Songs"
+        "songs": "Τραγούδια"
     },
     "flood": {
-        "download": "Download",
+        "download": "Κατέβασμα",
-        "upload": "Upload",
+        "upload": "Ανέβασμα",
-        "leech": "Leech",
+        "leech": "Αφαίμαξη",
-        "seed": "Seed"
+        "seed": "Σπείρε"
     },
     "changedetectionio": {
-        "totalObserved": "Total Observed",
+        "totalObserved": "Συνολικά παρατηρηθείσα",
-        "diffsDetected": "Diffs Detected"
+        "diffsDetected": "Εντοπίστηκαν διαφορές"
     },
     "tautulli": {
-        "playing": "Playing",
+        "playing": "Παίζει",
-        "transcoding": "Transcoding",
+        "transcoding": "Διακωδικοποίηση",
-        "bitrate": "Bitrate",
+        "bitrate": "Ρυθμός bit",
-        "no_active": "No Active Streams"
+        "no_active": "Δεν υπάρχουν ενεργές ροές"
     },
     "nzbget": {
-        "rate": "Rate",
+        "rate": "βαθμός",
-        "remaining": "Remaining",
+        "remaining": "Υπόλοιπο",
-        "downloaded": "Downloaded"
+        "downloaded": "Κατεβασμένο"
     },
     "plex": {
-        "streams": "Active Streams",
+        "streams": "Ενεργά Streams",
-        "movies": "Movies",
+        "movies": "Ταινίες",
-        "tv": "TV Shows"
+        "tv": "Σειρές"
     },
     "sabnzbd": {
-        "rate": "Rate",
+        "rate": "Βαθμός",
-        "queue": "Queue",
+        "queue": "Ουρά",
-        "timeleft": "Time Left"
+        "timeleft": "Χρόνος που απομένει"
     },
     "rutorrent": {
-        "active": "Active",
+        "active": "Ενεργό",
-        "upload": "Upload",
+        "upload": "Ανέβασμα",
-        "download": "Download"
+        "download": "Κατέβασμα"
     },
     "transmission": {
-        "download": "Download",
+        "download": "Κατέβασμα",
-        "upload": "Upload",
+        "upload": "Ανέβασμα",
         "leech": "Leech",
         "seed": "Seed"
     },
     "qbittorrent": {
-        "download": "Download",
+        "download": "Κατέβασμα",
-        "upload": "Upload",
+        "upload": "Ανέβασμα",
         "leech": "Leech",
         "seed": "Seed"
     },
     "deluge": {
-        "download": "Download",
+        "download": "Κατέβασμα",
         "upload": "Upload",
         "leech": "Leech",
         "seed": "Seed"
@@ -561,6 +561,6 @@
         "podcasts": "Podcasts",
         "books": "Books",
         "podcastsDuration": "Duration",
-        "booksDuration": "Duration"
+        "booksDuration": "Διάρκεια"
     }
 }

public/locales/es/common.json

@@ -158,7 +158,7 @@
     "transmission": {
         "download": "Bajada",
         "upload": "Subida",
-        "leech": "Sanguijuela",
+        "leech": "Compañeros",
         "seed": "Semillas"
     },
     "jackett": {
@@ -213,11 +213,11 @@
         "users": "Usuarios",
         "uptime": "Tiempo de actividad",
         "days": "Días",
-        "wan": "Red WAN",
+        "wan": "WAN",
         "lan_users": "Usuarios LAN",
         "wlan_users": "Usuarios WLAN",
         "down": "CAÍDO",
-        "wait": "Espere por favor",
+        "wait": "Espera por favor",
         "lan": "LAN",
         "wlan": "WLAN",
         "devices": "Dispositivos",
@@ -233,7 +233,7 @@
     "glances": {
         "cpu": "Procesador",
         "mem": "Memoria",
-        "wait": "Espere por favor",
+        "wait": "Espera por favor",
         "temp": "TEMPORAL",
         "uptime": "ARRIBA",
         "days": "Días",
@@ -277,20 +277,20 @@
         "66-night": "Granizo",
         "67-night": "Granizo",
         "71-day": "Nevada Leve",
-        "71-night": "Nevada Leva",
+        "71-night": "Nevada Leve",
         "73-day": "Nevada",
         "73-night": "Nevada",
         "75-day": "Fuertes Nevadas",
         "75-night": "Fuertes Nevadas",
         "77-day": "Nevada Leve",
         "77-night": "Nevada Leve",
-        "80-day": "llovizna",
+        "80-day": "Llovizna",
         "80-night": "Llovizna",
         "81-day": "Lluvia",
         "81-night": "Lluvia",
         "82-day": "Chubascos",
         "82-night": "Chubascos",
-        "85-day": "Chubascos",
+        "85-day": "Lluvia de nieve",
         "85-night": "Lluvia de nieve",
         "86-day": "Lluvia de nieve",
         "86-night": "Lluvia de nieve",
@@ -378,12 +378,12 @@
     "deluge": {
         "download": "Descarga",
         "upload": "Subida",
-        "leech": "Depender",
+        "leech": "Compañeros",
-        "seed": "Semilla"
+        "seed": "Semillas"
     },
     "flood": {
-        "download": "Descargar",
+        "download": "Descarga",
-        "upload": "Subir",
+        "upload": "Subida",
         "leech": "Depender",
         "seed": "Semillas"
     },
@@ -398,7 +398,7 @@
         "unread": "Sin leer"
     },
     "nextdns": {
-        "wait": "Espere, por favor",
+        "wait": "Espera, por favor",
         "no_devices": "No se reciben datos del dispositivo"
     },
     "common": {
@@ -415,7 +415,7 @@
     "downloadstation": {
         "download": "Descargar",
         "upload": "Subir",
-        "leech": "Sanguijuela",
+        "leech": "Compañeros",
         "seed": "Semilla"
     },
     "mikrotik": {
@@ -425,8 +425,8 @@
         "numberOfLeases": "Alquileres"
     },
     "xteve": {
-        "streams_all": "Todos los flujos",
+        "streams_all": "Todas las transmisiones",
-        "streams_active": "Flujos activos",
+        "streams_active": "Transmisiones activas",
         "streams_xepg": "Canales XEPG"
     },
     "opnsense": {
@@ -437,7 +437,7 @@
     },
     "moonraker": {
         "printer_state": "Estado de la impresora",
-        "print_status": "Estado de la impresora",
+        "print_status": "Estado de la impresión",
         "print_progress": "Progreso",
         "layers": "Capas"
     },
@@ -447,9 +447,9 @@
         "series": "Serie"
     },
     "octoprint": {
-        "temp_bed": "temperatura de la plataforma",
+        "temp_bed": "Temperatura de la plataforma",
         "printer_state": "Estado",
-        "temp_tool": "Temperatura de herramienta",
+        "temp_tool": "Temperatura de la herramienta",
         "job_completion": "Finalización"
     },
     "cloudflared": {
@@ -533,7 +533,7 @@
         "grace": "En Periodo de Gracia",
         "paused": "Pausado",
         "status": "Estado",
-        "last_ping": "Último Ping",
+        "last_ping": "Último ping",
         "never": "Aún no hay pings"
     },
     "pterodactyl": {

public/locales/pt-BR/common.json

@@ -52,9 +52,9 @@
         "load": "Carregamento",
         "cpu": "CPU",
         "mem": "MEM",
-        "max": "Max",
+        "max": "Máximo",
         "temp": "TEMP",
-        "uptime": "UP",
+        "uptime": "CIMA",
         "months": "mo",
         "days": "d",
         "hours": "h",
@@ -235,7 +235,7 @@
         "mem": "MEM",
         "wait": "Por favor aguarde",
         "temp": "TEMP",
-        "uptime": "UP",
+        "uptime": "CIMA",
         "days": "d",
         "hours": "h"
     },
@@ -316,9 +316,9 @@
         "up_to_date": "Atualizado",
         "child_bridges": "Pontes Filhas",
         "child_bridges_status": "{{ok}}/{{total}}",
-        "up": "Up",
+        "up": "Cima",
         "pending": "Pendente",
-        "down": "Down"
+        "down": "Baixo"
     },
     "autobrr": {
         "approvedPushes": "Aprovado",

public/locales/pt/common.json

@@ -18,9 +18,9 @@
         "load": "Carga",
         "cpu": "CPU",
         "mem": "MEM",
-        "max": "Max",
+        "max": "Máximo",
         "temp": "TEMP",
-        "uptime": "UP",
+        "uptime": "CIMA",
         "months": "mo",
         "days": "d",
         "hours": "h",
@@ -248,7 +248,7 @@
         "mem": "MEM",
         "wait": "Por favor, aguarde",
         "temp": "TEMP",
-        "uptime": "UP",
+        "uptime": "Cima",
         "days": "d",
         "hours": "h"
     },
@@ -331,7 +331,7 @@
         "child_bridges_status": "{{ok}}/{{total}}",
         "up": "Up",
         "pending": "Pendente",
-        "down": "Down"
+        "down": "Baixo"
     },
     "autobrr": {
         "approvedPushes": "Aprovado",
@@ -550,8 +550,8 @@
         "nodes": "Nós"
     },
     "prometheus": {
-        "targets_up": "Targets Up",
+        "targets_up": "Alvo ativo",
-        "targets_down": "Targets Down",
+        "targets_down": "Alvo inativo",
         "targets_total": "Total de Alvos"
     },
     "minecraft": {

public/locales/zh-CN/common.json

@@ -234,8 +234,8 @@
         "cpu": "处理器",
         "mem": "内存",
         "wait": "请稍等",
-        "temp": "TEMP",
+        "temp": "温度",
-        "uptime": "UP",
+        "uptime": "运行时间",
         "days": "天",
         "hours": "时"
     },
@@ -260,8 +260,8 @@
         "45-night": "有雾",
         "48-night": "有雾",
         "51-night": "小雨",
-        "53-day": "Drizzle",
+        "53-day": "小雨",
-        "53-night": "Drizzle",
+        "53-night": "小雨",
         "55-day": "毛毛雨",
         "55-night": "毛毛雨",
         "56-day": "小冻毛雨",

src/components/services/group.jsx

@@ -3,12 +3,13 @@ import classNames from "classnames";
 import List from "components/services/list";
 import ResolvedIcon from "components/resolvedicon";
 
-export default function ServicesGroup({ services, layout }) {
+export default function ServicesGroup({ services, layout, fiveColumns }) {
   return (
     <div
       key={services.name}
       className={classNames(
-        layout?.style === "row" ? "basis-full" : "basis-full md:basis-1/2 lg:basis-1/3 xl:basis-1/4 2xl:basis-1/5",
+        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" : "",
         "flex-1 p-1"
       )}
     >

src/components/services/item.jsx

@@ -14,7 +14,8 @@ import ResolvedIcon from "components/resolvedicon";
 export default function Item({ service }) {
   const hasLink = service.href && service.href !== "#";
   const { settings } = useContext(SettingsContext);
-  const [statsOpen, setStatsOpen] = useState(false);
+  const showStats = (service.showStats === false) ? false : settings.showStats;
+  const [statsOpen, setStatsOpen] = useState(service.showStats);
   const [statsClosing, setStatsClosing] = useState(false);
 
   // set stats to closed after 300ms
@@ -107,21 +108,21 @@ export default function Item({ service }) {
         {service.container && service.server && (
           <div
             className={classNames(
-              statsOpen && !statsClosing ? "max-h-[110px] opacity-100" : " max-h-[0] opacity-0",
+              showStats || (statsOpen && !statsClosing) ? "max-h-[110px] opacity-100" : " max-h-[0] opacity-0",
               "w-full overflow-hidden transition-all duration-300 ease-in-out"
             )}
           >
-            {statsOpen && <Docker service={{ widget: { container: service.container, server: service.server } }} />}
+            {(showStats || statsOpen) && <Docker service={{ widget: { container: service.container, server: service.server } }} />}
           </div>
         )}
         {service.app && (
           <div
             className={classNames(
-              statsOpen && !statsClosing ? "max-h-[55px] opacity-100" : " max-h-[0] opacity-0",
+              showStats || (statsOpen && !statsClosing) ? "max-h-[55px] opacity-100" : " max-h-[0] opacity-0",
               "w-full overflow-hidden transition-all duration-300 ease-in-out"
             )}
           >
-            {statsOpen && <Kubernetes service={{ widget: { namespace: service.namespace, app: service.app, podSelector: service.podSelector } }} />}
+            {(showStats || statsOpen) && <Kubernetes service={{ widget: { namespace: service.namespace, app: service.app, podSelector: service.podSelector } }} />}
           </div>
         )}
 

src/pages/index.jsx

@@ -289,7 +289,7 @@ function Home({ initialSettings }) {
         {services && (
           <div className="flex flex-wrap p-4 sm:p-8 sm:pt-4 items-start pb-2">
             {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]} fiveColumns={settings.fiveColumns} />
             ))}
           </div>
         )}

src/utils/config/service-helpers.js

@@ -236,6 +236,7 @@ export function cleanServiceGroups(groups) {
     name: serviceGroup.name,
     services: serviceGroup.services.map((service) => {
       const cleanedService = { ...service };
+      if (cleanedService.showStats !== undefined) cleanedService.showStats = JSON.parse(cleanedService.showStats);
       if (typeof service.weight === 'string') {
         const weight = parseInt(service.weight, 10);
         if (Number.isNaN(weight)) {
@@ -297,8 +298,8 @@ export function cleanServiceGroups(groups) {
           if (wan) cleanedService.widget.wan = wan;
         }
         if (type === "emby" || type === "jellyfin") {
-          if (enableBlocks !== undefined) cleanedService.widget.enableBlocks = enableBlocks;
+          if (enableBlocks !== undefined) cleanedService.widget.enableBlocks = JSON.parse(enableBlocks);
-          if (enableNowPlaying !== undefined) cleanedService.widget.enableNowPlaying = enableNowPlaying;
+          if (enableNowPlaying !== undefined) cleanedService.widget.enableNowPlaying = JSON.parse(enableNowPlaying);
         }
         if (type === "diskstation") {
           if (volume) cleanedService.widget.volume = volume;

src/utils/proxy/use-widget-api.js

@@ -7,7 +7,7 @@ export default function useWidgetAPI(widget, ...options) {
   if (options && options[1]?.refreshInterval) {
     config.refreshInterval = options[1].refreshInterval;
   }
-  const { data, error } = useSWR(formatProxyUrl(widget, ...options), config);
+  const { data, error, mutate } = useSWR(formatProxyUrl(widget, ...options), config);
   // make the data error the top-level error
-  return { data, error: data?.error ?? error }
+  return { data, error: data?.error ?? error, mutate }
 }

src/utils/proxy/validate-widget-data.js

@@ -2,11 +2,13 @@ import widgets from "widgets/widgets";
 
 export default function validateWidgetData(widget, endpoint, data) {
     let valid = true;
-    let dataParsed;
+    let dataParsed = data;
-    try {
+    if (Buffer.isBuffer(data)) {
-        dataParsed = JSON.parse(data);
+        try {
-    } catch (e) {
+            dataParsed = JSON.parse(data);
-        valid = false;
+        } catch (e) {
+            valid = false;
+        }
     }
 
     if (dataParsed && Object.entries(dataParsed).length) {

tailwind.config.js

@@ -25,6 +25,10 @@ module.exports = {
           900: "rgb(var(--color-900) / <alpha-value>)",
         },
       },
+      screens: {
+        '3xl': '1800px',
+        // => @media (min-width: 1800px) { ... }
+      },
     },
   },
   plugins: [tailwindForms, tailwindScrollbars],