eduardo
/
katoikia-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflicts fix

This commit is contained in:
Maria Sanchez 2022-08-22 17:51:55 -06:00
parent 5d4aa25259 d6339121b7
commit 421f56b709
12 changed files with 282 additions and 20248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
.log/ .log/
node_modules node_modules
.DS_Store

2
mobile-ui/.gitignore vendored
View File

@ -10,4 +10,4 @@ npm-debug.*
web-build/ web-build/
.vscode .vscode
.DS_Store .DS_Store
package-lock.json

59
mobile-ui/App.js
View File

@ -1,32 +1,31 @@
import React,{useState} from "react"; import React, { useContext, useState } from "react";
import { import {
NativeBaseProvider, NativeBaseProvider,
Icon Icon
} from "native-base"; } from "native-base";
import { NavigationContainer } from '@react-navigation/native'; import { NavigationContainer } from '@react-navigation/native';
import { createNativeStackNavigator } from '@react-navigation/native-stack'; import { createNativeStackNavigator } from '@react-navigation/native-stack';
import { createBottomTabNavigator} from '@react-navigation/bottom-tabs'; import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
import LogIn from "./components/LogIn"; import LogIn from "./components/LogIn";
import Home from "./components/Home"; import Home from "./components/Home";
import RecoverPassword from "./components/RecoverPassword"; import RecoverPassword from "./components/RecoverPassword";
import Reservas from "./components/Reservas"; import Reservas from "./components/Reservas";
import Profile from "./components/Profile"; import Profile from "./components/Profile";
import { MaterialCommunityIcons } from '@expo/vector-icons'; import { MaterialCommunityIcons } from '@expo/vector-icons';
import AreaComun from "./components/AreaComun"; import AreaComun from "./components/AreaComun";
import { UserContext, UserContextProvider } from "./context/UserContext";
const Stack = createNativeStackNavigator(); const Stack = createNativeStackNavigator();
const Tab = createBottomTabNavigator(); const Tab = createBottomTabNavigator();
function HomeTab({route}) { function HomeTab({ route }) {
const { user } = useContext(UserContext);
const [selected, setSelected] = useState(0); const [selected, setSelected] = useState(0);
const user = route.params;
// console.log(user);
return ( return (
<Tab.Navigator initialParams={user} initialRouteName="Comunicados" > <Tab.Navigator initialParams={user} initialRouteName="Comunicados" >
<Tab.Screen name="Comunicados" component={Home} initialParams={user} options={{headerStyle: { <Tab.Screen name="Comunicados" component={Home} initialParams={user} options={{headerStyle: {
backgroundColor: "#D7A86E" backgroundColor: "#D7A86E"
@ -39,26 +38,30 @@ const user = route.params;
backgroundColor: "#D7A86E" backgroundColor: "#D7A86E"
}, tabBarIcon: () => (<Icon mb="2" as={<MaterialCommunityIcons name={selected === 2 ? 'account' : 'account-outline'} />} color="#D7A86E" size="md" />)}} onclick={() => setSelected(2)} /> }, tabBarIcon: () => (<Icon mb="2" as={<MaterialCommunityIcons name={selected === 2 ? 'account' : 'account-outline'} />} color="#D7A86E" size="md" />)}} onclick={() => setSelected(2)} />
</Tab.Navigator> </Tab.Navigator>
) )
} }
export default function App() { export default function App() {
return ( return (
<NativeBaseProvider> <NativeBaseProvider>
<UserContextProvider>
<NavigationContainer> <NavigationContainer>
<Stack.Navigator initialRouteName="LogIn"> <Stack.Navigator initialRouteName="LogIn">
<Stack.Screen name="Inicio" component={LogIn} options={{headerStyle: { <Stack.Screen name="Inicio" component={LogIn} options={{
backgroundColor: "#D7A86E" headerStyle: {
}}} /> backgroundColor: "#D7A86E"
<Stack.Screen name="Comunicados" component={HomeTab} options={{headerShown: false}} /> }
<Stack.Screen name="Password" component={RecoverPassword} /> }} />
<Stack.Screen name="area" component={AreaComun} options={{headerStyle: { <Stack.Screen name="Comunicados" component={HomeTab} options={{ headerShown: false }} />
backgroundColor: "#D7A86E" <Stack.Screen name="Password" component={RecoverPassword} />
}}} /> <Stack.Screen name="area" component={AreaComun} options={{
</Stack.Navigator> headerStyle: {
backgroundColor: "#D7A86E"
}
</NavigationContainer> }} />
</Stack.Navigator>
</NavigationContainer>
</UserContextProvider>
</NativeBaseProvider> </NativeBaseProvider>
); );
} }

