Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"react-color-palette": "^7.3.1",
"react-dom": "^19.2.7",
"react-router": "^8.2.0",
"react-router-dom": "^7.18.1",
"react-scripts": "5.0.1",
"styled-components": "^6.4.3",
"typescript": "^6.0.3"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Outlet } from "react-router-dom";
import { Outlet } from "react-router";
import { ErrorProvider } from "jderobot-ide-interface";
import { BtThemeProvider } from "BtContexts/BtThemeContext";

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Buttons/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { StyledHeaderButton } from "BtStyles/Header/HeaderMenu.styles";
import { useBtTheme } from "BtContexts/BtThemeContext";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { HomeIcon } from "BtIcons";

const HomeButton = () => {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/CreateProject/CreateProject.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from "BtStyles/CreateProject/CreateProject.styles";
import { createProject, getProjectInfo } from "BtApi/TreeWrapper";
import { useError } from "jderobot-ide-interface";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import {
EmptyAddIcon,
GazeboIcon,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/EditProject/EditProject.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
getProjectInfo,
} from "BtApi/TreeWrapper";
import { useError } from "jderobot-ide-interface";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import {
GazeboIcon,
RvizIcon,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/ProjectsMenu/ProjectEntry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
StyledEntryContainer,
StyledSpacer,
} from "BtStyles/ProjectMenu/ProjectEntry.styles";
import { Link } from "react-router-dom";
import { Link } from "react-router";

import { Entry, useError } from "jderobot-ide-interface";
import {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { createRoot } from "react-dom/client";
import "./index.css";
import { RouterProvider, createBrowserRouter } from "react-router-dom";
import { RouterProvider, createBrowserRouter } from "react-router";
import BtRoutes from "./routes";

// Clear stored state on app startup to ensure fresh state on every launch
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/routes/Project.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { explorers } from "BtComponents/Explorers";
import { statusBar } from "BtComponents/StatusBar";
import { editorApi } from "BtComponents/Editors";

import { useParams } from "react-router-dom";
import { useParams } from "react-router";
import { StyledAppContainer } from "BtStyles/App.styles";
import { useBtTheme } from "BtContexts/BtThemeContext";
import {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/routes/create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
StyledHomeContent,
} from "BtStyles/Pages/Home.styles";
import { CreateProjectMenu } from "BtComponents/CreateProject";
import { useParams } from "react-router-dom";
import { useParams } from "react-router";
import ProjSizeIndicator from "BtComponents/LimitIndicator";

const App = () => {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/routes/edit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
StyledHomeContainer,
StyledHomeContent,
} from "BtStyles/Pages/Home.styles";
import { useParams } from "react-router-dom";
import { useParams } from "react-router";
import { EditProjectMenu } from "BtComponents/EditProject";
import ProjSizeIndicator from "BtComponents/LimitIndicator";

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/styles/Pages/Home.styles.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link } from "react-router-dom";
import { Link } from "react-router";
import styled from "styled-components";

const primaryColor = "#666";
Expand Down
8 changes: 2 additions & 6 deletions frontend/src/styles/ProjectMenu/ProjectEntry.styles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link } from "react-router-dom";
import { Link } from "react-router";
import styled from "styled-components";

const primaryColor = "#666";
Expand All @@ -24,11 +24,7 @@ export const StyledEntry = styled.div<StyledEntryProps>`
display: grid;
grid-template-columns: auto 20% 20% 15%;

${(p) =>
p.noHover
? ``
: ` &:hover {filter: var(--hover-light);}`
}
${(p) => (p.noHover ? `` : ` &:hover {filter: var(--hover-light);}`)}

&:first-of-type {
border-top-right-radius: ${(p) => p.roundness ?? 1}px;
Expand Down
25 changes: 0 additions & 25 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6242,11 +6242,6 @@ cookie@0.5.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==

cookie@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610"
integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==

core-js-compat@^3.31.0, core-js-compat@^3.32.2:
version "3.33.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.0.tgz#24aa230b228406450b2277b7c8bfebae932df966"
Expand Down Expand Up @@ -11989,21 +11984,6 @@ react-refresh@^0.11.0:
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==

react-router-dom@^7.18.1:
version "7.18.1"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.18.1.tgz#0d1b138e291393059ad481c3e10e366385a978a4"
integrity sha512-KaZh+X/6UtEp28x51AUYZDMg9NGoz2ja3dNHa+ta/tk40vCzKhQ/RypCWBMLbmDr6//E24Vv5uPsrqXFozdkAg==
dependencies:
react-router "7.18.1"

react-router@7.18.1:
version "7.18.1"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.18.1.tgz#61259d1594b95c1ace299ee4c57453570f0c22f1"
integrity sha512-GDLgg3i3uM0aeJO3Fm+TCS+sDQ7gu12T6x0qdTEzcwqEfleci7JwugVNIF3U//0FWKnJT7ptG+20B2jfDqnZAg==
dependencies:
cookie "^1.0.1"
set-cookie-parser "^2.6.0"

react-router@^8.2.0:
version "8.2.0"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-8.2.0.tgz#194809cb06a1b9ed83654882fd549b7fd47a20fd"
Expand Down Expand Up @@ -12661,11 +12641,6 @@ serve-static@1.15.0:
parseurl "~1.3.3"
send "0.18.0"

set-cookie-parser@^2.6.0:
version "2.7.2"
resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz#ccd08673a9ae5d2e44ea2a2de25089e67c7edf68"
integrity sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==

set-function-length@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
Expand Down
Loading