Index: lan-frontend/src/components/TopBar.jsx
===================================================================
--- lan-frontend/src/components/TopBar.jsx (revision 2058e5c694bb6097866a5fe6503c519e8f74970f)
+++ lan-frontend/src/components/TopBar.jsx (revision 505f39ae7b51fc1db15123d66bf06aec0dca2f62)
@@ -1,14 +1,19 @@
import React, { useEffect, useMemo, useState } from "react";
-
-export default function TopBar({ onOpenAI, onRefresh, lastUpdated, onEnvChange }) {
+import logo from "../assets/ChatGPT_Image_Jan_21__2026__01_20_04_PM-removebg-preview (1).png";
+
+export default function TopBar({
+ onOpenAI,
+ onRefresh,
+ lastUpdated,
+ onEnvChange,
+ selectedEnv: selectedEnvProp, // optional (ако сакаш да го контролира App)
+ me,
+ onLoggedOut, // optional callback (App loadMe)
+}) {
const [open, setOpen] = useState(false);
-
- // admin auth
- const [adminKey, setAdminKey] = useState("");
- const [adminSession, setAdminSession] = useState("");
// env + tokens
const [envs, setEnvs] = useState(["default"]);
- const [selectedEnv, setSelectedEnv] = useState("default");
+ const [selectedEnv, setSelectedEnv] = useState(selectedEnvProp || "default");
const [newEnvName, setNewEnvName] = useState("");
const [token, setToken] = useState("");
@@ -17,8 +22,16 @@
const [error, setError] = useState("");
- // helper: fetch env list after login
- async function loadEnvironments(session) {
+
+ // keep in sync ако App праќа selectedEnv prop
+ useEffect(() => {
+ if (selectedEnvProp && selectedEnvProp !== selectedEnv) {
+ setSelectedEnv(selectedEnvProp);
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [selectedEnvProp]);
+
+ async function loadEnvironments() {
const r = await fetch("/api/admin/environments", {
- headers: { "X-Admin-Session": session },
+ credentials: "include",
});
const data = await r.json();
@@ -28,5 +41,4 @@
setEnvs(list);
- // ако тековниот не постои, стави првиот од листата
if (!list.includes(selectedEnv)) {
setSelectedEnv(list[0]);
@@ -35,46 +47,8 @@
}
- async function login() {
- setError("");
- setToken("");
-
- if (!adminKey.trim()) {
- setError("Внеси admin key.");
- return;
- }
-
- setBusy(true);
- try {
- const r = await fetch("/api/admin/login", {
- method: "POST",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify({ admin_key: adminKey.trim() }),
- });
- const data = await r.json();
- if (!r.ok) throw new Error(data?.error || `HTTP ${r.status}`);
-
- const session = data.session;
- setAdminSession(session);
- await loadEnvironments(session);
- } catch (e) {
- setError(String(e.message || e));
- } finally {
- setBusy(false);
- }
- }
-
- function logout() {
- setAdminSession("");
- setAdminKey("");
- setToken("");
- setError("");
- setEnvs(["default"]);
- setSelectedEnv("default");
- onEnvChange?.("default");
- }
-
async function createEnvironment() {
setError("");
setToken("");
+
if (!newEnvName.trim()) {
setError("Внеси име за environment.");
@@ -86,8 +60,6 @@
const r = await fetch("/api/admin/environments", {
method: "POST",
- headers: {
- "Content-Type": "application/json",
- "X-Admin-Session": adminSession,
- },
+ headers: { "Content-Type": "application/json" },
+ credentials: "include",
body: JSON.stringify({ name: newEnvName.trim() }),
});
@@ -96,6 +68,5 @@
if (!r.ok) throw new Error(data?.error || `HTTP ${r.status}`);
- // reload list, select new env
- await loadEnvironments(adminSession);
+ await loadEnvironments();
setSelectedEnv(newEnvName.trim());
onEnvChange?.(newEnvName.trim());
@@ -120,8 +91,6 @@
const r = await fetch("/api/admin/tokens", {
method: "POST",
- headers: {
- "Content-Type": "application/json",
- "X-Admin-Session": adminSession,
- },
+ headers: { "Content-Type": "application/json" },
+ credentials: "include",
body: JSON.stringify({ env: selectedEnv }),
});
@@ -147,4 +116,15 @@
setToken("");
onEnvChange?.(val);
+ }
+
+ async function logout() {
+ try {
+ await fetch("/api/auth/logout", { method: "POST", credentials: "include" });
+ } catch {}
+ onLoggedOut?.();
+ // reset local admin modal state
+ setOpen(false);
+ setToken("");
+ setError("");
}
@@ -161,228 +141,63 @@
<>
- {/* TOPBAR */}
@@ -394,6 +209,23 @@
Sysmon Edition •
{prettyTime}
+ {me?.email && (
+
+ Signed in as {me.email}
+ {me.role ? ` • ${me.role}` : ""}
+
+ )}
+
+
+
@@ -402,12 +234,29 @@
Env: {selectedEnv}
-
-
-
+
+
+
- {/* MODAL */}
{open && (
setOpen(false)}>
@@ -415,106 +264,92 @@
-
Admin Panel
-
Login ➜ Environments ➜ Generate token
-
-
+
Tenant Admin
+
+ Environments ➜ Generate token (clients send X-Env-Token to /receive)
+
+
+
+
+
+
- {/* 1) LOGIN */}
- {!adminSession ? (
-
-
-
Step 1: Admin login
+
+
+
+
+
+ Овој env ќе се користи за dashboard филтрирање + token generation.
-
-
-
setAdminKey(e.target.value)}
- placeholder="Enter admin key"
- />
-
-
- Admin key е само за логирање. После тоа користиме session token.
-
-
-
- ) : (
- <>
- {/* 2) ENV SELECT */}
-
-
-
Step 2: Choose environment
-
-
-
-
-
+
+
+
+
+
+
Create new environment
+
+
+ setNewEnvName(e.target.value)}
+ placeholder="e.g. school-lab / staging"
+ />
+
+
+
+
+
+
+
Generate token (for clients)
+
+
+
+
+
+ {token && (
+ <>
+
+
+
+ Token
+
+
+ {token.slice(0, 12)}…{token.slice(-10)}
+
+
+
+
+
- Овој env ќе се користи за dashboard филтрирање + token generation.
+ Клиентот мора да праќа header: X-Env-Token со овој token на /receive.
-
-
-
- {/* 3) CREATE ENV */}
-
-
-
Create new environment
-
-
-
- setNewEnvName(e.target.value)}
- placeholder="e.g. school-lab / staging"
- />
-
-
-
-
- {/* 4) TOKEN */}
-
-
-
Step 3: Generate token (for clients)
-
-
-
-
-
- {token && (
- <>
-
-
-
Token
-
- {token.slice(0, 12)}…{token.slice(-10)}
-
-
-
-
-
-
- Клиентот мора да праќа header: X-Env-Token со овој token на /receive.
-
-
- )}
-
-
-
- )}
+
+ )}
+
+
{error && (