From 24ead01a640f774981bc6ee9d9752a2716d2ec8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Baumruck?= Date: Wed, 3 Apr 2024 07:58:21 +0200 Subject: [PATCH 1/3] adjust navigation styles, change colors to proper branding --- assets/logo/logo-sygnet-dark.png | Bin 6031 -> 5677 bytes src/components/LandingHeader.tsx | 7 ++- .../tabNavigator/components/AppHeader.tsx | 12 +++-- .../tabNavigator/components/BottomBar.tsx | 11 ++--- .../tabNavigator/components/HeaderLogo.tsx | 7 ++- .../tabNavigator/components/SideBar.tsx | 6 ++- .../components/SideBarTabItem.tsx | 43 ++++-------------- .../tabNavigator/navigation-config.ts | 15 ------ 8 files changed, 33 insertions(+), 68 deletions(-) diff --git a/assets/logo/logo-sygnet-dark.png b/assets/logo/logo-sygnet-dark.png index a64f209bc9fc92b4952ac59f4eb7a16902288dff..09ce2d5d7ac5117043b282e8374982542d30706b 100644 GIT binary patch literal 5677 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 literal 6031 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 diff --git a/src/components/LandingHeader.tsx b/src/components/LandingHeader.tsx index f001e4ea..e28eb5af 100644 --- a/src/components/LandingHeader.tsx +++ b/src/components/LandingHeader.tsx @@ -1,8 +1,7 @@ import { lightBinarLogo, darkBinarLogo } from '@baca/constants' import { useColorScheme } from '@baca/contexts' import { Box, Button, Icon, Pressable, Spacer } from '@baca/design-system' -import { useCallback, useTranslation } from '@baca/hooks' -import { TabColorsStrings } from '@baca/navigation/tabNavigator/navigation-config' +import { useCallback, useTheme, useTranslation } from '@baca/hooks' import { isSignedInAtom } from '@baca/store/auth' import { useRouter } from 'expo-router' import { useAtomValue } from 'jotai' @@ -11,6 +10,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context' export function LandingHeader() { const { colorScheme } = useColorScheme() + const { colors } = useTheme() const { top } = useSafeAreaInsets() const { t } = useTranslation() const { push, canGoBack, back } = useRouter() @@ -25,7 +25,7 @@ export function LandingHeader() { return ( + ) @@ -22,7 +27,6 @@ export function AppHeader() { const jsStyles = StyleSheet.create({ appHeader: { alignItems: 'center', - borderBottomColor: TabColorsStrings.lightGray, borderBottomWidth: 1, display: 'flex', flexDirection: 'row', diff --git a/src/navigation/tabNavigator/components/BottomBar.tsx b/src/navigation/tabNavigator/components/BottomBar.tsx index 18b95580..66ed2d21 100644 --- a/src/navigation/tabNavigator/components/BottomBar.tsx +++ b/src/navigation/tabNavigator/components/BottomBar.tsx @@ -1,15 +1,15 @@ -import { useColorScheme } from '@baca/contexts' import { Icon } from '@baca/design-system' +import { useTheme } from '@baca/hooks' import cssStyles from '@baca/styles' import { Platform, StyleSheet, View } from 'react-native' import { useSafeAreaInsets } from 'react-native-safe-area-context' import { TabBarItemWrapper } from './TabBarItemWrapper' -import { bottomTabs, TabColors, TabColorsStrings } from '../navigation-config' +import { bottomTabs } from '../navigation-config' import { cns } from '../utils' export function BottomBar({ visible }: { visible: boolean }) { - const { colorScheme } = useColorScheme() + const { colors } = useTheme() return ( - + {bottomTabs.map((tab, i) => ( {({ focused, pressed, hovered }) => ( diff --git a/src/navigation/tabNavigator/components/SideBar.tsx b/src/navigation/tabNavigator/components/SideBar.tsx index ea94fa78..704649d7 100644 --- a/src/navigation/tabNavigator/components/SideBar.tsx +++ b/src/navigation/tabNavigator/components/SideBar.tsx @@ -1,3 +1,4 @@ +import { useTheme } from '@baca/hooks' import { signOut } from '@baca/store/auth' import cssStyles from '@baca/styles' import { Platform, StyleSheet, View } from 'react-native' @@ -5,12 +6,13 @@ import { Platform, StyleSheet, View } from 'react-native' import { HeaderLogo } from './HeaderLogo' import { SideBarTabItem } from './SideBarTabItem' import { useWidth } from '../hooks' -import { TabColorsStrings, upperSideTabs } from '../navigation-config' +import { upperSideTabs } from '../navigation-config' import { cns } from '../utils' const NAV_MEDIUM_WIDTH = 244 export function SideBar({ visible }: { visible: boolean }) { + const { colors } = useTheme() const isLarge = useWidth(1264) return ( @@ -36,6 +38,7 @@ export function SideBar({ visible }: { visible: boolean }) { }) { const isLarge = useWidth(1264) - const { colorScheme } = useColorScheme() + const { colors } = useTheme() return ( @@ -35,7 +31,7 @@ export function SideBarTabItem({ style={[ jsStyles.sidebarItemContainer, hovered && { - backgroundColor: TabColorsStrings.lightGray50, + backgroundColor: colors.bg.tertiary, }, ]} > @@ -47,30 +43,13 @@ export function SideBarTabItem({ }, ]} > - + - {children} @@ -81,7 +60,6 @@ export function SideBarTabItem({ } const jsStyles = StyleSheet.create({ - fontBold: { fontWeight: 'bold' }, sidebarIconContainer: Platform.select({ default: { padding: 0 }, web: { @@ -103,10 +81,9 @@ const jsStyles = StyleSheet.create({ }), }, sidebarItemText: { - fontSize: 16, - lineHeight: 24, marginLeft: 16, marginRight: 16, + userSelect: 'none', }, sidebarTabItem: { paddingVertical: 4, diff --git a/src/navigation/tabNavigator/navigation-config.ts b/src/navigation/tabNavigator/navigation-config.ts index 061f97d3..81ba8419 100644 --- a/src/navigation/tabNavigator/navigation-config.ts +++ b/src/navigation/tabNavigator/navigation-config.ts @@ -1,6 +1,4 @@ -import { palette } from '@baca/design-system' import { IconNames } from '@baca/types/icon' -import { hex2rgba } from '@baca/utils' type Tab = { displayedName: string @@ -64,16 +62,3 @@ export const upperSideTabs: Tabs = [ export const bottomSideTabs: Tabs = [] export const bottomTabs: Tabs = [...upperSideTabs] - -export const TabColors: Record = { - tabIconDark: 'text.brand.tertiary', - tabIconLight: 'text.success.primary', -} as const - -export const TabColorsStrings = { - lightGray: palette.gray['300'], - lightGray50: hex2rgba(palette.gray['50'], 0.5), - tabTextDark: palette.gray['700'], - tabTextLight: palette.gray['300'], - transparent: 'transparent', -} as const From 8279ee1029a7e3ad0928faf0837156c14f84e8a7 Mon Sep 17 00:00:00 2001 From: Mateusz Rostkowski Date: Wed, 3 Apr 2024 20:14:53 +0200 Subject: [PATCH 2/3] chore: update user session screen --- src/screens/UserSessionScreen.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/screens/UserSessionScreen.tsx b/src/screens/UserSessionScreen.tsx index 99dddbe9..72aec0a8 100644 --- a/src/screens/UserSessionScreen.tsx +++ b/src/screens/UserSessionScreen.tsx @@ -2,6 +2,7 @@ import { useAuthControllerMe } from '@baca/api/query/auth/auth' import { Box, Button, ScrollView, Text } from '@baca/design-system' import { Token, getToken } from '@baca/services' import { isRefreshingTokenAtom } from '@baca/store' +import { wait } from '@baca/utils' import { useAtomValue } from 'jotai' import { useCallback, useEffect, useState } from 'react' @@ -22,7 +23,11 @@ export const UserSessionScreen = () => { const fetchUser = useCallback(async () => { await refetch() - }, [refetch]) + + // Refetch function could refresh token, so we are fetching it from store again + await wait(100) + await fetchToken() + }, [fetchToken, refetch]) useEffect(() => { fetchToken() From cee41eb1395e225cbc165cab4956227ddb400bd2 Mon Sep 17 00:00:00 2001 From: Mateusz Rostkowski Date: Wed, 3 Apr 2024 20:15:20 +0200 Subject: [PATCH 3/3] chore: add comment to refetchTriggerTime --- src/services/TokenService.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/services/TokenService.ts b/src/services/TokenService.ts index 0ada592f..40b71e4a 100644 --- a/src/services/TokenService.ts +++ b/src/services/TokenService.ts @@ -50,7 +50,13 @@ export const refreshTokenIfNeeded = async (token: Token): Promise => { return token } - const refetchTriggerTime = Date.now() + 1000 * 14.9 * 60 //CONFIG: add time when to refetch token before current token expiration f.e. 1 hour -> 1000 * 60 * 60 + // CONFIG: add time when to refetch token before current token expiration f.e. 1 hour -> 1000 * 60 * 60 + // Current time - 14.9 minute + // If token is valid for 20 minute, it will be refreshed after 6 minutes + // Current time is set like that to easily test this logic, but in production app it could be 1 or 2 minutes + const timeBeforeTokenShouldBeRefetched = 1000 * 60 * 14.9 + + const refetchTriggerTime = Date.now() + timeBeforeTokenShouldBeRefetched const shouldRefreshToken = expirationTime < Math.round(refetchTriggerTime) // If token is still refreshing and there is no logout message shown app should try again to get token after 0.5 second