Update nesting of Button and Link components

The Link component is modified to be nested within the Button component in various JSX files. This change was made with the aid of the 'asChild' property, it ensures that the link remains operable even when wrapped by the button, improving the site's semantics and accessibility.

apps/web/app/(marketing)/_components/site-header-account-section.tsx

@@ -71,15 +71,15 @@ function AuthButtons() {
       <div className={'hidden space-x-0.5 md:flex'}>
         <ModeToggle className={textClassName} />
 
+        <Button asChild variant={'ghost'} className={textClassName}>
           <Link href={pathsConfig.auth.signIn}>
-          <Button variant={'ghost'} className={textClassName}>
             <Trans i18nKey={'auth:signIn'} />
-          </Button>
           </Link>
+        </Button>
       </div>
 
+      <Button asChild className="group" variant={'default'}>
         <Link href={pathsConfig.auth.signUp}>
-        <Button className="group" variant={'default'}>
           <Trans i18nKey={'auth:signUp'} />
 
           <ChevronRight
@@ -87,8 +87,8 @@ function AuthButtons() {
               'ml-1 h-4 w-4 transition-transform duration-500 group-hover:translate-x-1'
             }
           />
-        </Button>
         </Link>
+      </Button>
     </div>
   );
 }

apps/web/app/(marketing)/_components/site-navigation.tsx

@@ -70,7 +70,7 @@ function MobileDropdown() {
           const className = 'flex w-full h-full items-center';
 
           return (
-            <DropdownMenuItem key={item.path}>
+            <DropdownMenuItem key={item.path} asChild>
               <Link className={className} href={item.path}>
                 <Trans i18nKey={item.label} />
               </Link>

apps/web/app/(marketing)/faq/page.tsx

@@ -86,15 +86,15 @@ async function FAQPage() {
           </div>
 
           <div>
-            <Link href={'/contact'}>
             <Button variant={'outline'}>
+              <Link asChild href={'/contact'}>
                 <span>
                   <Trans i18nKey={'marketing:contactFaq'} />
                 </span>
 
                 <ArrowRight className={'ml-2 w-4'} />
-              </Button>
               </Link>
+            </Button>
           </div>
         </div>
       </div>

apps/web/app/(marketing)/page.tsx

@@ -347,14 +347,14 @@ function FeatureContainer(
 function MainCallToActionButton() {
   return (
     <div className={'flex space-x-2'}>
+      <Button asChild variant={'link'}>
         <Link href={'/docs'}>
-        <Button variant={'link'}>
           <Trans i18nKey={'common:documentation'} />
-        </Button>
         </Link>
+      </Button>
 
+      <Button asChild>
         <Link href={'/auth/sign-up'}>
-        <Button>
           <span className={'flex items-center space-x-0.5'}>
             <span>
               <Trans i18nKey={'common:getStarted'} />
@@ -367,8 +367,8 @@ function MainCallToActionButton() {
               }
             />
           </span>
-        </Button>
         </Link>
+      </Button>
     </div>
   );
 }

apps/web/app/auth/callback/error/page.tsx

@@ -39,7 +39,7 @@ function AuthCallbackErrorPage({ searchParams }: Params) {
         </Alert>
       </div>
 
-      <Button>
+      <Button asChild>
         <Link href={signInPath}>
           <Trans i18nKey={'auth:signIn'} />
         </Link>

apps/web/app/auth/password-reset/page.tsx

@@ -31,11 +31,11 @@ function PasswordResetPage() {
         <PasswordResetRequestContainer redirectPath={redirectPath} />
 
         <div className={'flex justify-center text-xs'}>
+          <Button asChild variant={'link'} size={'sm'}>
             <Link href={signIn}>
-            <Button variant={'link'} size={'sm'}>
               <Trans i18nKey={'auth:passwordRecoveredQuestion'} />
-            </Button>
             </Link>
+          </Button>
         </div>
       </div>
     </>

apps/web/app/auth/sign-in/page.tsx

@@ -33,11 +33,11 @@ function SignInPage() {
       <SignInMethodsContainer paths={paths} providers={authConfig.providers} />
 
       <div className={'flex justify-center'}>
+        <Button asChild variant={'link'} size={'sm'}>
           <Link href={pathsConfig.auth.signUp}>
-          <Button variant={'link'} size={'sm'}>
             <Trans i18nKey={'auth:doNotHaveAccountYet'} />
-          </Button>
           </Link>
+        </Button>
       </div>
     </>
   );

apps/web/app/auth/sign-up/page.tsx

@@ -45,11 +45,11 @@ function SignUpPage({ searchParams }: Props) {
       />
 
       <div className={'justify-centers flex'}>
+        <Button asChild variant={'link'} size={'sm'}>
           <Link href={pathsConfig.auth.signIn}>
-          <Button variant={'link'} size={'sm'}>
             <Trans i18nKey={'auth:alreadyHaveAnAccount'} />
-          </Button>
           </Link>
+        </Button>
       </div>
     </>
   );

apps/web/app/join/page.tsx

@@ -119,12 +119,12 @@ function InviteNotFoundOrExpired() {
         <Trans i18nKey={'teams:inviteNotFoundOrExpiredDescription'} />
       </p>
 
+      <Button asChild className={'w-full'} variant={'outline'}>
         <Link href={pathsConfig.app.home}>
-        <Button className={'w-full'} variant={'outline'}>
           <ArrowLeft className={'mr-2 w-4'} />
           <Trans i18nKey={'teams:backToHome'} />
-        </Button>
         </Link>
+      </Button>
     </div>
   );
 }

apps/web/app/not-found.tsx

@@ -56,13 +56,13 @@ const NotFoundPage = async () => {
               </p>
             </div>
 
+            <Button asChild variant={'outline'}>
               <Link href={'/'}>
-              <Button variant={'outline'}>
                 <ArrowLeft className={'mr-2 h-4'} />
 
                 <Trans i18nKey={'common:backToHomePage'} />
-              </Button>
               </Link>
+            </Button>
           </div>
         </div>
       </div>

packages/features/auth/src/components/password-sign-in-form.tsx

@@ -88,16 +88,17 @@ export const PasswordSignInForm: React.FC<{
 
               <FormMessage />
 
-              <Link href={'/auth/password-reset'}>
               <Button
+                asChild
                 type={'button'}
                 size={'sm'}
                 variant={'link'}
                 className={'text-xs'}
               >
+                <Link href={'/auth/password-reset'}>
                   <Trans i18nKey={'auth:passwordForgottenQuestion'} />
-                </Button>
                 </Link>
+              </Button>
             </FormItem>
           )}
         />

packages/ui/src/makerkit/sidebar.tsx

@@ -164,14 +164,15 @@ export function SidebarItem({
   const size = collapsed ? 'icon' : 'sm';
 
   return (
-    <Link key={path} href={path}>
     <Button
+      asChild
       className={cn('flex w-full text-sm shadow-none', {
         'justify-start space-x-2': !collapsed,
       })}
       size={size}
       variant={variant}
     >
+      <Link key={path} href={path}>
         <If condition={collapsed} fallback={Icon}>
           <TooltipProvider>
             <Tooltip>
@@ -185,8 +186,8 @@ export function SidebarItem({
         </If>
 
         <span className={cn({ hidden: collapsed })}>{children}</span>
-      </Button>
       </Link>
+    </Button>
   );
 }