Merge pull request #3333 from JdeRobot/fix-new-themes

Fix new themes

Author: javizqh

common/hal_interfaces/hal_interfaces/general/lidar.py

@@ -46,9 +46,7 @@ def pointCloud2LidarData(cloud):
         lidar.intensities = [i[0] for i in intensities]
 
     # Timestamp (ROS 2 Time -> seconds)
-    lidar.timeStamp = (
-        cloud.header.stamp.sec + (cloud.header.stamp.nanosec * 1e-9)
-    )
+    lidar.timeStamp = cloud.header.stamp.sec + (cloud.header.stamp.nanosec * 1e-9)
 
     # Validate point cloud
     lidar.is_dense = all(

exercises/static/exercises/autoparking/python_template/ros2_humble/WebGUI.py

@@ -1,6 +1,8 @@
 import json
 
-from gui_interfaces.general.measuring_threading_gui_harmonic import MeasuringThreadingGUI
+from gui_interfaces.general.measuring_threading_gui_harmonic import (
+    MeasuringThreadingGUI,
+)
 from console_interfaces.general.console import start_console
 from map import Map
 from HAL import getFrontLaserData, getRightLaserData, getBackLaserData

exercises/static/exercises/autoparking_lidar/python_template/ros2_humble/WebGUI.py

@@ -1,7 +1,9 @@
 import json
 import math
 
-from gui_interfaces.general.measuring_threading_gui_harmonic import MeasuringThreadingGUI
+from gui_interfaces.general.measuring_threading_gui_harmonic import (
+    MeasuringThreadingGUI,
+)
 from console_interfaces.general.console import start_console
 from HAL import getLidarData
 
@@ -35,7 +37,9 @@ def update_gui(self):
                         is_valid = False
                 if is_valid:
                     x, y, z = lidar.points[i]
-                    points.append((float(x*10), float((z  + 1.75)*10), float(-y*10)) + color)
+                    points.append(
+                        (float(x * 10), float((z + 1.75) * 10), float(-y * 10)) + color
+                    )
         self.payload["lidar"] = json.dumps(points)
         message = json.dumps(self.payload)
         self.send_to_client(message)

react_frontend/package.json

@@ -59,7 +59,7 @@
     "axios": "^1.12.0",
     "glob": "^8.0.3",
     "jderobot-commsmanager": "1.0.16",
-    "jderobot-ide-interface": "0.2.64",
+    "jderobot-ide-interface": "0.2.68",
     "jszip": "^3.10.1",
     "styled-components": "^5.3.6"
   },

react_frontend/src/components/buttons/Language.tsx

@@ -15,7 +15,7 @@ const LanguageButton = ({
 }) => {
   const theme = useAcademyTheme();
 
-  console.log(loading)
+  console.log(loading);
 
   const switchLanguage = () => {
     setter(language === "python" ? "cpp" : "python");

react_frontend/src/components/buttons/PlayPause.tsx

@@ -69,7 +69,11 @@ const PlayPauseButton = ({
   }, [exerciseContext]);
 
   useEffect(() => {
-    if (state === states.RUNNING || state === states.PAUSED || state === states.TOOLS_READY) {
+    if (
+      state === states.RUNNING ||
+      state === states.PAUSED ||
+      state === states.TOOLS_READY
+    ) {
       setLoading(false);
     }
   }, [state]);

react_frontend/src/components/exercise/WebGUI3D.tsx

@@ -50,7 +50,7 @@ const WebGUI3D = ({
       ];
       new_points.push({ pose, color });
     }
-    
+
     if (refreshPoints) {
       addPoints(new_points);
     } else {

react_frontend/src/components/layouts/AcademyContainer.tsx

@@ -31,7 +31,7 @@ const AcademyContainer = () => {
 
   if (loading) {
     return (
-      <StyledAcademyContainer bgColor={theme.palette.background}>
+      <StyledAcademyContainer bgColor={theme.palette.bg}>
         <StyledAcademyLoadingMsg>Loading exercises</StyledAcademyLoadingMsg>
       </StyledAcademyContainer>
     );
@@ -54,7 +54,7 @@ const AcademyContainer = () => {
     }) || [];
 
   return (
-    <StyledAcademyContainer bgColor={theme.palette.background}>
+    <StyledAcademyContainer bgColor={theme.palette.bg}>
       <StyledExerciseList>
         {filteredData.map((exercise) => (
           <ExerciseCard

react_frontend/src/components/layouts/ExerciseContainer.tsx

@@ -223,7 +223,7 @@ const ExerciseContainer = ({
   });
 
   useEffect(() => {
-    saveFile(true)
+    saveFile(true);
     if (language === "cpp") {
       setBaseFile(base_file_cpp);
     } else {
@@ -235,7 +235,7 @@ const ExerciseContainer = ({
     file: {
       get: (project: string, file: Entry) => {
         const func = async (file: Entry) => {
-          saveFile(false)
+          saveFile(false);
           if (file.name === "academy.cpp") {
             return defaultCppCode;
           } else {

react_frontend/src/contexts/AcademyThemeContext.tsx

@@ -21,7 +21,9 @@ const darkTheme: AcademyTheme = {
     success: "#29ac29",
     warning: "#b87a09",
     error: "#b91c1cff",
-    background: "#16161d",
+    bgDark: "#16161d",
+    bg: "#16161d",
+    bgLight: "#16161d",
     primary: "#ffa726",
     secondary: "#ff8800",
     scrollbar: "#6f6f90",
@@ -64,7 +66,9 @@ const lightTheme: AcademyTheme = {
     success: "#29ac29",
     warning: "#af5500ff",
     error: "#802626",
-    background: "#ffffff",
+    bgDark: "#ffffff",
+    bg: "#ffffff",
+    bgLight: "#ffffff",
     primary: "#ffa726",
     secondary: "#ff8800",
     scrollbar: "#6f6f90",