Merge branch 'Freehand' of https://git.ccom.uprrp.edu/ccorrada/ErEduGilMor into Freehand

Home_page.js

@@ -1,88 +0,0 @@
-
-import React, {useState, useEffect} from 'react'
-import { Button, Text, View, StyleSheet} from 'react-native'
-import {FlatList, ListViewBase } from 'react-native'
-import {TouchableOpacity} from 'react-native-gesture-handler'
-import {List, Divider} from 'react-native-paper'
-import Loading from './Loading'
-import firebase from 'firebase';
-import { styles } from "../config/styles";
-import { TextInput, TouchableWithoutFeedback, Keyboard, ImageBackground} from "react-native";
-
-export default function Home_page({navigation}) {
-  const [threads, setThreads] = useState([]);  
-  const [loading, setLoading] = useState(true);
-
-  useEffect(() => {
-
-    const fire = firebase.firestore()
-    .collection('THREADS')
-    
-    .onSnapshot(querySnapshot => {
-      const threads = querySnapshot.docs.map(documentSnapshot => {
-        return{
-          _id:documentSnapshot.id,
-          name:'',
-          ...documentSnapshot.data()
-        };
-
-      });
-
-      setThreads(threads);
-
-      if(loading){
-        setLoading(false);
-      }
-
-    });
-
-    return () => fire();
-  }, []);
-  
-  if (loading) {
-    return <Loading />;
-  }
-  
-  return (
-    <View>
-    <ImageBackground style={styles.stdcontainer} source={require('../assets/yellow-white.jpg')}>
-        <FlatList
-          data={threads}
-          keyExtractor = {item => item._id}
-          ItemSeparatorComponent={() => <Divider />}
-          renderItem = {({item}) => (
-
-            <TouchableOpacity
-            onPress={() => navigation.navigate('Room', {thread: item})}
-            
-            >
-            <List.Item
-              title={item.name}
-              description='Item description'
-              titleNumberOfLines={1}
-              titleStyle={styles.listTitle}
-              descriptionStyle={styles.listDescription}
-              descriptionNumberOfLines={1}
-            />
-          </TouchableOpacity>
-        )}
-      />
-
-      <Button
-        title='Ver mensajes'
-        onPress={() => navigation.navigate('Add')}
-      />
-
-        <Button
-        title ='Hacer Busqueda'
-        onPress= {() => navigation.navigate('Room')}
-        />
-        </ImageBackground>
-      </View>
-    );
-  }
-
-
-
-
-

screens/AvailabilityScreen.js

