Merge pull request #34 from mscode07/dev

working on profile page

Author: mscode07

apps/X/app/(pages)/profile/page.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { HomeLeft } from "@/components/ui";
+import { HomeLeft, TopHeader } from "@/components/ui";
 import { UserInfo } from "@/components/ui/Profile/UserInfo";
 
 const page = () => {
@@ -11,7 +11,10 @@ const page = () => {
       </div>
       <div className="flex flex-grow">
         <div className="border border-y-0 custom:w-6/12 w-10/12">
-          <div>
+          <div className="relative">
+            <div className="sticky top-0 z-10 bg-black/70 backdrop-blur-2xl ">
+              <TopHeader />
+            </div>
             <UserInfo />
           </div>
         </div>

apps/X/app/lib/auth.ts

@@ -109,7 +109,7 @@ export const authOptions = {
               console.log("This is username", existingUser.username);
               return {
                 id: existingUser.id.toString(),
-                usernname: existingUser.username,
+                username: existingUser.username,
                 email: existingUser.email,
                 name: existingUser.name,
               };

apps/X/src/components/TopHeader.tsx

@@ -15,7 +15,7 @@ export const TopHeader = () => {
   return (
     <div>
       <div className="mt-3 flex items-center gap-5 cursor-pointer">
-        <div className=" rounded-full p-2 hover:bg-neutral-800 transition duration-300 m-2">
+        <div className=" rounded-full p-2 hover:bg-neutral-800 transition duration-300 m-2 ">
           <IoArrowBack className="text-xl" onClick={handleBackClick} />
         </div>
         <div>

apps/X/src/components/ui/Profile/UserInfo.tsx

@@ -14,6 +14,8 @@ interface UserDataProps {
   location: string;
   createdDate: string;
   bio: string;
+  username: string;
+  biolink: string;
 }
 export const UserInfo = () => {
   const { data: session } = useSession();
@@ -45,61 +47,63 @@ export const UserInfo = () => {
   return (
     <div>
       <div>
-        <div>
-          <TopHeader />
-        </div>
+        <div className=""></div>
         <div>
           <div
-            className="relative w-full h-64 bg-cover bg-center object-cover"
+            className="w-full h-64 bg-cover bg-center object-cover relative"
             style={{
               backgroundImage: `url('https://github.com/mscode07.png')`,
             }}
           >
-            <div>
+            <div className="absolute -bottom-16 left-4">
               <Avatar>
                 <AvatarImage
-                  src={session?.user?.image || ""}
-                  alt={session?.user?.name || "User"}
+                  src="https://github.com/mscode07.png"
+                  className="rounded-full h-36 w-36 border-black border-4 "
                 />
-                <AvatarFallback>{session?.user?.name?.[0]}</AvatarFallback>
+                <AvatarFallback></AvatarFallback>
               </Avatar>
             </div>
           </div>
-          <div className="mt-24 ml-3">
+          <div className="mt-20 ml-3">
             <p className="text-2xl font-bold">{session?.user?.name}</p>
             <p className="text-gray-500">@{session?.user?.username}</p>
           </div>
         </div>
         <div className="ml-3 mt-2 w-full">
           <p className="mb-3"></p>
           <div>
-            <div className="flex gap-2">
+            <div className="flex gap-4">
               <p className="flex items-center text-gray-500 gap-1">
                 <GrLocation className="text-xl" />
-                {userData?.[0]?.location || "Location"}
+                {userData?.[0]?.location ? userData?.[0]?.location : "N/A"}
               </p>
               <a
                 className="text-blue-500 flex items-center gap-1"
                 href="https://buymeacoffee.com/mscode07"
               >
-                <AiOutlineLink className="text-gray-500 text-xl" />{" "}
-                buymeacoffee.com/mscode07
+                <AiOutlineLink className="text-gray-500 text-xl hover:underline" />{" "}
+                {userData?.[0]?.biolink ? userData?.[0]?.biolink : "N/A"}
               </a>
               <p className="flex items-center text-gray-500 gap-1">
                 <PiBalloon className="text-xl font-bold" />
-                {userData?.[0]?.DOB || "DOB"}
+                {userData?.[0]?.DOB
+                  ? new Date(userData[0].DOB).toLocaleDateString("en-GB")
+                  : "N/A"}
               </p>
             </div>
             <p className="flex items-center text-gray-500 gap-2">
               <IoCalendarOutline className="text-lg" />{" "}
-              {userData?.[0]?.createdDate}
+              {userData?.[0]?.createdDate
+                ? new Date(userData[0].createdDate).toLocaleDateString("en-GB")
+                : "N/A"}
             </p>
-            <div className="flex gap-2 mt-2">
-              <div className="flex">
+            <div className="flex gap-2 mt-4">
+              <div className="flex hover:underline">
                 <p className="font-bold">2,147</p>
                 <span className="text-gray-500 ml-1 ">Following</span>
               </div>
-              <div className="flex">
+              <div className="flex hover:underline">
                 <p className="font-bold">3,605</p>
                 <span className="text-gray-500 ml-1">Followers</span>
               </div>

apps/X/src/components/ui/TopNavHome.tsx

@@ -3,7 +3,7 @@ export const TopHead = () => {
   return (
     <div>
       <div>
-        <div className="mt-3 flex items-center gap-5 cursor-pointer">
+        <div className="mt-3 flex items-center gap-5 cursor-pointer backdrop-blur-sm">
           <div className=" rounded-full p-2 hover:bg-neutral-800 transition duration-300 m-2"></div>
           <div>
             <p className="font-bold text-xl"></p>