From 849bf85bcea12485d0347cddea445c2d74ccb4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Thu, 21 Mar 2024 11:57:57 +0100 Subject: [PATCH 01/20] add forgot password screen --- .../(not-authorized)/forgot-password.tsx | 3 ++ src/components/molecules/Field/Checkbox.tsx | 2 +- src/components/molecules/Field/Input.tsx | 2 +- src/i18n/translations/en.json | 2 + src/i18n/translations/pl.json | 2 + src/screens/ForgotPasswordScreen.tsx | 11 +++++ src/screens/SignInScreen.tsx | 40 ++++++++++--------- src/screens/index.ts | 1 + 8 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 app/(app)/(not-authorized)/forgot-password.tsx create mode 100644 src/screens/ForgotPasswordScreen.tsx diff --git a/app/(app)/(not-authorized)/forgot-password.tsx b/app/(app)/(not-authorized)/forgot-password.tsx new file mode 100644 index 00000000..caedadac --- /dev/null +++ b/app/(app)/(not-authorized)/forgot-password.tsx @@ -0,0 +1,3 @@ +import { ForgotPasswordScreen } from '@baca/screens' + +export default ForgotPasswordScreen diff --git a/src/components/molecules/Field/Checkbox.tsx b/src/components/molecules/Field/Checkbox.tsx index 9401d07a..c8585be8 100644 --- a/src/components/molecules/Field/Checkbox.tsx +++ b/src/components/molecules/Field/Checkbox.tsx @@ -52,7 +52,7 @@ export const Checkbox = ({ }, [checkboxes, value, props, onChange]) return ( - + {checkboxes ? ( renderCheckboxes diff --git a/src/components/molecules/Field/Input.tsx b/src/components/molecules/Field/Input.tsx index 071f54d8..648199ed 100644 --- a/src/components/molecules/Field/Input.tsx +++ b/src/components/molecules/Field/Input.tsx @@ -88,7 +88,7 @@ export const Input = forwardRef, FieldInputProps>( ) return ( - + { + const { t } = useTranslation() + + useScreenOptions({ + title: t('navigation.screen_titles.forgot_password'), + }) + + return <> +} diff --git a/src/screens/SignInScreen.tsx b/src/screens/SignInScreen.tsx index 8e6d9650..72944339 100644 --- a/src/screens/SignInScreen.tsx +++ b/src/screens/SignInScreen.tsx @@ -1,7 +1,7 @@ import { ControlledField, KeyboardAwareScrollView, LanguagePicker, Version } from '@baca/components' import { REGEX, darkLogo, lightLogo } from '@baca/constants' import { useColorScheme } from '@baca/contexts' -import { Box, Button, Center, Spacer, Text } from '@baca/design-system' +import { Box, Button, Center, Row, Spacer, Text } from '@baca/design-system' import { useCallback, useSignInForm, @@ -31,6 +31,7 @@ export const SignInScreen = (): JSX.Element => { const navigateToSignUp = useCallback(() => push('/sign-up'), [push]) const navigateToAppInfo = useCallback(() => push('/application-info'), [push]) + const navigateToForgotPassword = useCallback(() => push('/forgot-password'), [push]) const focusPasswordInput = useCallback(() => setFocus('password'), [setFocus]) return ( @@ -38,7 +39,7 @@ export const SignInScreen = (): JSX.Element => { -
+
{ testID="passwordInput" type="password" /> -
+ - - - {t('sign_in_screen.do_not_have_an_account')} - - - {t('sign_in_screen.sign_up')} + + {t('sign_in_screen.forgot_password')} -
+ + + + {t('sign_in_screen.do_not_have_an_account')} + + + {t('sign_in_screen.sign_up')} + {/* TODO: Remove this after implementing signing in with backend */} diff --git a/src/screens/index.ts b/src/screens/index.ts index 12a7fc75..af3f4550 100644 --- a/src/screens/index.ts +++ b/src/screens/index.ts @@ -6,6 +6,7 @@ export * from './ConfirmEmail' export * from './DataFromBeScreen_EXAMPLE' export * from './DetailsScreen' export * from './ExamplesScreen' +export * from './ForgotPasswordScreen' export * from './HomeScreen' export * from './NotFoundScreen' export * from './ProfileScreen' From db6da359da1fafa3e3c53fee17639fcdcc264763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Thu, 21 Mar 2024 13:56:08 +0100 Subject: [PATCH 02/20] add forgot password screen content --- src/components/CompanyLogo.tsx | 37 +++++++++++ src/components/FeaturedIcon.tsx | 35 +++++++++++ src/components/index.ts | 2 + src/hooks/forms/index.ts | 1 + src/hooks/forms/useForgotPasswordForm.tsx | 49 +++++++++++++++ src/hooks/forms/useSignInForm.ts | 4 +- src/i18n/translations/en.json | 6 ++ src/i18n/translations/pl.json | 6 ++ .../tabNavigator/components/HeaderLogo.tsx | 49 ++++++--------- src/screens/ForgotPasswordScreen.tsx | 62 ++++++++++++++++++- src/screens/SignInScreen.tsx | 30 ++++----- src/screens/SignUpScreen.tsx | 5 +- 12 files changed, 233 insertions(+), 53 deletions(-) create mode 100644 src/components/CompanyLogo.tsx create mode 100644 src/components/FeaturedIcon.tsx create mode 100644 src/hooks/forms/useForgotPasswordForm.tsx diff --git a/src/components/CompanyLogo.tsx b/src/components/CompanyLogo.tsx new file mode 100644 index 00000000..831725cf --- /dev/null +++ b/src/components/CompanyLogo.tsx @@ -0,0 +1,37 @@ +import { darkBinarLogo, darkLogoSygnet, lightBinarLogo, lightLogoSygnet } from '@baca/constants' +import { ColorSchemeName, useColorScheme } from '@baca/contexts' +import { Image, ImageProps, ImageStyle } from 'react-native' + +type LogoTypes = 'binarSygnet' | 'binar' + +const LOGO: { + [key in ColorSchemeName]: { [key in LogoTypes]: ImageProps['source'] } +} = { + light: { binarSygnet: lightLogoSygnet, binar: lightBinarLogo }, + dark: { binarSygnet: darkLogoSygnet, binar: darkBinarLogo }, +} + +export const CompanyLogo = ({ + height = 100, + type = 'binar', + width = '100%', + style, +}: { + height?: ImageStyle['height'] + type?: LogoTypes + width?: ImageStyle['width'] + style?: ImageStyle +}) => { + const { colorScheme } = useColorScheme() + + const source = LOGO[colorScheme][type] + + return ( + + ) +} diff --git a/src/components/FeaturedIcon.tsx b/src/components/FeaturedIcon.tsx new file mode 100644 index 00000000..22005967 --- /dev/null +++ b/src/components/FeaturedIcon.tsx @@ -0,0 +1,35 @@ +import { Box, Icon } from '@baca/design-system' +import { IconNames } from '@baca/types/icon' + +type FeatureIconSize = 'sm' | 'md' | 'lg' | 'xl' + +const featuredIconSizeVariants: { + [key in FeatureIconSize]: { iconSize: number; borderRadius: number; padding: number } +} = { + // FIXME: add values according to design theme + sm: { iconSize: 16, borderRadius: 6, padding: 2.5 }, + md: { iconSize: 20, borderRadius: 8, padding: 2.5 }, + lg: { iconSize: 24, borderRadius: 10, padding: 3 }, + xl: { iconSize: 28, borderRadius: 12, padding: 14 }, +} + +// FIXME: Add different variants for featuredIcon according to design https://www.figma.com/file/Zk5v95NgasXz7o84UABvH3/%E2%9D%96-BACA---Untitled-UI-(v4.0---plik-madka)?type=design&node-id=1102-5338&mode=design&t=sc8jQ2o3oHFoeslg-4 +export const FeaturedIcon = ({ + iconName, + size = 'md', +}: { + iconName: IconNames + size?: FeatureIconSize +}) => { + const icon = featuredIconSizeVariants[size] + return ( + + + + ) +} diff --git a/src/components/index.ts b/src/components/index.ts index f33b3c77..e1cb6335 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -2,6 +2,8 @@ export * from './molecules' export * from './organisms' export * from './AppLoading' +export * from './CompanyLogo' +export * from './FeaturedIcon' export * from './KeyboardAwareScrollView' export * from './LanguagePicker' export * from './Modal' diff --git a/src/hooks/forms/index.ts b/src/hooks/forms/index.ts index c026210d..70d7fd67 100644 --- a/src/hooks/forms/index.ts +++ b/src/hooks/forms/index.ts @@ -1,3 +1,4 @@ +export * from './useForgotPasswordForm' export * from './useSignInForm' export * from './useSignUpForm' export * from './useTestForm' diff --git a/src/hooks/forms/useForgotPasswordForm.tsx b/src/hooks/forms/useForgotPasswordForm.tsx new file mode 100644 index 00000000..2481e31b --- /dev/null +++ b/src/hooks/forms/useForgotPasswordForm.tsx @@ -0,0 +1,49 @@ +import { useAuthControllerForgotPassword } from '@baca/api/query/auth/auth' +import { AuthForgotPasswordDto } from '@baca/api/types' +import { handleFormError, hapticImpact } from '@baca/utils' +import { useForm } from 'react-hook-form' + +const defaultValues: AuthForgotPasswordDto = { + email: '', +} + +export const useForgotPasswordForm = () => { + const { mutate: forgotPasswordMutate, isLoading: isSubmitting } = + useAuthControllerForgotPassword() + + const { + control, + formState: { errors }, + handleSubmit, + setError: setFormError, + } = useForm({ + mode: 'onTouched', + defaultValues, + }) + + const onSubmit = async (data: AuthForgotPasswordDto) => { + forgotPasswordMutate( + { data }, + { + onSuccess: () => {}, + onError: (e) => { + handleFormError( + e as unknown as keyof AuthForgotPasswordDto, + ({ field, description }) => { + setFormError(field, { message: description }) + } + ) + + hapticImpact() + }, + } + ) + } + + return { + control, + errors, + isSubmitting, + submit: handleSubmit(onSubmit), + } +} diff --git a/src/hooks/forms/useSignInForm.ts b/src/hooks/forms/useSignInForm.ts index 1783a4ec..82fa1f61 100644 --- a/src/hooks/forms/useSignInForm.ts +++ b/src/hooks/forms/useSignInForm.ts @@ -65,10 +65,10 @@ export const useSignInForm = () => { } return { - submit: handleSubmit(onSubmit), - isSubmitting, control, errors, + isSubmitting, setFocus, + submit: handleSubmit(onSubmit), } } diff --git a/src/i18n/translations/en.json b/src/i18n/translations/en.json index 78f63cb8..f7579a8e 100644 --- a/src/i18n/translations/en.json +++ b/src/i18n/translations/en.json @@ -169,6 +169,12 @@ "go_to_typography": "Go to Typography", "header": "This is Example screen" }, + "forgot_password_screen": { + "back_to_login": "Back to login", + "forgot_password": "Forgot password?", + "no_worries": "No worries, we’ll send you reset instructions.", + "reset_password": "Reset password" + }, "home_screen": { "details": "Details" }, diff --git a/src/i18n/translations/pl.json b/src/i18n/translations/pl.json index 5f82c33f..e6f288d0 100644 --- a/src/i18n/translations/pl.json +++ b/src/i18n/translations/pl.json @@ -168,6 +168,12 @@ "go_to_screen_with_BEdata": "Idź do widoku z danymi z backend-u", "go_to_screen_test_form": "Idź do formularza testowego" }, + "forgot_password_screen": { + "back_to_login": "Wróć do logowania", + "forgot_password": "Zapomniałeś hasła?", + "no_worries": "Bez obaw, wyślemy Ci instrukcje resetowania hasła.", + "reset_password": "Zresetuj hasło" + }, "home_screen": { "details": "Detale" }, diff --git a/src/navigation/tabNavigator/components/HeaderLogo.tsx b/src/navigation/tabNavigator/components/HeaderLogo.tsx index dd4653af..09db93c9 100644 --- a/src/navigation/tabNavigator/components/HeaderLogo.tsx +++ b/src/navigation/tabNavigator/components/HeaderLogo.tsx @@ -1,16 +1,14 @@ -import { darkLogoFull, darkLogoSygnet, lightLogoFull, lightLogoSygnet } from '@baca/constants' -import { useColorScheme } from '@baca/contexts' +import { CompanyLogo } from '@baca/components' import cssStyles from '@baca/styles' import { Pressable, Text } from '@bacons/react-views' import { Link } from 'expo-router' -import { Image, Platform, StyleSheet, View } from 'react-native' +import { Platform, StyleSheet, View } from 'react-native' import { useWidth } from '../hooks' import { TabColorsStrings } from '../navigation-config' import { cns } from '../utils' export function HeaderLogo() { - const { colorScheme } = useColorScheme() const isLargeHorizontal = useWidth(1264) return ( @@ -40,29 +38,23 @@ export function HeaderLogo() { }, ]} > - - )} @@ -85,8 +77,7 @@ const jsStyles = StyleSheet.create({ alignItems: 'center', borderRadius: 8, display: 'flex', - margin: 0, + marginVertical: 8, + padding: 8, }, - logoSygnet: { height: 60, width: 40 }, - logoWide: { height: 60, width: 150 }, }) diff --git a/src/screens/ForgotPasswordScreen.tsx b/src/screens/ForgotPasswordScreen.tsx index edfd166b..2e002cc6 100644 --- a/src/screens/ForgotPasswordScreen.tsx +++ b/src/screens/ForgotPasswordScreen.tsx @@ -1,4 +1,14 @@ -import { useScreenOptions, useTranslation } from '@baca/hooks' +import { + CompanyLogo, + ControlledField, + FeaturedIcon, + KeyboardAwareScrollView, +} from '@baca/components' +import { REGEX } from '@baca/constants' +import { Button, Center, Display, Spacer, Text } from '@baca/design-system' +import { useForgotPasswordForm, useScreenOptions, useTranslation } from '@baca/hooks' +import { router } from 'expo-router' +import { StyleSheet } from 'react-native' export const ForgotPasswordScreen = () => { const { t } = useTranslation() @@ -7,5 +17,53 @@ export const ForgotPasswordScreen = () => { title: t('navigation.screen_titles.forgot_password'), }) - return <> + const { control, errors, submit } = useForgotPasswordForm() + + return ( + +
+ + + + + + {t('forgot_password_screen.forgot_password')} + + {t('forgot_password_screen.no_worries')} + + + + + + +
+ + ) } + +const styles = StyleSheet.create({ + contentContainerStyle: { padding: 32 }, +}) diff --git a/src/screens/SignInScreen.tsx b/src/screens/SignInScreen.tsx index 72944339..b9f41014 100644 --- a/src/screens/SignInScreen.tsx +++ b/src/screens/SignInScreen.tsx @@ -1,6 +1,11 @@ -import { ControlledField, KeyboardAwareScrollView, LanguagePicker, Version } from '@baca/components' -import { REGEX, darkLogo, lightLogo } from '@baca/constants' -import { useColorScheme } from '@baca/contexts' +import { + CompanyLogo, + ControlledField, + KeyboardAwareScrollView, + LanguagePicker, + Version, +} from '@baca/components' +import { REGEX } from '@baca/constants' import { Box, Button, Center, Row, Spacer, Text } from '@baca/design-system' import { useCallback, @@ -10,12 +15,10 @@ import { useScreenOptions, } from '@baca/hooks' import { useRouter } from 'expo-router' -import { StyleSheet, Image } from 'react-native' export const SignInScreen = (): JSX.Element => { const { push } = useRouter() const { t } = useTranslation() - const { colorScheme } = useColorScheme() useScreenOptions({ title: t('navigation.screen_titles.sign_in'), @@ -40,13 +43,9 @@ export const SignInScreen = (): JSX.Element => {
- - + + + { ) } - -const styles = StyleSheet.create({ - logo: { - height: 100, - width: '100%', - }, -}) diff --git a/src/screens/SignUpScreen.tsx b/src/screens/SignUpScreen.tsx index dee3915d..6b10b13a 100644 --- a/src/screens/SignUpScreen.tsx +++ b/src/screens/SignUpScreen.tsx @@ -1,4 +1,4 @@ -import { ControlledField, KeyboardAwareScrollView } from '@baca/components' +import { CompanyLogo, ControlledField, KeyboardAwareScrollView } from '@baca/components' import { Button, Center, Spacer } from '@baca/design-system' import { useScreenOptions, useSignUpForm, useTranslation } from '@baca/hooks' import { useCallback, useEffect } from 'react' @@ -25,6 +25,9 @@ export const SignUpScreen = () => { return (
+ + + Date: Thu, 21 Mar 2024 14:30:48 +0100 Subject: [PATCH 03/20] pass current email to forgot password screen --- src/hooks/forms/useForgotPasswordForm.tsx | 7 ++++++- src/hooks/forms/useSignInForm.ts | 2 ++ src/screens/ForgotPasswordScreen.tsx | 21 ++++++++++++++++----- src/screens/SignInScreen.tsx | 7 +++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/hooks/forms/useForgotPasswordForm.tsx b/src/hooks/forms/useForgotPasswordForm.tsx index 2481e31b..e772e0d9 100644 --- a/src/hooks/forms/useForgotPasswordForm.tsx +++ b/src/hooks/forms/useForgotPasswordForm.tsx @@ -1,6 +1,7 @@ import { useAuthControllerForgotPassword } from '@baca/api/query/auth/auth' import { AuthForgotPasswordDto } from '@baca/api/types' import { handleFormError, hapticImpact } from '@baca/utils' +import { router } from 'expo-router' import { useForm } from 'react-hook-form' const defaultValues: AuthForgotPasswordDto = { @@ -15,6 +16,7 @@ export const useForgotPasswordForm = () => { control, formState: { errors }, handleSubmit, + reset, setError: setFormError, } = useForm({ mode: 'onTouched', @@ -25,7 +27,9 @@ export const useForgotPasswordForm = () => { forgotPasswordMutate( { data }, { - onSuccess: () => {}, + onSuccess: () => { + router.replace('/reset-password-sent') + }, onError: (e) => { handleFormError( e as unknown as keyof AuthForgotPasswordDto, @@ -44,6 +48,7 @@ export const useForgotPasswordForm = () => { control, errors, isSubmitting, + reset, submit: handleSubmit(onSubmit), } } diff --git a/src/hooks/forms/useSignInForm.ts b/src/hooks/forms/useSignInForm.ts index 82fa1f61..bddc2f77 100644 --- a/src/hooks/forms/useSignInForm.ts +++ b/src/hooks/forms/useSignInForm.ts @@ -27,6 +27,7 @@ export const useSignInForm = () => { const { control, formState: { errors }, + getValues, handleSubmit, setError: setFormError, setFocus, @@ -67,6 +68,7 @@ export const useSignInForm = () => { return { control, errors, + getValues, isSubmitting, setFocus, submit: handleSubmit(onSubmit), diff --git a/src/screens/ForgotPasswordScreen.tsx b/src/screens/ForgotPasswordScreen.tsx index 2e002cc6..86a84452 100644 --- a/src/screens/ForgotPasswordScreen.tsx +++ b/src/screens/ForgotPasswordScreen.tsx @@ -6,8 +6,8 @@ import { } from '@baca/components' import { REGEX } from '@baca/constants' import { Button, Center, Display, Spacer, Text } from '@baca/design-system' -import { useForgotPasswordForm, useScreenOptions, useTranslation } from '@baca/hooks' -import { router } from 'expo-router' +import { useForgotPasswordForm, useScreenOptions, useTranslation, useEffect } from '@baca/hooks' +import { router, useLocalSearchParams } from 'expo-router' import { StyleSheet } from 'react-native' export const ForgotPasswordScreen = () => { @@ -17,7 +17,15 @@ export const ForgotPasswordScreen = () => { title: t('navigation.screen_titles.forgot_password'), }) - const { control, errors, submit } = useForgotPasswordForm() + const { email } = useLocalSearchParams<{ email?: string }>() + + const { control, errors, reset, submit } = useForgotPasswordForm() + + useEffect(() => { + if (email) { + reset({ email: decodeURIComponent(email) }) + } + }, [email, reset]) return ( @@ -29,13 +37,16 @@ export const ForgotPasswordScreen = () => { {t('forgot_password_screen.forgot_password')} - {t('forgot_password_screen.no_worries')} + + {t('forgot_password_screen.no_worries')} + { testID="emailInput" /> - diff --git a/src/screens/SignInScreen.tsx b/src/screens/SignInScreen.tsx index b9f41014..a820a546 100644 --- a/src/screens/SignInScreen.tsx +++ b/src/screens/SignInScreen.tsx @@ -24,7 +24,7 @@ export const SignInScreen = (): JSX.Element => { title: t('navigation.screen_titles.sign_in'), }) - const { control, errors, submit, isSubmitting, setFocus } = useSignInForm() + const { control, errors, submit, getValues, isSubmitting, setFocus } = useSignInForm() useEffect(() => { setTimeout(() => { @@ -34,7 +34,10 @@ export const SignInScreen = (): JSX.Element => { const navigateToSignUp = useCallback(() => push('/sign-up'), [push]) const navigateToAppInfo = useCallback(() => push('/application-info'), [push]) - const navigateToForgotPassword = useCallback(() => push('/forgot-password'), [push]) + const navigateToForgotPassword = useCallback( + () => push(`/forgot-password?email=${encodeURIComponent(getValues('email'))}`), + [getValues, push] + ) const focusPasswordInput = useCallback(() => setFocus('password'), [setFocus]) return ( From bfa82b99369ce5bbcdc2ac1a0bc4f157e07c8901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Thu, 21 Mar 2024 15:40:01 +0100 Subject: [PATCH 04/20] add reset password link sent screen --- .../reset-password-link-sent.tsx | 2 + src/hooks/forms/useForgotPasswordForm.tsx | 7 +- src/i18n/translations/en.json | 8 ++ src/i18n/translations/pl.json | 8 ++ src/screens/ForgotPasswordScreen.tsx | 2 +- src/screens/ResetPasswordLinkSentScreen.tsx | 74 +++++++++++++++++++ src/screens/ResetPasswordScreen.tsx | 3 + src/screens/index.ts | 2 + 8 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 app/(app)/(not-authorized)/reset-password-link-sent.tsx create mode 100644 src/screens/ResetPasswordLinkSentScreen.tsx create mode 100644 src/screens/ResetPasswordScreen.tsx diff --git a/app/(app)/(not-authorized)/reset-password-link-sent.tsx b/app/(app)/(not-authorized)/reset-password-link-sent.tsx new file mode 100644 index 00000000..dcfec1d5 --- /dev/null +++ b/app/(app)/(not-authorized)/reset-password-link-sent.tsx @@ -0,0 +1,2 @@ +import { ResetPasswordLinkSentScreen } from '@baca/screens' +export default ResetPasswordLinkSentScreen diff --git a/src/hooks/forms/useForgotPasswordForm.tsx b/src/hooks/forms/useForgotPasswordForm.tsx index e772e0d9..db1aa3f2 100644 --- a/src/hooks/forms/useForgotPasswordForm.tsx +++ b/src/hooks/forms/useForgotPasswordForm.tsx @@ -8,7 +8,7 @@ const defaultValues: AuthForgotPasswordDto = { email: '', } -export const useForgotPasswordForm = () => { +export const useForgotPasswordForm = ({ onSuccess }: { onSuccess?: () => void }) => { const { mutate: forgotPasswordMutate, isLoading: isSubmitting } = useAuthControllerForgotPassword() @@ -27,8 +27,9 @@ export const useForgotPasswordForm = () => { forgotPasswordMutate( { data }, { - onSuccess: () => { - router.replace('/reset-password-sent') + onSuccess: (_, { data: { email } }) => { + if (onSuccess) onSuccess() + else router.replace(`/reset-password-link-sent?email=${encodeURIComponent(email)}`) }, onError: (e) => { handleFormError( diff --git a/src/i18n/translations/en.json b/src/i18n/translations/en.json index f7579a8e..c196b209 100644 --- a/src/i18n/translations/en.json +++ b/src/i18n/translations/en.json @@ -69,6 +69,7 @@ "home": "Home", "main_tab": "MainTab", "not_found": "Not Found", + "resetLinkSent": "Reset link sent", "settings": "Settings", "sign_in": "Sign in", "sign_up": "Sign up", @@ -184,6 +185,13 @@ "login_cta": "Log in", "sign_up": "Sign up" }, + "reset_password_link_sent_screen": { + "check_email": "Check your email", + "click_to_resend": "Click to resend", + "did_not_receive": "Didn’t receive the email?", + "open_email_app": "Open email app", + "we_sent_link": "We sent a password reset link to" + }, "settings_screen": { "copy_push_token": "Copy push token", "current_theme": "Current theme: {{theme}}", diff --git a/src/i18n/translations/pl.json b/src/i18n/translations/pl.json index e6f288d0..8adf89d8 100644 --- a/src/i18n/translations/pl.json +++ b/src/i18n/translations/pl.json @@ -69,6 +69,7 @@ "home": "Home", "main_tab": "MainTab", "not_found": "NotFound", + "resetLinkSent": "Link wysłany", "settings": "Settings", "sign_in": "Sign in", "sign_up": "Sign up", @@ -183,6 +184,13 @@ "go_to_blog": "Otwórz blog", "go_to_form": "Otwórz pełno ekranowy formularz full" }, + "reset_password_link_sent_screen": { + "check_email": "Sprawdź skrzynkę e-mail", + "click_to_resend": "Wyślij ponownie", + "did_not_receive": "Nie otrzymałeś wiadomości e-mail?", + "open_email_app": "Otwórz aplikację e-mail", + "we_sent_link": "Wysłaliśmy link resetujący hasło na" + }, "settings_screen": { "current_theme": "Current theme: {{theme}}", "selected": " - wybrano", diff --git a/src/screens/ForgotPasswordScreen.tsx b/src/screens/ForgotPasswordScreen.tsx index 86a84452..80d94d31 100644 --- a/src/screens/ForgotPasswordScreen.tsx +++ b/src/screens/ForgotPasswordScreen.tsx @@ -19,7 +19,7 @@ export const ForgotPasswordScreen = () => { const { email } = useLocalSearchParams<{ email?: string }>() - const { control, errors, reset, submit } = useForgotPasswordForm() + const { control, errors, reset, submit } = useForgotPasswordForm({}) useEffect(() => { if (email) { diff --git a/src/screens/ResetPasswordLinkSentScreen.tsx b/src/screens/ResetPasswordLinkSentScreen.tsx new file mode 100644 index 00000000..d29dce85 --- /dev/null +++ b/src/screens/ResetPasswordLinkSentScreen.tsx @@ -0,0 +1,74 @@ +import { CompanyLogo, FeaturedIcon, KeyboardAwareScrollView } from '@baca/components' +import { Button, Center, Display, Row, Spacer, Text } from '@baca/design-system' +import { useEffect, useForgotPasswordForm, useScreenOptions, useTranslation } from '@baca/hooks' +import { showSuccessToast } from '@baca/utils' +import { router, useLocalSearchParams } from 'expo-router' +import { StyleSheet } from 'react-native' + +const navigateToLogin = () => { + router.navigate('/sign-in') +} + +export const ResetPasswordLinkSentScreen = () => { + const { t } = useTranslation() + + useScreenOptions({ + title: t('navigation.screen_titles.forgot_password'), + }) + + const { email } = useLocalSearchParams<{ email?: string }>() + + const { reset, submit } = useForgotPasswordForm({ + onSuccess: () => { + showSuccessToast({ description: 'Password link resend' }) + }, + }) + + useEffect(() => { + if (email) { + reset({ email }) + } + }, [email, reset]) + + return ( + +
+ + + + + + {t('reset_password_link_sent_screen.check_email')} + + + {t('reset_password_link_sent_screen.we_sent_link')} + + {email} + + + + + + {t('reset_password_link_sent_screen.did_not_receive')} + + + + +
+ + ) +} + +const styles = StyleSheet.create({ + contentContainerStyle: { padding: 32 }, +}) diff --git a/src/screens/ResetPasswordScreen.tsx b/src/screens/ResetPasswordScreen.tsx new file mode 100644 index 00000000..88155262 --- /dev/null +++ b/src/screens/ResetPasswordScreen.tsx @@ -0,0 +1,3 @@ +export const ResetPasswordScreen = () => { + return <> +} diff --git a/src/screens/index.ts b/src/screens/index.ts index af3f4550..e6bf5296 100644 --- a/src/screens/index.ts +++ b/src/screens/index.ts @@ -10,6 +10,8 @@ export * from './ForgotPasswordScreen' export * from './HomeScreen' export * from './NotFoundScreen' export * from './ProfileScreen' +export * from './ResetPasswordLinkSentScreen' +export * from './ResetPasswordScreen' export * from './SettingsScreen' export * from './SignInScreen' export * from './SignUpScreen' From 6cc242d101f080b744ee653f5515bad6b6d3c475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Fri, 22 Mar 2024 11:11:11 +0100 Subject: [PATCH 05/20] add small style fixes to header logo style --- src/navigation/tabNavigator/components/HeaderLogo.tsx | 10 +++------- src/navigation/tabNavigator/components/SideBar.tsx | 2 +- src/styles/root-layout.module.scss | 4 +--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/navigation/tabNavigator/components/HeaderLogo.tsx b/src/navigation/tabNavigator/components/HeaderLogo.tsx index 09db93c9..4eb285b6 100644 --- a/src/navigation/tabNavigator/components/HeaderLogo.tsx +++ b/src/navigation/tabNavigator/components/HeaderLogo.tsx @@ -1,6 +1,6 @@ import { CompanyLogo } from '@baca/components' import cssStyles from '@baca/styles' -import { Pressable, Text } from '@bacons/react-views' +import { Pressable } from '@bacons/react-views' import { Link } from 'expo-router' import { Platform, StyleSheet, View } from 'react-native' @@ -28,7 +28,7 @@ export function HeaderLogo() { > {({ hovered }) => ( - - + )} @@ -66,8 +66,6 @@ export function HeaderLogo() { const jsStyles = StyleSheet.create({ headerContainer: { - height: 96, - minHeight: 96, paddingTop: 0, }, headerLink: { @@ -76,8 +74,6 @@ const jsStyles = StyleSheet.create({ headerLogo: { alignItems: 'center', borderRadius: 8, - display: 'flex', - marginVertical: 8, padding: 8, }, }) diff --git a/src/navigation/tabNavigator/components/SideBar.tsx b/src/navigation/tabNavigator/components/SideBar.tsx index 27c7de5e..ea94fa78 100644 --- a/src/navigation/tabNavigator/components/SideBar.tsx +++ b/src/navigation/tabNavigator/components/SideBar.tsx @@ -65,7 +65,7 @@ export function SideBar({ visible }: { visible: boolean }) { > - + {upperSideTabs.map((tab) => ( {tab.displayedName} diff --git a/src/styles/root-layout.module.scss b/src/styles/root-layout.module.scss index c65cb1bc..6046563b 100644 --- a/src/styles/root-layout.module.scss +++ b/src/styles/root-layout.module.scss @@ -15,8 +15,6 @@ $ui-sidebar: 244px; // Header Logo .headerContainer { padding-top: 0px; - min-height: 96px; - height: 96px; } .headerLink { @@ -87,5 +85,5 @@ $ui-sidebar: 244px; } .sideBarHeader { - align-items: center; + align-items: stretch; } From f9a96dd7424ca3cd29d151bbe59593c8350d179a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Fri, 22 Mar 2024 11:53:19 +0100 Subject: [PATCH 06/20] remove full logo --- assets/logo/logo-full-dark.png | Bin 15683 -> 0 bytes assets/logo/logo-full-light.png | Bin 21203 -> 0 bytes src/constants/images.ts | 3 --- .../tabNavigator/components/AppHeader.tsx | 23 ++++-------------- 4 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 assets/logo/logo-full-dark.png delete mode 100644 assets/logo/logo-full-light.png diff --git a/assets/logo/logo-full-dark.png b/assets/logo/logo-full-dark.png deleted file mode 100644 index a14668ad3a815802cd2461433f55150f745aaf56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15683 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 LG!<**tv>$`_+2r+ diff --git a/assets/logo/logo-full-light.png b/assets/logo/logo-full-light.png deleted file mode 100644 index 5f767a5a273e4b401fa3af58f2f3784107821361..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21203 zcmeFZV{m5OyC>XH$F@63$F{AGZQJ%8b!^+Vb*JNwZQHh;ym|iTocF^yXQpauYCcTW zeA~PB-mCV)wbu2+T4D0C;_xsyFyFp?gO~UvqWJ9_$lcfV5Y+dtD+>Y=pRXHmGeH@_ zZ{O--VBZWNzI_w;CLtoI><)6C1+9-Z|30{xu`JW$ov{A&0I5ujg4{pTy{*h#dwf_Q9;T^sGJKEHN*g#;SD;bCOj% zbw-9NjkjN03LS}i$9PhH+_3ynf_0v`iz%t?y_?5m4|g>B91F4RV8BxLW*q~_gXW%ktJO4ye8*5<;Usj25;(IyiQw5t;tT3>Jklh#9yOL- zG~eDex6Fg<3nf#}QRH^U!L}frJaGb<`&suM=WRg3ofJ&TrU2)UJjLMcTh+IOF)7$l z!pNp(FX8zE^^PU8qDV8N`!{$MD@yW0R0qe5pMl8Jrgd7OzcP*9PoAuSc(x@R5IvnS zP3oAH4smHFbn|i)qkZLya-v9MDVB;kh8aXs^lFk`-&WCGC~y+bN&3f2#gNN$*OX7n ztQC5^lwi)sTJ=@LyMeXN)%`U=DrfZgZY{vw+vFU4>I7nfij-j|oMm0QCJ0HLkKzwF zHCGlJ18m)QzjREaED8fW!ivF3>EF-{ApieR`1c!xZ=jTe8!U)+gUlO!g*L!09p>;q z_$^={0yxYpuFk8~6WaQx0~sL^C1$Ia7gi&ov&4M^urVjf9OuXTvYZ!&;*<@oPRRLB zC7)t5^>e&Cu8sV z?=vJV$+&j=y1u#PY9clHAQ70N&T^J-Q=<`l>v!(Ldu6+uiIf-4^*h5%*A_B6CKNDm z@0qqo*>~pQsj6DmqSQ2Z4LQe_ZG+)syTHzlRzs`-Xkhkv2)@Nkh%u~kSqYEyvop)EhtC?dvPTA&G;61L!x zhlHJj(Y-B=nvIw&jy1hO95-5-Xli=4geyu}q6AV#YrOy_wOlggI_XVq!^>c}#)at4 zw!GQ;V5<~1h*@8oRUHxA)Z5s<2kU>=U0-2*v<$8&+fj__btq-Gq(krA(lXfquXZUh zNV~fH2wpFH=PoroVQ#Ki;oG?#Unk4kd8rGklYKOCWZ-g9gb9}7>dxA45pvmB!uv)NyXiWk#3ze?<(hdw)kPq+gU9BV;>X%Fbq_`Z-CXTivD<~ z?rAczJ8kd|z(*BdeLU7KfIUc7S+O#tk8f^?GHxVkSKASNiEY{^ZoMLKAZcX3e%Ls+ zc_^Uo+6h_-jnCH?scA2U_tYY$A5k^%g+1r^(Qf7Qbw{sr2#f zMQ|~m#~R^BftJDLqOu>*l16s6L;GyYvPTH^AHT}M(lw;5?Iql~(lLLE*tjV-XIYoPuAz2`{{}(t zDHnII*r0W1>pgz&vfG7!Mm{y=;u1OwRaBOmT~O3*F$W;bz|JfJd*rMCwQ8@4uRf{b z!2A>CZHLXXVH`SpbTDvyDrMzv<5+UHo})`oJ!_YB9}97G)hTh#9IjX5_^HRikms1ujO> zLhUk`XmR?0E^(om;!vrK)Q`0LKz3f%#cxPz<>z4hY1I?Kg)nd}+Rvt@f#>N7N2hfo zjiYgGC1al@ikIM9MyV|}|6Tb)`5G`{Wu%&trYbOFk>zoRG^$BTvSWXfmM%Npu5FML z)=fbsV8u50pZ{n(DPac9)GAeMVULFmNJCW9&DorcVMlBv zuLZX@TwaS=;Pp~>N`nfx*{)BMbm^Ph+-P;t$MXh&0%q0C=SU-QxcZPya#`a%0tMOg3R{v_J6gkJ$}MTIlHlW3JZe5M^nKnqj}Eh5X(gS)R}yfo9f)-wj)Pt zc=e||%pqr@V`WXfexk7f{F8zo&&CTHNeS^6ciP)OK+A6+-wv4>ok1oZ{NjajLcnt_ z8dJ_TA~QdnK?G~%bb8oRq8sJxzJV4PUBq!Hi9J))QPv%ar-6hSX!O7P>igh5OQnUQ zz2()UW=Z@^8cA>;z?S5I@hE!zzHU5oamTx>oens&6!)2--Wz8bwEKa+1pq%4@ zt?wibH}j2!58yf`4Je)owQnB9DvZ&z6uMh$3r$P>G$N-r!@k;&@e_){Q(sZgn21XmF)JEp2R5i9*9HAo8Q$0=xP~hqiuAHPo zd=$y1MZbV>%q^E&e@^tas(D$!PH|tg$sEZlEc8jKO25I3GJOp%(!`sMKLf^h3SP-O z?g^};s8d>G03hr-LIqG^sSw!;%4D>X-TlIIB4Z`g z6VI%aSN@L25SCF+;(lYsu=j-|zz+MFfRxl7ROJnTmDS*^oT;qRbJDk6`G)qRPHRg#Wo}nA6#+@}jxcDrk#T++r1Yj2drAyirDi)(L8?c9}?2 zydn8mr%gslE6SNWK8xP;osu+j`Z%5;Ab78d6W`Q zu9o;SgIJXiraCItdnWN;FmpfVZ`PY%grq*J3+U&VHSm~l0{3tgbDFxoN7{r5yO@`Y^V*9P-r)A(2zzobI06Cay6)5@<=bl5lV$H~S!Z*R1iQEP`6WF# zUCYy!1VJ<<>JYr2E$xv~M~p9G)gy0K7))nPuw7Pa5v+d--Fc*^>sKjcpzGRGIntLI z^puK$nx0BnPM9p(Ow2(lY^I=)r2l-bhyU3=<90T|=`M3LnuDm#!+7Yg@dI^94%*pD zknmMaII3-5!r;K=E!G^!!|FvpZ@s~+-<^DezdV$GsSWhO!Aby^@>j|F2u`ahbxbU7 zoV;EZc^NCkn5$=B=rPH$uB484eP?+Sx$!CN zv=q(873OJgS%1IMt>-xbfIXPdOwg21RhDnA&~-3Am~+&|qi&JW$Q0wwhHawTY=PWD z5%^1(PWwi5-m~t33{VoKi;)_#Et7HMQB89VNqAn{s;H^%ksW(*JjB*I*Vr8VeSt5- zl7gk%={a@3dvLK)B4!O=L0!Sp@&r`*@7xZ}y!OE+rd?^%4z3mZ2D1Z`vd4bXe`~`W2)44D1AZy(l_N4u~46a-j*M? zWbq4Gs|nc-suQHq)%BnlmC~svVNM25Duwk}7Ng4+^?de=^f4lHDh3KU?uC!5;FeBV zNa_hY!5|j_|4w!f4NV_DV20nu|IJ+B2@1cm__+X~xRryp2nSvHUZI1eQ2Uaq=%Xk3 z%)Ep=Uhk2*>bxG)Zh}G=p*Hbbj8^JH{=hRNX9Nk}gy(^@YSs&XCYBH)Hi` zomOQiuDS#u0+Gsdo&)CHmJS|RdpMQP5f@aG0aRLBUAVoakitZdv^ll_W3vigx&Gr{ z0nZG$!OolhBQBvfrh4Al$BX&#p5G?z&9b4>KI_JhUW($_A6Bqe++(KhD&ic#XUdbJ zW;Z(jT(ZSbI%1>WVd2cJV5)SHztF(uN6qk`GB0H^Z2DSAMK)CuW`_rW8Gb;`u{znkjs zG{cm1*&AK@DZq8*ox-B1`A@Qr>`H*@BCn2O;$A?|62mJRHNTV&KU&%zt3xXXs}6Ej zGx=g((b3cl9rRcMfrwo^_b@kD$M2y%;#S8^?uR9fW*W^qdkPZ%q(8NE9E((2z%~>U=X9@i9npAep!kN8JLz`7O*<%2N(YfwRw~ zRA%dtA<7qb)ll5VW}s>8SSann1uL6IBrkJkPR=!E!8UhNsSeEbrN1F0wLMC5_s-q) z`tHrITsINnNX1%&Bbf922LV3Sw-S#tZylp^oucfU-k@RyfO?X!xA%Fp;w9V``ell{ zX(AW(wE83OHfMvMom()LN<1e5uF=3QJMyXlB=OO7dl?)WRWDD`Q&VmJ<`VlDUD|jt zojFJQdI}5}%=0Y}pDJ|RZ{5Po-BBE3#J1mtbAmce!OD($4KaLea$%^8tw_0DXv37Q z?*?8aW17p(>4da(5Gj}{u@EM01G8*z&P9TDfLVFxzN)O@``hNemGg45##a7j6C>Xkfr|X8^Gusl&YB`o^v$16p7qlf z$^EoJWSA=`f~-uQ#e=0h!55?H$lNZ{U`Ib=tL!2eP)kp*YAnlCU%9CZEUVqtePUYFoEnC%kQe z=>0s@Fx#K4_Q7aTLz(z}&A{T+pQ!2AO|8KzDctHOLhzB|cGR>~zR0f*8)1R{INqOd z2Jae`%@o^lPf&HxrueOY>KcmoUrgjFYve`ly(n`TdbKvwbc;)kRT!LxgP`wBz71xlV?uBR(?Jfe-ZgF&Uo=;}_&i)fB%H4#ZALp#<6`L*)Rp1Gvr!{jG86~01`Sf0F5Mc7uy zLrlGd&Zrg|XM?})Agy^1(Xn5Mj0GAs6T50Tf9-dfXB0HKV?L_VgN%xwTE7RX6=C#N zvZs+m`jm9E2IIt=m^h*phRAb{hbzlpVYad;#q`umV#|~)*klskq08_?p!ed%2MQIb zTJz17|BwR9yB}@8NUFu9WKhigU08wvEzS2m-vCQhH`2a6tl@iSWb!o1?>rf19#5p8 zYpto=oGWzIOur6L2UxHuCrpSh+T|e{Pl0pdkoFTw=eU4Ex6r&akhEQGjp#8lhK=_| zM~ZovkS1sy#OMXuFtF4YR+w&XLZq9j-6|>m^AvF)CoSeeFqGjznqIKzno3)?JM(uD zW>OvY>F-CQ{An2W;R`zSyg8Z97;k(RZ)aC7HNn^=_8Os`*cVDi?`q@v%nOp=px$g$ z#SqVa{yY^oLrfIY`%V0L;`TPl`47~G)faHIngTSO+xW9IiOzXJ@+VPAB~}RyNWHRY ze?eq&wP0J#VerWSn3bqYM~Pwiwk?(jIXb?pb?fgj-&(z}i1wM*kb-F&S`z>8 z4~}NEk{UW^;k&cid*0BeKH`Rh1<^CxD zT6~yS+T+vobq)S~nf5Pn0@voLQm;37P7v)PY=h69?6-dhK1T-}5 z=a!RM1|Pw9w{+B1W7Mzy%LHdR?CtDaG|^oN%Ipcg;QdG|XyOfFk-6u&U+P4le;ow> z0!8Z!`8nJtErL{YjieiYcyv-1o^%?u?}dc1$*$EILC9i51)7_VMyzpCWQaFdUzLyAy=zPZp+5G9{k1e1{2A3 z51r9RLeH}h&QnHXTr$^5@Yamq6>XqfE3HyC{MYi+mt9s)1mIL>yJ>j zrz~abgmFZo>gjqK3-b4pW+ur1>dj;!?x3{{)1$|affZbC>WFnlKWQjutq55^>-Hn8 zy{9#o%`D_a(U0wk!-@3_)VefC!9qRtqvGXb=&pZYgk)MtEZ&QR%xAV-;=T)=_E|Wz zvDiN$2Zx>iF%c2yXtbymos=iEV?AkPq!Vmrzo*aj*UPZ_8QU&JLhpqO zG-Eo4hq6f5InDg4+qsD7pCA#-zcS;O2&t>ZS|UDif}rx`Y#1l?(@900_9?PhK}-QZ za9%YnI@|3*d0+=!XT!!sObo_&kEkKEc^6xMEw{H@kJ8L_+80cqWAxqaZ`*mE^#2cZ`Q+al!F9?9(7_G?)#u5J@IAo2dWKQK8xtZclGfRww; z$th9!RYXRaS2Zp2G)x+GtGaqnR{am`f^~)Og7Ji-6G-CJhHimh|8qjxeZmP`o!M4H zv$P$@QKQ*l01AdKtEQAoCm!cS58cM|3IorsYjV1RF33HoN(?8qP5ZpzP|OmP>x--F zPWYIl3dx9l(#bmg-R}l*VXXoywlqFpx-@UB+51@7Y&+vj0^U#iU5O5waToFT(>Td! zA|n_V84;qosWSDi?skIHIc2C%k0Yf8r{p0Y}b#*t$d-WJ5oqK zxo6$L(%%;@OL};NEg@?DQYo*ZdZfN9&G9!Rx=t-7K z1DIU{w3!OpfK>j@o|{dJ^w$B>P)O`3Tn$cQ`pRTsq#dbCF|qIfA@w>MP+ZF_)AF!k z7^|`pN5(a|{HLYuF!u;~LB!8*n@{my=}SPU&*NKE>`fBcsVg3{W@X=#_oGM+ zYqs28?7;q$cVdJP!6ahgssf!-ZmbeW4DH^YKME%H3fiXt(X*B~wk-Skg_abtiGB`w zjkd)K-P$194I96Fnz#H(mhQ$hB9Uaoh}?p9hg-gXsMgSMl*;z6dsJm6-*DxhRSw~E zBFNoG#v*s{%JQMJ7=dNNM9ur%rd^@TXe$b{-xaz=!#D|VHoGIBjlKd@vV85tK8OpU zR#ifY55A>FWG$~YS9yu)2*-f7asq)W?VcjCOSs!tR;fJJc=?8QUSV~7pBES zPiYeb0{A-QLdWHCqpU6(QT^#@sKB`p-zFzoUTb^BzmCDnW}e3vCNBy7_y zo}c=wVdfAlWmYULvvdiASCyiva}GvcFb{M^q3m?(=Bi^o6*q^$ebRDUzb~3Zx*>=TT~RFo}q%~KNKLq z?xjvZOv+3B{l{Jlmlg45daww}n0Rn0a;p*|`6kQ1HT9Xg%XJwCWxnaIsJ~yJl8#{)k8#vg?dqeHiX{m=N=5zCN3g4~L*Gk2mq% z{jOiROkqTgyTX8+3hUtrugemC?AAw#!_*G$@ zLE5TF#145m95b*86cbKd@DfQdV~UjEclLhAJuGQDspDa=L)O$f36p6I0=7wRi*hC1>=kqezohT*I+-m0cgj->m$od(P?Lj5NACS*xV z@Xt0)wv`1051AfG8>qxv@jZAkDVxERd6$enTo3p~19WiSMHK;Jte)zay{OMhkNv0> z3~ld$vv^=ljm(MX2-pgouq{<`YDbd}4|t{MnO`DpIyU`M$N9*EFjNbx?pN&7+EjX@ z2jMlG9aAc$x_wP0(FjrgZ5G6^>z|j-EYg)mP>Y;c5&ca9ycCU|<3S?@}70YC0hJ8x{MwlGdR;#861OU`h5kRVlquN^cCZQHepgs7*ZXf25m|g!8sSedSL1PemAF8 z>0qpg$xnK_np2N>l^;S%E2D`$`!mcJAYvitB}?_Sn%6W;+naTb?o={d`6Vjs!&)Bq z(;?a_#;eB?i|+-w1>}{%1*;s$QXS6}BG>VFN;^FakS85|z+OESGiP|?Cb}eTt18ac zGhx^17t=9y3DNc2KFN`X1g+K+D-Bi4z*%ITkEv(8%MEL2qvb&j#{LHMI)hXIm(F#! zIb)T^%~L$nVt;*>6X_3H5JJ0*2KXz=8ubqRRpbM*zTA5&-19@{8myw(+Ps)qK7bl# z8%(31`iv*c3*XoX4;D-a`&1$I_>fjmSLqE+$rop0hp*+L_AUM;qP~IwJs&}kq0D}e zdW#WM88*53=3Z^EtLnuUP`-w3lzDE1<9RqbMZ*ayi7p=u!|OkWA4izJwmxA+6kK?- zQYB%1b(HA_ZOks*rQ`QYpC0UdPsW=^aFBp|biLhA)f9X@r;)O7Fu6zgMzmn4@kW3e zHOtE)fs9W#07f)a%DSpxUe>$8R($-sjMj30Wq7oYmAovP-RC2qLEsF`@H!u zp%M~S`fyMh&+`723)BOWcTnvm*F{6G16{W{$&s@Lvf`TAr<5hpQ}dt)8A8hSpYk)R zbnHv`hcAkpTjcSpWlclIO1EBdt+Kl#KiH>sq(m%Hj;*TsT5O$vS+A5IqB~Eqh#TSY zVW682EEmykFzMYk^6no@q>Iwi)X37wR9KqP?dz@bx^08G&hVa~#o!z3x$q6Pi4&Da zmTYS9-bLDx%NF&H%1ww2D9UZbWT6+%(hm1#2k&M9$}Wm5-r`+%3_=X0_d|MYM<5kj z+|mi7pm}i$tP~qB!tB$@+Xip6vM7c1$RAO8Qeq@bo2kbEvVtWJPx3OUq!e2a3rkcL z?iCoM106*OqmsYy28V|Bi#Bc`jiO3L^T*LyX052xX$dgY*;jooPEKcn%VXs2wL0>~ zf*8^oQ`%H!9Rf&8d6h#Q%T91CKTLuIXE(+~=#ruBThX7!vnTj)k9*EKwE`c3pV_Y za*l%B37C*t`9FGQI^<3v1{?FK79A@rz0`~i_yWYTnq>Ea6GFBvY6Gya{XJ{Rg~lKO z*ue6S@7pcQz~JigL@fY&3Sh*-*N3)M0!z3;O5Q&D5=nPeAz9771*wD4+NR2#aD6dB zF|0Rvo?d?2x_=G);hQ{JsDh+dq{MhZ?Lz0bQCB4+X>Oi;(B4PTE0`(WhMx}E z&pO3csAHvXq$;IzT@iPD(rMq9n#v?}D~-#i3YJ!VRWfYfxUFwmqf`xH8u>n+*jja) zSGAm3v8p&)Pp)U!Gmd7BAG1N-q6d#HBk;*8ND~cd97imsPUVNDEzg9=I2M6jHP!0u zpL}A0jV?_p3VveO*oaZw-(J-IaKSz=u-tf7R65(5N5XijT%C%bJ)Fh$k%WZU!3K7y(y5tAkiBanuINSN7eC0#uvvOPyf z=diA$EutQePH`XYTH6p?MeTV2HGU`XVw-1ONNi5~VM-;9ewcJcAIgr1dQtUP%Z8nZ zUOOTwv1+1fL{{T7IPF(N&QY1Yc{HM9F-~#MF?Iv@;(L z{N6yP_T=e_ZRZ4d8=|@W2WTyGwoq$FviLChp+Eo4SipJ%IfOJI0}Ny z#J|L_Uh4!lsaegbtb7SfwuYET>xVH78L=E2gJr$zW!V&`JD9CteeDd;5N+@L>Qlx_ zRXa`HRC%=aXGm@7Y#nBHHBw$jppLWI;7HH+Z0J(w3vr(6-WyGlhrQlb4M@*Xc}_Ti zR5F97t)gvIW7}KE^6!HqODU73&~Q@fUMLEElxMHmZV@XrlLC9YjAgIG@pL;h(vs4RcGqNYg^e~&1tDzb;< zy4k4zhj7)4qK{@*5l~028<=twz9{!81OanDgQ!5!Y?nbYy$Nu`RT4Bz58b}hw0duKdaS&zJtf7!rcQ-QzF)P zjZx+0z%?JwC>S#~#|QD|uXgqF_;iE7_^3OEzNM))4oopTmeq})@T1RIFn7;K;UaFx}x*c|;e2Kg9H`Pfck{bL$upVo3CNgA5q*LCsToAeag)YaD z$@qn`gH&aYs@cTMD~8xn^m-4>pje3tfJ3qzDk}?Pev;UXE!R$oalg-T+p5&o4GT(~ zkkggwsp|EOmswW2JqtnZZ!~Fny{|2r(ZizBR|wBh&br!k#^-iSt=?(dS8BaV*P6$$ zcLN&4qU+A+Omw9=X8^W1`~|Zw;*8PHmi`E>5xS<7C>XaU>10J8J-=Ct0X2rUQj?(7 zhW4O?n*0@}~RN&m3x4!*fZaPS)a zk0Nruioh=|0UXH9v)E)Ktq3RuaY5wZxXH8zmi0s=DmT-c|JhrXg*Fub4+kZe;8w2f z)Fi$N_Yhpm=0agxVFSDe@xfP2AMv%1ChiDgGx@&u3`hlpoz?UGv$^4mzxT6-#%qLs znL}nJ2}*kmLrZ6E%BCGMzOcBHRk{&&;f zV0PkVlFRyLzQG7!7d3BF-0?}VetvI&pJgj@9c25DFMg8Q%d;IR@yaDb$#~Nw9@ws) zC1WY7rHhDN;uIf_v$L2?_|T~XYpLIjmjA6b_WCFs9JqJLa#=s6cRR9E3gf1^7dF^4 zM&5*d{7yT4t6R*qCSl1#LjTR755VyYs2AklUwbUMtAXt#OVN^mQl-_5N@2BSeo&t26=)Uw*Ihe0!-;ItKr+UR{oU|g#zeck@H zD9)tA75jNpUMM4y7Y6KFtQSW(I7bH~_0g0aJfy?;pRRJI^vm9icM-fBaXkrXg!%1BmfOFl6Fi(gqKK2;`l%?#af-#tK@>~LsOj&YBQ@hw+y_rhx0^xhzVC_ou8-69}37S|1HIR}y5 z|B2%CK-nhuVf=`#2zNZ7gf;wEEtvfR97ooNwS(d7-urs{fJ%em{w`X5u_^EQZtr4N z4Vg2ZroJH)shE<{%XwoCp`+vzPglHCf&D0X8FS0IvtC>j5>hmh)i>3+_x&aK(i#E( zjDT8S6pkZYXYOU=A*Atako>$GUcjg`ZCpCZ6 z{;7L`)t)fH`d7FG1bt&aqEuY*X|lOIA~NhvDuKc&JLS%(jN^{lx?iVV2;~b(&BUG^ zc3iq9=v%tU;6z<{_dnY}j!AXOz~D`$?jWjbC?%>6`vy{#oTQlgAe7vqYIYwyu6T5av@(rS|}^ROs#XoRO(klzVOt zn)8i0zUL{)2sK9j%k+}=#X6bDGXF`71ouMWL-hA)bjth5wiE`Svdo#l?Eni7(}`C-%->x5P|Y)s%7? zuN=7g56Q|mbsg_)o$7jBxyu$27heigTIis6Ehd80?#Mq5m&hjJ$s*AdLSpI1(W^^) zrC`E)$ge5DH6;3YI-5GA3910jV_y-A0Brd^Q%VqMO?{pyfuCto`6|jd zYsu~-Ia5VG7LA~GX6Q+HB0*ID7|^o5+ut(lw3-eEqoTu|RRkY&1|T@utnz8PMToQH zWue5a=UuplpV`Yr@!{Z~nX%O9yok!!K*Cb8Nb;yXv21_9x@QIs#PlTfh!Ptqr$NE) zT=iXmdYk5SY^xO(XZe5U9RN{5w)CVZd{(utUeU)D<3e3QVZnGOhBnF&2TvrG}aPzbu=niZR7XQcc>`Zav3yQ!_;tf#Hlqbk*?0L7WjjBM)*4 zOP3J$`zQfd8PqAL2|^N3O3&aK zBJ{N*mN)&4$Q45vCLwk-*43(LhAn`Q^nk%0Kgf%lz_cL$`MdFz@jlTlm`reu4oa#x zy!T3ZVeOl^{+koj%nxpy$y$)aMl~14z#7oX-1wRD(rrC@9?vkuKS?`2G&>=f$#8!} zeH37_1aHky1I8c6FmDsu{SsV}9=RiUgeFzui7;o5){lbxV8t#nI#n$tE*gj_zIOq& z(JI&dyQNzT9*5E{ilOX;$vSI1>_+YMmI22P+7K>!Lt$*;zWqaRNu1>&2=Jn&d9_p` zj`@9VFRT%lx%FQg3Ltd)vj_J=o{Tw-%ca*#jwh|iigt` z?e>KYNbZvM^>~tR+CWLOvH4hNKYPCH*eZ7#H$P*iSz0UQl%ANB%ePervcgh(Wqw9C zVk_`Nc5+D1d{IJ)EfS0K(-G`EtsBQDwSp#KfPKt2oz?stzZ*aOfN*(g1z8^^#@fd+ zX{sBEf?{|@qIaBj{bylk)9QsrJ~bnZV-vkyCldEC(dwpUw`#Dq{3r(pTDi-#tBi0;5+y1s0$sTli@1l`n*_x)dHo$Gdi( zZBCOAavc6lMT&0meY+O=G1hM$Tce4RnxGK!H<`W6{^e)lRNM4WPJnV7;CjmEmH}c; zKZ8(O&33AdqUpTpkv9Yp(=!~F5iqE3vP!^sbe@#|8Il8AMLB1Cj-RAw-1jrm?ds*> z{GZLSjq=V4wNA9a-l0e_Q00`|YpDF6^!>eDJi&Q>7Hpgd5Kf?gb-EK5r2*Lb@<;cslq)7Ya`vY_Mpb-u38euARp!fB?q!DpIVwENCVayFHXB5 zFHEwmDmqGG9{I7v7C@Y{v|92R`SS8wNqO6Ibug|dn$yw^DtmKeq5BnaRe_-g`V>l0lGX(zH1<$zIv6 zesW_{%ZYa58*Oo86&cIrvs|41dse3X^_OmfH)Fwr-5xSa=ZNympB2K=cPF0L<0D!` zzRvFtrqeZZ+~>GhRXo9!%WAVa^u0NUZ{2m61DDp53yG?Fu+?DZd=M7TVC@b!70z$c z#%2;mw5H+iU^Lgm4n(qnZ$B2rWt+t=y>Gsfh5@H&fzjVB*^*N^WN(i#}PFt(jO);l(-rlwDnhGM-+}%Bu)bDiY9~;7z@d?xHq| zbPG2t9ox$h zJ6oBP@xukY7{3;A;bk%oHs$B5X@2+C{5VZEFX&o@YtEFcAty^n3Da1|l&kcAzy1~S z*4>yI7riK0Ts@a8S0!G`l|DUb~Ef^Zq9UW{PSj{tFD;9G$hHrNawcK9xUDXXqzi1+c{iA~4!t0#$L&47k8B_Jv7tb%H>mAnB#uL(k zA0w;!)+_r(?Y(>1Y=G?qRjiUA5F%EXk*XvOeRi(TkHKCd$UG-at03C@V72=K8D8_M z7XzIr+_~mI4fSSCr-a}OZXUFs4x5dy1G1O>9a%mKqhFQ%V^g; zM8&JY+p}V!Lj<8T%a~hI7*nMhuq;e;e^9?2pp`$ch7$*S3le{6C+%yKU zo)7xLIXv7H?#yC51%)m8YcOJJTXH2e;d4p;f!Ie+i(oc2#l1Mm&%2Qk(-Zjs)p0qM zdpBBk-Y&_)iyoFtW=X_d(RuC&Ei2)*$ZzG+koOH*lUd9M#~8~I0lehQO@5>QuU8lp zTTbHWz*;ogcsxac1rrydm3b|wPl8kjZ$azVSpX6 z-c@@VUD(E{(^UL7?%ml_k*iD;M|cKKpbWWDokAtJS!T?@oH^l4U|LwVB`O;`_CelJ z9p9Yd&-92*hNvC($dx*~(y%h#qZYPO#Xg_Hwo`d%7q-NYfkE9~^CuoOpZs}24HCAq z30_Cz{ZNEp&beF#PO3hDH6R_uPR*IBCS6ntf~qZQ8rg;WG*)U-{3YbRXHF)gr}QDC z(W649po^`a1=m$1S7?+)O1U%qAsO%~<$A5cx!QTv?$A1e_& z8&fnll8Hv;S(EbWx&z(H$*zn_FpSAtDB;^hseqX0-LykV#HibI3N_kkFDEexgMR2T z<5@*`%goCs(Hra{Wykn5EnJwQhlpQ?ATH@Bn>}Y5IqK{m`nUT-PBG$7<2sUeK1y^pe9%KdXpz{FnQlB})pbAMKfjlrtprKyX}-=;sQ} zN*SfO>Ga@^?%9Eki0fa!ybB|*J}bFM>=YvJ3Es@BVr=>&z#mOO1ZC|Cl9Zb|0yven@4KIIDG}7QcriPg5hfH`EYer8-~(dv zgHbdNunK)3+X@9U;HHP4l(c&zS?9q@^(~wdxQ$92@Z?J%X6JF!GsgNIBAI8>m5&Ib zqUnn3%hZGFwlz9q<9<(Q46uP;%RRX`l1)sv6!rn=P}#HUxEZG!4a>-VIeXl|xwuiX zVs?oRH^YoYXN^=kf$sq#u8zeuV{WyJB!S0Z?3SGh!BXhLu4C78|5&8788xJj7B0vzJ&UV@nS*ApUuGbDoaYPcnRKo5ye0D~u0?Bl zT>x+7UVe~hITXG}YsXWNp@BMhKVhB}ztppsj}wC!18EOK%s}B<92A!+<-WNy(qJB# zR`{kUngPzoD!gxDLXCZ~|BH-H?SX{WLbv<*jpWtuK*=Q7cXPDp@7nh<)!MNHWlsU+ zp&I0$RP88`tjeeRAEi&MyMy;;M_osSrQSO<^?AQ=kLeiX0z))xyz-8nNvwA|PM`Gi zV${C(y?CS4c^?d0ivaN);>8DVQD)ngOw2RCH!SoT>?})(Po6941-FANm{Z_GzD~&s zI*kSw`+L!-Y~kCKwZSt>Uk11yC$fnmK0p2mq*YjZ(mEZWD})ZRv(TpIoXPw;8v_cb zeR{5RS{W3lvuRjl)|q=QHA=J~{EA6Uv2A#-(BuH-|7+(=-=W~!K7JJ-8%-A*A8Dh+Yt}NNIM~pptm?FC&1|cS68T+2G-RgPnKjD6NpD%vz z&f`3e-`nr^^WjJPR;`4p>w9yz08fSYs)M%n&W?g9RTJf5G?L`U~Ex3 zA3Ev?r_X(oAa40NvIBtR?|rit={}q!E034@@i93cyj4)5h!syZ^2cu*TeM}i-N(Ob zDklTN#qEfGx<>-DN8Q?={PNvMD$p#GDbT3zMuVow8%~RE2a1h@Zj;g_CdJTF7MHOY z$M0GDc67mzUjAcS%OH-@TjHg}Z&IV*2>4aYbR_#GFsHdkhTeRgXi(BXROx=>+;0)a zk323h;85p=zWYAyJ!&I6ZQu^JwJEf?WQ;hSuvBctc@Y~9oMgApU^JZemQ*uy*(heL z)hRpghbR*%qKa$2+k%s{S{ za5#}4d51HG7lu-{>y<2YlEtbq$PL#_cbLn=1S@Vw%-8+pCpLyaf!72PXz$}1meizC z455FL(?>1@DA~E5Ye{68{HYMktRyBRKpRfFyS}m!_@YElL(dD!Fobb$Ks-o^FiZ$9 z1zT&Ca4Ya1`VHdW?|g^%j;%MGGu92;F`BE%4A0b-dZt*Vhc0}z&91y{oZ8#ML;EO` z6RrzS#0uui?~W99kfQ;S#O7&rKX=?vL8tqY69*fB?K@pLk zKDBF`U8?(q6&V37g5YkhV#I5_JLS>j3mv|?B*@4SlGhrS*>q1J~@iOb)(E#!xUIN3PMT8G z@d}!Ocm|C{BUuoj&a7%TW6ow1Geys|v~O{!YUY@6Xof}LI^$vI-XiMBmMP6Jgoj(l z<|cO%?n>g{4&o)9U8(uBURo}^L8-sXtWE=aQmGDYQLK<@aDeDI{swAP%HP*oCg5S- zE;Up{XMVThXr2dt-!IvblWvUY*(ks5>OhejZJ~a={X;|fb(2x! zRjfm6Jf{AI%-d1M3kMH0ZgAC(rT(3TGVBMh{J`!Tx$&0dJBIZ)U(qUw3GKN%eU;`gUxx#IKrqVPs>@1X>rP^}sHeWPtus%gO=`TK8k7E^2=tLd}M@J8y71s#tyccp0;nq&G#}+vl9j`k(fGJQF z_(Uy2c7{Sf4Od)zE=K*$oR-~Ri)v*41`J`lERnOIu*V$0+abOJI4ak4Epg{X7b-El zYvFZYPACvqcgUTL7)CYOdm2^4cuQPqy`#|6W%0u)fVj0uCtV`22ACz2my!4=Pp|k8 z+5E_CUelqIQQ62tk)u@5VNDu!!UgBs7y21%Yr7CYnxO)u>Ht`#yS{N5FO93l%l8z; zL(%}IQ~d4Hq{B%&9NAt~hib!A*K9(W0;Vi~{n&Qkq*9p4qOP`loC0`IvmUS*pQfSa z&!-aq&We^>B>PQxtN~zAHPPS`T&PcH;YO<~Sf8ei;`*pG32#O=O;Ts)k|lZ++zSnl z-@NJ*qaS*&Et59nLtVW&#G0I@>%}Gi5sBsCrr)O}UQc=Ry2}E881ON0)c6@EGyXcI zA~tTd>LxsG*ydv{NcT$xe`Mu!G?FADHc~ii`%5K%pjd>L7_HS6cC!46M<$xeI=ho@ z8!c?tpBUoCcN9y!(oC;=;#>kF&X~h?*snoucs(J;Zmo%Zz~=m=ZZZs~^YI0z$f;-_ zspN^$B<1auON)m)N8T?+=@by`9y>2*b1-2%d!@LyKZujrJLYKH97fTd9%~=-;p)ss z%b@6WkOVuZL2N!Sn(b=bLit#ymR3oDZtrCmCsOzHxhj}vyuZ#?Q>f3q#09W4AL0YQ zZ&fIiZ6@Xg!nYUOLbbOTa&qLb9hPLR8ZOkUP|xVEG$Yq#f|YlqjEb%IUrJ@L%(_*k zFD~`*l##!Vca%PZ&^|ipJ`Y%8mn%B-SY*)xoHm|n_guCB8Fd*@QC62Em5m)eY)njD zC=1dd(;kkI$wT7&NlITKA@4+L>CL&g!8}*PbOj{WPvcfcO_tueo zGF>Fb@7&9hhG#2}l!E*FPvk1y%A_0g=DX@McBXoyg#YnKBpdDq!N5_Mibi-N%my`T zwfs<9d@xT9QtZ%0um0`ZvF2K^Vq1IvXtGXgRkclp&R7<0=&%R6h_&mm2P%Zeaz|oD z=k_=}Zv|0rD~&%wAP$fF&vFf(O=JzdhA@1QvS4|s{zY$TD1RPm-)Qa%4Xr$s2I~If z`4Dr#PfBP@#QuzaxvjVv!nmV;pfd;5dKb`i0}(NC8A`y52T0wh zK7l!D>O@s;O}#3rnLUXKP_1SLWvS8r^&<^L?$4+i&79`IcqO(U;NnZ4Lx;1?!FNGV z8|ixzR)>nCgr$V=Osn=Y-;l zEu`x^;YEFhxR&NK7c(JOH??(woE5V0-XDNV!{jCmCck`i*HFl%<<5BF%B@`~`fh^! zFp9u4Fc3IqayQpstRh?K#;w;I0{1gyFa7tX}5(4Et zpJ$f{(0w@A>JssPOTV*SQNUiE-J8b=c5~J0=`jV|r0#Xvz-1OV*w^xopP(L{pilw_iKVmgy_HX*`bWiwW|lCRCjJ zJtd5~@;_uz6b)=tNk@g0le9=at#OCkw8RDJVzc6nLV(A7lI8r_U8dmfc$tM;S!|!t z|B1JqHRf`?hdm*&pLmpSByQs}9#af?z{Sn=e88B5SCio(0iR}D%eIG@mblidNIU=h zzg4ci?OzwM9dGYXyD3CTdX6PBz0?=hU&5>_$kb(7E)|AWT}DP+FIa$_SRs4%XpnTO zjTFDxBtBXpj|(#EKZe5pL3n?P4FCNPS?0NX&fJiaT4$b^3;gS1^t6q&DnRy;{|3*& Bh@b!f diff --git a/src/constants/images.ts b/src/constants/images.ts index 52b081b3..baf24b92 100644 --- a/src/constants/images.ts +++ b/src/constants/images.ts @@ -5,8 +5,5 @@ export const lightLogo = require('@baca/assets/logo-light.png') export const darkBinarLogo = require('@baca/assets/logo/logo-dark.png') export const lightBinarLogo = require('@baca/assets/logo/logo-light.png') -export const darkLogoFull = require('@baca/assets/logo/logo-full-dark.png') -export const lightLogoFull = require('@baca/assets/logo/logo-full-light.png') - export const darkLogoSygnet = require('@baca/assets/logo/logo-sygnet-dark.png') export const lightLogoSygnet = require('@baca/assets/logo/logo-sygnet-light.png') diff --git a/src/navigation/tabNavigator/components/AppHeader.tsx b/src/navigation/tabNavigator/components/AppHeader.tsx index 7cc37e32..11a64a27 100644 --- a/src/navigation/tabNavigator/components/AppHeader.tsx +++ b/src/navigation/tabNavigator/components/AppHeader.tsx @@ -1,29 +1,16 @@ -import { darkLogoFull, lightLogoFull } from '@baca/constants' -import { useColorScheme } from '@baca/contexts' -import { Image, Platform, StyleSheet, View } from 'react-native' +import { CompanyLogo } from '@baca/components' +import { Platform, StyleSheet, View } from 'react-native' import { useSafeAreaInsets } from 'react-native-safe-area-context' import { TabColorsStrings } from '../navigation-config' export function AppHeader() { - const { colorScheme } = useColorScheme() const { top } = useSafeAreaInsets() const height = 60 + top return ( - - + + ) } @@ -38,6 +25,6 @@ const jsStyles = StyleSheet.create({ paddingHorizontal: 16, width: '100%', zIndex: 10, + ...Platform.select({ default: { display: 'none' }, web: { display: 'flex' } }), }, - logoWide: { height: 60, width: 150 }, }) From 72f04de07996c4a9228aa77735191e5abcc927bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Fri, 22 Mar 2024 12:00:21 +0100 Subject: [PATCH 07/20] replace company logo here and there --- src/components/index.ts | 1 + src/screens/CategoriesScreen.tsx | 20 ++------------------ src/screens/HomeScreen.tsx | 20 ++------------------ src/screens/LandingScreen.tsx | 22 ++-------------------- 4 files changed, 7 insertions(+), 56 deletions(-) diff --git a/src/components/index.ts b/src/components/index.ts index e1cb6335..5f7e6034 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -5,6 +5,7 @@ export * from './AppLoading' export * from './CompanyLogo' export * from './FeaturedIcon' export * from './KeyboardAwareScrollView' +export * from './LandingHeader' export * from './LanguagePicker' export * from './Modal' export * from './StatusBar' diff --git a/src/screens/CategoriesScreen.tsx b/src/screens/CategoriesScreen.tsx index cd18c4de..52a19bc8 100644 --- a/src/screens/CategoriesScreen.tsx +++ b/src/screens/CategoriesScreen.tsx @@ -1,32 +1,16 @@ -import { darkLogo, lightLogo } from '@baca/constants' -import { useColorScheme } from '@baca/contexts' +import { CompanyLogo } from '@baca/components' import { Center, Text } from '@baca/design-system' import { useScreenOptions } from '@baca/hooks' -import { Image, StyleSheet } from 'react-native' export const CategoriesScreen = () => { useScreenOptions({ title: 'Categories', }) - const { colorScheme } = useColorScheme() - return (
- + Categories screen
) } - -const styles = StyleSheet.create({ - logo: { - height: 50, - width: '100%', - }, -}) diff --git a/src/screens/HomeScreen.tsx b/src/screens/HomeScreen.tsx index d3c28780..4e9b4610 100644 --- a/src/screens/HomeScreen.tsx +++ b/src/screens/HomeScreen.tsx @@ -1,10 +1,8 @@ import { useArticlesControllerFindAll } from '@baca/api/query/articles/articles' -import { darkLogo, lightLogo } from '@baca/constants' -import { useColorScheme } from '@baca/contexts' +import { CompanyLogo } from '@baca/components' import { Button, Center, Text } from '@baca/design-system' import { useCallback, useScreenOptions, useTranslation } from '@baca/hooks' import { router } from 'expo-router' -import { Image, StyleSheet } from 'react-native' export const HomeScreen = () => { const { t } = useTranslation() @@ -13,8 +11,6 @@ export const HomeScreen = () => { title: t('navigation.screen_titles.home'), }) - const { colorScheme } = useColorScheme() - useArticlesControllerFindAll({ page: 1, pageSize: 10 }) const navigateToDetails = useCallback(() => { @@ -33,12 +29,7 @@ export const HomeScreen = () => { return (
- + {t('hello')} {t('thanks')} {t('app_information')} @@ -54,10 +45,3 @@ export const HomeScreen = () => {
) } - -const styles = StyleSheet.create({ - logo: { - height: 50, - width: '100%', - }, -}) diff --git a/src/screens/LandingScreen.tsx b/src/screens/LandingScreen.tsx index 3ff4fd70..ffafaf54 100644 --- a/src/screens/LandingScreen.tsx +++ b/src/screens/LandingScreen.tsx @@ -1,11 +1,7 @@ -import { KeyboardAwareScrollView } from '@baca/components' -import { LandingHeader } from '@baca/components/LandingHeader' -import { darkLogo, lightLogo } from '@baca/constants' -import { useColorScheme } from '@baca/contexts' +import { CompanyLogo, KeyboardAwareScrollView, LandingHeader } from '@baca/components' import { Button, Center, Text } from '@baca/design-system' import { useCallback, useScreenOptions, useTranslation } from '@baca/hooks' import { router } from 'expo-router' -import { Image, StyleSheet } from 'react-native' export const LandingScreen = () => { const { t } = useTranslation() @@ -14,8 +10,6 @@ export const LandingScreen = () => { title: t('navigation.screen_titles.home'), }) - const { colorScheme } = useColorScheme() - const navigateToBlog = useCallback(() => { router.navigate('/blog') }, []) @@ -28,12 +22,7 @@ export const LandingScreen = () => {
- + {t('hello')} {t('thanks')} {t('app_information')} @@ -47,10 +36,3 @@ export const LandingScreen = () => { ) } - -const styles = StyleSheet.create({ - logo: { - height: 50, - width: '100%', - }, -}) From 0f8e41a725223cc0841edba8bec0b232b40dfc7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Mon, 25 Mar 2024 08:35:24 +0100 Subject: [PATCH 08/20] change checkbox text size --- src/design-system/components/Checkbox.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/design-system/components/Checkbox.tsx b/src/design-system/components/Checkbox.tsx index 91b02831..e2be0237 100644 --- a/src/design-system/components/Checkbox.tsx +++ b/src/design-system/components/Checkbox.tsx @@ -97,7 +97,7 @@ export const Checkbox = forwardRef( ) : null} - {checkboxText} + {checkboxText} ) From 2d0e0f234787a851ccff9d5a1a2c42041ae44f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Mon, 25 Mar 2024 09:22:46 +0100 Subject: [PATCH 09/20] add form wrapper --- src/components/index.ts | 1 + src/components/wrappers/FormWrapper.tsx | 24 +++++++++++++++++ src/components/wrappers/index.ts | 1 + src/hooks/forms/useSignInForm.ts | 2 +- src/screens/ForgotPasswordScreen.tsx | 29 ++++++--------------- src/screens/ResetPasswordLinkSentScreen.tsx | 24 +++++++---------- 6 files changed, 44 insertions(+), 37 deletions(-) create mode 100644 src/components/wrappers/FormWrapper.tsx create mode 100644 src/components/wrappers/index.ts diff --git a/src/components/index.ts b/src/components/index.ts index 5f7e6034..129263d8 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,5 +1,6 @@ export * from './molecules' export * from './organisms' +export * from './wrappers' export * from './AppLoading' export * from './CompanyLogo' diff --git a/src/components/wrappers/FormWrapper.tsx b/src/components/wrappers/FormWrapper.tsx new file mode 100644 index 00000000..78e00acc --- /dev/null +++ b/src/components/wrappers/FormWrapper.tsx @@ -0,0 +1,24 @@ +import { useScreenOptions } from '@baca/hooks' +import { FC, PropsWithChildren } from 'react' +import { StyleSheet } from 'react-native' + +import { KeyboardAwareScrollView } from '../KeyboardAwareScrollView' + +export const FormWrapper: FC = ({ children }) => { + useScreenOptions({ headerShown: false }) + return ( + + {children} + + ) +} + +const styles = StyleSheet.create({ + contentContainerStyle: { + alignSelf: 'center', + flex: 1, + flexGrow: 1, + maxWidth: 360, + width: '100%', + }, +}) diff --git a/src/components/wrappers/index.ts b/src/components/wrappers/index.ts new file mode 100644 index 00000000..719fcfb6 --- /dev/null +++ b/src/components/wrappers/index.ts @@ -0,0 +1 @@ +export * from './FormWrapper' diff --git a/src/hooks/forms/useSignInForm.ts b/src/hooks/forms/useSignInForm.ts index bddc2f77..e0b5d0d8 100644 --- a/src/hooks/forms/useSignInForm.ts +++ b/src/hooks/forms/useSignInForm.ts @@ -12,7 +12,7 @@ type SignInFormValues = AuthEmailLoginDto & { const defaultValues: SignInFormValues = { // TODO: Reset this values when building production app - email: 'l.jeziorski+user@binarapps.com', + email: 'm.baumruck+user@binarapps.com', password: 'Qwerty1!', confirm: false, } diff --git a/src/screens/ForgotPasswordScreen.tsx b/src/screens/ForgotPasswordScreen.tsx index 80d94d31..a6eef520 100644 --- a/src/screens/ForgotPasswordScreen.tsx +++ b/src/screens/ForgotPasswordScreen.tsx @@ -1,22 +1,12 @@ -import { - CompanyLogo, - ControlledField, - FeaturedIcon, - KeyboardAwareScrollView, -} from '@baca/components' +import { CompanyLogo, ControlledField, FeaturedIcon, FormWrapper } from '@baca/components' import { REGEX } from '@baca/constants' import { Button, Center, Display, Spacer, Text } from '@baca/design-system' -import { useForgotPasswordForm, useScreenOptions, useTranslation, useEffect } from '@baca/hooks' +import { useForgotPasswordForm, useTranslation, useEffect } from '@baca/hooks' import { router, useLocalSearchParams } from 'expo-router' -import { StyleSheet } from 'react-native' export const ForgotPasswordScreen = () => { const { t } = useTranslation() - useScreenOptions({ - title: t('navigation.screen_titles.forgot_password'), - }) - const { email } = useLocalSearchParams<{ email?: string }>() const { control, errors, reset, submit } = useForgotPasswordForm({}) @@ -28,16 +18,16 @@ export const ForgotPasswordScreen = () => { }, [email, reset]) return ( - +
- + {t('forgot_password_screen.forgot_password')} - + {t('forgot_password_screen.no_worries')} @@ -64,17 +54,14 @@ export const ForgotPasswordScreen = () => { - +
- + ) } - -const styles = StyleSheet.create({ - contentContainerStyle: { padding: 32 }, -}) diff --git a/src/screens/ResetPasswordLinkSentScreen.tsx b/src/screens/ResetPasswordLinkSentScreen.tsx index d29dce85..693a4b04 100644 --- a/src/screens/ResetPasswordLinkSentScreen.tsx +++ b/src/screens/ResetPasswordLinkSentScreen.tsx @@ -1,9 +1,8 @@ -import { CompanyLogo, FeaturedIcon, KeyboardAwareScrollView } from '@baca/components' +import { CompanyLogo, FeaturedIcon, FormWrapper } from '@baca/components' import { Button, Center, Display, Row, Spacer, Text } from '@baca/design-system' -import { useEffect, useForgotPasswordForm, useScreenOptions, useTranslation } from '@baca/hooks' +import { useEffect, useForgotPasswordForm, useTranslation } from '@baca/hooks' import { showSuccessToast } from '@baca/utils' import { router, useLocalSearchParams } from 'expo-router' -import { StyleSheet } from 'react-native' const navigateToLogin = () => { router.navigate('/sign-in') @@ -12,9 +11,9 @@ const navigateToLogin = () => { export const ResetPasswordLinkSentScreen = () => { const { t } = useTranslation() - useScreenOptions({ - title: t('navigation.screen_titles.forgot_password'), - }) + // useScreenOptions({ + // title: t('navigation.screen_titles.forgot_password'), + // }) const { email } = useLocalSearchParams<{ email?: string }>() @@ -31,21 +30,20 @@ export const ResetPasswordLinkSentScreen = () => { }, [email, reset]) return ( - +
- + {t('reset_password_link_sent_screen.check_email')} - + {t('reset_password_link_sent_screen.we_sent_link')} {email} - @@ -65,10 +63,6 @@ export const ResetPasswordLinkSentScreen = () => { title={t('forgot_password_screen.back_to_login')} />
- + ) } - -const styles = StyleSheet.create({ - contentContainerStyle: { padding: 32 }, -}) From 99c41a4bdeede06fb9738881d0760ac9ca026cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Tue, 26 Mar 2024 10:06:45 +0100 Subject: [PATCH 10/20] refactor button --- .../components/Button/Button.tsx | 59 +++++++++---------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/src/design-system/components/Button/Button.tsx b/src/design-system/components/Button/Button.tsx index e9af61ef..a3248681 100644 --- a/src/design-system/components/Button/Button.tsx +++ b/src/design-system/components/Button/Button.tsx @@ -1,4 +1,4 @@ -import { useColorScheme } from '@baca/contexts' +import { useTheme } from '@baca/hooks' import { IconNames } from '@baca/types/icon' import { getColorValue } from '@baca/utils' import { @@ -28,7 +28,6 @@ import { buttonSizeVariants, buttonVariants, getButtonShadowStyle, - theme, } from '../../config' import { generateStyledComponent } from '../../utils' import { Icon } from '../Icon' @@ -84,7 +83,7 @@ const RawButton = memo( }, ref ) => { - const { colorScheme } = useColorScheme() + const { colors } = useTheme() const { hoverProps, isHovered } = useHover() const { hoveredStyle, defaultStyle, disabledStyle } = useMemo( () => buttonVariants[variant], @@ -99,76 +98,66 @@ const RawButton = memo( () => ({ backgroundColor: getColorValue({ color: hoveredStyle.backgroundColor, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), borderColor: getColorValue({ color: hoveredStyle.borderColor!, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), borderWidth: hoveredStyle.borderWidth, }), - [ - colorScheme, - hoveredStyle.backgroundColor, - hoveredStyle.borderColor, - hoveredStyle.borderWidth, - ] + [colors, hoveredStyle.backgroundColor, hoveredStyle.borderColor, hoveredStyle.borderWidth] ) const hoverColorStyle = useMemo( () => ({ color: getColorValue({ color: hoveredStyle.color!, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), }), - [colorScheme, hoveredStyle.color] + [colors, hoveredStyle.color] ) const defaultStyles = useMemo( () => ({ backgroundColor: getColorValue({ color: defaultStyle.backgroundColor, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), borderColor: getColorValue({ color: defaultStyle.borderColor!, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), borderWidth: defaultStyle.borderWidth, }), - [ - colorScheme, - defaultStyle.backgroundColor, - defaultStyle.borderColor, - defaultStyle.borderWidth, - ] + [colors, defaultStyle.backgroundColor, defaultStyle.borderColor, defaultStyle.borderWidth] ) const defaultColorStyle = useMemo( () => ({ color: getColorValue({ color: defaultStyle.color!, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), }), - [colorScheme, defaultStyle.color] + [colors, defaultStyle.color] ) const disabledStyles = useMemo( () => ({ backgroundColor: getColorValue({ color: disabledStyle.backgroundColor, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), borderColor: getColorValue({ color: disabledStyle.borderColor!, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), borderWidth: disabledStyle.borderWidth, }), [ - colorScheme, + colors, disabledStyle.backgroundColor, disabledStyle.borderColor, disabledStyle.borderWidth, @@ -179,10 +168,10 @@ const RawButton = memo( () => ({ color: getColorValue({ color: disabledStyle.color!, - colors: colorScheme === 'light' ? theme.light.colors : theme.dark.colors, + colors, }), }), - [colorScheme, disabledStyle.color] + [colors, disabledStyle.color] ) const buttonSizeVariant = buttonSizeVariants[size] @@ -261,10 +250,11 @@ const RawButton = memo( if (title) { return ( {title} @@ -273,10 +263,11 @@ const RawButton = memo( if (typeof children === 'string') { return ( {children} @@ -298,7 +289,11 @@ const RawButton = memo( {...{ ...hoverProps, ref, ...props }} > {loading ? ( - + ) : ( (props: PressableStateCallbackType) => ( @@ -326,7 +321,7 @@ const Button = generateStyledComponent( ) as ButtonComposition const generateButtonVariant = (variant: ButtonVariant) => - forwardRef((props, ref) => diff --git a/src/screens/ResetPasswordLinkSentScreen.tsx b/src/screens/ResetPasswordLinkSentScreen.tsx index 693a4b04..e1bf7858 100644 --- a/src/screens/ResetPasswordLinkSentScreen.tsx +++ b/src/screens/ResetPasswordLinkSentScreen.tsx @@ -11,13 +11,9 @@ const navigateToLogin = () => { export const ResetPasswordLinkSentScreen = () => { const { t } = useTranslation() - // useScreenOptions({ - // title: t('navigation.screen_titles.forgot_password'), - // }) - const { email } = useLocalSearchParams<{ email?: string }>() - const { reset, submit } = useForgotPasswordForm({ + const { isSubmitting, reset, submit } = useForgotPasswordForm({ onSuccess: () => { showSuccessToast({ description: 'Password link resend' }) }, @@ -51,6 +47,7 @@ export const ResetPasswordLinkSentScreen = () => { {t('reset_password_link_sent_screen.did_not_receive')} Date: Tue, 26 Mar 2024 10:38:19 +0100 Subject: [PATCH 12/20] handle to many request error --- src/api/axios/custom-instance.ts | 5 +++++ src/i18n/translations/en.json | 3 ++- src/i18n/translations/pl.json | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/api/axios/custom-instance.ts b/src/api/axios/custom-instance.ts index 4a8ced25..0acacf3a 100644 --- a/src/api/axios/custom-instance.ts +++ b/src/api/axios/custom-instance.ts @@ -42,6 +42,11 @@ AXIOS_INSTANCE.interceptors.response.use( throw formErrors } + if (error.response?.status === 429) { + showErrorToast({ title: 'ERROR', description: i18n.t('errors.to_may_requests') }) + return + } + // TODO: we should handle certain error type if (errorMessage) { showErrorToast({ title: 'ERROR', description: i18n.t('errors.something_went_wrong') }) diff --git a/src/i18n/translations/en.json b/src/i18n/translations/en.json index c196b209..f176eac0 100644 --- a/src/i18n/translations/en.json +++ b/src/i18n/translations/en.json @@ -16,7 +16,8 @@ "missing_auth": "Missing auth", "screen_not_found": "NotFound screen", "something_went_wrong": "Something went wrong", - "token_expired": "Token expired" + "token_expired": "Token expired", + "to_may_requests": "To many request. Please try again after few minutes" }, "examples_component": { "example": "Example" diff --git a/src/i18n/translations/pl.json b/src/i18n/translations/pl.json index 8adf89d8..d5d4e0fd 100644 --- a/src/i18n/translations/pl.json +++ b/src/i18n/translations/pl.json @@ -16,7 +16,8 @@ "missing_auth": "Brak autoryzacji", "screen_not_found": "NotFound screen", "something_went_wrong": "Coś poszło nie tak", - "token_expired": "Token wygasł" + "token_expired": "Token wygasł", + "to_may_requests": "Zbyt wiele prób, spróbuj ponownie za kilka minut" }, "examples_component": { "example": "Przykład" From 1614dcd928b520c1a7511e703c7955c839e399ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Tue, 26 Mar 2024 12:26:25 +0100 Subject: [PATCH 13/20] add small fixes / refactor --- App.web.tsx | 2 +- src/constants/regex.ts | 2 +- src/design-system/components/Button/Button.tsx | 2 +- src/utils/showToast.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/App.web.tsx b/App.web.tsx index 0edc6f34..9fd96927 100644 --- a/App.web.tsx +++ b/App.web.tsx @@ -11,7 +11,7 @@ import { startMockedServer } from '@baca/services' import 'expo-router/entry' // FIXME: moking not working on mobile app - follow this discussion https://github.com/mswjs/msw/issues/2026 -const ENABLE_MOCKED_SERVER = true +const ENABLE_MOCKED_SERVER = false if (ENABLE_MOCKED_SERVER) { startMockedServer() diff --git a/src/constants/regex.ts b/src/constants/regex.ts index d89c9c67..f703ae7a 100644 --- a/src/constants/regex.ts +++ b/src/constants/regex.ts @@ -1,5 +1,5 @@ export const REGEX = { EMAIL: /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$/g, // PASSWORD - minimum: at least 8 chars, 1 small letter, 1 big letter, 1 special char, 1 number - REGISTRATION_PASSWORD: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/g, + REGISTRATION_PASSWORD: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@#$%^&*!])[A-Za-z\d@#$%^&*!]{8,}$/, } as const diff --git a/src/design-system/components/Button/Button.tsx b/src/design-system/components/Button/Button.tsx index a3248681..1ac12982 100644 --- a/src/design-system/components/Button/Button.tsx +++ b/src/design-system/components/Button/Button.tsx @@ -299,7 +299,7 @@ const RawButton = memo( {leftIconName && iconElement(props, leftIconName)} {childrenElement(props)} - {rightIconName && iconElement(props, leftIconName)} + {rightIconName && iconElement(props, rightIconName)} ) )} diff --git a/src/utils/showToast.ts b/src/utils/showToast.ts index 74113dd3..9872acc4 100644 --- a/src/utils/showToast.ts +++ b/src/utils/showToast.ts @@ -24,7 +24,7 @@ const showCustomToast = ({ error: i18n.t('toast.title.error'), info: i18n.t('toast.title.info'), warning: i18n.t('toast.title.warning'), - success: i18n.t('toast.title.warning'), + success: i18n.t('toast.title.success'), }[variant] notify(variant, { From 8f56fdc86a61e7ba140d86ac65bc7d1eba5c1c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Tue, 26 Mar 2024 14:07:20 +0100 Subject: [PATCH 14/20] add reset password screens --- .../reset-password-complete.tsx | 3 + app/(app)/(not-authorized)/reset-password.tsx | 3 + src/api/axios/custom-instance.ts | 29 +++++- src/hooks/forms/index.ts | 1 + src/hooks/forms/useResetPasswordForm.tsx | 57 +++++++++++ src/hooks/forms/useSignInForm.ts | 2 +- src/i18n/translations/en.json | 13 +++ src/i18n/translations/pl.json | 17 +++- src/screens/ConfirmEmail.tsx | 6 +- src/screens/ResetPasswordCompleteScreen.tsx | 31 ++++++ src/screens/ResetPasswordScreen.tsx | 95 ++++++++++++++++++- src/screens/index.ts | 1 + 12 files changed, 246 insertions(+), 12 deletions(-) create mode 100644 app/(app)/(not-authorized)/reset-password-complete.tsx create mode 100644 app/(app)/(not-authorized)/reset-password.tsx create mode 100644 src/hooks/forms/useResetPasswordForm.tsx create mode 100644 src/screens/ResetPasswordCompleteScreen.tsx diff --git a/app/(app)/(not-authorized)/reset-password-complete.tsx b/app/(app)/(not-authorized)/reset-password-complete.tsx new file mode 100644 index 00000000..6714dff0 --- /dev/null +++ b/app/(app)/(not-authorized)/reset-password-complete.tsx @@ -0,0 +1,3 @@ +import { ResetPasswordCompleteScreen } from '@baca/screens' + +export default ResetPasswordCompleteScreen diff --git a/app/(app)/(not-authorized)/reset-password.tsx b/app/(app)/(not-authorized)/reset-password.tsx new file mode 100644 index 00000000..cba7da09 --- /dev/null +++ b/app/(app)/(not-authorized)/reset-password.tsx @@ -0,0 +1,3 @@ +import { ResetPasswordScreen } from '@baca/screens' + +export default ResetPasswordScreen diff --git a/src/api/axios/custom-instance.ts b/src/api/axios/custom-instance.ts index 0acacf3a..ba994ad1 100644 --- a/src/api/axios/custom-instance.ts +++ b/src/api/axios/custom-instance.ts @@ -8,13 +8,28 @@ import qs from 'qs' import { injectTokenToRequest } from './interceptors' -export type ApiError = { - error?: string +type ApiErrorType = { + error: string + message: string + statusCode: number + + errors: never + status: never +} + +type FormErrorType = { errors?: { [key: string]: string[] } + status: number + + error: never + message: never + statusCode: never } +export type ApiError = ApiErrorType | FormErrorType + export const baseURL = ENV.API_URL export const AXIOS_INSTANCE = Axios.create({ @@ -35,21 +50,25 @@ AXIOS_INSTANCE.interceptors.response.use( return response }, async (error: AxiosError) => { - const errorMessage = error?.response?.data?.error + console.log('ERRRRRR DUPA ERRR', error) + // handle FormErrorType const formErrors = error?.response?.data?.errors if (formErrors) { throw formErrors } + // handle ApiErrorType + const errorMessage = error?.response?.data?.message + if (error.response?.status === 429) { - showErrorToast({ title: 'ERROR', description: i18n.t('errors.to_may_requests') }) + showErrorToast({ description: i18n.t('errors.to_may_requests') }) return } // TODO: we should handle certain error type if (errorMessage) { - showErrorToast({ title: 'ERROR', description: i18n.t('errors.something_went_wrong') }) + showErrorToast({ description: errorMessage }) //CONFIG: Add errors in getApiError const api_error = getApiError(errorMessage) diff --git a/src/hooks/forms/index.ts b/src/hooks/forms/index.ts index 70d7fd67..1388b190 100644 --- a/src/hooks/forms/index.ts +++ b/src/hooks/forms/index.ts @@ -1,4 +1,5 @@ export * from './useForgotPasswordForm' +export * from './useResetPasswordForm' export * from './useSignInForm' export * from './useSignUpForm' export * from './useTestForm' diff --git a/src/hooks/forms/useResetPasswordForm.tsx b/src/hooks/forms/useResetPasswordForm.tsx new file mode 100644 index 00000000..c2d9befc --- /dev/null +++ b/src/hooks/forms/useResetPasswordForm.tsx @@ -0,0 +1,57 @@ +import { useAuthControllerResetPassword } from '@baca/api/query/auth/auth' +import { AuthResetPasswordDto } from '@baca/api/types' +import { handleFormError, hapticImpact } from '@baca/utils' +import { router } from 'expo-router' +import { useForm } from 'react-hook-form' + +type FormValuesType = AuthResetPasswordDto & { confirmPassword: string } + +const defaultValues: FormValuesType = { + confirmPassword: '', + hash: '', + password: '', +} + +export const useResetPasswordForm = () => { + const { mutate: resetPasswordMutate, isLoading: isSubmitting } = useAuthControllerResetPassword() + + const { + control, + formState: { errors }, + handleSubmit, + reset, + setError: setFormError, + } = useForm({ + mode: 'onTouched', + defaultValues, + }) + + const onSubmit = async ({ confirmPassword, ...data }: FormValuesType) => { + resetPasswordMutate( + { data }, + { + onSuccess: () => { + router.replace(`/reset-password-complete`) + }, + onError: (e) => { + handleFormError( + e as unknown as keyof AuthResetPasswordDto, + ({ field, description }) => { + setFormError(field, { message: description }) + } + ) + + hapticImpact() + }, + } + ) + } + + return { + control, + errors, + isSubmitting, + reset, + submit: handleSubmit(onSubmit), + } +} diff --git a/src/hooks/forms/useSignInForm.ts b/src/hooks/forms/useSignInForm.ts index e0b5d0d8..bddc2f77 100644 --- a/src/hooks/forms/useSignInForm.ts +++ b/src/hooks/forms/useSignInForm.ts @@ -12,7 +12,7 @@ type SignInFormValues = AuthEmailLoginDto & { const defaultValues: SignInFormValues = { // TODO: Reset this values when building production app - email: 'm.baumruck+user@binarapps.com', + email: 'l.jeziorski+user@binarapps.com', password: 'Qwerty1!', confirm: false, } diff --git a/src/i18n/translations/en.json b/src/i18n/translations/en.json index f176eac0..b6710970 100644 --- a/src/i18n/translations/en.json +++ b/src/i18n/translations/en.json @@ -3,6 +3,7 @@ "add": "Add", "back": "Back", "cancel": "Cancel", + "continue": "Continue", "go_back": "Go back", "remove": "Remove", "save": "Save", @@ -30,12 +31,14 @@ }, "errors": {}, "labels": { + "confirm_password": "Confirm password", "email": "E-mail address", "first_name": "First name", "last_name": "Last name", "password": "Password" }, "placeholders": { + "confirm_password": "Confirm password", "create_password": "Create a password", "email": "Enter your email", "first_name": "Enter your first name", @@ -46,6 +49,7 @@ "validation": { "invalid_email_format": "Incorrect e-mail address format", "invalid_password_format": "Password must be at least 8 characters long, contain at least one uppercase letter, one lowercase letter, one number, and one special character", + "passwords_does_not_match": "Passwords does not match", "required": "This field is required" } }, @@ -186,6 +190,10 @@ "login_cta": "Log in", "sign_up": "Sign up" }, + "reset_password_complete": { + "password_reset": "Password reset", + "password_successfully_reset": "Your password has been successfully reset. Click below to log in magically." + }, "reset_password_link_sent_screen": { "check_email": "Check your email", "click_to_resend": "Click to resend", @@ -193,6 +201,11 @@ "open_email_app": "Open email app", "we_sent_link": "We sent a password reset link to" }, + "reset_password_screen": { + "reset_password": "Reset password", + "set_new_password": "Set new password", + "welcome_back": "Welcome back! Please enter your details." + }, "settings_screen": { "copy_push_token": "Copy push token", "current_theme": "Current theme: {{theme}}", diff --git a/src/i18n/translations/pl.json b/src/i18n/translations/pl.json index d5d4e0fd..26899a58 100644 --- a/src/i18n/translations/pl.json +++ b/src/i18n/translations/pl.json @@ -3,6 +3,7 @@ "add": "Dodaj", "back": "Cofnij", "cancel": "Anuluj", + "continue": "Kontynuuj", "go_back": "Cofnij", "remove": "Usuń", "save": "Zapisz", @@ -30,12 +31,14 @@ }, "errors": {}, "labels": { + "confirm_password": "Potwierdź hasło", "email": "Adres e-mail", "first_name": "Imię", "last_name": "Nazwisko", "password": "Hasło" }, "placeholders": { + "confirm_password": "Potwierdź hasło", "create_password": "Utwórz nowe hasło", "email": "Podaj adres e-mail", "first_name": "Podaj swoje imię", @@ -46,6 +49,7 @@ "validation": { "invalid_email_format": "Niepoprawny format adresu e-mail", "invalid_password_format": "Hasło musi zawierać minimum: 8 znaków, jedną wielką literę, jedną małą literę, jedną cyfrę i jeden znak specjalny", + "passwords_does_not_match": "Wprowadzone hasła nie są identyczne", "required": "Pole wymagane" } }, @@ -185,6 +189,10 @@ "go_to_blog": "Otwórz blog", "go_to_form": "Otwórz pełno ekranowy formularz full" }, + "reset_password_complete": { + "password_reset": "Reset hasła", + "password_successfully_reset": "Twoje hasło zostało pomyślnie zresetowane. Kliknij poniżej aby się zalogować." + }, "reset_password_link_sent_screen": { "check_email": "Sprawdź skrzynkę e-mail", "click_to_resend": "Wyślij ponownie", @@ -192,6 +200,11 @@ "open_email_app": "Otwórz aplikację e-mail", "we_sent_link": "Wysłaliśmy link resetujący hasło na" }, + "reset_password_screen": { + "reset_password": "Reset hasła", + "set_new_password": "Ustaw nowe hasło", + "welcome_back": "Witaj ponownie! Proszę wprowadź dane." + }, "settings_screen": { "current_theme": "Current theme: {{theme}}", "selected": " - wybrano", @@ -226,9 +239,9 @@ "interests": "Zaznacz przynajmniej 1 zainteresowanie", "music": "Zaznacz przynajmniej 1 rodzaj muzyki", "name": "Imie jest wymagane", - "phone_format": "Numer telefonu musi byc w formacie 000-000-000", + "phone_format": "Numer telefonu musi być w formacie 000-000-000", "phone": "Number telefonu jest wymagany", - "postalCode_format": "Kod pocztowy musi byc w formacie 00-000", + "postalCode_format": "Kod pocztowy musi być w formacie 00-000", "postalCode": "Kod pocztowy jest wymagany", "sex": "Płeć jest wymagana", "shoeSize": "Rozmiar buta jest wymagany", diff --git a/src/screens/ConfirmEmail.tsx b/src/screens/ConfirmEmail.tsx index d2b918fa..52827720 100644 --- a/src/screens/ConfirmEmail.tsx +++ b/src/screens/ConfirmEmail.tsx @@ -9,7 +9,7 @@ const navigateToSignIn = () => router.replace('/sign-in') export const ConfirmEmail = () => { const { t } = useTranslation() - const { code } = useLocalSearchParams<{ code: string }>() + const { hash } = useLocalSearchParams<{ hash: string }>() const { isError, @@ -30,8 +30,8 @@ export const ConfirmEmail = () => { } } } - confirmFn(code) - }, [code, confirmEmailMutation]) + confirmFn(hash) + }, [hash, confirmEmailMutation]) return (
diff --git a/src/screens/ResetPasswordCompleteScreen.tsx b/src/screens/ResetPasswordCompleteScreen.tsx new file mode 100644 index 00000000..ec7baecd --- /dev/null +++ b/src/screens/ResetPasswordCompleteScreen.tsx @@ -0,0 +1,31 @@ +import { CompanyLogo, FeaturedIcon, FormWrapper } from '@baca/components' +import { Button, Center, Display, Spacer, Text } from '@baca/design-system' +import { useTranslation } from '@baca/hooks' +import { router } from 'expo-router' + +const navigateToLogin = () => { + router.replace('/sign-in') +} + +export const ResetPasswordCompleteScreen = () => { + const { t } = useTranslation() + + return ( + +
+ + + + + + {t('reset_password_complete.password_reset')} + + + {t('reset_password_complete.password_successfully_reset')} + + +
+ + ) +} diff --git a/src/screens/ResetPasswordScreen.tsx b/src/screens/ResetPasswordScreen.tsx index 88155262..978657c2 100644 --- a/src/screens/ResetPasswordScreen.tsx +++ b/src/screens/ResetPasswordScreen.tsx @@ -1,3 +1,96 @@ +import { CompanyLogo, ControlledField, FeaturedIcon, FormWrapper } from '@baca/components' +import { REGEX } from '@baca/constants' +import { Button, Center, Display, Spacer, Text } from '@baca/design-system' +import { useEffect, useResetPasswordForm, useTranslation } from '@baca/hooks' +import { router, useLocalSearchParams } from 'expo-router' + +const navigateToLogin = () => { + router.replace('/sign-in') +} + export const ResetPasswordScreen = () => { - return <> + const { t } = useTranslation() + const { hash } = useLocalSearchParams<{ hash: string }>() + + const { control, errors, isSubmitting, reset, submit } = useResetPasswordForm() + + useEffect(() => { + if (hash) { + reset({ hash }) + } + }, [hash, reset]) + + return ( + +
+ + + + + + {t('reset_password_screen.set_new_password')} + + + {t('reset_password_screen.welcome_back')} + + + + + + { + if (formValues.password !== inputValue) { + return t('form.validation.passwords_does_not_match') + } + }, + }, + }} + testID="passwordInput" + type="password" + /> + + + + +
+ + ) } diff --git a/src/screens/index.ts b/src/screens/index.ts index e6bf5296..2e5ba259 100644 --- a/src/screens/index.ts +++ b/src/screens/index.ts @@ -10,6 +10,7 @@ export * from './ForgotPasswordScreen' export * from './HomeScreen' export * from './NotFoundScreen' export * from './ProfileScreen' +export * from './ResetPasswordCompleteScreen' export * from './ResetPasswordLinkSentScreen' export * from './ResetPasswordScreen' export * from './SettingsScreen' From 139419cf3bada72c38116fd1fb254c0311398803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Tue, 26 Mar 2024 14:15:59 +0100 Subject: [PATCH 15/20] update button snapshot --- .../components/Button/__snapshots__/Button.test.tsx.snap | 1 + 1 file changed, 1 insertion(+) diff --git a/src/design-system/components/Button/__snapshots__/Button.test.tsx.snap b/src/design-system/components/Button/__snapshots__/Button.test.tsx.snap index e4380482..541ac05a 100644 --- a/src/design-system/components/Button/__snapshots__/Button.test.tsx.snap +++ b/src/design-system/components/Button/__snapshots__/Button.test.tsx.snap @@ -63,6 +63,7 @@ exports[`Button renders correctly 1`] = ` > Date: Tue, 26 Mar 2024 14:45:11 +0100 Subject: [PATCH 16/20] move auth screens to auth folder inside screen folder --- src/screens/{ => auth}/ConfirmEmail.tsx | 0 src/screens/{ => auth}/ForgotPasswordScreen.tsx | 0 src/screens/{ => auth}/ResetPasswordCompleteScreen.tsx | 0 src/screens/{ => auth}/ResetPasswordLinkSentScreen.tsx | 0 src/screens/{ => auth}/ResetPasswordScreen.tsx | 0 src/screens/{ => auth}/SignInScreen.tsx | 2 +- src/screens/{ => auth}/SignUpScreen.tsx | 0 src/screens/auth/index.ts | 7 +++++++ src/screens/index.ts | 9 ++------- 9 files changed, 10 insertions(+), 8 deletions(-) rename src/screens/{ => auth}/ConfirmEmail.tsx (100%) rename src/screens/{ => auth}/ForgotPasswordScreen.tsx (100%) rename src/screens/{ => auth}/ResetPasswordCompleteScreen.tsx (100%) rename src/screens/{ => auth}/ResetPasswordLinkSentScreen.tsx (100%) rename src/screens/{ => auth}/ResetPasswordScreen.tsx (100%) rename src/screens/{ => auth}/SignInScreen.tsx (99%) rename src/screens/{ => auth}/SignUpScreen.tsx (100%) create mode 100644 src/screens/auth/index.ts diff --git a/src/screens/ConfirmEmail.tsx b/src/screens/auth/ConfirmEmail.tsx similarity index 100% rename from src/screens/ConfirmEmail.tsx rename to src/screens/auth/ConfirmEmail.tsx diff --git a/src/screens/ForgotPasswordScreen.tsx b/src/screens/auth/ForgotPasswordScreen.tsx similarity index 100% rename from src/screens/ForgotPasswordScreen.tsx rename to src/screens/auth/ForgotPasswordScreen.tsx diff --git a/src/screens/ResetPasswordCompleteScreen.tsx b/src/screens/auth/ResetPasswordCompleteScreen.tsx similarity index 100% rename from src/screens/ResetPasswordCompleteScreen.tsx rename to src/screens/auth/ResetPasswordCompleteScreen.tsx diff --git a/src/screens/ResetPasswordLinkSentScreen.tsx b/src/screens/auth/ResetPasswordLinkSentScreen.tsx similarity index 100% rename from src/screens/ResetPasswordLinkSentScreen.tsx rename to src/screens/auth/ResetPasswordLinkSentScreen.tsx diff --git a/src/screens/ResetPasswordScreen.tsx b/src/screens/auth/ResetPasswordScreen.tsx similarity index 100% rename from src/screens/ResetPasswordScreen.tsx rename to src/screens/auth/ResetPasswordScreen.tsx diff --git a/src/screens/SignInScreen.tsx b/src/screens/auth/SignInScreen.tsx similarity index 99% rename from src/screens/SignInScreen.tsx rename to src/screens/auth/SignInScreen.tsx index 40cb165e..a820a546 100644 --- a/src/screens/SignInScreen.tsx +++ b/src/screens/auth/SignInScreen.tsx @@ -48,7 +48,7 @@ export const SignInScreen = (): JSX.Element => {
- + Date: Tue, 26 Mar 2024 14:52:40 +0100 Subject: [PATCH 17/20] change api error type --- src/api/axios/custom-instance.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/api/axios/custom-instance.ts b/src/api/axios/custom-instance.ts index ba994ad1..e289f077 100644 --- a/src/api/axios/custom-instance.ts +++ b/src/api/axios/custom-instance.ts @@ -14,18 +14,16 @@ type ApiErrorType = { statusCode: number errors: never - status: never } type FormErrorType = { errors?: { [key: string]: string[] } - status: number + statusCode: number error: never message: never - statusCode: never } export type ApiError = ApiErrorType | FormErrorType @@ -50,7 +48,6 @@ AXIOS_INSTANCE.interceptors.response.use( return response }, async (error: AxiosError) => { - console.log('ERRRRRR DUPA ERRR', error) // handle FormErrorType const formErrors = error?.response?.data?.errors From aadd51c72ca4aba4e3407270f5bf651df28e6b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Wed, 27 Mar 2024 14:14:58 +0100 Subject: [PATCH 18/20] adjust sign in screen and sign up screen --- src/components/KeyboardAwareScrollView.tsx | 70 +++++++------- src/components/LanguagePicker.tsx | 31 ++++--- src/components/Version.tsx | 6 +- src/components/organisms/Menu/index.tsx | 19 +++- src/components/wrappers/FormWrapper.tsx | 37 ++++++-- src/constants/environments.ts | 3 + .../components/BoxWithShadow.tsx | 2 +- src/design-system/config/theme.ts | 4 +- .../utils/generateStyledSystem.ts | 1 - src/i18n/translations/en.json | 9 +- src/i18n/translations/pl.json | 12 ++- src/screens/auth/SignInScreen.tsx | 80 ++++++++-------- src/screens/auth/SignUpScreen.tsx | 92 +++++++++++-------- src/utils/removeFalsyProperties.ts | 6 +- 14 files changed, 219 insertions(+), 153 deletions(-) diff --git a/src/components/KeyboardAwareScrollView.tsx b/src/components/KeyboardAwareScrollView.tsx index e1e0eb9d..c137f118 100644 --- a/src/components/KeyboardAwareScrollView.tsx +++ b/src/components/KeyboardAwareScrollView.tsx @@ -3,45 +3,49 @@ import { forwardRef, useMemo } from 'react' import { Platform, StyleProp, ViewStyle } from 'react-native' import { KeyboardAwareScrollView as KeyboardAwareScroll, - KeyboardAwareScrollViewProps, + KeyboardAwareScrollViewProps as KeyboardAwareScrollProps, } from 'react-native-keyboard-aware-scroll-view' const keyboardDismissMode = Platform.OS === 'android' ? 'on-drag' : 'interactive' -type Props = Omit & { +export type KeyboardAwareScrollViewProps = Omit< + KeyboardAwareScrollProps, + 'contentContainerStyle' +> & { contentContainerStyle?: Omit, 'false'> } -export const KeyboardAwareScrollView = forwardRef( - ({ children, contentContainerStyle = {}, ...rest }, ref) => { - const { navigationTheme } = useNavigationTheme() +export const KeyboardAwareScrollView = forwardRef< + KeyboardAwareScroll, + KeyboardAwareScrollViewProps +>(({ children, contentContainerStyle = {}, ...rest }, ref) => { + const { navigationTheme } = useNavigationTheme() - const scrollViewContentContainerStyle = useMemo( - () => [ - { - backgroundColor: navigationTheme.colors.background, - flexGrow: 1, - }, - contentContainerStyle, - ], - [contentContainerStyle, navigationTheme.colors.background] - ) + const scrollViewContentContainerStyle = useMemo( + () => [ + { + backgroundColor: navigationTheme.colors.background, + flexGrow: 1, + }, + contentContainerStyle, + ], + [contentContainerStyle, navigationTheme.colors.background] + ) - return ( - - {children} - - ) - } -) + return ( + + {children} + + ) +}) diff --git a/src/components/LanguagePicker.tsx b/src/components/LanguagePicker.tsx index 984d0f17..cf98c6e9 100644 --- a/src/components/LanguagePicker.tsx +++ b/src/components/LanguagePicker.tsx @@ -1,6 +1,7 @@ +import { theme } from '@baca/design-system' import { Icon, Row, Text } from '@baca/design-system/components' import { Touchable, TouchableProps } from '@baca/design-system/components/Touchables/Touchable' -import { useCallback, useTranslation, useTheme } from '@baca/hooks' +import { useCallback, useTranslation } from '@baca/hooks' import { StyleSheet } from 'react-native' import Animated, { useAnimatedStyle, @@ -9,12 +10,18 @@ import Animated, { withTiming, } from 'react-native-reanimated' -import { Menu } from './organisms/Menu' +import { Menu, MenuProps } from './organisms/Menu' import languages from '../../assets/languages.json' -export const LanguagePicker: React.FC = () => { - const { size } = useTheme() +type LanguagePickerProps = { + isWeb?: boolean + pickerPlacement?: MenuProps['placement'] +} +export const LanguagePicker: React.FC = ({ + isWeb = false, + pickerPlacement, +}) => { const { i18n } = useTranslation() const language = i18n?.language?.slice?.(0, 2).toUpperCase() as keyof typeof languages const isOpen = useSharedValue(false) @@ -24,10 +31,6 @@ export const LanguagePicker: React.FC = () => { transform: [{ rotateZ: `${rotateZ.value}deg` }], })) - const styles = StyleSheet.create({ - icon: { height: size['8'], justifyContent: 'center' }, - }) - const iconColor = 'text.brand.primary' const renderTrigger = useCallback( @@ -43,7 +46,9 @@ export const LanguagePicker: React.FC = () => { return ( - {languages?.[language]?.emoji} + + {languages?.[language]?.[isWeb ? 'language' : 'emoji']} + @@ -51,7 +56,7 @@ export const LanguagePicker: React.FC = () => { ) }, - [animatedIconStyle, isOpen, language, styles.icon, iconColor] + [isOpen, language, isWeb, animatedIconStyle] ) const handleItemPress = useCallback( @@ -62,7 +67,7 @@ export const LanguagePicker: React.FC = () => { ) return ( - + {Object.entries(languages).map(([key, languageData]) => ( { ) } + +const styles = StyleSheet.create({ + icon: { height: theme.dark.size['8'], justifyContent: 'center' }, +}) diff --git a/src/components/Version.tsx b/src/components/Version.tsx index 7330a418..38972d5a 100644 --- a/src/components/Version.tsx +++ b/src/components/Version.tsx @@ -11,7 +11,7 @@ const appVersion = Application?.nativeApplicationVersion ?? Constants?.expoConfi export const Version = ({ onPress }: { onPress: () => void }) => { const version = `${appName}: ${appVersion} (${Application?.nativeBuildVersion ?? '-'}) ${ - Updates.updateId ? 'update: ' + Updates.updateId : '' + Updates.updateId ? '\nupdate: ' + Updates.updateId : '' }` const handleShortPress = useCallback(async () => { @@ -20,7 +20,9 @@ export const Version = ({ onPress }: { onPress: () => void }) => { return ( - {version} + + {version} + ) diff --git a/src/components/organisms/Menu/index.tsx b/src/components/organisms/Menu/index.tsx index 511323b9..0ea4f9df 100644 --- a/src/components/organisms/Menu/index.tsx +++ b/src/components/organisms/Menu/index.tsx @@ -1,8 +1,9 @@ -import { Box, TouchableProps, ScrollView, Pressable } from '@baca/design-system/components' +import { useColorScheme } from '@baca/contexts' +import { Box, TouchableProps, ScrollView, Pressable } from '@baca/design-system' import { useRef, useState, useMemo, useTheme, useCallback } from '@baca/hooks' import { Portal } from '@gorhom/portal' import React, { NamedExoticComponent, PropsWithChildren, memo } from 'react' -import { View, Modal } from 'react-native' +import { View, Modal, Dimensions } from 'react-native' import { MenuItem } from '../../molecules/MenuItem' @@ -15,7 +16,7 @@ type TriggerPosition = { type TriggerState = { isOpen: boolean } -type MenuProps = { +export type MenuProps = { trigger: (props: TouchableProps, state: TriggerState) => JSX.Element onOpen?: () => void onClose?: () => void @@ -47,6 +48,7 @@ const Menu = memo( placement = 'bottomLeft', ...props }) => { + const { colorScheme } = useColorScheme() const { shadows } = useTheme() const _modalRef = useRef(null) const _triggerContainer = useRef(null) @@ -120,12 +122,19 @@ const Menu = memo( visible={isOpen} onRequestClose={handleClose} > - + {triggerPosition && ( = ({ children }) => { - useScreenOptions({ headerShown: false }) +type FormWrapperProps = { + edges?: SafeAreaViewProps['edges'] + headerShown?: boolean + keyboardAwareProps?: KeyboardAwareScrollViewProps +} + +export const FormWrapper: FC> = ({ + children, + edges, + headerShown = false, + keyboardAwareProps = {}, +}) => { + useScreenOptions({ headerShown }) return ( - - {children} - + + + {children} + + ) } const styles = StyleSheet.create({ contentContainerStyle: { alignSelf: 'center', - flex: 1, flexGrow: 1, - maxWidth: 360, + maxWidth: 360 + 2 * 32, // contentWidth + 2 * paddingHorizontal + paddingHorizontal: 32, width: '100%', }, + safeAreaContainer: { flex: 1 }, }) diff --git a/src/constants/environments.ts b/src/constants/environments.ts index 9e44fbfc..12d2ad22 100644 --- a/src/constants/environments.ts +++ b/src/constants/environments.ts @@ -1,5 +1,8 @@ import Constants, { AppOwnership } from 'expo-constants' +import { Platform } from 'react-native' export const isExpoGo = Constants.appOwnership === AppOwnership.Expo export const isDevelopment = __DEV__ || process.env.NODE_ENV === 'development' export const isProduction = !isDevelopment || process.env.NODE_ENV === 'production' + +export const isWeb = Platform.OS === 'web' diff --git a/src/design-system/components/BoxWithShadow.tsx b/src/design-system/components/BoxWithShadow.tsx index 2cfe4f9f..2da06cc2 100644 --- a/src/design-system/components/BoxWithShadow.tsx +++ b/src/design-system/components/BoxWithShadow.tsx @@ -18,7 +18,7 @@ export const BoxWithShadow: FC> = ({ ...rest }) => { const shadowProps = useMemo( - () => (isInvalid ? errorShadow : isFocused ? focusShadow : {}), + () => (isInvalid && isFocused ? errorShadow : isFocused ? focusShadow : {}), [isInvalid, isFocused] ) diff --git a/src/design-system/config/theme.ts b/src/design-system/config/theme.ts index ba420444..37bf664c 100644 --- a/src/design-system/config/theme.ts +++ b/src/design-system/config/theme.ts @@ -320,14 +320,14 @@ export const shadows = { shadowOffset: { width: 0, height: 0 }, shadowColor: themeColors.primitives.Error[500], shadowOpacity: 1, - shadowRadius: 8, + shadowRadius: 3, elevation: 3, }, focusShadow: { shadowOffset: { width: 0, height: 0 }, shadowColor: themeColors.primitives.Brand[500], shadowOpacity: 1, - shadowRadius: 8, + shadowRadius: 3, elevation: 3, }, grayShadow: { diff --git a/src/design-system/utils/generateStyledSystem.ts b/src/design-system/utils/generateStyledSystem.ts index 4f2308d2..9ff6ce54 100644 --- a/src/design-system/utils/generateStyledSystem.ts +++ b/src/design-system/utils/generateStyledSystem.ts @@ -173,7 +173,6 @@ const generateLayoutsStyle = ({ }: LayoutsProps): StyleProp => { return { position, - bottom, left, right, top, diff --git a/src/i18n/translations/en.json b/src/i18n/translations/en.json index b6710970..02f093b7 100644 --- a/src/i18n/translations/en.json +++ b/src/i18n/translations/en.json @@ -216,10 +216,15 @@ "do_not_have_an_account": "Don't have an account?", "forgot_password": "Forgot password", "sign_in": "Sign in", - "sign_up": "Sign up" + "sign_up": "Sign up", + "welcome_back": "Welcome back", + "welcome_back_enter_details": "Welcome back! Please enter your details" }, "sign_up_screen": { - "sign_up": "Sign up" + "get_started": "Get started", + "log_in": "Log in", + "sign_up": "Sign up", + "start_free_trail": "Start your 30-day free trial." }, "test_form": { "additional_comment": "Additional comment", diff --git a/src/i18n/translations/pl.json b/src/i18n/translations/pl.json index 26899a58..1137b946 100644 --- a/src/i18n/translations/pl.json +++ b/src/i18n/translations/pl.json @@ -213,12 +213,16 @@ "sign_in_screen": { "do_not_have_an_account": "Nie masz konta?", "forgot_password": "Nie pamiętam hasła", - "sign_in": "Zaloguj", - "sign_up": "Zarejestruj" + "sign_in": "Zaloguj się", + "sign_up": "Zarejestruj się", + "welcome_back": "Welcome back", + "welcome_back_enter_details": "Welcome back! Please enter your details" }, "sign_up_screen": { - "created_new_account": "Nowe konto zostało stworzone. Email z linkiem weryfikacyjnym został wysłany na {{userEmail}}.", - "sign_up": "Zarejestruj" + "get_started": "Rozpoczynamy", + "log_in": "Zaloguj się", + "sign_up": "Zarejestruj się", + "start_free_trail": "Rozpocznij darmowy 30 dniowy okres próbny." }, "test_form": { "additional_comment": "Dodatkowy komentarz", diff --git a/src/screens/auth/SignInScreen.tsx b/src/screens/auth/SignInScreen.tsx index a820a546..87d7f898 100644 --- a/src/screens/auth/SignInScreen.tsx +++ b/src/screens/auth/SignInScreen.tsx @@ -1,37 +1,21 @@ import { CompanyLogo, ControlledField, - KeyboardAwareScrollView, + FormWrapper, LanguagePicker, Version, } from '@baca/components' -import { REGEX } from '@baca/constants' -import { Box, Button, Center, Row, Spacer, Text } from '@baca/design-system' -import { - useCallback, - useSignInForm, - useTranslation, - useEffect, - useScreenOptions, -} from '@baca/hooks' +import { REGEX, isWeb } from '@baca/constants' +import { Box, Button, Center, Display, Row, Spacer, Text } from '@baca/design-system' +import { useCallback, useSignInForm, useTranslation } from '@baca/hooks' import { useRouter } from 'expo-router' export const SignInScreen = (): JSX.Element => { const { push } = useRouter() const { t } = useTranslation() - useScreenOptions({ - title: t('navigation.screen_titles.sign_in'), - }) - const { control, errors, submit, getValues, isSubmitting, setFocus } = useSignInForm() - useEffect(() => { - setTimeout(() => { - setFocus('email') - }, 500) - }, [setFocus]) - const navigateToSignUp = useCallback(() => push('/sign-up'), [push]) const navigateToAppInfo = useCallback(() => push('/application-info'), [push]) const navigateToForgotPassword = useCallback( @@ -41,14 +25,30 @@ export const SignInScreen = (): JSX.Element => { const focusPasswordInput = useCallback(() => setFocus('password'), [setFocus]) return ( - - - - -
- + + {isWeb ? ( + + + + + + + ) : null} +
+ {!isWeb ? ( + + + + ) : null} + + {t('sign_in_screen.welcome_back')} + + + {t('sign_in_screen.welcome_back_enter_details')} + + { my={8} onPress={submit} testID="signInButton" + w="full" > {t('sign_in_screen.sign_in')} - - {t('sign_in_screen.do_not_have_an_account')} - - - {t('sign_in_screen.sign_up')} - - - - {/* TODO: Remove this after implementing signing in with backend */} - Correct credentials - - Email: test@example.com{'\n'}Password: 123456 - - + + + {t('sign_in_screen.do_not_have_an_account')} + + + {t('sign_in_screen.sign_up')} + +
- + + + + ) } diff --git a/src/screens/auth/SignUpScreen.tsx b/src/screens/auth/SignUpScreen.tsx index 6b10b13a..412d27c7 100644 --- a/src/screens/auth/SignUpScreen.tsx +++ b/src/screens/auth/SignUpScreen.tsx @@ -1,33 +1,35 @@ -import { CompanyLogo, ControlledField, KeyboardAwareScrollView } from '@baca/components' -import { Button, Center, Spacer } from '@baca/design-system' -import { useScreenOptions, useSignUpForm, useTranslation } from '@baca/hooks' -import { useCallback, useEffect } from 'react' +import { CompanyLogo, ControlledField, FormWrapper } from '@baca/components' +import { Box, Button, Center, Display, Row, Spacer, Text } from '@baca/design-system' +import { useSignUpForm, useTranslation } from '@baca/hooks' +import { router } from 'expo-router' +import { useCallback } from 'react' +import { Keyboard } from 'react-native' + +const navigateToLogIn = () => { + router.navigate('/sign-in') +} export const SignUpScreen = () => { const { t } = useTranslation() - useScreenOptions({ - title: t('navigation.screen_titles.sign_up'), - }) - const { control, errors, register, isSubmitting, setFocus } = useSignUpForm() - useEffect(() => { - setTimeout(() => { - setFocus('firstName') - }, 500) - }, [setFocus]) - const focusLastNameInput = useCallback(() => setFocus('lastName'), [setFocus]) const focusEmailInput = useCallback(() => setFocus('email'), [setFocus]) const focusPasswordInput = useCallback(() => setFocus('password'), [setFocus]) return ( - -
+ +
+ {t('sign_up_screen.sign_up')} + + + {t('sign_up_screen.start_free_trail')} + + { enterKeyHint="next" isRequired label={t('form.labels.password')} - mb={16} name="password" - onSubmitEditing={register} + onSubmitEditing={Keyboard.dismiss} placeholder={t('form.placeholders.create_password')} rules={{ required: t('form.validation.required'), }} type="password" /> - - - + + + + + - + + + + {t('sign_in_screen.do_not_have_an_account')} + + + {t('sign_up_screen.log_in')} + +
- + ) } diff --git a/src/utils/removeFalsyProperties.ts b/src/utils/removeFalsyProperties.ts index 94f51195..b1e78c69 100644 --- a/src/utils/removeFalsyProperties.ts +++ b/src/utils/removeFalsyProperties.ts @@ -1,10 +1,10 @@ export const removeFalsyProperties = (obj: O) => { - const filterdObject = Object.entries(obj).reduce>((acc, curr) => { - if (curr[1]) { + const filteredObject = Object.entries(obj).reduce>((acc, curr) => { + if (curr[1] !== undefined) { acc[curr[0]] = curr[1] } return acc }, {}) - return filterdObject as O + return filteredObject } From 4641444a4fde6e0ee91522858e166158998a364e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Wed, 27 Mar 2024 14:25:43 +0100 Subject: [PATCH 19/20] add CR fixes --- src/navigation/tabNavigator/components/AppHeader.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/navigation/tabNavigator/components/AppHeader.tsx b/src/navigation/tabNavigator/components/AppHeader.tsx index 11a64a27..eb030c2f 100644 --- a/src/navigation/tabNavigator/components/AppHeader.tsx +++ b/src/navigation/tabNavigator/components/AppHeader.tsx @@ -1,5 +1,6 @@ import { CompanyLogo } from '@baca/components' -import { Platform, StyleSheet, View } from 'react-native' +import { isWeb } from '@baca/constants' +import { StyleSheet, View } from 'react-native' import { useSafeAreaInsets } from 'react-native-safe-area-context' import { TabColorsStrings } from '../navigation-config' @@ -7,7 +8,10 @@ import { TabColorsStrings } from '../navigation-config' export function AppHeader() { const { top } = useSafeAreaInsets() + if (!isWeb) return null + const height = 60 + top + return ( @@ -20,11 +24,11 @@ const jsStyles = StyleSheet.create({ alignItems: 'center', borderBottomColor: TabColorsStrings.lightGray, borderBottomWidth: 1, + display: 'flex', flexDirection: 'row', justifyContent: 'center', paddingHorizontal: 16, width: '100%', zIndex: 10, - ...Platform.select({ default: { display: 'none' }, web: { display: 'flex' } }), }, }) From 297ebac534207951fb27d433b9a7e9aa7741b09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Wed, 27 Mar 2024 14:31:11 +0100 Subject: [PATCH 20/20] add fixes according to pass tests --- src/design-system/components/Button/Button.tsx | 1 - src/utils/removeFalsyProperties.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/design-system/components/Button/Button.tsx b/src/design-system/components/Button/Button.tsx index 1ac12982..c7bb0518 100644 --- a/src/design-system/components/Button/Button.tsx +++ b/src/design-system/components/Button/Button.tsx @@ -60,7 +60,6 @@ const styles = StyleSheet.create({ baseText: { fontStyle: 'normal', fontWeight: '400', - letterSpacing: 0, lineHeight: 21, }, }) diff --git a/src/utils/removeFalsyProperties.ts b/src/utils/removeFalsyProperties.ts index b1e78c69..e1031436 100644 --- a/src/utils/removeFalsyProperties.ts +++ b/src/utils/removeFalsyProperties.ts @@ -1,6 +1,6 @@ export const removeFalsyProperties = (obj: O) => { const filteredObject = Object.entries(obj).reduce>((acc, curr) => { - if (curr[1] !== undefined) { + if (curr[1] || curr[1] === 0) { acc[curr[0]] = curr[1] } return acc