51
mobile-ui/components/CommentCard/index.js Normal file
View File

@ -0,0 +1,51 @@
import { format } from "date-fns";
import {
Badge,
Box, HStack, Pressable,
Spacer, Text
} from "native-base";
import PropTypes from 'prop-types';
import React from 'react';
export const CommentCard = ({ date, comment }) => {
const dateFormated = format(new Date(date), "dd LL yyyy")
return (
<Pressable
rounded="8"
overflow="hidden"
borderWidth="1"
borderColor="coolGray.300"
maxW="96"
shadow="3"
bg="coolGray.100"
p="5"
marginTop="4"
>
<Box>
<HStack alignItems="center">
<Badge colorScheme="darkBlue" _text={{
color: "white"
}} variant="solid" rounded="4">
Comunicado
</Badge>
<Spacer />
<Text fontSize={10} color="coolGray.800">
{dateFormated}
</Text>
</HStack>
<Text color="coolGray.800" mt="3" fontWeight="medium" fontSize="xl">
Administrador de Comunidad
</Text>
<Text mt="2" fontSize="sm" color="coolGray.700">
{comment}
</Text>
</Box>
</Pressable>
)
}
CommentCard.propTypes = {
date: PropTypes.string.isRequired,
comment: PropTypes.string.isRequired,
}

142
mobile-ui/components/Home.js
View File

