Merge pull request #10 from WilliamCallao/develop

Pantallas: Notas clientes, Pago unico, Pago automatico
WilliamCallao · Jun 23, 2024 · d149356 · d149356
2 parents faf949b + 21e4921
commit d149356
Show file tree

Hide file tree

Showing 20 changed files with 1,116 additions and 831 deletions.
diff --git a/src/components/DateInputField.js b/src/components/DateInputField.js
@@ -1,22 +1,21 @@
-import React, {useState} from 'react';
-import { Text, TextInput, StyleSheet, View } from 'react-native';
+import React, { useState } from 'react';
+import { Text, TextInput, StyleSheet, View, Dimensions, TouchableOpacity } from 'react-native';
 import { theme } from "../assets/Theme";
 import { Controller } from 'react-hook-form';
 import DateTimePicker from '@react-native-community/datetimepicker';
-import { format, formatDate } from 'date-fns';
+import { format } from 'date-fns';
 
-const DateInputField = ({ control, name, title, callThrough, type = 'default', isEditable }) => {
+const screenWidth = Dimensions.get('window').width;
 
+const DateInputField = ({ control, name, title, callThrough, isEditable }) => {
     const [selectedDate, setSelectedDate] = useState(new Date());
     const [showDatePicker, setShowDatePicker] = useState(false);
 
-    const handleDateChange =  (event, newselectedDate) => {
+    const handleDateChange = (event, newselectedDate) => {
         const currentDate = newselectedDate || selectedDate;
         setShowDatePicker(false);
         setSelectedDate(currentDate);
-        console.log(formatDate(currentDate, 'yyyy-MM-dd')); 
-        console.log('selectedDate', selectedDate);
-        callThrough(formatDate(currentDate, 'yyyy-MM-dd'));
+        callThrough(format(currentDate, 'yyyy-MM-dd'));
     };
 
     return (
@@ -26,16 +25,14 @@ const DateInputField = ({ control, name, title, callThrough, type = 'default', i
                 control={control}
                 name={name}
                 defaultValue=""
-                render={({ field: { onChange, onBlur, value}}) => (
-                    <TextInput
-                        style={styles.input}
-                        onFocus={() => setShowDatePicker(true)}
-                        onBlur={onBlur}
-                        onChangeText={onChange}
-                        value={format(selectedDate, 'dd/MM/yyyy')}
-                        editable={isEditable}
-                    />
-
+                render={({ field: { onChange, value } }) => (
+                    <TouchableOpacity onPress={() => setShowDatePicker(true)}>
+                        <TextInput
+                            style={styles.input}
+                            value={format(selectedDate, 'dd/MM/yyyy')}
+                            editable={false}
+                        />
+                    </TouchableOpacity>
                 )}
             />
             {showDatePicker && (
@@ -55,30 +52,32 @@ const styles = StyleSheet.create({
     container: {
         marginHorizontal: 10,
         marginBottom: 20,
-        width: 145,
+        width: screenWidth - 40, // Full width minus margins
     },
     label: {
         color: 'gray',
         fontSize: 18,
         marginBottom: 5,
-        paddingLeft: 10
+        paddingLeft: 10,
     },
     input: {
-      height: 46,
-      borderColor: 'gray',
-      paddingHorizontal: 10,
-      backgroundColor: theme.colors.otherWhite,
-      borderRadius: 22,
-      fontSize: 18,
-      fontWeight: "bold",
-      textAlign: 'center',
+        height: 46,
+        borderColor: '#D6E3F5',
+        paddingHorizontal: 10,
+        backgroundColor: '#D6E3F5', // Background color
+        borderRadius: 10,
+        borderWidth: 2, // Maintain the border
+        fontSize: 18,
+        fontWeight: "bold",
+        textAlign: 'left', // Align text to the left
+        color: 'black', // Text color
     },
     error: {
         color: 'red',
         fontSize: 12,
         marginTop: 1,
-        paddingLeft: 10
+        paddingLeft: 10,
     },
 });
 
-export default DateInputField;
+export default DateInputField;
diff --git a/src/navigation/AppNavigator.js b/src/navigation/AppNavigator.js
@@ -1,20 +1,20 @@
 import React, { useEffect, useState } from 'react';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { NavigationContainer } from '@react-navigation/native';
-import NewScreen from '../screens/HomeScreen';
+import NewScreen from '../screens/Home/HomeScreen';
 import ClientSearchScreen from '../screens/ClientSearch/ClientSearchScreen';
 import BillScreen from '../screens/BillScreen';
-import ClientPaymentScreen from '../screens/ClientPaymentScreen';
-import PayScreen from '../screens/PayScreen';
-import AutomaticPayScreen from '../screens/AutomaticPayScreen';
+import ClientPaymentScreen from '../screens/NotesScreen/ClientPaymentScreen';
+import PayScreen from '../screens/PayScreen/PayScreen';
+import AutomaticPayScreen from '../screens/PayScreen/AutomaticPayScreen';
 import SelectPaymentMethodScreen from '../screens/SelectPaymentMethodScreen';
 import FacturaScreen from '../screens/FacturaScreen';
 import ProfileScreen from '../screens/ProfileScreen';
-import ActivationScreen from '../screens/ActivationScreen';
+import ActivationScreen from '../screens/ActivationScreen/ActivationScreen';
 import LoginScreen from '../screens/LoginScreen';
 import SelectPayModeScreen from '../screens/SelectPayModeScreen';
 import SelectPaymentMethodScreen2 from '../screens/SelectPaymentMethodScreen2';
-import CobradoresScreen from '../screens/CobradoresScreen';
+import CobradoresScreen from '../screens/CobradoresScreen/CobradoresScreen';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { View, ActivityIndicator } from 'react-native';
 import { theme } from '../assets/Theme';

diff --git a/src/screens/ActivationScreen.js → ...eens/ActivationScreen/ActivationScreen.js b/src/screens/ActivationScreen.js → ...eens/ActivationScreen/ActivationScreen.js
@@ -13,12 +13,12 @@ import {
 } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { useNavigation } from "@react-navigation/native";
-import userStore from "../stores/userStore";
-import StyledText from "../utils/StyledText";
-import SimpleButton from "../utils/SimpleButton";
+import userStore from "../../stores/userStore";
+import StyledText from "../../utils/StyledText";
+import SimpleButton from "../../utils/SimpleButton";
 import axios from "axios";
-import { BASE_URL } from "../../config";
-import { theme } from "../assets/Theme";
+import { BASE_URL } from "../../../config";
+import { theme } from "../../assets/Theme";
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { StatusBar } from "expo-status-bar";
 
@@ -122,7 +122,7 @@ const ActivationScreen = () => {
         <ScrollView contentContainerStyle={styles.scrollViewContent}>
           <View style={styles.containerImgs}>
             <Image
-              source={require("../assets/formas.png")}
+              source={require("../../assets/formas.png")}
               style={{
                 width: windowWidth * 0.75,
                 height: windowWidth * 0.75 * aspectRatio,