From 0e7057cb02283df5e2841583aeef42880929aa54 Mon Sep 17 00:00:00 2001 From: Ronnie Beggs Date: Wed, 24 Apr 2024 14:36:49 -0700 Subject: [PATCH] [feat] apply headers to every screen in the auth flow. --- .../(Authentication)/Login/Email/index.tsx | 3 - .../(Authentication)/Login/Password/index.tsx | 3 - .../OTPFlow/OTPEmailInput/index.tsx | 6 -- .../OTPFlow/OTPNewPassword/index.tsx | 8 -- .../OTPFlow/OTPVerify/index.tsx | 5 -- .../(Authentication)/SignUp/Address/index.tsx | 1 - .../(Authentication)/SignUp/Email/index.tsx | 8 -- .../SignUp/Password/index.tsx | 8 -- src/app/(Authentication)/Welcome/index.tsx | 5 -- src/app/(Authentication)/_layout.tsx | 86 ++++++++++++++++++- 10 files changed, 84 insertions(+), 49 deletions(-) diff --git a/src/app/(Authentication)/Login/Email/index.tsx b/src/app/(Authentication)/Login/Email/index.tsx index 0901cc2a..7530da2c 100644 --- a/src/app/(Authentication)/Login/Email/index.tsx +++ b/src/app/(Authentication)/Login/Email/index.tsx @@ -31,9 +31,6 @@ export default function LoginScreen() { return ( - router.back()}> - Back - Please enter your email address. diff --git a/src/app/(Authentication)/Login/Password/index.tsx b/src/app/(Authentication)/Login/Password/index.tsx index 2f1258b9..77e61d90 100644 --- a/src/app/(Authentication)/Login/Password/index.tsx +++ b/src/app/(Authentication)/Login/Password/index.tsx @@ -35,9 +35,6 @@ export default function LoginScreen() { return ( - router.back()}> - Back - Please enter your password. diff --git a/src/app/(Authentication)/OTPFlow/OTPEmailInput/index.tsx b/src/app/(Authentication)/OTPFlow/OTPEmailInput/index.tsx index 62a53d3a..325d29ac 100644 --- a/src/app/(Authentication)/OTPFlow/OTPEmailInput/index.tsx +++ b/src/app/(Authentication)/OTPFlow/OTPEmailInput/index.tsx @@ -45,12 +45,6 @@ export default function OTPEmailInput() { return ( - router.back()} - > - Back - Please enter the email you used to create your account. diff --git a/src/app/(Authentication)/OTPFlow/OTPNewPassword/index.tsx b/src/app/(Authentication)/OTPFlow/OTPNewPassword/index.tsx index 6383c5cc..125f09af 100644 --- a/src/app/(Authentication)/OTPFlow/OTPNewPassword/index.tsx +++ b/src/app/(Authentication)/OTPFlow/OTPNewPassword/index.tsx @@ -64,14 +64,6 @@ export default function SignUpScreen() { return ( - - router.back()} - > - Back - - Create a new password. diff --git a/src/app/(Authentication)/OTPFlow/OTPVerify/index.tsx b/src/app/(Authentication)/OTPFlow/OTPVerify/index.tsx index 9d7745b2..572418e4 100644 --- a/src/app/(Authentication)/OTPFlow/OTPVerify/index.tsx +++ b/src/app/(Authentication)/OTPFlow/OTPVerify/index.tsx @@ -50,11 +50,6 @@ export default function OTPFlow() { return ( - - router.back()}> - Back - - Enter verification code. diff --git a/src/app/(Authentication)/SignUp/Address/index.tsx b/src/app/(Authentication)/SignUp/Address/index.tsx index 68097129..823d402c 100644 --- a/src/app/(Authentication)/SignUp/Address/index.tsx +++ b/src/app/(Authentication)/SignUp/Address/index.tsx @@ -66,7 +66,6 @@ export default function SignUpScreen() { return ( - Last, enter your address. diff --git a/src/app/(Authentication)/SignUp/Email/index.tsx b/src/app/(Authentication)/SignUp/Email/index.tsx index e100976f..80748571 100644 --- a/src/app/(Authentication)/SignUp/Email/index.tsx +++ b/src/app/(Authentication)/SignUp/Email/index.tsx @@ -58,14 +58,6 @@ export default function SignUpScreen() { return ( - - router.back()} - > - Back - - Create your account. - - router.back()} - > - Back - - Next, make a password. diff --git a/src/app/(Authentication)/Welcome/index.tsx b/src/app/(Authentication)/Welcome/index.tsx index 73d6c787..7fc6829c 100644 --- a/src/app/(Authentication)/Welcome/index.tsx +++ b/src/app/(Authentication)/Welcome/index.tsx @@ -9,11 +9,6 @@ function WelcomeScreen() { return ( - - Welcome to the Impact Fund! diff --git a/src/app/(Authentication)/_layout.tsx b/src/app/(Authentication)/_layout.tsx index 54f10f4f..6f6649c1 100644 --- a/src/app/(Authentication)/_layout.tsx +++ b/src/app/(Authentication)/_layout.tsx @@ -1,6 +1,88 @@ import { Stack } from 'expo-router'; import React from 'react'; -export default function AuthLayout() { - return ; +import { + BackButtonNoText, + BackButtonText, +} from '../../Components/BackButtons/BackButtons'; +import { + LeftAlignedHeader, + HeaderImage, + EmptyHeader, +} from '../../Components/HeaderComponents/HeaderComponents'; +import { CaseContextProvider } from '../../context/CaseContext'; + +export default function CasesLayout() { + return ( + + + , + }} + /> + , + headerTitle: () => , + }} + /> + , + headerTitle: () => , + }} + /> + , + headerTitle: () => , + }} + /> + , + headerTitle: () => , + }} + /> + , + }} + /> + , + headerTitle: () => , + }} + /> + , + headerTitle: () => , + }} + /> + , + }} + /> + + + ); }