From 2629d63ab3a31d511b0b1b22173de27d93d10669 Mon Sep 17 00:00:00 2001
From: Victor <victor@sentryhealth.ca>
Date: Wed, 27 Sep 2023 00:13:05 -0400
Subject: [PATCH 1/6] first draft navbar and pages

---
 src/app/components/NavBar.tsx | 33 ++++++++++++++++++++++++++++-----
 src/app/landing/page.tsx      |  3 +++
 src/app/markets/page.tsx      |  3 +++
 src/app/trade/page.tsx        |  3 +++
 4 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 src/app/landing/page.tsx
 create mode 100644 src/app/markets/page.tsx
 create mode 100644 src/app/trade/page.tsx

diff --git a/src/app/components/NavBar.tsx b/src/app/components/NavBar.tsx
index 850aa1e3..3a0eedeb 100644
--- a/src/app/components/NavBar.tsx
+++ b/src/app/components/NavBar.tsx
@@ -1,16 +1,17 @@
 import React from "react";
 import Image from "next/image";
 import { FaRegMoon } from "react-icons/fa6";
+import Link from "next/link";
 
 // TODO: theme switching
 
 export function Navbar() {
   return (
-    <div className="col-span-12 navbar">
-      <div className="navbar-start">
-        <a
+    <div className="col-span-12 navbar p-0 min-h-6">
+      <div className="flex-none px-2 mx-2">
+        <Link
           href="/"
-          className="btn btn-ghost hover:bg-transparent no-underline text-xl p-0"
+          className="btn btn-ghost hover:bg-transparent no-underline text-xl p-0 join-item"
         >
           <Image
             src="/logo_icon.svg"
@@ -20,7 +21,29 @@ export function Navbar() {
             className="!my-0"
           />
           <span className="xs:invisible sm:visible uppercase">DeXter</span>
-        </a>
+        </Link>
+      </div>
+      <div className="flex-1 px-2 mx-2">
+        <div className="items-stretch hidden lg:flex">
+          <Link
+            className="btn btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-success hover:text-success uppercase"
+            href="/landing"
+          >
+            Landing
+          </Link>
+          <Link
+            className="btn btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-success hover:text-success uppercase"
+            href="/trade"
+          >
+            Trade
+          </Link>
+          <Link
+            className="btn btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-success hover:text-success uppercase"
+            href="/markets"
+          >
+            Markets
+          </Link>
+        </div>
       </div>
 
       <div className="navbar-end">
diff --git a/src/app/landing/page.tsx b/src/app/landing/page.tsx
new file mode 100644
index 00000000..526fe2c4
--- /dev/null
+++ b/src/app/landing/page.tsx
@@ -0,0 +1,3 @@
+export default function Landing() {
+  return <div className="col-span-full p-4">Landing</div>;
+}
diff --git a/src/app/markets/page.tsx b/src/app/markets/page.tsx
new file mode 100644
index 00000000..d9344c73
--- /dev/null
+++ b/src/app/markets/page.tsx
@@ -0,0 +1,3 @@
+export default function Markets() {
+  return <div className="col-span-full p-4">Markets</div>;
+}
diff --git a/src/app/trade/page.tsx b/src/app/trade/page.tsx
new file mode 100644
index 00000000..1ca881e6
--- /dev/null
+++ b/src/app/trade/page.tsx
@@ -0,0 +1,3 @@
+export default function Markets() {
+  return <div className="col-span-full p-4">Trade</div>;
+}

From 3d9bcd0ed85dcb24aec18b83c91a2f70969c2d6e Mon Sep 17 00:00:00 2001
From: Victor <victor@sentryhealth.ca>
Date: Wed, 4 Oct 2023 00:25:37 -0400
Subject: [PATCH 2/6] cleaned up nav

---
 src/app/components/NavBar.tsx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/app/components/NavBar.tsx b/src/app/components/NavBar.tsx
index 3a0eedeb..b84147dc 100644
--- a/src/app/components/NavBar.tsx
+++ b/src/app/components/NavBar.tsx
@@ -7,7 +7,7 @@ import Link from "next/link";
 
 export function Navbar() {
   return (
-    <div className="col-span-12 navbar p-0 min-h-6">
+    <div className="col-span-12 !py-0 navbar">
       <div className="flex-none px-2 mx-2">
         <Link
           href="/"
@@ -26,19 +26,13 @@ export function Navbar() {
       <div className="flex-1 px-2 mx-2">
         <div className="items-stretch hidden lg:flex">
           <Link
-            className="btn btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-success hover:text-success uppercase"
-            href="/landing"
-          >
-            Landing
-          </Link>
-          <Link
-            className="btn btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-success hover:text-success uppercase"
-            href="/trade"
+            className="btn btn-lg btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-accent hover:text-accent uppercase"
+            href="/"
           >
             Trade
           </Link>
           <Link
-            className="btn btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-success hover:text-success uppercase"
+            className="btn btn-lg btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-accent hover:text-accent uppercase"
             href="/markets"
           >
             Markets

From 6ab4738766395f941aa7fbb391897a62a87b16ac Mon Sep 17 00:00:00 2001
From: Victor <victor@sentryhealth.ca>
Date: Wed, 4 Oct 2023 00:26:44 -0400
Subject: [PATCH 3/6] removed theme switch

---
 src/app/components/NavBar.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/app/components/NavBar.tsx b/src/app/components/NavBar.tsx
index b84147dc..9402b03e 100644
--- a/src/app/components/NavBar.tsx
+++ b/src/app/components/NavBar.tsx
@@ -41,13 +41,6 @@ export function Navbar() {
       </div>
 
       <div className="navbar-end">
-        <div
-          className="btn mx-2 border-none"
-          style={{ height: "40px", minHeight: "40px" }}
-        >
-          <FaRegMoon className="h-6 w-6 text-secondary-content" />
-        </div>
-
         <radix-connect-button></radix-connect-button>
       </div>
     </div>

From 301db511db2f736d6a8e95df2928531c894e26f3 Mon Sep 17 00:00:00 2001
From: Victor <victor@sentryhealth.ca>
Date: Wed, 4 Oct 2023 00:37:57 -0400
Subject: [PATCH 4/6] fixed lint issue

---
 src/app/components/NavBar.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/components/NavBar.tsx b/src/app/components/NavBar.tsx
index 9402b03e..81c3c3e7 100644
--- a/src/app/components/NavBar.tsx
+++ b/src/app/components/NavBar.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import Image from "next/image";
-import { FaRegMoon } from "react-icons/fa6";
 import Link from "next/link";
 
 // TODO: theme switching

From a86ecfc4aa3b6294e88d1902e177fb99ae5491d8 Mon Sep 17 00:00:00 2001
From: Victor <victor@sentryhealth.ca>
Date: Wed, 4 Oct 2023 23:35:48 -0400
Subject: [PATCH 5/6] rm market, rm underline, padding tweaks

---
 src/app/components/NavBar.tsx | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/app/components/NavBar.tsx b/src/app/components/NavBar.tsx
index 81c3c3e7..1d478752 100644
--- a/src/app/components/NavBar.tsx
+++ b/src/app/components/NavBar.tsx
@@ -6,11 +6,11 @@ import Link from "next/link";
 
 export function Navbar() {
   return (
-    <div className="col-span-12 !py-0 navbar">
-      <div className="flex-none px-2 mx-2">
+    <div className="col-span-12 !py-0 px-3 navbar h-20">
+      <div className="flex-none">
         <Link
           href="/"
-          className="btn btn-ghost hover:bg-transparent no-underline text-xl p-0 join-item"
+          className="btn btn-ghost hover:bg-transparent no-underline hover:!no-underline text-xl join-item px-3"
         >
           <Image
             src="/logo_icon.svg"
@@ -19,26 +19,19 @@ export function Navbar() {
             height={40}
             className="!my-0"
           />
-          <span className="xs:invisible sm:visible uppercase">DeXter</span>
+          <span className="ml-6 pt-1 xs:invisible sm:visible hover:text-accent uppercase">DeXter</span>
         </Link>
       </div>
       <div className="flex-1 px-2 mx-2">
         <div className="items-stretch hidden lg:flex">
           <Link
-            className="btn btn-lg btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-accent hover:text-accent uppercase"
+            className="btn btn-lg h-20 btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-accent hover:text-accent uppercase"
             href="/"
           >
             Trade
           </Link>
-          <Link
-            className="btn btn-lg btn-ghost hover:!no-underline pt-2 border-t-0 border-x-0 border-b-4 border-transparent hover:border-accent hover:text-accent uppercase"
-            href="/markets"
-          >
-            Markets
-          </Link>
         </div>
       </div>
-
       <div className="navbar-end">
         <radix-connect-button></radix-connect-button>
       </div>

From 306759cd67f76a7cea02fa047af25d35483e7bab Mon Sep 17 00:00:00 2001
From: Victor <victor@sentryhealth.ca>
Date: Wed, 4 Oct 2023 23:56:35 -0400
Subject: [PATCH 6/6] fix prettier

---
 src/app/components/NavBar.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/components/NavBar.tsx b/src/app/components/NavBar.tsx
index 1d478752..eb536e0e 100644
--- a/src/app/components/NavBar.tsx
+++ b/src/app/components/NavBar.tsx
@@ -19,7 +19,9 @@ export function Navbar() {
             height={40}
             className="!my-0"
           />
-          <span className="ml-6 pt-1 xs:invisible sm:visible hover:text-accent uppercase">DeXter</span>
+          <span className="ml-6 pt-1 xs:invisible sm:visible hover:text-accent uppercase">
+            DeXter
+          </span>
         </Link>
       </div>
       <div className="flex-1 px-2 mx-2">