Skip to content

Commit 06b2b18

Browse files
authored
Merge branch 'develop' into s24-remove-redundancy-transcript
2 parents e74e80c + 49403b7 commit 06b2b18

File tree

7 files changed

+35
-18
lines changed

7 files changed

+35
-18
lines changed

src/components/Header/index.jsx

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,28 @@ const useTabHighlight = () => {
5757
return tabIndex;
5858
};
5959

60+
const useAltText = () => {
61+
const location = useLocation();
62+
const [altText, setAltText] = useState('');
63+
64+
useEffect(() => {
65+
if (location.pathname === '/') {
66+
setAltText('Gordon 360 Logo - Home page');
67+
} else {
68+
setAltText('Gordon 360 Logo - Go to home');
69+
}
70+
}, [location]);
71+
72+
return altText;
73+
};
74+
6075
const GordonHeader = ({ onDrawerToggle }) => {
6176
const navigate = useNavigate();
6277
const [dialog, setDialog] = useState('');
6378
const isOnline = useNetworkStatus();
6479
const isAuthenticated = useIsAuthenticated();
6580
const tabIndex = useTabHighlight();
81+
const altText = useAltText();
6682

6783
const handleOpenProfile = () => {
6884
navigate('/myprofile');
@@ -148,7 +164,7 @@ const GordonHeader = ({ onDrawerToggle }) => {
148164
<source srcSet={headerLogo72dpi} media="(min-width: 900px)" />
149165
<source srcSet={headerLogo64dpi} media="(min-width: 600px)" />
150166
<source srcSet={headerLogo56dpiNoText} media="(max-width: 375px)" />
151-
<img src={headerLogo56dpi} alt="Gordon 360 Logo"></img>
167+
<img src={headerLogo56dpi} alt={altText}></img>
152168
</picture>
153169
</Link>
154170
</div>

src/components/Profile/components/PersonalInfoList/index.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,10 @@ const PersonalInfoList = ({ myProf, profile, isOnline, createSnackbar }) => {
599599
(isFacStaff ? (
600600
<Typography align="left" className={styles.note}>
601601
NOTE: To update your personal info, please go to{' '}
602-
<a href="https://gordon.criterionhcm.com/">Criterion</a> and look under "Personal Info" tab.
602+
<a href="https://gordon.criterionhcm.com/" className={`gc360_text_link`}>
603+
Criterion
604+
</a>{' '}
605+
and look under "Personal Info" tab.
603606
</Typography>
604607
) : isStudent ? (
605608
<div align="left" className={styles.note}>

src/views/Home/components/GuestWelcome/index.jsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ const GuestWelcome = () => {
7474
<Grid container style={{ textAlign: 'center' }}>
7575
<Card raised className={styles.gw_card}>
7676
<CardHeader title="Welcome to Gordon 360!" />
77-
<CardMedia image={GordonLogoVerticalWhite} component="img" />
77+
<CardMedia
78+
image={GordonLogoVerticalWhite}
79+
component="img"
80+
alt="Welcome to Gordon 360"
81+
/>
7882
<CardContent>
7983
<Typography>
8084
As a guest, you have access to a limited view of the site. Login for full access.

src/views/InvolvementProfile/components/ContactListItem/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ const ContactListItem = ({ contact }) => {
4242
{!avatar && <PlaceHolderAvatar />}
4343
</Avatar>
4444
</ListItemAvatar>
45-
<Link href={`/profile/${contact.Email.split('@')[0]}`} underline="hover">
45+
<Link href={`/profile/${contact.Email.split('@')[0]}`} className={`gc360_text_link`}>
4646
<ListItemText
4747
primary={`${contact.FirstName} ${contact.LastName}`}
4848
secondary={contact?.Description}
4949
/>
5050
</Link>
5151
<ListItemSecondaryAction>
52-
<IconButton color="primary" href={`mailto:${contact.Email}`} size="large">
53-
<Email color="primary" />
52+
<IconButton href={`mailto:${contact.Email}`} size="large">
53+
<Email className={`gc360_text_link`} />
5454
</IconButton>
5555
</ListItemSecondaryAction>
5656
</ListItem>

src/views/InvolvementProfile/components/Membership/components/MemberList/MemberList.module.scss

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/views/InvolvementProfile/components/Membership/components/MemberList/components/MemberListItem/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ const MemberListItem = ({
247247
{member.FirstName} {member.LastName}
248248
</Typography>
249249
) : (
250-
<Link href={`/profile/${member.Username}`} underline="hover">
250+
<Link href={`/profile/${member.Username}`} className={`gc360_text_link`}>
251251
<Typography>
252252
{member.FirstName} {member.LastName}
253253
</Typography>
@@ -307,7 +307,7 @@ const MemberListItem = ({
307307
{member.FirstName} {member.LastName}
308308
</Typography>
309309
) : (
310-
<Link href={`/profile/${member.Username}`} underline="hover">
310+
<Link href={`/profile/${member.Username}`} className={`gc360_text_link`}>
311311
<Typography>
312312
{member.FirstName} {member.LastName}
313313
</Typography>
@@ -359,7 +359,7 @@ const MemberListItem = ({
359359
{member.FirstName} {member.LastName}
360360
</Typography>
361361
) : (
362-
<Link href={`/profile/${member.Username}`} underline="hover">
362+
<Link href={`/profile/${member.Username}`} className={`gc360_text_link`}>
363363
<Typography>
364364
{member.FirstName} {member.LastName}
365365
</Typography>

src/views/InvolvementProfile/components/Membership/components/MemberList/index.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Card, CardContent, CardHeader, Grid } from '@mui/material';
22
import { useWindowSize } from 'hooks';
33
import MemberListItem from './components/MemberListItem';
4-
import styles from './MemberList.module.css';
54

65
const breakpointWidth = 810;
76

@@ -52,7 +51,7 @@ const MemberList = ({
5251
};
5352

5453
const header = isMobileView ? (
55-
<CardHeader title="Members" className={styles.headerStyle} />
54+
<CardHeader title="Members" className="gc360_header" />
5655
) : isAdmin || isSiteAdmin ? (
5756
<CardHeader
5857
title={
@@ -71,7 +70,7 @@ const MemberList = ({
7170
</Grid>
7271
}
7372
titleTypographyProps={{ variant: 'h6' }}
74-
className={styles.headerStyle}
73+
className="gc360_header"
7574
/>
7675
) : (
7776
<CardHeader
@@ -86,7 +85,7 @@ const MemberList = ({
8685
</Grid>
8786
</Grid>
8887
}
89-
className={styles.headerStyle}
88+
className="gc360_header"
9089
/>
9190
);
9291
return (

0 commit comments

Comments
 (0)