-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into update_buildcheck
- Loading branch information
Showing
55 changed files
with
4,819 additions
and
3,923 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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| name: Sync Staging to Main Branch | ||
|
|
||
| on: | ||
| push: | ||
| branches: [main] | ||
|
|
||
| permissions: | ||
| contents: write | ||
|
|
||
| jobs: | ||
| sync: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Update Staging Branch | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| git checkout main | ||
| git fetch origin | ||
| git checkout staging | ||
| git pull | ||
| git merge origin/main | ||
| git push origin staging |
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 |
|---|---|---|
|
|
@@ -11,3 +11,6 @@ dist | |
| .vercel | ||
| .expo | ||
| .vscode | ||
| expo-env.d.ts | ||
| ios | ||
| android | ||
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
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
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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 |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "project_info": { | ||
| "project_number": "861551563613", | ||
| "project_id": "vessel-f2624", | ||
| "storage_bucket": "vessel-f2624.appspot.com" | ||
| }, | ||
| "client": [ | ||
| { | ||
| "client_info": { | ||
| "mobilesdk_app_id": "1:861551563613:android:73a9441fe09d26ab038eb4", | ||
| "android_client_info": { | ||
| "package_name": "com.vessel.pager" | ||
| } | ||
| }, | ||
| "oauth_client": [], | ||
| "api_key": [ | ||
| { | ||
| "current_key": "AIzaSyBqiNT0SVPZiiabtznYgOrApiIdWzhTmr8" | ||
| } | ||
| ], | ||
| "services": { | ||
| "appinvite_service": { | ||
| "other_platform_oauth_client": [] | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "configuration_version": "1" | ||
| } |
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
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,4 +1,4 @@ | ||
| import { useOAuth } from '@clerk/clerk-expo'; | ||
| import { useOAuth, useSignIn } from '@clerk/clerk-expo'; | ||
| import { FontAwesome } from '@expo/vector-icons'; | ||
| import * as WebBrowser from 'expo-web-browser'; | ||
| import React from 'react'; | ||
|
|
@@ -14,6 +14,7 @@ const SignInWithOAuth = () => { | |
| // Warm up the android browser to improve UX | ||
| // https://docs.expo.dev/guides/authentication/#improving-user-experience | ||
| useWarmUpBrowser(); | ||
| const { signIn, setActive, isLoaded } = useSignIn(); | ||
|
|
||
| const { startOAuthFlow: startOAuthFlowGoogle } = useOAuth({ | ||
| strategy: 'oauth_google', | ||
|
|
@@ -42,6 +43,23 @@ const SignInWithOAuth = () => { | |
| } | ||
| }, [startFlow]); | ||
|
|
||
| const onSignInPress = async () => { | ||
| if (!isLoaded) { | ||
| return; | ||
| } | ||
| try { | ||
| const completeSignIn = await signIn.create({ | ||
| identifier: '[email protected]', | ||
| password: 'vesselguest', | ||
| }); | ||
| // This is an important step, | ||
| // This indicates the user is signed in | ||
| await setActive({ session: completeSignIn.createdSessionId }); | ||
| } catch (err: any) { | ||
| console.log(err); | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <SafeAreaView> | ||
| <View className="h-full w-full p-4 bg-[#181818] flex-col justify-center"> | ||
|
|
@@ -77,6 +95,13 @@ const SignInWithOAuth = () => { | |
| </View> | ||
| </TouchableOpacity> | ||
| </View> | ||
| <View className="p-4 mb-4"> | ||
| <TouchableOpacity onPress={onSignInPress}> | ||
| <View className="w-full flex-row items-center justify-center"> | ||
| <Text className="text-xl text-slate-200">Continue as guest</Text> | ||
| </View> | ||
| </TouchableOpacity> | ||
| </View> | ||
| </View> | ||
| </SafeAreaView> | ||
| ); | ||
|
|
||
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
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,4 +1,4 @@ | ||
| import type { RouterOutputs } from '@vessel/api'; | ||
|
|
||
| export type Alert = RouterOutputs['alert']['all']['0']; | ||
| export type Alert = NonNullable<RouterOutputs['alert']['all']['0']>; | ||
| export type User = RouterOutputs['user']['me']['user']; |
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
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
Oops, something went wrong.