@@ -1,128 +0,0 @@
-import React, { Component } from "react";
-import { TextInput, TouchableWithoutFeedback, Keyboard, ImageBackground, Image, View, Text, Button } from "react-native";
-import firebase from "firebase";
-import { Calendar } from "react-native-calendars";
-import { ScrollView } from "react-native-gesture-handler";
-import SectionedMultiSelect from 'react-native-sectioned-multi-select';
-import Icon from 'react-native-vector-icons/MaterialIcons';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { fetchUser } from "../redux/actions";
-import { styles } from "../config/styles";
-import { availability } from "../config/availability";
-
-export class AvailabilityScreen extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            english: false,
-            spanish: false,
-            virtual: false,
-            face_to_face: false,
-            personal: false,
-            group: false,
-            cities: [],
-            selectedItems: [],
-            markedDates: {}
-        };
-        this.onSelectedItemsChange = this.onSelectedItemsChange.bind(this);
-        this.onDaySelect = this.onDaySelect.bind(this);
-        this.onSave = this.onSave.bind(this);
-    };
-
-    componentDidMount(){
-        this.props.fetchUser();
-        const { currentUser } = this.props;
-
-        if(currentUser.english !== undefined){
-            this.setState(currentUser);
-        }
-    };
-
-    onSave(){
-        const { selectedItems } = this.state;
-    
-        selectedItems.forEach((value) => {
-            if(value === 'English'){
-                this.setState({english : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({english : true}, {merge : true}));
-            }
-            else if(value === 'Spanish'){
-                this.setState({spanish : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({spanish : true}, {merge : true}));
-            }
-            else if(value === 'Virtual'){
-                this.setState({virtual : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({virtual : true}, {merge : true}));
-            }
-            else if(value === 'Face-to-Face'){
-                this.setState({face_to_face : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({face_to_face : true}, {merge : true}));
-            }
-            else if(value === 'Personal Session'){
-                this.setState({personal : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({personal : true}, {merge : true}));
-            }
-            else if(value === 'Group Session'){
-                this.setState({group : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({group : true}, {merge : true}));
-            }
-            else if(!isNaN(value.charAt(0))){
-                for (let key in this.state.markedDates) {
-                    if(this.state.markedDates[key].hasOwnProperty('timeSlot')){
-                        this.state.markedDates[key].timeSlot.push(value);
-                    }
-                    else{
-                        this.state.markedDates[key].timeSlot = [];
-                        this.state.markedDates[key].timeSlot.push(value);
-                    }
-                }
-            }
-            else{
-                this.state.cities.push(value);
-            }
-        })
-        firebase.firestore().collection('Interpreters')
-            .doc(firebase.auth().currentUser.uid)
-            .set(this.state, {merge : true})
-            .then(() => {this.props.navigation.goBack()});
-    };
-
-    onSelectedItemsChange = (selectedItems) => {
-        this.setState({selectedItems});
-    };
-
-    onDaySelect = (day) => {
-        const selectedDay = day.dateString;
-        let selected = true;
-
-        if (this.state.markedDates[selectedDay]) {
-            selected = !this.state.markedDates[selectedDay].selected;
-        }
-        const updatedMarkedDates = {...this.state.markedDates, ...{ [selectedDay]: { selected } } }
-        this.setState({ markedDates : updatedMarkedDates });
-    }
-
-    render() {
-        return (
-            <ScrollView contentContainerstyle={styles.stdcontainer}>
-                <Calendar
-                    onDayPress={this.onDaySelect}
-                    style={styles.calendar}
-                    markedDates={this.state.markedDates}
-                    theme={{selectedDayBackgroundColor: 'green'}}
-                />
-                <SectionedMultiSelect 
-                    items={availability}
-                    IconRenderer={Icon}
-                    readOnlyHeadings={true}
-                    uniqueKey='name'
-                    subKey='children'
-                    selectText='Choose your availability...'
-                    onSelectedItemsChange={this.onSelectedItemsChange}
-                    selectedItems={this.state.selectedItems}
-                />
-                <Button title='Save' onPress={() => {this.onSave()}}/>
-            </ScrollView>
-        );
-    }
-}
-
-const mapStateProps = (store) => ({currentUser : store.userState.currentUser})
-const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch)
-export default connect(mapStateProps, mapDispatchProps)(AvailabilityScreen)

screens/HomeScreen.js

@@ -1,142 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import firebase from 'firebase';
-import { Text, View, ImageBackground } from 'react-native';
-import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
-
-import { fetchUser } from '../redux/actions/index'
-//import Loading from '../components/Loading'
-import Loading from './main/Loading'
-import { styles } from '../config/styles'
-
-export class HomeScreen extends Component {
-  constructor(props){
-    super(props);
-    this.state = {
-      interpreter: false,
-    };
-    this.onLogout = this.onLogout.bind(this)
-  };
-
-  componentDidMount(){
-    this.props.fetchUser();
-    firebase.firestore()
-    .collection("Interpreters")
-    .doc(firebase.auth().currentUser.uid)
-    .get()
-    .then((snapshot) => {
-      if(snapshot.exists){
-        this.setState({interpreter: true})
-      }
-    })
-  }
-
-  onLogout(){
-    firebase.auth().signOut();
-  }
-
-  render() {
-    const { currentUser } = this.props;
-
-    if(currentUser == undefined){
-      return <Loading/>
-    }
-    if(this.state.interpreter){
-      return(
-        <View style={styles.regcontainer}>
-          <ImageBackground style={styles.home} source={require("../assets/yellow-white.jpg")}>
-            <View style={styles.homeTopView}>
-              <MaterialIcons name='logout' size={30} color='dodgerblue' onPress={() => this.onLogout()}/>
-              <MaterialIcons name='event' size={30} color='dodgerblue' style={styles.homeIcon} onPress={() => this.props.navigation.navigate('Availability')}/>
-              <MaterialIcons name='mail' size={30} color='dodgerblue' onPress={() => this.props.navigation.navigate('Mail')}/>
-            </View>
-          </ImageBackground>
-          <View style={styles.regcontainer}></View>
-        </View>
-      );
-    }
-    else{
-      return(
-        <View style={styles.regcontainer}><Text>You are a user</Text></View>
-      );
-    }
-  }
-}
-
-const mapStateProps = (store) => ({currentUser: store.userState.currentUser})
-const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch)
-export default connect(mapStateProps, mapDispatchProps)(HomeScreen)
-
-/*export default function HomeScreen({navigation}) {
-  const [threads, setThreads] = useState([]);  
-  const [loading, setLoading] = useState(true);
-
-  useEffect(() => {
-
-    const fire = firebase.firestore()
-    .collection('THREADS')
-    
-    .onSnapshot(querySnapshot => {
-      const threads = querySnapshot.docs.map(documentSnapshot => {
-        return{
-          _id:documentSnapshot.id,
-          name:'',
-          ...documentSnapshot.data()
-        };
-
-      });
-
-      setThreads(threads);
-
-      if(loading){
-        setLoading(false);
-      }
-
-    });
-
-    return () => fire();
-  }, []);
-  
-  if (loading) {
-    return <Loading />;
-  }
-  
-  return (
-      <View style={styles.container}>
-        <FlatList
-          data={threads}
-          keyExtractor = {item => item._id}
-          ItemSeparatorComponent={() => <Divider />}
-          renderItem = {({item}) => (
-
-            <TouchableOpacity
-            onPress={() => navigation.navigate('Room', {thread: item})}
-            
-            >
-            <List.Item
-              title={item.name}
-              description='Item description'
-              titleNumberOfLines={1}
-              titleStyle={styles.listTitle}
-              descriptionStyle={styles.listDescription}
-              descriptionNumberOfLines={1}
-            />
-          </TouchableOpacity>
-        )}
-      />
-
-      <Button
-        title='Add Room'
-        onPress={() => navigation.navigate('Add')}
-      />
-
-        <Button
-        title ='Room'
-        onPress= {() => navigation.navigate('Room')}
-        />
-
-      </View>
-    );
-  }
-*/

screens/main/Home_page.js

@@ -27,7 +27,6 @@ Notifications.setNotificationHandler({
 let x = "x";
 console.log(x);
 
-
 export function Home_page({navigation}) {
 
   const [threads, setThreads] = useState([]);  
@@ -241,7 +240,6 @@ export function Home_page({navigation}) {
                 x = item._id;
                 await sendPushNotification(item.i_token, x);
                 citaId(item._id);
-                //x = item._id;
                 }
               }
             /> 
@@ -313,31 +311,6 @@ export function Home_page({navigation}) {
           </TouchableOpacity>
         )}
         />
-        <FlatList style={{
-             flex: 1,
-             width: screenWidth,
-         }}
-          data={appointments}
-          keyExtractor = {item => item._id}
-          ItemSeparatorComponent={() => <Divider />}
-          renderItem={({ item }) => {
-            if(item.new == 'true'){
-            return (
-              <Button
-              title ='Pedir Cita'
-              onPress={ async () => {
-                x = item._id;
-                await sendPushNotification(item.i_token, x);
-                citaId(item._id);
-                //x = item._id;
-                console.log(x);
-                console.log("en pedir cita, appointments", appointments[0])
-                }
-              }
-            /> 
-            )
-          }}}
-            />
           <Button
           title ='Availability'
           onPress= {() => navigation.navigate('Availability')}