From 531f0c86c3326912fbb93140b50f931ebe1df286 Mon Sep 17 00:00:00 2001 From: Web Dev Cody Date: Fri, 2 Feb 2024 12:08:34 -0500 Subject: [PATCH] fix issue with header --- src/app/create/page.tsx | 17 ++-- src/app/footer.tsx | 3 +- src/app/header.tsx | 44 +++++----- src/app/mobile-nav.tsx | 174 ++++++++++++++++++++-------------------- 4 files changed, 120 insertions(+), 118 deletions(-) diff --git a/src/app/create/page.tsx b/src/app/create/page.tsx index ecfcbf8..61db74c 100644 --- a/src/app/create/page.tsx +++ b/src/app/create/page.tsx @@ -3,16 +3,15 @@ import { useAction, useMutation } from "convex/react"; import { api } from "../../../convex/_generated/api"; import { UploadButton, UploadFileResponse } from "@xixixao/uploadstuff/react"; -import "@xixixao/uploadstuff/react/styles.css"; import { useState } from "react"; -import { Button } from "@/components/ui/button"; +import { Button, buttonVariants } from "@/components/ui/button"; import Image from "next/image"; import { Label } from "@/components/ui/label"; import { Input } from "@/components/ui/input"; import { useToast } from "@/components/ui/use-toast"; import clsx from "clsx"; import { useRouter } from "next/navigation"; -import { getImageUrl } from "@/lib/utils"; +import { cn, getImageUrl } from "@/lib/utils"; import { UpgradeButton } from "@/components/upgrade-button"; import { Id } from "../../../convex/_generated/dataModel"; @@ -30,7 +29,7 @@ export default function CreatePage() { const [images, setImages] = useState[]>([]); return ( -
+

Create a Thumbnail Test

@@ -96,7 +95,7 @@ export default function CreatePage() { }} >

- + 0 && "Another"} Thumbnail Image { + return cn(buttonVariants()); + }} + content={(progress) => + progress === null || progress === 0 + ? `Choose File` + : "Uploading..." + } uploadUrl={generateUploadUrl} fileTypes={["image/*"]} onUploadComplete={async (uploaded: UploadFileResponse[]) => { diff --git a/src/app/footer.tsx b/src/app/footer.tsx index b064af9..4735c28 100644 --- a/src/app/footer.tsx +++ b/src/app/footer.tsx @@ -5,9 +5,10 @@ export function Footer() {
diff --git a/src/app/header.tsx b/src/app/header.tsx index 54b1161..b2fcf7b 100644 --- a/src/app/header.tsx +++ b/src/app/header.tsx @@ -14,6 +14,8 @@ export function Header() { return (
+ +
ThumbnailCritique - - -
- {!isLoading && ( +
+ {!isLoading && isAuthenticated && ( <> - {isAuthenticated && ( - <> - - Dashboard - - - Create - - - Explore - - - Following - - - Account - - - )} + + Dashboard + + + Create + + + Explore + + + Following + + + Account + )}
-
{!isLoading && ( <> @@ -68,6 +63,7 @@ export function Header() { {!isAuthenticated && } )} + diff --git a/src/app/mobile-nav.tsx b/src/app/mobile-nav.tsx index fefefed..df33ee4 100644 --- a/src/app/mobile-nav.tsx +++ b/src/app/mobile-nav.tsx @@ -38,95 +38,93 @@ export default function MobileNav({ const { signOut } = useClerk(); return ( - <> - + + - - -
- - - toggleOpen()} - className="flex w-full font-semibold capitalize" - > - Dashboard - - - - - toggleOpen()} - className="flex w-full font-semibold capitalize" - > - Create - - - - - toggleOpen()} - className="flex w-full font-semibold capitalize" - > - Explore - - - - - - toggleOpen()} - className="flex w-full font-semibold capitalize" - > - Following - - - - - - toggleOpen()} - className="flex w-full font-semibold capitalize" - > - Account - - - - - - { - signOut(); - toggleOpen(); - }} - className="flex w-full font-semibold capitalize" - > - Sign Out - - -
-
-
- +
+ + + toggleOpen()} + className="flex w-full font-semibold capitalize" + > + Dashboard + + + + + toggleOpen()} + className="flex w-full font-semibold capitalize" + > + Create + + + + + toggleOpen()} + className="flex w-full font-semibold capitalize" + > + Explore + + + + + + toggleOpen()} + className="flex w-full font-semibold capitalize" + > + Following + + + + + + toggleOpen()} + className="flex w-full font-semibold capitalize" + > + Account + + + + + + { + signOut(); + toggleOpen(); + }} + className="flex w-full font-semibold capitalize" + > + Sign Out + + +
+ + ); }