From ff49603cb1e11cd1ad84bfacda4e792e0996e3ee Mon Sep 17 00:00:00 2001 From: Maximilian Kaske <56969857+mxkaske@users.noreply.github.com> Date: Wed, 16 Aug 2023 20:56:18 +0200 Subject: [PATCH] feat: clean up (#186) * feat: clean up * chore: update footer * fix: add missing docs --- .../(auth)/sign-in/[[...sign-in]]/page.tsx | 1 + .../(auth)/sign-up/[[...sign-up]]/page.tsx | 1 + .../(dashboard)/[workspaceSlug]/layout.tsx | 3 +- .../[workspaceSlug]/monitors/loading.tsx | 18 +++ .../[workspaceSlug]/monitors/page.tsx | 40 +++---- .../_components/customer-portal-button.tsx | 39 ++++++ .../settings/_components/plan.tsx | 111 +++--------------- .../[workspaceSlug]/settings/loading.tsx | 14 +++ .../[workspaceSlug]/settings/page.tsx | 13 +- .../src/components/dashboard/container.tsx | 4 +- apps/web/src/components/layout/app-footer.tsx | 30 +++++ apps/web/src/components/layout/footer.tsx | 47 -------- .../components/layout/marketing-footer.tsx | 64 ++++++++++ .../components/layout/marketing-layout.tsx | 4 +- apps/web/src/components/marketing/plans.tsx | 105 ++++++----------- apps/web/src/config/plans.ts | 63 ++++++++++ 16 files changed, 318 insertions(+), 239 deletions(-) create mode 100644 apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/loading.tsx create mode 100644 apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/customer-portal-button.tsx create mode 100644 apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/loading.tsx create mode 100644 apps/web/src/components/layout/app-footer.tsx delete mode 100644 apps/web/src/components/layout/footer.tsx create mode 100644 apps/web/src/components/layout/marketing-footer.tsx create mode 100644 apps/web/src/config/plans.ts diff --git a/apps/web/src/app/app/(auth)/sign-in/[[...sign-in]]/page.tsx b/apps/web/src/app/app/(auth)/sign-in/[[...sign-in]]/page.tsx index 53d95220..3a48f679 100644 --- a/apps/web/src/app/app/(auth)/sign-in/[[...sign-in]]/page.tsx +++ b/apps/web/src/app/app/(auth)/sign-in/[[...sign-in]]/page.tsx @@ -4,6 +4,7 @@ import { auth, SignIn } from "@clerk/nextjs"; export default function Page() { const { userId } = auth(); + // TODO: we can improve the UX here. If user is logged in, (s)he will see the screen for a quick moment if (userId) { redirect("/app"); } diff --git a/apps/web/src/app/app/(auth)/sign-up/[[...sign-up]]/page.tsx b/apps/web/src/app/app/(auth)/sign-up/[[...sign-up]]/page.tsx index 4366ebcc..d47b3a72 100644 --- a/apps/web/src/app/app/(auth)/sign-up/[[...sign-up]]/page.tsx +++ b/apps/web/src/app/app/(auth)/sign-up/[[...sign-up]]/page.tsx @@ -4,6 +4,7 @@ import { auth, SignUp } from "@clerk/nextjs"; export default function Page() { const { userId } = auth(); + // TODO: we can improve the UX here. If user is logged in, (s)he will see the screen for a quick moment if (userId) { redirect("/app"); } diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/layout.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/layout.tsx index aecab5fc..80419c7d 100644 --- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/layout.tsx +++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/layout.tsx @@ -4,8 +4,8 @@ import { Shell } from "@/components/dashboard/shell"; import { AppHeader } from "@/components/layout/app-header"; import { AppMenu } from "@/components/layout/app-menu"; import { AppSidebar } from "@/components/layout/app-sidebar"; -import { Footer } from "@/components/layout/footer"; +// TODO: make the container min-h-screen and the footer below! export default function AppLayout({ children }: { children: React.ReactNode }) { return (
@@ -24,7 +24,6 @@ export default function AppLayout({ children }: { children: React.ReactNode }) {
-