Big progress!

This commit is contained in:
Dave Richer
2023-12-11 19:28:27 -05:00
parent ad79344709
commit b0d1a7b65e
77 changed files with 721 additions and 521 deletions

View File

@@ -48,7 +48,7 @@ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export function TechPage({ technician, match }) {
export function TechPage({ technician }) {
const { t } = useTranslation();
const navigate = useNavigate();
@@ -56,11 +56,16 @@ export function TechPage({ technician, match }) {
document.title = t("titles.app");
}, [t]);
useEffect(() => {
if (!technician) {
navigate(`/tech/login`);
}
}, [technician, navigate]);
return (
<Layout className="tech-layout-container">
<TechSider />
<Layout>
{technician ? null : navigate(`${match.path}/login`)}
<UpdateAlert />
<TechHeader />
@@ -76,12 +81,12 @@ export function TechPage({ technician, match }) {
<EmailOverlayContainer />
<PrintCenterModalContainer />
<Routes>
<Route path={`${match.path}/login`} element={<TechLogin />} />
<Route path={`${match.path}/joblookup`} element={<TechLookup />} />
<Route path={`${match.path}/list`} element={<ProductionListPage />} />
<Route path={`${match.path}/jobclock`} element={<TechJobClock />} />
<Route path={`${match.path}/shiftclock`} element={<TechShiftClock />} />
<Route path={`${match.path}/board`} element={<ProductionBoardPage />} />
<Route path='/login' element={<TechLogin />} />
<Route path='/joblokup' element={<TechLookup />} />
<Route path='/list' element={<ProductionListPage />} />
<Route path='/jobclock' element={<TechJobClock />} />
<Route path='/shiftclock' element={<TechShiftClock />} />
<Route path='/board' element={<ProductionBoardPage />} />
</Routes>
</FeatureWrapper>
</Suspense>

View File

@@ -19,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({
setBodyshop: (bs) => dispatch(setBodyshop(bs)),
});
export function TechPageContainer({ bodyshop, setBodyshop, match }) {
export function TechPageContainer({ bodyshop, setBodyshop }) {
const { loading, error, data } = useQuery(QUERY_BODYSHOP, {
fetchPolicy: "network-only",
nextFetchPolicy: "network-only",
@@ -32,7 +32,7 @@ export function TechPageContainer({ bodyshop, setBodyshop, match }) {
if (loading || !bodyshop)
return <LoadingSpinner message={t("general.labels.loadingshop")} />;
if (error) return <AlertComponent message={error.message} type="error" />;
return <TechPage match={match} />;
return <TechPage />;
}
export default connect(mapStateToProps, mapDispatchToProps)(TechPageContainer);