forked from BinaryStudioAcademy/bsa-2023-towhub
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
th-351: Sidebar for drivers (BinaryStudioAcademy#358)
* th-351: * sidebar * th-351: * active tab * th-351: * close shift button to sidebar * th-351: * small changes * th-351: * small changes * th-351: * small changes
- Loading branch information
1 parent
6185994
commit cbd9c08
Showing
10 changed files
with
96 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...d/src/pages/dashboard/components/sidebar/components/end-shift-button/end-shift-button.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
import { Button } from '~/libs/components/components.js'; | ||
import { IconName } from '~/libs/enums/icon-name.enum.js'; | ||
import { getValidClassNames } from '~/libs/helpers/helpers.js'; | ||
import { | ||
useAppDispatch, | ||
useAppSelector, | ||
useCallback, | ||
} from '~/libs/hooks/hooks.js'; | ||
import { manufacturerKeyToReadableName } from '~/packages/trucks/libs/maps/manufacturer-key-to-readable-name.map.js'; | ||
import { actions as driverActions } from '~/slices/driver/driver.js'; | ||
import { ShiftStatus } from '~/slices/driver/libs/enums/enums.js'; | ||
import { | ||
selectActiveTruck, | ||
selectShiftStatus, | ||
} from '~/slices/driver/selectors.js'; | ||
|
||
import styles from './styles.module.scss'; | ||
|
||
const EndShiftButton: React.FC = () => { | ||
const dispatch = useAppDispatch(); | ||
const shiftStatus = useAppSelector(selectShiftStatus); | ||
const truck = useAppSelector(selectActiveTruck); | ||
|
||
const isActive = shiftStatus === ShiftStatus.ACTIVE; | ||
|
||
const handleClick = useCallback(() => { | ||
void dispatch(driverActions.endShift()); | ||
}, [dispatch]); | ||
|
||
const manufacturerName = | ||
truck && manufacturerKeyToReadableName[truck.manufacturer]; | ||
|
||
return ( | ||
<> | ||
{isActive && ( | ||
<div className={styles.block}> | ||
<p className={getValidClassNames(styles.truckInfo, 'textMd')}> | ||
{manufacturerName} {truck?.licensePlateNumber} | ||
</p> | ||
<Button | ||
label={'End shift'} | ||
frontIcon={IconName.TRUCK} | ||
onClick={handleClick} | ||
className={styles.button} | ||
/> | ||
</div> | ||
)} | ||
</> | ||
); | ||
}; | ||
|
||
export { EndShiftButton }; |
15 changes: 15 additions & 0 deletions
15
...end/src/pages/dashboard/components/sidebar/components/end-shift-button/styles.module.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
@import "src/assets/css/vars.scss"; | ||
|
||
.block { | ||
margin-top: auto; | ||
} | ||
|
||
.button { | ||
width: 100%; | ||
} | ||
|
||
.truckInfo { | ||
margin: 10px 0; | ||
color: $grey; | ||
text-align: center; | ||
} |
7 changes: 0 additions & 7 deletions
7
frontend/src/pages/dashboard/components/sidebar/libs/helpers.ts
This file was deleted.
Oops, something went wrong.
4 changes: 1 addition & 3 deletions
4
frontend/src/pages/dashboard/components/sidebar/libs/helpers/check-active-tab.helper.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
import { AppRoute } from '~/libs/enums/app-route.enum'; | ||
|
||
const checkActiveTab = (path: string, tab: string): boolean => { | ||
return path === `${AppRoute.DASHBOARD}/${tab}`; | ||
return path === tab; | ||
}; | ||
|
||
export { checkActiveTab }; |
18 changes: 7 additions & 11 deletions
18
frontend/src/pages/dashboard/components/sidebar/libs/tabs.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
frontend/src/pages/dashboard/components/sidebar/styles.module.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,18 @@ | ||
import { Button } from '~/libs/components/components.js'; | ||
import { AppRoute } from '~/libs/enums/enums.js'; | ||
import { | ||
useAppDispatch, | ||
useAppSelector, | ||
useCallback, | ||
useEffect, | ||
useNavigate, | ||
} from '~/libs/hooks/hooks.js'; | ||
import { actions as driverActions } from '~/slices/driver/driver.js'; | ||
import { useAppSelector, useEffect, useNavigate } from '~/libs/hooks/hooks.js'; | ||
import { ShiftStatus } from '~/slices/driver/libs/enums/enums.js'; | ||
import { | ||
selectActiveTruck, | ||
selectShiftStatus, | ||
} from '~/slices/driver/selectors.js'; | ||
import { selectShiftStatus } from '~/slices/driver/selectors.js'; | ||
|
||
const Orders: React.FC = () => { | ||
const dispatch = useAppDispatch(); | ||
const truck = useAppSelector(selectActiveTruck); | ||
const shiftStatus = useAppSelector(selectShiftStatus); | ||
const navigate = useNavigate(); | ||
useEffect(() => { | ||
if (shiftStatus === ShiftStatus.DISABLED) { | ||
navigate(AppRoute.AVAILABLE_TRUCKS); | ||
} | ||
}, [shiftStatus, navigate]); | ||
const handleClick = useCallback(() => { | ||
void dispatch(driverActions.endShift()); | ||
}, [dispatch]); | ||
|
||
return ( | ||
<div> | ||
<p> | ||
Your chosen truck: {truck?.manufacturer} ({truck?.id}) Test | ||
</p> | ||
<Button label={'End shift'} frontIcon={'truck'} onClick={handleClick} /> | ||
</div> | ||
); | ||
return <div>Orders page</div>; | ||
}; | ||
|
||
export { Orders }; |