Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
146c17abd8 | ||
|
|
47ce924a90 | ||
|
|
82b9ac30e9 | ||
|
|
c6f13f2e07 | ||
|
|
945da97c97 | ||
|
|
a0e3fc7b1e |
@@ -6,6 +6,24 @@ Pre-1.0 versions treat MINOR as feature releases and PATCH as bug fixes.
|
||||
|
||||
---
|
||||
|
||||
## [0.4.4] — 2026-04-11
|
||||
|
||||
### New Features
|
||||
- **Server info bar on Dashboard** — cPanel/WHM-style info strip at the top of the NixPanel home page. Shows Username, Hostname, OS, NixPanel Version, Load Averages (live from WebSocket), and Server Monitoring alert count. Alerts are colour-coded: green "All Clear" when all managed services are running; amber "N Alerts" with a count of stopped/failed services.
|
||||
|
||||
---
|
||||
|
||||
## [0.4.3] — 2026-04-11
|
||||
|
||||
### New Features
|
||||
- **Version display in sidebar** — the sidebar footer shows the currently installed version (e.g. `v0.4.3`), fetched live from the API. A green checkmark indicates up to date; an amber alert indicates an update is available.
|
||||
- **One-click panel upgrade** — "Upgrade panel" button in the sidebar footer. When a newer version is available it highlights amber and shows the target version. Clicking requires a confirmation step before running. Calls `POST /api/nixserver/system/upgrade` which fires `scripts/update.sh` in the background (git pull → npm install → prisma migrate → build frontends + server → restart service). The panel comes back online automatically after ~60 s.
|
||||
- **Check for updates button** — small refresh icon next to the version badge re-fetches version info on demand.
|
||||
- **Backend: `GET /api/nixserver/system/version`** — returns `currentVersion` (read from `/opt/nixpanel/package.json`), `latestVersion` (fetched from GitHub raw content with a 5 s timeout), and `updateAvailable` boolean.
|
||||
- **Backend: `POST /api/nixserver/system/upgrade`** — admin-only; responds immediately then spawns `scripts/update.sh` detached so the HTTP response is flushed before the service restarts.
|
||||
|
||||
---
|
||||
|
||||
## [0.4.2] — 2026-04-11
|
||||
|
||||
### Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nixpanel/cpanel",
|
||||
"version": "0.4.2",
|
||||
"version": "0.4.3",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nixpanel/whm",
|
||||
"version": "0.4.2",
|
||||
"version": "0.4.3",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useState, useMemo, useEffect } from 'react'
|
||||
import { useState, useMemo, useEffect, useCallback } from 'react'
|
||||
import { Outlet, Link, useNavigate, useLocation } from 'react-router-dom'
|
||||
import {
|
||||
LayoutDashboard, Settings, HelpCircle, Network, BookUser, UserCog,
|
||||
@@ -6,8 +6,10 @@ import {
|
||||
Users, UserCheck, ArrowRightLeft, Paintbrush, Package,
|
||||
Globe, Database, Wifi, Box, Mail, HeartPulse, Lock,
|
||||
ShoppingBag, Code2, Puzzle, LogOut, Menu, X,
|
||||
ChevronDown, ChevronRight, Search, RotateCcw
|
||||
ChevronDown, ChevronRight, Search, RotateCcw, RefreshCcw,
|
||||
ArrowUpCircle, CheckCircle2, AlertCircle, Loader2
|
||||
} from 'lucide-react'
|
||||
import axios from 'axios'
|
||||
import { useAuth } from '../contexts/AuthContext'
|
||||
|
||||
// ─── Nav data ────────────────────────────────────────────────────────────────
|
||||
@@ -16,7 +18,7 @@ type NavItem = { label: string; to: string }
|
||||
type NavCategory = {
|
||||
id: string
|
||||
label: string
|
||||
icon: React.ComponentType<{ size?: number; className?: string }>
|
||||
icon: React.ComponentType<{ size?: number | string; className?: string }>
|
||||
items: NavItem[]
|
||||
}
|
||||
|
||||
@@ -456,6 +458,41 @@ export default function Layout() {
|
||||
|
||||
const [sidebarOpen, setSidebarOpen] = useState(true)
|
||||
const [search, setSearch] = useState('')
|
||||
|
||||
// ── Version / upgrade state ──────────────────────────────────────────────
|
||||
type VersionInfo = { currentVersion: string; latestVersion: string | null; updateAvailable: boolean }
|
||||
const [versionInfo, setVersionInfo] = useState<VersionInfo | null>(null)
|
||||
const [versionError, setVersionError] = useState(false)
|
||||
const [upgradeState, setUpgradeState] = useState<'idle' | 'confirm' | 'running' | 'done' | 'error'>('idle')
|
||||
|
||||
const fetchVersion = useCallback(async () => {
|
||||
setVersionError(false)
|
||||
try {
|
||||
const { data } = await axios.get('/api/nixserver/system/version', { timeout: 10_000 })
|
||||
setVersionInfo(data.data)
|
||||
} catch {
|
||||
setVersionError(true)
|
||||
}
|
||||
}, [])
|
||||
|
||||
useEffect(() => { fetchVersion() }, [fetchVersion])
|
||||
|
||||
const handleUpgrade = async () => {
|
||||
if (upgradeState === 'confirm') {
|
||||
setUpgradeState('running')
|
||||
try {
|
||||
await axios.post('/api/nixserver/system/upgrade')
|
||||
setUpgradeState('done')
|
||||
} catch {
|
||||
setUpgradeState('error')
|
||||
}
|
||||
} else {
|
||||
setUpgradeState('confirm')
|
||||
}
|
||||
}
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
const [openCats, setOpenCats] = useState<Set<string>>(() => {
|
||||
// Auto-open the category that contains the active route on first render
|
||||
const active = NAV.find(cat =>
|
||||
@@ -618,6 +655,96 @@ export default function Layout() {
|
||||
)}
|
||||
</nav>
|
||||
|
||||
{/* Version + upgrade */}
|
||||
<div className="border-t border-[#2a2d3e] px-3 pt-2.5 pb-1 flex-shrink-0">
|
||||
{versionInfo ? (
|
||||
<div className="space-y-1.5">
|
||||
{/* Version row */}
|
||||
<div className="flex items-center justify-between px-1">
|
||||
<div className="flex items-center gap-1.5">
|
||||
{versionInfo.updateAvailable ? (
|
||||
<AlertCircle size={11} className="text-amber-400 flex-shrink-0" />
|
||||
) : (
|
||||
<CheckCircle2 size={11} className="text-emerald-500 flex-shrink-0" />
|
||||
)}
|
||||
<span className="text-[#64748b] text-[10px]">
|
||||
v{versionInfo.currentVersion}
|
||||
</span>
|
||||
{versionInfo.updateAvailable && versionInfo.latestVersion && (
|
||||
<span className="text-amber-400 text-[10px]">
|
||||
→ v{versionInfo.latestVersion}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
<button
|
||||
onClick={fetchVersion}
|
||||
title="Check for updates"
|
||||
className="text-[#4a5568] hover:text-[#94a3b8] transition-colors"
|
||||
>
|
||||
<RefreshCcw size={10} />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Upgrade button */}
|
||||
{upgradeState === 'done' ? (
|
||||
<div className="flex items-center gap-1.5 px-2 py-1.5 rounded-md bg-emerald-600/10 text-emerald-400 text-[10px]">
|
||||
<CheckCircle2 size={11} />
|
||||
<span>Upgrade started — panel restarting…</span>
|
||||
</div>
|
||||
) : upgradeState === 'error' ? (
|
||||
<div className="flex items-center gap-1.5 px-2 py-1.5 rounded-md bg-red-600/10 text-red-400 text-[10px]">
|
||||
<AlertCircle size={11} />
|
||||
<span>Upgrade failed — check logs</span>
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex gap-1.5">
|
||||
<button
|
||||
onClick={handleUpgrade}
|
||||
disabled={upgradeState === 'running'}
|
||||
className={`flex-1 flex items-center justify-center gap-1.5 px-2 py-1.5 rounded-md text-[10px] font-medium transition-colors ${
|
||||
upgradeState === 'confirm'
|
||||
? 'bg-amber-500/20 text-amber-300 hover:bg-amber-500/30'
|
||||
: versionInfo.updateAvailable
|
||||
? 'bg-indigo-600/20 text-indigo-300 hover:bg-indigo-600/30'
|
||||
: 'bg-[#1e2130] text-[#64748b] hover:text-[#94a3b8]'
|
||||
}`}
|
||||
>
|
||||
{upgradeState === 'running' ? (
|
||||
<><Loader2 size={10} className="animate-spin" /><span>Upgrading…</span></>
|
||||
) : upgradeState === 'confirm' ? (
|
||||
<><ArrowUpCircle size={10} /><span>Confirm upgrade</span></>
|
||||
) : versionInfo.updateAvailable ? (
|
||||
<><ArrowUpCircle size={10} /><span>Upgrade available</span></>
|
||||
) : (
|
||||
<><ArrowUpCircle size={10} /><span>Upgrade panel</span></>
|
||||
)}
|
||||
</button>
|
||||
{upgradeState === 'confirm' && (
|
||||
<button
|
||||
onClick={() => setUpgradeState('idle')}
|
||||
className="px-2 py-1.5 rounded-md bg-[#1e2130] text-[#64748b] hover:text-[#94a3b8] text-[10px] transition-colors"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
) : versionError ? (
|
||||
<div className="flex items-center justify-between px-1 py-1">
|
||||
<span className="text-[#4a5568] text-[10px]">Version unavailable</span>
|
||||
<button onClick={fetchVersion} title="Retry" className="text-[#4a5568] hover:text-[#94a3b8] transition-colors">
|
||||
<RefreshCcw size={10} />
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex items-center gap-1.5 px-1 py-1">
|
||||
<Loader2 size={10} className="animate-spin text-[#4a5568]" />
|
||||
<span className="text-[#4a5568] text-[10px]">Checking version…</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* User + logout */}
|
||||
<div className="border-t border-[#2a2d3e] p-3 flex-shrink-0">
|
||||
<div className="px-1 mb-2">
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import React, { useEffect, useState, useRef } from 'react'
|
||||
import { Users, Server, HardDrive, Activity } from 'lucide-react'
|
||||
import { Users, Server, HardDrive, Activity, AlertTriangle, CheckCircle2 } from 'lucide-react'
|
||||
import { AreaChart, Area, XAxis, YAxis, Tooltip, ResponsiveContainer } from 'recharts'
|
||||
import { api } from '../api/client'
|
||||
import { useAuth } from '../contexts/AuthContext'
|
||||
|
||||
interface SystemStats {
|
||||
cpu: number
|
||||
@@ -18,6 +19,17 @@ interface AccountStats {
|
||||
terminated: number
|
||||
}
|
||||
|
||||
interface SystemInfo {
|
||||
hostname: string
|
||||
os: string
|
||||
}
|
||||
|
||||
interface ServiceStatus {
|
||||
name: string
|
||||
status: 'running' | 'stopped' | 'failed' | 'unknown'
|
||||
enabled: boolean
|
||||
}
|
||||
|
||||
interface StatCard {
|
||||
label: string
|
||||
value: string | number
|
||||
@@ -31,15 +43,51 @@ const formatBytes = (bytes: number) => {
|
||||
return gb >= 1 ? `${gb.toFixed(1)} GB` : `${(bytes / 1024 / 1024).toFixed(0)} MB`
|
||||
}
|
||||
|
||||
// ─── Server Info Bar ─────────────────────────────────────────────────────────
|
||||
|
||||
interface InfoCellProps {
|
||||
label: string
|
||||
value: React.ReactNode
|
||||
}
|
||||
|
||||
function InfoCell({ label, value }: InfoCellProps) {
|
||||
return (
|
||||
<div className="flex flex-col min-w-0">
|
||||
<span className="text-[#4a5568] text-[10px] font-medium uppercase tracking-wide leading-none mb-0.5">
|
||||
{label}
|
||||
</span>
|
||||
<span className="text-[#94a3b8] text-xs font-medium leading-none truncate">
|
||||
{value}
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function Divider() {
|
||||
return <div className="w-px h-8 bg-[#2a2d3e] flex-shrink-0" />
|
||||
}
|
||||
|
||||
// ─── Component ───────────────────────────────────────────────────────────────
|
||||
|
||||
export default function Dashboard() {
|
||||
const { user } = useAuth()
|
||||
const [stats, setStats] = useState<SystemStats | null>(null)
|
||||
const [accountStats, setAccountStats] = useState<AccountStats | null>(null)
|
||||
const [cpuHistory, setCpuHistory] = useState<{ t: string; cpu: number; mem: number }[]>([])
|
||||
const [systemInfo, setSystemInfo] = useState<SystemInfo | null>(null)
|
||||
const [version, setVersion] = useState<string | null>(null)
|
||||
const [alertCount, setAlertCount] = useState<number | null>(null)
|
||||
const wsRef = useRef<WebSocket | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
api.get('/nixserver/accounts/stats').then(r => setAccountStats(r.data.data)).catch(() => {})
|
||||
api.get('/nixserver/system/stats').then(r => setStats(r.data.data)).catch(() => {})
|
||||
api.get('/nixserver/system/info').then(r => setSystemInfo(r.data.data)).catch(() => {})
|
||||
api.get('/nixserver/system/version').then(r => setVersion(r.data.data?.currentVersion ?? null)).catch(() => {})
|
||||
api.get('/nixserver/services').then(r => {
|
||||
const services: ServiceStatus[] = r.data.data ?? []
|
||||
setAlertCount(services.filter(s => s.status !== 'running').length)
|
||||
}).catch(() => { setAlertCount(0) })
|
||||
|
||||
// WebSocket live stats
|
||||
const token = localStorage.getItem('access_token')
|
||||
@@ -92,14 +140,44 @@ export default function Dashboard() {
|
||||
},
|
||||
]
|
||||
|
||||
const loadStr = stats
|
||||
? `${stats.load[0].toFixed(2)}\u00a0\u00a0${stats.load[1].toFixed(2)}\u00a0\u00a0${stats.load[2].toFixed(2)}`
|
||||
: '…'
|
||||
|
||||
const monitoringNode =
|
||||
alertCount === null ? (
|
||||
<span className="text-[#4a5568]">…</span>
|
||||
) : alertCount === 0 ? (
|
||||
<span className="flex items-center gap-1 text-emerald-400">
|
||||
<CheckCircle2 size={11} />
|
||||
All Clear
|
||||
</span>
|
||||
) : (
|
||||
<span className="flex items-center gap-1 text-amber-400">
|
||||
<AlertTriangle size={11} />
|
||||
{alertCount} Alert{alertCount !== 1 ? 's' : ''}
|
||||
</span>
|
||||
)
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<div>
|
||||
<h1 className="text-white text-xl font-semibold">Dashboard</h1>
|
||||
<p className="text-[#64748b] text-sm mt-0.5">Server overview and real-time metrics</p>
|
||||
|
||||
{/* ── cPanel-style server info bar ─────────────────────────────────── */}
|
||||
<div className="bg-[#1a1d27] border border-[#2a2d3e] rounded-xl px-5 py-3.5 flex flex-wrap items-center gap-x-5 gap-y-3">
|
||||
<InfoCell label="Username" value={user?.username ?? '…'} />
|
||||
<Divider />
|
||||
<InfoCell label="Hostname" value={systemInfo?.hostname ?? '…'} />
|
||||
<Divider />
|
||||
<InfoCell label="OS" value={systemInfo?.os ?? '…'} />
|
||||
<Divider />
|
||||
<InfoCell label="NixPanel Version" value={version ? `v${version}` : '…'} />
|
||||
<Divider />
|
||||
<InfoCell label="Load Averages" value={loadStr} />
|
||||
<Divider />
|
||||
<InfoCell label="Server Monitoring" value={monitoringNode} />
|
||||
</div>
|
||||
|
||||
{/* Stat cards */}
|
||||
{/* ── Stat cards ───────────────────────────────────────────────────── */}
|
||||
<div className="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-4 gap-4">
|
||||
{cards.map(card => (
|
||||
<div key={card.label} className="bg-[#1a1d27] border border-[#2a2d3e] rounded-xl p-4">
|
||||
@@ -113,7 +191,7 @@ export default function Dashboard() {
|
||||
))}
|
||||
</div>
|
||||
|
||||
{/* CPU / Memory chart */}
|
||||
{/* ── CPU / Memory chart ───────────────────────────────────────────── */}
|
||||
<div className="bg-[#1a1d27] border border-[#2a2d3e] rounded-xl p-4">
|
||||
<h2 className="text-white text-sm font-medium mb-4">CPU & Memory — Live</h2>
|
||||
{cpuHistory.length > 0 ? (
|
||||
@@ -146,7 +224,7 @@ export default function Dashboard() {
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Account status breakdown */}
|
||||
{/* ── Account status breakdown ─────────────────────────────────────── */}
|
||||
{accountStats && (
|
||||
<div className="bg-[#1a1d27] border border-[#2a2d3e] rounded-xl p-4">
|
||||
<h2 className="text-white text-sm font-medium mb-4">Account Status</h2>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nixpanel-server",
|
||||
"version": "0.4.2",
|
||||
"version": "0.4.4",
|
||||
"private": true,
|
||||
"workspaces": [
|
||||
"server",
|
||||
|
||||
+8
-2
@@ -24,14 +24,20 @@ success "Dependencies ready"
|
||||
|
||||
step "Running migrations"
|
||||
cd "$INSTALL_DIR/server"
|
||||
npx prisma generate --silent
|
||||
npx prisma migrate deploy
|
||||
npx prisma generate
|
||||
npx prisma db push
|
||||
success "Migrations applied"
|
||||
|
||||
step "Rebuilding frontends"
|
||||
cd "$INSTALL_DIR"
|
||||
npm run build --workspace=nixserver --silent
|
||||
npm run build --workspace=nixclient --silent
|
||||
# Ensure Apache (www-data) can read the rebuilt assets
|
||||
chmod 755 "$INSTALL_DIR/nixserver" "$INSTALL_DIR/nixclient"
|
||||
find "$INSTALL_DIR/nixserver/dist" -type d -exec chmod 755 {} \;
|
||||
find "$INSTALL_DIR/nixserver/dist" -type f -exec chmod 644 {} \;
|
||||
find "$INSTALL_DIR/nixclient/dist" -type d -exec chmod 755 {} \;
|
||||
find "$INSTALL_DIR/nixclient/dist" -type f -exec chmod 644 {} \;
|
||||
success "Frontends rebuilt"
|
||||
|
||||
step "Rebuilding server"
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nixpanel/server",
|
||||
"version": "0.4.2",
|
||||
"version": "0.4.3",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "dist/index.js",
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ export async function buildApp() {
|
||||
|
||||
fastify.get('/api/health', async () => ({
|
||||
status: 'ok',
|
||||
version: '0.4.2',
|
||||
version: '0.4.4',
|
||||
timestamp: new Date().toISOString(),
|
||||
}))
|
||||
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
import type { FastifyInstance } from 'fastify'
|
||||
import { spawn } from 'child_process'
|
||||
import prisma from '../../db/client.js'
|
||||
import { requireAdmin } from '../../middleware/auth.js'
|
||||
import { getSystemStats } from '../../core/system.js'
|
||||
import { exec } from '../../core/exec.js'
|
||||
import { readFile } from 'fs/promises'
|
||||
|
||||
const INSTALL_DIR = process.env.INSTALL_DIR ?? '/opt/nixpanel'
|
||||
|
||||
export default async function systemRoutes(fastify: FastifyInstance) {
|
||||
// GET /api/nixserver/system/stats
|
||||
fastify.get('/stats', { preHandler: [requireAdmin] }, async (request, reply) => {
|
||||
@@ -121,4 +124,56 @@ export default async function systemRoutes(fastify: FastifyInstance) {
|
||||
|
||||
return reply.send({ success: true, data: { message: 'Settings updated' } })
|
||||
})
|
||||
|
||||
// GET /api/nixserver/system/version
|
||||
// Returns the installed version and checks GitHub for the latest available version.
|
||||
fastify.get('/version', { preHandler: [requireAdmin] }, async (_request, reply) => {
|
||||
// Read installed version from package.json
|
||||
let currentVersion = '0.0.0'
|
||||
try {
|
||||
const pkg = JSON.parse(await readFile(`${INSTALL_DIR}/package.json`, 'utf8'))
|
||||
currentVersion = pkg.version ?? '0.0.0'
|
||||
} catch { /* running in dev or non-standard path */ }
|
||||
|
||||
// Check GitHub for latest version (5 s timeout, non-fatal)
|
||||
let latestVersion: string | null = null
|
||||
try {
|
||||
const resp = await fetch(
|
||||
'https://raw.githubusercontent.com/NixReaper/nixpanel-server/main/package.json',
|
||||
{ signal: AbortSignal.timeout(5_000) }
|
||||
)
|
||||
if (resp.ok) {
|
||||
const json = await resp.json() as { version?: string }
|
||||
latestVersion = json.version ?? null
|
||||
}
|
||||
} catch { /* offline or rate-limited */ }
|
||||
|
||||
return reply.send({
|
||||
success: true,
|
||||
data: {
|
||||
currentVersion,
|
||||
latestVersion,
|
||||
updateAvailable: latestVersion !== null && latestVersion !== currentVersion,
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
// POST /api/nixserver/system/upgrade
|
||||
// Fires the update script in the background and returns immediately.
|
||||
// The service will restart ~60 s later once the build finishes.
|
||||
fastify.post('/upgrade', { preHandler: [requireAdmin] }, async (_request, reply) => {
|
||||
reply.send({
|
||||
success: true,
|
||||
data: { message: 'Upgrade started. The panel will be back online in about 60 seconds.' },
|
||||
})
|
||||
|
||||
// Delay slightly to ensure the HTTP response is flushed before the service restarts
|
||||
setTimeout(() => {
|
||||
const child = spawn('bash', [`${INSTALL_DIR}/scripts/update.sh`], {
|
||||
detached: true,
|
||||
stdio: 'ignore',
|
||||
})
|
||||
child.unref()
|
||||
}, 800)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user