-
Notifications
You must be signed in to change notification settings - Fork 0
add auth function & profile page #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -42,3 +42,4 @@ app-example | |
| # generated native folders | ||
| /ios | ||
| /android | ||
| .env | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -27,6 +27,8 @@ | |
| }, | ||
| "plugins": [ | ||
| "expo-router", | ||
| "expo-secure-store", | ||
| "@clerk/expo", | ||
| [ | ||
| "expo-splash-screen", | ||
| { | ||
|
|
||
This file contains hidden or 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,5 +1,16 @@ | ||
| import { Stack } from "expo-router"; | ||
| import { useAuth } from "@clerk/expo"; | ||
| import { Redirect, Stack } from "expo-router"; | ||
|
|
||
| export default function AuthLayout() { | ||
| const { isLoaded, isSignedIn } = useAuth(); | ||
|
|
||
| if (!isLoaded) { | ||
| return null; | ||
| } | ||
|
|
||
| if (isSignedIn) { | ||
| return <Redirect href="/" />; | ||
| } | ||
|
|
||
| return <Stack screenOptions={{ headerShown: false }} />; | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import * as WebBrowser from "expo-web-browser"; | ||
|
|
||
| WebBrowser.maybeCompleteAuthSession(); | ||
|
|
||
| export default function OAuthCallback() { | ||
| return null; | ||
| } |
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| import { useAuth, useClerk, useUser } from "@clerk/expo"; | ||
| import { Ionicons } from "@expo/vector-icons"; | ||
| import { Redirect, router } from "expo-router"; | ||
| import { useState } from "react"; | ||
| import { Image, Pressable, Text, View } from "react-native"; | ||
| import { useSafeAreaInsets } from "react-native-safe-area-context"; | ||
|
|
||
| export default function ProfileScreen() { | ||
| const { isLoaded, isSignedIn } = useAuth(); | ||
| const { signOut } = useClerk(); | ||
| const { user } = useUser(); | ||
| const insets = useSafeAreaInsets(); | ||
| const [isSigningOut, setSigningOut] = useState(false); | ||
| const [signOutError, setSignOutError] = useState<string | null>(null); | ||
|
|
||
| const emailAddress = user?.primaryEmailAddress?.emailAddress ?? ""; | ||
| const displayName = user?.fullName ?? user?.firstName ?? "Language Learner"; | ||
|
|
||
| const handleSignOut = async () => { | ||
| if (isSigningOut) { | ||
| return; | ||
| } | ||
|
|
||
| setSigningOut(true); | ||
| setSignOutError(null); | ||
|
|
||
| try { | ||
| await signOut(); | ||
| router.replace("/onboarding"); | ||
| } catch (error) { | ||
| console.error("Failed to sign out", error); | ||
| setSignOutError("Unable to sign out. Please try again."); | ||
| } finally { | ||
| setSigningOut(false); | ||
| } | ||
| }; | ||
|
|
||
| if (!isLoaded) { | ||
| return null; | ||
| } | ||
|
|
||
| if (!isSignedIn) { | ||
| return <Redirect href="/onboarding" />; | ||
| } | ||
|
|
||
| return ( | ||
| <View | ||
| className="flex-1 bg-white px-[28px]" | ||
| style={{ | ||
| paddingBottom: Math.max(insets.bottom, 24), | ||
| paddingTop: Math.max(insets.top, 18) + 12, | ||
| }} | ||
| > | ||
| <View className="mx-auto w-full max-w-[430px] flex-1"> | ||
| <View className="flex-row items-center justify-between"> | ||
| <Pressable | ||
| accessibilityLabel="Go back" | ||
| className="h-[44px] w-[44px] items-start justify-center" | ||
| onPress={() => router.back()} | ||
| > | ||
| <Ionicons name="chevron-back" size={32} color="#06112B" /> | ||
| </Pressable> | ||
| <Text className="font-poppins-bold text-[20px] leading-[28px] text-lingua-text-primary"> | ||
| Profile | ||
| </Text> | ||
| <View className="h-[44px] w-[44px]" /> | ||
| </View> | ||
|
|
||
| <View className="mt-[38px] items-center"> | ||
| {user?.imageUrl ? ( | ||
| <Image | ||
| source={{ uri: user.imageUrl }} | ||
| resizeMode="cover" | ||
| className="h-[104px] w-[104px] rounded-full bg-[#f0f1f5]" | ||
| /> | ||
| ) : ( | ||
| <View className="h-[104px] w-[104px] items-center justify-center rounded-full bg-[#f0f1f5]"> | ||
| <Ionicons name="person" size={48} color="#77819b" /> | ||
| </View> | ||
| )} | ||
|
|
||
| <Text className="mt-[18px] text-center font-poppins-bold text-[26px] leading-[34px] text-lingua-text-primary"> | ||
| {displayName} | ||
| </Text> | ||
| {emailAddress ? ( | ||
| <Text className="mt-[6px] text-center font-poppins text-[15px] leading-[22px] text-[#69728c]"> | ||
| {emailAddress} | ||
| </Text> | ||
| ) : null} | ||
| </View> | ||
|
|
||
| <View className="mt-[38px] gap-[14px]"> | ||
| <View className="rounded-[18px] border border-[#eef0f5] bg-white px-[20px] py-[18px]"> | ||
| <Text className="font-poppins-medium text-[14px] leading-[20px] text-[#77819b]"> | ||
| Account | ||
| </Text> | ||
| <Text className="mt-[8px] font-poppins-semibold text-[18px] leading-[26px] text-lingua-text-primary"> | ||
| Signed in with Clerk | ||
| </Text> | ||
| </View> | ||
|
|
||
| <Pressable | ||
| className="h-[62px] flex-row items-center justify-center gap-[10px] rounded-[14px] bg-[#ff4b4b]" | ||
| disabled={isSigningOut} | ||
| onPress={handleSignOut} | ||
| > | ||
| <Ionicons name="log-out-outline" size={24} color="#ffffff" /> | ||
| <Text className="font-poppins-bold text-[18px] leading-[25px] text-white"> | ||
| {isSigningOut ? "Signing Out..." : "Sign Out"} | ||
| </Text> | ||
| </Pressable> | ||
| {signOutError ? ( | ||
| <Text className="text-center font-poppins text-[14px] leading-[21px] text-[#ff4b4b]"> | ||
| {signOutError} | ||
| </Text> | ||
| ) : null} | ||
| </View> | ||
| </View> | ||
| </View> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.