Merging dev into main #49

Merged
8464960 merged 260 commits from dev into main 2026-01-28 10:48:52 +00:00
2 changed files with 5 additions and 4 deletions
Showing only changes of commit 72d61e3985 - Show all commits

View File

@@ -1,5 +1,5 @@
import { Routes, Route, Link } from 'react-router' import { Routes, Route, Link } from 'react-router'
import { useState, useEffect } from 'react' import { useState } from 'react'
import './App.css' import './App.css'
import TemplatePage from './pages/TemplatePage/Template.tsx' import TemplatePage from './pages/TemplatePage/Template.tsx'
import Home from './pages/Home/Home.tsx' import Home from './pages/Home/Home.tsx'
@@ -17,6 +17,7 @@ function App(){
port: number; port: number;
}; };
// (Acces to) the array of connected robots
const [connectedRobots, setConnectedRobots] = useState<Robot[]>([]); const [connectedRobots, setConnectedRobots] = useState<Robot[]>([]);
return ( return (

View File

@@ -1,5 +1,4 @@
import { mergeAriaLabelConfig } from '@xyflow/system'; import { useEffect } from 'react'
import { useState, useEffect } from 'react'
// Define the robot type // Define the robot type
type Robot = { type Robot = {
@@ -21,7 +20,6 @@ export default function ConnectedRobots({
const eventSource = new EventSource("http://localhost:8000/sse"); const eventSource = new EventSource("http://localhost:8000/sse");
eventSource.onmessage = (event) => { eventSource.onmessage = (event) => {
try { try {
console.log("message received :", event.data)
const data = JSON.parse(event.data); const data = JSON.parse(event.data);
// Example: data = { event: "robot_connected", id: "pepper_robot1", name: "Pepper", port: 1234 } // Example: data = { event: "robot_connected", id: "pepper_robot1", name: "Pepper", port: 1234 }
@@ -69,6 +67,7 @@ export default function ConnectedRobots({
<h2>Connected Robots</h2> <h2>Connected Robots</h2>
<ul> <ul>
{connectedRobots.map(robot => {connectedRobots.map(robot =>
// Map all the robots in an unordered list
<li key={robot.id}> <li key={robot.id}>
<strong>{robot.name}</strong> (ID: {robot.id}, Port: {robot.port === -1 ? "No given port" : robot.port}) <strong>{robot.name}</strong> (ID: {robot.id}, Port: {robot.port === -1 ? "No given port" : robot.port})
</li> </li>
@@ -100,6 +99,7 @@ export default function ConnectedRobots({
setConnectedRobots(robots => [...robots, randomConnectionDummy]); setConnectedRobots(robots => [...robots, randomConnectionDummy]);
}}>'Sent connected event'</button> }}>'Sent connected event'</button>
<button onClick={() => { <button onClick={() => {
// Example disconnection bots
const disconnection_dummies = [ const disconnection_dummies = [
{ id: "pepper_robot1" }, { id: "pepper_robot1" },
{ id: "pepper_robot2" }, { id: "pepper_robot2" },