-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: adds warmup browser for OAuth, err handling on sign in/up, back…
… btn, layout styling Adds error handling with messages displayed to user if input is incorrect. Adds styling to inputs with color on placeholder text and borders on inputs. Configures autocomplete for inputs. Updates Links to Buttons for standard styling. Signed-off-by: Kenton Duprey <[email protected]>
- Loading branch information
Showing
2 changed files
with
365 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,172 @@ | ||
| import { useSignIn } from "@clerk/clerk-expo"; | ||
| import { Link, useRouter } from "expo-router"; | ||
| import { Stack, useRouter } from "expo-router"; | ||
| import { Text, TextInput, Button, View } from "react-native"; | ||
| import React from "react"; | ||
| import * as WebBrowser from "expo-web-browser"; | ||
|
|
||
| export const useWarmUpBrowser = () => { | ||
| React.useEffect(() => { | ||
| // Warm up the android browser to improve UX | ||
| // https://docs.expo.dev/guides/authentication/#improving-user-experience | ||
| void WebBrowser.warmUpAsync(); | ||
| return () => { | ||
| void WebBrowser.coolDownAsync(); | ||
| }; | ||
| }, []); | ||
| }; | ||
|
|
||
| WebBrowser.maybeCompleteAuthSession(); | ||
|
|
||
| export default function Page() { | ||
| const { signIn, setActive, isLoaded } = useSignIn(); | ||
| const router = useRouter(); | ||
|
|
||
| const [emailAddress, setEmailAddress] = React.useState(""); | ||
| const [password, setPassword] = React.useState(""); | ||
|
|
||
| const onSignInPress = React.useCallback(async () => { | ||
| if (!isLoaded) { | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| const signInAttempt = await signIn.create({ | ||
| identifier: emailAddress, | ||
| password, | ||
| }); | ||
|
|
||
| if (signInAttempt.status === "complete") { | ||
| await setActive({ session: signInAttempt.createdSessionId }); | ||
| router.replace("/"); | ||
| } else { | ||
| // See https://clerk.com/docs/custom-flows/error-handling | ||
| // for more info on error handling | ||
| console.error(JSON.stringify(signInAttempt, null, 2)); | ||
| } | ||
| } catch (err: any) { | ||
| console.error(JSON.stringify(err, null, 2)); | ||
| } | ||
| }, [isLoaded, emailAddress, password]); | ||
|
|
||
| return ( | ||
| <View> | ||
| <TextInput | ||
| autoCapitalize="none" | ||
| value={emailAddress} | ||
| placeholder="Email..." | ||
| onChangeText={(emailAddress) => setEmailAddress(emailAddress)} | ||
| /> | ||
| <TextInput | ||
| value={password} | ||
| placeholder="Password..." | ||
| secureTextEntry={true} | ||
| onChangeText={(password) => setPassword(password)} | ||
| /> | ||
| <Button title="Sign In" onPress={onSignInPress} /> | ||
| <View> | ||
| <Text>Don't have an account?</Text> | ||
| <Link href="/sign-up"> | ||
| <Text>Sign up</Text> | ||
| </Link> | ||
| </View> | ||
| </View> | ||
| ); | ||
| const { signIn, setActive, isLoaded } = useSignIn(); | ||
| const router = useRouter(); | ||
|
|
||
| const [emailAddress, setEmailAddress] = React.useState(""); | ||
| const [password, setPassword] = React.useState(""); | ||
| const [emailError, setEmailError] = React.useState(""); | ||
| const [passwordError, setPasswordError] = React.useState(""); | ||
|
|
||
| const onSignInPress = React.useCallback(async () => { | ||
| if (!isLoaded) { | ||
| return; | ||
| } | ||
|
|
||
| if (!emailAddress) { | ||
| setEmailError("Email is required"); | ||
| } | ||
| if (!password) { | ||
| setPasswordError("Password is required"); | ||
| } | ||
|
|
||
| if (!emailAddress || !password) { | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| const signInAttempt = await signIn.create({ | ||
| identifier: emailAddress, | ||
| password, | ||
| }); | ||
|
|
||
| if (signInAttempt.status === "complete") { | ||
| await setActive({ session: signInAttempt.createdSessionId }); | ||
| } else { | ||
| // See https://clerk.com/docs/custom-flows/error-handling | ||
| // for more info on error handling | ||
| console.error(JSON.stringify(signInAttempt, null, 2)); | ||
| } | ||
| } catch (err: any) { | ||
| console.error(JSON.stringify(err, null, 2)); | ||
| } | ||
| }, [isLoaded, emailAddress, password]); | ||
|
|
||
| return ( | ||
| <View> | ||
| <Stack.Screen | ||
| options={{ | ||
| title: "", | ||
| headerLeft: () => ( | ||
| <Button | ||
| title="Back" | ||
| onPress={() => router.replace("/")} | ||
| /> | ||
| ), | ||
| }} | ||
| /> | ||
|
|
||
| <Text | ||
| style={{ | ||
| fontSize: 24, | ||
| fontWeight: "bold", | ||
| textAlign: "center", | ||
| marginVertical: 10, | ||
| }} | ||
| > | ||
| Sign In | ||
| </Text> | ||
| <View> | ||
| {emailError ? ( | ||
| <Text | ||
| style={{ | ||
| color: "red", | ||
| marginBottom: 10, | ||
| fontWeight: "bold", | ||
| fontSize: 16, | ||
| textAlign: "center", | ||
| }} | ||
| > | ||
| {emailError} | ||
| </Text> | ||
| ) : null} | ||
| {passwordError ? ( | ||
| <Text | ||
| style={{ | ||
| color: "red", | ||
| marginBottom: 10, | ||
| fontWeight: "bold", | ||
| fontSize: 16, | ||
| textAlign: "center", | ||
| }} | ||
| > | ||
| {passwordError} | ||
| </Text> | ||
| ) : null} | ||
| </View> | ||
| <TextInput | ||
| autoCapitalize="none" | ||
| placeholderTextColor={"#000"} | ||
| value={emailAddress} | ||
| placeholder="Email..." | ||
| autoComplete="email" | ||
| inputMode="email" | ||
| style={{ | ||
| marginBottom: 10, | ||
| marginHorizontal: 10, | ||
| borderColor: "black", | ||
| borderWidth: 1, | ||
| padding: 10, | ||
| }} | ||
| onChangeText={(emailAddress) => setEmailAddress(emailAddress)} | ||
| /> | ||
| <TextInput | ||
| value={password} | ||
| placeholder="Password..." | ||
| placeholderTextColor={"#000"} | ||
| autoComplete="password" | ||
| style={{ | ||
| marginBottom: 10, | ||
| marginHorizontal: 10, | ||
| borderColor: "black", | ||
| borderWidth: 1, | ||
| padding: 10, | ||
| }} | ||
| secureTextEntry={true} | ||
| onChangeText={(password) => setPassword(password)} | ||
| /> | ||
| <Button title="Sign In" onPress={onSignInPress} /> | ||
|
|
||
| <View | ||
| style={{ | ||
| display: "flex", | ||
| flexDirection: "column", | ||
| alignItems: "center", | ||
| paddingTop: 10, | ||
| }} | ||
| > | ||
| <Text | ||
| style={{ | ||
| marginTop: 10, | ||
| marginBottom: 10, | ||
| fontSize: 20, | ||
| }} | ||
| > | ||
| Don't have an account? | ||
| </Text> | ||
| <Button | ||
| onPress={() => router.replace("/sign-up")} | ||
| title="Sign Up" | ||
| /> | ||
| </View> | ||
| </View> | ||
| ); | ||
| } |
Oops, something went wrong.