From cb528f588ef110bc988931a8645d46a3e4dfc6dd Mon Sep 17 00:00:00 2001
From: jam-kt <jamesktorres2022@gmail.com>
Date: Mon, 4 Nov 2024 15:15:18 -0800
Subject: [PATCH 1/2] feat: homepage

---
 src/app/layout.tsx            |  2 +-
 src/app/page.tsx              |  5 +++++
 src/styles/example.module.css |  1 -
 src/styles/page.module.css    | 11 +++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)
 delete mode 100644 src/styles/example.module.css
 create mode 100644 src/styles/page.module.css

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 5f544c3..9e1bb51 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,7 +3,7 @@ import "./globals.css";
 
 //! Update metadata to match your project
 export const metadata: Metadata = {
-  title: "Create Next App",
+  title: "2024 TL Bootcamp - James",
   description: "Generated by create next app",
 };
 
diff --git a/src/app/page.tsx b/src/app/page.tsx
index ba5e808..7a24503 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,10 +1,15 @@
 import Navbar from "@/components/Navbar";
+import style from "@/styles/page.module.css";
 
 export default function Home() {
   return (
     <main>
       <Navbar />
       <h1>Home</h1>
+      <div className={style["about"]}>
+        <p>Hi! My name is James and I'm currently a 3rd year Computer Engineer.</p>
+        <p>Please make a merge conflict for me!</p>
+      </div>
     </main>
   );
 }
diff --git a/src/styles/example.module.css b/src/styles/example.module.css
deleted file mode 100644
index 56d4ddc..0000000
--- a/src/styles/example.module.css
+++ /dev/null
@@ -1 +0,0 @@
-/* DELETE ME */
diff --git a/src/styles/page.module.css b/src/styles/page.module.css
new file mode 100644
index 0000000..10b5313
--- /dev/null
+++ b/src/styles/page.module.css
@@ -0,0 +1,11 @@
+.about {
+    display:flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 20px;
+    background-color: rgba(4, 9, 30, 0.3);
+    border: 5px solid black;
+    border-radius: 10px;
+    border-style: double;
+}
\ No newline at end of file

From 8c6f8b5f412e104c7f5abe708c4787014285c7f8 Mon Sep 17 00:00:00 2001
From: jam-kt <jamesktorres2022@gmail.com>
Date: Mon, 4 Nov 2024 15:22:34 -0800
Subject: [PATCH 2/2] fix: escape character

---
 src/app/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 7a24503..b653362 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -7,7 +7,7 @@ export default function Home() {
       <Navbar />
       <h1>Home</h1>
       <div className={style["about"]}>
-        <p>Hi! My name is James and I'm currently a 3rd year Computer Engineer.</p>
+        <p>Hi! My name is James and I&apos;m currently a 3rd year Computer Engineer.</p>
         <p>Please make a merge conflict for me!</p>
       </div>
     </main>