From 8a4d039ffb53395648c240176bb7ee7cbdb401e0 Mon Sep 17 00:00:00 2001 From: Harish Mohan Raj Date: Mon, 15 Apr 2024 13:34:22 +0530 Subject: [PATCH] Polishing --- app/src/client/App.tsx | 22 +++++++--- app/src/client/components/Footer.tsx | 35 ++++++++++++++++ app/src/client/landing-page/LandingPage.tsx | 41 ++----------------- .../client/landing-page/contentSections.ts | 6 +-- 4 files changed, 57 insertions(+), 47 deletions(-) create mode 100644 app/src/client/components/Footer.tsx diff --git a/app/src/client/App.tsx b/app/src/client/App.tsx index ee57ddd..8262653 100644 --- a/app/src/client/App.tsx +++ b/app/src/client/App.tsx @@ -5,6 +5,7 @@ import AppNavBar from './components/AppNavBar'; import ServerNotRechableComponent from './components/ServerNotRechableComponent'; import LoadingComponent from './components/LoadingComponent'; import TosAndMarketingEmailsModal from './components/TosAndMarketingEmailsModal'; +import Footer from './components/Footer'; import { useMemo, useEffect, ReactNode, useState } from 'react'; import { useLocation } from 'react-router-dom'; @@ -32,9 +33,10 @@ export default function App({ children }: { children: ReactNode }) { const shouldDisplayAppNavBar = useMemo(() => { return ( - location.pathname !== '/' && - location.pathname !== '/login' && - location.pathname !== '/signup' + location.pathname !== '/' + // && + // location.pathname !== '/login' && + // location.pathname !== '/signup' ); }, [location]); @@ -114,9 +116,9 @@ export default function App({ children }: { children: ReactNode }) { )} ) : ( - <> +
{shouldDisplayAppNavBar && } -
+
{isError ? ( children ) : isLoading ? ( @@ -133,7 +135,15 @@ export default function App({ children }: { children: ReactNode }) { )) )}
- +
+
+
+

+ © 2024 airt. All rights reserved. +

+
+
+
)}
diff --git a/app/src/client/components/Footer.tsx b/app/src/client/components/Footer.tsx new file mode 100644 index 0000000..d4e9152 --- /dev/null +++ b/app/src/client/components/Footer.tsx @@ -0,0 +1,35 @@ +import { footerNavigation } from '../landing-page/contentSections'; + +const Footer = () => { + return ( +
+
+
+
+

+ Company +

+ +
+
+
+
+ ); +}; + +export default Footer; diff --git a/app/src/client/landing-page/LandingPage.tsx b/app/src/client/landing-page/LandingPage.tsx index d5dd79d..81e5812 100644 --- a/app/src/client/landing-page/LandingPage.tsx +++ b/app/src/client/landing-page/LandingPage.tsx @@ -17,7 +17,7 @@ import { } from './contentSections'; import DropdownUser from '../components/DropdownUser'; import { UserMenuItems } from '../components/UserMenuItems'; -import FreeTrialButton from '../components/FreeTrialButton'; +import Footer from '../components/Footer'; import UserActionButton from '../components/UserActionButton'; export default function LandingPage() { @@ -389,7 +389,7 @@ export default function LandingPage() { {/* Footer */} -
+ {/*
-
+
*/} ); } diff --git a/app/src/client/landing-page/contentSections.ts b/app/src/client/landing-page/contentSections.ts index 6564ba2..084e2da 100644 --- a/app/src/client/landing-page/contentSections.ts +++ b/app/src/client/landing-page/contentSections.ts @@ -113,8 +113,8 @@ export const footerNavigation = { { name: 'Blog', href: BLOG_URL }, ], company: [ - { name: 'About', href: 'https://airt.ai/' }, - { name: 'Privacy', href: 'https://captn.ai/privacy' }, - { name: 'Terms of Service', href: 'https://captn.ai/toc' }, + { name: 'airt', href: 'https://airt.ai/' }, + { name: 'Privacy', href: '/privacy' }, + { name: 'Terms of Service', href: '/toc' }, ], };