Cambios hasta registrarse en DB

App.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { StatusBar } from 'expo-status-bar';
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
@@ -10,13 +11,89 @@ export default function App() {
       <StatusBar style="auto" />
     </View>
   );
+=======
+import React, { Component } from 'react';
+import firebase from 'firebase'
+import { NavigationContainer } from '@react-navigation/native';
+import { createStackNavigator } from '@react-navigation/stack';
+
+import RegisterScreen from './screens/RegisterScreen';
+import LoginScreen from './screens/LoginScreen';
+import { firebaseConfig } from './config/firebaseConfig';
+import { Text, View } from 'react-native';
+import { styles } from './config/styles';
+
+
+/*const seConfig = {
+  apiKey: "AIzaSyDW-ABAQ3r_WR7C7WC_3VprL77NcAoitJI",
+  authDomain: "freehand-d8ecd.firebaseapp.com",
+  projectId: "freehand-d8ecd",
+  storageBucket: "freehand-d8ecd.appspot.com",
+  messagingSenderId: "48371388186",
+  appId: "1:48371388186:web:9a5a4bf1218e17ac6326a3"
+};
+*/
+// Initialize Firebase
+//const app = firebase.initializeApp(seConfig);
+if (firebase.apps.length === 0) {
+  firebase.initializeApp(firebaseConfig)
+>>>>>>> master
 }
 
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-});
+const Stack = createStackNavigator();
+
+export default class App extends Component {
+  constructor(props){
+    super(props);
+    this.state = {
+      loaded: false,
+    }
+  }
+  
+  componentDidMount(){
+    firebase.auth().onAuthStateChanged((user) => {
+      if (!user){
+        this.setState({
+          loggedIn: false,
+          loaded: true,
+        })
+      }
+      else{
+        this.setState({
+          loggedIn: true,
+          loaded: true,
+        })
+      }
+    })
+  }
+
+  render() {
+
+    const { loggedIn, loaded } = this.state
+
+    if(!loaded){
+      return(
+        <View style={styles.regcontainer}>
+          <Text>Hopper</Text>
+        </View>
+      );
+    }
+
+    if(!loggedIn){
+      return (
+        <NavigationContainer>
+          <Stack.Navigator>
+            <Stack.Screen name={" "} options={{headerShown: false}} component={LoginScreen}/>
+            <Stack.Screen name={"Register"} options={{headerTransparent: true, headerTitle: " "}} component={RegisterScreen}/>
+          </Stack.Navigator>
+        </NavigationContainer>
+      );
+    }
+
+    return(
+      <View style={styles.regcontainer}>
+        <Text>Cheese</Text>
+      </View>
+    );
+  }
+}

README.md

@@ -0,0 +1 @@
+#Probando

components/CustomButton.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import { Text, TouchableOpacity } from 'react-native';
+
+import { styles } from '../config/styles';
+import colors from '../config/colors';
+
+function CustomButton( {title, onPress, color = "skyblue", marginTop} ) {
+    return (
+        <TouchableOpacity style={[styles.regbutton, { backgroundColor: colors[color] }, { marginTop: marginTop }]} onPress={onPress}>
+            <Text style={styles.regbuttontext}>{title}</Text>
+        </TouchableOpacity>
+    );
+}
+
+export default CustomButton;

config/colors.js

@@ -0,0 +1,5 @@
+export default {
+        softpink: '#FFF0F5',
+        skyblue: '#87CEFA',
+        white: '#FFFFFF'
+}

config/firebaseConfig.js

@@ -0,0 +1,8 @@
+export const firebaseConfig = {
+  apiKey: "AIzaSyDW-ABAQ3r_WR7C7WC_3VprL77NcAoitJI",
+  authDomain: "freehand-d8ecd.firebaseapp.com",
+  projectId: "freehand-d8ecd",
+  storageBucket: "freehand-d8ecd.appspot.com",
+  messagingSenderId: "48371388186",
+  appId: "1:48371388186:web:9a5a4bf1218e17ac6326a3"
+};

config/styles.js

