fankes/beszel
2
0
Fork 0
mirror of https://github.com/fankes/beszel.git synced 2025-10-20 02:09:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve useeffects for favicon and system subscription

Browse Source
This commit is contained in:
Henry Dollman
2024-10-19 19:57:35 -04:00
parent b5c158d1b3
commit 6de5dce176
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beszel/site/src/components/routes/system.tsx
View File

@@ -155,7 +155,7 @@ export default function SystemDetail({ name }: { name: string }) {
return () => { return () => {
pb.collection('systems').unsubscribe(system.id) pb.collection('systems').unsubscribe(system.id)
} }
}, [system]) }, [system.id])
const chartData: ChartData = useMemo(() => { const chartData: ChartData = useMemo(() => {
const lastCreated = Math.max( const lastCreated = Math.max(

6
beszel/site/src/lib/utils.ts
View File

@@ -9,7 +9,6 @@ import { timeDay, timeHour } from 'd3-time'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { CpuIcon, HardDriveIcon, MemoryStickIcon, ServerIcon } from 'lucide-react' import { CpuIcon, HardDriveIcon, MemoryStickIcon, ServerIcon } from 'lucide-react'
import { EthernetIcon, ThermometerIcon } from '@/components/ui/icons' import { EthernetIcon, ThermometerIcon } from '@/components/ui/icons'
import { newQueue, Queue } from '@henrygd/queue'
export function cn(...inputs: ClassValue[]) { export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs)) return twMerge(clsx(inputs))
@@ -103,8 +102,9 @@ export const formatDay = (timestamp: string) => {
return dayFormatter.format(new Date(timestamp)) return dayFormatter.format(new Date(timestamp))
} }
export const updateFavicon = (newIcon: string) => export const updateFavicon = (newIcon: string) => {
((document.querySelector("link[rel='icon']") as HTMLLinkElement).href = `/static/${newIcon}`) ;(document.querySelector("link[rel='icon']") as HTMLLinkElement).href = `/static/${newIcon}`
}
export const isAdmin = () => pb.authStore.model?.role === 'admin' export const isAdmin = () => pb.authStore.model?.role === 'admin'
export const isReadOnlyUser = () => pb.authStore.model?.role === 'readonly' export const isReadOnlyUser = () => pb.authStore.model?.role === 'readonly'

12
beszel/site/src/main.tsx
View File

@@ -73,29 +73,27 @@ const App = () => {
updateUserSettings() updateUserSettings()
// get alerts after system list is loaded // get alerts after system list is loaded
updateSystemList().then(updateAlerts) updateSystemList().then(updateAlerts)
return () => updateFavicon('favicon.svg')
}, []) }, [])
// update favicon // update favicon
useEffect(() => { useEffect(() => {
if (!authenticated || !systems.length) { if (!systems.length || !authenticated) {
updateFavicon('favicon.svg') updateFavicon('favicon.svg')
} else { } else {
let up = false let up = false
for (const system of systems) { for (const system of systems) {
if (system.status === 'down') { if (system.status === 'down') {
updateFavicon('favicon-red.svg') updateFavicon('favicon-red.svg')
return () => updateFavicon('favicon.svg') return
} else if (system.status === 'up') { } else if (system.status === 'up') {
up = true up = true
} }
} }
updateFavicon(up ? 'favicon-green.svg' : 'favicon.svg') updateFavicon(up ? 'favicon-green.svg' : 'favicon.svg')
return () => updateFavicon('favicon.svg')
} }
return () => { }, [systems])
updateFavicon('favicon.svg')
}
}, [authenticated, systems])
if (!page) { if (!page) {
return <h1 className="text-3xl text-center my-14">404</h1> return <h1 className="text-3xl text-center my-14">404</h1>