Merge branch 'gfohl/precommit'

Burzmalian · Aug 15, 2024 · c94f492 · c94f492
2 parents 9a860f7 + 1df1e07
commit c94f492
Show file tree

Hide file tree

Showing 18 changed files with 316 additions and 210 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -53,7 +53,7 @@ module.exports = {
     // Typescript
     {
       files: ["**/*.{ts,tsx}"],
-      plugins: ["@typescript-eslint", "import"],
+      plugins: ["@typescript-eslint", "import", "prettier"],
       parser: "@typescript-eslint/parser",
       settings: {
         "import/internal-regex": "^~/",
@@ -70,6 +70,7 @@ module.exports = {
         "plugin:@typescript-eslint/recommended",
         "plugin:import/recommended",
         "plugin:import/typescript",
+        "prettier",
       ],
     },
 

diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,7 @@
+build
+node_modules
+package.json
+package-lock.json
+.cache
+.vercel
+stats.html
diff --git a/app/components/ThemeToggle.tsx b/app/components/ThemeToggle.tsx
@@ -7,7 +7,7 @@ export function ThemeToggle() {
   return (
     <button
       type="button"
-      className="bg-muted text-muted-foreground rounded-full p-2.5"
+      className="rounded-full bg-muted p-2.5 text-muted-foreground"
       onClick={() => setTheme(theme === Theme.LIGHT ? Theme.DARK : Theme.LIGHT)}
     >
       {theme === Theme.LIGHT && <SunIcon className="h-[1.2rem] w-[1.2rem]" />}

diff --git a/app/root.tsx b/app/root.tsx
@@ -32,7 +32,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
 export const meta: MetaFunction = ({ location }) => {
   const { title, description } =
     Object.values(routeData).find(
-      (route) => route.route === location.pathname
+      (route) => route.route === location.pathname,
     ) || {};
   return [{ title: title }, { name: "description", content: description }];
 };
@@ -75,7 +75,7 @@ export function ErrorBoundary() {
         <Meta />
         <Links />
       </head>
-      <body className="h-full relative">
+      <body className="relative h-full">
         {/* <Error error={error} /> */}
         <Scripts />
         <SpeedInsights />
@@ -106,10 +106,10 @@ export function InnerLayout({
         <Meta />
         <Links />
       </head>
-      <body className="h-full relative flex flex-col" suppressHydrationWarning>
+      <body className="relative flex h-full flex-col" suppressHydrationWarning>
         <a
           href="#main"
-          className="transition left-0 bg-popover text-popover-foreground rounded-md absolute py-1 px-2 text-sm border m-3 -translate-y-16 focus:translate-y-0 z-50"
+          className="absolute left-0 z-50 m-3 -translate-y-16 rounded-md border bg-popover px-2 py-1 text-sm text-popover-foreground transition focus:translate-y-0"
         >
           Skip to main content
         </a>

diff --git a/app/routes/_layout._index/Contact.tsx b/app/routes/_layout._index/Contact.tsx
@@ -2,7 +2,7 @@ import { Container } from "~/components/Container";
 
 export const Contact = () => {
   return (
-    <Container className="bg-gray-800 relative overflow-hidden">
+    <Container className="relative overflow-hidden bg-gray-800">
       <svg
         viewBox="0 0 1024 1024"
         className="absolute inset-0"
@@ -31,7 +31,7 @@ export const Contact = () => {
       </svg>
       <Container.Inner>
         <div className="relative isolate flex flex-col gap-10 overflow-hidden xl:flex-row xl:items-center">
-          <h2 className="max-w-2xl text-3xl font-bold tracking-tight sm:leading-snug text-white sm:text-4xl xl:max-w-none xl:flex-auto">
+          <h2 className="max-w-2xl text-3xl font-bold tracking-tight text-white sm:text-4xl sm:leading-snug xl:max-w-none xl:flex-auto">
             Ask me anything.
           </h2>
           <form className="w-full max-w-md">

diff --git a/app/routes/_layout._index/Hero.tsx b/app/routes/_layout._index/Hero.tsx
@@ -4,9 +4,9 @@ export const Hero = () => {
   return (
     <Container className="bg-background">
       <Container.Inner>
-        <div className="flex flex-col max-w-3xl">
+        <div className="flex max-w-3xl flex-col">
           <img
-            className="inline-block h-14 w-14 rounded-full mb-3"
+            className="mb-3 inline-block h-14 w-14 rounded-full"
             src="https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"
             alt=""
           />

diff --git a/app/routes/_layout._index/ProjectCard.tsx b/app/routes/_layout._index/ProjectCard.tsx
@@ -12,10 +12,10 @@ export const ProjectCard = (props: ProjectCardProps) => {
   const { title, href, description, logo, linkText } = props;
 
   return (
-    <article className="flex flex-col items-start p-6 rounded-md group relative border hover:bg-background-2">
-      <div className="max-w-xl flex flex-col w-full h-full justify-between">
+    <article className="group relative flex flex-col items-start rounded-md border p-6 hover:bg-background-2">
+      <div className="flex h-full w-full max-w-xl flex-col justify-between">
         <div>
-          <div className="h-10 w-10 rounded-full flex items-center bg-foreground p-2.5 justify-center text-2xl">
+          <div className="flex h-10 w-10 items-center justify-center rounded-full bg-foreground p-2.5 text-2xl">
             {logo}
           </div>
           <h3 className="mt-3 text-xl font-bold leading-6 text-card-foreground">
@@ -29,7 +29,7 @@ export const ProjectCard = (props: ProjectCardProps) => {
           </p>
         </div>
         <div className="mt-6 flex items-center gap-x-4">
-          <div className="text-sm leading-6 flex gap-2 items-center font-semibold text-card-foreground">
+          <div className="flex items-center gap-2 text-sm font-semibold leading-6 text-card-foreground">
             <LinkIcon className="h-4 w-4" />
             {linkText}
           </div>

diff --git a/app/routes/_layout._index/Projects.tsx b/app/routes/_layout._index/Projects.tsx
@@ -40,7 +40,7 @@ export const Projects = () => {
         <CogIcon className="h-6 w-6 flex-none" />
         <span className="ml-3">Projects</span>
       </h2>
-      <div className="flex flex-col gap-4 mt-6">
+      <div className="mt-6 flex flex-col gap-4">
         {cards.map((card) => (
           <ProjectCard key={card.id} {...card} />
         ))}

diff --git a/app/routes/_layout._index/TechCloud.tsx b/app/routes/_layout._index/TechCloud.tsx
@@ -73,7 +73,7 @@ export const TechCloud = () => {
     <Container className="bg-background text-foreground">
       <Container.Inner>
         <div id="tech" />
-        <h2 className="flex text-sm font-semibold mb-6">
+        <h2 className="mb-6 flex text-sm font-semibold">
           <BeakerIcon className="h-6 w-6 flex-none" />
           <span className="ml-3">Tech</span>
         </h2>

diff --git a/app/routes/_layout._index/Work.tsx b/app/routes/_layout._index/Work.tsx
@@ -37,7 +37,7 @@ export const Work = () => {
   ];
 
   return (
-    <div className="bg-card text-card-foreground basis-80 shrink-0 grow">
+    <div className="shrink-0 grow basis-80 bg-card text-card-foreground">
       <h2 className="flex text-sm font-semibold">
         <BriefcaseIcon className="h-6 w-6 flex-none" />
         <span className="ml-3">Work</span>
@@ -49,7 +49,7 @@ export const Work = () => {
       </ol>
       <Link
         href="/cv"
-        className="inline-flex items-center gap-2.5 px-3 rounded-md font-bold py-2 mt-6 bg-primary text-primary-foreground hover:bg-primary/90"
+        className="mt-6 inline-flex items-center gap-2.5 rounded-md bg-primary px-3 py-2 font-bold text-primary-foreground hover:bg-primary/90"
       >
         Go to CV
         <ArrowRightIcon className="h-4 w-4" />

diff --git a/app/routes/_layout._index/route.tsx b/app/routes/_layout._index/route.tsx
@@ -14,7 +14,7 @@ export default function Home() {
         <Container.Inner>
           <div
             id="projects"
-            className="flex flex-col lg:flex-row gap-12 justify-between"
+            className="flex flex-col justify-between gap-12 lg:flex-row"
           >
             <Projects />
             <Work />

diff --git a/app/routes/_layout/Header.tsx b/app/routes/_layout/Header.tsx
@@ -13,7 +13,7 @@ const Header = () => {
     <header className="bg-background">
       <nav className="mx-auto flex max-w-7xl p-6 md:px-8" aria-label="Global">
         <div className="flex flex-1 md:justify-center">
-          <div className="hidden md:flex md:gap-x-12 items-center">
+          <div className="hidden items-center md:flex md:gap-x-12">
             {navigationData.map((item) => (
               <Link
                 key={item.name}

diff --git a/app/routes/cv/route.tsx b/app/routes/cv/route.tsx
@@ -1,6 +1,6 @@
 export default function CV() {
   return (
-    <div className="px-11 py-10 grid md:grid-cols-[2.9fr_1.1fr] gap-5 mx-auto max-w-7xl">
+    <div className="mx-auto grid max-w-7xl gap-5 px-11 py-10 md:grid-cols-[2.9fr_1.1fr]">
       <div className="flex flex-col gap-2">
         <h1 className="text-4xl font-bold">Gyles Fohl</h1>
         <p className="text-lg">Senior Software Engineer</p>
@@ -12,7 +12,7 @@ export default function CV() {
         </p>
       </div>
 
-      <ul className="text-sm font-bold self-end">
+      <ul className="self-end text-sm font-bold">
         <li>[email protected]</li>
         <li>linkedin.com/in/gylesfohl</li>
         <li>github.com/Burzmalian</li>
@@ -21,17 +21,17 @@ export default function CV() {
       </ul>
 
       <div>
-        <h2 className="font-bold text-lg border-b text-indigo-700 border-indigo-600 mb-2">
+        <h2 className="mb-2 border-b border-indigo-600 text-lg font-bold text-indigo-700">
           Experience
         </h2>
         <div className="mb-3">
           <h3 className="text-lg">
             <strong>Microsoft</strong> - Senior Software Engineer
           </h3>
-          <p className="text-xs mb-1.5">
+          <p className="mb-1.5 text-xs">
             July 2020 - July 2024, Minneapolis MN
           </p>
-          <ul className="list-disc text-sm pl-6 flex flex-col gap-1.5">
+          <ul className="flex list-disc flex-col gap-1.5 pl-6 text-sm">
             <li>
               As part of the Bing Pros team, I led UX efforts in our Bing Search
               Answer. Creating A/B testing, telemetry workflows, and improved
@@ -66,8 +66,8 @@ export default function CV() {
           <h3 className="text-lg">
             <strong>Thomson Reuters</strong> - Senior Web Engineer
           </h3>
-          <p className="text-xs mb-1.5">Dec 2012 - July 2020, Eagan MN</p>
-          <ul className="list-disc text-sm pl-6 flex flex-col gap-1.5">
+          <p className="mb-1.5 text-xs">Dec 2012 - July 2020, Eagan MN</p>
+          <ul className="flex list-disc flex-col gap-1.5 pl-6 text-sm">
             <li>
               Built a React based component library/design system implemented in
               Adobe Experience Manager.
@@ -93,8 +93,8 @@ export default function CV() {
           <h3 className="text-lg">
             <strong>J. Murphy & Associates</strong> - Web Developer
           </h3>
-          <p className="text-xs mb-1.5">Nov 2011 - Dec 2012</p>
-          <ul className="list-disc text-sm pl-6 flex flex-col gap-1">
+          <p className="mb-1.5 text-xs">Nov 2011 - Dec 2012</p>
+          <ul className="flex list-disc flex-col gap-1 pl-6 text-sm">
             <li>Programmed custom WordPress themes and plugins.</li>
             <li>Developed responsive sites true to given designs.</li>
             <li>
@@ -105,10 +105,10 @@ export default function CV() {
         </div>
       </div>
       <div>
-        <h2 className="font-bold text-lg border-b text-indigo-700 border-indigo-600 mb-2">
+        <h2 className="mb-2 border-b border-indigo-600 text-lg font-bold text-indigo-700">
           Skills
         </h2>
-        <ul className="text-sm flex flex-col gap-1.5 mb-4">
+        <ul className="mb-4 flex flex-col gap-1.5 text-sm">
           <li>Typescript/Javascript</li>
           <li>HTML5</li>
           <li>CSS/Sass/Less/PostCSS</li>
@@ -129,7 +129,7 @@ export default function CV() {
           <li>Technical SEO/Schema</li>
           <li>Telemetry Integrations</li>
         </ul>
-        <h2 className="font-bold text-lg border-b text-indigo-700 border-indigo-600 mb-2">
+        <h2 className="mb-2 border-b border-indigo-600 text-lg font-bold text-indigo-700">
           Education
         </h2>
         <p>University of Minnesota, Morris - Bachelor of Arts/Studio Art</p>

diff --git a/app/tr-rebranded-logo.svg b/app/tr-rebranded-logo.svg