mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-11-17 19:16:25 +00:00
Update AppImage
This commit is contained in:
@@ -5,10 +5,16 @@ import { Button } from "./ui/button"
|
|||||||
import { Input } from "./ui/input"
|
import { Input } from "./ui/input"
|
||||||
import { Label } from "./ui/label"
|
import { Label } from "./ui/label"
|
||||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./ui/card"
|
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./ui/card"
|
||||||
import { Shield, Lock, User, AlertCircle, CheckCircle, Info, LogOut } from "lucide-react"
|
import { Shield, Lock, User, AlertCircle, CheckCircle, Info, LogOut, Wrench, Package } from "lucide-react"
|
||||||
import { getApiUrl } from "../lib/api-config"
|
import { getApiUrl } from "../lib/api-config"
|
||||||
import { TwoFactorSetup } from "./two-factor-setup"
|
import { TwoFactorSetup } from "./two-factor-setup"
|
||||||
|
|
||||||
|
interface ProxMenuxTool {
|
||||||
|
key: string
|
||||||
|
name: string
|
||||||
|
enabled: boolean
|
||||||
|
}
|
||||||
|
|
||||||
export function Settings() {
|
export function Settings() {
|
||||||
const [authEnabled, setAuthEnabled] = useState(false)
|
const [authEnabled, setAuthEnabled] = useState(false)
|
||||||
const [totpEnabled, setTotpEnabled] = useState(false)
|
const [totpEnabled, setTotpEnabled] = useState(false)
|
||||||
@@ -32,8 +38,12 @@ export function Settings() {
|
|||||||
const [show2FADisable, setShow2FADisable] = useState(false)
|
const [show2FADisable, setShow2FADisable] = useState(false)
|
||||||
const [disable2FAPassword, setDisable2FAPassword] = useState("")
|
const [disable2FAPassword, setDisable2FAPassword] = useState("")
|
||||||
|
|
||||||
|
const [proxmenuxTools, setProxmenuxTools] = useState<ProxMenuxTool[]>([])
|
||||||
|
const [loadingTools, setLoadingTools] = useState(true)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
checkAuthStatus()
|
checkAuthStatus()
|
||||||
|
loadProxmenuxTools()
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const checkAuthStatus = async () => {
|
const checkAuthStatus = async () => {
|
||||||
@@ -47,6 +57,21 @@ export function Settings() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const loadProxmenuxTools = async () => {
|
||||||
|
try {
|
||||||
|
const response = await fetch(getApiUrl("/api/proxmenux/installed-tools"))
|
||||||
|
const data = await response.json()
|
||||||
|
|
||||||
|
if (data.success) {
|
||||||
|
setProxmenuxTools(data.installed_tools || [])
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Failed to load ProxMenux tools:", err)
|
||||||
|
} finally {
|
||||||
|
setLoadingTools(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const handleEnableAuth = async () => {
|
const handleEnableAuth = async () => {
|
||||||
setError("")
|
setError("")
|
||||||
setSuccess("")
|
setSuccess("")
|
||||||
@@ -541,21 +566,45 @@ export function Settings() {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
{/* About Section */}
|
{/* ProxMenux Optimizations */}
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle>About</CardTitle>
|
<div className="flex items-center gap-2">
|
||||||
<CardDescription>ProxMenux Monitor information</CardDescription>
|
<Wrench className="h-5 w-5 text-orange-500" />
|
||||||
|
<CardTitle>ProxMenux Optimizations</CardTitle>
|
||||||
|
</div>
|
||||||
|
<CardDescription>System optimizations and utilities installed via ProxMenux</CardDescription>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent className="space-y-2">
|
<CardContent>
|
||||||
<div className="flex justify-between">
|
{loadingTools ? (
|
||||||
<span className="text-muted-foreground">Version</span>
|
<div className="flex items-center justify-center py-8">
|
||||||
<span className="font-medium">1.0.1</span>
|
<div className="animate-spin h-8 w-8 border-4 border-orange-500 border-t-transparent rounded-full" />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex justify-between">
|
) : proxmenuxTools.length === 0 ? (
|
||||||
<span className="text-muted-foreground">Build</span>
|
<div className="text-center py-8">
|
||||||
<span className="font-medium">Debian Package</span>
|
<Package className="h-12 w-12 text-muted-foreground mx-auto mb-3 opacity-50" />
|
||||||
</div>
|
<p className="text-muted-foreground">No ProxMenux optimizations installed yet</p>
|
||||||
|
<p className="text-sm text-muted-foreground mt-1">Run ProxMenux to configure system optimizations</p>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-2">
|
||||||
|
<div className="flex items-center justify-between mb-4 pb-2 border-b border-border">
|
||||||
|
<span className="text-sm font-medium text-muted-foreground">Installed Tools</span>
|
||||||
|
<span className="text-sm font-semibold text-orange-500">{proxmenuxTools.length} active</span>
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-2">
|
||||||
|
{proxmenuxTools.map((tool) => (
|
||||||
|
<div
|
||||||
|
key={tool.key}
|
||||||
|
className="flex items-center gap-2 p-3 bg-muted/50 rounded-lg border border-border hover:bg-muted transition-colors"
|
||||||
|
>
|
||||||
|
<div className="w-2 h-2 rounded-full bg-green-500 flex-shrink-0" />
|
||||||
|
<span className="text-sm font-medium">{tool.name}</span>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ cp "$SCRIPT_DIR/auth_manager.py" "$APP_DIR/usr/bin/" 2>/dev/null || echo "⚠️
|
|||||||
cp "$SCRIPT_DIR/health_monitor.py" "$APP_DIR/usr/bin/" 2>/dev/null || echo "⚠️ health_monitor.py not found"
|
cp "$SCRIPT_DIR/health_monitor.py" "$APP_DIR/usr/bin/" 2>/dev/null || echo "⚠️ health_monitor.py not found"
|
||||||
cp "$SCRIPT_DIR/health_persistence.py" "$APP_DIR/usr/bin/" 2>/dev/null || echo "⚠️ health_persistence.py not found"
|
cp "$SCRIPT_DIR/health_persistence.py" "$APP_DIR/usr/bin/" 2>/dev/null || echo "⚠️ health_persistence.py not found"
|
||||||
cp "$SCRIPT_DIR/flask_health_routes.py" "$APP_DIR/usr/bin/" 2>/dev/null || echo "⚠️ flask_health_routes.py not found"
|
cp "$SCRIPT_DIR/flask_health_routes.py" "$APP_DIR/usr/bin/" 2>/dev/null || echo "⚠️ flask_health_routes.py not found"
|
||||||
|
cp "$SCRIPT_DIR/flask_proxmenux_routes.py" "$APP_DIR/usr/bin/" 2>/dev/null || echo "⚠️ flask_proxmenux_routes.py not found"
|
||||||
|
|
||||||
echo "📋 Adding translation support..."
|
echo "📋 Adding translation support..."
|
||||||
cat > "$APP_DIR/usr/bin/translate_cli.py" << 'PYEOF'
|
cat > "$APP_DIR/usr/bin/translate_cli.py" << 'PYEOF'
|
||||||
|
|||||||
75
AppImage/scripts/flask_proxmenux_routes.py
Normal file
75
AppImage/scripts/flask_proxmenux_routes.py
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
from flask import Blueprint, jsonify
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
proxmenux_bp = Blueprint('proxmenux', __name__)
|
||||||
|
|
||||||
|
# Tool descriptions mapping
|
||||||
|
TOOL_DESCRIPTIONS = {
|
||||||
|
'lvm_repair': 'LVM PV Headers Repair',
|
||||||
|
'repo_cleanup': 'Repository Cleanup',
|
||||||
|
'subscription_banner': 'Subscription Banner Removal',
|
||||||
|
'time_sync': 'Time Synchronization',
|
||||||
|
'apt_languages': 'APT Language Skip',
|
||||||
|
'journald': 'Journald Optimization',
|
||||||
|
'logrotate': 'Logrotate Optimization',
|
||||||
|
'system_limits': 'System Limits Increase',
|
||||||
|
'entropy': 'Entropy Generation (haveged)',
|
||||||
|
'memory_settings': 'Memory Settings Optimization',
|
||||||
|
'kernel_panic': 'Kernel Panic Configuration',
|
||||||
|
'apt_ipv4': 'APT IPv4 Force',
|
||||||
|
'kexec': 'kexec for quick reboots',
|
||||||
|
'network_optimization': 'Network Optimizations',
|
||||||
|
'bashrc_custom': 'Bashrc Customization',
|
||||||
|
'figurine': 'Figurine',
|
||||||
|
'fastfetch': 'Fastfetch',
|
||||||
|
'log2ram': 'Log2ram (SSD Protection)',
|
||||||
|
'amd_fixes': 'AMD CPU (Ryzen/EPYC) fixes',
|
||||||
|
'persistent_network': 'Setting persistent network interfaces'
|
||||||
|
}
|
||||||
|
|
||||||
|
@proxmenux_bp.route('/api/proxmenux/installed-tools', methods=['GET'])
|
||||||
|
def get_installed_tools():
|
||||||
|
"""Get list of installed ProxMenux tools/optimizations"""
|
||||||
|
installed_tools_path = '/usr/local/share/proxmenux/installed_tools.json'
|
||||||
|
|
||||||
|
try:
|
||||||
|
if not os.path.exists(installed_tools_path):
|
||||||
|
return jsonify({
|
||||||
|
'success': True,
|
||||||
|
'installed_tools': [],
|
||||||
|
'message': 'No ProxMenux optimizations installed yet'
|
||||||
|
})
|
||||||
|
|
||||||
|
with open(installed_tools_path, 'r') as f:
|
||||||
|
data = json.load(f)
|
||||||
|
|
||||||
|
# Convert to list format with descriptions
|
||||||
|
tools = []
|
||||||
|
for tool_key, enabled in data.items():
|
||||||
|
if enabled: # Only include enabled tools
|
||||||
|
tools.append({
|
||||||
|
'key': tool_key,
|
||||||
|
'name': TOOL_DESCRIPTIONS.get(tool_key, tool_key.replace('_', ' ').title()),
|
||||||
|
'enabled': enabled
|
||||||
|
})
|
||||||
|
|
||||||
|
# Sort alphabetically by name
|
||||||
|
tools.sort(key=lambda x: x['name'])
|
||||||
|
|
||||||
|
return jsonify({
|
||||||
|
'success': True,
|
||||||
|
'installed_tools': tools,
|
||||||
|
'total_count': len(tools)
|
||||||
|
})
|
||||||
|
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
return jsonify({
|
||||||
|
'success': False,
|
||||||
|
'error': 'Invalid JSON format in installed_tools.json'
|
||||||
|
}), 500
|
||||||
|
except Exception as e:
|
||||||
|
return jsonify({
|
||||||
|
'success': False,
|
||||||
|
'error': str(e)
|
||||||
|
}), 500
|
||||||
@@ -34,12 +34,14 @@ from flask_health_routes import health_bp
|
|||||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
from flask_auth_routes import auth_bp
|
from flask_auth_routes import auth_bp
|
||||||
|
from flask_proxmenux_routes import proxmenux_bp
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
CORS(app) # Enable CORS for Next.js frontend
|
CORS(app) # Enable CORS for Next.js frontend
|
||||||
|
|
||||||
app.register_blueprint(auth_bp)
|
app.register_blueprint(auth_bp)
|
||||||
app.register_blueprint(health_bp)
|
app.register_blueprint(health_bp)
|
||||||
|
app.register_blueprint(proxmenux_bp)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user