diff --git a/apps/web/src/app/(content)/layout.tsx b/apps/web/src/app/(content)/layout.tsx index 83dc56c18..1a96b5c4a 100644 --- a/apps/web/src/app/(content)/layout.tsx +++ b/apps/web/src/app/(content)/layout.tsx @@ -1,6 +1,34 @@ import { MarketingLayout } from "@/components/layout/marketing-layout"; +import { ArrowRight, ChevronRight } from "lucide-react"; +import Link from "next/link"; import type { ReactNode } from "react"; +const FLAG = false; + export default function ContentLayout({ children }: { children: ReactNode }) { - return {children}; + return ( + <> + {FLAG ? : null} + {children} + + ); +} + +function Banner() { + return ( +
+ +
+

+ New Dashboard. New Pricing. We are reworking the whole experience. +

+
+ Read more + + +
+
+ +
+ ); } diff --git a/apps/web/src/app/oss-friends/page.tsx b/apps/web/src/app/(content)/oss-friends/page.tsx similarity index 92% rename from apps/web/src/app/oss-friends/page.tsx rename to apps/web/src/app/(content)/oss-friends/page.tsx index 89503bc05..1b978d29a 100644 --- a/apps/web/src/app/oss-friends/page.tsx +++ b/apps/web/src/app/(content)/oss-friends/page.tsx @@ -4,8 +4,6 @@ import { z } from "zod"; import { Card, CardDescription, CardHeader, CardTitle } from "@openstatus/ui"; -import { MarketingLayout } from "@/components/layout/marketing-layout"; - const OSSFriendSchema = z.object({ href: z.string(), name: z.string(), @@ -17,7 +15,7 @@ const OpenSourceFriends = async () => { const data = await res.json(); const openSourceFriends = z.array(OSSFriendSchema).parse(data.data); return ( - + <>

Our OpenSource Friends

@@ -41,7 +39,7 @@ const OpenSourceFriends = async () => { ))} -
+ ); }; diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/(content)/page.tsx similarity index 59% rename from apps/web/src/app/page.tsx rename to apps/web/src/app/(content)/page.tsx index 3806914ee..71cc7ad89 100644 --- a/apps/web/src/app/page.tsx +++ b/apps/web/src/app/(content)/page.tsx @@ -1,4 +1,3 @@ -import { MarketingLayout } from "@/components/layout/marketing-layout"; import { AlertCard } from "@/components/marketing/alert/card"; import { CLICard } from "@/components/marketing/cli/card"; import { Hero } from "@/components/marketing/hero"; @@ -11,21 +10,19 @@ import { StatusPageCard } from "@/components/marketing/status-page/card"; export const revalidate = 600; -export default async function Page() { +export default async function LandingPage() { return ( - -
- - - - - - - - - - -
-
+
+ + + + + + + + + + +
); } diff --git a/apps/web/src/app/play/checker/[id]/page.tsx b/apps/web/src/app/(content)/play/checker/[id]/page.tsx similarity index 100% rename from apps/web/src/app/play/checker/[id]/page.tsx rename to apps/web/src/app/(content)/play/checker/[id]/page.tsx diff --git a/apps/web/src/app/play/checker/[id]/search-params.ts b/apps/web/src/app/(content)/play/checker/[id]/search-params.ts similarity index 100% rename from apps/web/src/app/play/checker/[id]/search-params.ts rename to apps/web/src/app/(content)/play/checker/[id]/search-params.ts diff --git a/apps/web/src/app/play/checker/_components/checker-form.tsx b/apps/web/src/app/(content)/play/checker/_components/checker-form.tsx similarity index 99% rename from apps/web/src/app/play/checker/_components/checker-form.tsx rename to apps/web/src/app/(content)/play/checker/_components/checker-form.tsx index 651d65c22..8c5fcafa5 100644 --- a/apps/web/src/app/play/checker/_components/checker-form.tsx +++ b/apps/web/src/app/(content)/play/checker/_components/checker-form.tsx @@ -53,8 +53,7 @@ import { useQueryStates } from "nuqs"; import { searchParamsParsers } from "../search-params"; const FloatingActionNoSSR = dynamic( - () => - import("../_components/floating-action").then((mod) => mod.FloatingAction), + () => import("./floating-action").then((mod) => mod.FloatingAction), { ssr: false, loading: () => <>, diff --git a/apps/web/src/app/play/checker/_components/checker-play.tsx b/apps/web/src/app/(content)/play/checker/_components/checker-play.tsx similarity index 100% rename from apps/web/src/app/play/checker/_components/checker-play.tsx rename to apps/web/src/app/(content)/play/checker/_components/checker-play.tsx diff --git a/apps/web/src/app/play/checker/_components/floating-action.tsx b/apps/web/src/app/(content)/play/checker/_components/floating-action.tsx similarity index 100% rename from apps/web/src/app/play/checker/_components/floating-action.tsx rename to apps/web/src/app/(content)/play/checker/_components/floating-action.tsx diff --git a/apps/web/src/app/play/checker/_components/global-monitoring.tsx b/apps/web/src/app/(content)/play/checker/_components/global-monitoring.tsx similarity index 100% rename from apps/web/src/app/play/checker/_components/global-monitoring.tsx rename to apps/web/src/app/(content)/play/checker/_components/global-monitoring.tsx diff --git a/apps/web/src/app/play/checker/_components/testimonial.tsx b/apps/web/src/app/(content)/play/checker/_components/testimonial.tsx similarity index 100% rename from apps/web/src/app/play/checker/_components/testimonial.tsx rename to apps/web/src/app/(content)/play/checker/_components/testimonial.tsx diff --git a/apps/web/src/app/play/checker/api/mock.ts b/apps/web/src/app/(content)/play/checker/api/mock.ts similarity index 100% rename from apps/web/src/app/play/checker/api/mock.ts rename to apps/web/src/app/(content)/play/checker/api/mock.ts diff --git a/apps/web/src/app/play/checker/api/route.ts b/apps/web/src/app/(content)/play/checker/api/route.ts similarity index 100% rename from apps/web/src/app/play/checker/api/route.ts rename to apps/web/src/app/(content)/play/checker/api/route.ts diff --git a/apps/web/src/app/play/checker/layout.tsx b/apps/web/src/app/(content)/play/checker/layout.tsx similarity index 100% rename from apps/web/src/app/play/checker/layout.tsx rename to apps/web/src/app/(content)/play/checker/layout.tsx diff --git a/apps/web/src/app/play/checker/page.tsx b/apps/web/src/app/(content)/play/checker/page.tsx similarity index 100% rename from apps/web/src/app/play/checker/page.tsx rename to apps/web/src/app/(content)/play/checker/page.tsx diff --git a/apps/web/src/app/play/checker/search-params.ts b/apps/web/src/app/(content)/play/checker/search-params.ts similarity index 100% rename from apps/web/src/app/play/checker/search-params.ts rename to apps/web/src/app/(content)/play/checker/search-params.ts diff --git a/apps/web/src/app/play/curl/_components/curl-form.tsx b/apps/web/src/app/(content)/play/curl/_components/curl-form.tsx similarity index 100% rename from apps/web/src/app/play/curl/_components/curl-form.tsx rename to apps/web/src/app/(content)/play/curl/_components/curl-form.tsx diff --git a/apps/web/src/app/play/curl/layout.tsx b/apps/web/src/app/(content)/play/curl/layout.tsx similarity index 100% rename from apps/web/src/app/play/curl/layout.tsx rename to apps/web/src/app/(content)/play/curl/layout.tsx diff --git a/apps/web/src/app/play/curl/page.tsx b/apps/web/src/app/(content)/play/curl/page.tsx similarity index 100% rename from apps/web/src/app/play/curl/page.tsx rename to apps/web/src/app/(content)/play/curl/page.tsx diff --git a/apps/web/src/app/play/curl/search-params.ts b/apps/web/src/app/(content)/play/curl/search-params.ts similarity index 100% rename from apps/web/src/app/play/curl/search-params.ts rename to apps/web/src/app/(content)/play/curl/search-params.ts diff --git a/apps/web/src/app/play/default.tsx b/apps/web/src/app/(content)/play/default.tsx similarity index 100% rename from apps/web/src/app/play/default.tsx rename to apps/web/src/app/(content)/play/default.tsx diff --git a/apps/web/src/app/play/page.tsx b/apps/web/src/app/(content)/play/page.tsx similarity index 98% rename from apps/web/src/app/play/page.tsx rename to apps/web/src/app/(content)/play/page.tsx index 2bd4febf0..0b920669c 100644 --- a/apps/web/src/app/play/page.tsx +++ b/apps/web/src/app/(content)/play/page.tsx @@ -17,7 +17,7 @@ import { defaultMetadata, ogMetadata, twitterMetadata, -} from "../shared-metadata"; +} from "../../shared-metadata"; export const metadata: Metadata = { ...defaultMetadata, diff --git a/apps/web/src/app/play/status/_components/status-play.tsx b/apps/web/src/app/(content)/play/status/_components/status-play.tsx similarity index 100% rename from apps/web/src/app/play/status/_components/status-play.tsx rename to apps/web/src/app/(content)/play/status/_components/status-play.tsx diff --git a/apps/web/src/app/play/status/layout.tsx b/apps/web/src/app/(content)/play/status/layout.tsx similarity index 100% rename from apps/web/src/app/play/status/layout.tsx rename to apps/web/src/app/(content)/play/status/layout.tsx diff --git a/apps/web/src/app/play/status/page.tsx b/apps/web/src/app/(content)/play/status/page.tsx similarity index 100% rename from apps/web/src/app/play/status/page.tsx rename to apps/web/src/app/(content)/play/status/page.tsx diff --git a/apps/web/src/app/pricing/page.tsx b/apps/web/src/app/(content)/pricing/page.tsx similarity index 53% rename from apps/web/src/app/pricing/page.tsx rename to apps/web/src/app/(content)/pricing/page.tsx index 1e8ddaef8..263d8c98a 100644 --- a/apps/web/src/app/pricing/page.tsx +++ b/apps/web/src/app/(content)/pricing/page.tsx @@ -1,17 +1,16 @@ import type { Metadata } from "next"; +import { + defaultMetadata, + ogMetadata, + twitterMetadata, +} from "@/app/shared-metadata"; import { Shell } from "@/components/dashboard/shell"; -import { MarketingLayout } from "@/components/layout/marketing-layout"; import { FAQs } from "@/components/marketing/faqs"; import { EnterpricePlan } from "@/components/marketing/pricing/enterprice-plan"; import { PricingSlider } from "@/components/marketing/pricing/pricing-slider"; import { PricingWrapperSuspense } from "@/components/marketing/pricing/pricing-wrapper"; import { Separator } from "@openstatus/ui"; -import { - defaultMetadata, - ogMetadata, - twitterMetadata, -} from "../shared-metadata"; export const metadata: Metadata = { ...defaultMetadata, @@ -29,24 +28,22 @@ export const metadata: Metadata = { export default function PricingPage() { return ( - -
- -
-

Pricing

-

- All plans. Start free today, upgrade later. -

-
- - - -
- - - - -
-
+
+ +
+

Pricing

+

+ All plans. Start free today, upgrade later. +

+
+ + + +
+ + + + +
); } diff --git a/apps/web/src/app/play/layout.tsx b/apps/web/src/app/play/layout.tsx deleted file mode 100644 index 30b9b1343..000000000 --- a/apps/web/src/app/play/layout.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { - defaultMetadata, - ogMetadata, - twitterMetadata, -} from "@/app/shared-metadata"; -import { MarketingLayout } from "@/components/layout/marketing-layout"; -import type { Metadata } from "next"; -import type { ReactNode } from "react"; - -export const metadata: Metadata = { - ...defaultMetadata, - twitter: { - ...twitterMetadata, - }, - openGraph: { - ...ogMetadata, - }, -}; - -export default function PlayLayout({ children }: { children: ReactNode }) { - return {children}; -}