Skip to content

Dev builds/2.0.0 #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Medicopter117 merged 3 commits into from
Jan 21, 2026
Merged

Dev builds/2.0.0 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
973db59
update: static
Medicopter117 Jan 20, 2026
2ce6bbc
Update
Medicopter117 Jan 21, 2026
d058872
Merge branch 'main' into dev-builds/2.0.0
Medicopter117 Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 43 additions & 5 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
# =============================================================================
import discord
import sys
import asyncio
from pathlib import Path
from colorama import Fore, Style, init as colorama_init
from dotenv import load_dotenv
import ezcord
from ezcord import CogLog
from aiohttp import web # Neu für die Status-Seite

# Logger (muss existieren!)
from logger import logger
Expand All @@ -27,6 +29,7 @@
from src.bot.core.database import DatabaseManager
from src.bot.core.dashboard import DashboardTask
from src.bot.core.utils import print_logo

# =============================================================================
# SETUP
# =============================================================================
Expand All @@ -37,6 +40,41 @@
# Sys-Path
if str(BASEDIR) not in sys.path:
sys.path.append(str(BASEDIR))

# =============================================================================
# STATUS API SERVER (Für die React-Webseite)
# =============================================================================
async def get_status_api(request):
"""Liefert Live-Daten an die React Status-Seite"""
try:
status_data = {
"status": "online",
"latency": f"{round(bot.latency * 1000)}ms",
"version": BotConfig.VERSION,
"guilds": len(bot.guilds),
"users": len(bot.users),
"sqlite": "connected",
"ai_engine": "ready"
}
return web.json_response(status_data, headers={
"Access-Control-Allow-Origin": "*",
"Access-Control-Allow-Methods": "GET"
})
except Exception as e:
logger.error("API", f"Fehler bei Status-Abfrage: {e}")
return web.json_response({"status": "error"}, status=500)

async def start_webserver():
"""Startet den aiohttp Webserver auf Port 8080"""
app = web.Application()
app.router.add_get('/api/status', get_status_api)
runner = web.AppRunner(app)
await runner.setup()
# Port 8080 - Stelle sicher, dass dieser in der Firewall offen ist (ufw allow 8080/tcp)
site = web.TCPSite(runner, '0.0.0.0', 8040)

Check warning on line 74 in main.py

View check run for this annotation

codefactor.io / CodeFactor

main.py#L74 

Possible binding to all interfaces. (B104)
await site.start()
logger.success("API", "Status-Server läuft auf http://0.0.0.0:8040/api/status")

# =============================================================================
# MAIN EXECUTION
# =============================================================================
Expand All @@ -55,7 +93,7 @@
bot_setup = BotSetup(config)
bot = bot_setup.create_bot()

# Datenbank initialisieren (optional - Bot läuft auch ohne)
# Datenbank initialisieren
db_manager = DatabaseManager()
if not db_manager.initialize(bot):
logger.warning("DATABASE", "Bot läuft ohne Datenbank weiter...")
Expand All @@ -71,6 +109,9 @@
async def on_ready():
logger.success("BOT", f"Logged in as {bot.user.name}")

# --- NEU: Status API & Webserver starten ---
bot.loop.create_task(start_webserver())

# Dashboard starten
dashboard.start()

Expand All @@ -87,18 +128,15 @@
await bot.sync_commands()
logger.success("COMMANDS", "Application Commands synchronisiert")


# Minimaler KeepAlive Cog - damit Bot immer online bleibt
# Minimaler KeepAlive Cog
class KeepAlive(discord.ext.commands.Cog):
"""Minimal Cog to keep bot online"""
def __init__(self, bot):
self.bot = bot

@discord.ext.commands.Cog.listener()
async def on_ready(self):
logger.info("KEEPALIVE", "KeepAlive Cog aktiv - Bot bleibt online")

# KeepAlive Cog immer laden
bot.add_cog(KeepAlive(bot))
logger.success("BOT", "KeepAlive Cog geladen")

Expand Down
5 changes: 5 additions & 0 deletions src/web/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import NotFound from "./pages/NotFound";
import Impressum from "./pages/Impressum";
import Datenschutz from "./pages/Datenschutz";
import Nutzungsbedingungen from "./pages/Nutzungsbedingungen";
import PluginsPage from "./pages/PluginsPage";
import Status from "./pages/Status";


const queryClient = new QueryClient();

