mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-11-18 03:26:17 +00:00
Uppdate AppImage
This commit is contained in:
@@ -3,7 +3,6 @@ import type { Metadata } from "next"
|
|||||||
import { GeistSans } from "geist/font/sans"
|
import { GeistSans } from "geist/font/sans"
|
||||||
import { GeistMono } from "geist/font/mono"
|
import { GeistMono } from "geist/font/mono"
|
||||||
import { ThemeProvider } from "../components/theme-provider"
|
import { ThemeProvider } from "../components/theme-provider"
|
||||||
import { PollingConfigProvider } from "../lib/polling-config"
|
|
||||||
import { Suspense } from "react"
|
import { Suspense } from "react"
|
||||||
import "./globals.css"
|
import "./globals.css"
|
||||||
|
|
||||||
@@ -38,7 +37,7 @@ export default function RootLayout({
|
|||||||
<body className={`${GeistSans.variable} ${GeistMono.variable} antialiased bg-background text-foreground`}>
|
<body className={`${GeistSans.variable} ${GeistMono.variable} antialiased bg-background text-foreground`}>
|
||||||
<Suspense fallback={<div>Loading...</div>}>
|
<Suspense fallback={<div>Loading...</div>}>
|
||||||
<ThemeProvider attribute="class" defaultTheme="dark" enableSystem disableTransitionOnChange>
|
<ThemeProvider attribute="class" defaultTheme="dark" enableSystem disableTransitionOnChange>
|
||||||
<PollingConfigProvider>{children}</PollingConfigProvider>
|
{children}
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
</Suspense>
|
</Suspense>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import {
|
|||||||
import useSWR from "swr"
|
import useSWR from "swr"
|
||||||
import { useState, useEffect } from "react"
|
import { useState, useEffect } from "react"
|
||||||
import { type HardwareData, type GPU, type PCIDevice, type StorageDevice, fetcher } from "../types/hardware"
|
import { type HardwareData, type GPU, type PCIDevice, type StorageDevice, fetcher } from "../types/hardware"
|
||||||
import { usePollingConfig } from "@/lib/polling-config"
|
|
||||||
|
|
||||||
const parseLsblkSize = (sizeStr: string | undefined): number => {
|
const parseLsblkSize = (sizeStr: string | undefined): number => {
|
||||||
if (!sizeStr) return 0
|
if (!sizeStr) return 0
|
||||||
@@ -164,38 +163,14 @@ const groupAndSortTemperatures = (temperatures: any[]) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function Hardware() {
|
export default function Hardware() {
|
||||||
const { intervals } = usePollingConfig()
|
|
||||||
|
|
||||||
// Static data (loaded once on mount): system info, memory, PCI, network/storage summaries
|
|
||||||
const {
|
const {
|
||||||
data: staticHardwareData,
|
data: hardwareData,
|
||||||
error: staticError,
|
error,
|
||||||
isLoading: staticLoading,
|
isLoading,
|
||||||
} = useSWR<HardwareData>("/api/hardware", fetcher, {
|
} = useSWR<HardwareData>("/api/hardware", fetcher, {
|
||||||
refreshInterval: 0, // Never refresh automatically - only load once
|
refreshInterval: 5000,
|
||||||
revalidateOnFocus: false,
|
|
||||||
revalidateOnReconnect: false,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// Dynamic data (temperatures only) - polls at configured interval
|
|
||||||
const { data: temperatureData, error: tempError } = useSWR<{ temperatures: any[] }>(
|
|
||||||
"/api/hardware/temperatures",
|
|
||||||
fetcher,
|
|
||||||
{
|
|
||||||
refreshInterval: intervals.hardware,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
const hardwareData = staticHardwareData
|
|
||||||
? {
|
|
||||||
...staticHardwareData,
|
|
||||||
temperatures: temperatureData?.temperatures || staticHardwareData.temperatures || [],
|
|
||||||
}
|
|
||||||
: null
|
|
||||||
|
|
||||||
const error = staticError || tempError
|
|
||||||
const isLoading = staticLoading
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (hardwareData?.storage_devices) {
|
if (hardwareData?.storage_devices) {
|
||||||
console.log("[v0] Storage devices data from backend:", hardwareData.storage_devices)
|
console.log("[v0] Storage devices data from backend:", hardwareData.storage_devices)
|
||||||
|
|||||||
@@ -13,9 +13,6 @@ import { SystemLogs } from "./system-logs"
|
|||||||
import { OnboardingCarousel } from "./onboarding-carousel"
|
import { OnboardingCarousel } from "./onboarding-carousel"
|
||||||
import { HealthStatusModal } from "./health-status-modal"
|
import { HealthStatusModal } from "./health-status-modal"
|
||||||
import { getApiUrl } from "../lib/api-config"
|
import { getApiUrl } from "../lib/api-config"
|
||||||
import { usePollingConfig, INTERVAL_OPTIONS } from "@/lib/polling-config"
|
|
||||||
import { Label } from "./ui/label"
|
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select"
|
|
||||||
import {
|
import {
|
||||||
RefreshCw,
|
RefreshCw,
|
||||||
AlertTriangle,
|
AlertTriangle,
|
||||||
@@ -69,7 +66,6 @@ export function ProxmoxDashboard() {
|
|||||||
const [showNavigation, setShowNavigation] = useState(true)
|
const [showNavigation, setShowNavigation] = useState(true)
|
||||||
const [lastScrollY, setLastScrollY] = useState(0)
|
const [lastScrollY, setLastScrollY] = useState(0)
|
||||||
const [showHealthModal, setShowHealthModal] = useState(false)
|
const [showHealthModal, setShowHealthModal] = useState(false)
|
||||||
const { intervals, updateInterval } = usePollingConfig()
|
|
||||||
|
|
||||||
const fetchSystemData = useCallback(async () => {
|
const fetchSystemData = useCallback(async () => {
|
||||||
console.log("[v0] Fetching system data from Flask server...")
|
console.log("[v0] Fetching system data from Flask server...")
|
||||||
@@ -620,116 +616,6 @@ export function ProxmoxDashboard() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="border-t border-border pt-4">
|
|
||||||
<h3 className="text-lg font-medium mb-2">Polling Intervals</h3>
|
|
||||||
<p className="text-sm text-muted-foreground mb-4">
|
|
||||||
Configure how frequently each section updates its data. Lower values provide more real-time data
|
|
||||||
but increase server load.
|
|
||||||
</p>
|
|
||||||
<div className="space-y-4">
|
|
||||||
<div className="flex items-center justify-between py-2">
|
|
||||||
<div>
|
|
||||||
<Label htmlFor="storage-interval" className="font-medium">
|
|
||||||
Storage
|
|
||||||
</Label>
|
|
||||||
<p className="text-sm text-muted-foreground">Update frequency for storage metrics</p>
|
|
||||||
</div>
|
|
||||||
<Select
|
|
||||||
value={intervals.storage.toString()}
|
|
||||||
onValueChange={(value) => updateInterval("storage", Number.parseInt(value))}
|
|
||||||
>
|
|
||||||
<SelectTrigger id="storage-interval" className="w-[180px]">
|
|
||||||
<SelectValue />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
{INTERVAL_OPTIONS.map((option) => (
|
|
||||||
<SelectItem key={option.value} value={option.value.toString()}>
|
|
||||||
{option.label}
|
|
||||||
</SelectItem>
|
|
||||||
))}
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex items-center justify-between py-2">
|
|
||||||
<div>
|
|
||||||
<Label htmlFor="network-interval" className="font-medium">
|
|
||||||
Network
|
|
||||||
</Label>
|
|
||||||
<p className="text-sm text-muted-foreground">Update frequency for network metrics</p>
|
|
||||||
</div>
|
|
||||||
<Select
|
|
||||||
value={intervals.network.toString()}
|
|
||||||
onValueChange={(value) => updateInterval("network", Number.parseInt(value))}
|
|
||||||
>
|
|
||||||
<SelectTrigger id="network-interval" className="w-[180px]">
|
|
||||||
<SelectValue />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
{INTERVAL_OPTIONS.map((option) => (
|
|
||||||
<SelectItem key={option.value} value={option.value.toString()}>
|
|
||||||
{option.label}
|
|
||||||
</SelectItem>
|
|
||||||
))}
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex items-center justify-between py-2">
|
|
||||||
<div>
|
|
||||||
<Label htmlFor="vms-interval" className="font-medium">
|
|
||||||
VMs & LXCs
|
|
||||||
</Label>
|
|
||||||
<p className="text-sm text-muted-foreground">Update frequency for VM/LXC data</p>
|
|
||||||
</div>
|
|
||||||
<Select
|
|
||||||
value={intervals.vms.toString()}
|
|
||||||
onValueChange={(value) => updateInterval("vms", Number.parseInt(value))}
|
|
||||||
>
|
|
||||||
<SelectTrigger id="vms-interval" className="w-[180px]">
|
|
||||||
<SelectValue />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
{INTERVAL_OPTIONS.map((option) => (
|
|
||||||
<SelectItem key={option.value} value={option.value.toString()}>
|
|
||||||
{option.label}
|
|
||||||
</SelectItem>
|
|
||||||
))}
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex items-center justify-between py-2">
|
|
||||||
<div>
|
|
||||||
<Label htmlFor="hardware-interval" className="font-medium">
|
|
||||||
Hardware
|
|
||||||
</Label>
|
|
||||||
<p className="text-sm text-muted-foreground">Update frequency for temperature sensors only</p>
|
|
||||||
</div>
|
|
||||||
<Select
|
|
||||||
value={intervals.hardware.toString()}
|
|
||||||
onValueChange={(value) => updateInterval("hardware", Number.parseInt(value))}
|
|
||||||
>
|
|
||||||
<SelectTrigger id="hardware-interval" className="w-[180px]">
|
|
||||||
<SelectValue />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
{INTERVAL_OPTIONS.map((option) => (
|
|
||||||
<SelectItem key={option.value} value={option.value.toString()}>
|
|
||||||
{option.label}
|
|
||||||
</SelectItem>
|
|
||||||
))}
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<p className="mt-4 text-xs text-muted-foreground bg-blue-500/10 border border-blue-500/20 rounded-lg p-3">
|
|
||||||
<strong>Note:</strong> Hardware static information (System Info, Memory Modules, PCI Devices,
|
|
||||||
Network/Storage Summaries) is loaded only once when entering the Hardware page and does not
|
|
||||||
refresh automatically.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="border-t border-border pt-4">
|
<div className="border-t border-border pt-4">
|
||||||
<h3 className="text-lg font-medium mb-2">About</h3>
|
<h3 className="text-lg font-medium mb-2">About</h3>
|
||||||
<p className="text-sm text-muted-foreground mb-4">
|
<p className="text-sm text-muted-foreground mb-4">
|
||||||
|
|||||||
Reference in New Issue
Block a user