Brigade

app.json

@@ -33,7 +33,8 @@
           "backgroundColor": "#ffffff"
         }
       ],
-      "expo-secure-store"
+      "expo-secure-store",
+      "expo-font"
     ],
     "experiments": {
       "typedRoutes": true

package.json

@@ -15,6 +15,7 @@
     "preset": "jest-expo"
   },
   "dependencies": {
+    "@expo-google-fonts/inter": "^0.3.0",
     "@expo/vector-icons": "^14.0.2",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-navigation/bottom-tabs": "^7.2.0",

src/entites/brigade/ui/BrigadeSelector/BrigadeSelector.tsx

@@ -4,8 +4,13 @@ import { CardBrigade } from "../CardBrigade/CardBrigade";
 import { IBrigade } from "../../type/IBirgade";
 import React, { useState } from "react";
 import { BrigadeSelectorProps } from "./type";
+<<<<<<< HEAD
+import { useNavigation } from "@react-navigation/native";
+
+=======
 import { BrigadeChooseInfo } from "../BrigadeChooseInfo/BrigadeChooseInfo";
 import { ITypePage } from "@/shared/type/ITypePage/ITypePage";
+>>>>>>> main
 
 
 export const BrigadeSelector: React.FC<BrigadeSelectorProps> = ({ handlerSubmit, setValue, stateRegister, handlerNextPage }) => {

src/features/auth/ui/AuthTitle/AuthTitle.tsx

@@ -15,7 +15,7 @@ const styles = StyleSheet.create({
       color:'white',
       fontSize: 24,
       fontWeight: 700,
-      paddingBottom:140,
+      paddingBottom:265,
       textAlign: 'center',
       paddingTop:52,
 

src/shared/ui/ErrorField/ErrorField.tsx

@@ -1,14 +1,34 @@
 import * as React from 'react';
 import { View } from 'react-native';
-import { TextInput, HelperText } from 'react-native-paper'
+import { TextInput, HelperText } from 'react-native-paper';
 import { ErrorFieldProps } from './type';
+import { StyleSheet } from 'react-native';
+
 export const ErrorField: React.FC<ErrorFieldProps> = ({ error }) => {
-  return (
-    <View style={{ paddingLeft:30 }}>
-      <HelperText type="error" >
-        {error}
-      </HelperText>
-    </View>
-  );
+    return (
+        <View style={styles.error}>
+            <HelperText type="error" style={styles.helperText}>
+                {error}
+            </HelperText>
+        </View>
+    );
+};
 
-}
+const styles = StyleSheet.create({
+    error: {
+        width: '100%',
+        maxWidth: 412,
+        alignSelf: 'center',
+        marginTop: 4,
+        marginBottom: 4,
+        paddingHorizontal: 20
+    },
+    helperText: {
+        fontSize: 12,
+        lineHeight: 16,
+        paddingVertical: 0,
+        paddingHorizontal: 0,
+        textAlign: 'left',
+        paddingLeft:20
+    }
+});

src/shared/ui/Input/Input.tsx

@@ -1,28 +1,56 @@
 import { TextInput } from "react-native-paper"
 import { InputProps } from "./type"
-import { View } from "react-native";
+import { View,Image } from "react-native";
 import { StyleSheet } from "react-native";
+import React, {useState} from 'react';
 
+// const eyeIcon = require('../../../assets/images/eye.png');
 
-
-
-export const Input: React.FC<InputProps> = ({ typePage, field, placeholder, type = "default" }) => {
+export const Input: React.FC<InputProps> = ({typePage, field, placeholder, type = "default",secureTextEntry = false,showEyeIcon = false }) => {
+  const [isSecure,setIsSecure] = useState(secureTextEntry)
+    const [isFocused, setIsFocused] = useState(false)
   return (
     <View style={{ alignItems: "center" }}>
       <TextInput style={[
-
         styles.input,
-        typePage === 'login' ? styles.login : styles.register
+        typePage === 'login' ? styles.login : styles.register,
+          {
+              borderRadius: 28,
+              borderWidth:1,
+              borderColor: isFocused ? 'orange' : '#eee',
+          }
       ]}
-        keyboardType={type}
-                 underlineColor="transparent"
-                 selectionColor="transparent"
-                 outlineColor="transparent"
+                 keyboardType={type}
+                 mode="flat"
                  label={placeholder}
-        value={field.value}
-        onChangeText={field.onChange}
-        theme={{ primary: 'blue', underlineColor: 'transparent', roundness: 110 }}
-        {...field}
+                 value={field.value}
+                 onChangeText={field.onChange}
+                 secureTextEntry={isSecure}
+
+                 onFocus={() => setIsFocused(true)}
+                 onBlush={() => setIsFocused(false)}
+                 theme={{
+                     colors: {
+                         primary: 'transperent',
+                         background: 'white',
+                         placeholder: isFocused ? 'orange' : 'gray',
+                         text: 'black',
+                         underlineColor: 'transparent',
+                     },
+                     roundness: 28
+      }}
+                 underlineColor="transparent"
+                 activeOutlineColor="transparent"
+                 right={
+                     showEyeIcon && (
+                         <TextInput.Icon
+                             icon={isSecure ? 'eye-off' : 'eye'}
+                             onPress={() => setIsSecure(!isSecure)}
+                             color={isFocused ? 'orange' : '#999'}
+                         />
+                     )
+                 }
+                 {...field}
       />
     </View>
   )
@@ -31,17 +59,14 @@ export const Input: React.FC<InputProps> = ({ typePage, field, placeholder, type
 
 const styles = StyleSheet.create({
   input: {
-    width: 330,
-    height: 55,
-    backgroundColor: 'white',
-    color: '',
-
-    paddingHorizontal: 15,
-    marginBottom:10,
-
-    borderWidth: 1,
-    borderRadius: 110,
-
+      width: 330,
+      height: 55,
+      backgroundColor:'white',
+      paddingHorizontal: 24,
+      marginBottom:16,
+      overwlow:'hidden',
+      // borderWidth: 1,
+      // borderColor:'#eee',
   },
   login: {
 

src/shared/ui/InputController/InputController.tsx

@@ -15,6 +15,8 @@ export const InputController: React.FC<InputControllerProps> = ({ errors, contro
             field={field}
             placeholder={input.placeholder}
             type={input.type}
+            secureTextEntry={input.name === 'password'}
+            showEyeIcon={input.name === 'password'}
           />
           <ErrorField error={errors[input.name]?.message} />
 

src/shared/ui/ItemButton/ItemButton.tsx

@@ -22,16 +22,21 @@ export const ItemButton: React.FC<ButtonProps> = ({ title, handleSubmit, }) => {
 }
 const styles = StyleSheet.create({
   button: {
-    marginTop: 10,
+      width: 330,
+      height:55,
+
+      marginTop:0,
+      alignSelf: 'center',
+
     backgroundColor:'orange',
     color:'black',
-    width: 330,
-    alignSelf: 'center',
 
   },
   label:{
-    color:'black',
-    fontSize: 16,
+      textAlign:'center',
+      lineHeight: 30,
+      color:'black',
+    fontSize: 20,
     fontWeight: 700,
   }
 });

src/widgets/auth/auth.tsx

@@ -2,7 +2,11 @@ import React, { useState } from "react";
 import { AuthForm, AuthLink } from "@/features/auth"
 import { AuthTitle } from "@/features/auth/ui/AuthTitle/AuthTitle"
 import { AuthProps } from "@/shared/type/AuthProps/type"
+<<<<<<< HEAD
+import { View, Text, StyleSheet,ImageBackground,} from "react-native"
+=======
 import { View, Text, StyleSheet } from "react-native"
+>>>>>>> main
 
 
 function AuthText(props: { text: string }) {
@@ -14,6 +18,32 @@ export const Auth: React.FC<AuthProps> = ({ typePage }) => {
 
 
   return (
+<<<<<<< HEAD
+          <ImageBackground
+              source={require("../../../assets/images/registration.png")}
+              resizeMode='cover'
+              style={styles.back}
+          >
+        <View style={styles.container}>
+          <AuthTitle  text={typePage} />
+          <AuthForm  typePage={typePage} />
+          <AuthLink typePage={typePage} />
+        </View>
+          </ImageBackground>
+      );
+    };
+
+    const styles = StyleSheet.create({
+        back:{
+            flex: 1,
+            width: 412,
+            height: 917,
+        },
+        container: {
+            flex: 1,
+        }
+    })
+=======
     <View style={styles.back}>
       {!stateRegister && <AuthTitle text={typePage} />}
       <AuthForm typePage={typePage} stateRegister={stateRegister} setStateRegister={setStateRegister} />
@@ -38,6 +68,7 @@ const styles = StyleSheet.create({
     height: 917,
   }
 })
+>>>>>>> main