Skip to content

Commit

Permalink
Improve ongoing mission card
Browse files Browse the repository at this point in the history
  • Loading branch information
mrica-equinor committed Oct 30, 2024
1 parent fa9e49e commit 858bcd2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Icons } from 'utils/icons'

const BatteryAlignment = styled.div`
display: flex;
align-items: center;
`

const StyledTypography = styled(Typography)<{ $fontSize?: 24 | 16 | 18 | 32 | 40 | 48 }>`
Expand All @@ -15,12 +14,14 @@ interface BatteryStatusDisplayProps {
batteryLevel?: number
itemSize?: 24 | 16 | 18 | 32 | 40 | 48 | undefined
batteryWarningLimit?: number
textAlignedBottom?: boolean
}

export const BatteryStatusDisplay = ({
batteryLevel,
itemSize,
batteryWarningLimit,
textAlignedBottom,
}: BatteryStatusDisplayProps): JSX.Element => {
let iconColor: string = tokens.colors.interactive.primary__resting.hex

Expand All @@ -45,7 +46,7 @@ export const BatteryStatusDisplay = ({
iconColor = batteryIcon === Icons.BatteryAlert ? tokens.colors.interactive.warning__resting.hex : iconColor

return (
<BatteryAlignment>
<BatteryAlignment style={{ alignItems: textAlignedBottom ? 'end' : 'center' }}>
<Icon name={batteryIcon} color={iconColor} size={itemSize} />
<StyledTypography $fontSize={itemSize}>{batteryValue}</StyledTypography>
</BatteryAlignment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const StyledTitle = styled(Card)`
padding-left: 12px;
:hover {
background-color: #deedee;
cursor: pointer;
}
box-shadow: none;
`
Expand Down Expand Up @@ -61,7 +62,7 @@ export const OngoingMissionCard = ({ mission }: MissionProps): JSX.Element => {
<StyledMissionCard style={{ boxShadow: tokens.elevation.raised }}>
<TopContent>
<StyledTitle onClick={routeChange}>
<Typography variant="h6" color="primary">
<Typography variant="h5" style={{ color: tokens.colors.text.static_icons__default.hex }}>
{mission.name}
</Typography>
</StyledTitle>
Expand All @@ -79,6 +80,7 @@ export const OngoingMissionCard = ({ mission }: MissionProps): JSX.Element => {
<BatteryStatusDisplay
batteryLevel={robot?.batteryLevel}
batteryWarningLimit={robot?.model.batteryWarningThreshold}
textAlignedBottom={true}
/>
</BottomContent>
</StyledMissionCard>
Expand Down

0 comments on commit 858bcd2

Please sign in to comment.