diff --git a/client/src/components/Button.tsx b/client/src/components/Button.tsx index fe30167..a5a1b9c 100644 --- a/client/src/components/Button.tsx +++ b/client/src/components/Button.tsx @@ -51,6 +51,7 @@ const Button = (props: ButtonProps) => { : 'cursor-auto text-lighter bg-backgroundDark'; const boldFormat = props.bold ? 'font-bold' : 'font-normal'; const widthFormat = props.full ? 'w-full' : 'w-3/4 md:w-2/3'; + const focusFormat = 'focus:outline-none focus:ring-inset focus:ring-4 focus:ring-backgroundDark focus:ring-opacity-100'; const formatting = twMerge( defaultFormat, borderFormat, @@ -58,6 +59,7 @@ const Button = (props: ButtonProps) => { squareFormat, boldFormat, widthFormat, + focusFormat, props.className ); diff --git a/client/src/components/admin/AdminStatsPanel.tsx b/client/src/components/admin/AdminStatsPanel.tsx index 8280f45..3f74b44 100644 --- a/client/src/components/admin/AdminStatsPanel.tsx +++ b/client/src/components/admin/AdminStatsPanel.tsx @@ -68,11 +68,12 @@ const AdminStatsPanel = () => { }, [paused, time]); return ( -
+
- + +
{ className={'basis-1/5' + (paused ? ' text-error' : '')} />
- - + +
); diff --git a/client/src/components/admin/AdminToolbar.tsx b/client/src/components/admin/AdminToolbar.tsx index 1e356c9..089fc02 100644 --- a/client/src/components/admin/AdminToolbar.tsx +++ b/client/src/components/admin/AdminToolbar.tsx @@ -14,7 +14,6 @@ const AdminToolbar = (props: { showProjects: boolean }) => { bold full className="py-2 px-4 rounded-md" - // lucatodo: remove ability to add judges from this admin portal href='/admin/add-projects' > Add Projects @@ -38,7 +37,7 @@ const AdminToolbar = (props: { showProjects: boolean }) => { )}
- Click on headings to sort by that column. + Click on headings to sort by that column. This will clear your selections.
{showFlags && } diff --git a/client/src/components/admin/FlagsPopup.tsx b/client/src/components/admin/FlagsPopup.tsx index a1d77a5..b5daccc 100644 --- a/client/src/components/admin/FlagsPopup.tsx +++ b/client/src/components/admin/FlagsPopup.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { getRequest } from '../../api'; -import { errorAlert, timeSince } from '../../util'; +import {errorAlert, timeSince, truncate} from '../../util'; interface FlagsPopupProps { /* Function to modify the popup state variable */ @@ -98,7 +98,7 @@ const FlagsPopup = ({ close }: FlagsPopupProps) => { className="flex flex-row items-center text-xl border-b-2 border-backgroundDark py-1" >

- {`[${flag.project_location}] ${flag.project_name.substring(0, 15)}`} + {`[${flag.project_location}] ${truncate(flag.project_name, 20)}`}

{flag.judge_name} diff --git a/client/src/components/admin/add-projects/NewProjectForm.tsx b/client/src/components/admin/add-projects/NewProjectForm.tsx index b0c8d33..5ea9710 100644 --- a/client/src/components/admin/add-projects/NewProjectForm.tsx +++ b/client/src/components/admin/add-projects/NewProjectForm.tsx @@ -46,7 +46,10 @@ const NewProjectForm = () => {

Add Project

- +
+ + +