@@ -296,5 +276,5 @@ export function Navigation({ nav }: { nav: Menu }) {
- );
+ )
}
diff --git a/apps/trialanderror.org/src/app/components/OurMission.tsx b/apps/trialanderror.org/src/app/components/OurMission.tsx
index 3a4a7fe1..ed039442 100644
--- a/apps/trialanderror.org/src/app/components/OurMission.tsx
+++ b/apps/trialanderror.org/src/app/components/OurMission.tsx
@@ -4,8 +4,7 @@ import { motion } from 'framer-motion'
import Link from 'next/link'
export function OurMission() {
- return (
-
+ return
{/* light blue backdrop */}
@@ -58,5 +57,4 @@ export function OurMission() {
- )
}
diff --git a/apps/trialanderror.org/src/app/components/SignUp.tsx b/apps/trialanderror.org/src/app/components/SignUp.tsx
index 287f7329..91232409 100644
--- a/apps/trialanderror.org/src/app/components/SignUp.tsx
+++ b/apps/trialanderror.org/src/app/components/SignUp.tsx
@@ -1,14 +1,18 @@
'use client'
+
+/* eslint-disable jsx-a11y/label-has-associated-control */
+
import { lazy, useId, useState } from 'react'
// lazy load the form
-const MailForm = lazy(async () => await import('./MailForm'))
+const MailForm = lazy(async () => import('./MailForm'))
-export const SignUp = ({ mailId }: { mailId?: string }) => {
+export function SignUp({ mailId }: { mailId?: string }) {
const [open, setOpen] = useState(false)
const [email, setEmail] = useState('')
const id = useId()
+ const correctId = mailId ?? id
return (
<>
@@ -19,25 +23,25 @@ export const SignUp = ({ mailId }: { mailId?: string }) => {
}}
className="mt-4 sm:flex sm:max-w-md lg:mt-0"
>
-
+
)
}
diff --git a/apps/trialanderror.org/src/app/components/WhatDoWeDo.tsx b/apps/trialanderror.org/src/app/components/WhatDoWeDo.tsx
index a5a55c28..52301d1f 100644
--- a/apps/trialanderror.org/src/app/components/WhatDoWeDo.tsx
+++ b/apps/trialanderror.org/src/app/components/WhatDoWeDo.tsx
@@ -1,11 +1,12 @@
'use client'
+
import { Attribute } from '@strapi/strapi'
import { motion, useReducedMotion, Variant } from 'framer-motion'
import Image from 'next/image'
import { useMemo, useState } from 'react'
import { useMediaQuery } from '../../hooks/useMediaQuery'
-const WhatWeDoSection = ({
+function WhatWeDoSection({
children,
hover,
image,
@@ -19,9 +20,9 @@ const WhatWeDoSection = ({
title: string
isSmall?: boolean
setHover: (arg: React.SetStateAction<{ tab: number; show: boolean }[]>) => void
-}) => {
+}) {
const handleHover = () => {
- setHover((prev) => {
+ setHover(() => {
const newHover = [
{ tab: 0, show: false },
{ tab: 1, show: false },
@@ -78,6 +79,7 @@ const WhatWeDoSection = ({
flexShrink: 1,
}}
className={`relative flex flex-col items-center bg-white ${
+ // eslint-disable-next-line no-nested-ternary
hover.tab === 2
? ''
: isSmall
@@ -179,11 +181,11 @@ const WhatWeDoSection = ({
)
}
-export const WhatDoWeDo = ({
+export function WhatDoWeDo({
images,
}: {
images: (Attribute.GetValues<'plugin::upload.file'> | null)[]
-}) => {
+}) {
const [hover, setHover] = useState([
{ tab: 0, show: true },
{ tab: 1, show: false },
diff --git a/apps/trialanderror.org/src/app/layout.tsx b/apps/trialanderror.org/src/app/layout.tsx
index 4ec2569e..24edbff4 100644
--- a/apps/trialanderror.org/src/app/layout.tsx
+++ b/apps/trialanderror.org/src/app/layout.tsx
@@ -1,11 +1,10 @@
+import { Overpass, Open_Sans } from 'next/font/google'
+import Script from 'next/script'
import { AnalyticsWrapper } from './components/Analytics'
import { Footer } from './components/Footer'
import { Nav } from './components/Nav'
import { createMetadata } from '../utils/createMetadata'
-import { Overpass, Open_Sans } from 'next/font/google'
-import Script from 'next/script'
-
import '../styles/globals.css'
const overpass = Overpass({
@@ -14,7 +13,7 @@ const overpass = Overpass({
// display: 'swap',
})
-const open_sans = Open_Sans({
+const openSans = Open_Sans({
subsets: ['latin'],
variable: '--font-open-sans',
// display: 'swap',
@@ -26,7 +25,7 @@ export const metadata = createMetadata({
export default function RootLayout({ children }: { children: React.ReactNode }) {
return (
-
+
diff --git a/apps/trialanderror.org/src/app/page.tsx b/apps/trialanderror.org/src/app/page.tsx
index 30abe18e..7f902a8d 100644
--- a/apps/trialanderror.org/src/app/page.tsx
+++ b/apps/trialanderror.org/src/app/page.tsx
@@ -9,7 +9,7 @@ export const revalidate = 3600 // revalidate at least every hour
export default async function Page() {
const cardsPromise = await getAllCards({ limit: 12 })
// TODO: don't hardcode the images
- const filesPromise = Promise.all([573, 571, 572].map(async (file) => await getFile(file)))
+ const filesPromise = Promise.all([573, 571, 572].map(async (file) => getFile(file)))
const [cards, files] = await Promise.all([cardsPromise, filesPromise])
@@ -22,7 +22,7 @@ export default async function Page() {
- What's New?
+ What's New?
{cards.map((card, idx) => (
diff --git a/apps/trialanderror.org/src/app/projects/page.tsx b/apps/trialanderror.org/src/app/projects/page.tsx
index 9dbfa99a..9e097a8b 100644
--- a/apps/trialanderror.org/src/app/projects/page.tsx
+++ b/apps/trialanderror.org/src/app/projects/page.tsx
@@ -5,17 +5,17 @@ export default async function ProjectsPage() {
Journal of Trial & Error
-
+
Blog of Trial & Error
-
+
Publishers of Trial & Error
-
+
)
diff --git a/apps/trialanderror.org/src/app/team/[slug]/pageX.tsx b/apps/trialanderror.org/src/app/team/[slug]/pageX.tsx
index b53f9958..2c7fd4d2 100644
--- a/apps/trialanderror.org/src/app/team/[slug]/pageX.tsx
+++ b/apps/trialanderror.org/src/app/team/[slug]/pageX.tsx
@@ -30,12 +30,12 @@ export default async function PersonPage({ params }: { params: { slug: string }
lastName,
position,
pronouns,
- show_pronouns,
+ show_pronouns: showPronouns,
bio,
summary,
github,
image,
- blog_posts,
+ blog_posts: blogPosts,
linkedin,
personalWebsite,
twitter,
@@ -49,7 +49,7 @@ export default async function PersonPage({ params }: { params: { slug: string }
{firstName} {lastName}
- {show_pronouns && (
+ {showPronouns && (
{pronouns}
@@ -118,13 +118,13 @@ export default async function PersonPage({ params }: { params: { slug: string }