From 5d624512df3e6dbd215a422cb0564ddb56a0b9dd Mon Sep 17 00:00:00 2001 From: James Wyndham Date: Thu, 15 Feb 2024 15:53:22 +0800 Subject: [PATCH] feature - first pass genericizing FE --- Frontend/app/(admin)/blogs/page.tsx | 4 +- Frontend/app/(admin)/pricing/page.tsx | 14 +- Frontend/app/(admin)/signup/page.tsx | 6 +- Frontend/app/layout.tsx | 25 +- Frontend/app/page.tsx | 18 +- Frontend/app/providers.js | 10 +- Frontend/components/Header.tsx | 83 ++-- Frontend/components/Spacer.tsx | 12 + Frontend/package.json | 2 +- Frontend/pages/LandingPage.tsx | 65 +++ Frontend/pages/LandingPageWaitingList.tsx | 159 +++++++ .../CenterAllignedWithVideoHero.tsx | 34 ++ .../HeroSections/SquaredBackgroundHero.tsx | 402 ++++++++++++++++++ Frontend/sections/HeroSections/index.ts | 6 + Frontend/sections/PageHeader.tsx | 2 +- .../sections/{HeroVideo.tsx => Video.tsx} | 4 +- Frontend/tailwind.config.ts | 2 +- 17 files changed, 767 insertions(+), 81 deletions(-) create mode 100644 Frontend/components/Spacer.tsx create mode 100644 Frontend/pages/LandingPage.tsx create mode 100644 Frontend/pages/LandingPageWaitingList.tsx create mode 100644 Frontend/sections/HeroSections/CenterAllignedWithVideoHero.tsx create mode 100644 Frontend/sections/HeroSections/SquaredBackgroundHero.tsx create mode 100644 Frontend/sections/HeroSections/index.ts rename Frontend/sections/{HeroVideo.tsx => Video.tsx} (91%) diff --git a/Frontend/app/(admin)/blogs/page.tsx b/Frontend/app/(admin)/blogs/page.tsx index 5ae41e7..cbe3e64 100644 --- a/Frontend/app/(admin)/blogs/page.tsx +++ b/Frontend/app/(admin)/blogs/page.tsx @@ -10,7 +10,7 @@ export default function BlogsPage() { .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()) .map((post) => ); return ( - <> +
{/* Page sections */} - +
); } diff --git a/Frontend/app/(admin)/pricing/page.tsx b/Frontend/app/(admin)/pricing/page.tsx index ea8a1c1..52dde22 100644 --- a/Frontend/app/(admin)/pricing/page.tsx +++ b/Frontend/app/(admin)/pricing/page.tsx @@ -26,25 +26,29 @@ export default function PricingPage() { }, []); return ( - <> +
{" "} -

+

Select a subscription plan for your team or try advanced functionality for free.

} /> -
+
{products.map((x, i) => ( @@ -52,7 +56,7 @@ export default function PricingPage() {
- +
); } diff --git a/Frontend/app/(admin)/signup/page.tsx b/Frontend/app/(admin)/signup/page.tsx index 47e5da3..d791170 100644 --- a/Frontend/app/(admin)/signup/page.tsx +++ b/Frontend/app/(admin)/signup/page.tsx @@ -3,7 +3,7 @@ import HeroHome from "@/sections/HeroHome"; import FeaturesBlocks from "@/sections/FeaturesBlocks"; import FeaturesZigZag from "@/sections/FeaturesZigzag"; import Newsletter from "@/sections/Newsletter/Newsletter"; -import HeroVideo from "@/sections/HeroVideo"; +import HeroVideo from "@/sections/Video"; import Aos from "aos"; import "aos/dist/aos.css"; import { useEffect } from "react"; @@ -20,7 +20,9 @@ export default function Home() { }); }, []); useEffect(() => { - document.getElementById("sign-up-modal")?.setAttribute("name", SourceModal.SignUp); + document + .getElementById("sign-up-modal") + ?.setAttribute("name", SourceModal.SignUp); document.getElementById("sign-up-modal")?.removeAttribute("price_id"); document.getElementById("sign-up-modal")?.click(); }, []); diff --git a/Frontend/app/layout.tsx b/Frontend/app/layout.tsx index 7476d5d..4d2a0b9 100644 --- a/Frontend/app/layout.tsx +++ b/Frontend/app/layout.tsx @@ -8,10 +8,7 @@ import Footer from "@/components/Footer"; import Header from "@/components/Header"; import { cookies } from "next/headers"; import { isAuthenticated } from "@/lib/auth"; -import Script from "next/script"; -import React from "react"; -import { PHProvider } from "./providers"; -import GoogleAnalytics from "@/components/GoogleAnalytics"; +import { GTagProvider, PHProvider } from "./providers"; import PrelineScript from "@/components/PrelineScript"; const raleway = Raleway({ @@ -37,23 +34,20 @@ export default async function RootLayout({ }) { const isUserLoggedIn = await isAuthenticated(cookies()); return ( - + - - {process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS ? ( - - ) : null} -
- {/* Page content */} + + +
+ {/*
- {/* Site header */}
-
{children}
-
+
*/} + {children} - - {/* Site footer */} -