@@ -0,0 +1,61 @@
+import { StyleSheet } from "react-native"
+
+import colors from "./colors"
+
+export const styles = StyleSheet.create({
+    stdcontainer: {
+        flex: 1,
+        justifyContent: 'flex-start',
+        alignItems: 'center'
+    },
+
+    regcontainer: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+    },
+
+    regbutton:{
+        backgroundColor: colors.skyblue,
+        justifyContent: 'center',
+        alignItems: 'center',
+        width: '50%',
+        height: '5%',
+    },
+
+    regtxtfield: {
+        backgroundColor: colors.softpink,
+        width: '75%',
+        height: '5%',
+        borderRadius: 25,
+        paddingLeft: 20,
+        paddingRight: 20,
+        margin: 20,
+    },
+
+    regbuttontext: {
+        color: colors.white,
+        fontSize: 17
+    },
+
+    logo: {
+        width: "25%",
+        height: "25%",
+        top: 50,
+        marginBottom: 200
+    },
+
+    loginbutton: {
+        position: 'absolute',
+        bottom: 50,
+    },
+
+    picker: {
+        width: '50%',
+    },
+
+    qsttxt: {
+        marginTop: 20,
+        fontWeight: "bold"
+    }
+})

package.json

@@ -8,8 +8,12 @@
     "eject": "expo eject"
   },
   "dependencies": {
+    "@react-native-picker/picker": "^2.1.0",
+    "@react-navigation/native": "^6.0.4",
+    "@react-navigation/stack": "^6.0.9",
     "expo": "~42.0.1",
     "expo-status-bar": "~1.0.4",
+    "firebase": "8.2.3",
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",

screens/Home_page.js

@@ -0,0 +1,92 @@
+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 '../components/Loading'
+import firebase from 'firebase';
+
+
+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 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>
+    );
+  }
+  const styles = StyleSheet.create({
+    container: {
+      backgroundColor: '#f5f5f5',
+      flex: 1
+    },
+    listTitle: {
+      fontSize: 22
+    },
+    listDescription: {
+      fontSize: 16
+    }
+  });

screens/LoginScreen.js

@@ -0,0 +1,38 @@
+import React, { Component } from "react";
+import { TextInput, TouchableWithoutFeedback, Keyboard, ImageBackground, Image } from "react-native";
+import firebase from "firebase";
+
+import { styles } from "../config/styles";
+import CustomButton from "../components/CustomButton";
+
+
+export default class LoginScreen extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            email: '',
+            password: '',
+        };
+        this.onLogin = this.onLogin.bind(this)
+    };
+
+    onLogin() {
+        const { email, password } = this.state;
+        firebase.auth().signInWithEmailAndPassword(email, password).then((result) => {console.log(result)}).catch((error) => {console.log(error)})
+    }
+
+    render() {
+        
+        return (
+            <TouchableWithoutFeedback style={styles.stdcontainer} onPress={Keyboard.dismiss} accessible={false}>
+                <ImageBackground style={styles.stdcontainer} source={require('../assets/yellow-white.jpg')}>
+                    <Image style={styles.logo} resizeMode="contain" source={require("../assets/open-hand.png")}/>
+                    <TextInput style={styles.regtxtfield} placeholder="Email" onChangeText={(email) => this.setState({ email })}/>
+                    <TextInput style={styles.regtxtfield} placeholder="Password" onChangeText={(password) => this.setState({ password })} secureTextEntry={ true }/>
+                    <CustomButton marginTop={70} title="Login" onPress={() => this.onLogin()}/>
+                    <CustomButton marginTop={25} title="Register" onPress={() => this.props.navigation.navigate('Register')}/>
+                </ImageBackground>
+            </TouchableWithoutFeedback>
+        );
+    }
+}

screens/RegisterScreen.js

