From 045871978727e0b927402f8cc3dfb5541e960ab8 Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Tue, 13 Jun 2023 15:47:57 +0100
Subject: [PATCH] Add new menu item indicator

---
 src/components/AccountSidebar.astro      | 147 ++++++++++++++---------
 src/components/Activity/ActivityPage.tsx |  13 --
 2 files changed, 88 insertions(+), 72 deletions(-)

diff --git a/src/components/AccountSidebar.astro b/src/components/AccountSidebar.astro
index b1fce9282..b4f3ef4e5 100644
--- a/src/components/AccountSidebar.astro
+++ b/src/components/AccountSidebar.astro
@@ -9,48 +9,52 @@ export interface Props {
 }
 
 const sidebarLinks = [
-    {
-        href: '/account',
-        title: 'Activity',
-        id: 'activity',
-        icon: {
-            glyph: 'analytics',
-            classes: 'h-3 w-4',
-        }
+  {
+    href: '/account',
+    title: 'Activity',
+    id: 'activity',
+    isNew: false,
+    icon: {
+      glyph: 'analytics',
+      classes: 'h-3 w-4',
     },
-    {
-        href: '/account/road-card',
-        title: 'Card',
-        id: 'road-card',
-        icon: {
-            glyph: 'badge',
-            classes: 'h-4 w-4',
-        }
+  },
+  {
+    href: '/account/road-card',
+    title: 'Card',
+    id: 'road-card',
+    isNew: true,
+    icon: {
+      glyph: 'badge',
+      classes: 'h-4 w-4',
     },
-    {
-        href: '/account/update-profile',
-        title: 'Profile',
-        id: 'profile',
-        icon: {
-            glyph: 'user',
-            classes: 'h-4 w-4',
-        }
+  },
+  {
+    href: '/account/update-profile',
+    title: 'Profile',
+    id: 'profile',
+    isNew: false,
+    icon: {
+      glyph: 'user',
+      classes: 'h-4 w-4',
     },
-    {
-        href: '/account/update-password',
-        title: 'Security',
-        id: 'change-password',
-        icon: {
-            glyph: 'security',
-            classes: 'h-4 w-4'
-        }
+  },
+  {
+    href: '/account/update-password',
+    title: 'Security',
+    id: 'change-password',
+    isNew: false,
+    icon: {
+      glyph: 'security',
+      classes: 'h-4 w-4',
     },
+  },
 ];
 ---
 
 <div class='relative mb-5 block border-b p-4 shadow-inner md:hidden'>
   <button
-    class='flex h-10 w-full items-center justify-between rounded-md border bg-white px-2 text-center text-gray-900 text-sm font-medium'
+    class='flex h-10 w-full items-center justify-between rounded-md border bg-white px-2 text-center text-sm font-medium text-gray-900'
     id='settings-menu'
   >
     {activePageTitle}
@@ -61,42 +65,67 @@ const sidebarLinks = [
     class='absolute left-0 right-0 z-10 mt-1 hidden space-y-1.5 bg-white p-2 shadow-lg'
   >
     {
-      sidebarLinks.map((sidebarLink) => (
-        <li>
-          <a
-            href={sidebarLink.href}
-            class={`flex items-center w-full rounded px-3 py-1.5 text-slate-900 hover:bg-slate-200 text-sm ${
-              activePageId === sidebarLink.id ? 'bg-slate-100' : ''
-            }`}
-          >
-              <AstroIcon icon={sidebarLink.icon.glyph} class={`${sidebarLink.icon.classes} mr-2`} />
+      sidebarLinks.map((sidebarLink) => {
+        const isActive = activePageId === sidebarLink.id;
+
+        return (
+          <li>
+            <a
+              href={sidebarLink.href}
+              class={`flex w-full items-center rounded px-3 py-1.5 text-sm text-slate-900 hover:bg-slate-200 ${
+                isActive ? 'bg-slate-100' : ''
+              }`}
+            >
+              <AstroIcon
+                icon={sidebarLink.icon.glyph}
+                class={`${sidebarLink.icon.classes} mr-2`}
+              />
               {sidebarLink.title}
-          </a>
-        </li>
-      ))
+            </a>
+          </li>
+        );
+      })
     }
   </ul>
 </div>
 
 <div class='container flex min-h-screen items-stretch'>
   <!-- Start Desktop Sidebar -->
-  <aside class='hidden shrink-0 w-44 border-r border-slate-200 py-10 md:block'>
+  <aside class='hidden w-44 shrink-0 border-r border-slate-200 py-10 md:block'>
     <nav>
       <ul class='space-y-1'>
         {
-          sidebarLinks.map((sidebarLink) => (
-            <li>
-              <a
-                href={sidebarLink.href}
-                class={`font-regular flex w-full items-center gap-2 px-2 py-1.5 text-sm border-r-2 ${
-                  activePageId === sidebarLink.id ? 'text-black border-r-black bg-gray-100' : 'text-gray-500 border-r-transparent hover:border-r-gray-300'
-                }`}
-              >
-                <AstroIcon icon={sidebarLink.icon.glyph} class={`${sidebarLink.icon.classes} mr-0`} />
-                {sidebarLink.title}
-              </a>
-            </li>
-          ))
+          sidebarLinks.map((sidebarLink) => {
+            const isActive = activePageId === sidebarLink.id;
+
+            return (
+              <li>
+                <a
+                  href={sidebarLink.href}
+                  class={`font-regular flex w-full items-center border-r-2 px-2 py-1.5 text-sm ${
+                    isActive
+                      ? 'border-r-black bg-gray-100 text-black'
+                      : 'border-r-transparent text-gray-500 hover:border-r-gray-300'
+                  }`}
+                >
+                  <span class='flex flex-grow items-center'>
+                    <AstroIcon
+                      icon={sidebarLink.icon.glyph}
+                      class={`${sidebarLink.icon.classes} mr-2`}
+                    />
+                    {sidebarLink.title}
+                  </span>
+
+                  {sidebarLink.isNew && !isActive && (
+                    <span class='relative mr-1 flex items-center'>
+                      <span class='relative rounded-full bg-gray-200 p-1 text-xs' />
+                      <span class='absolute bottom-0 left-0 right-0 top-0 animate-ping rounded-full bg-gray-400 p-1 text-xs' />
+                    </span>
+                  )}
+                </a>
+              </li>
+            );
+          })
         }
       </ul>
     </nav>
diff --git a/src/components/Activity/ActivityPage.tsx b/src/components/Activity/ActivityPage.tsx
index 65c260782..851730d15 100644
--- a/src/components/Activity/ActivityPage.tsx
+++ b/src/components/Activity/ActivityPage.tsx
@@ -97,19 +97,6 @@ export function ActivityPage() {
 
         {(learningRoadmaps.length > 0 || learningBestPractices.length > 0) && (
           <>
-            <a
-              href="/account/road-card"
-              className="text-md group mb-7 hidden items-center text-red-600 hover:text-red-900 sm:flex"
-            >
-              <span class="mr-2 rounded-sm bg-red-600 px-1.5 py-0.5 text-xs font-medium uppercase text-white group-hover:bg-red-800">
-                New
-              </span>
-              <span className="mr-1 underline">
-                Share your progress with others using a{' '}
-                <span className="font-medium">#RoadCard</span>
-              </span>
-              <span>»</span>
-            </a>
             <h2 class="mb-3 text-xs uppercase text-gray-400">
               Continue Following
             </h2>