sidebar fix

solana-labs · Jul 15, 2023 · 29b9b81 · 29b9b81 · vercel · Jul 15, 2023
1 parent 17b8bd6
commit 29b9b81
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/apps/backend-serverless/prisma/seed.ts b/apps/backend-serverless/prisma/seed.ts
@@ -50,6 +50,7 @@ function generateMerchantRecords(count = 1): any[] {
                 kybInquiry: `inq_${i}`,
                 kybState: 'finished',
                 acceptedTermsAndConditions: true,
+                // acceptedPrivacyPolicy: true,
                 dismissCompleted: false,
                 active: true,
             };

diff --git a/apps/merchant-ui/src/components/DefaultLayoutNavigation.tsx b/apps/merchant-ui/src/components/DefaultLayoutNavigation.tsx
@@ -56,7 +56,6 @@ export function DefaultLayoutNavigation(props: Props) {
                 'flex-col',
                 'flex',
                 'h-full',
-                'justify-between',
                 'left-0',
                 'max-w-xs',
                 'px-6',
@@ -100,7 +99,7 @@ export function DefaultLayoutNavigation(props: Props) {
                 {isOk(merchantInfo) && (
                     <>
                         {merchantInfo.data.completed ? (
-                            <div className="mt-6">
+                            <div className="border-b mt-3 pb-3">
                                 <DefaultLayoutNavigationLink href="/payments" icon={<ReceiptLong />} text="Payments" />
                                 <DefaultLayoutNavigationLink
                                     href="/refunds"
@@ -112,7 +111,7 @@ export function DefaultLayoutNavigation(props: Props) {
                                 <DefaultLayoutNavigationLink href="/support" icon={<Support />} text="Support" />
                             </div>
                         ) : (
-                            <div className="mt-6">
+                            <div className="mt-3 pb-3">
                                 <DefaultLayoutNavigationLink
                                     href="/getting-started"
                                     icon={<Flag />}
@@ -124,8 +123,7 @@ export function DefaultLayoutNavigation(props: Props) {
                     </>
                 )}
             </NavigationMenu.List>
-            <NavigationMenu.List className="pr-6">
-                <DefaultLayoutNavigationExternalLink href="/docs" icon={<Folder />} text="Documentation" />
+            <NavigationMenu.List className="pr-6 border-b mt-3 pb-3">
                 <DefaultLayoutNavigationExternalLink
                     className="bg-slate-600"
                     href="/termsofservice"
@@ -138,10 +136,17 @@ export function DefaultLayoutNavigation(props: Props) {
                     icon={<RuleDataQuality />}
                     text="Privacy Policy"
                 />
+                <DefaultLayoutNavigationExternalLink
+                    href="https://shopifydocs.solanapay.com"
+                    icon={<Folder />}
+                    text="Documentation"
+                />
+            </NavigationMenu.List>
+            <NavigationMenu.List className="pr-6 mt-3 mb-3">
                 <button
                     onClick={logout}
                     className={twMerge(
-                        'gap-x-4',
+                        'gap-x-3',
                         'group',
                         'grid',
                         'items-center',

diff --git a/apps/merchant-ui/src/components/DefaultLayoutNavigationExternalLink.tsx b/apps/merchant-ui/src/components/DefaultLayoutNavigationExternalLink.tsx
@@ -2,8 +2,6 @@ import * as NavigationMenu from '@radix-ui/react-navigation-menu';
 import { cloneElement } from 'react';
 import { twMerge } from 'tailwind-merge';
 
-import { OpenInNew } from './icons/OpenInNew';
-
 interface Props {
     className?: string;
     href: string;
@@ -16,7 +14,7 @@ export function DefaultLayoutNavigationExternalLink(props: Props) {
         <NavigationMenu.Item>
             <NavigationMenu.Link
                 className={twMerge(
-                    'gap-x-4',
+                    'gap-x-3',
                     'group',
                     'grid-cols-[24px,1fr,max-content]',
                     'grid',
@@ -33,7 +31,7 @@ export function DefaultLayoutNavigationExternalLink(props: Props) {
                     className: twMerge('fill-slate-400', 'h-6', 'transition-colors', 'w-6', props.icon.props.className),
                 })}
                 <div className="transition-all group-hover:font-semibold">{props.text}</div>
-                <OpenInNew className="fill-indigo-500 h-6 w-6" />
+                {/* <OpenInNew className="fill-indigo-500 h-6 w-6" /> */}
             </NavigationMenu.Link>
         </NavigationMenu.Item>
     );

diff --git a/apps/merchant-ui/src/components/DefaultLayoutNavigationLink.tsx b/apps/merchant-ui/src/components/DefaultLayoutNavigationLink.tsx
@@ -1,8 +1,8 @@
-import { cloneElement } from 'react';
-import { twMerge } from 'tailwind-merge';
-import { useRouter } from 'next/router';
 import * as NavigationMenu from '@radix-ui/react-navigation-menu';
 import Link from 'next/link';
+import { useRouter } from 'next/router';
+import { cloneElement } from 'react';
+import { twMerge } from 'tailwind-merge';
 
 interface Props {
     className?: string;
@@ -21,7 +21,6 @@ export function DefaultLayoutNavigationLink(props: Props) {
             <NavigationMenu.Link asChild>
                 <Link
                     className={twMerge(
-                        'gap-x-4',
                         'gap-x-3',
                         'group',
                         'grid',