From 5a7a2dc4e193bb365a5e84b0186081b3c056411a Mon Sep 17 00:00:00 2001 From: hyochan Date: Sun, 31 Jan 2021 09:42:44 +0900 Subject: [PATCH] Change folder dir for potential atomic design structures --- src/App.tsx | 2 +- .../GestureHandler/index.ts | 0 .../GestureHandler/index.web.ts | 0 .../RootStackNavigator.tsx | 4 +-- .../__tests__/RootStackNavigator.test.tsx | 0 .../RootStackNavigator.test.tsx.snap | 0 src/components/{screen => pages}/Intro.tsx | 4 +-- src/components/{screen => pages}/Temp.tsx | 4 +-- .../__tests__/Intro.test.tsx | 2 +- .../{screen => pages}/__tests__/Temp.test.tsx | 0 .../__snapshots__/Intro.test.tsx.snap | 0 .../__snapshots__/Temp.test.tsx.snap | 0 .../{shared => templates}/Button.tsx | 0 .../__tests__/Button.test.tsx | 0 .../__snapshots__/Button.test.tsx.snap | 0 src/components/ui/Typography.tsx | 29 +++++++++++++++++++ 16 files changed, 37 insertions(+), 8 deletions(-) rename src/components/{navigation => navigations}/GestureHandler/index.ts (100%) rename src/components/{navigation => navigations}/GestureHandler/index.web.ts (100%) rename src/components/{navigation => navigations}/RootStackNavigator.tsx (95%) rename src/components/{navigation => navigations}/__tests__/RootStackNavigator.test.tsx (100%) rename src/components/{navigation => navigations}/__tests__/__snapshots__/RootStackNavigator.test.tsx.snap (100%) rename src/components/{screen => pages}/Intro.tsx (95%) rename src/components/{screen => pages}/Temp.tsx (90%) rename src/components/{screen => pages}/__tests__/Intro.test.tsx (98%) rename src/components/{screen => pages}/__tests__/Temp.test.tsx (100%) rename src/components/{screen => pages}/__tests__/__snapshots__/Intro.test.tsx.snap (100%) rename src/components/{screen => pages}/__tests__/__snapshots__/Temp.test.tsx.snap (100%) rename src/components/{shared => templates}/Button.tsx (100%) rename src/components/{shared => templates}/__tests__/Button.test.tsx (100%) rename src/components/{shared => templates}/__tests__/__snapshots__/Button.test.tsx.snap (100%) create mode 100644 src/components/ui/Typography.tsx diff --git a/src/App.tsx b/src/App.tsx index 2aaed1d0..532e2738 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import RootNavigator from './components/navigation/RootStackNavigator'; +import RootNavigator from './components/navigations/RootStackNavigator'; import RootProvider from './providers'; import {initFbt} from './utils/fbt'; diff --git a/src/components/navigation/GestureHandler/index.ts b/src/components/navigations/GestureHandler/index.ts similarity index 100% rename from src/components/navigation/GestureHandler/index.ts rename to src/components/navigations/GestureHandler/index.ts diff --git a/src/components/navigation/GestureHandler/index.web.ts b/src/components/navigations/GestureHandler/index.web.ts similarity index 100% rename from src/components/navigation/GestureHandler/index.web.ts rename to src/components/navigations/GestureHandler/index.web.ts diff --git a/src/components/navigation/RootStackNavigator.tsx b/src/components/navigations/RootStackNavigator.tsx similarity index 95% rename from src/components/navigation/RootStackNavigator.tsx rename to src/components/navigations/RootStackNavigator.tsx index 7ee2abfb..3f9b07ec 100644 --- a/src/components/navigation/RootStackNavigator.tsx +++ b/src/components/navigations/RootStackNavigator.tsx @@ -5,10 +5,10 @@ import { createStackNavigator, } from '@react-navigation/stack'; -import Intro from '../screen/Intro'; +import Intro from '../pages/Intro'; import {NavigationContainer} from '@react-navigation/native'; import React from 'react'; -import Temp from '../screen/Temp'; +import Temp from '../pages/Temp'; import {useTheme} from '../../providers/ThemeProvider'; export type RootStackParamList = { diff --git a/src/components/navigation/__tests__/RootStackNavigator.test.tsx b/src/components/navigations/__tests__/RootStackNavigator.test.tsx similarity index 100% rename from src/components/navigation/__tests__/RootStackNavigator.test.tsx rename to src/components/navigations/__tests__/RootStackNavigator.test.tsx diff --git a/src/components/navigation/__tests__/__snapshots__/RootStackNavigator.test.tsx.snap b/src/components/navigations/__tests__/__snapshots__/RootStackNavigator.test.tsx.snap similarity index 100% rename from src/components/navigation/__tests__/__snapshots__/RootStackNavigator.test.tsx.snap rename to src/components/navigations/__tests__/__snapshots__/RootStackNavigator.test.tsx.snap diff --git a/src/components/screen/Intro.tsx b/src/components/pages/Intro.tsx similarity index 95% rename from src/components/screen/Intro.tsx rename to src/components/pages/Intro.tsx index db917d92..7929e501 100644 --- a/src/components/screen/Intro.tsx +++ b/src/components/pages/Intro.tsx @@ -1,9 +1,9 @@ import styled, {css} from 'styled-components/native'; -import Button from '../shared/Button'; +import Button from '../templates/Button'; import {IC_MASK} from '../../utils/Icons'; import React from 'react'; -import {RootStackNavigationProps} from '../navigation/RootStackNavigator'; +import {RootStackNavigationProps} from '../navigations/RootStackNavigator'; import {User} from '../../types'; import {View} from 'react-native'; import {fbt} from 'fbt'; diff --git a/src/components/screen/Temp.tsx b/src/components/pages/Temp.tsx similarity index 90% rename from src/components/screen/Temp.tsx rename to src/components/pages/Temp.tsx index 45990a39..bf8bfc0e 100644 --- a/src/components/screen/Temp.tsx +++ b/src/components/pages/Temp.tsx @@ -1,9 +1,9 @@ import { RootStackNavigationProps, RootStackParamList, -} from '../../components/navigation/RootStackNavigator'; +} from '../navigations/RootStackNavigator'; -import Button from '../shared/Button'; +import Button from '../templates/Button'; import React from 'react'; import {RouteProp} from '@react-navigation/core'; import styled from 'styled-components/native'; diff --git a/src/components/screen/__tests__/Intro.test.tsx b/src/components/pages/__tests__/Intro.test.tsx similarity index 98% rename from src/components/screen/__tests__/Intro.test.tsx rename to src/components/pages/__tests__/Intro.test.tsx index 2cf85c9a..690cae6f 100644 --- a/src/components/screen/__tests__/Intro.test.tsx +++ b/src/components/pages/__tests__/Intro.test.tsx @@ -2,7 +2,7 @@ import React, {ReactElement} from 'react'; import {RenderAPI, act, fireEvent, render} from '@testing-library/react-native'; import {createTestElement, createTestProps} from '../../../../test/testUtils'; -import Button from '../../shared/Button'; +import Button from '../../templates/Button'; import Intro from '../Intro'; import {ThemeType} from '../../../providers/ThemeProvider'; import renderer from 'react-test-renderer'; diff --git a/src/components/screen/__tests__/Temp.test.tsx b/src/components/pages/__tests__/Temp.test.tsx similarity index 100% rename from src/components/screen/__tests__/Temp.test.tsx rename to src/components/pages/__tests__/Temp.test.tsx diff --git a/src/components/screen/__tests__/__snapshots__/Intro.test.tsx.snap b/src/components/pages/__tests__/__snapshots__/Intro.test.tsx.snap similarity index 100% rename from src/components/screen/__tests__/__snapshots__/Intro.test.tsx.snap rename to src/components/pages/__tests__/__snapshots__/Intro.test.tsx.snap diff --git a/src/components/screen/__tests__/__snapshots__/Temp.test.tsx.snap b/src/components/pages/__tests__/__snapshots__/Temp.test.tsx.snap similarity index 100% rename from src/components/screen/__tests__/__snapshots__/Temp.test.tsx.snap rename to src/components/pages/__tests__/__snapshots__/Temp.test.tsx.snap diff --git a/src/components/shared/Button.tsx b/src/components/templates/Button.tsx similarity index 100% rename from src/components/shared/Button.tsx rename to src/components/templates/Button.tsx diff --git a/src/components/shared/__tests__/Button.test.tsx b/src/components/templates/__tests__/Button.test.tsx similarity index 100% rename from src/components/shared/__tests__/Button.test.tsx rename to src/components/templates/__tests__/Button.test.tsx diff --git a/src/components/shared/__tests__/__snapshots__/Button.test.tsx.snap b/src/components/templates/__tests__/__snapshots__/Button.test.tsx.snap similarity index 100% rename from src/components/shared/__tests__/__snapshots__/Button.test.tsx.snap rename to src/components/templates/__tests__/__snapshots__/Button.test.tsx.snap diff --git a/src/components/ui/Typography.tsx b/src/components/ui/Typography.tsx new file mode 100644 index 00000000..61cb3b6b --- /dev/null +++ b/src/components/ui/Typography.tsx @@ -0,0 +1,29 @@ +import styled, {css} from 'styled-components/native'; + +export const Heading1 = styled.Text` + font-size: 26px; + text-align: center; + color: ${({theme}): string => theme.text}; + font-family: futura; + font-weight: 700; + + ${({theme: {isDesktop}}) => + isDesktop && + css` + font-size: 40px; + `} +`; + +export const Body1 = styled.Text` + font-size: 20px; + text-align: center; + color: ${({theme}): string => theme.text}; + font-family: avenir; + font-weight: 800; + + ${({theme: {isDesktop}}) => + isDesktop && + css` + font-size: 28px; + `} +`;