app-expo-cli 1.0.5 → 1.0.6

package/template/src/app/auth/forgot.tsx

@@ -1,32 +1,25 @@
 import * as Yup from "yup";
 
-import { Image, Text, View } from "react-native";
+import { Text, View } from "react-native";
 
-import AppBgWrapper from "@/src/components/common/AppBgWrapper";
+import { Icon } from "@/assets/icon";
 import BackButton from "@/src/lib/backHeader/BackButton";
-import { Formik } from "formik";
-import { Icon } from "@/assets/icons/Icon";
-import { ImageAssets } from "@/assets/images/image";
-import InputText from "@/src/lib/inputs/InputText";
-import { KeyboardAwareScrollView } from "react-native-keyboard-controller";
-import React from "react";
 import TButton from "@/src/lib/buttons/TButton";
-import { router } from "expo-router";
+import InputText from "@/src/lib/inputs/InputText";
 import tw from "@/src/lib/tailwind";
-import { useForgotMutation } from "@/src/redux/apiSlices/authSlices";
+import { router } from "expo-router";
+import { Formik } from "formik";
 
 const Forgot = () => {
-  const [forgot, { isLoading }] = useForgotMutation();
-
   const handleForgot = async (values: any) => {
     try {
-      const res = await forgot(values).unwrap();
-      if (res?.success) {
-        router.push(`/modals/toaster?content=${res?.message}`);
-        router.replace(`/auth/opt_verify?email=${values.email}&forgot=true`);
-      } else {
-        router.push(`/modals/toaster?content=${res?.message}`);
-      }
+      // const res = await forgot(values).unwrap();
+      // if (res?.success) {
+      //   router.push(`/modals/toaster?content=${res?.message}`);
+      router.replace(`/auth/opt_verify?email=${values.email}&forgot=true`);
+      // } else {
+      //   router.push(`/modals/toaster?content=${res?.message}`);
+      // }
     } catch (error: any) {
       router.push(`/modals/toaster?content=${error?.message}`);
     }
@@ -40,84 +33,77 @@ const Forgot = () => {
   });
 
   return (
-    <AppBgWrapper>
+    <View style={tw`flex-1`}>
       <BackButton
         onPress={() => router.dismiss()}
         containerStyle={tw`absolute top-5`}
       />
-      <KeyboardAwareScrollView
-        style={tw`z-10 flex-1`}
-        contentContainerStyle={tw`items-center justify-center flex-1`}
-      >
-        <View style={tw`z-10 flex-1 items-center justify-center  p-5`}>
-          <View style={tw`justify-center items-center  gap-2`}>
-            <Image
-              source={ImageAssets.logo}
-              style={tw`h-30 aspect-square mb-5`}
-              resizeMode="contain"
-            />
-            <View style={tw`items-center justify-center gap-2`}>
-              <Text
-                style={tw`text-white font-InterSemiBold text-2xl -tracking-[1px]`}
-              >
-                Forgot password ?
-              </Text>
-              <Text
-                style={tw`text-white text-base text-center font-InterRegular -tracking-[1px]`}
-              >
-                Enter the email address that you used to create your account. We
-                will send an OTP to reset your password.
-              </Text>
-            </View>
-          </View>
 
-          {/* Formik Wrapper */}
-          <Formik
-            initialValues={{ email: "" }}
-            validationSchema={loginValidationSchema}
-            onSubmit={handleForgot}
-          >
-            {({
-              handleChange,
-              handleBlur,
-              handleSubmit,
-              values,
-              errors,
-              touched,
-              isValid,
-            }) => (
-              <View style={tw`w-full py-8 gap-6`}>
-                <View style={tw`gap-3`}>
-                  <InputText
-                    svgFirstIcon={Icon.email}
-                    textInputProps={{
-                      placeholder: "Email",
-                      placeholderTextColor: "#A9A9A9",
-                    }}
-                    value={values.email}
-                    onChangeText={handleChange("email")}
-                    onBlur={handleBlur("email")}
-                    touched={touched.email}
-                    errorText={errors.email}
-                  />
-                </View>
+      <View style={tw`z-10 flex-1 items-center justify-center  p-5`}>
+        <View style={tw`justify-center items-center  gap-2`}>
+          <View style={tw`items-center justify-center gap-2`}>
+            <Text
+              style={tw`text-white font-InterSemiBold text-2xl -tracking-[1px]`}
+            >
+              Forgot password ?
+            </Text>
+            <Text
+              style={tw`text-white text-base text-center font-InterRegular -tracking-[1px]`}
+            >
+              Enter the email address that you used to create your account. We
+              will send an OTP to reset your password.
+            </Text>
+          </View>
+        </View>
 
-                {/* Submit button calls handleSubmit from Formik */}
-                <TButton
-                  title="Get OTP"
-                  isLoading={isLoading}
-                  onPress={() => {
-                    handleSubmit();
-                    // router.push("/auth/opt_verify");
+        {/* Formik Wrapper */}
+        <Formik
+          initialValues={{ email: "" }}
+          validationSchema={loginValidationSchema}
+          onSubmit={handleForgot}
+        >
+          {({
+            handleChange,
+            handleBlur,
+            handleSubmit,
+            values,
+            errors,
+            touched,
+            isValid,
+          }) => (
+            <View style={tw`w-full py-8 gap-6`}>
+              <View style={tw`gap-3`}>
+                <InputText
+                  // === Place icons here ===
+                  svgFirstIcon={Icon.email}
+                  textInputProps={{
+                    placeholder: "Email",
+                    placeholderTextColor: "#A9A9A9",
                   }}
-                  disabled={!isValid}
+                  value={values.email}
+                  onChangeText={handleChange("email")}
+                  onBlur={handleBlur("email")}
+                  touched={touched.email}
+                  errorText={errors.email}
                 />
               </View>
-            )}
-          </Formik>
-        </View>
-      </KeyboardAwareScrollView>
-    </AppBgWrapper>
+
+              {/* Submit button calls handleSubmit from Formik */}
+              <TButton
+                title="Get OTP"
+                // If you connect API then you can add loading here
+                // isLoading={isLoading}
+                onPress={() => {
+                  handleSubmit();
+                  // router.push("/auth/opt_verify");
+                }}
+                disabled={!isValid}
+              />
+            </View>
+          )}
+        </Formik>
+      </View>
+    </View>
   );
 };
 

package/template/src/app/auth/index.tsx

@@ -1,27 +1,17 @@
 import * as Yup from "yup";
 
-import {
-  useGoogleLoginMutation,
-  useLoginMutation,
-} from "@/src/redux/apiSlices/authSlices";
 import { Image, Text, TouchableOpacity, View } from "react-native";
 
-import { Icon } from "@/assets/icons/Icon";
-import { ImageAssets } from "@/assets/images/image";
-import AppBgWrapper from "@/src/components/common/AppBgWrapper";
-import IButton from "@/src/lib/buttons/IButton";
-import Or from "@/src/lib/buttons/Or";
+import { Icon } from "@/assets/icon";
+import { ImageAssets } from "@/assets/images";
 import TButton from "@/src/lib/buttons/TButton";
 import CheckBox from "@/src/lib/inputs/CheckBox";
 import InputText from "@/src/lib/inputs/InputText";
 import tw from "@/src/lib/tailwind";
-import { support } from "@/src/utils/utils";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { router } from "expo-router";
 import { Formik } from "formik";
 import React from "react";
-import { KeyboardAwareScrollView } from "react-native-keyboard-controller";
-import { SvgXml } from "react-native-svg";
 
 const Login = () => {
   const [loginInfo, setLoginInfo] = React.useState<null | {
@@ -31,8 +21,7 @@ const Login = () => {
   const [check, setCheck] = React.useState(false);
   const [passShow, setPassShow] = React.useState(false);
 
-  const [login, results] = useLoginMutation();
-  const [loginWithGoogle, googleResults] = useGoogleLoginMutation();
+  // const [login, results] = useLoginMutation();
 
   const handleLogin = async (values: any) => {
     try {
@@ -43,36 +32,21 @@ const Login = () => {
         AsyncStorage.removeItem("check");
         AsyncStorage.removeItem("loginInfo");
       }
-      const response = await login(values).unwrap();
-      if (response?.success) {
-        // console.log(response?.data);
-
-        await AsyncStorage.setItem("token", response?.data?.token);
-        router.replace("/auth/location_access");
-      } else {
-        router.push(`/modals/toaster?content=${response?.message}`);
-      }
+      // const response = await login(values).unwrap();
+      // if (response?.success) {
+      // console.log(response?.data);
+
+      // await AsyncStorage.setItem("token", response?.data?.token);
+      router.replace("/auth/home");
+      // } else {
+      //   router.push(`/modals/toaster?content=${response?.message}`);
+      // }
     } catch (error: any) {
       console.log(error);
       router.push(`/modals/toaster?content=${error?.message}`);
     }
   };
 
-  const handleLoginWithGoogle = async () => {
-    try {
-      const response = await loginWithGoogle({}).unwrap();
-      // console.log(response);
-      if (response?.success) {
-        // router.push("/home/tabs");
-        router.push(`/auth/google_login?url=${`${response?.data}`}`);
-      } else {
-        router.push(`/modals/toaster?content=${response?.message}`);
-      }
-    } catch (error: any) {
-      router.push(`/modals/toaster?content=${error?.message}`);
-    }
-  };
-
   // Define validation schema using Yup
   const loginValidationSchema = Yup.object().shape({
     email: Yup.string()
@@ -99,175 +73,170 @@ const Login = () => {
   }, []);
 
   return (
-    <AppBgWrapper>
-      <KeyboardAwareScrollView style={tw`z-10 `}>
-        <View style={tw`flex-1 items-center justify-center p-5`}>
-          <View style={tw`justify-center items-center mt-10 gap-2`}>
-            <Image
-              source={ImageAssets.logo}
-              style={tw`h-18 aspect-square mb-5`}
-              resizeMode="contain"
-            />
-            <View style={tw`items-center justify-center gap-2`}>
-              <Text
-                style={tw`text-white font-InterSemiBold text-2xl -tracking-[1px]`}
-              >
-                Welcome Back
-              </Text>
-              <Text
-                style={tw`text-white text-base font-InterRegular -tracking-[1px]`}
-              >
-                Please use your credentials to sign in
-              </Text>
-            </View>
-          </View>
-
-          {/* Formik Wrapper */}
-          <Formik
-            initialValues={{
-              email: loginInfo?.email || "",
-              password: loginInfo?.password || "",
-            }}
-            enableReinitialize
-            validationSchema={loginValidationSchema}
-            onSubmit={handleLogin}
+    <View style={tw`flex-1 items-center justify-center p-5`}>
+      <View style={tw`justify-center items-center mt-10 gap-2`}>
+        {/*=========== If need show logo then you can add here========= */}
+        <Image
+          source={ImageAssets.logo}
+          style={tw`h-18 aspect-square mb-5`}
+          resizeMode="contain"
+        />
+        <View style={tw`items-center justify-center gap-2`}>
+          <Text
+            style={tw`text-white font-InterSemiBold text-2xl -tracking-[1px]`}
           >
-            {({
-              handleChange,
-              handleBlur,
-              handleSubmit,
-              values,
-              errors,
-              touched,
-              isValid,
-            }) => (
-              <View style={tw`w-full py-8 gap-6`}>
-                <View style={tw`gap-3`}>
-                  <InputText
-                    svgFirstIcon={Icon.email}
-                    textInputProps={{
-                      placeholder: "Email",
-                      placeholderTextColor: "#A9A9A9",
-                    }}
-                    value={values.email}
-                    onChangeText={handleChange("email")}
-                    onBlur={handleBlur("email")}
-                    touched={touched.email}
-                    errorText={errors.email}
-                  />
+            Welcome Back
+          </Text>
+          <Text
+            style={tw`text-white text-base font-InterRegular -tracking-[1px]`}
+          >
+            Please use your credentials to sign in
+          </Text>
+        </View>
+      </View>
+
+      {/* Formik Wrapper */}
+      <Formik
+        initialValues={{
+          email: loginInfo?.email || "",
+          password: loginInfo?.password || "",
+        }}
+        enableReinitialize
+        validationSchema={loginValidationSchema}
+        onSubmit={handleLogin}
+      >
+        {({
+          handleChange,
+          handleBlur,
+          handleSubmit,
+          values,
+          errors,
+          touched,
+          isValid,
+        }) => (
+          <View style={tw`w-full py-8 gap-6`}>
+            <View style={tw`gap-3`}>
+              <InputText
+                // === Place icons here ===
+                svgFirstIcon={Icon.email}
+                textInputProps={{
+                  placeholder: "Email",
+                  placeholderTextColor: "#A9A9A9",
+                }}
+                value={values.email}
+                onChangeText={handleChange("email")}
+                onBlur={handleBlur("email")}
+                touched={touched.email}
+                errorText={errors.email}
+              />
+
+              <InputText
+                // === Place icons here ===
+                svgFirstIcon={Icon.lock}
+                textInputProps={{
+                  placeholder: "Password",
+                  placeholderTextColor: "#A9A9A9",
+                  secureTextEntry: !passShow,
+                }}
+                value={values.password}
+                onChangeText={handleChange("password")}
+                onBlur={handleBlur("password")}
+                touched={touched.password}
+                errorText={errors.password}
+                //  === Place second icon here ===
+                // svgSecondIcon={passShow ? Icon.eye : Icon.eyeOff}
+                svgSecondOnPress={() => setPassShow(!passShow)}
+              />
+            </View>
 
-                  <InputText
-                    svgFirstIcon={Icon.lock}
-                    textInputProps={{
-                      placeholder: "Password",
-                      placeholderTextColor: "#A9A9A9",
-                      secureTextEntry: !passShow,
-                    }}
-                    value={values.password}
-                    onChangeText={handleChange("password")}
-                    onBlur={handleBlur("password")}
-                    touched={touched.password}
-                    errorText={errors.password}
-                    svgSecondIcon={passShow ? Icon.eye : Icon.eyeOff}
-                    svgSecondOnPress={() => setPassShow(!passShow)}
-                  />
-                </View>
+            <View style={tw`flex-row justify-between items-center`}>
+              <View style={tw`flex-row items-center`}>
+                <CheckBox
+                  checked={check}
+                  onPress={() => setCheck(!check)}
+                  title="Remember me"
+                />
+              </View>
+              <TouchableOpacity
+                onPress={() => {
+                  router.push("/auth/forgot");
+                }}
+              >
+                <Text style={tw`text-[#339DFF] underline`}>
+                  Forgot Password?
+                </Text>
+              </TouchableOpacity>
+            </View>
 
-                <View style={tw`flex-row justify-between items-center`}>
-                  <View style={tw`flex-row items-center`}>
-                    <CheckBox
-                      checked={check}
-                      onPress={() => setCheck(!check)}
-                      title="Remember me"
-                    />
-                  </View>
-                  <TouchableOpacity
-                    onPress={() => {
-                      router.push("/auth/forgot");
-                    }}
-                  >
-                    <Text style={tw`text-[#339DFF] underline`}>
-                      Forgot Password?
-                    </Text>
-                  </TouchableOpacity>
-                </View>
+            {/* Submit button calls handleSubmit from Formik */}
+            <TButton
+              //  If you connect API then you can add loading here
+              // isLoading={results.isLoading}
+              title="Sign In"
+              onPress={() => {
+                handleSubmit();
+                // router.push("/home");
+              }}
+              disabled={!isValid}
+            />
 
-                {/* Submit button calls handleSubmit from Formik */}
-                <TButton
-                  isLoading={results.isLoading}
-                  title="Sign In"
-                  onPress={() => {
-                    handleSubmit();
-                    // router.push("/home");
-                  }}
-                  disabled={!isValid}
-                />
+            {/* <Or title="Or continue with" /> */}
 
-                <Or title="Or continue with" />
-                <View style={tw`flex-row justify-center items-center gap-4`}>
+            {/* Social login button if need then you can add */}
+            {/* <View style={tw`flex-row justify-center items-center gap-4`}>
                   <IButton
                     isLoading={googleResults.isLoading}
                     containerStyle={tw`w-16 h-16 bg-transparent  `}
                     svg={Icon.google}
                     onPress={handleLoginWithGoogle}
                   />
-                  {/* <IButton
+                  <IButton
                     containerStyle={tw`w-16 h-16 bg-transparent  `}
                     svg={Icon.apple}
-                    onPress={handleLoginWithGoogle}
-                  /> */}
-                </View>
+                    onPress={handleLoginWithApple}
+                  />
+                </View> */}
 
-                <View style={tw`gap-2`}>
-                  <View style={tw`flex-row justify-center `}>
-                    <Text style={tw`text-white`}>Dont have an account?</Text>
-                    <TouchableOpacity
-                      onPress={() => {
-                        router.push("/auth/register");
-                      }}
-                      style={tw`flex-row items-center gap-3`}
-                    >
-                      <Text style={tw`text-[#339DFF] underline ml-1`}>
-                        Sign up
-                      </Text>
-                      <SvgXml xml={Icon.play} />
-                    </TouchableOpacity>
-                  </View>
-                  <View>
-                    <Text style={tw`text-white text-center leading-6`}>
-                      Please read our{" "}
-                      <Text
-                        onPress={() =>
-                          router.push("/settings/terms_and_conditions")
-                        }
-                        style={tw`text-[#339DFF] underline`}
-                      >
-                        Terms
-                      </Text>{" "}
-                      and{" "}
-                      <Text
-                        onPress={() => router.push("/settings/privacy_policy")}
-                        style={tw`text-[#339DFF] underline`}
-                      >
-                        Privacy Policy
-                      </Text>{" "}
-                      and if you have any problems please contact our{" "}
-                      <Text
-                        onPress={() => support()}
-                        style={tw`text-[#339DFF] underline`}
-                      >
-                        Support
-                      </Text>
-                    </Text>
-                  </View>
-                </View>
+            <View style={tw`gap-2`}>
+              <View style={tw`flex-row justify-center `}>
+                <Text style={tw`text-white`}>Dont have an account?</Text>
+                <TouchableOpacity
+                  onPress={() => {
+                    router.push("/auth/register");
+                  }}
+                  style={tw`flex-row items-center gap-3`}
+                >
+                  <Text style={tw`text-[#339DFF] underline ml-1`}>Sign up</Text>
+                  <SvgXml xml={Icon.play} />
+                </TouchableOpacity>
               </View>
-            )}
-          </Formik>
-          {/* End of Formik Wrapper */}
-        </View>
-      </KeyboardAwareScrollView>
-    </AppBgWrapper>
+              <View>
+                <Text style={tw`text-white text-center leading-6`}>
+                  Please read our{" "}
+                  <Text
+                    onPress={() =>
+                      router.push("/settings/terms_and_conditions")
+                    }
+                    style={tw`text-[#339DFF] underline`}
+                  >
+                    Terms
+                  </Text>{" "}
+                  and{" "}
+                  <Text
+                    onPress={() => router.push("/settings/privacy_policy")}
+                    style={tw`text-[#339DFF] underline`}
+                  >
+                    Privacy Policy
+                  </Text>{" "}
+                  and if you have any problems please contact our{" "}
+                </Text>
+              </View>
+            </View>
+          </View>
+        )}
+      </Formik>
+      {/* End of Formik Wrapper */}
+    </View>
   );
 };