From 634af337569b41f3b6820e6cb1ee854e87129c0e Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Tue, 9 Apr 2024 22:40:51 +0100
Subject: [PATCH] Revamp UI for profile page

---
 .../UserPublicActivityHeatmap.tsx             | 48 ++++++++++-
 .../UserPublicProfileHeader.tsx               |  8 +-
 .../UserPublicProfilePage.tsx                 | 36 ++++----
 .../UserPublicProgresses.tsx                  | 83 ++++++++++---------
 4 files changed, 110 insertions(+), 65 deletions(-)

diff --git a/src/components/UserPublicProfile/UserPublicActivityHeatmap.tsx b/src/components/UserPublicProfile/UserPublicActivityHeatmap.tsx
index f07305050..8a36c4661 100644
--- a/src/components/UserPublicProfile/UserPublicActivityHeatmap.tsx
+++ b/src/components/UserPublicProfile/UserPublicActivityHeatmap.tsx
@@ -9,6 +9,15 @@ import dayjs from 'dayjs';
 type UserActivityHeatmapProps = {
   activity: UserActivityCount;
 };
+
+const legends = [
+  { count: '1-2', color: 'bg-gray-200' },
+  { count: '3-4', color: 'bg-gray-300' },
+  { count: '5-9', color: 'bg-gray-500' },
+  { count: '10-19', color: 'bg-gray-600' },
+  { count: '20+', color: 'bg-gray-800' },
+];
+
 export function UserActivityHeatmap(props: UserActivityHeatmapProps) {
   const { activity } = props;
   const data = Object.entries(activity.activityCount).map(([date, count]) => ({
@@ -20,7 +29,16 @@ export function UserActivityHeatmap(props: UserActivityHeatmapProps) {
   const endDate = dayjs().toDate();
 
   return (
-    <>
+    <div className="rounded-lg border bg-white p-4">
+      <div className="-mx-4 mb-8 flex justify-between border-b px-4 pb-3">
+        <div className="">
+          <h2 className="mb-0.5 font-semibold">Activity</h2>
+          <p className="text-sm text-gray-500">
+            Progress updates over the past year
+          </p>
+        </div>
+        <span className="text-sm text-gray-400">Member since: June 2021</span>
+      </div>
       <CalendarHeatmap
         startDate={startDate}
         endDate={endDate}
@@ -51,7 +69,7 @@ export function UserActivityHeatmap(props: UserActivityHeatmapProps) {
           const formattedDate = formatActivityDate(value.date);
           return {
             'data-tooltip-id': 'user-activity-tip',
-            'data-tooltip-content': `${value.count} Progress Update on ${formattedDate}`,
+            'data-tooltip-content': `${value.count} Updates - ${formattedDate}`,
           };
         }}
       />
@@ -60,6 +78,30 @@ export function UserActivityHeatmap(props: UserActivityHeatmapProps) {
         id="user-activity-tip"
         className="!rounded-lg !bg-gray-900 !p-1 !px-2 !text-sm"
       />
-    </>
+
+      <div className="mt-4 flex items-center justify-between">
+        <span className="text-sm text-gray-400">
+          Number of topics marked as learning, or completed by day
+        </span>
+        <div className="flex items-center">
+          <span className="mr-2 text-xs text-gray-500">Less</span>
+          {legends.map((legend) => (
+            <div
+              key={legend.count}
+              className="flex items-center"
+              data-tooltip-id="user-activity-tip"
+              data-tooltip-content={`${legend.count} Updates`}
+            >
+              <div className={`h-3 w-3 ${legend.color} mr-1 rounded-sm`}></div>
+            </div>
+          ))}
+          <span className="ml-2 text-xs text-gray-500">More</span>
+          <ReactTooltip
+            id="user-activity-tip"
+            className="!rounded-lg !bg-gray-900 !p-1 !px-2 !text-sm"
+          />
+        </div>
+      </div>
+    </div>
   );
 }
diff --git a/src/components/UserPublicProfile/UserPublicProfileHeader.tsx b/src/components/UserPublicProfile/UserPublicProfileHeader.tsx
index d5911b30d..769e310af 100644
--- a/src/components/UserPublicProfile/UserPublicProfileHeader.tsx
+++ b/src/components/UserPublicProfile/UserPublicProfileHeader.tsx
@@ -12,7 +12,7 @@ export function UserPublicProfileHeader(props: UserPublicProfileHeaderProps) {
   const { headline, isAvailableForHire, isEmailVisible } = publicConfig!;
 
   return (
-    <div className="flex items-center gap-8">
+    <div className="flex items-center gap-6 container bg-white border p-8 rounded-xl">
       <img
         src={
           avatar
@@ -25,12 +25,12 @@ export function UserPublicProfileHeader(props: UserPublicProfileHeaderProps) {
 
       <div>
         {isAvailableForHire && (
-          <span className="mb-1 inline-block rounded-md bg-green-100 px-2 py-1 text-xs font-medium text-green-700">
+          <span className="mb-1 inline-block rounded-md bg-green-100 px-2 py-1 text-sm text-green-700">
             Available for hire
           </span>
         )}
-        <h1 className="text-2xl font-bold">{name}</h1>
-        <p className="mt-1 text-sm text-gray-500">{headline}</p>
+        <h1 className="text-3xl font-bold">{name}</h1>
+        <p className="mt-1 text-base text-gray-500">{headline}</p>
         <div className="mt-3 flex items-center gap-2">
           {links?.github && <UserLink href={links?.github} icon={Github} />}
           {links?.linkedin && (
diff --git a/src/components/UserPublicProfile/UserPublicProfilePage.tsx b/src/components/UserPublicProfile/UserPublicProfilePage.tsx
index a64e33ff9..be00d140d 100644
--- a/src/components/UserPublicProfile/UserPublicProfilePage.tsx
+++ b/src/components/UserPublicProfile/UserPublicProfilePage.tsx
@@ -16,25 +16,23 @@ export function UserPublicProfilePage(props: UserPublicProfilePageProps) {
   } = props;
 
   return (
-    <>
-      <PrivateProfileBanner
-        isOwnProfile={isOwnProfile}
-        profileVisibility={profileVisibility}
-      />
-      <section className="container mt-5 pb-10">
+    <div className="bg-gray-200/40">
+      <div className="container flex flex-col gap-8">
+        <PrivateProfileBanner
+          isOwnProfile={isOwnProfile}
+          profileVisibility={profileVisibility}
+        />
+
         <UserPublicProfileHeader userDetails={props!} />
-        <div className="mt-10">
-          <UserActivityHeatmap activity={activity!} />
-        </div>
-        <div className="mt-10">
-          <UserPublicProgresses
-            username={username!}
-            userId={userId!}
-            roadmaps={props.roadmaps}
-            publicConfig={props.publicConfig}
-          />
-        </div>
-      </section>
-    </>
+
+        <UserActivityHeatmap activity={activity!} />
+        <UserPublicProgresses
+          username={username!}
+          userId={userId!}
+          roadmaps={props.roadmaps}
+          publicConfig={props.publicConfig}
+        />
+      </div>
+    </div>
   );
 }
diff --git a/src/components/UserPublicProfile/UserPublicProgresses.tsx b/src/components/UserPublicProfile/UserPublicProgresses.tsx
index faea3df15..5378aba3d 100644
--- a/src/components/UserPublicProfile/UserPublicProgresses.tsx
+++ b/src/components/UserPublicProfile/UserPublicProgresses.tsx
@@ -24,19 +24,50 @@ export function UserPublicProgresses(props: UserPublicProgressesProps) {
     (roadmap) => roadmap.isCustomResource,
   );
 
+  // <UserPublicProgressStats
+  //                     updatedAt={roadmap.updatedAt}
+  //                     title={roadmap.title}
+  //                     totalCount={roadmap.total}
+  //                     doneCount={roadmap.done}
+  //                     learningCount={roadmap.learning}
+  //                     skippedCount={roadmap.skipped}
+  //                     resourceId={roadmap.id}
+  //                     resourceType="roadmap"
+  //                     roadmapSlug={roadmap.roadmapSlug}
+  //                     username={username!}
+  //                     isCustomResource={true}
+  //                     userId={userId}
+  //                   />
+
   return (
     <div>
-      {roadmapVisibility !== 'none' && (
-        <>
-          <h2 className="text-xs uppercase text-gray-400">My Skills</h2>
-          {roadmaps?.length === 0 ? (
-            <div className="mt-4 text-sm text-gray-500">
-              No skills added yet.
-            </div>
-          ) : (
-            <ul className="mt-4 grid grid-cols-2 gap-2 max-md:grid-cols-1">
+      {customRoadmapVisibility !== 'none' && customRoadmaps?.length > 0 && (
+        <div className='mb-5'>
+          <h2 className="mb-2 text-xs uppercase tracking-wide text-gray-400">
+            Roadmaps made by me
+          </h2>
+          <div className="grid grid-cols-3">
+            {customRoadmaps.map((roadmap, counter) => (
+              <a
+                target="_blank"
+                href={`/r/${roadmap.roadmapSlug}`}
+                key={roadmap.id + counter}
+                className="rounded-md border bg-white px-3 py-2 text-left text-sm shadow-sm transition-all hover:border-gray-300 hover:bg-gray-50"
+              >
+                {roadmap.title}
+              </a>
+            ))}
+          </div>
+        </div>
+      )}
+
+      <div>
+        {roadmapVisibility !== 'none' && (
+          <>
+            <h2 className="text-xs uppercase text-gray-400">My Skills</h2>
+            <ul className="">
               {roadmaps.map((roadmap, counter) => (
-                <li key={roadmap.id + counter}>
+                <li key={roadmap.id + counter} className="bg-white">
                   <UserPublicProgressStats
                     updatedAt={roadmap.updatedAt}
                     title={roadmap.title}
@@ -54,35 +85,9 @@ export function UserPublicProgresses(props: UserPublicProgressesProps) {
                 </li>
               ))}
             </ul>
-          )}
-        </>
-      )}
-
-      {customRoadmapVisibility !== 'none' && customRoadmaps?.length > 0 && (
-        <>
-          <h2 className="mt-6 text-xs uppercase text-gray-400">My Roadmaps</h2>
-          <ul className="mt-4 grid grid-cols-2 gap-2 max-md:grid-cols-1">
-            {customRoadmaps.map((roadmap, counter) => (
-              <li key={roadmap.id + counter}>
-                <UserPublicProgressStats
-                  updatedAt={roadmap.updatedAt}
-                  title={roadmap.title}
-                  totalCount={roadmap.total}
-                  doneCount={roadmap.done}
-                  learningCount={roadmap.learning}
-                  skippedCount={roadmap.skipped}
-                  resourceId={roadmap.id}
-                  resourceType="roadmap"
-                  roadmapSlug={roadmap.roadmapSlug}
-                  username={username!}
-                  isCustomResource={true}
-                  userId={userId}
-                />
-              </li>
-            ))}
-          </ul>
-        </>
-      )}
+          </>
+        )}
+      </div>
     </div>
   );
 }