Revert "Updated table tags"

This reverts commit 848025b.
StephenJLu · Dec 20, 2024 · 8f18b8c · 8f18b8c
1 parent 2fe3cc6
commit 8f18b8c
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 98 deletions.
diff --git a/app/routes/home/ForensicsText.tsx b/app/routes/home/ForensicsText.tsx
@@ -1,32 +1,32 @@
-import { Heading, Text, Table, TableHead, TableBody, TableRow, List, ListItem, Link } from '../../components/Components';
+import { Heading, Text, Table, TableRow, TableCell, List, ListItem, Link } from '../../components/Components';
 import styles from './forensics.module.css';
 
 const ForensicsText = ({ visible, titleId }: { visible: boolean; titleId: string }) => (
   <>  
     <Heading className={styles.title} data-visible={visible} level={3} weight={'light'} id={titleId}>Crime Scene Investigator and Firearms Examiner</Heading>
     <Table className={styles.table} data-visible={visible}>
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>    
-      <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>Previous Employers</Heading>    
-    </TableHead>
+    <TableCell>
+      <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>Previous Employers</Heading>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-      <TableBody>    
+    <TableCell>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><Link secondary href={'https://www.sdsheriff.gov'}>San Diego County Sheriff's Department</Link></Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><Link secondary href={'https://gfjc.fiu.edu/'}>FIU Global Forensic Science and Justice Center</Link></Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><Link secondary href={'https://www.azdps.gov/'}>Arizona Department of Public Safety</Link></Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><Link secondary href={'https://www.oag.ca.gov/'}>California Department of Justice</Link></Text></ListItem>
       </List>
-       </TableBody>
+    </TableCell>
     </TableRow>  
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>    
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>Forensic Experience</Heading>
-        </TableHead>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-            <TableBody>    
+    <TableCell>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Forensic Biology</Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Forensic Firearms Analysis</Text></ListItem>
@@ -35,17 +35,17 @@ const ForensicsText = ({ visible, titleId }: { visible: boolean; titleId: string
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Trajectory Analysis</Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Crime Scene and Shooting Incident Reconstruction</Text></ListItem>
       </List>
-        </TableBody>   
+    </TableCell>    
   </TableRow>
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>          
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>
         Testimony Experience
       </Heading>
-        </TableHead>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-      <TableBody>    
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={5} weight={'thin'}>Qualified Subjects</Heading>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Forensic Biology</Text></ListItem>
@@ -56,24 +56,24 @@ const ForensicsText = ({ visible, titleId }: { visible: boolean; titleId: string
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><b>State</b>: Arizona and California</Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><b>Federal</b>: U.S. District Court for the Central District of California</Text></ListItem>
-      </List>    
-    </TableBody>
+      </List>
+    </TableCell>
   </TableRow>
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>    
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>
         Publications
       </Heading>
-        </TableHead>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-            <TableBody>    
+    <TableCell>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Lu, Stephen J. "The Cultural Context of Forensic Laboratories in California." The CACNews, Summer 2023, August 29, 2023.</Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Lu, Stephen J. and Olivia A. Mendoza. "On a Mission to Improve Leadership in Forensics" Catalyst Magazine (Tucson, AZ), December 18, 2023.</Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Lu, Stephen J. 2024. CSI to CEO: What the Dead Can Teach Us About Life and Leadership. Edited by Eve Porinchak. 1st ed. San Diego: Independent.</Text></ListItem>
-        </List>    
-    </TableBody>
+        </List>
+    </TableCell>
   </TableRow>
 </Table>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}><br />Detailed Professional History</Heading>
@@ -83,6 +83,7 @@ const ForensicsText = ({ visible, titleId }: { visible: boolean; titleId: string
 <Text className={styles.description} data-visible={visible} size={'l'} as={'p'}>In addition to his forensic science work, Stephen served as the Regional Director South for the California Association of Criminalists (CAC), where he organized regional study groups and hosted presentations by experts, including a keynote address by Jeff Udvarhelyi, an Escondido Police Department Child Abuse Detective, on a significant child abuse case. As the Lead Webmaster for the CAC, he enhanced the organization’s public presence by overhauling its website for better communication and engagement.</Text>
 <Text className={styles.description} data-visible={visible} size={'l'} as={'p'}>Since retiring from active casework, Stephen has shifted his focus towards leadership development in forensic science. He founded the Forensic Leaders Training Center®, where he provided online leadership and management training for forensic professionals, helping them to advance their careers and improve workplace culture. Stephen's interest in leadership and public education is further reflected in his recent book, <i>CSI to CEO</i>, where he covers forensic science topics such as DNA analysis, crime scene investigation, bloodstain pattern analysis, and forensic leadership for a general audience. In 2023, Stephen had the honor of graduating from the FBI San Diego's Citizens Academy as a demonstration of his continued dedication to public service.</Text>
   </>
+
 );
 
 export default ForensicsText;
diff --git a/app/routes/home/ResearchText.tsx b/app/routes/home/ResearchText.tsx
@@ -1,4 +1,4 @@
-import { Heading, Text, Table, TableHead, TableBody, TableRow, List, ListItem, Link } from '../../components/Components';
+import { Heading, Text, Table, TableRow, TableCell, List, ListItem, Link } from '../../components/Components';
 import styles from './research.module.css';
 import nihPoster from '/docs/nih-poster.pdf';
 
@@ -7,25 +7,25 @@ const ResearchText = ({ visible, titleId }: { visible: boolean; titleId: string
     <Heading className={styles.title} data-visible={visible} level={3} weight={'light'} id={titleId}>Insect Biochemistry and Human Cell Biology</Heading>
     <Table className={styles.table} data-visible={visible}>
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>Previous Employers</Heading>
-    </TableHead>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-    <TableBody>
+    <TableCell>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><Link secondary href={'https://www.nih.gov/'}>National Institutes of Health</Link></Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><Link secondary href={'https://www.arizona.edu/'}>University of Arizona</Link></Text></ListItem>        
       </List>
-    </TableBody>
+    </TableCell>
   </TableRow>
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>    
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>Areas of Research</Heading>
-        </TableHead>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-    <TableBody>
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={5} weight={'thin'}>Insect Biology and Biochemistry</Heading>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Fat Metabolism</Text></ListItem>
@@ -41,15 +41,15 @@ const ResearchText = ({ visible, titleId }: { visible: boolean; titleId: string
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Neutral Lipid Trafficking</Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Fluorescent Microscopy</Text></ListItem>
       </List>
-    </TableBody>
+    </TableCell>
   </TableRow>
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>    
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>Primary Investigators and Lead Research Teams</Heading>
-        </TableHead>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-    <TableBody>
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={5} weight={'thin'}>University of Arizona</Heading>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><b>Dr. Michael A. Wells</b></Text></ListItem>
@@ -68,35 +68,35 @@ const ResearchText = ({ visible, titleId }: { visible: boolean; titleId: string
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Marcy Comly</Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Sanjay Patel</Text></ListItem>
       </List>
-    </TableBody>
+    </TableCell>
   </TableRow>
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>    
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>Publications</Heading>
-        </TableHead>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-    <TableBody>
+    <TableCell>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Reevaluation of the Role of Early Trypsin Activity in the Transcriptional Activation of the Late Trypsin Gene in the Mosquito Aedes Aegypti<br/><Link secondary href={'https://doi.org/10.1016/j.ibmb.2006.01.011'}>Journal Link</Link></Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l">Neutral Lipid Trafficking Differentiates Niemann-Pick C (NPC) 1 from NPC2 Mutant Fibroblasts<br/><Link secondary href={nihPoster} target="_blank" rel="noopener noreferrer" download>Download Poster</Link></Text></ListItem>
         </List>
-    </TableBody>
+    </TableCell>
   </TableRow>
   <TableRow className={styles.row} data-visible={visible}>
-    <TableHead>    
+    <TableCell>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}>Education and Certifications</Heading>
-        </TableHead>
+    </TableCell>
     </TableRow>
     <TableRow className={styles.row} data-visible={visible}>
-    <TableBody>
+    <TableCell>
       <List className={styles.description} data-visible={visible} size="l" as={'ul'}>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><b>Executive Master of Business Administration with Honors</b> — Business Administration and Management, Quantic School of Business and Technology</Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><b>Bachelor of Science with Honors</b> — Biochemistry and Molecular Biophysics and Molecular and Cellular Biology, University of Arizona. Phi Beta Kappa, <i>magna cum laude</i></Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><b>Society for Human Resource Management Certified Professional</b></Text></ListItem>
         <ListItem><Text className={styles.description} data-visible={visible} size="l"><b>2023 FBI San Diego Citizens' Academy</b></Text></ListItem>        
       </List>
-    </TableBody>
+    </TableCell>
   </TableRow>
 </Table>
       <Heading className={styles.title} data-visible={visible} level={4} weight={'regular'}><br />Detailed Professional History</Heading>