diff --git a/package.json b/package.json index d0119c9..dcc8d00 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "@types/react-native-svg-charts": "^5.0.16", "eslint-config-prettier": "^9.1.0", "metro-react-native-babel-preset": "^0.77.0", + "prettier": "^3.2.5", "prettier-plugin-organize-imports": "^3.2.4", "typescript": "^5.3.3" }, diff --git a/src/auth/firebase-auth.tsx b/src/auth/firebase-auth.tsx index d545816..ea49c31 100644 --- a/src/auth/firebase-auth.tsx +++ b/src/auth/firebase-auth.tsx @@ -38,16 +38,6 @@ export const onAuthStateChanged = ( return auth().onAuthStateChanged(callback); }; -export const currentUser = () => auth().currentUser; - -export const getCurrentUserToken = async (): Promise => { - const user = auth().currentUser; - if (user) { - return await user.getIdToken(); - } - return null; -}; - export const handleSignOut = (): Promise => { return auth().signOut(); }; diff --git a/src/auth/index.ts b/src/auth/index.ts index e766cfb..deee33a 100644 --- a/src/auth/index.ts +++ b/src/auth/index.ts @@ -1,6 +1,5 @@ import { confirmCode, - currentUser, handleSignInWithPhoneNumber, handleSignOut, onAuthStateChanged, @@ -8,7 +7,6 @@ import { export { confirmCode, - currentUser, handleSignInWithPhoneNumber, handleSignOut, onAuthStateChanged, diff --git a/src/screens/login.tsx b/src/screens/login.tsx index 612aad7..fa37c4b 100644 --- a/src/screens/login.tsx +++ b/src/screens/login.tsx @@ -3,6 +3,9 @@ import React, { useState } from "react"; import { Button, Keyboard, + StyleSheet, + Switch, + Text, TextInput, TouchableWithoutFeedback, View, @@ -10,55 +13,125 @@ import { import { confirmCode, handleSignInWithPhoneNumber } from "../auth"; export default function Login() { + const [isEmailLogin, setIsEmailLogin] = useState(false); const [phoneNumber, setPhoneNumber] = useState(""); const [code, setCode] = useState(""); + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); const [confirm, setConfirm] = useState(null); + const toggleSwitch = () => setIsEmailLogin((previousState) => !previousState); + + // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars + const handleSignInWithEmail = (email: string, password: string) => + console.log("signingInWithEmail"); + return ( Keyboard.dismiss()}> - - setPhoneNumber(value)} - /> - {confirm && ( - setCode(value)} + + + Use email + + + + {!isEmailLogin ? ( + <> + + {confirm && ( + + )} + + +