Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots

src/App.tsx

@@ -4,7 +4,11 @@ import './App.css'
 import TemplatePage from './pages/TemplatePage/Template.tsx'
 import Home from './pages/Home/Home.tsx'
 import Robot from './pages/Robot/Robot.tsx';
+<<<<<<< HEAD
 import ConnectedRobots from './pages/ConnectedRobots/ConnectedRobots.tsx'
+=======
+import VisProg from "./pages/VisProgPage/VisProg.tsx";
+>>>>>>> origin/dev
 
 function App(){
 
@@ -27,6 +31,7 @@ function App(){
         <Routes>
           <Route path="/" element={<Home />} />
           <Route path="/template" element={<TemplatePage />} />
+          <Route path="/editor" element={<VisProg />} />
           <Route path="/robot" element={<Robot />} />
           <Route
           path="/ConnectedRobots"