Skip to content

Commit 8b52c2a

Browse files
Fix multiple UI bugs found in full audit
- Routes: deduplicate /employee, add /employeemenu for EmployeeMenu page - Home Nav: replace dead href='#' links with react-router Links to /home/howitworks, /home/contactus, /home/about - EmployeesPage: fix broken /invitation link to /invitationMobile - BookingStepper: add default case to getStepContent switch - GetSite/GetFloor/EmployeeList: add missing key props on mapped elements - SideDrawer: wire nav items to navigate to correct routes Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 8e76bba commit 8b52c2a

8 files changed

Lines changed: 24 additions & 13 deletions

File tree

code_base/web-ui/src/app/pages/EmployeeBooking/components/BookingStepper.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ function getStepContent(step) {
108108
return <GetDate />;
109109
case 3:
110110
return <GetDesk />;
111+
default:
112+
return null;
111113
}
112114
}
113115

code_base/web-ui/src/app/pages/EmployeeBooking/components/GetFloor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export const GetFloor = () => {
6767
<Box className={classes.root}>
6868
<ToggleButtonGroup className={classes.buttonGroup} exclusive value={floor} onChange={handleFloor} aria-label="floor number">
6969
{mockFloors.map((mock) =>
70-
<NumberButton onClick={handleNext} value={mock} aria-label={mock}>{mock}</NumberButton>
70+
<NumberButton key={mock} onClick={handleNext} value={mock} aria-label={mock}>{mock}</NumberButton>
7171
)}
7272
</ToggleButtonGroup>
7373
</Box>

code_base/web-ui/src/app/pages/EmployeeBooking/components/GetSite.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export function GetSite() {
9191
<GridList cellHeight={160} className={classes.gridList}>
9292
<ToggleButtonGroup exclusive value={site} onChange={handleSite} aria-label="site" cols={3} className={classes.buttonGroup}>
9393
{sites.map((mockSite, index) => (
94-
<ToggleButton value={mockSite} aria-label={mockSite} cols={2} onClick={handleNext}>
94+
<ToggleButton key={index} value={mockSite} aria-label={mockSite} cols={2} onClick={handleNext}>
9595
{mockSite}
9696
</ToggleButton>
9797
))}

code_base/web-ui/src/app/pages/EmployeeList/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const EmployeeList = () => {
130130
{listBig && (
131131
<Grid className={classes.gridBigCard}>
132132
{small.map(x => (
133-
<Grid className={classes.cardContainer}>
133+
<Grid key={x} className={classes.cardContainer}>
134134
<BigCard item xs={8} />
135135
</Grid>
136136
))}
@@ -139,7 +139,7 @@ const EmployeeList = () => {
139139
{listSmall && (
140140
<Grid>
141141
{small.map(x => (
142-
<Grid className={classes.smallCardContainer}>
142+
<Grid key={x} className={classes.smallCardContainer}>
143143
<SmallCard item xs={8} />
144144
</Grid>
145145
))}

code_base/web-ui/src/app/pages/EmployeeMenu/components/SideDrawer.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { useState } from 'react';
2+
import history from '../../../../history';
23
import styled from 'styled-components';
34
import { makeStyles } from '@material-ui/core/styles';
45
import Drawer from '@material-ui/core/Drawer';
@@ -93,6 +94,12 @@ const useStyles = makeStyles((theme) => ({
9394
}
9495
}));
9596

97+
const navRoutes = {
98+
'View all bookings': '/employee',
99+
'Calendar view': '/employee',
100+
'Edit profile': '/employeemenu',
101+
};
102+
96103
const navList = [
97104
{
98105
text: 'View all bookings',
@@ -236,6 +243,7 @@ export default function SideDrawer() {
236243
<ListItem
237244
button key={option.text}
238245
aria-label={option.text}
246+
onClick={() => navRoutes[option.text] && history.push(navRoutes[option.text])}
239247
style={{ paddingLeft: 0,
240248
paddingBottom: 10,
241249
direction: "ltr" }}>

code_base/web-ui/src/app/pages/Home/components/Home/HomeDetails/Nav.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
import React from "react";
22
import { makeStyles } from "@material-ui/core/styles";
3-
import { AppBar, Toolbar, Link } from "@material-ui/core";
3+
import { AppBar, Toolbar } from "@material-ui/core";
4+
import { Link } from "react-router-dom";
45
import { toAbsoluteUrl } from "../../../../../utils/utils";
56

67
const useStyles = makeStyles((theme) => ({
78
navItem: {
89
fontWeight: "bold",
910
color: "#000",
1011
paddingLeft: theme.spacing(2),
12+
textDecoration: "none",
13+
cursor: "pointer",
1114
},
1215
}));
1316

1417
export default function Nav() {
1518
const classes = useStyles();
1619

17-
const preventDefault = (event) => event.preventDefault();
18-
1920
return (
2021
<AppBar
2122
position="static"
@@ -31,13 +32,13 @@ export default function Nav() {
3132
/>
3233
</div>
3334
<div>
34-
<Link className={classes.navItem} href="#" onClick={preventDefault}>
35+
<Link className={classes.navItem} to="/home/howitworks">
3536
See How It Works
3637
</Link>
37-
<Link className={classes.navItem} href="#" onClick={preventDefault}>
38+
<Link className={classes.navItem} to="/home/contactus">
3839
Contact Us
3940
</Link>
40-
<Link className={classes.navItem} href="#" onClick={preventDefault}>
41+
<Link className={classes.navItem} to="/home/about">
4142
About Us
4243
</Link>
4344
</div>

code_base/web-ui/src/app/pages/OrganisationMenu/EmployeesPage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export default function EmployeesPage() {
126126
1672 Employees Invited
127127
</div>
128128
<div className={classes.labels}>
129-
<Link to ='/invitation' className={classes.link}>Invite Employees Check </Link>
129+
<Link to='/invitationMobile' className={classes.link}>Invite Employees Check </Link>
130130
<br/> Employees List
131131
</div>
132132
</div>

code_base/web-ui/src/router/Routes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import HomeRouter from "./HomeRouter"
66
import WIPRouter from "./WIPRouter"
77
import Sites from '../app/container/Sites/Sites'
88
import EmployeeDevelopment from '../app/pages/EmployeeList';
9-
import Index from '../app/pages/EmployeeMenu/Index'
9+
import EmployeeMenu from '../app/pages/EmployeeMenu/Index'
1010
import EmployeesPage from "../app/pages/OrganisationMenu/EmployeesPage";
1111
import NewSite from '../app/pages/NewSite/NewSite'
1212
import EmployeesPageMobile from "../app/pages/OrganisationMenu/EmployeesPageMobile";
@@ -31,7 +31,7 @@ export const Routes = () => {
3131
<Route path="/newsite" component={NewSite}/>
3232
<Route path="/sites/:id" component={Sites}/>
3333
<Route path="/employee" component={EmployeeDevelopment} />
34-
<Route exact path="/employee" component={Index} />
34+
<Route path="/employeemenu" component={EmployeeMenu} />
3535
<Route exact path="/employeebooking" component={EmployeeBooking} />
3636
</Switch>
3737
</Router>

0 commit comments

Comments
 (0)