Index: .env =================================================================== --- .env (revision 2058e5c694bb6097866a5fe6503c519e8f74970f) +++ .env (revision 505f39ae7b51fc1db15123d66bf06aec0dca2f62) @@ -1,1 +1,4 @@ ADMIN_KEY=admin-key123 +GOOGLE_CLIENT_ID=43542590862-pt18e0hb33o41889bu976oshddoemivs.apps.googleusercontent.com +JWT_SECRET=ova_43542590862_admin_098765434 +OPENAI_API_KEY=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 Index: lan-frontend/.env =================================================================== --- lan-frontend/.env (revision 2058e5c694bb6097866a5fe6503c519e8f74970f) +++ lan-frontend/.env (revision 505f39ae7b51fc1db15123d66bf06aec0dca2f62) @@ -1,1 +1,2 @@ -VITE_API_BASE=http://192.168.11.232:5555 +VITE_API_BASE=http://localhost:5555 +VITE_GOOGLE_CLIENT_ID=43542590862-pt18e0hb33o41889bu976oshddoemivs.apps.googleusercontent.com Index: lan-frontend/package-lock.json =================================================================== --- lan-frontend/package-lock.json (revision 2058e5c694bb6097866a5fe6503c519e8f74970f) +++ lan-frontend/package-lock.json (revision 505f39ae7b51fc1db15123d66bf06aec0dca2f62) @@ -9,4 +9,5 @@ "version": "0.0.0", "dependencies": { + "@react-oauth/google": "^0.13.4", "chart.js": "^4.5.1", "react": "^19.2.0", @@ -1014,4 +1015,14 @@ "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==", "license": "MIT" + }, + "node_modules/@react-oauth/google": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/@react-oauth/google/-/google-0.13.4.tgz", + "integrity": "sha512-hGKyNEH+/PK8M0sFEuo3MAEk0txtHpgs94tDQit+s2LXg7b6z53NtzHfqDvoB2X8O6lGB+FRg80hY//X6hfD+w==", + "license": "MIT", + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } }, "node_modules/@reduxjs/toolkit": { Index: lan-frontend/package.json =================================================================== --- lan-frontend/package.json (revision 2058e5c694bb6097866a5fe6503c519e8f74970f) +++ lan-frontend/package.json (revision 505f39ae7b51fc1db15123d66bf06aec0dca2f62) @@ -11,4 +11,5 @@ }, "dependencies": { + "@react-oauth/google": "^0.13.4", "chart.js": "^4.5.1", "react": "^19.2.0", Index: lan-frontend/src/App.jsx =================================================================== --- lan-frontend/src/App.jsx (revision 2058e5c694bb6097866a5fe6503c519e8f74970f) +++ lan-frontend/src/App.jsx (revision 505f39ae7b51fc1db15123d66bf06aec0dca2f62) @@ -1,6 +1,6 @@ -import React from "react"; -import {useEffect, useMemo, useState} from "react"; +import React, {useEffect, useMemo, useState} from "react"; import "./styles/theme.css"; +import Login from "./components/Login"; import TopBar from "./components/TopBar"; import ComputerCard from "./components/ComputerCard"; @@ -22,13 +22,40 @@ const [selectedEnv, setSelectedEnv] = useState("default"); + const [me, setMe] = useState(null); + const [meLoading, setMeLoading] = useState(true); + + // const [openAI, setOpenAI] = useState(false); + // const [scope, setScope] = useState(null); + + + async function loadMe() { + setMeLoading(true); + try { + const r = await fetch("/api/me", {credentials: "include"}); + if (r.ok) { + const data = await r.json(); + setMe(data.user); + } else { + setMe(null); + } + } catch (e) { + console.error("loadMe error", e); + setMe(null); + } finally { + setMeLoading(false); + } + } + async function refresh() { try { setLoading(true); const [s, c] = await Promise.all([ - fetch("/api/stats").then((r) => r.json()), + fetch("/api/stats", {credentials: "include"}).then((r) => r.json()), fetch("/api/computers", { + credentials: "include", headers: {"X-Env": selectedEnv}, }).then((r) => r.json()), ]); + setStats(s); setComputers(Array.isArray(c) ? c : []); @@ -41,7 +68,14 @@ } + // on mount: check session useEffect(() => { - refresh(); - }, [selectedEnv]); + loadMe(); + }, []); + + // when logged in OR env changed, refresh data + useEffect(() => { + if (me) refresh(); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [me, selectedEnv]); const filtered = useMemo(() => { @@ -51,8 +85,15 @@ .filter((c) => { if (!q) return true; - const hay = [c.name, c.user, c.ip, c.os, c.status].filter(Boolean).join(" ").toLowerCase(); + const hay = [c.name, c.user, c.ip, c.os, c.status] + .filter(Boolean) + .join(" ") + .toLowerCase(); return hay.includes(q); }); }, [computers, query, status]); + + // Gate UI + if (meLoading) return
Loading…
; + if (!me) return ; return ( @@ -64,5 +105,8 @@ onEnvChange={(env) => setSelectedEnv(env)} selectedEnv={selectedEnv} + me={me} + onLoggedOut={loadMe} /> + {/* STATS */} @@ -104,5 +148,9 @@ /> - setStatus(e.target.value)} + > @@ -111,5 +159,7 @@ - + @@ -122,8 +172,12 @@
{filtered.length} computers -
@@ -142,5 +196,7 @@ ))} {filtered.length === 0 && ( -
No computers match filter.
+
+ No computers match filter. +
)} @@ -160,4 +216,15 @@ {/* AI DRAWER */} + {/**/} + + {/* setOpenAI(false)}*/} + {/* computers={computers}*/} + {/* scope={scope}*/} + {/* setScope={setScope}*/} + {/* apiBase={import.meta.env.VITE_API_BASE}*/} + {/*/>*/} + + + ); Index: lan-frontend/src/components/AIAssistantDrawer.jsx =================================================================== --- lan-frontend/src/components/AIAssistantDrawer.jsx (revision 2058e5c694bb6097866a5fe6503c519e8f74970f) +++ lan-frontend/src/components/AIAssistantDrawer.jsx (revision 505f39ae7b51fc1db15123d66bf06aec0dca2f62) @@ -1,83 +1,138 @@ -import React from "react"; +import React, {useEffect, useRef, useState} from "react"; -import { useEffect, useRef, useState } from "react"; +export default function AIAssistantDrawer({ + open, + onClose, + computers, + scope, + setScope, + apiBase = "", // ако сакаш можеш да пратиш VITE_API_BASE тука + }) { + const [messages, setMessages] = useState([ + { + role: "assistant", + text: "Постави прашање за Sysmon, процеси, мрежа. Можеш да избереш компјутер (scope) горе.", + }, + ]); + const [input, setInput] = useState(""); + const [sending, setSending] = useState(false); + const bottomRef = useRef(null); -export default function AIAssistantDrawer({ open, onClose, computers, scope, setScope }) { - const [messages, setMessages] = useState([ - { role: "assistant", text: "Постави прашање за Sysmon, процеси, мрежа. Можеш да избереш компјутер (scope) горе." }, - ]); - const [input, setInput] = useState(""); - const [sending, setSending] = useState(false); - const bottomRef = useRef(null); + useEffect(() => { + if (open) { + // затвори со Escape + const onKey = (e) => { + if (e.key === "Escape") onClose?.(); + }; + window.addEventListener("keydown", onKey); + return () => window.removeEventListener("keydown", onKey); + } + }, [open, onClose]); - useEffect(() => { - if (bottomRef.current) bottomRef.current.scrollIntoView({ behavior: "smooth" }); - }, [messages, open]); + useEffect(() => { + if (bottomRef.current) bottomRef.current.scrollIntoView({behavior: "smooth"}); + }, [messages, open]); - async function send() { - const q = input.trim(); - if (!q || sending) return; + async function send() { + const q = input.trim(); + if (!q || sending) return; - setInput(""); - setMessages((m) => [...m, { role: "user", text: q }]); - setSending(true); + setInput(""); + setMessages((m) => [...m, {role: "user", text: q}]); + setSending(true); - try { - const r = await fetch("/api/chat", { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ question: q, computer_name: scope || null }), - }); - const data = await r.json(); - setMessages((m) => [...m, { role: "assistant", text: data.answer || "(no answer)" }]); - } catch (e) { - setMessages((m) => [...m, { role: "assistant", text: `Грешка: ${String(e.message || e)}` }]); - } finally { - setSending(false); + try { + const base = (apiBase || "").replace(/\/$/, ""); // тргни trailing / + const url = `${base}/api/chat`; + + const r = await fetch(url, { + method: "POST", + headers: {"Content-Type": "application/json"}, + credentials: "include", + body: JSON.stringify({question: q, computer_name: scope || null}), + }); + + + const data = await r.json().catch(() => ({})); + if (!r.ok) { + setMessages((m) => [...m, { + role: "assistant", + text: `Error ${r.status}: ${data.error || "Request failed"}` + }]); + } else { + setMessages((m) => [...m, {role: "assistant", text: data.answer || "(no answer)"}]); + } + setMessages((m) => [ + ...m, + {role: "assistant", text: data.answer || "(no answer)"}, + ]); + } catch (e) { + setMessages((m) => [ + ...m, + {role: "assistant", text: `Грешка: ${String(e?.message || e)}`}, + ]); + } finally { + setSending(false); + } } - } - if (!open) return null; + if (!open) return null; - return ( - <> -
-
e.stopPropagation()}> -
-
-
🤖 AI Assistant
-
Uses /api/chat (RAG over your logs)
-
- -
+ return ( + <> +
-
-
- -
-
Tip: “Top процеси по RAM” или “сомнителни sysmon events”
-
+