fix: import 안된다는 에러해결

react-navigation/react-navigation#10507 버전이슈니 뭐니 어쩌고 다 했는데, 그냥 import 다시 새로적어주면 되는 이슈였음 ; 밤에 뭐했냐 진짜 ;;ㄱ허ㅏㅣ붖기ㅏ버
juhyeongee · Aug 10, 2022 · ee51baa · ee51baa
1 parent db68418
commit ee51baa
Show file tree

Hide file tree

Showing 10 changed files with 6,323 additions and 6,171 deletions.
diff --git a/App.tsx b/App.tsx
@@ -31,7 +31,7 @@ import { observer } from "mobx-react";
 
 function App() {
   const { currentScreen } = currentPageStore;
-  const [onPage, setOnPage] = useState("OnBoardingNav");
+  const [onPage, setOnPage] = useState("IntroNav");
   const [fontsLoaded] = useFonts({
     NotoSansKR_100Thin,
     NotoSansKR_300Light,
@@ -48,7 +48,6 @@ function App() {
   });
   useEffect(() => {
     todoNumStore.resetVersionNum;
-    AsyncStorage.clear();
   }, []);
 
   if (!fontsLoaded) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/navigations/IntroNav.tsx b/src/navigations/IntroNav.tsx
@@ -1,19 +1,16 @@
-import * as React from "react";
 import Intro from "../screens/Intro";
 import SignIn from "../screens/SignIn";
-import CheckPrivacyPolicy from "../screens/SignIn/pages/CheckPrivacyPolicy";
-import JoinWithEmail from "../screens/SignIn/pages/JoinWithEmail";
-import JoinWithApple from "../screens/SignIn/pages/JoinWithApple";
-import JoinWithGoogle from "../screens/SignIn/pages/JoinWithGoogle";
-import PolicyDetail from "../screens/SignIn/pages/PolicyDetail";
-import LogIn from "../screens/SignIn/pages/LogIn";
-
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import { IntroStackParamList } from "@/types";
-
-const IntroStack = createNativeStackNavigator<IntroStackParamList>();
+import EmailJoin from "@/screens/SignIn/Pages/JoinWithEmail";
+import CheckPrivacyPolicy from "@/screens/SignIn/Pages/CheckPrivacyPolicy";
+import JoinWithApple from "@/screens/SignIn/Pages/JoinWithApple";
+import JoinWithGoogle from "@/screens/SignIn/Pages/JoinWithGoogle";
+import LogIn from "@/screens/SignIn/Pages/LogIn";
+import PolicyDetail from "@/screens/SignIn/Pages/PolicyDetail";
 
 export function IntroNav() {
+  const IntroStack = createNativeStackNavigator<IntroStackParamList>();
   return (
     <IntroStack.Navigator
       screenOptions={{
@@ -24,14 +21,14 @@ export function IntroNav() {
     >
       <IntroStack.Screen name="Intro" component={Intro} />
       <IntroStack.Screen name="SignIn" component={SignIn} />
-      <IntroStack.Screen name="LogIn" component={LogIn} />
-      <IntroStack.Screen name="JoinWithEmail" component={JoinWithEmail} />
-      <IntroStack.Screen name="JoinWithApple" component={JoinWithApple} />
-      <IntroStack.Screen name="JoinWithGoogle" component={JoinWithGoogle} />
+      <IntroStack.Screen name="JoinWithEmail" component={EmailJoin} />
       <IntroStack.Screen
         name="CheckPrivacyPolicy"
         component={CheckPrivacyPolicy}
       />
+      <IntroStack.Screen name="JoinWithApple" component={JoinWithApple} />
+      <IntroStack.Screen name="JoinWithGoogle" component={JoinWithGoogle} />
+      <IntroStack.Screen name="LogIn" component={LogIn} />
       <IntroStack.Screen name="PolicyDetail" component={PolicyDetail} />
     </IntroStack.Navigator>
   );

diff --git a/src/screens/Setting/index.tsx b/src/screens/Setting/index.tsx
@@ -2,7 +2,6 @@ import React, { View, Text, Pressable } from "react-native";
 import styled from "styled-components/native";
 import todoNumStore from "@/store/TodoNumStore";
 import { observer } from "mobx-react";
-import { MainText } from "@/components";
 import currentPageStore from "@/store/CurrentPageStore";
 
 const Setting = () => {
@@ -19,7 +18,7 @@ const Setting = () => {
   }
   return (
     <CenterView>
-      <MainText> Store 상황입니다.</MainText>
+      <Text> Store 상황입니다.</Text>
       <Text>현재 TodoNum: {todoNumStore.todoNum}</Text>
       <Pressable onPress={addOne}>
         <Text>missionNum 하나 추가하기</Text>

diff --git a/src/screens/SignIn/Pages/JoinWithApple.tsx b/src/screens/SignIn/Pages/JoinWithApple.tsx
@@ -1,7 +1,7 @@
 import React, { View } from "react-native";
 
-const JoinWithApple = () => {
+const AppleJoin = () => {
   return <View>JoinWithApple</View>;
 };
 
-export default JoinWithApple;
+export default AppleJoin;
diff --git a/src/screens/SignIn/Pages/JoinWithEmail.tsx b/src/screens/SignIn/Pages/JoinWithEmail.tsx
@@ -1,7 +1,6 @@
 import React, { useRef, useState } from "react";
 import { View, Text } from "react-native";
 import { BigPrimaryBtn } from "@components/index";
-import { ITheme } from "@/types";
 import { IntroStackScreenProps } from "@/types";
 import {
   Container,
@@ -11,7 +10,7 @@ import {
   WhiteSpace,
 } from "../components/Styled";
 
-const JoinWithEmail = ({
+const EmailJoin = ({
   route,
   navigation,
 }: IntroStackScreenProps<"JoinWithEmail">) => {
@@ -72,5 +71,4 @@ const JoinWithEmail = ({
     </Container>
   );
 };
-
-export default JoinWithEmail;
+export default EmailJoin;
diff --git a/src/screens/SignIn/Pages/PolicyDetail.tsx b/src/screens/SignIn/Pages/PolicyDetail.tsx
@@ -1,12 +1,11 @@
 import React from "react";
 import { View, Text, ScrollView, Pressable } from "react-native";
-import { MainText, SubText } from "@components/index";
 import { policyText } from "@constants/properties";
 import SvgIcon from "@assets/SvgIcon";
 import { useNavigation } from "@react-navigation/native";
 import { NativeStackNavigationProp } from "@react-navigation/native-stack";
 import { IntroStackParamList } from "@/types";
-import { Container, SafeArea } from "../components/Styled";
+import { Container, SafeArea, TitleText, SubText } from "../components/Styled";
 
 const PolicyDetail = () => {
   const navigation =
@@ -20,7 +19,7 @@ const PolicyDetail = () => {
           </Pressable>
         </View>
         <View style={{ flex: 0.2 }}>
-          <MainText>이용약관 동의 </MainText>
+          <TitleText>이용약관 동의 </TitleText>
           <SubText>
             본 약관은 새로의 서비스 이용과 관련하여 필요한 사항을 규정합니다.
           </SubText>

diff --git a/src/screens/SignIn/components/Styled.ts b/src/screens/SignIn/components/Styled.ts
@@ -1,5 +1,6 @@
 import styled from "styled-components/native";
 import { ITheme } from "@/types";
+import { Platfrom } from "react-native";
 
 interface IContainerProps {
   theme: ITheme;
@@ -18,6 +19,27 @@ export const SafeArea = styled.SafeAreaView`
   flex: 1;
 `;
 
+export const TitleText = styled.Text`
+  color: ${(props: IContainerProps) => props.theme.color.n900};
+  font-family: ${(props: IContainerProps) =>
+    Platform.OS === "ios"
+      ? props.theme.font.thickFont
+      : props.theme.font.androidThickFont};
+  font-size: 20px;
+  line-height: ${(props: IContainerProps) =>
+    Platform.OS === "ios" ? "28px" : "32px"}; ;
+`;
+
+export const SubText = styled.Text`
+  color: ${(props: IContainerProps) => props.theme.color.n900};
+  font-family: ${(props: IContainerProps) =>
+    Platform.OS === "ios"
+      ? props.theme.font.thickFont
+      : props.theme.font.androidThickFont};
+  margin-bottom: 10px;
+  font-size: 14px;
+`;
+
 export const PressableIconBox = styled.Pressable`
   flex-direction: row;
   width: 90%;

diff --git a/src/screens/SignIn/index.tsx b/src/screens/SignIn/index.tsx
@@ -49,7 +49,9 @@ const SignIn = ({ route, navigation }: IntroStackScreenProps<"SignIn">) => {
           />
           <BigPrimaryBtn
             text="로그인 하기"
-            onPress={() => updateScreen(TOGO_SCREEN)}
+            onPress={() => {
+              updateScreen(TOGO_SCREEN);
+            }}
             textBold={true}
           />
         </View>