Merge pull request #3 from lsbyerley/dev

Prod Deploy 20240520
lsbyerley · May 21, 2024 · 419dbf6 · 419dbf6
2 parents 09214a7 + b87e2d8
commit 419dbf6
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/app/root.tsx b/app/root.tsx
@@ -31,7 +31,7 @@ import {
 	Sheet,
 } from '#app/components/ui/sheet'
 import { EpicToaster } from '#app/components/ui/sonner.tsx'
-import { ThemeSwitch, useTheme } from '#app/routes/resources+/theme'
+import { ThemeSwitch, useTheme } from '#app/routes/resources+/theme-switch.js'
 import { getUserId, logout } from '#app/utils/auth.server.ts'
 import { ClientHintCheck, getHints } from '#app/utils/client-hints.tsx'
 import { prisma } from '#app/utils/db.server.ts'

diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx
@@ -1,9 +1,8 @@
 import { LinkedinIcon, GithubIcon } from "#app/components/icons.js"
 
-const Home = () => {
+const HeroOne = () => {
 	return (
-		<>
-			<section className="w-full py-12 md:py-24 lg:py-32 xl:py-48">
+		<section className="w-full py-12 md:py-24 lg:py-32 xl:py-48">
 				<div className="container px-4 md:px-6">
 					<div className="flex flex-col items-center space-y-4 text-center">
 						<div className="space-y-2">
@@ -21,6 +20,45 @@ const Home = () => {
 					</div>
 				</div>
 			</section>
+	)
+};
+
+export const HeroTwo = () => {
+	return (
+		<section className="w-full border-b py-12 md:py-24 lg:py-32">
+			<div className="container grid gap-6 px-4 md:px-6 lg:grid-cols-2 lg:gap-12 xl:gap-20">
+				<div className="flex flex-col items-start justify-center space-y-4">
+					<h1 className="text-4xl font-bold tracking-tighter sm:text-5xl md:text-6xl lg:text-7xl">
+						Lucas Byerley
+					</h1>
+					<h2 className="text-2xl font-medium text-gray-500 dark:text-gray-400 sm:text-3xl">
+						Senior Software Engineer | Sports & Web3 Enthusiast
+					</h2>
+					<p className="max-w-[600px] text-gray-500 dark:text-gray-400 md:text-xl">
+					I create clean, modern, and responsive web applications that
+								deliver exceptional user experiences.
+					</p>
+				</div>
+				<img
+					alt="Lucas Byerley"
+					className="mx-auto rounded-full object-cover"
+					height="400"
+					src="https://avatars.githubusercontent.com/u/3066258"
+					style={{
+						aspectRatio: '400/400',
+						objectFit: 'cover',
+					}}
+					width="400"
+				/>
+			</div>
+		</section>
+	)
+};
+
+const Home = () => {
+	return (
+		<>
+			<HeroOne />
 			<section
 				id="section-featuredprojects"
 				className="w-full bg-gray-100 py-12 dark:bg-gray-800 md:py-24 lg:py-32"

diff --git a/app/routes/resources+/theme.tsx → app/routes/resources+/theme-switch.tsx b/app/routes/resources+/theme.tsx → app/routes/resources+/theme-switch.tsx
@@ -70,7 +70,7 @@ export function ThemeSwitch({
 	}
 
 	return (
-		<fetcher.Form method="POST" {...getFormProps(form)} action='/resources/theme'>
+		<fetcher.Form method="POST" {...getFormProps(form)} action='/resources/theme-switch'>
 			<input type="hidden" name="theme" value={nextMode} />
 			<div className="flex gap-2">
 				<button
@@ -90,7 +90,7 @@ export function ThemeSwitch({
  */
 export function useOptimisticThemeMode() {
 	const fetchers = useFetchers()
-	const themeFetcher = fetchers.find(f => f.formAction === '/')
+	const themeFetcher = fetchers.find(f => f.formAction === '/resources/theme-switch')
 
 	if (themeFetcher && themeFetcher.formData) {
 		const submission = parseWithZod(themeFetcher.formData, {

diff --git a/app/utils/misc.tsx b/app/utils/misc.tsx
@@ -1,7 +1,7 @@
 import { useFormAction, useNavigation } from '@remix-run/react'
-import { useHydrated } from 'remix-utils/use-hydrated'
 import { clsx, type ClassValue } from 'clsx'
 import { useEffect, useMemo, useRef, useState } from 'react'
+import { useHydrated } from 'remix-utils/use-hydrated'
 import { useSpinDelay } from 'spin-delay'
 import { extendTailwindMerge } from 'tailwind-merge'
 import { extendedTheme } from './extended-theme.ts'