@@ -0,0 +1,56 @@
+import React, { Component } from "react";
+import { TextInput, TouchableWithoutFeedback, Keyboard, ImageBackground, Text, View } from "react-native";
+import firebase from "firebase";
+import { Picker } from "@react-native-picker/picker";
+
+import { styles } from "../config/styles";
+import CustomButton from "../components/CustomButton";
+
+export default class RegisterScreen extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            username: '',
+            email: '',
+            password: '',
+            interpreter: false,
+        };
+        this.onRegister = this.onRegister.bind(this)
+    };
+
+    onRegister() {
+        const { username, email, password, interpreter } = this.state;
+        firebase.auth().createUserWithEmailAndPassword(email, password)
+            .then((result) => {
+                firebase.firestore().collection("Users")
+                    .doc(firebase.auth().currentUser.uid)
+                    .set({
+                        username,
+                        email,
+                        interpreter,
+                    })
+                console.log(result)
+            })
+            .catch((error) => {
+                console.log(error)
+            })
+    }
+
+    render() {
+        return (
+            <TouchableWithoutFeedback style={styles.regcontainer} onPress={Keyboard.dismiss} accessible={false}>
+                <ImageBackground style={styles.regcontainer} source={require('../assets/yellow-white.jpg')}>
+                    <TextInput style={styles.regtxtfield} placeholder="Userame" onChangeText={(username) => this.setState({ username })}/>
+                    <TextInput style={styles.regtxtfield} placeholder="Email" onChangeText={(email) => this.setState({ email })}/>
+                    <TextInput style={styles.regtxtfield} placeholder="Password" onChangeText={(password) => this.setState({ password })} secureTextEntry={ true }/>
+                    <Text style={styles.qsttxt}>Are you an interpreter?</Text>
+                    <Picker style={styles.picker} selectedValue={this.state.interpreter} onValueChange={(itemValue,itemIndex) => this.setState({interpreter: itemValue})}>
+                        <Picker.Item label="Yes" value={true}/>
+                        <Picker.Item label="No" value={false}/>
+                    </Picker>
+                    <CustomButton  marginTop={50} title="Register" onPress={() => this.onRegister()}/>
+                </ImageBackground>
+            </TouchableWithoutFeedback>
+        );
+    }
+}

sorting.py

@@ -0,0 +1,62 @@
+"""
+Carlos J Corrada Bravo
+Este programa calcula el promedio de tiempo de ejecución de cuatro algoritmos de ordenamiento
+La variable maxValor define el valor maximo de los elementos de la lista
+La variable largoLista define el largo de las listas a ordenar
+La variable veces define las veces que se va a hacer el ordenamiento 
+Al final se imprimen los promedios de cada algortimo
+"""
+from random import randint
+import time
+
+def mergeSort(lista):
+	#definan el algoritmo de ordenamiento mergesort
+	return lista
+
+def heapSort(lista):
+	#definan el algoritmo de ordenamiento heapsort
+	return lista
+
+def quickSort(lista):
+	#definan el algoritmo de ordenamiento quicksort
+	return lista
+
+def shellSort(lista):
+	#definan el algoritmo de ordenamiento shellsort
+	return lista
+
+maxValor=1000 	#define el valor maximo de los elementos de la lista
+largoLista=1000 #define el largo de las listas a ordenar
+veces=100 		#define las veces que se va a hacer el ordenamiento 
+
+acumulaMerge=0 	#variable para acumular el tiempo de ejecucion del mergesort
+acumulaHeap=0 	#variable para acumular el tiempo de ejecucion del heapsort
+acumulaQuick=0 	#variable para acumular el tiempo de ejecucion del quicksort
+acumulaShell=0 	#variable para acumular el tiempo de ejecucion del shellsort
+
+for i in range(veces):
+	lista = [randint(0,maxValor) for r in range(largoLista)] #creamos una lista con valores al azar
+
+	t1 = time.clock() 				#seteamos el tiempo al empezar
+	mergeSort(lista) 				#ejecutamos el algoritmo mergeSort
+	acumulaMerge+=time.clock()-t1 	#acumulamos el tiempo de ejecucion
+	
+	t1 = time.clock()				#seteamos el tiempo al empezar
+	heapSort(lista)					#ejecutamos el algoritmo heapSort
+	acumulaHeap+=time.clock()-t1 	#acumulamos el tiempo de ejecucion
+	
+	t1 = time.clock()				#seteamos el tiempo al empezar
+	quickSort(lista)				#ejecutamos el algoritmo quickSort
+	acumulaQuick+=time.clock()-t1 	#acumulamos el tiempo de ejecucion
+	
+	t1 = time.clock()				#seteamos el tiempo al empezar
+	shellSort(lista)				#ejecutamos el algoritmo shellSort
+	acumulaShell+=time.clock()-t1 	#acumulamos el tiempo de ejecucion
+
+#imprimos los resultados
+print "Promedio de tiempo de ejecucion de "+ str(veces) +" listas de largo " + str(largoLista)
+print "MergeSort " + str(acumulaMerge/veces) + " segundos"
+print "HeapSort " + str(acumulaHeap/veces) + " segundos"
+print "QuickSort " + str(acumulaQuick/veces) + " segundos"
+print "ShellSort " + str(acumulaShell/veces) + " segundos"
+