From 51cdecd388250bf6fe72f0f9b2d6ae26d31d6e3b Mon Sep 17 00:00:00 2001 From: Maria Sanchez Date: Wed, 24 Aug 2022 11:15:27 -0600 Subject: [PATCH] separar vistas del guarda e inquilino --- mobile-ui/App.js | 23 ++++++++++++++++++++++ mobile-ui/components/AreaComun.js | 8 ++++---- mobile-ui/components/Reservas.js | 1 + mobile-ui/components/ReservasCard/index.js | 4 ++-- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/mobile-ui/App.js b/mobile-ui/App.js index ed2b930a..f7b25e24 100644 --- a/mobile-ui/App.js +++ b/mobile-ui/App.js @@ -44,6 +44,28 @@ function HomeTab({ route }) { ) } + +function HomeTabGuarda({ route }) { + const { user } = useContext(UserContext); + const [selected, setSelected] = useState(0); + + return ( + + + (} color="#D7A86E" size="md" />)}} onclick={() => setSelected(0)} + /> + (} color="#D7A86E" size="md" />)} } onclick={() => setSelected(1)} /> + (} color="#D7A86E" size="md" />)}} onclick={() => setSelected(2)} /> + + + ) +} export default function App() { return ( @@ -56,6 +78,7 @@ export default function App() { } }} /> + { @@ -144,13 +144,13 @@ export default function AreaComun({navigation}){ Hora de inicio - + Hora de finalizaciĆ³n - + diff --git a/mobile-ui/components/Reservas.js b/mobile-ui/components/Reservas.js index 8ac0b01b..90d54b0c 100644 --- a/mobile-ui/components/Reservas.js +++ b/mobile-ui/components/Reservas.js @@ -70,6 +70,7 @@ export default function Reservas({navigation}) { startTime={item.start_time} endTime={item.finish_time} status={item.status} + name={item.common_area_name} /> )) } diff --git a/mobile-ui/components/ReservasCard/index.js b/mobile-ui/components/ReservasCard/index.js index 800cd75b..c255f3de 100644 --- a/mobile-ui/components/ReservasCard/index.js +++ b/mobile-ui/components/ReservasCard/index.js @@ -11,7 +11,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -export const ReservasCard = ({ date, startTime, endTime, status}) => { +export const ReservasCard = ({ date, startTime, endTime, status, name}) => { const dateFormated = format(new Date(date), "dd LL yyyy") @@ -44,7 +44,7 @@ export const ReservasCard = ({ date, startTime, endTime, status}) => { {status == 1 ? 'LIBRE' : 'RESERVADO'} - Reserva #1 + {name}