From c8f7f417c3be8404f83e9ab373f9fb70774a9bc7 Mon Sep 17 00:00:00 2001 From: Anette Uttisrud Date: Sat, 4 Nov 2023 17:13:33 +0100 Subject: [PATCH 1/2] Place stop all robots button above missions --- frontend/src/components/Pages/FrontPage/FrontPage.tsx | 2 ++ .../Pages/FrontPage/MissionOverview/OngoingMissionView.tsx | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Pages/FrontPage/FrontPage.tsx b/frontend/src/components/Pages/FrontPage/FrontPage.tsx index 6f6de970c..be29c2da8 100644 --- a/frontend/src/components/Pages/FrontPage/FrontPage.tsx +++ b/frontend/src/components/Pages/FrontPage/FrontPage.tsx @@ -5,6 +5,7 @@ import { FailedMissionAlertView } from './MissionOverview/FailedMissionAlertView import { Header } from 'components/Header/Header' import styled from 'styled-components' import { InspectionOverviewSection } from '../InspectionPage/InspectionOverview' +import { StopRobotDialog } from './MissionOverview/StopDialogs' const StyledFrontPage = styled.div` display: grid; @@ -33,6 +34,7 @@ export function FrontPage() {
+ diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx index 4dd839938..615892de2 100644 --- a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx +++ b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx @@ -8,7 +8,6 @@ import { config } from 'config' import { Icons } from 'utils/icons' /* import { useOngoingMissionsContext } from 'components/Contexts/OngoingMissionsContext' */ import { useMissionsContext } from 'components/Contexts/MissionListsContext' -import { StopRobotDialog } from './StopDialogs' const StyledOngoingMissionView = styled.div` display: flex; @@ -50,7 +49,6 @@ export function OngoingMissionView() { {TranslateText('Ongoing Missions')} - {ongoingMissions.length > 0 && ongoingMissionscard} From d443c581d31bae7cc7d3c337f2c1a34c1320aaf2 Mon Sep 17 00:00:00 2001 From: Anette Uttisrud Date: Sat, 4 Nov 2023 17:15:03 +0100 Subject: [PATCH 2/2] Remove commented imports --- .../Pages/FrontPage/MissionOverview/OngoingMissionView.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx index 615892de2..1aa759ab8 100644 --- a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx +++ b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionView.tsx @@ -6,7 +6,6 @@ import { useLanguageContext } from 'components/Contexts/LanguageContext' import { useNavigate } from 'react-router-dom' import { config } from 'config' import { Icons } from 'utils/icons' -/* import { useOngoingMissionsContext } from 'components/Contexts/OngoingMissionsContext' */ import { useMissionsContext } from 'components/Contexts/MissionListsContext' const StyledOngoingMissionView = styled.div`