Expand All @@ -22,6 +25,8 @@ const App = () => (
<Route path="/impressum" element={<Impressum />} />
<Route path="/datenschutz" element={<Datenschutz />} />
<Route path="/nutzungsbedingungen" element={<Nutzungsbedingungen />} />
<Route path="/plugins" element={<PluginsPage />} />
<Route path="/status" element={<Status />} />
{/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */}
<Route path="*" element={<NotFound />} />
</Routes>
Expand Down
107 changes: 84 additions & 23 deletions src/web/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { memo } from "react";
import { Link } from "react-router-dom";
import { motion } from "framer-motion";
import { Shield, Heart, Github, MessageCircle, ExternalLink, Terminal, Sparkles } from "lucide-react";
import { Shield, Heart, Github, MessageCircle, ExternalLink, Terminal, Sparkles, Code2 } from "lucide-react";

const socialLinks = [
{ icon: Github, href: "https://github.com/dein-github", label: "GitHub" },
{ icon: Github, href: "https://github.com/ManagerX-Development/ManagerX", label: "GitHub" },
{ icon: MessageCircle, href: "https://discord.gg/dein-link", label: "Discord Support" },
];

Expand All @@ -13,11 +13,12 @@ export const Footer = memo(function Footer() {
<footer className="relative py-24 border-t border-white/5 bg-background overflow-hidden">
{/* Hintergrund-Effekte */}
<div className="absolute top-0 left-1/2 -translate-x-1/2 w-3/4 h-[1px] bg-gradient-to-r from-transparent via-primary/20 to-transparent" />
<div className="absolute bottom-0 left-1/2 -translate-x-1/2 w-[600px] h-[300px] bg-primary/5 blur-[120px] rounded-full pointer-events-none" />

<div className="container relative z-10 px-4">
<div className="flex flex-col items-center">

{/* --- EXAKT DAS LOGO AUS DER HERO --- */}
{/* --- HERO LOGO REPLICA --- */}
<motion.div
initial={{ opacity: 0, scale: 0.9 }}
whileInView={{ opacity: 1, scale: 1 }}
Expand All @@ -34,18 +35,18 @@ export const Footer = memo(function Footer() {
</div>
</motion.div>

{/* --- TITEL AUS DER HERO --- */}
{/* --- BRAND TITLE --- */}
<motion.h2
initial={{ opacity: 0, y: 10 }}
whileInView={{ opacity: 1, y: 0 }}
viewport={{ once: true }}
className="text-5xl md:text-6xl font-bold mb-6 tracking-tight text-center"
>
<span className="text-foreground">Manager</span>
<span className="text-foreground italic">Manager</span>
<span className="text-transparent bg-clip-text bg-gradient-to-r from-primary to-accent ml-2">X</span>
</motion.h2>

{/* --- DEIN SLOGAN --- */}
{/* --- SLOGAN --- */}
<motion.p
initial={{ opacity: 0 }}
whileInView={{ opacity: 1 }}
Expand Down Expand Up @@ -74,42 +75,102 @@ export const Footer = memo(function Footer() {
))}
</div>

{/* --- NAVIGATION GRID --- */}
<div className="grid grid-cols-2 md:grid-cols-4 gap-12 text-center border-y border-white/5 py-16 w-full max-w-5xl mb-16">
{/* --- NAVIGATION & TECH GRID --- */}
<div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-4 gap-12 text-center md:text-left border-y border-white/5 py-16 w-full max-w-6xl mb-16">

{/* Spalte 1: Bot Navigation */}
<div className="flex flex-col gap-4">
<span className="text-[10px] font-black uppercase tracking-widest text-primary">Bot</span>
<a href="#features" className="text-sm text-muted-foreground hover:text-foreground">Features</a>
<a href="#stats" className="text-sm text-muted-foreground hover:text-foreground">Stats</a>
<span className="text-[10px] font-black uppercase tracking-widest text-primary">Schnellzugriff</span>
<a href="#features" className="text-sm text-muted-foreground hover:text-foreground transition-colors">Features</a>
<a href="#stats" className="text-sm text-muted-foreground hover:text-foreground transition-colors">Stats</a>
<a href="#commands" className="text-sm text-muted-foreground hover:text-foreground transition-colors">Commands</a>
</div>

{/* Spalte 2: Links */}
<div className="flex flex-col gap-4">
<span className="text-[10px] font-black uppercase tracking-widest text-primary">Links</span>
<a href="https://docs.oppro-network.de/" target="_blank" className="text-sm text-muted-foreground hover:text-foreground flex items-center justify-center gap-1 text-center">Docs <ExternalLink className="w-3 h-3" /></a>
<a href="https://discord..." className="text-sm text-muted-foreground hover:text-foreground text-center">Invite</a>
<a href="https://docs.oppro-network.de/" target="_blank" rel="noreferrer" className="text-sm text-muted-foreground hover:text-foreground flex items-center justify-center md:justify-start gap-1">
Docs <ExternalLink className="w-3 h-3" />
</a>
<a href="https://discord.com" className="text-sm text-muted-foreground hover:text-foreground transition-colors">Invite Bot</a>
<a href="https://status.oppro-network.de" className="text-sm text-muted-foreground hover:text-foreground transition-colors">Status Page</a>
</div>

{/* Spalte 3: Rechtliches */}
<div className="flex flex-col gap-4">
<span className="text-[10px] font-black uppercase tracking-widest text-primary">Rechtliches</span>
<Link to="/Datenschutz" className="text-sm text-muted-foreground hover:text-foreground">Datenschutz</Link>
<Link to="/Impressum" className="text-sm text-muted-foreground hover:text-foreground">Impressum</Link>
<Link to="/Nutzungsbedingungen" className="text-sm text-muted-foreground hover:text-foreground">Nutzungsbedingungen</Link>
<Link to="/datenschutz" className="text-sm text-muted-foreground hover:text-foreground transition-colors">Datenschutz</Link>
<Link to="/impressum" className="text-sm text-muted-foreground hover:text-foreground transition-colors">Impressum</Link>
<Link to="/nutzungsbedingungen" className="text-sm text-muted-foreground hover:text-foreground transition-colors">Nutzungsbedingungen</Link>
</div>
<div className="flex flex-col gap-4 items-center">
<span className="text-[10px] font-black uppercase tracking-widest text-primary">Status</span>
<div className="flex items-center gap-2 text-xs font-mono text-accent">
<Terminal className="w-4 h-4" />
<span>Online</span>

{/* Spalte 4: TECH STACK (DEINE REPO DATEN) */}
<div className="flex flex-col gap-4">
<span className="text-[10px] font-black uppercase tracking-widest text-primary">System Architecture</span>
<div className="space-y-4">
{/* Python */}
<div className="space-y-1.5">
<div className="flex justify-between text-[10px] font-mono tracking-tighter">
<span className="text-foreground">Python (Core)</span>
<span className="text-primary">66.6%</span>
</div>
<div className="h-1 w-full bg-white/5 rounded-full overflow-hidden">
<motion.div
initial={{ width: 0 }}
whileInView={{ width: "66.6%" }}
viewport={{ once: true }}
className="h-full bg-primary shadow-[0_0_8px_rgba(var(--primary),0.4)]"
/>
</div>
</div>

{/* TypeScript */}
<div className="space-y-1.5">
<div className="flex justify-between text-[10px] font-mono tracking-tighter">
<span className="text-foreground">TypeScript (Web)</span>
<span className="text-accent">32.0%</span>
</div>
<div className="h-1 w-full bg-white/5 rounded-full overflow-hidden">
<motion.div
initial={{ width: 0 }}
whileInView={{ width: "32.0%" }}
viewport={{ once: true }}
className="h-full bg-accent shadow-[0_0_8px_rgba(var(--accent),0.4)]"
/>
</div>
</div>

<div className="flex items-center gap-3 pt-1">
<div className="flex items-center gap-1.5">
<div className="w-1.5 h-1.5 rounded-full bg-blue-400 opacity-50" />
<span className="text-[9px] font-mono text-muted-foreground">CSS 1.1%</span>
</div>
<div className="flex items-center gap-2 px-2 py-0.5 rounded bg-accent/5 border border-accent/10">
<Terminal className="w-3 h-3 text-accent" />
<span className="text-[9px] font-mono text-accent">V2.0.0</span>
</div>
</div>
</div>
</div>
</div>

{/* --- BOTTOM BAR --- */}
<div className="flex flex-col md:flex-row items-center justify-between w-full gap-8">
<div className="flex items-center gap-3 text-[10px] font-bold uppercase tracking-widest text-muted-foreground">
<div className="flex items-center gap-3 text-[10px] font-bold uppercase tracking-[0.2em] text-muted-foreground">
<span>Built with</span>
<Heart className="w-4 h-4 text-primary fill-primary animate-pulse" />
<span>by ManagerX Dev Team</span>
</div>

<div className="flex items-center gap-6 opacity-40">
<div className="flex items-center gap-2 text-[10px] font-mono uppercase">
<Code2 className="w-3 h-3" />
<span>Open Source Project</span>
</div>
</div>

<p className="text-[10px] font-mono text-muted-foreground/40">
© {new Date().getFullYear()} / V2.0.0
© {new Date().getFullYear()} / ALL RIGHTS RESERVED
</p>
</div>
</div>
Expand Down
Loading