From a5960208eae1aa57451034615fbdb300ce4b0865 Mon Sep 17 00:00:00 2001 From: Michael Brennan Date: Wed, 4 Dec 2024 17:00:08 -0500 Subject: [PATCH] who the fuck keeps messing with typography --- frontend/src/components/Divider.tsx | 4 ++-- .../src/screens/login/signup_flow/ConnectAccountsScreen.tsx | 2 +- frontend/src/screens/login/signup_flow/EmailInputScreen.tsx | 2 +- frontend/src/screens/profile/ProfileEditScreen.tsx | 2 +- frontend/src/screens/profile/ProfileScreen.tsx | 2 +- frontend/src/screens/profile/ProfileSettingsScreen.tsx | 2 +- .../src/screens/profile/components/PageHeaderNavigation.tsx | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/Divider.tsx b/frontend/src/components/Divider.tsx index c0021ec..066fcc3 100644 --- a/frontend/src/components/Divider.tsx +++ b/frontend/src/components/Divider.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { View, Image, ImageSourcePropType } from 'react-native'; import { styled } from 'nativewind'; -import { CaptionText } from './typography'; +import { CaptionText } from './Typography'; const StyledView = styled(View); const StyledImage = styled(Image); @@ -22,7 +22,7 @@ const Divider: React.FC = ({ text, image }) => { {text && ( //Allows for conditional rendering of text element - //Text element styling is taken from typography.tsx + //Text element styling is taken from Typography.tsx {text} diff --git a/frontend/src/screens/login/signup_flow/ConnectAccountsScreen.tsx b/frontend/src/screens/login/signup_flow/ConnectAccountsScreen.tsx index a3642f8..a7e87ab 100644 --- a/frontend/src/screens/login/signup_flow/ConnectAccountsScreen.tsx +++ b/frontend/src/screens/login/signup_flow/ConnectAccountsScreen.tsx @@ -6,7 +6,7 @@ import PlaidLink from '../../../expo-plaid-link/Index'; import { useLink } from '../../../services/plaid'; import TextField from '../../../components/TextField'; import TextInputComponent from '../components/TextInputComponent'; -import { BodyBoldText, BodyText, CaptionText } from '../../../components/typography'; +import { BodyBoldText, BodyText, CaptionText } from '../../../components/Typography'; import Button from '../../../components/Button'; import NavProgressBar from '../components/NavProgressBar'; import OnboardingScreenWrapper from '../components/OnboardingScreenWrapper'; diff --git a/frontend/src/screens/login/signup_flow/EmailInputScreen.tsx b/frontend/src/screens/login/signup_flow/EmailInputScreen.tsx index e8e54d1..7634520 100644 --- a/frontend/src/screens/login/signup_flow/EmailInputScreen.tsx +++ b/frontend/src/screens/login/signup_flow/EmailInputScreen.tsx @@ -6,7 +6,7 @@ import TextInputComponent from '../components/TextInputComponent'; import { useAuth } from '../../../context/AuthContext'; import NavProgressBar from '../components/NavProgressBar'; import OnboardingScreenWrapper from '../components/OnboardingScreenWrapper'; -import { HeadingText, TitleText } from '../../../components/typography'; +import { HeadingText, TitleText } from '../../../components/Typography'; const StyledView = styled(View); const StyledText = styled(Text); diff --git a/frontend/src/screens/profile/ProfileEditScreen.tsx b/frontend/src/screens/profile/ProfileEditScreen.tsx index f6a7e36..2d3240e 100644 --- a/frontend/src/screens/profile/ProfileEditScreen.tsx +++ b/frontend/src/screens/profile/ProfileEditScreen.tsx @@ -6,7 +6,7 @@ import { NavigationScreenProp } from 'react-navigation'; import Divider from '../../components/Divider'; import Button from '../../components/Button'; -import { BodyText, SubheadingText } from '../../components/typography'; +import { BodyText, SubheadingText } from '../../components/Typography'; import { useInvestorProfile } from '../../services/investor'; import ProfiileHeaderNavigation from './components/PageHeaderNavigation'; import PageHeaderNavigation from './components/PageHeaderNavigation'; diff --git a/frontend/src/screens/profile/ProfileScreen.tsx b/frontend/src/screens/profile/ProfileScreen.tsx index ba2d2ec..4efbfa9 100644 --- a/frontend/src/screens/profile/ProfileScreen.tsx +++ b/frontend/src/screens/profile/ProfileScreen.tsx @@ -7,7 +7,7 @@ import { useInvestorProfile } from '../../../src/services/investor'; import Button from '../../components/Button'; import Divider from '../../components/Divider'; -import { BodyBoldText, BodyText, SubheadingText } from '../../components/typography'; +import { BodyBoldText, BodyText, SubheadingText } from '../../components/Typography'; const StyledView = styled(View); const StyledText = styled(Text); diff --git a/frontend/src/screens/profile/ProfileSettingsScreen.tsx b/frontend/src/screens/profile/ProfileSettingsScreen.tsx index ca9635a..113cfb8 100644 --- a/frontend/src/screens/profile/ProfileSettingsScreen.tsx +++ b/frontend/src/screens/profile/ProfileSettingsScreen.tsx @@ -5,7 +5,7 @@ import ProfilePageNavigator from './components/ProfilePageNavigator'; import { NavigationScreenProp } from 'react-navigation'; import Divider from '../../components/Divider'; -import { SubheadingText } from '../../components/typography'; +import { SubheadingText } from '../../components/Typography'; import PageHeaderNavigation from './components/PageHeaderNavigation'; const StyledView = styled(View); diff --git a/frontend/src/screens/profile/components/PageHeaderNavigation.tsx b/frontend/src/screens/profile/components/PageHeaderNavigation.tsx index 0eaa3e3..65e8627 100644 --- a/frontend/src/screens/profile/components/PageHeaderNavigation.tsx +++ b/frontend/src/screens/profile/components/PageHeaderNavigation.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { TouchableOpacity, View, Text, Image, ImageSourcePropType} from "react-native"; import { NavigationScreenProp } from 'react-navigation'; import { styled } from 'nativewind'; -import { SubheadingText } from '../../../components/typography'; +import { SubheadingText } from '../../../components/Typography'; interface ProfilePageNavigatorProps { // This actually should be `any`, so disabling the linter rule