requested changes

Pigmice2733 · Feb 17, 2024 · ee45d65 · ee45d65
1 parent 5e2bbc4
commit ee45d65
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/src/colors.ts b/src/colors.ts
@@ -5,7 +5,7 @@ export const lightGrey = '#E8E8E8'
 export const faintGrey = '#f5f5f5'
 export const blue = '#295dc0'
 export const red = '#c30000'
-export const greenOnPurple = '#47D232'
-export const redOnPurple = '#FF3C2E'
+export const greenOnPurple = '#4FAC40'
+export const redOnPurple = '#D61E42'
 export const offBlack = '#333'
 export const focusRing = '#0044ff40'
diff --git a/src/components/page.tsx b/src/components/page.tsx
@@ -2,7 +2,7 @@ import { RenderableProps, ComponentChildren } from 'preact'
 import { ErrorBoundary } from './error-boundary'
 import { css } from '@linaria/core'
 import { createShadow } from '@/utils/create-shadow'
-import { greenOnPurple, pigmicePurple } from '@/colors'
+import { pigmicePurple } from '@/colors'
 import IconButton, { iconButtonClass } from './icon-button'
 import { mdiArrowLeft, mdiMenu } from '@mdi/js'
 import clsx from 'clsx'
@@ -51,7 +51,7 @@ const headerText = css`
     color: white;
 
     &:hover {
-      text-decoration-color: ${greenOnPurple};
+      text-decoration-color: #47d232;
     }
   }
 `
@@ -66,7 +66,7 @@ type Props = Merge<
   }
 >
 
-const Header = ({ name, showBackButton }: Omit<Props, 'class'>) => {
+const Header = ({ name, showBackButton = true }: Omit<Props, 'class'>) => {
   const [isMenuOpen, setIsMenuOpen] = useState(false)
 
   const toggleMenu = () => setIsMenuOpen((isOpen) => !isOpen)
@@ -75,7 +75,7 @@ const Header = ({ name, showBackButton }: Omit<Props, 'class'>) => {
   return (
     <>
       <header class={headerStyle}>
-        {(showBackButton || showBackButton === undefined) && (
+        {showBackButton && (
           <IconButton
             icon={mdiArrowLeft}
             aria-label="Back"

diff --git a/src/routes/event-analysis.tsx b/src/routes/event-analysis.tsx
@@ -34,7 +34,7 @@ const EventAnalysis: FunctionComponent<Props> = ({ eventKey }) => {
       name={
         <>
           {'Analysis - '}
-          <a href={`/events/${eventKey}`}> {eventName} </a>
+          <a href={`/events/${eventKey}`}>{eventName}</a>
         </>
       }
       class={tablePageStyle}

diff --git a/src/routes/event-match.tsx b/src/routes/event-match.tsx
@@ -165,8 +165,8 @@ const EventMatch = ({ eventKey, matchKey }: Props) => {
     <Page
       name={
         <>
-          {m.group + (m.num ? ' Match ' + m.num : '') + ' - '}
-          <a href={`/events/${eventKey}`}> {event ? event.name : eventKey} </a>
+          {`${m.group}${m.num ? ` Match ${m.num}` : ''} - `}
+          <a href={`/events/${eventKey}`}>{event?.name || eventKey}</a>
         </>
       }
       class={clsx(

diff --git a/src/routes/event-team-comments.tsx b/src/routes/event-team-comments.tsx
@@ -53,7 +53,7 @@ const EventTeamComments = ({ eventKey, teamNum }: Props) => {
       name={
         <>
           {`Comments: ${teamNum} @ `}
-          <a href={`/events/${eventKey}`}> {eventName} </a>
+          <a href={`/events/${eventKey}`}>{eventName}</a>
         </>
       }
       class={commentsPageStyle}

diff --git a/src/routes/event-team-matches.tsx b/src/routes/event-team-matches.tsx
@@ -28,7 +28,7 @@ const EventTeamMatches = ({ eventKey, teamNum }: Props) => {
       name={
         <>
           {`Matches: ${teamNum} @ `}
-          <a href={`/events/${eventKey}`}> {eventName} </a>
+          <a href={`/events/${eventKey}`}>{eventName}</a>
         </>
       }
       class={eventTeamMatchesStyle}

diff --git a/src/routes/event-team.tsx b/src/routes/event-team.tsx
@@ -182,7 +182,7 @@ const EventTeam = ({ eventKey, teamNum }: Props) => {
         <span class={pageHeadingStyle}>
           <span class={teamHeadingSpanStyle}>
             {`${teamNum} @ `}
-            <a href={`/events/${eventKey}`}> {eventName} </a>
+            <a href={`/events/${eventKey}`}>{eventName}</a>
           </span>
           <IconButton
             icon={isTeamSaved ? mdiStar : mdiStarOutline}