From 5f6cf2adbb24d5b76290260d339c9b1d91061a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Fri, 5 Apr 2024 12:01:09 +0200 Subject: [PATCH] show Google Button in sign in screen --- .env | 3 --- .../components/GoogleButton/GoogleButton.tsx | 2 +- src/screens/auth/SignInScreen.tsx | 12 +++++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index 4783255f..00000000 --- a/.env +++ /dev/null @@ -1,3 +0,0 @@ -ENVIRONMENT=production -ANDROID_FIREBASE_CONFIG=ewogICJwcm9qZWN0X2luZm8iOiB7CiAgICAicHJvamVjdF9udW1iZXIiOiAiMzYzNTM0MTMzMDk1IiwKICAgICJwcm9qZWN0X2lkIjogInNjaG9vbHBpbG90LWRldmVsb3BtZW50IiwKICAgICJzdG9yYWdlX2J1Y2tldCI6ICJzY2hvb2xwaWxvdC1kZXZlbG9wbWVudC5hcHBzcG90LmNvbSIKICB9LAogICJjbGllbnQiOiBbCiAgICB7CiAgICAgICJjbGllbnRfaW5mbyI6IHsKICAgICAgICAibW9iaWxlc2RrX2FwcF9pZCI6ICIxOjM2MzUzNDEzMzA5NTphbmRyb2lkOjUzYTYwODI2NjZkMzc4MmM5MzMxYzIiLAogICAgICAgICJhbmRyb2lkX2NsaWVudF9pbmZvIjogewogICAgICAgICAgInBhY2thZ2VfbmFtZSI6ICJvbmxpbmUuYmluYXJhcHBzIgogICAgICAgIH0KICAgICAgfSwKICAgICAgIm9hdXRoX2NsaWVudCI6IFsKICAgICAgICB7CiAgICAgICAgICAiY2xpZW50X2lkIjogIjM2MzUzNDEzMzA5NS0zZGdvMmRnNnI0bzNmdDkyMHA0dTRtaGIwdG1vM25sbS5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbSIsCiAgICAgICAgICAiY2xpZW50X3R5cGUiOiAzCiAgICAgICAgfQogICAgICBdLAogICAgICAiYXBpX2tleSI6IFsKICAgICAgICB7CiAgICAgICAgICAiY3VycmVudF9rZXkiOiAiQUl6YVN5QUFjM2VvUTF4Z1RxSHNfZmdTSHZzSGlYeG5QdndoNVg4IgogICAgICAgIH0KICAgICAgXSwKICAgICAgInNlcnZpY2VzIjogewogICAgICAgICJhcHBpbnZpdGVfc2VydmljZSI6IHsKICAgICAgICAgICJvdGhlcl9wbGF0Zm9ybV9vYXV0aF9jbGllbnQiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAiY2xpZW50X2lkIjogIjM2MzUzNDEzMzA5NS0zZGdvMmRnNnI0bzNmdDkyMHA0dTRtaGIwdG1vM25sbS5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbSIsCiAgICAgICAgICAgICAgImNsaWVudF90eXBlIjogMwogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAgImNsaWVudF9pZCI6ICIzNjM1MzQxMzMwOTUtYm1maG9tM2NrMjdpdWRyZmJnMnI3MWNlZTUwMDc4bTIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLAogICAgICAgICAgICAgICJjbGllbnRfdHlwZSI6IDIsCiAgICAgICAgICAgICAgImlvc19pbmZvIjogewogICAgICAgICAgICAgICAgImJ1bmRsZV9pZCI6ICJvbmxpbmUuYmluYXJhcHBzIgogICAgICAgICAgICAgIH0KICAgICAgICAgICAgfQogICAgICAgICAgXQogICAgICAgIH0KICAgICAgfQogICAgfQogIF0sCiAgImNvbmZpZ3VyYXRpb25fdmVyc2lvbiI6ICIxIgp9 -IOS_FIREBASE_CONFIG=PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCFET0NUWVBFIHBsaXN0IFBVQkxJQyAiLS8vQXBwbGUvL0RURCBQTElTVCAxLjAvL0VOIiAiaHR0cDovL3d3dy5hcHBsZS5jb20vRFREcy9Qcm9wZXJ0eUxpc3QtMS4wLmR0ZCI+CjxwbGlzdCB2ZXJzaW9uPSIxLjAiPgo8ZGljdD4KCTxrZXk+Q0xJRU5UX0lEPC9rZXk+Cgk8c3RyaW5nPjM2MzUzNDEzMzA5NS1ibWZob20zY2syN2l1ZHJmYmcycjcxY2VlNTAwNzhtMi5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbTwvc3RyaW5nPgoJPGtleT5SRVZFUlNFRF9DTElFTlRfSUQ8L2tleT4KCTxzdHJpbmc+Y29tLmdvb2dsZXVzZXJjb250ZW50LmFwcHMuMzYzNTM0MTMzMDk1LWJtZmhvbTNjazI3aXVkcmZiZzJyNzFjZWU1MDA3OG0yPC9zdHJpbmc+Cgk8a2V5PkFQSV9LRVk8L2tleT4KCTxzdHJpbmc+QUl6YVN5RExCc1gxRUVFZ2hhTDhydkVPbTJSbzFDNHA5LUVidlhjPC9zdHJpbmc+Cgk8a2V5PkdDTV9TRU5ERVJfSUQ8L2tleT4KCTxzdHJpbmc+MzYzNTM0MTMzMDk1PC9zdHJpbmc+Cgk8a2V5PlBMSVNUX1ZFUlNJT048L2tleT4KCTxzdHJpbmc+MTwvc3RyaW5nPgoJPGtleT5CVU5ETEVfSUQ8L2tleT4KCTxzdHJpbmc+b25saW5lLmJpbmFyYXBwczwvc3RyaW5nPgoJPGtleT5QUk9KRUNUX0lEPC9rZXk+Cgk8c3RyaW5nPnNjaG9vbHBpbG90LWRldmVsb3BtZW50PC9zdHJpbmc+Cgk8a2V5PlNUT1JBR0VfQlVDS0VUPC9rZXk+Cgk8c3RyaW5nPnNjaG9vbHBpbG90LWRldmVsb3BtZW50LmFwcHNwb3QuY29tPC9zdHJpbmc+Cgk8a2V5PklTX0FEU19FTkFCTEVEPC9rZXk+Cgk8ZmFsc2U+PC9mYWxzZT4KCTxrZXk+SVNfQU5BTFlUSUNTX0VOQUJMRUQ8L2tleT4KCTxmYWxzZT48L2ZhbHNlPgoJPGtleT5JU19BUFBJTlZJVEVfRU5BQkxFRDwva2V5PgoJPHRydWU+PC90cnVlPgoJPGtleT5JU19HQ01fRU5BQkxFRDwva2V5PgoJPHRydWU+PC90cnVlPgoJPGtleT5JU19TSUdOSU5fRU5BQkxFRDwva2V5PgoJPHRydWU+PC90cnVlPgoJPGtleT5HT09HTEVfQVBQX0lEPC9rZXk+Cgk8c3RyaW5nPjE6MzYzNTM0MTMzMDk1OmlvczpiZDM2N2E3ZDExMTQxYTIwOTMzMWMyPC9zdHJpbmc+CjwvZGljdD4KPC9wbGlzdD4= \ No newline at end of file diff --git a/src/design-system/components/GoogleButton/GoogleButton.tsx b/src/design-system/components/GoogleButton/GoogleButton.tsx index d12c4861..2196d77c 100644 --- a/src/design-system/components/GoogleButton/GoogleButton.tsx +++ b/src/design-system/components/GoogleButton/GoogleButton.tsx @@ -11,7 +11,7 @@ type GoogleButtonProps = { export const GoogleButton = ({ onPress, isDisabled }: GoogleButtonProps) => { return ( - diff --git a/src/screens/auth/SignInScreen.tsx b/src/screens/auth/SignInScreen.tsx index 87d7f898..0202b87a 100644 --- a/src/screens/auth/SignInScreen.tsx +++ b/src/screens/auth/SignInScreen.tsx @@ -6,7 +6,16 @@ import { Version, } from '@baca/components' import { REGEX, isWeb } from '@baca/constants' -import { Box, Button, Center, Display, Row, Spacer, Text } from '@baca/design-system' +import { + Box, + Button, + Center, + Display, + Row, + SignInWithGoogle, + Spacer, + Text, +} from '@baca/design-system' import { useCallback, useSignInForm, useTranslation } from '@baca/hooks' import { useRouter } from 'expo-router' @@ -104,6 +113,7 @@ export const SignInScreen = (): JSX.Element => { > {t('sign_in_screen.sign_in')} + {t('sign_in_screen.do_not_have_an_account')}