diff --git a/apps/total-typescript/public/assets/landing/exercise-screenshots@2x.png b/apps/total-typescript/public/assets/landing/exercise-screenshots@2x.png index 55761320dd..6ba1d6fd35 100644 Binary files a/apps/total-typescript/public/assets/landing/exercise-screenshots@2x.png and b/apps/total-typescript/public/assets/landing/exercise-screenshots@2x.png differ diff --git a/apps/total-typescript/public/assets/matt-in-new-studio@2x.jpg b/apps/total-typescript/public/assets/matt-in-new-studio@2x.jpg new file mode 100644 index 0000000000..97010417a1 Binary files /dev/null and b/apps/total-typescript/public/assets/matt-in-new-studio@2x.jpg differ diff --git a/apps/total-typescript/public/assets/wizard-in-a-cave@2x.png b/apps/total-typescript/public/assets/wizard-in-a-cave@2x.png index d2a333dd0f..f295fbd4b1 100644 Binary files a/apps/total-typescript/public/assets/wizard-in-a-cave@2x.png and b/apps/total-typescript/public/assets/wizard-in-a-cave@2x.png differ diff --git a/apps/total-typescript/src/components/app/layout.tsx b/apps/total-typescript/src/components/app/layout.tsx index 412c0f24ca..0585d81444 100644 --- a/apps/total-typescript/src/components/app/layout.tsx +++ b/apps/total-typescript/src/components/app/layout.tsx @@ -20,6 +20,7 @@ type LayoutProps = { footer?: React.ReactElement | null survey?: boolean children?: any + withNavLinks?: boolean } const Layout: FunctionComponent = ({ @@ -28,6 +29,7 @@ const Layout: FunctionComponent = ({ meta, noIndex, nav, + withNavLinks = true, footer, survey = true, }) => { @@ -94,7 +96,7 @@ const Layout: FunctionComponent = ({ {isFeedbackDialogOpen && feedbackComponent} - {nav ? nav : isNull(nav) ? null : } + {nav ? nav : isNull(nav) ? null : }
> = ({ className, containerClassName = 'flex items-stretch justify-between w-full h-full', isMinified = false, + withLinks = true, }) => { return ( <> @@ -49,7 +51,7 @@ const Navigation: React.FC> = ({ >
- +
@@ -65,9 +67,10 @@ const useAbilities = () => { type DesktopNavProps = { isMinified?: boolean + withLinks?: boolean } -const DesktopNav: React.FC = ({isMinified}) => { +const DesktopNav: React.FC = ({isMinified, withLinks}) => { const ability = useAbilities() const {status} = useSession() const {setIsFeedbackDialogOpen} = useFeedback() @@ -80,76 +83,82 @@ const DesktopNav: React.FC = ({isMinified}) => { const {subscriber, loadingSubscriber} = useConvertkit() + const isRoot = usePathname() === '/' + return (
-
    - {/*
    +
      + {/* */} - - - Pro - {' '} - Workshops {/* NEW INDICATOR */} - {/*
      */} - - } - // icon={KeyIcon} - /> - - - - - Book{' '} - - New - - - } - className="font-medium text-white" - /> -
    + + + Pro + {' '} + Workshops {/* NEW INDICATOR */} + {/*
    */} + + } + // icon={KeyIcon} + /> + + + + + Book{' '} + + New + + + } + className="font-medium text-white" + /> +
+ + )}
    {status === 'loading' ? null : } {status === 'unauthenticated' && ( @@ -187,14 +196,24 @@ const DesktopNav: React.FC = ({isMinified}) => { label="Log in" className="min-w-full sm:min-w-full lg:min-w-full lg:text-sm" /> - {!loadingSubscriber && !subscriber && ( + {isRoot ? ( + + ) : ( <> -