@ -1,88 +1,64 @@
import React from "react"; import{Box, ScrollView} from "native-base";
import { import React, { useContext, useEffect, useState } from "react";
Text, import { UserContext } from "../context/UserContext";
HStack, import { API } from "../environment/api";
Badge, import { CommentCard } from "./CommentCard";
Box,
Pressable,
Spacer,
ScrollView
} from "native-base";
import { MaterialCommunityIcons } from '@expo/vector-icons';
export default function Home({route}){
const [selected, setSelected] = React.useState(0); export default function Home() {
return ( const { user } = useContext(UserContext)
const [isRequesting, setIsRequesting] = useState(false);
const [comments, setComments] = useState([]);
<Box alignItems="center"> useEffect(() => {
const onRequestCommentsData = async () => {
setIsRequesting(true);
try {
const jsonResponse = await fetch(`${API.BASE_URL}/post/allComments`, {
method: "GET",
headers: {
'Content-Type': 'application/json'
}
})
const response = await jsonResponse.json();
setComments(response.message);
} catch (error) {
}
setIsRequesting(false)
}
onRequestCommentsData()
}, [user])
return (
<Box alignItems="center">
<ScrollView width='100%' h='550' ml='1' _contentContainerStyle={{
px: "20px",
mb: "4",
minW: "72"
}}>
{
comments.map(item => (
<CommentCard
key={item._id}
comment={item.comment}
date={item.date_entry}
/>
))
}
<ScrollView width='100%' h='550' ml='1' _contentContainerStyle={{
px: "20px",
mb: "4",
minW: "72"
}}>
<Pressable onPress={() => console.log("I'm Pressed")} rounded="8" overflow="hidden" borderWidth="1" borderColor="coolGray.300" maxW="96" shadow="3" bg="coolGray.100" p="5" marginTop="4">
<Box>
<HStack alignItems="center">
<Badge colorScheme="darkBlue" _text={{
color: "white"
}} variant="solid" rounded="4">
Comunicado
</Badge>
<Spacer />
<Text fontSize={10} color="coolGray.800">
1 month ago
</Text>
</HStack>
<Text color="coolGray.800" mt="3" fontWeight="medium" fontSize="xl">
Administrador de Comunidad
</Text>
<Text mt="2" fontSize="sm" color="coolGray.700">
Notificacion sobre la aplicacion
</Text>
</Box>
</Pressable>
</ScrollView> </ScrollView>
</Box> </Box>
// <Center width={"100%"} marginTop={"auto"}> )
}
// <Box safeAreaTop bg="#D7A86E" flex={1} />
// <HStack bg="#D7A86E" px="2" py="4" justifyContent="space-between" alignItems="center" w="100%" maxW="100%">
// <Pressable opacity={selected === 0 ? 1 : 0.5} py="3" flex={1} onPress={() => setSelected(0) && navigation.navigate('Home')}>
// <Center>
// <Icon mb="2" as={<MaterialCommunityIcons name={selected === 0 ? 'home' : 'home-outline'} />} color="white" size="md" />
// <Text color="white" fontSize="15">
// Inicio
// </Text>
// </Center>
// </Pressable>
// <Pressable opacity={selected === 1 ? 1 : 0.5} py="3" flex={1} onPress={() => setSelected(1) && ( () => navigation.navigate('Reservas'))}>
// <Center>
// <Icon mb="2" as={<MaterialCommunityIcons name={selected === 1 ? 'tree' : 'tree-outline'} />} color="white" size="md" />
// <Text color="white" fontSize="15">
// Reservas
// </Text>
// </Center>
// </Pressable>
// <Pressable opacity={selected === 2 ? 1 : 0.5} py="3" flex={1} onPress={() => setSelected(2)}>
// <Center>
// <Icon mb="2" as={<MaterialCommunityIcons name={selected === 2 ? 'account' : 'account-outline'} />} color="white" size="md" />
// <Text color="white" fontSize="15">
// Perfil
// </Text>
// </Center>
// </Pressable>
// </HStack>
// </Center>
)
}

183
mobile-ui/components/LogIn.js
View File

@ -1,4 +1,4 @@
import React, {useState} from "react"; import React, { useContext, useState } from "react";
import Cookies from 'universal-cookie'; import Cookies from 'universal-cookie';
import { import {
Text, Text,
@ -12,43 +12,33 @@ import {
Image Image
} from "native-base"; } from "native-base";
import logo from "../assets/logo-katoikia.png"; import logo from "../assets/logo-katoikia.png";
import { Entypo } from '@expo/vector-icons'; import { Entypo } from '@expo/vector-icons';
import { MaterialCommunityIcons } from '@expo/vector-icons'; import { MaterialCommunityIcons } from '@expo/vector-icons';
import { View, TextInput, StyleSheet } from "react-native"; import { View, TextInput, StyleSheet } from "react-native";
import { UserContext } from "../context/UserContext";
import { API } from "../environment/api";
const baseURL = "http://localhost:4000/user/loginUser"; const baseURL = `${API.BASE_URL}/user/loginUser`;
const cookies = new Cookies();
// const handleChange = (value) => { export default function LogIn({ navigation }) {
// console.log(value);
// } const { addUser } = useContext(UserContext);
export default function LogIn({navigation}) { const [credentials, setCredentials] = useState({
email: "",
password: ""
});
const [email, setEmail] = useState();
const [password, setPassword] = useState();
// const [inputs, setInputs] = useState();
const iniciarSesion = async () => { const onHandleChange = (name) => (value) => setCredentials(prev => ({ ...prev, [name]: value }))
console.log(email); const iniciarSesion = async () => {
const userData = {
email: "lalo@lalo.com",
password: '12345'
}
console.log(userData);
// const userData = JSON.stringify(FormControl.toString);
// console.log(userData);
try { try {
await fetch(baseURL, { await fetch(baseURL, {
cache: 'no-cache', cache: 'no-cache',
method: 'POST', method: 'POST',
body: JSON.stringify(userData), body: JSON.stringify(credentials),
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
@ -64,81 +54,86 @@ export default function LogIn({navigation}) {
// inqulino 4 y guarda 63 // inqulino 4 y guarda 63
const user = response.message const user = response.message
//console.log(user);
cookies.set('id',user._id, {path: "/"} )
cookies.set('name',user.name, {path: "/"} )
cookies.set('email',user.email, {path: "/"} )
cookies.set('type',user.user_type, {path: "/"} )
if(user.user_type == '4'){ if(user.user_type == '4'){
navigation.navigate('Comunicados', {user}) navigation.navigate('Comunicados', {user})
}else if(user.user_type == '3'){ }else if(user.user_type == '3'){
navigation.navigate('Comunicados', {user}) addUser(user);
navigation.navigate('Comunicados')
} }
}) })
} catch (error) { } catch (error) {
console.log("ERROR: " +error); console.log("ERROR: " +error);
} }
} }
return ( return (
<Center w="100%">
<Box safeArea p="2" py="8" w="90%" maxW="290">
<Center>
<Image source={
logo
} width={500} height={550} m='2'
alt="Katoikia logo" size="xl" justifyContent="center" />
</Center> <Center w="100%">
<Box safeArea p="2" py="8" w="90%" maxW="290">
<Heading
size="lg"
fontWeight="600"
color="coolGray.800"
_dark={{
color: "warmGray.50",
}}
>
Bienvenido a Katoikia
</Heading>
<Heading
mt="1"
_dark={{
color: "warmGray.200",
}}
color="coolGray.600"
fontWeight="medium"
size="xs"
>
Su app de comunidad de confianza
</Heading>
<View style={styles.container}> <Center>
<VStack space={3} mt="5"> <Image source={
logo
} width={500} height={550} m='2'
alt="Katoikia logo" size="xl" justifyContent="center" />
</Center>
<Heading
size="lg"
fontWeight="600"
color="coolGray.800"
_dark={{
color: "warmGray.50",
}}
>
Bienvenido a Katoikia
</Heading>
<Heading
mt="1"
_dark={{
color: "warmGray.200",
}}
color="coolGray.600"
fontWeight="medium"
size="xs"
>
Su app de comunidad de confianza
</Heading>
<View style={styles.container}>
<VStack space={3} mt="5">
<FormControl isRequired > <FormControl isRequired >
<FormControl.Label Text='bold'> Correo Electrónico </FormControl.Label> <FormControl.Label Text='bold'> Correo Electrónico </FormControl.Label>
<View style={styles.viewSection}> <View style={styles.viewSection}>
<Entypo name="email" size={20} color="grey" style={styles.iconStyle} /> <Entypo name="email" size={20} color="grey" style={styles.iconStyle} />
<TextInput name='email' type="text" style={styles.input} placeholder='Correo electrónico' onChangeText={(value) => setEmail(value) } /> <TextInput
name='email'
type="text"
style={styles.input}
value={credentials.email}
placeholder='Correo electrónico'
onChangeText={onHandleChange("email")} />
</View> </View>
</FormControl> </FormControl>
<FormControl isRequired> <FormControl isRequired>
<FormControl.Label Text='bold'> Contraseña </FormControl.Label> <FormControl.Label Text='bold'> Contraseña </FormControl.Label>
<View style={styles.viewSection}> <View style={styles.viewSection}>
<MaterialCommunityIcons name="form-textbox-password" size={20} color="grey" style={styles.iconStyle}/> <MaterialCommunityIcons name="form-textbox-password" size={20} color="grey" style={styles.iconStyle} />
<TextInput name='password' type="password" style={styles.input} placeholder='Contraseña' onChangeText={(value) => setPassword(value)} /> <TextInput
</View> name='password'
type="password"
style={styles.input}
value={credentials.password}
placeholder='Contraseña'
onChangeText={onHandleChange("password")} />
</View>
<Link <Link
_text={{ _text={{
fontSize: "xs", fontSize: "xs",
@ -149,24 +144,24 @@ export default function LogIn({navigation}) {
alignSelf="flex-end" alignSelf="flex-end"
mt="1" mt="1"
onPress={() => navigation.navigate('Password')} onPress={() => navigation.navigate('Password')}
> >
Recuperar contraseña Recuperar contraseña
</Link> </Link>
</FormControl> </FormControl>
<Button mt="2" backgroundColor="#D7A86E" onPress={() => iniciarSesion()} <Button mt="2" backgroundColor="#D7A86E" onPress={iniciarSesion}
> >
<Text>Continuar</Text> <Text>Continuar</Text>
</Button> </Button>
</VStack></View> </VStack></View>
</Box> </Box>
</Center> </Center>
); );
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
@ -180,16 +175,16 @@ const styles = StyleSheet.create({
paddingRight: 10, paddingRight: 10,
paddingBottom: 10, paddingBottom: 10,
paddingLeft: 0, paddingLeft: 0,
marginTop: 50, marginTop: 50,
marginBottom: 10, marginBottom: 10,
borderRadius: 4 borderRadius: 4
}, },
iconStyle: { iconStyle: {
paddingBottom: 20, paddingBottom: 20,
marginTop: 3, marginTop: 3,
paddingTop: 35 paddingTop: 35
}, },
viewSection: { viewSection: {
flex: 1, flex: 1,
@ -203,4 +198,4 @@ const styles = StyleSheet.create({
container: { container: {
} }
}) })

42
mobile-ui/components/Profile.js
View File

@ -1,23 +1,19 @@
import React, { useState } from "react";
import React, { useContext, useState } from "react";
import { import {
Box, Box, Button,
Heading, Center, FormControl, Heading, ScrollView, VStack
VStack, } from "native-base";
FormControl,
Button,
Center,
ScrollView
} from "native-base";
import { View, TextInput, StyleSheet } from "react-native";
export default function Profile({route, navigation}){
import { StyleSheet, TextInput } from "react-native";
import { UserContext } from "../context/UserContext";
export default function Profile({ navigation }) {
const baseURL = 'http://localhost:4000/user/updateUser' const baseURL = 'http://localhost:4000/user/updateUser'
const userData = JSON.parse(JSON.stringify(route.params)); //const userData = JSON.parse(JSON.stringify(route.params));
const [name, setName] = useState(); const [name, setName] = useState();
const [apellido, setApellido] =useState(); const [apellido, setApellido] =useState();
const [email, setEmail] = useState(); const [email, setEmail] = useState();
@ -26,6 +22,8 @@ export default function Profile({route, navigation}){
console.log(userData.user); console.log(userData.user);
const userData = useContext(UserContext)
const updateInfo = async() => { const updateInfo = async() => {
@ -123,17 +121,17 @@ export default function Profile({route, navigation}){
</Box> </Box>
</ScrollView> </ScrollView>
</Center> </Center>
) )
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
input: { input: {
height: 10, height: 10,
margin:3, margin: 3,
borderWidth: 0.5, borderWidth: 0.5,
padding: 5, padding: 5,
flex: 1, flex: 1,
@ -141,9 +139,9 @@ const styles = StyleSheet.create({
paddingRight: 19, paddingRight: 19,
paddingBottom: 20, paddingBottom: 20,
paddingLeft: 0, paddingLeft: 0,
marginTop: 6, marginTop: 6,
marginBottom:6, marginBottom: 6,
borderRadius: 4 borderRadius: 4
} }
}) })

23
mobile-ui/context/UserContext.js Normal file
View File

@ -0,0 +1,23 @@
import React, { createContext, useState } from 'react'
export const UserContext = createContext({});
export const UserContextProvider = ({ children }) => {
const [user, setUser] = useState(null);
const addUser = (user) => setUser(user);
const removeUser = () => setUser(null);
const value = {
user,
addUser,
removeUser
}
return (
<UserContext.Provider value={value}>
{children}
</UserContext.Provider>
)
}

5
mobile-ui/environment/api.js Normal file
View File

@ -0,0 +1,5 @@
export class API {
static BASE_URL = "http://10.0.2.2:4000"
}

20020
mobile-ui/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
mobile-ui/package.json
View File

@ -22,9 +22,11 @@
"@react-navigation/native": "^6.0.11", "@react-navigation/native": "^6.0.11",
"@react-navigation/native-stack": "^6.7.0", "@react-navigation/native-stack": "^6.7.0",
"@react-navigation/stack": "^6.2.2", "@react-navigation/stack": "^6.2.2",
"date-fns": "^2.29.2",
"expo": "^44.0.0", "expo": "^44.0.0",
"expo-status-bar": "~1.2.0", "expo-status-bar": "~1.2.0",
"native-base": "3.4.0", "native-base": "3.4.0",
"prop-types": "^15.8.1",
"react": "17.0.1", "react": "17.0.1",
"react-dom": "17.0.1", "react-dom": "17.0.1",
"react-native": "0.64.3", "react-native": "0.64.3",