From 7ceff69f3949a45ea183a7420d8c57c881bf0b38 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 30 Mar 2022 14:59:26 -0700
Subject: [PATCH] Rearrange sidebar ordering

---
 web/components/nav/manifold-logo.tsx |  4 ++--
 web/components/nav/profile-menu.tsx  |  2 +-
 web/components/nav/sidebar.tsx       | 28 ++++++++++++++--------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/web/components/nav/manifold-logo.tsx b/web/components/nav/manifold-logo.tsx
index efe6358f..cead711c 100644
--- a/web/components/nav/manifold-logo.tsx
+++ b/web/components/nav/manifold-logo.tsx
@@ -15,9 +15,9 @@ export function ManifoldLogo(props: {
 
   return (
     <Link href={user ? '/home' : '/'}>
-      <a className={clsx('flex flex-shrink-0 flex-row gap-4', className)}>
+      <a className={clsx('group flex flex-shrink-0 flex-row gap-4', className)}>
         <img
-          className="transition-all hover:rotate-12"
+          className="transition-all group-hover:rotate-12"
           src={darkBackground ? '/logo-white.svg' : '/logo.svg'}
           width={45}
           height={45}
diff --git a/web/components/nav/profile-menu.tsx b/web/components/nav/profile-menu.tsx
index f404d06c..a35822a4 100644
--- a/web/components/nav/profile-menu.tsx
+++ b/web/components/nav/profile-menu.tsx
@@ -43,7 +43,7 @@ export function getNavigationOptions() {
 export function ProfileSummary(props: { user: User | undefined }) {
   const { user } = props
   return (
-    <Row className="group avatar items-center gap-4 py-6 text-gray-600">
+    <Row className="group avatar items-center gap-4 py-6 text-gray-600 group-hover:text-gray-900">
       <Avatar avatarUrl={user?.avatarUrl} username={user?.username} noLink />
 
       <div className="truncate text-left sm:w-32">
diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index 6df5e946..699e172f 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -11,7 +11,6 @@ import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { useFollowedFolds } from '../../hooks/use-fold'
 import { useUser } from '../../hooks/use-user'
-import { Spacer } from '../layout/spacer'
 import { ManifoldLogo } from './manifold-logo'
 import { MenuButton } from './menu'
 import { getNavigationOptions, ProfileSummary } from './profile-menu'
@@ -78,10 +77,21 @@ export default function Sidebar() {
 
   return (
     <nav aria-label="Sidebar" className="sticky top-4 divide-y divide-gray-300">
-      <div className="space-y-1 pb-8">
+      <div className="space-y-1 pb-6">
         <ManifoldLogo hideText />
-        <Spacer h={4} />
+      </div>
 
+      {user && (
+        <div>
+          <Link href={`/${user.username}`}>
+            <a className="group">
+              <ProfileSummary user={user} />
+            </a>
+          </Link>
+        </div>
+      )}
+
+      <div className="space-y-1 py-6">
         {navigation.map((item) => (
           <SidebarItem item={item} currentPage={currentPage} />
         ))}
@@ -92,17 +102,7 @@ export default function Sidebar() {
         />
       </div>
 
-      {user && (
-        <div>
-          <Link href={`/${user.username}`}>
-            <a>
-              <ProfileSummary user={user} />
-            </a>
-          </Link>
-        </div>
-      )}
-
-      <div className="pt-10">
+      <div className="pt-6">
         <SidebarItem
           item={{ name: 'Communities', href: '/folds', icon: UserGroupIcon }}
           currentPage={currentPage}