diff --git a/apps/webapp/app/assets/images/gradient-background.png b/apps/webapp/app/assets/images/gradient-background.png deleted file mode 100644 index 9f40d2483..000000000 Binary files a/apps/webapp/app/assets/images/gradient-background.png and /dev/null differ diff --git a/apps/webapp/app/components/PageGradient.tsx b/apps/webapp/app/components/PageGradient.tsx deleted file mode 100644 index 4bfed9f24..000000000 --- a/apps/webapp/app/components/PageGradient.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import gradientBackground from "~/assets/images/gradient-background.png"; - -export function PageGradient({ children }: { children: React.ReactNode }) { - return ( -
- {children} -
- ); -} diff --git a/apps/webapp/app/components/layout/AppLayout.tsx b/apps/webapp/app/components/layout/AppLayout.tsx index cf33364bf..b9e72d1aa 100644 --- a/apps/webapp/app/components/layout/AppLayout.tsx +++ b/apps/webapp/app/components/layout/AppLayout.tsx @@ -1,42 +1,8 @@ import { cn } from "~/utils/cn"; -import gradientPath from "./app-container-gradient.svg"; /** This container is used to surround the entire app, it correctly places the nav bar */ -export function AppContainer({ - children, - showBackgroundGradient, -}: { - children: React.ReactNode; - showBackgroundGradient?: boolean; -}) { - return ( - -
{children}
- - ); -} - -export function BackgroundGradient({ - children, - showBackgroundGradient, -}: { - children: React.ReactNode; - showBackgroundGradient?: boolean; -}) { - return ( -
- {children} -
- ); +export function AppContainer({ children }: { children: React.ReactNode }) { + return
{children}
; } /** This container should be placed around the content on a page */ diff --git a/apps/webapp/app/root.tsx b/apps/webapp/app/root.tsx index 91eb125d0..a77c7a8c7 100644 --- a/apps/webapp/app/root.tsx +++ b/apps/webapp/app/root.tsx @@ -71,7 +71,7 @@ export function ErrorBoundary() { - + diff --git a/apps/webapp/app/routes/_app/route.tsx b/apps/webapp/app/routes/_app/route.tsx index 8d2d20034..6d8f8e9dc 100644 --- a/apps/webapp/app/routes/_app/route.tsx +++ b/apps/webapp/app/routes/_app/route.tsx @@ -3,7 +3,6 @@ import type { LoaderFunctionArgs } from "@remix-run/server-runtime"; import { redirect, typedjson } from "remix-typedjson"; import { RouteErrorDisplay } from "~/components/ErrorDisplay"; import { AppContainer, MainCenteredContainer } from "~/components/layout/AppLayout"; -import { useIsOrgChildPage } from "~/hooks/useIsOrgChildPage"; import { clearRedirectTo, commitSession } from "~/services/redirectTo.server"; import { requireUser } from "~/services/session.server"; import { confirmBasicDetailsPath } from "~/utils/pathBuilder"; @@ -22,11 +21,8 @@ export const loader = async ({ request }: LoaderFunctionArgs) => { }; export default function App() { - const isOrgChildPage = useIsOrgChildPage(); - const showBackgroundGradient = !isOrgChildPage; - return ( - + ); @@ -35,7 +31,7 @@ export default function App() { export function ErrorBoundary() { return ( <> - + diff --git a/apps/webapp/app/routes/account/route.tsx b/apps/webapp/app/routes/account/route.tsx index 70d3298b1..01f701c51 100644 --- a/apps/webapp/app/routes/account/route.tsx +++ b/apps/webapp/app/routes/account/route.tsx @@ -123,7 +123,7 @@ export default function Page() { }); return ( - +
diff --git a/apps/webapp/app/routes/confirm-basic-details.tsx b/apps/webapp/app/routes/confirm-basic-details.tsx index 000498c21..5c1ad1c60 100644 --- a/apps/webapp/app/routes/confirm-basic-details.tsx +++ b/apps/webapp/app/routes/confirm-basic-details.tsx @@ -137,7 +137,7 @@ export default function Page() { const shouldShowConfirm = user.email !== enteredEmail || user.email === ""; return ( - + +