Merge pull request #211 from OxfordRSE/moar-accesbility

Fixes various accesibility nav issues
OxfordRSE · May 29, 2024 · 5ca7a8e · 5ca7a8e
2 parents d9f945c + 0d4c0c4
commit 5ca7a8e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/components/EventsView.tsx b/components/EventsView.tsx
@@ -159,12 +159,10 @@ const EventsView: React.FC<EventsProps> = ({ material, events }) => {
                     </Stack>
                   )}
                 </Timeline.Time>
-                <Timeline.Title>
-                  <Link href={`/event/${event.id}`}>{event.name}</Link>
-                </Timeline.Title>
-                <Timeline.Body>
-                  <Link href={`/event/${event.id}`}>{event.summary}</Link>
-                </Timeline.Body>
+                <Link href={`/event/${event.id}`}>
+                  <Timeline.Title>{event.name}</Timeline.Title>
+                  <Timeline.Body>{event.summary}</Timeline.Body>
+                </Link>
                 <EventActions event={event} />
               </Timeline.Content>
             </Timeline.Item>

diff --git a/components/Navbar.tsx b/components/Navbar.tsx
@@ -301,29 +301,21 @@ const Navbar: React.FC<Props> = ({
           </li>
         )}
 
-        <li>
+        <li aria-label={session ? session.user?.name || "Account details" : "Sign in"}>
           <Dropdown
             label={
               <span className="inline-flex items-center text-gray-700 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white w-10 h-10">
                 {session ? (
                   <Avatar
                     role="img"
-                    aria-label={session.user?.name || "Account details"}
                     img={session.user?.image ? session.user?.image : undefined}
                     className="w-8 h-8"
                     size="sm"
                     rounded={true}
                     data-cy={`avatar-${session.user?.email}`}
                   />
                 ) : (
-                  <Avatar
-                    role="img"
-                    aria-label="Sign in"
-                    className="w-8 h-8"
-                    size="sm"
-                    rounded={true}
-                    data-cy={`avatar-not-signed-in`}
-                  />
+                  <Avatar role="img" className="w-8 h-8" size="sm" rounded={true} data-cy={`avatar-not-signed-in`} />
                 )}
               </span>
             }

diff --git a/pages/material/index.tsx b/pages/material/index.tsx
@@ -16,6 +16,7 @@ type HomeProps = {
 const Home: NextPage<HomeProps> = ({ material, events, pageInfo }) => {
   return (
     <Layout material={material} pageInfo={pageInfo}>
+      <h1 className="text-3xl font-bold text-center">Material Themes</h1>
       <ThemeCards material={material} />
     </Layout>
   )