Merge pull request #234 from emrysal/feature/active-link-component

calcom · Jun 1, 2021 · e49a652 · e49a652 · vercel · Jun 1, 2021
2 parents 6e76cc3 + b2c25ba
commit e49a652
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 28 deletions.
diff --git a/components/ActiveLink.tsx b/components/ActiveLink.tsx
@@ -0,0 +1,23 @@
+import { useRouter } from 'next/router'
+import PropTypes from 'prop-types'
+import Link from 'next/link'
+import React, { Children } from 'react'
+
+const ActiveLink = ({ children, activeClassName, ...props }) => {
+  const { asPath } = useRouter()
+  const child = Children.only(children)
+  const childClassName = child.props.className || ''
+
+  const className =
+    asPath === props.href || asPath === props.as
+      ? `${childClassName} ${activeClassName}`.trim()
+      : childClassName
+
+  return <Link {...props}>{React.cloneElement(child, { className })}</Link>;
+}
+
+ActiveLink.defaultProps = {
+    activeClassName: 'active'
+} as Partial<Props>
+
+export default ActiveLink
diff --git a/components/Settings.tsx b/components/Settings.tsx
@@ -1,6 +1,6 @@
-import Link from 'next/link';
+import ActiveLink from '../components/ActiveLink';
 import { useRouter } from "next/router";
-import { UserCircleIcon, KeyIcon, CodeIcon } from '@heroicons/react/outline';
+import { UserCircleIcon, KeyIcon, CodeIcon, UserGroupIcon } from '@heroicons/react/outline';
 
 export default function SettingsShell(props) {
     const router = useRouter();
@@ -11,15 +11,11 @@ export default function SettingsShell(props) {
                     <div className="bg-white rounded-lg shadow">
                         <div className="divide-y divide-gray-200 lg:grid lg:grid-cols-12 lg:divide-y-0 lg:divide-x">
                             <aside className="py-6 lg:col-span-3">
-                                <nav className="space-y-1">
-                                    <Link href="/settings/profile">
-                                        <a className={router.pathname == "/settings/profile" ? "bg-blue-50 border-blue-500 text-blue-700 hover:bg-blue-50 hover:text-blue-700 group border-l-4 px-3 py-2 flex items-center text-sm font-medium" : "border-transparent text-gray-900 hover:bg-gray-50 hover:text-gray-900 group border-l-4 px-3 py-2 flex items-center text-sm font-medium"} aria-current="page">
-                                            <UserCircleIcon className={router.pathname == "/settings/profile" ? "text-blue-500 group-hover:text-blue-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6" : "text-gray-400 group-hover:text-gray-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6"} />
-                                            <span className="truncate">
-                                                Profile
-                                            </span>
-                                        </a>
-                                    </Link>
+                                <nav id="nav--settings" className="space-y-1">
+
+                                    <ActiveLink href="/settings/profile">
+                                        <a><UserCircleIcon /> Profile</a>
+                                    </ActiveLink>
 
                                     {/* <Link href="/settings/account">
                                         <a className={router.pathname == "/settings/account" ? "bg-blue-50 border-blue-500 text-blue-700 hover:bg-blue-50 hover:text-blue-700 group border-l-4 px-3 py-2 flex items-center text-sm font-medium" : "border-transparent text-gray-900 hover:bg-gray-50 hover:text-gray-900 group border-l-4 px-3 py-2 flex items-center text-sm font-medium"}>
@@ -33,23 +29,15 @@ export default function SettingsShell(props) {
                                         </a>
                                     </Link> */}
 
-                                    <Link href="/settings/password">
-                                        <a className={router.pathname == "/settings/password" ? "bg-blue-50 border-blue-500 text-blue-700 hover:bg-blue-50 hover:text-blue-700 group border-l-4 px-3 py-2 flex items-center text-sm font-medium" : "border-transparent text-gray-900 hover:bg-gray-50 hover:text-gray-900 group border-l-4 px-3 py-2 flex items-center text-sm font-medium"}>
-                                            <KeyIcon className={router.pathname == "/settings/password" ? "text-blue-500 group-hover:text-blue-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6" : "text-gray-400 group-hover:text-gray-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6"} />
-                                            <span className="truncate">
-                                                Password
-                                            </span>
-                                        </a>
-                                    </Link>
-
-                                    <Link href="/settings/embed">
-                                        <a className={router.pathname == "/settings/embed" ? "bg-blue-50 border-blue-500 text-blue-700 hover:bg-blue-50 hover:text-blue-700 group border-l-4 px-3 py-2 flex items-center text-sm font-medium" : "border-transparent text-gray-900 hover:bg-gray-50 hover:text-gray-900 group border-l-4 px-3 py-2 flex items-center text-sm font-medium"}>
-                                            <CodeIcon className={router.pathname == "/settings/embed" ? "text-blue-500 group-hover:text-blue-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6" : "text-gray-400 group-hover:text-gray-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6"} />
-                                            <span className="truncate">
-                                                Embed
-                                            </span>
-                                        </a>
-                                    </Link>
+                                    <ActiveLink href="/settings/password">
+                                        <a><KeyIcon /> Password</a>
+                                    </ActiveLink>
+                                    <ActiveLink href="/settings/embed">
+                                        <a><CodeIcon /> Embed</a>
+                                    </ActiveLink>
+                                    {/*<ActiveLink href="/settings/teams">
+                                        <a><UserGroupIcon /> Teams</a>
+                                    </ActiveLink>*/}
 
                                     {/* <Link href="/settings/notifications">
                                         <a className={router.pathname == "/settings/notifications" ? "bg-blue-50 border-blue-500 text-blue-700 hover:bg-blue-50 hover:text-blue-700 group border-l-4 px-3 py-2 flex items-center text-sm font-medium" : "border-transparent text-gray-900 hover:bg-gray-50 hover:text-gray-900 group border-l-4 px-3 py-2 flex items-center text-sm font-medium"}>

diff --git a/styles/components/activelink.css b/styles/components/activelink.css
@@ -0,0 +1,16 @@
+
+nav#nav--settings > a {
+    @apply border-transparent text-gray-900 hover:bg-gray-50 hover:text-gray-900 border-l-4 px-3 py-2 flex items-center text-sm font-medium;
+}
+
+nav#nav--settings > a svg {
+    @apply text-gray-400 group-hover:text-gray-500 flex-shrink-0 -ml-1 mr-3 h-6 w-6;
+}
+
+nav#nav--settings > a.active {
+    @apply bg-blue-50 border-blue-500 text-blue-700 hover:bg-blue-50 hover:text-blue-700;
+}
+
+nav#nav--settings > a.active svg {
+    @apply text-blue-500;
+}
diff --git a/styles/globals.css b/styles/globals.css
@@ -4,6 +4,7 @@
 
 @import './components/buttons.css';
 @import './components/spinner.css';
+@import './components/activelink.css';
 
 body {
     background-color: #f3f4f6;