new console

This commit is contained in:
AntoninoP 2024-08-17 11:11:55 +02:00
parent 76272696f3
commit ef1e5fc2ac
3 changed files with 89 additions and 24 deletions

View File

@ -1,4 +1,4 @@
import { useEffect, useState } from 'react'; import { useEffect, useState, useRef } from 'react';
import { useParams, useNavigate } from 'react-router-dom'; import { useParams, useNavigate } from 'react-router-dom';
import styles from './ServerConsole.module.scss'; import styles from './ServerConsole.module.scss';
import serviiApi from "../../service/api.tsx"; import serviiApi from "../../service/api.tsx";
@ -11,6 +11,13 @@ const ServerConsole = ({ user }) => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [error, setError] = useState(null); const [error, setError] = useState(null);
const [logs, setLogs] = useState(''); const [logs, setLogs] = useState('');
const [message, setMessage] = useState('');
const logsEndRef = useRef(null);
const scrollToBottom = () => {
logsEndRef.current?.scrollIntoView({ behavior: "smooth" });
};
useEffect(() => { useEffect(() => {
const fetchServerLogs = async () => { const fetchServerLogs = async () => {
@ -20,11 +27,10 @@ const ServerConsole = ({ user }) => {
try { try {
const response = await serviiApi.fetchLogs(serverName); const response = await serviiApi.fetchLogs(serverName);
if (response.return_code === 200) { if (response.return_code === 200) {
// Nettoyer la chaîne de caractères en supprimant les [ ] et en remplaçant les \\n
let logString = response.message; let logString = response.message;
logString = logString.slice(1, -1); // Supprime les crochets [ ] au début et à la fin logString = logString.slice(1, -1);
logString = logString.replace(/\\n/g, '\n'); // Remplace les \\n par de véritables sauts de ligne logString = logString.replace(/\\n/g, '\n');
logString = logString.replace(/\\\"/g, '"'); // Supprime les échappements de guillemets logString = logString.replace(/\\\"/g, '"');
setLogs(logString); setLogs(logString);
} else { } else {
setError(`Erreur lors de la récupération des logs: ${response.message}`); setError(`Erreur lors de la récupération des logs: ${response.message}`);
@ -39,6 +45,17 @@ const ServerConsole = ({ user }) => {
fetchServerLogs(); fetchServerLogs();
}, [serverName]); }, [serverName]);
useEffect(() => {
scrollToBottom();
}, [logs]);
const handleSendMessage = () => {
if (message.trim()) {
console.log(`Message envoyé: ${message}`);
setMessage('');
}
};
if (loading) { if (loading) {
return <Loading />; return <Loading />;
} }
@ -58,11 +75,24 @@ const ServerConsole = ({ user }) => {
<div className={styles.container}> <div className={styles.container}>
<div className={styles.containerConsole}> <div className={styles.containerConsole}>
<div className={styles.header}>Console</div> <div className={styles.header}>Console</div>
<h1>Console</h1>
<div className={styles.logContainer}> <div className={styles.logContainer}>
<pre className={styles.logs}> <pre className={styles.logs}>
{logs} {logs}
</pre> </pre>
<div ref={logsEndRef} />
</div>
{}
<div className={styles.chatInputContainer}>
<input
type="text"
className={styles.chatInput}
value={message}
onChange={(e) => setMessage(e.target.value)}
placeholder="Écrire un message..."
/>
<button className={styles.sendButton} onClick={handleSendMessage}>
Envoyer
</button>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,13 +1,10 @@
/* Container for the entire console section */
.container { .container {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: var(--navbar-height); margin-top: var(--navbar-height);
width: 100%; width: 100%;
height: calc(100vh - var(--navbar-height) - 2rem); overflow: hidden;
margin-bottom: 1rem;
overflow: hidden;
} }
.containerConsole { .containerConsole {
@ -18,11 +15,12 @@
background-color: #100D25; background-color: #100D25;
width: 100%; width: 100%;
max-width: 50rem; max-width: 50rem;
height: 100%; height: 38rem;
overflow-y: auto; overflow: hidden;
border: .1rem solid #343947; border: .1rem solid #343947;
padding: 1rem; padding: 0;
box-shadow: 0 0 1rem rgba(0, 0, 0, 0.5); box-shadow: 0 0 1rem rgba(0, 0, 0, 0.5);
margin-bottom: 2rem;
} }
.header { .header {
@ -35,6 +33,15 @@
font-size: 1rem; font-size: 1rem;
font-weight: 500; font-weight: 500;
border-bottom: .1rem solid #343947; border-bottom: .1rem solid #343947;
padding-left: 1rem; /* Ajoutez du padding à l'intérieur */
}
.logContainer {
width: 100%;
height: calc(100% - 6rem); /* Prend en compte la hauteur de la barre d'en-tête et de la barre de chat */
overflow-y: auto;
padding: 1rem; /* Ajoutez du padding pour éviter que le texte touche les bords */
box-sizing: border-box; /* Inclut le padding dans la taille totale */
} }
.logs { .logs {
@ -43,14 +50,40 @@
color: #ffffff; color: #ffffff;
white-space: pre-wrap; white-space: pre-wrap;
line-height: 1.5; line-height: 1.5;
margin: 0; /* Supprimez les marges par défaut de <pre> */
} }
.sidebar { .chatInputContainer {
overflow: hidden; display: flex;
}
.logContainer {
width: 100%; width: 100%;
height: calc(100% - 3rem); padding: 0.5rem;
overflow-y: auto; background-color: #1D1836;
border-top: .1rem solid #343947;
border-left: .1rem solid #343947;
border-right: .1rem solid #343947;
}
.chatInput {
flex: 1;
padding: 0.5rem;
border: .1rem solid #343947;
background-color: #2C2A3E;
color: #ffffff;
font-size: 0.9rem;
box-sizing: border-box;
}
.sendButton {
margin-left: 0.5rem;
padding: 0.5rem 1rem;
background-color: #3E3B59;
color: #ffffff;
border: none;
cursor: pointer;
font-size: 0.9rem;
transition: background-color 0.3s;
}
.sendButton:hover {
background-color: #5A567E;
} }

View File

@ -1,7 +1,6 @@
.container { .container {
display: flex; display: flex;
min-height: 100vh; min-height: calc(100vh - var(--navbar-height));
margin-top: var(--navbar-height);
} }
.sidebar { .sidebar {
@ -83,17 +82,20 @@
} }
.serverDetailsContainer { .serverDetailsContainer {
margin-top: var(--navbar-height);
flex: 1; flex: 1;
margin-left: 20rem; margin-left: 20rem;
padding-top: 2rem; padding-top: 1rem;
background-color: var(--main-bg-color); background-color: var(--main-bg-color);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
color: var(--text-color); color: var(--text-color);
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto;
} }
.navbar { .navbar {
position: fixed; position: fixed;
top: 0; top: 0;