From 30235c545f0b73ee93e6bfc0bc1c1961e767ce8e Mon Sep 17 00:00:00 2001 From: xn1cklas Date: Sat, 7 Sep 2024 17:37:50 +0200 Subject: [PATCH] chore: folder cleanup --- src/app/layout.tsx | 2 +- src/app/page.tsx | 6 +++++- .../{Layout/Public => }/BrandingMenu.tsx | 0 src/components/{Organization => }/Footer.tsx | 0 src/components/{Landing => }/LandingLayout.tsx | 18 +++++------------- src/components/Pricing.tsx | 7 +++++++ src/components/{Landing => }/Section.tsx | 0 .../{Landing => }/TopbarNavigation.tsx | 0 8 files changed, 18 insertions(+), 15 deletions(-) rename src/components/{Layout/Public => }/BrandingMenu.tsx (100%) rename src/components/{Organization => }/Footer.tsx (100%) rename src/components/{Landing => }/LandingLayout.tsx (75%) create mode 100644 src/components/Pricing.tsx rename src/components/{Landing => }/Section.tsx (100%) rename src/components/{Landing => }/TopbarNavigation.tsx (100%) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 984afab..637a13f 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,5 +1,5 @@ import { PropsWithChildren } from "react"; -import LandingLayout from "@/components/Landing/LandingLayout"; +import LandingLayout from "@/components/LandingLayout"; import type { Metadata } from "next"; import { twMerge } from "tailwind-merge"; import localFont from "next/font/local"; diff --git a/src/app/page.tsx b/src/app/page.tsx index 79af392..56536c6 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,6 +1,7 @@ "use client"; -import { Section } from "@/components/Landing/Section"; +import { Section } from "@/components/Section"; +import { Pricing } from "@/components/Pricing"; // import GetStartedButton from "@/components/Auth/GetStartedButton"; // import Button from "@/components/ui/atoms/button"; @@ -37,6 +38,9 @@ export default function Page() { +
+ +
); } diff --git a/src/components/Layout/Public/BrandingMenu.tsx b/src/components/BrandingMenu.tsx similarity index 100% rename from src/components/Layout/Public/BrandingMenu.tsx rename to src/components/BrandingMenu.tsx diff --git a/src/components/Organization/Footer.tsx b/src/components/Footer.tsx similarity index 100% rename from src/components/Organization/Footer.tsx rename to src/components/Footer.tsx diff --git a/src/components/Landing/LandingLayout.tsx b/src/components/LandingLayout.tsx similarity index 75% rename from src/components/Landing/LandingLayout.tsx rename to src/components/LandingLayout.tsx index 3eef629..e5a3453 100644 --- a/src/components/Landing/LandingLayout.tsx +++ b/src/components/LandingLayout.tsx @@ -1,22 +1,14 @@ "use client"; -import { Section } from "@/components/Landing/Section"; -import { TopbarNavigation } from "@/components/Landing/TopbarNavigation"; -import { BrandingMenu } from "@/components/Layout/Public/BrandingMenu"; -import Footer from "@/components/Organization/Footer"; -// import { motion } from "framer-motion"; +import { Section } from "@/components/Section"; +import { TopbarNavigation } from "@/components/TopbarNavigation"; +import { BrandingMenu } from "@/components/BrandingMenu"; +import Footer from "@/components/Footer"; import Link from "next/link"; -import { usePathname } from "next/navigation"; import Button from "@/components/ui/atoms/button"; -import { PropsWithChildren, useEffect } from "react"; +import { PropsWithChildren } from "react"; export default function Layout({ children }: PropsWithChildren) { - const pathname = usePathname(); - - useEffect(() => { - window.scroll(0, 0); - }, [pathname]); - return (
+

Pricing

+
+ ); +} diff --git a/src/components/Landing/Section.tsx b/src/components/Section.tsx similarity index 100% rename from src/components/Landing/Section.tsx rename to src/components/Section.tsx diff --git a/src/components/Landing/TopbarNavigation.tsx b/src/components/TopbarNavigation.tsx similarity index 100% rename from src/components/Landing/TopbarNavigation.tsx rename to src/components/TopbarNavigation.tsx