From c547ea828ecb67357edfe20425ea831ce53ce677 Mon Sep 17 00:00:00 2001 From: noki-program Date: Sun, 13 Dec 2020 12:47:58 +0900 Subject: [PATCH 1/6] =?UTF-8?q?App.tsx=E3=81=A7=E5=88=86=E5=B2=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.tsx | 69 +- package.json | 11 +- src/@types/App.d.ts | 17 +- src/{Compose => Components}/items.tsx | 0 src/Fire.ts | 0 src/Navigations/BottomTabNavigation.tsx | 56 ++ src/Navigations/Navigations.ts | 3 + src/Navigations/StackScreen.tsx | 0 src/{ => Navigations}/TaskNavigation.tsx | 2 +- src/{ => Navigations}/TweetNavigation.tsx | 2 +- src/Screens.ts | 8 - src/Screens/Screens.ts | 9 + src/Screens/SingInUpScreen/SignInScreen.tsx | 222 +++++ src/Screens/SingInUpScreen/SignUpScreen.tsx | 218 +++++ src/Screens/SingInUpScreen/WelcomeScreen.tsx | 87 ++ .../TasksScreen}/TaskAddScreen.tsx | 4 +- .../TasksScreen}/TaskDetailScreen.tsx | 4 +- .../TasksScreen}/TaskEditScreen.tsx | 0 .../TasksScreen}/TaskListScreen.tsx | 2 +- .../TweetsScreen}/TweetAddScreen.tsx | 2 +- .../TweetsScreen}/TweetListScreen.tsx | 2 +- src/{ => Stores}/TaskStore.ts | 0 src/{ => Stores}/TweetStore.ts | 0 yarn.lock | 869 +++++++++++++++++- 24 files changed, 1461 insertions(+), 126 deletions(-) rename src/{Compose => Components}/items.tsx (100%) create mode 100644 src/Fire.ts create mode 100644 src/Navigations/BottomTabNavigation.tsx create mode 100644 src/Navigations/Navigations.ts create mode 100644 src/Navigations/StackScreen.tsx rename src/{ => Navigations}/TaskNavigation.tsx (97%) rename src/{ => Navigations}/TweetNavigation.tsx (95%) delete mode 100644 src/Screens.ts create mode 100644 src/Screens/Screens.ts create mode 100644 src/Screens/SingInUpScreen/SignInScreen.tsx create mode 100644 src/Screens/SingInUpScreen/SignUpScreen.tsx create mode 100644 src/Screens/SingInUpScreen/WelcomeScreen.tsx rename src/{ => Screens/TasksScreen}/TaskAddScreen.tsx (98%) rename src/{ => Screens/TasksScreen}/TaskDetailScreen.tsx (98%) rename src/{ => Screens/TasksScreen}/TaskEditScreen.tsx (100%) rename src/{ => Screens/TasksScreen}/TaskListScreen.tsx (98%) rename src/{ => Screens/TweetsScreen}/TweetAddScreen.tsx (96%) rename src/{ => Screens/TweetsScreen}/TweetListScreen.tsx (97%) rename src/{ => Stores}/TaskStore.ts (100%) rename src/{ => Stores}/TweetStore.ts (100%) diff --git a/App.tsx b/App.tsx index ce92a98..61bba88 100644 --- a/App.tsx +++ b/App.tsx @@ -1,59 +1,24 @@ -import { StatusBar } from 'expo-status-bar'; -import { StyleSheet, Text, View } from 'react-native'; -import React, { useEffect } from "react"; -import { NavigationContainer } from "@react-navigation/native"; -import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; -//import { createMaterialBottomTabNavigator } from "@react-navigation/material-bottom-tabs"; -import { TaskListScreen, TweetListScreen } from "./src/Screens"; - -import { Provider as PaperProvider } from "react-native-paper"; -import { TaskNavigation } from './src/TaskNavigation'; -import { TweetNavigation } from './src/TweetNavigation'; -import { LogBox } from "react-native"; -import Ionicons from 'react-native-vector-icons/Ionicons'; - - -LogBox.ignoreLogs(["Setting a timer for a long period of time"]); - - -//const Tab = createMaterialBottomTabNavigator(); -const Tab = createBottomTabNavigator(); - -export default function App() { - return ( - - ({ - tabBarIcon: ({ focused, color, size }) => { - let iconName = "list-circle"; - - if (route.name === "Task") { - iconName = focused ? "clipboard-outline" : "clipboard-outline"; - } else if (route.name === "Tweet") { - iconName = focused ? "chatbox-outline" : "chatbox-outline"; - } - - // You can return any component that you like here! - return ; - }, - })} - tabBarOptions={{ - activeTintColor: "#0f5c55", - inactiveTintColor: "#c4d4e3", - }} - > - - - - - ); +import { BottomTabBar } from "@react-navigation/bottom-tabs"; +import { StatusBar } from "expo-status-bar"; +import React from "react"; +import { StyleSheet, Text, View } from "react-native"; +import { SignUpScreen } from "./src/Screens/Screens"; + +export function TaskEditScreen() { + if (i =0){ + return( + + ) + } else { + + } } const styles = StyleSheet.create({ container: { flex: 1, - backgroundColor: '#fff', - alignItems: 'center', - justifyContent: 'center', + backgroundColor: "#fff", + alignItems: "center", + justifyContent: "center", }, }); diff --git a/package.json b/package.json index 81d210d..c54e300 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dependencies": { "@react-native-community/async-storage": "^1.12.1", "@react-native-community/datetimepicker": "3.0.4", - "@react-native-community/masked-view": "^0.1.10", + "@react-native-community/masked-view": "0.1.10", "@react-navigation/bottom-tabs": "^5.11.2", "@react-navigation/drawer": "^5.11.4", "@react-navigation/material-bottom-tabs": "^5.3.10", @@ -19,15 +19,16 @@ "@types/react-native-vector-icons": "^6.4.6", "expo": "~40.0.0", "expo-status-bar": "~1.0.3", + "firebase": "7.9.0", "moment": "^2.29.1", "react": "16.13.1", "react-dom": "16.13.1", "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz", - "react-native-gesture-handler": "^1.9.0", + "react-native-gesture-handler": "~1.8.0", "react-native-paper": "^4.4.1", - "react-native-reanimated": "^1.13.2", - "react-native-safe-area-context": "^3.1.9", - "react-native-screens": "^2.15.0", + "react-native-reanimated": "~1.13.0", + "react-native-safe-area-context": "3.1.9", + "react-native-screens": "~2.15.0", "react-native-storage": "^1.0.1", "react-native-super-grid": "^4.0.3", "react-native-vector-icons": "^7.1.0", diff --git a/src/@types/App.d.ts b/src/@types/App.d.ts index bba1e9a..e0e34b7 100644 --- a/src/@types/App.d.ts +++ b/src/@types/App.d.ts @@ -14,11 +14,26 @@ interface Tweet { type RootStackParamList = { TaskItem: string[] TaskAdd: {Task: Task}; - TaskList: {Task: Task}; + TaskList: {Task: Task, user: signedInUser}; TaskDetail: {Task: Task}; TaskEdit: undefined; TaskNavigation: undefined; TweetList: {Tweet: Tweet}; TweetAdd: {Tweet: Tweet}; TweetNavigation: undefined; + Welcome: undefined; + SignIn: undefined; + SignUp: undefined; + BottomTabNavigation: undefined; +} + + +type RootStackParamList2 = { + addTask: undefined; + editTask: undefined; +}; + +type signedInUser = { + email: string; + uid: string; } \ No newline at end of file diff --git a/src/Compose/items.tsx b/src/Components/items.tsx similarity index 100% rename from src/Compose/items.tsx rename to src/Components/items.tsx diff --git a/src/Fire.ts b/src/Fire.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/Navigations/BottomTabNavigation.tsx b/src/Navigations/BottomTabNavigation.tsx new file mode 100644 index 0000000..e238302 --- /dev/null +++ b/src/Navigations/BottomTabNavigation.tsx @@ -0,0 +1,56 @@ +import { StatusBar } from "expo-status-bar"; +import { StyleSheet, Text, View } from "react-native"; +import React, { useEffect } from "react"; +import { NavigationContainer } from "@react-navigation/native"; +import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; +//import { createMaterialBottomTabNavigator } from "@react-navigation/material-bottom-tabs"; +import { TaskListScreen, TweetListScreen } from "../Screens/Screens"; + +import { Provider as PaperProvider } from "react-native-paper"; +import { TaskNavigation, TweetNavigation } from "./Navigations"; +import { LogBox } from "react-native"; +import Ionicons from "react-native-vector-icons/Ionicons"; + +LogBox.ignoreLogs(["Setting a timer for a long period of time"]); + +//const Tab = createMaterialBottomTabNavigator(); +const Tab = createBottomTabNavigator(); + +export function BottomTabNavigation() { + return ( + + ({ + tabBarIcon: ({ focused, color, size }) => { + let iconName = "list-circle"; + + if (route.name === "Task") { + iconName = focused ? "clipboard-outline" : "clipboard-outline"; + } else if (route.name === "Tweet") { + iconName = focused ? "chatbox-outline" : "chatbox-outline"; + } + + // You can return any component that you like here! + return ; + }, + })} + tabBarOptions={{ + activeTintColor: "#0f5c55", + inactiveTintColor: "#c4d4e3", + }} + > + + + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#fff", + alignItems: "center", + justifyContent: "center", + }, +}); diff --git a/src/Navigations/Navigations.ts b/src/Navigations/Navigations.ts new file mode 100644 index 0000000..9b56a71 --- /dev/null +++ b/src/Navigations/Navigations.ts @@ -0,0 +1,3 @@ +export * from "./BottomTabNavigation"; +export * from "./TaskNavigation"; +export * from "./TweetNavigation"; diff --git a/src/Navigations/StackScreen.tsx b/src/Navigations/StackScreen.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/TaskNavigation.tsx b/src/Navigations/TaskNavigation.tsx similarity index 97% rename from src/TaskNavigation.tsx rename to src/Navigations/TaskNavigation.tsx index aea237c..fda9b9a 100644 --- a/src/TaskNavigation.tsx +++ b/src/Navigations/TaskNavigation.tsx @@ -8,7 +8,7 @@ import { TaskEditScreen, TaskDetailScreen, //TweetNavigation, -} from "./Screens"; +} from "../Screens/Screens"; const Stack = createStackNavigator(); diff --git a/src/TweetNavigation.tsx b/src/Navigations/TweetNavigation.tsx similarity index 95% rename from src/TweetNavigation.tsx rename to src/Navigations/TweetNavigation.tsx index 49292b7..2ae9d41 100644 --- a/src/TweetNavigation.tsx +++ b/src/Navigations/TweetNavigation.tsx @@ -5,7 +5,7 @@ import { createStackNavigator } from "@react-navigation/stack"; import { TweetListScreen, TweetAddScreen, -} from "./Screens"; +} from "../Screens/Screens"; const Stack = createStackNavigator(); diff --git a/src/Screens.ts b/src/Screens.ts deleted file mode 100644 index 650eb37..0000000 --- a/src/Screens.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from "./TaskListScreen"; -export * from "./TaskAddScreen"; -export * from "./TaskDetailScreen"; -export * from "./TaskEditScreen"; -export * from "./TweetListScreen"; -export * from "./TweetAddScreen"; -export * from "./TweetNavigation"; -export * from "./TaskNavigation"; \ No newline at end of file diff --git a/src/Screens/Screens.ts b/src/Screens/Screens.ts new file mode 100644 index 0000000..47956e0 --- /dev/null +++ b/src/Screens/Screens.ts @@ -0,0 +1,9 @@ +export * from "./TasksScreen/TaskListScreen"; +export * from "./TasksScreen/TaskAddScreen"; +export * from "./TasksScreen/TaskDetailScreen"; +export * from "./TasksScreen/TaskEditScreen"; +export * from "./TweetsScreen/TweetListScreen"; +export * from "./TweetsScreen/TweetAddScreen"; +export * from "./SingInUpScreen/SignInScreen"; +export * from "./SingInUpScreen/SignUpScreen"; +export * from "./SingInUpScreen/WelcomeScreen"; diff --git a/src/Screens/SingInUpScreen/SignInScreen.tsx b/src/Screens/SingInUpScreen/SignInScreen.tsx new file mode 100644 index 0000000..38a100f --- /dev/null +++ b/src/Screens/SingInUpScreen/SignInScreen.tsx @@ -0,0 +1,222 @@ +import { StatusBar as ExpoStatusBar } from "expo-status-bar"; +import React, { useState } from "react"; +import { + StyleSheet, + Text, + View, + Button, + TextInput, + KeyboardAvoidingView, + Platform, + SafeAreaView, + Alert, + StatusBar, + TouchableOpacity, +} from "react-native"; +import { useNavigation } from "@react-navigation/native"; +import firebase from "firebase"; + +export function SignInScreen() { + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); + + const navigation = useNavigation(); + + const toHome = (user: signedInUser) => { + navigation.navigate("home", { user: user }); + }; + + const toSignUp = () => { + navigation.navigate("signUp"); + }; + + const toBack = () => { + navigation.navigate("welcome"); + }; + const backButton = "<"; + + const pressedSubmit = (email: string, password: string) => { + firebase + .auth() + .signInWithEmailAndPassword(email, password) + .then((user) => { + if (!user) throw new Error("user is empty"); + if (!user.user) throw new Error("user.user is empty"); + if (!user.user.email) throw new Error("user.user.email is empty"); + + Alert.alert("サインイン成功", "正常にサインインできました"); + //console.log(JSON.stringify(user)); + + const currentUser: signedInUser = { + email: user.user.email, + uid: user.user.uid, + }; + toHome(currentUser); + }) + .catch((error) => { + console.log(error); + Alert.alert("エラー", `${error}`); + }); + }; + + return ( + + + { + toBack(); + }} + > + {backButton} + + + ログイン + + + { + setEmail(email); + }} + /> + { + setPassword(password); + }} + /> + + + + + { + toSignUp(); + }} + > + アカウントを作成 + + + { + pressedSubmit(email, password); + }} + > + 次へ + + + + + + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#fff", + width: "100%", + alignItems: "center", + justifyContent: "center", + paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0, + }, + + titleAndFieldView: { + flex: 2, + alignItems: "center", + justifyContent: "center", + }, + + back: { + width: "90%", + alignItems: "center", + justifyContent: "center", + position: "absolute", + top: "5%", + }, + + backText: { + color: "#F7B3B3", + fontSize: 50, + position: "absolute", + left: "5%", + }, + + screenTitle: { + fontSize: 25, + marginBottom: 50, + position: "absolute", + top: "20%", + }, + + inputContainer: { + alignItems: "center", + justifyContent: "center", + width: "90%", + position: "absolute", + top: "35%", + flex: 1, + //backgroundColor:"#eee", + }, + + inputContainerItem: { + borderBottomWidth: 2, + borderBottomColor: "#eee", + marginBottom: 30, + width: "80%", + padding: 10, + }, + + buttonContainer: { + alignItems: "center", + justifyContent: "center", + bottom: "1%", + backgroundColor: "#eee", + flex: 1, + width: "100%", + }, + + signIp: { + width: 120, + height: 40, + position: "absolute", + bottom: "7%", + right: "15%", + alignItems: "center", + justifyContent: "center", + }, + + signUpText: { + color: "#F7B3B3", + }, + + nextStep: { + backgroundColor: "#F7B3B3", + width: 60, + height: 40, + borderRadius: 30, + alignItems: "center", + justifyContent: "center", + position: "absolute", + bottom: "7%", + left: "25%", + }, + + nextStepText: { + color: "#fff", + fontSize: 18, + }, +}); diff --git a/src/Screens/SingInUpScreen/SignUpScreen.tsx b/src/Screens/SingInUpScreen/SignUpScreen.tsx new file mode 100644 index 0000000..94b5f54 --- /dev/null +++ b/src/Screens/SingInUpScreen/SignUpScreen.tsx @@ -0,0 +1,218 @@ +import { StatusBar as ExpoStatusBar } from "expo-status-bar"; +import React, { useState } from "react"; +import { + StyleSheet, + Text, + View, + Button, + TextInput, + KeyboardAvoidingView, + Platform, + SafeAreaView, + Alert, + StatusBar, + TouchableOpacity, + Dimensions, +} from "react-native"; + +import { useNavigation } from "@react-navigation/native"; +import firebase from "firebase"; + +const screenWidth = Dimensions.get("screen").width; + +export function SignUpScreen() { + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); + + const navigation = useNavigation(); + + const back = () => { + navigation.goBack(); + }; + + const toSignIn = () => { + navigation.navigate("signIn"); + }; + + const toWelcome = () => { + navigation.navigate("welcome"); + }; + const backButton = "<"; + + //Submitが押されたときにSign Up(登録処理)する関数 + const pressedSubmit = (email: string, password: string) => { + //ここでFirebaseでの登録 + firebase + .auth() + .createUserWithEmailAndPassword(email, password) + .then((user) => { + //登録成功したらログイン画面に戻る + Alert.alert("登録成功！", "サインインできるようになりました"); + back(); + }) + .catch((error) => { + //エラーが返ってきたらその内容をアラートで表示 + console.log(error); + Alert.alert("エラー", `${error}`); + }); + }; + + return ( + + + { + toWelcome(); + }} + > + {backButton} + + + アカウントを作成 + + + { + setEmail(email); + }} + /> + { + setPassword(password); + }} + /> + + + + { + toSignIn(); + }} + > + ログイン + + + { + pressedSubmit(email, password); + }} + > + 次へ + + + + + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#fff", + width: screenWidth * 1, + alignItems: "center", + justifyContent: "center", + paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0, + }, + + titleAndFieldView: { + flex: 2, + alignItems: "center", + justifyContent: "center", + }, + + backWelcome: { + width: "90%", + alignItems: "center", + justifyContent: "center", + position: "absolute", + top: "5%", + }, + + backWelcomeText: { + color: "#F7B3B3", + fontSize: 50, + position: "absolute", + left: "5%", + }, + + screenTitle: { + fontSize: 25, + marginBottom: 50, + position: "absolute", + top: "20%", + }, + + inputContainer: { + alignItems: "center", + justifyContent: "center", + width: "90%", + position: "absolute", + top: "35%", + flex: 1, + //backgroundColor:"#eee", + }, + + inputContainerItem: { + borderBottomWidth: 2, + borderBottomColor: "#eee", + marginBottom: 30, + width: "80%", + padding: 10, + }, + + buttonContainer: { + alignItems: "center", + justifyContent: "center", + bottom: "1%", + backgroundColor: "#eee", + flex: 1, + width: "100%", + }, + + signUp: { + width: 120, + height: 40, + position: "absolute", + bottom: "7%", + right: "18%", + alignItems: "center", + justifyContent: "center", + }, + + signUpText: { + color: "#F7B3B3", + }, + + nextStep: { + backgroundColor: "#F7B3B3", + width: 60, + height: 40, + borderRadius: 30, + alignItems: "center", + justifyContent: "center", + position: "absolute", + bottom: "7%", + left: "25%", + }, + + nextStepText: { + color: "#fff", + fontSize: 18, + }, +}); diff --git a/src/Screens/SingInUpScreen/WelcomeScreen.tsx b/src/Screens/SingInUpScreen/WelcomeScreen.tsx new file mode 100644 index 0000000..a28600f --- /dev/null +++ b/src/Screens/SingInUpScreen/WelcomeScreen.tsx @@ -0,0 +1,87 @@ +import { StatusBar } from "expo-status-bar"; +import React, { useState } from "react"; +import { StyleSheet, Text, View, TouchableOpacity } from "react-native"; +import { useNavigation } from "@react-navigation/native"; + +export function WelcomeScreen() { + const navigation = useNavigation(); + + const toSignIn = () => { + navigation.navigate("signIn"); + }; + + const toSignUp = () => { + navigation.navigate("signUp"); + }; + + const firstMessage = `こんにちは。\nあなたのメモリになります。`; + + return ( + + {firstMessage} + { + toSignUp(); + }} + > + アカウントを作成 + + + { + toSignIn(); + }} + > + ログイン + + + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#fff", + alignItems: "center", + justifyContent: "center", + }, + + firstMessage: { + fontSize: 28, + fontWeight: "bold", + position: "absolute", + top: "30%", + color: "#707070", + }, + + mkAcount: { + backgroundColor: "#F7B3B3", + width: 280, + height: 50, + borderRadius: 30, + position: "absolute", + top: "55%", + alignItems: "center", + justifyContent: "center", + }, + + mkAcountText: { + color: "#fff", + fontSize: 20, + fontWeight: "bold", + }, + + logIn: { + position: "absolute", + bottom: "5%", + right: "10%", + }, + + logInText: { + color: "#F7B3B3", + }, +}); diff --git a/src/TaskAddScreen.tsx b/src/Screens/TasksScreen/TaskAddScreen.tsx similarity index 98% rename from src/TaskAddScreen.tsx rename to src/Screens/TasksScreen/TaskAddScreen.tsx index 759ec62..f92ae05 100644 --- a/src/TaskAddScreen.tsx +++ b/src/Screens/TasksScreen/TaskAddScreen.tsx @@ -19,8 +19,8 @@ import { import { useNavigation, RouteProp } from "@react-navigation/native"; import DateTimePicker from "@react-native-community/datetimepicker"; import { FAB } from "react-native-paper"; -import { Item } from "../src/Compose/items"; -import { save } from "./TaskStore"; +import { Item } from "../../Components/items"; +import { save } from "../../Stores/TaskStore"; import { add } from "react-native-reanimated"; import { render } from "react-dom"; const screenWidth = Dimensions.get("screen").width; diff --git a/src/TaskDetailScreen.tsx b/src/Screens/TasksScreen/TaskDetailScreen.tsx similarity index 98% rename from src/TaskDetailScreen.tsx rename to src/Screens/TasksScreen/TaskDetailScreen.tsx index c71bfca..e275a83 100644 --- a/src/TaskDetailScreen.tsx +++ b/src/Screens/TasksScreen/TaskDetailScreen.tsx @@ -17,10 +17,10 @@ import { } from "react-native"; import { FAB } from "react-native-paper"; -import { Item } from "../src/Compose/items"; +import { Item } from "../../Components/items"; import { useNavigation, RouteProp } from "@react-navigation/native"; -import { save } from "./TaskStore"; +import { save } from "../../Stores/TaskStore"; type TaskDetailScreenRouteProp = RouteProp; diff --git a/src/TaskEditScreen.tsx b/src/Screens/TasksScreen/TaskEditScreen.tsx similarity index 100% rename from src/TaskEditScreen.tsx rename to src/Screens/TasksScreen/TaskEditScreen.tsx diff --git a/src/TaskListScreen.tsx b/src/Screens/TasksScreen/TaskListScreen.tsx similarity index 98% rename from src/TaskListScreen.tsx rename to src/Screens/TasksScreen/TaskListScreen.tsx index cbaae23..9b8799f 100644 --- a/src/TaskListScreen.tsx +++ b/src/Screens/TasksScreen/TaskListScreen.tsx @@ -17,7 +17,7 @@ import { Provider as PaperProvider } from "react-native-paper"; import { FAB, List } from "react-native-paper"; import { useNavigation,} from "@react-navigation/native"; -import { removeTaskInfoAsync, loadAll } from "./TaskStore"; +import { removeTaskInfoAsync, loadAll } from "../../Stores/TaskStore"; import { render } from "react-dom"; import { TouchableOpacity } from "react-native-gesture-handler"; import { useFocusEffect } from "@react-navigation/native"; diff --git a/src/TweetAddScreen.tsx b/src/Screens/TweetsScreen/TweetAddScreen.tsx similarity index 96% rename from src/TweetAddScreen.tsx rename to src/Screens/TweetsScreen/TweetAddScreen.tsx index 9f4929b..b3b601c 100644 --- a/src/TweetAddScreen.tsx +++ b/src/Screens/TweetsScreen/TweetAddScreen.tsx @@ -2,7 +2,7 @@ import { StatusBar } from "expo-status-bar"; import { StyleSheet, Text, View, TextInput, KeyboardAvoidingView } from "react-native"; import { FAB, List } from "react-native-paper"; import React, { useEffect, useState } from "react"; -import { save } from "./TweetStore"; +import { save } from "../../Stores/TweetStore"; import { useNavigation, RouteProp } from "@react-navigation/native"; export function TweetAddScreen() { diff --git a/src/TweetListScreen.tsx b/src/Screens/TweetsScreen/TweetListScreen.tsx similarity index 97% rename from src/TweetListScreen.tsx rename to src/Screens/TweetsScreen/TweetListScreen.tsx index 5b4128b..f2a03cd 100644 --- a/src/TweetListScreen.tsx +++ b/src/Screens/TweetsScreen/TweetListScreen.tsx @@ -15,7 +15,7 @@ import { FAB, List } from "react-native-paper"; import { useNavigation } from "@react-navigation/native"; import React, { useEffect, useState } from "react"; -import { loadAll, removeTweetInfoAsync } from "./TweetStore"; +import { loadAll, removeTweetInfoAsync } from "../../Stores/TweetStore"; import { useFocusEffect } from "@react-navigation/native"; import moment from "moment"; diff --git a/src/TaskStore.ts b/src/Stores/TaskStore.ts similarity index 100% rename from src/TaskStore.ts rename to src/Stores/TaskStore.ts diff --git a/src/TweetStore.ts b/src/Stores/TweetStore.ts similarity index 100% rename from src/TweetStore.ts rename to src/Stores/TweetStore.ts diff --git a/yarn.lock b/yarn.lock index 790bc04..ea4214b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1012,6 +1012,236 @@ pouchdb-collections "^1.0.1" tiny-queue "^0.2.1" +"@firebase/analytics-types@0.2.6": + version "0.2.6" + resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.2.6.tgz#c8f4102c2c6492f563a53381a0db620dd6ac1711" + integrity sha512-G4wGsWCxVibT4vHHTzFXi0uXk91upPUMYQyKnVEq4E9Qr491+EyyT3xH/6k+Hxj4/bGeK0lhJ4czMd1R5cOWwg== + +"@firebase/analytics@0.2.13": + version "0.2.13" + resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.2.13.tgz#55faa9d7a87fa08b764c08d3e026da71da77577a" + integrity sha512-FAvpVS3dmfeCcYdxl7msz3Fr9OOLp/EYfDAx4T1yKi3dfTOXALH6pJK1hNjWjmGMq0qAWPmOFfAdpzd13Q0Uag== + dependencies: + "@firebase/analytics-types" "0.2.6" + "@firebase/component" "0.1.5" + "@firebase/installations" "0.4.2" + "@firebase/util" "0.2.40" + tslib "1.10.0" + +"@firebase/app-types@0.5.1": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.5.1.tgz#8add41d10c533759a80a376d09d24af0a1009343" + integrity sha512-fhe4KxEoRLD596tuIkvBXVHedVByI5ALzf5nMraOXsnBxLY0gKcMSXQGwwPxZyeUt/S1VM8DRVXOg9shegEO7g== + +"@firebase/app@0.5.4": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.5.4.tgz#3c23eabd0f3b2f48daa3530f6c6b18eeb96a8ec2" + integrity sha512-a+Z13FB/Om3JAv6wTUUW/X8ikRmK66fvbLCGPUKoUtqKow1zxeUelznyKNhF4/WA2wxpo3w5OXzp0G9U09Lecw== + dependencies: + "@firebase/app-types" "0.5.1" + "@firebase/component" "0.1.5" + "@firebase/logger" "0.1.35" + "@firebase/util" "0.2.40" + dom-storage "2.1.0" + tslib "1.10.0" + xmlhttprequest "1.8.0" + +"@firebase/auth-interop-types@0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.2.tgz#2f76aba39b4f22c52bb4b2eb7f31beb6ec312b33" + integrity sha512-FW4wNZbGSBpA8SgJy8EFdx0lPGm8a25zojI48kbV+QNn4EizJ1jbLPGtmBeEJJPFI4Ij+9EuCbsV1iwelZzDaA== + +"@firebase/auth-types@0.9.5": + version "0.9.5" + resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.9.5.tgz#16d6ec2ca02591528088840f826ca66e394fc4fd" + integrity sha512-nXruvfY/S3q2PhKR/vMfWGkn/zZY0JTT07R/aEdClYRDV7AZDhmgCi3m5HZmj+bMPz7PeZT/w1tUuNLjUqJV2A== + +"@firebase/auth@0.13.5": + version "0.13.5" + resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.13.5.tgz#2fc0aec89744463d3e14608bf6fe286f23418da3" + integrity sha512-0s/ULeqstzQ/Xi0ZgJnasYXH4WtTRaa9LztPv9gXHjwmOt/GtFnRUeW0RqDCmF4A2uikanMFm5+wtm80BkfpTg== + dependencies: + "@firebase/auth-types" "0.9.5" + +"@firebase/component@0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.1.5.tgz#57836339073ebebad5cbfc81d83d0507b3630ca6" + integrity sha512-oxRmOEIW3YbJVchLZKXiP4nJlKDCNLCQRdFdcO23IfJnaWePZofh4v5nT3XSJ6ouWlGIpENLZgoXjv2QrGFXfg== + dependencies: + "@firebase/util" "0.2.40" + tslib "1.10.0" + +"@firebase/database-types@0.4.11": + version "0.4.11" + resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.4.11.tgz#f76a1e668e7215a2855ded2a074601a0911d6bdb" + integrity sha512-+SiBjnufVhRSJg078feQWH7yHQncRjX+23NUgvBCRFXNBwUVvmPenNXYhCpF8XbhSOrC7BvfcRZTGqeI7+ZUdg== + dependencies: + "@firebase/app-types" "0.5.1" + +"@firebase/database@0.5.21": + version "0.5.21" + resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.5.21.tgz#2544399a9e018bab4241559932ccae6a9ae1cb35" + integrity sha512-NlndeAr88Rfi6LbeHF0/YaTkapns6K6bLGVu2w22oivHjZxLfR4aoyN2172yzhPpwEPN7iYhkkz/ZQi11CzL4g== + dependencies: + "@firebase/auth-interop-types" "0.1.2" + "@firebase/component" "0.1.5" + "@firebase/database-types" "0.4.11" + "@firebase/logger" "0.1.35" + "@firebase/util" "0.2.40" + faye-websocket "0.11.3" + tslib "1.10.0" + +"@firebase/firestore-types@1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-1.9.1.tgz#2a5372b3f314901186edbfd44b898f9120cf3a48" + integrity sha512-w3pT+RMQOORS8Tvf6wCaW8sq8hklPS4FkWSGCyo/gIbATP7pG8rvQDihN1x6D3if1jILWiZ/uPyl0eazm+MGzw== + +"@firebase/firestore@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-1.11.0.tgz#ed8c71fe2f586e3d2211c75a2faec798c709b86e" + integrity sha512-BMCdngDbYjrjKMLtszp34O8Hiw+zumsn4KhwSXpiLcHqKb2l7LN5XCdlKrLz4m3SXcit6vENfVWngVhwaMNalw== + dependencies: + "@firebase/component" "0.1.5" + "@firebase/firestore-types" "1.9.1" + "@firebase/logger" "0.1.35" + "@firebase/util" "0.2.40" + "@firebase/webchannel-wrapper" "0.2.35" + "@grpc/proto-loader" "^0.5.0" + grpc "1.24.2" + tslib "1.10.0" + +"@firebase/functions-types@0.3.14": + version "0.3.14" + resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.3.14.tgz#6abdebfe26c0896e0176edfd17502011b68c3259" + integrity sha512-G7wq6fahQuXbiSf/PbffWnWXNaYKsT9ECvps/2hTKXevZfeWEhDju40c/XFIDI2dcSnTfOYiKoRP8Mp7hi7/CQ== + +"@firebase/functions@0.4.33": + version "0.4.33" + resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.4.33.tgz#6556681af8e4652c6729d428f61004fa84642fb5" + integrity sha512-AI0NKxBnqClR5Afm7LIJyEMB1KL7JpAdfPutCrHXsNsPRxI589wNdMjqS2xcVpdEzfT3Y0iocFs93XcCmu5pNg== + dependencies: + "@firebase/component" "0.1.5" + "@firebase/functions-types" "0.3.14" + "@firebase/messaging-types" "0.4.2" + isomorphic-fetch "2.2.1" + tslib "1.10.0" + +"@firebase/installations-types@0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.3.1.tgz#f9f9264168081060ef8007d1a02b5a25317c3176" + integrity sha512-VU2Ssgy+rZx1LLra3e3CtYQ6cyZHMsg8zO6HVK3sf83qEOWMmWFPxLgjmyrCx+YDSY4A0TwmwFi2I7Mh98WY7w== + +"@firebase/installations@0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.4.2.tgz#471a6c936b029aa15e2505dc79257e29474675d4" + integrity sha512-g8GDRRikxY7U1rUe9xdAKShCz2/S5CdlYOnYP4Qm+kaJDbfQvAZRRRhpo4sIg7cpoxZ5dSVbl64YyEZzVS7XtA== + dependencies: + "@firebase/component" "0.1.5" + "@firebase/installations-types" "0.3.1" + "@firebase/util" "0.2.40" + idb "3.0.2" + tslib "1.10.0" + +"@firebase/logger@0.1.35": + version "0.1.35" + resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.1.35.tgz#e9938eca5d81b72b581b9a4c9031ffebdb31e56d" + integrity sha512-T7I/0+IQrlPAm/uUw6xeyJH5Msi8P6in/0LUtz2XQn2+LVBqyatlr+Nod9AldDCZehwLySEAFhXlqhb3BrI5GA== + +"@firebase/messaging-types@0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@firebase/messaging-types/-/messaging-types-0.4.2.tgz#7cd8489fbcce17c1f35537641c417883269fad02" + integrity sha512-Yb6pJ31tyDWP+4/8uXUO4cNP4oBdfauNuPT0SVqQ92SKlp4n2lHtH68IHa1outxJj6CFzFgj/Z2YZMviUWCM0Q== + +"@firebase/messaging@0.6.5": + version "0.6.5" + resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.6.5.tgz#9c9d1011c0017b3a9cae356b7c5d78c90068e35e" + integrity sha512-vlhO9h/0RfCOop3RFUdcqY5i+HiAnz/bJeQEN61WTqKzwHZWo16JhKVOhYmTnYfIEnbLSffbam74tQCKig+8sw== + dependencies: + "@firebase/component" "0.1.5" + "@firebase/installations" "0.4.2" + "@firebase/messaging-types" "0.4.2" + "@firebase/util" "0.2.40" + idb "3.0.2" + tslib "1.10.0" + +"@firebase/performance-types@0.0.9": + version "0.0.9" + resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.0.9.tgz#27227b91149cf57c3f5b15fc1a234fdc791a65ae" + integrity sha512-kOVFW2OY5qObjSrq3OczLuEIKGtnVw/R7qw/wTtgPbyQUhMp7o2tnfTcMWlKSEifgcJDEY3kMTda3fjAuXgzSw== + +"@firebase/performance@0.2.32": + version "0.2.32" + resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.2.32.tgz#0f85540f7fe616d2249ea6050471f0b3fac98598" + integrity sha512-e18mVGU7Er13nG1IT/BrONxvoKhd2MK7IUWMvxGv1NDQ0gs/AiK1qKzCRI1oBtyna5b/I+pYI8UvaffWRQXKBw== + dependencies: + "@firebase/component" "0.1.5" + "@firebase/installations" "0.4.2" + "@firebase/logger" "0.1.35" + "@firebase/performance-types" "0.0.9" + "@firebase/util" "0.2.40" + tslib "1.10.0" + +"@firebase/polyfill@0.3.31": + version "0.3.31" + resolved "https://registry.yarnpkg.com/@firebase/polyfill/-/polyfill-0.3.31.tgz#e22c51b6e48195ad7886ebef25a900deb08660e4" + integrity sha512-7XItMz50tdba57tCOTCSH8REvHYbrTU7MBOksnNZ3td/J9W/RkCPcLVSSnFWNmn0Jv1aufpUevryX1J4DZ/oiw== + dependencies: + core-js "3.6.2" + promise-polyfill "8.1.3" + whatwg-fetch "2.0.4" + +"@firebase/remote-config-types@0.1.6": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.1.6.tgz#9f81e5edee67b1c2a258cf609c7c5514a0575e86" + integrity sha512-t8Q3GOq7mGqy8SwgnMHQZYqADEc4fj3rdA8U+ZFPWEISMrGQQfaCm/5QaS7HFmSoKaJx+/tSBBKVjVqvSoOH6Q== + +"@firebase/remote-config@0.1.13": + version "0.1.13" + resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.1.13.tgz#4ae29abf24e13fc67329d09a08e07fa66486dd92" + integrity sha512-VpqUZ5NRbWtoWkKsro2cqGRQh5eqTD6Fw/qETUmYk2jp1vdkyIzn8Mb4yAdejwC6W/fuib3R2XzIjHeHtAJNRA== + dependencies: + "@firebase/component" "0.1.5" + "@firebase/installations" "0.4.2" + "@firebase/logger" "0.1.35" + "@firebase/remote-config-types" "0.1.6" + "@firebase/util" "0.2.40" + tslib "1.10.0" + +"@firebase/storage-types@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.3.9.tgz#0e8f6531c80c6110df800b60d4c30137544400b0" + integrity sha512-az7GZ9zpLAh8vvbOKGwsRy/pB7bI654PzGPvAdK4E35NDBjLMTVBn8yqeDZd/5OjY3dgYit0twIDo1ljx1O6QA== + +"@firebase/storage@0.3.26": + version "0.3.26" + resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.3.26.tgz#4068209281e569f182fc8a304a0cc13601195bbe" + integrity sha512-oSzQsDVUL5YuL7+7bkoA111rID0y1OZpAWKZlKtLktTqWN8GUloQIqArdwg1POt0wV+B1hfBytJuYZlI17hGgg== + dependencies: + "@firebase/component" "0.1.5" + "@firebase/storage-types" "0.3.9" + "@firebase/util" "0.2.40" + tslib "1.10.0" + +"@firebase/util@0.2.40": + version "0.2.40" + resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.2.40.tgz#b8c33437c63e08749c4c872025d70721d690aa69" + integrity sha512-ViuceN8F6eeN/8QaA7FbOX7KlypQAFrXHBnTEicxwED4n1SdgGFapaS/ggScq1MMwq0RjGinNbigtc1Rqy8yVA== + dependencies: + tslib "1.10.0" + +"@firebase/webchannel-wrapper@0.2.35": + version "0.2.35" + resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.35.tgz#232e857698efb30cdda98b6f6a7a31a905d16147" + integrity sha512-7njiGBbFW0HCnuKNEJLcQt9EjfOzG8EJiXlFJwA3XfgiFxPVHmXrcF4d5yold2wfiwCwrXpeNTGZ854oRr6Hcw== + +"@grpc/proto-loader@^0.5.0": + version "0.5.5" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.5.tgz#6725e7a1827bdf8e92e29fbf4e9ef0203c0906a9" + integrity sha512-WwN9jVNdHRQoOBo9FDH7qU+mgfjPc8GygPYms3M+y3fbQLfnCe/Kv/E01t7JRgnrsOHH8euvSbed3mIalXhwqQ== + dependencies: + lodash.camelcase "^4.3.0" + protobufjs "^6.8.6" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz" @@ -1110,6 +1340,59 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= + +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= + dependencies: + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= + "@react-native-community/async-storage@^1.12.1": version "1.12.1" resolved "https://registry.yarnpkg.com/@react-native-community/async-storage/-/async-storage-1.12.1.tgz#25f821b4f6b13abe005ad67e47c6f1cee9f27b24" @@ -1244,9 +1527,9 @@ dependencies: invariant "^2.2.4" -"@react-native-community/masked-view@^0.1.10": +"@react-native-community/masked-view@0.1.10": version "0.1.10" - resolved "https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.10.tgz" + resolved "https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.10.tgz#5dda643e19e587793bc2034dd9bf7398ad43d401" integrity sha512-rk4sWFsmtOw8oyx8SD3KSvawwaK7gRBSEIy2TAwURyGt+3TizssXP1r8nx3zY+R7v2vYYHXZ+k2/GULAT/bcaQ== "@react-navigation/bottom-tabs@^5.11.2": @@ -1301,7 +1584,7 @@ "@react-navigation/native@^5.8.10": version "5.8.10" - resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-5.8.10.tgz" + resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-5.8.10.tgz#3fe806abff9efb085bcf595212803dd05a1347ca" integrity sha512-OUgD1o+y7PwmhRIRqQxN0SQvVU/SHic/ek/qMvBZX8nu5/WlBNxmNRMHVxONgHlG3AQZh27NUs9ynntL7ek1zQ== dependencies: "@react-navigation/core" "^5.14.4" @@ -1323,6 +1606,14 @@ color "^3.1.3" react-native-iphone-x-helper "^1.3.0" +"@types/bytebuffer@^5.0.40": + version "5.0.42" + resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.42.tgz#1c602a77942d34c5c0879ad75c58d5d8c07dfb3b" + integrity sha512-lEgKojWUAc/MG2t649oZS5AfYFP2xRNPoDuwDBlBMjHXd8MaGPgFgtCXUK7inZdBOygmVf10qxc1Us8GXC96aw== + dependencies: + "@types/long" "*" + "@types/node" "*" + "@types/hammerjs@^2.0.36": version "2.0.36" resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.36.tgz" @@ -1355,11 +1646,21 @@ dependencies: "@types/istanbul-lib-report" "*" +"@types/long@*", "@types/long@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" + integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== + "@types/node@*": version "14.14.11" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.11.tgz" integrity sha512-BJ97wAUuU3NUiUCp44xzUFquQEvnk1wu7q4CMEUYKJWjdkr0YWYDsm4RFtAvxYsNjLsKcrFt6RvK8r+mnzMbEQ== +"@types/node@^13.7.0": + version "13.13.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.36.tgz#0c4d3c4e365396c84b1c595524e2faff7dd45b26" + integrity sha512-ctzZJ+XsmHQwe3xp07gFUq4JxBaRSYzKHPgblR76//UanGST7vfFNF0+ty5eEbgTqsENopzoDK090xlha9dccQ== + "@types/prop-types@*": version "15.7.3" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz" @@ -1450,6 +1751,11 @@ invariant "^2.2.4" lodash "^4.5.0" +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz" @@ -1574,6 +1880,19 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz" @@ -1649,6 +1968,14 @@ asap@~2.0.3, asap@~2.0.6: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= +ascli@~1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc" + integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw= + dependencies: + colour "~0.7.1" + optjs "~3.2.2" + assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz" @@ -1889,6 +2216,13 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== +bytebuffer@~5: + version "5.0.1" + resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" + integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0= + dependencies: + long "~3" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz" @@ -1941,6 +2275,11 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== +camelcase@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz" @@ -1999,6 +2338,11 @@ chardet@^0.4.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz" integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz" @@ -2031,6 +2375,15 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz" integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== +cliui@^3.0.3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz" @@ -2054,6 +2407,11 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz" @@ -2112,6 +2470,11 @@ colorette@^1.0.7, colorette@^1.2.1: resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz" integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colour@~0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778" + integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g= + command-exists@^1.2.8: version "1.2.9" resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz" @@ -2187,6 +2550,11 @@ connect@^3.6.5: parseurl "~1.3.3" utils-merge "1.0.1" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz" @@ -2207,6 +2575,11 @@ core-js-compat@^3.8.0: browserslist "^4.15.0" semver "7.0.0" +core-js@3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.2.tgz#2799ea1a59050f0acf50dfe89b916d6503b16caa" + integrity sha512-hIE5dXkRzRvnZ5vhkRfQxUvDxQZmD9oueA08jDYRBKJHx+VIl/Pne/e0A4x9LObEEthC/TqiZybUoNM4tRgnKg== + core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz" @@ -2240,13 +2613,6 @@ create-react-class@^15.6.2: loose-envify "^1.3.1" object-assign "^4.1.1" -cross-fetch@^3.0.4: - version "3.0.6" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz" - integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ== - dependencies: - node-fetch "2.6.1" - cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz" @@ -2292,6 +2658,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: dependencies: ms "2.0.0" +debug@^3.2.6: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + debug@^4.1.0: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz" @@ -2299,7 +2672,7 @@ debug@^4.1.0: dependencies: ms "2.1.2" -decamelize@^1.2.0: +decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -2316,6 +2689,11 @@ deep-assign@^3.0.0: dependencies: is-obj "^1.0.0" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deepmerge@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.3.0.tgz" @@ -2357,6 +2735,11 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + denodeify@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz" @@ -2372,6 +2755,16 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + +dom-storage@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/dom-storage/-/dom-storage-2.1.0.tgz#00fb868bc9201357ea243c7bcfd3304c1e34ea39" + integrity sha512-g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q== + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz" @@ -2706,6 +3099,13 @@ fancy-log@^1.3.2: parse-node-version "^1.0.0" time-stamp "^1.0.0" +faye-websocket@0.11.3: + version "0.11.3" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" + integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== + dependencies: + websocket-driver ">=0.5.1" + fb-watchman@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz" @@ -2768,19 +3168,6 @@ fbjs@^0.8.4: setimmediate "^1.0.5" ua-parser-js "^0.7.18" -fbjs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz" - integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg== - dependencies: - cross-fetch "^3.0.4" - fbjs-css-vars "^1.0.0" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.18" - figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz" @@ -2855,6 +3242,26 @@ find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +firebase@7.9.0: + version "7.9.0" + resolved "https://registry.yarnpkg.com/firebase/-/firebase-7.9.0.tgz#eaa462297e9c027f8fa2dd4b7f2c1ad9f7c81075" + integrity sha512-BQM8q/qoMDqvLAoPopX1QNNai5fNbHOgLsf2TAfco67Cl2WgKwRWHtvAh4JLEfwQAUizoPVb3Hy61kf3gFZj0g== + dependencies: + "@firebase/analytics" "0.2.13" + "@firebase/app" "0.5.4" + "@firebase/app-types" "0.5.1" + "@firebase/auth" "0.13.5" + "@firebase/database" "0.5.21" + "@firebase/firestore" "1.11.0" + "@firebase/functions" "0.4.33" + "@firebase/installations" "0.4.2" + "@firebase/messaging" "0.6.5" + "@firebase/performance" "0.2.32" + "@firebase/polyfill" "0.3.31" + "@firebase/remote-config" "0.1.13" + "@firebase/storage" "0.3.26" + "@firebase/util" "0.2.40" + fontfaceobserver@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fontfaceobserver/-/fontfaceobserver-2.1.0.tgz" @@ -2895,6 +3302,13 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz" @@ -2913,6 +3327,20 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + gensync@^1.0.0-beta.1: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz" @@ -2944,7 +3372,7 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -glob@^7.1.2, glob@^7.1.3: +glob@^7.0.5, glob@^7.1.2, glob@^7.1.3: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2966,6 +3394,18 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== +grpc@1.24.2: + version "1.24.2" + resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.24.2.tgz#76d047bfa7b05b607cbbe3abb99065dcefe0c099" + integrity sha512-EG3WH6AWMVvAiV15d+lr+K77HJ/KV/3FvMpjKjulXHbTwgDZkhkcWbwhxFAoTdxTkQvy0WFcO3Nog50QBbHZWw== + dependencies: + "@types/bytebuffer" "^5.0.40" + lodash.camelcase "^4.3.0" + lodash.clone "^4.5.0" + nan "^2.13.2" + node-pre-gyp "^0.14.0" + protobufjs "^5.0.3" + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -2988,6 +3428,11 @@ has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz" @@ -3061,12 +3506,17 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" +http-parser-js@>=0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77" + integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ== + hyphenate-style-name@^1.0.2, hyphenate-style-name@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz" integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== -iconv-lite@^0.4.17: +iconv-lite@^0.4.17, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3080,6 +3530,18 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" +idb@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/idb/-/idb-3.0.2.tgz#c8e9122d5ddd40f13b60ae665e4862f8b13fa384" + integrity sha512-+FLa/0sTXqyux0o6C+i2lOR0VoS60LU/jzUo5xjfY6+7sEEgy4Gz1O7yFBXvjd7N0NyIGWIRg8DcQSLEG+VSPw== + +ignore-walk@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" + integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + dependencies: + minimatch "^3.0.4" + image-size@^0.6.0: version "0.6.3" resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz" @@ -3116,6 +3578,11 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + inline-style-prefixer@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-5.1.2.tgz" @@ -3169,6 +3636,11 @@ invariant@^2.2.2, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= + ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz" @@ -3266,6 +3738,13 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz" @@ -3337,7 +3816,7 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isomorphic-fetch@^2.1.1: +isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz" integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= @@ -3545,6 +4024,13 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= + dependencies: + invert-kv "^1.0.0" + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz" @@ -3578,6 +4064,16 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + +lodash.clone@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" + integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= + lodash.frompairs@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.frompairs/-/lodash.frompairs-4.0.1.tgz" @@ -3644,6 +4140,16 @@ logkitty@^0.7.1: dayjs "^1.8.15" yargs "^15.1.0" +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +long@~3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" + integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s= + loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz" @@ -4107,6 +4613,21 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz" @@ -4115,7 +4636,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -4142,12 +4663,17 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= -nan@^2.12.1: +nan@^2.12.1, nan@^2.13.2: version "2.14.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== @@ -4174,6 +4700,15 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +needle@^2.2.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz#cf1a8fce382b5a280108bba90a14993c00e4010a" + integrity sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz" @@ -4197,11 +4732,6 @@ node-fetch@1.6.3: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz" @@ -4210,6 +4740,11 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" +node-fetch@^2.2.0, node-fetch@^2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz" @@ -4220,6 +4755,22 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= +node-pre-gyp@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-releases@^1.1.67: version "1.1.67" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz" @@ -4235,6 +4786,14 @@ noop-fn@^1.0.0: resolved "https://registry.yarnpkg.com/noop-fn/-/noop-fn-1.0.0.tgz" integrity sha1-XzPUfxPSFQ35PgywNmmemC94/78= +nopt@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-css-color@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/normalize-css-color/-/normalize-css-color-1.0.2.tgz" @@ -4247,6 +4806,27 @@ normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" +npm-bundled@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-packlist@^1.1.6: + version "1.4.8" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" + integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-normalize-package-bin "^1.0.1" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz" @@ -4254,11 +4834,26 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^4.0.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + nullthrows@^1.1.0, nullthrows@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz" integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw== +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + ob1@0.58.0: version "0.58.0" resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.58.0.tgz" @@ -4375,6 +4970,11 @@ options@>=0.0.5: resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz" integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= +optjs@~3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee" + integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4= + ora@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz" @@ -4387,11 +4987,31 @@ ora@^3.4.0: strip-ansi "^5.2.0" wcwidth "^1.0.1" +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= + dependencies: + lcid "^1.0.0" + os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz" @@ -4605,6 +5225,11 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +promise-polyfill@8.1.3: + version "8.1.3" + resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116" + integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g== + promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz" @@ -4628,6 +5253,35 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: object-assign "^4.1.1" react-is "^16.8.1" +protobufjs@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" + integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== + dependencies: + ascli "~1" + bytebuffer "~5" + glob "^7.0.5" + yargs "^3.10.0" + +protobufjs@^6.8.6: + version "6.10.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.2.tgz#b9cb6bd8ec8f87514592ba3fdfd28e93f33a469b" + integrity sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.1" + "@types/node" "^13.7.0" + long "^4.0.0" + pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz" @@ -4665,6 +5319,16 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + react-devtools-core@^4.6.0: version "4.10.1" resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.10.1.tgz" @@ -4693,13 +5357,12 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react-native-gesture-handler@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.9.0.tgz" - integrity sha512-fkkNeWDBzDdwDxDcxtYbrb9T1g0PLgT1AxBs2iO/p7uEbDbC6mIoL/NzuOnKNEBHcd0lpLoJuNmIfdmucEON5g== +react-native-gesture-handler@~1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.8.0.tgz#18f61f51da50320f938957b0ee79bc58f47449dc" + integrity sha512-E2FZa0qZ5Bi0Z8Jg4n9DaFomHvedSjwbO2DPmUUHYRy1lH2yxXUpSrqJd6yymu+Efzmjg2+JZzsjFYA2Iq8VEQ== dependencies: "@egjs/hammerjs" "^2.0.17" - fbjs "^3.0.0" hoist-non-react-statics "^3.3.0" invariant "^2.2.4" prop-types "^15.7.2" @@ -4718,14 +5381,14 @@ react-native-paper@^4.4.1: color "^3.1.2" react-native-safe-area-view "^0.14.9" -react-native-reanimated@^1.13.2: +react-native-reanimated@~1.13.0: version "1.13.2" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.13.2.tgz" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.13.2.tgz#1ae5457b24b4913d173a5a064bb28eae7783d293" integrity sha512-O+WhgxSjOIzcVdAAvx+h2DY331Ek1knKlaq+jsNLpC1fhRy9XTdOObovgob/aF2ve9uJfPEawCx8381g/tUJZQ== dependencies: fbjs "^1.0.0" -react-native-safe-area-context@3.1.9, react-native-safe-area-context@^3.1.9: +react-native-safe-area-context@3.1.9: version "3.1.9" resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.1.9.tgz" integrity sha512-wmcGbdyE/vBSL5IjDPReoJUEqxkZsywZw5gPwsVUV1NBpw5eTIdnL6Y0uNKHE25Z661moxPHQz6kwAkYQyorxA== @@ -4737,9 +5400,9 @@ react-native-safe-area-view@^0.14.9: dependencies: hoist-non-react-statics "^2.3.1" -react-native-screens@^2.15.0: +react-native-screens@~2.15.0: version "2.15.0" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.15.0.tgz" + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.15.0.tgz#9b97c1881c4fcdf304bf363f0013225901625f44" integrity sha512-qTSQPy0WKHtlb8xt5gY0Gt6sdvfQUQAnFSqgsggW9UEvySbkHzpqOrOYNA79Ca8oXO0dCFwp6X8buIiDefa7+Q== react-native-storage@^1.0.1: @@ -4845,7 +5508,7 @@ react@16.13.1: object-assign "^4.1.1" prop-types "^15.6.2" -readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@~2.3.6: +readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -4990,7 +5653,7 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@^2.5.4: +rimraf@^2.5.4, rimraf@^2.6.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -5041,6 +5704,11 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +safe-buffer@>=5.1.0, safe-buffer@^5.1.2: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz" @@ -5068,7 +5736,7 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sax@^1.2.1: +sax@^1.2.1, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -5086,7 +5754,7 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -5130,7 +5798,7 @@ serve-static@^1.13.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0: +set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -5350,7 +6018,16 @@ strict-uri-encode@^2.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz" integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY= -string-width@^2.0.0, string-width@^2.1.0: +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -5383,7 +6060,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0: +strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= @@ -5416,6 +6093,11 @@ strip-eof@^1.0.0: resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + sudo-prompt@^9.0.0: version "9.2.1" resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz" @@ -5452,6 +6134,19 @@ symbol-observable@1.0.1: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz" integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= +tar@^4.4.2: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + temp@0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz" @@ -5535,6 +6230,11 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +tslib@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" + integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + type-fest@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz" @@ -5738,6 +6438,25 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +websocket-driver@>=0.5.1: + version "0.7.4" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== + dependencies: + http-parser-js ">=0.5.1" + safe-buffer ">=5.1.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== + +whatwg-fetch@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" + integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== + whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0: version "3.5.0" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz" @@ -5755,11 +6474,31 @@ which@^1.2.9: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + +window-size@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" + integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= + wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz" @@ -5830,6 +6569,11 @@ xmldom@0.1.x: resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz" integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== +xmlhttprequest@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" + integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw= + xpipe@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz" @@ -5840,6 +6584,11 @@ xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== +y18n@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" + integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= + y18n@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz" @@ -5850,6 +6599,11 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +yallist@^3.0.0, yallist@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + yargs-parser@^15.0.1: version "15.0.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz" @@ -5899,3 +6653,16 @@ yargs@^15.0.2, yargs@^15.1.0: which-module "^2.0.0" y18n "^4.0.0" yargs-parser "^18.1.2" + +yargs@^3.10.0: + version "3.32.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" + integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= + dependencies: + camelcase "^2.0.1" + cliui "^3.0.3" + decamelize "^1.1.1" + os-locale "^1.4.0" + string-width "^1.0.1" + window-size "^0.1.4" + y18n "^3.2.0" From 20534256470a02b0f03d1c4e722f14af09f36b10 Mon Sep 17 00:00:00 2001 From: noki-program Date: Sun, 13 Dec 2020 14:28:49 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ App.tsx | 10 +++----- src/Navigations/StackScreen.tsx | 45 +++++++++++++++++++++++++++++++++ src/Screens/Screens.ts | 1 + 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 73e9e94..9afd41e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ web-build/ # macOS .DS_Store + +src/env.json diff --git a/App.tsx b/App.tsx index 61bba88..9828e39 100644 --- a/App.tsx +++ b/App.tsx @@ -2,15 +2,13 @@ import { BottomTabBar } from "@react-navigation/bottom-tabs"; import { StatusBar } from "expo-status-bar"; import React from "react"; import { StyleSheet, Text, View } from "react-native"; -import { SignUpScreen } from "./src/Screens/Screens"; +import { SignUpScreen, BottomTabNavigation } from "./src/Screens/Screens"; export function TaskEditScreen() { - if (i =0){ - return( - - ) + if (true){ + return ; } else { - + return } } diff --git a/src/Navigations/StackScreen.tsx b/src/Navigations/StackScreen.tsx index e69de29..033804c 100644 --- a/src/Navigations/StackScreen.tsx +++ b/src/Navigations/StackScreen.tsx @@ -0,0 +1,45 @@ +import React from "react"; +//navigation +import { NavigationContainer } from "@react-navigation/native"; +import { createStackNavigator } from "@react-navigation/stack"; +import "react-native-gesture-handler"; +//Screens.tsでまとめたものをimport +import { + SignInScreen, + SignUpScreen, + WelcomeScreen, + BottomTabNavigation, +} from "../Screens/Screens"; + +import "./src/Fire"; + +const Stack = createStackNavigator(); + +export default function App() { + return ( + + + + + + + + + ); +} diff --git a/src/Screens/Screens.ts b/src/Screens/Screens.ts index 47956e0..82fe42a 100644 --- a/src/Screens/Screens.ts +++ b/src/Screens/Screens.ts @@ -7,3 +7,4 @@ export * from "./TweetsScreen/TweetAddScreen"; export * from "./SingInUpScreen/SignInScreen"; export * from "./SingInUpScreen/SignUpScreen"; export * from "./SingInUpScreen/WelcomeScreen"; +export * from "../Navigations/BottomTabNavigation"; From f0e7573f7ee682357d3f6c3452e23fba00adcf4e Mon Sep 17 00:00:00 2001 From: noki-program Date: Sun, 13 Dec 2020 14:54:08 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E9=81=B7=E7=A7=BB?= =?UTF-8?q?=E5=AE=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/App.tsx b/App.tsx index 9828e39..0cbe81b 100644 --- a/App.tsx +++ b/App.tsx @@ -2,9 +2,9 @@ import { BottomTabBar } from "@react-navigation/bottom-tabs"; import { StatusBar } from "expo-status-bar"; import React from "react"; import { StyleSheet, Text, View } from "react-native"; -import { SignUpScreen, BottomTabNavigation } from "./src/Screens/Screens"; - -export function TaskEditScreen() { +import { SignUpScreen } from "./src/Screens/Screens"; +import { BottomTabNavigation } from "./src/Navigations/BottomTabNavigation" +export default function App() { if (true){ return ; } else { From d684b31895c6f18ae8e86419ebd4ed73da63fd65 Mon Sep 17 00:00:00 2001 From: noki-program Date: Tue, 15 Dec 2020 14:00:05 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.tsx | 6 ++++-- src/Navigations/StackScreen.tsx | 7 +++++++ src/Screens/TasksScreen/TaskAddScreen.tsx | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/App.tsx b/App.tsx index 0cbe81b..d227ed8 100644 --- a/App.tsx +++ b/App.tsx @@ -1,14 +1,16 @@ -import { BottomTabBar } from "@react-navigation/bottom-tabs"; import { StatusBar } from "expo-status-bar"; import React from "react"; import { StyleSheet, Text, View } from "react-native"; + +//Screenのimport import { SignUpScreen } from "./src/Screens/Screens"; import { BottomTabNavigation } from "./src/Navigations/BottomTabNavigation" + export default function App() { if (true){ return ; } else { - return + return ; } } diff --git a/src/Navigations/StackScreen.tsx b/src/Navigations/StackScreen.tsx index 033804c..6cb627f 100644 --- a/src/Navigations/StackScreen.tsx +++ b/src/Navigations/StackScreen.tsx @@ -1,8 +1,10 @@ import React from "react"; + //navigation import { NavigationContainer } from "@react-navigation/native"; import { createStackNavigator } from "@react-navigation/stack"; import "react-native-gesture-handler"; + //Screens.tsでまとめたものをimport import { SignInScreen, @@ -11,6 +13,8 @@ import { BottomTabNavigation, } from "../Screens/Screens"; + +//Firebaseの設定 import "./src/Fire"; const Stack = createStackNavigator(); @@ -24,16 +28,19 @@ export default function App() { component={WelcomeScreen} options={{ headerShown: false }} /> + + + Date: Thu, 17 Dec 2020 15:46:18 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E3=81=93=E3=82=8C=E3=81=8B=E3=82=89?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E4=BF=AE=E6=AD=A3=E5=85=A5?= =?UTF-8?q?=E3=82=8A=E3=81=BE=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Components/items.tsx | 12 +++++++----- src/Stores/TaskStore.ts | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/Components/items.tsx b/src/Components/items.tsx index 23afe18..a3fb467 100644 --- a/src/Components/items.tsx +++ b/src/Components/items.tsx @@ -16,6 +16,8 @@ import { import { FAB } from "react-native-paper"; import { color } from "react-native-reanimated"; +import { saveButtonStatus } from "../Stores/TaskStore" + export interface ItemProps { defaultValue?: string; onChangeText?: (value: string) => void; @@ -33,18 +35,18 @@ const [chosenDate, setChosenDate] = useState(new Date()); setButtonColor("#2aefd1"); } else { setButtonColor("#c4d4e3"); - } + }; } return ( + > + diff --git a/src/Stores/TaskStore.ts b/src/Stores/TaskStore.ts index 50e162c..447284b 100644 --- a/src/Stores/TaskStore.ts +++ b/src/Stores/TaskStore.ts @@ -23,6 +23,7 @@ export const save = (deadlineDate: string, taskName: string, taskItem: string[], alert("保存されました"); }; + export const loadAll = async () => { const key = "taskList"; const tasks = await storage.getAllDataForKey(key); @@ -35,4 +36,21 @@ export const removeTaskInfoAsync = async (taskInfo: Task, ) => { key: key, id: `${taskInfo.createdAt}`, }); +} + +export const saveButtonStatus = (buttonColor: string) => { + const key = "buttonColor"; + storage.save({ + key: key, // データの合言葉 keyでアンダースコア（"_"）を使用しないでください + id: `${buttonColor}`, // これがないと常に上書きになってしまう。 + data: { + buttonColor: buttonColor, + }, + }) +} + +export const loadButtonColor = async () => { + const key = "buttonColor" + const buttonColor = await storage.getAllDataForKey(key); + return buttonColor; } \ No newline at end of file From 01df24a53b64c201bd5ee734c7abd7c0b30b14e3 Mon Sep 17 00:00:00 2001 From: noki-program Date: Fri, 15 Jan 2021 09:44:01 +0900 Subject: [PATCH 6/6] =?UTF-8?q?List=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Screens/TasksScreen/TaskAddScreen.tsx | 6 +++--- src/Screens/TasksScreen/TaskListScreen.tsx | 9 +-------- src/Stores/TaskStore.ts | 1 + 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Screens/TasksScreen/TaskAddScreen.tsx b/src/Screens/TasksScreen/TaskAddScreen.tsx index 6dc3847..dc791bb 100644 --- a/src/Screens/TasksScreen/TaskAddScreen.tsx +++ b/src/Screens/TasksScreen/TaskAddScreen.tsx @@ -35,9 +35,9 @@ export function TaskAddScreen() { const navigation = useNavigation(); const onSave = () => { - console.log(deadlineDate); - console.log(taskItems); - console.log(taskName); + // console.log(deadlineDate); + // console.log(taskItems); + // console.log(taskName); save(deadlineDate, taskName, taskItems, Date.now()); navigation.goBack(); }; diff --git a/src/Screens/TasksScreen/TaskListScreen.tsx b/src/Screens/TasksScreen/TaskListScreen.tsx index 9b8799f..3104044 100644 --- a/src/Screens/TasksScreen/TaskListScreen.tsx +++ b/src/Screens/TasksScreen/TaskListScreen.tsx @@ -30,16 +30,9 @@ const screenWidth = Dimensions.get("screen").width; export function TaskListScreen() { const navigation = useNavigation(); const [tasks, setTasks] = useState([]); - - const taskItemsList = tasks.map((task) => - {task.taskName} - ); - const taskItemsListDate = tasks.map((task) => - {task.deadlineDate} - ); const toTaskAddScreen = () => { - console.log(tasks); + //console.log(tasks); navigation.navigate("TaskAdd"); }; diff --git a/src/Stores/TaskStore.ts b/src/Stores/TaskStore.ts index 447284b..fc45cfa 100644 --- a/src/Stores/TaskStore.ts +++ b/src/Stores/TaskStore.ts @@ -20,6 +20,7 @@ export const save = (deadlineDate: string, taskName: string, taskItem: string[], createdAt: createdAt, }, }); + // console.log(save) alert("保存されました"); };