From bad70d7217e53a298a1284cf099b651bb15a022a Mon Sep 17 00:00:00 2001 From: Maria Sanchez Date: Fri, 22 Jul 2022 15:16:54 -0600 Subject: [PATCH 01/16] login web component --- web-ui/web-react/src/components/LogIn.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web-ui/web-react/src/components/LogIn.js b/web-ui/web-react/src/components/LogIn.js index 10c58bd6..4d0531e1 100644 --- a/web-ui/web-react/src/components/LogIn.js +++ b/web-ui/web-react/src/components/LogIn.js @@ -3,6 +3,8 @@ import { InputText } from 'primereact/inputtext'; const LogIn = () => { + + return (
From 75c463b1626329100ff2377c514bea325b18bd69 Mon Sep 17 00:00:00 2001 From: Maria Sanchez Date: Tue, 2 Aug 2022 23:01:58 -0600 Subject: [PATCH 02/16] log in --- web-ui/web-react/src/components/LogIn.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/web-ui/web-react/src/components/LogIn.js b/web-ui/web-react/src/components/LogIn.js index 4d0531e1..e4e09d8f 100644 --- a/web-ui/web-react/src/components/LogIn.js +++ b/web-ui/web-react/src/components/LogIn.js @@ -1,8 +1,16 @@ -import React from 'react'; +import React, { useState } from 'react'; import { InputText } from 'primereact/inputtext'; const LogIn = () => { + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); + + + const iniciarSesion = () =>{ + + } + return ( @@ -12,12 +20,12 @@ const LogIn = () => {
Iniciar Sesión
- - + +
- - + +
{/* */} @@ -28,8 +36,4 @@ const LogIn = () => { ) } -export default LogIn - -/* image 1 */ - - +export default LogIn \ No newline at end of file From d52b47a2c19df40d9659d285f1a2d2f59d2d1267 Mon Sep 17 00:00:00 2001 From: Maria Sanchez Date: Fri, 5 Aug 2022 23:16:04 -0600 Subject: [PATCH 03/16] mobile home component --- .expo/README.md | 15 ++++++++ .expo/settings.json | 8 +++++ mobile-ui/App.js | 34 +++++------------- .../{Logo_Katoikia.png => logo-katoikia.png} | Bin mobile-ui/components/Home.js | 28 +++++++++++++++ 5 files changed, 59 insertions(+), 26 deletions(-) create mode 100644 .expo/README.md create mode 100644 .expo/settings.json rename mobile-ui/assets/{Logo_Katoikia.png => logo-katoikia.png} (100%) create mode 100644 mobile-ui/components/Home.js diff --git a/.expo/README.md b/.expo/README.md new file mode 100644 index 00000000..fd146b4d --- /dev/null +++ b/.expo/README.md @@ -0,0 +1,15 @@ +> Why do I have a folder named ".expo" in my project? + +The ".expo" folder is created when an Expo project is started using "expo start" command. + +> What do the files contain? + +- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds. +- "packager-info.json": contains port numbers and process PIDs that are used to serve the application to the mobile device/simulator. +- "settings.json": contains the server configuration that is used to serve the application manifest. + +> Should I commit the ".expo" folder? + +No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine. + +Upon project creation, the ".expo" folder is already added to your ".gitignore" file. diff --git a/.expo/settings.json b/.expo/settings.json new file mode 100644 index 00000000..92bc513b --- /dev/null +++ b/.expo/settings.json @@ -0,0 +1,8 @@ +{ + "hostType": "lan", + "lanType": "ip", + "dev": true, + "minify": false, + "urlRandomness": null, + "https": false +} diff --git a/mobile-ui/App.js b/mobile-ui/App.js index 0b181475..169933a1 100644 --- a/mobile-ui/App.js +++ b/mobile-ui/App.js @@ -18,6 +18,7 @@ import { } from "native-base"; import NativeBaseIcon from "./components/NativeBaseIcon"; import { Platform } from "react-native"; +import logo from "./assets/logo-katoikia.png" // Define the config const config = { @@ -31,17 +32,18 @@ colors: { brown: "#D7A86E" } }); -//const logo = require('./assets/') +// const logo = require('./assets/logo-katoikia.png') + export default function App() { return (
- {/* Katoikia logo */} + Katoikia logo Continuar - - {/* - I'm a new user. - */} - - Regístrese aquí - - +
diff --git a/mobile-ui/assets/Logo_Katoikia.png b/mobile-ui/assets/logo-katoikia.png similarity index 100% rename from mobile-ui/assets/Logo_Katoikia.png rename to mobile-ui/assets/logo-katoikia.png diff --git a/mobile-ui/components/Home.js b/mobile-ui/components/Home.js new file mode 100644 index 00000000..cce81831 --- /dev/null +++ b/mobile-ui/components/Home.js @@ -0,0 +1,28 @@ +import React from "react"; +import { + Text, + Link, + HStack, + Center, + Heading, + Switch, + useColorMode, + NativeBaseProvider, + extendTheme, + VStack, + Box, + FormControl, + Input, + Button, + Image + } from "native-base"; + +export default function Home(){ + + return ( + + + + + ) +} \ No newline at end of file From 8e98739f99f481087db6f6ab8171f6eee80a83e8 Mon Sep 17 00:00:00 2001 From: Mariela Date: Tue, 9 Aug 2022 11:56:36 -0600 Subject: [PATCH 04/16] Nueva prueba de inicio de sesion --- web-ui/web-react/src/App.js | 76 +--- .../src/components/DashboardAdmin.js | 360 ++++++++++++++++++ .../web-react/src/components/LocalStorage.js | 17 + .../src/components/LoginLocalStorage.js | 104 +++++ web-ui/web-react/src/index.js | 3 +- web-ui/web-react/src/pages/Menu.js | 35 ++ web-ui/web-react/src/routes/Routes.js | 17 + 7 files changed, 554 insertions(+), 58 deletions(-) create mode 100644 web-ui/web-react/src/components/DashboardAdmin.js create mode 100644 web-ui/web-react/src/components/LocalStorage.js create mode 100644 web-ui/web-react/src/components/LoginLocalStorage.js create mode 100644 web-ui/web-react/src/pages/Menu.js create mode 100644 web-ui/web-react/src/routes/Routes.js diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js index 4f7d2c96..d6fa404a 100644 --- a/web-ui/web-react/src/App.js +++ b/web-ui/web-react/src/App.js @@ -1,7 +1,8 @@ import React, { useState, useEffect, useRef } from 'react'; import classNames from 'classnames'; -import { Route, useLocation } from 'react-router-dom'; +import { Route, useLocation, BrowserRouter} from 'react-router-dom'; import { CSSTransition } from 'react-transition-group'; +import Routes from './routes/Routes' import { AppTopbar } from './AppTopbar'; import { AppFooter } from './AppFooter'; @@ -50,6 +51,7 @@ import './assets/demo/Demos.scss'; import './assets/layout/layout.scss'; import './App.scss'; import LogIn from './components/LogIn'; +import LoginLocalStorage from './components/LoginLocalStorage'; const App = () => { const [layoutMode, setLayoutMode] = useState('static'); @@ -63,6 +65,15 @@ const App = () => { const copyTooltipRef = useRef(); const location = useLocation(); + const handleLogout=()=>{ + localStorage.clear(); + window.location.reload(); + } + + + + + PrimeReact.ripple = true; let menuClick = false; @@ -171,7 +182,8 @@ const App = () => { {label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad'}, {label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas'}, {label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos'}, - {label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn'} + {label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn'}, + {label: 'Log out', icon: 'pi pi-fw pi-id-card', to: '/logOut'} ] }, { @@ -289,61 +301,11 @@ const App = () => { }); return ( -
- - - - -
- -
- -
-
- } /> - - - - - - - - - - - - - - - - - } /> - - - - - - - - - - - -
- - -
- - - - -
- - - -
+
+ + + +
); } diff --git a/web-ui/web-react/src/components/DashboardAdmin.js b/web-ui/web-react/src/components/DashboardAdmin.js new file mode 100644 index 00000000..0911d706 --- /dev/null +++ b/web-ui/web-react/src/components/DashboardAdmin.js @@ -0,0 +1,360 @@ +import React, { useState, useEffect, useRef } from 'react'; +import classNames from 'classnames'; +import { Route, useLocation } from 'react-router-dom'; +import { CSSTransition } from 'react-transition-group'; + +import { AppTopbar } from '../AppTopbar'; +import { AppFooter } from '../AppFooter'; +import { AppMenu } from '../AppMenu'; +import { AppConfig } from '../AppConfig'; + +import Dashboard from '../templates/Dashboard'; +import ButtonDemo from '../templates/ButtonDemo'; +import ChartDemo from '../templates/ChartDemo'; +import Documentation from '../templates/Documentation'; +import FileDemo from '../templates/FileDemo'; +import FloatLabelDemo from '../templates/FloatLabelDemo'; +import FormLayoutDemo from '../templates/FormLayoutDemo'; +import InputDemo from '../templates/InputDemo'; +import ListDemo from '../templates/ListDemo'; +import MenuDemo from '../templates/MenuDemo'; +import MessagesDemo from '../templates/MessagesDemo'; +import MiscDemo from '../templates/MiscDemo'; +import OverlayDemo from '../templates/OverlayDemo'; +import MediaDemo from '../templates/MediaDemo'; +import PanelDemo from '../templates/PanelDemo'; +import TableDemo from '../templates/TableDemo'; +import TreeDemo from '../templates/TreeDemo'; +import InvalidStateDemo from '../templates/InvalidStateDemo'; +import BlocksDemo from '../templates/BlocksDemo'; +import IconsDemo from '../templates/IconsDemo'; +import AdministradoresSistema from '../components/AdministradoresSistema'; +import AdministradoresComunidad from '../components/AdministradoresComunidad'; +import GuardasSeguridad from '../components/GuardasSeguridad'; +import Communities from '../components/ComunidadViviendas'; +import Inquilinos from '../components/Inquilinos'; + +import Crud from '../pages/Crud'; +import EmptyPage from '../pages/EmptyPage'; +import TimelineDemo from '../pages/TimelineDemo'; + +import PrimeReact from 'primereact/api'; +import { Tooltip } from 'primereact/tooltip'; + +import 'primereact/resources/primereact.css'; +import 'primeicons/primeicons.css'; +import 'primeflex/primeflex.css'; +import 'prismjs/themes/prism-coy.css'; +import '../assets/demo/flags/flags.css'; +import '../assets/demo/Demos.scss'; +import '../assets/layout/layout.scss'; +import '../App.scss'; +import LogIn from '../components/LogIn'; +import LoginLocalStorage from '../components/LoginLocalStorage'; + +const DashboardAdmin = () => { + const [layoutMode, setLayoutMode] = useState('static'); + const [layoutColorMode, setLayoutColorMode] = useState('light') + const [inputStyle, setInputStyle] = useState('outlined'); + const [ripple, setRipple] = useState(true); + const [staticMenuInactive, setStaticMenuInactive] = useState(false); + const [overlayMenuActive, setOverlayMenuActive] = useState(false); + const [mobileMenuActive, setMobileMenuActive] = useState(false); + const [mobileTopbarMenuActive, setMobileTopbarMenuActive] = useState(false); + const copyTooltipRef = useRef(); + const location = useLocation(); + + const handleLogout=()=>{ + localStorage.clear(); + window.location.reload(); + } + + PrimeReact.ripple = true; + + let menuClick = false; + let mobileTopbarMenuClick = false; + + useEffect(() => { + if (mobileMenuActive) { + addClass(document.body, "body-overflow-hidden"); + } else { + removeClass(document.body, "body-overflow-hidden"); + } + }, [mobileMenuActive]); + + useEffect(() => { + copyTooltipRef && copyTooltipRef.current && copyTooltipRef.current.updateTargetEvents(); + }, [location]); + + const onInputStyleChange = (inputStyle) => { + setInputStyle(inputStyle); + } + + const onRipple = (e) => { + PrimeReact.ripple = e.value; + setRipple(e.value) + } + + const onLayoutModeChange = (mode) => { + setLayoutMode(mode) + } + + const onColorModeChange = (mode) => { + setLayoutColorMode(mode) + } + + const onWrapperClick = (event) => { + if (!menuClick) { + setOverlayMenuActive(false); + setMobileMenuActive(false); + } + + if (!mobileTopbarMenuClick) { + setMobileTopbarMenuActive(false); + } + + mobileTopbarMenuClick = false; + menuClick = false; + } + + const onToggleMenuClick = (event) => { + menuClick = true; + + if (isDesktop()) { + if (layoutMode === 'overlay') { + if (mobileMenuActive === true) { + setOverlayMenuActive(true); + } + + setOverlayMenuActive((prevState) => !prevState); + setMobileMenuActive(false); + } + else if (layoutMode === 'static') { + setStaticMenuInactive((prevState) => !prevState); + } + } + else { + setMobileMenuActive((prevState) => !prevState); + } + + event.preventDefault(); + } + + const onSidebarClick = () => { + menuClick = true; + } + + const onMobileTopbarMenuClick = (event) => { + mobileTopbarMenuClick = true; + + setMobileTopbarMenuActive((prevState) => !prevState); + event.preventDefault(); + } + + const onMobileSubTopbarMenuClick = (event) => { + mobileTopbarMenuClick = true; + + event.preventDefault(); + } + + const onMenuItemClick = (event) => { + if (!event.item.items) { + setOverlayMenuActive(false); + setMobileMenuActive(false); + } + } + const isDesktop = () => { + return window.innerWidth >= 992; + } + + const menu = [ + { + label: 'Home', + items: [ + {label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/'}, + {label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema'}, + {label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad'}, + {label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad'}, + {label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas'}, + {label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos'}, + {label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn'}, + {label: 'Log out', icon: 'pi pi-fw pi-id-card', to: '/logOut'} + ] + }, + { + label: 'UI Components', icon: 'pi pi-fw pi-sitemap', + items: [ + { label: 'Form Layout', icon: 'pi pi-fw pi-id-card', to: '/formlayout' }, + { label: 'Input', icon: 'pi pi-fw pi-check-square', to: '/input' }, + { label: "Float Label", icon: "pi pi-fw pi-bookmark", to: "/floatlabel" }, + { label: "Invalid State", icon: "pi pi-fw pi-exclamation-circle", to: "invalidstate" }, + { label: 'Button', icon: 'pi pi-fw pi-mobile', to: '/button' }, + { label: 'Table', icon: 'pi pi-fw pi-table', to: '/table' }, + { label: 'List', icon: 'pi pi-fw pi-list', to: '/list' }, + { label: 'Tree', icon: 'pi pi-fw pi-share-alt', to: '/tree' }, + { label: 'Panel', icon: 'pi pi-fw pi-tablet', to: '/panel' }, + { label: 'Overlay', icon: 'pi pi-fw pi-clone', to: '/overlay' }, + { label: "Media", icon: "pi pi-fw pi-image", to: "/media" }, + { label: 'Menu', icon: 'pi pi-fw pi-bars', to: '/menu' }, + { label: 'Message', icon: 'pi pi-fw pi-comment', to: '/messages' }, + { label: 'File', icon: 'pi pi-fw pi-file', to: '/file' }, + { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', to: '/chart' }, + { label: 'Misc', icon: 'pi pi-fw pi-circle-off', to: '/misc' }, + ] + }, + { + label: 'UI Blocks', + items: [ + { label: 'Free Blocks', icon: 'pi pi-fw pi-eye', to: '/blocks', badge: "NEW" }, + { label: 'All Blocks', icon: 'pi pi-fw pi-globe', url: 'https://www.primefaces.org/primeblocks-react' } + ] + }, + { + label: 'Icons', + items: [ + { label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/icons' } + ] + }, + { + label: 'Pages', icon: 'pi pi-fw pi-clone', + items: [ + { label: 'Crud', icon: 'pi pi-fw pi-user-edit', to: '/crud' }, + { label: 'Timeline', icon: 'pi pi-fw pi-calendar', to: '/timeline' }, + { label: 'Empty', icon: 'pi pi-fw pi-circle-off', to: '/empty' } + ] + }, + { + label: 'Menu Hierarchy', icon: 'pi pi-fw pi-search', + items: [ + { + label: 'Submenu 1', icon: 'pi pi-fw pi-bookmark', + items: [ + { + label: 'Submenu 1.1', icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 1.1.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.1.2', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.1.3', icon: 'pi pi-fw pi-bookmark' }, + ] + }, + { + label: 'Submenu 1.2', icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 1.2.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.2.2', icon: 'pi pi-fw pi-bookmark' } + ] + }, + ] + }, + { + label: 'Submenu 2', icon: 'pi pi-fw pi-bookmark', + items: [ + { + label: 'Submenu 2.1', icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 2.1.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.1.2', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.1.3', icon: 'pi pi-fw pi-bookmark' }, + ] + }, + { + label: 'Submenu 2.2', icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 2.2.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.2.2', icon: 'pi pi-fw pi-bookmark' } + ] + } + ] + } + ] + } + ]; + + const addClass = (element, className) => { + if (element.classList) + element.classList.add(className); + else + element.className += ' ' + className; + } + + const removeClass = (element, className) => { + if (element.classList) + element.classList.remove(className); + else + element.className = element.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' '); + } + + const wrapperClass = classNames('layout-wrapper', { + 'layout-overlay': layoutMode === 'overlay', + 'layout-static': layoutMode === 'static', + 'layout-static-sidebar-inactive': staticMenuInactive && layoutMode === 'static', + 'layout-overlay-sidebar-active': overlayMenuActive && layoutMode === 'overlay', + 'layout-mobile-sidebar-active': mobileMenuActive, + 'p-input-filled': inputStyle === 'filled', + 'p-ripple-disabled': ripple === false, + 'layout-theme-light': layoutColorMode === 'light' + }); + + return ( +
+ + + + +
+ +
+ +
+
+ } /> + + + + + + + + + + + + + + + + + } /> + + + + + + + + + + + + +
+ + +
+ + + + +
+ + + +
+ + ); + +} + +export default DashboardAdmin; diff --git a/web-ui/web-react/src/components/LocalStorage.js b/web-ui/web-react/src/components/LocalStorage.js new file mode 100644 index 00000000..37edbadb --- /dev/null +++ b/web-ui/web-react/src/components/LocalStorage.js @@ -0,0 +1,17 @@ +import React, { useRef } from "react"; + +function LocalStorage(){ + const data=useRef(); + const handleClick=()=>{ + console.log(data.current.value,"initial value") + localStorage.setItem("inputValue",data.current.value) + } + console.log(localStorage.getItem("inputValue"),"****") + return( + <> + + + + ); +} +export default LocalStorage; \ No newline at end of file diff --git a/web-ui/web-react/src/components/LoginLocalStorage.js b/web-ui/web-react/src/components/LoginLocalStorage.js new file mode 100644 index 00000000..206a7ab1 --- /dev/null +++ b/web-ui/web-react/src/components/LoginLocalStorage.js @@ -0,0 +1,104 @@ +import DashboardAdmin from "./DashboardAdmin"; +import React, { Component, Fragment } from 'react'; +import Cookies from 'universal-cookie'; +import { InputText } from 'primereact/inputtext'; + +const baseUrl = "http://localhost:4000/user/loginUser"; +const cookies = new Cookies(); + + +class LoginLocalStorage extends Component { + state = { + form: { + username: '', + password: '' + } + } + + handleChange = async e => { + await this.setState({ + form: { + ...this.state.form, + [e.target.name]: e.target.value + } + }); + } + + iniciarSesion = async () => { + const data = { + email: this.state.form.email, + password: this.state.form.password + } + + await fetch(baseUrl, { + cache: 'no-cache', + method: 'POST', + body: JSON.stringify(data), + headers: { + 'Content-Type': 'application/json' + } + }) + .then(response => { + return response.json(); + }) + .then(response => { + console.log(response.message); + if (response.message) { + const user = response.message; + cookies.set('id', user._id, { path: "/" }); + cookies.set('name', user.name, { path: "/" }); + cookies.set('email', user.username, { path: "/" }); + alert(`Bienvenido ${user.name}`); + window.location.href = "./menu"; + } else { + alert('El usuario o la contraseña no son correctos'); + } + }) + .catch(error => { + console.log(error); + }) + + + + } + + componentDidMount() { + if (cookies.get('email')) { + window.location.href = "./menu"; + } + } + + + render() { + return ( + + +
+
+
+
Iniciar Sesión
+
+
+ + +
+
+ + +
+ + +
+
+
+
+ + + + + + ); + } +} + +export default LoginLocalStorage; \ No newline at end of file diff --git a/web-ui/web-react/src/index.js b/web-ui/web-react/src/index.js index fb5e7a3f..991c96b9 100644 --- a/web-ui/web-react/src/index.js +++ b/web-ui/web-react/src/index.js @@ -9,7 +9,8 @@ import ScrollToTop from './ScrollToTop'; ReactDOM.render( - + + , document.getElementById('root') diff --git a/web-ui/web-react/src/pages/Menu.js b/web-ui/web-react/src/pages/Menu.js new file mode 100644 index 00000000..379eb986 --- /dev/null +++ b/web-ui/web-react/src/pages/Menu.js @@ -0,0 +1,35 @@ +import React, { Component } from 'react'; +import Cookies from 'universal-cookie'; + +const cookies = new Cookies(); + +class Menu extends Component { + cerrarSesion=()=>{ + cookies.remove('id', {path: "/"}); + cookies.remove('name', {path: "/"}); + cookies.remove('email', {path: "/"}); + window.location.href='/'; + } + + componentDidMount() { + if(!cookies.get('email')){ + window.location.href="./"; + } + } + + render() { + console.log('id: '+ cookies.get('id')); + console.log('name: '+cookies.get('name')); + console.log('email: '+cookies.get('email')); + return ( +
+ Menu Principal + +
+ +
+ ); + } +} + +export default Menu; \ No newline at end of file diff --git a/web-ui/web-react/src/routes/Routes.js b/web-ui/web-react/src/routes/Routes.js new file mode 100644 index 00000000..a9d8860a --- /dev/null +++ b/web-ui/web-react/src/routes/Routes.js @@ -0,0 +1,17 @@ +import React from 'react'; +import {BrowserRouter, Switch, Route} from 'react-router-dom'; +import LoginLocalStorage from '../components/LoginLocalStorage'; +import Menu from '../pages/Menu'; + +function Routes() { + return ( + + + + + + + ); +} + +export default Routes; \ No newline at end of file From 770bbfed430207e8d5162b4a8494f8445d9a01e0 Mon Sep 17 00:00:00 2001 From: Mariela Date: Tue, 9 Aug 2022 13:42:47 -0600 Subject: [PATCH 05/16] iniciar sesion funcionalidad frontend --- .../public/assets/themes/khaki/theme.css | 7 + web-ui/web-react/src/App.js | 67 +++- .../src/components/LoginLocalStorage.js | 63 +++- web-ui/web-react/src/components/MenuAdmin.js | 308 ++++++++++++++++++ web-ui/web-react/src/index.js | 8 +- web-ui/web-react/src/pages/Menu.js | 2 +- web-ui/web-react/src/routes/Routes.js | 4 +- 7 files changed, 424 insertions(+), 35 deletions(-) create mode 100644 web-ui/web-react/src/components/MenuAdmin.js diff --git a/web-ui/web-react/public/assets/themes/khaki/theme.css b/web-ui/web-react/public/assets/themes/khaki/theme.css index 08d350a6..259307db 100644 --- a/web-ui/web-react/public/assets/themes/khaki/theme.css +++ b/web-ui/web-react/public/assets/themes/khaki/theme.css @@ -7117,4 +7117,11 @@ .p-button.p-button-danger:enabled:focus { box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #f7a2a2, 0 1px 2px 0 black; +} + + +.login-wrapper { + display: flex; + flex-direction: column; + align-items: center; } \ No newline at end of file diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js index d6fa404a..349d6c11 100644 --- a/web-ui/web-react/src/App.js +++ b/web-ui/web-react/src/App.js @@ -1,8 +1,7 @@ import React, { useState, useEffect, useRef } from 'react'; import classNames from 'classnames'; -import { Route, useLocation, BrowserRouter} from 'react-router-dom'; +import { Route, useLocation } from 'react-router-dom'; import { CSSTransition } from 'react-transition-group'; -import Routes from './routes/Routes' import { AppTopbar } from './AppTopbar'; import { AppFooter } from './AppFooter'; @@ -51,7 +50,6 @@ import './assets/demo/Demos.scss'; import './assets/layout/layout.scss'; import './App.scss'; import LogIn from './components/LogIn'; -import LoginLocalStorage from './components/LoginLocalStorage'; const App = () => { const [layoutMode, setLayoutMode] = useState('static'); @@ -70,10 +68,6 @@ const App = () => { window.location.reload(); } - - - - PrimeReact.ripple = true; let menuClick = false; @@ -301,11 +295,60 @@ const App = () => { }); return ( -
- - - -
+
+ + + + +
+ +
+ +
+
+ } /> + + + + + + + + + + + + + + + + + } /> + + + + + + + + + + + + +
+ + +
+ + + + +
+ +
); } diff --git a/web-ui/web-react/src/components/LoginLocalStorage.js b/web-ui/web-react/src/components/LoginLocalStorage.js index 206a7ab1..6f01c4bc 100644 --- a/web-ui/web-react/src/components/LoginLocalStorage.js +++ b/web-ui/web-react/src/components/LoginLocalStorage.js @@ -2,6 +2,7 @@ import DashboardAdmin from "./DashboardAdmin"; import React, { Component, Fragment } from 'react'; import Cookies from 'universal-cookie'; import { InputText } from 'primereact/inputtext'; +import { Button } from 'primereact/button'; const baseUrl = "http://localhost:4000/user/loginUser"; const cookies = new Cookies(); @@ -10,9 +11,10 @@ const cookies = new Cookies(); class LoginLocalStorage extends Component { state = { form: { - username: '', + email: '', password: '' - } + }, + errorMessages:{} } handleChange = async e => { @@ -30,6 +32,8 @@ class LoginLocalStorage extends Component { password: this.state.form.password } + console.log(data); + await fetch(baseUrl, { cache: 'no-cache', method: 'POST', @@ -47,7 +51,7 @@ class LoginLocalStorage extends Component { const user = response.message; cookies.set('id', user._id, { path: "/" }); cookies.set('name', user.name, { path: "/" }); - cookies.set('email', user.username, { path: "/" }); + cookies.set('email', user.email, { path: "/" }); alert(`Bienvenido ${user.name}`); window.location.href = "./menu"; } else { @@ -68,31 +72,54 @@ class LoginLocalStorage extends Component { } } + renderErrorMessage = (name) => + name === this.state.errorMessages.name && ( +
{this.state.errorMessages.message}
+ ); + + errors = { + email: "Correo requerido", + pass: "Contraseña requerida" + }; render() { return ( -
-
-
-
Iniciar Sesión
-
-
- - -
-
- - -
+ +
- +
+
+
+
Iniciar Sesión
+
+
+ + + {this.renderErrorMessage("email")} +
+
+ + + {this.renderErrorMessage("password")} +
+ + +
- diff --git a/web-ui/web-react/src/components/MenuAdmin.js b/web-ui/web-react/src/components/MenuAdmin.js new file mode 100644 index 00000000..5cca9efe --- /dev/null +++ b/web-ui/web-react/src/components/MenuAdmin.js @@ -0,0 +1,308 @@ +import React, { Component } from 'react'; +import Cookies from 'universal-cookie'; +import AdministradoresComunidad from './AdministradoresComunidad'; +import AdministradoresSistema from './AdministradoresSistema'; +import Communities from './components/ComunidadViviendas'; + +class MenuAdmin extends Component { + state = { + layoutMode + } + + + +} + +const [layoutMode, setLayoutMode] = useState('static'); +const [layoutColorMode, setLayoutColorMode] = useState('light') +const [inputStyle, setInputStyle] = useState('outlined'); +const [ripple, setRipple] = useState(true); +const [staticMenuInactive, setStaticMenuInactive] = useState(false); +const [overlayMenuActive, setOverlayMenuActive] = useState(false); +const [mobileMenuActive, setMobileMenuActive] = useState(false); +const [mobileTopbarMenuActive, setMobileTopbarMenuActive] = useState(false); +const copyTooltipRef = useRef(); +const location = useLocation(); + +const [cookies, setCookies] = useRef(); + +const handleLogout = () => { + cookies.remove('id', {path: "/"}); + cookies.remove('email', {path: "/"}); + cookies.remove('name', {path: "/"}); + window.location.href='/'; +} + +useEffect(() => { + if(!cookies.get('email')){ + window.location.href="./"; + } +}, []) + + + +PrimeReact.ripple = true; + +let menuClick = false; +let mobileTopbarMenuClick = false; + +useEffect(() => { + if (mobileMenuActive) { + addClass(document.body, "body-overflow-hidden"); + } else { + removeClass(document.body, "body-overflow-hidden"); + } +}, [mobileMenuActive]); + +useEffect(() => { + copyTooltipRef && copyTooltipRef.current && copyTooltipRef.current.updateTargetEvents(); +}, [location]); + +const onInputStyleChange = (inputStyle) => { + setInputStyle(inputStyle); +} + +const onRipple = (e) => { + PrimeReact.ripple = e.value; + setRipple(e.value) +} + +const onLayoutModeChange = (mode) => { + setLayoutMode(mode) +} + +const onColorModeChange = (mode) => { + setLayoutColorMode(mode) +} + +const onWrapperClick = (event) => { + if (!menuClick) { + setOverlayMenuActive(false); + setMobileMenuActive(false); + } + + if (!mobileTopbarMenuClick) { + setMobileTopbarMenuActive(false); + } + + mobileTopbarMenuClick = false; + menuClick = false; +} + +const onToggleMenuClick = (event) => { + menuClick = true; + + if (isDesktop()) { + if (layoutMode === 'overlay') { + if (mobileMenuActive === true) { + setOverlayMenuActive(true); + } + + setOverlayMenuActive((prevState) => !prevState); + setMobileMenuActive(false); + } + else if (layoutMode === 'static') { + setStaticMenuInactive((prevState) => !prevState); + } + } + else { + setMobileMenuActive((prevState) => !prevState); + } + + event.preventDefault(); +} + +const onSidebarClick = () => { + menuClick = true; +} + +const onMobileTopbarMenuClick = (event) => { + mobileTopbarMenuClick = true; + + setMobileTopbarMenuActive((prevState) => !prevState); + event.preventDefault(); +} + +const onMobileSubTopbarMenuClick = (event) => { + mobileTopbarMenuClick = true; + + event.preventDefault(); +} + +const onMenuItemClick = (event) => { + if (!event.item.items) { + setOverlayMenuActive(false); + setMobileMenuActive(false); + } +} +const isDesktop = () => { + return window.innerWidth >= 992; +} + +const menu = [ + { + label: 'Home', + items: [ + { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, + { label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema' }, + { label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad' }, + { label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad' }, + { label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas' }, + { label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos' }, + { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' }, + { label: 'Log out', icon: 'pi pi-fw pi-id-card', to: '/logOut' } + ] + }, + { + label: 'UI Components', icon: 'pi pi-fw pi-sitemap', + items: [ + { label: 'Form Layout', icon: 'pi pi-fw pi-id-card', to: '/formlayout' }, + { label: 'Input', icon: 'pi pi-fw pi-check-square', to: '/input' }, + { label: "Float Label", icon: "pi pi-fw pi-bookmark", to: "/floatlabel" }, + { label: "Invalid State", icon: "pi pi-fw pi-exclamation-circle", to: "invalidstate" }, + { label: 'Button', icon: 'pi pi-fw pi-mobile', to: '/button' }, + { label: 'Table', icon: 'pi pi-fw pi-table', to: '/table' }, + { label: 'List', icon: 'pi pi-fw pi-list', to: '/list' }, + { label: 'Tree', icon: 'pi pi-fw pi-share-alt', to: '/tree' }, + { label: 'Panel', icon: 'pi pi-fw pi-tablet', to: '/panel' }, + { label: 'Overlay', icon: 'pi pi-fw pi-clone', to: '/overlay' }, + { label: "Media", icon: "pi pi-fw pi-image", to: "/media" }, + { label: 'Menu', icon: 'pi pi-fw pi-bars', to: '/menu' }, + { label: 'Message', icon: 'pi pi-fw pi-comment', to: '/messages' }, + { label: 'File', icon: 'pi pi-fw pi-file', to: '/file' }, + { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', to: '/chart' }, + { label: 'Misc', icon: 'pi pi-fw pi-circle-off', to: '/misc' }, + ] + }, + { + label: 'UI Blocks', + items: [ + { label: 'Free Blocks', icon: 'pi pi-fw pi-eye', to: '/blocks', badge: "NEW" }, + { label: 'All Blocks', icon: 'pi pi-fw pi-globe', url: 'https://www.primefaces.org/primeblocks-react' } + ] + }, + { + label: 'Icons', + items: [ + { label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/icons' } + ] + }, + { + label: 'Pages', icon: 'pi pi-fw pi-clone', + items: [ + { label: 'Crud', icon: 'pi pi-fw pi-user-edit', to: '/crud' }, + { label: 'Timeline', icon: 'pi pi-fw pi-calendar', to: '/timeline' }, + { label: 'Empty', icon: 'pi pi-fw pi-circle-off', to: '/empty' } + ] + }, + { + label: 'Menu Hierarchy', icon: 'pi pi-fw pi-search', + items: [ + { + label: 'Submenu 1', icon: 'pi pi-fw pi-bookmark', + items: [ + { + label: 'Submenu 1.1', icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 1.1.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.1.2', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.1.3', icon: 'pi pi-fw pi-bookmark' }, + ] + }, + { + label: 'Submenu 1.2', icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 1.2.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.2.2', icon: 'pi pi-fw pi-bookmark' } + ] + }, + ] + }, + { + label: 'Submenu 2', icon: 'pi pi-fw pi-bookmark', + items: [ + { + label: 'Submenu 2.1', icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 2.1.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.1.2', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.1.3', icon: 'pi pi-fw pi-bookmark' }, + ] + }, + { + label: 'Submenu 2.2', icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 2.2.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.2.2', icon: 'pi pi-fw pi-bookmark' } + ] + } + ] + } + ] + } +]; + +const addClass = (element, className) => { + if (element.classList) + element.classList.add(className); + else + element.className += ' ' + className; +} + +const removeClass = (element, className) => { + if (element.classList) + element.classList.remove(className); + else + element.className = element.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' '); +} + +const wrapperClass = classNames('layout-wrapper', { + 'layout-overlay': layoutMode === 'overlay', + 'layout-static': layoutMode === 'static', + 'layout-static-sidebar-inactive': staticMenuInactive && layoutMode === 'static', + 'layout-overlay-sidebar-active': overlayMenuActive && layoutMode === 'overlay', + 'layout-mobile-sidebar-active': mobileMenuActive, + 'p-input-filled': inputStyle === 'filled', + 'p-ripple-disabled': ripple === false, + 'layout-theme-light': layoutColorMode === 'light' +}); + +class Menu extends Component { + cerrarSesion=()=>{ + cookies.remove('id', {path: "/"}); + cookies.remove('email', {path: "/"}); + cookies.remove('name', {path: "/"}); + window.location.href='/'; + } + + componentDidMount() { + if(!cookies.get('email')){ + window.location.href="./app"; + } + } + + render() { + console.log('id: '+ cookies.get('id')); + console.log('name: '+cookies.get('name')); + console.log('email: '+cookies.get('email')); + return ( +
+ Menu Principal +
+
+ + + + + +
+ +
+
+ +
+ ); + } +} + +export default Menu; \ No newline at end of file diff --git a/web-ui/web-react/src/index.js b/web-ui/web-react/src/index.js index 991c96b9..3e9cb72d 100644 --- a/web-ui/web-react/src/index.js +++ b/web-ui/web-react/src/index.js @@ -3,14 +3,16 @@ import React from 'react'; import ReactDOM from 'react-dom'; import App from './App'; //import * as serviceWorker from './serviceWorker'; -import { HashRouter } from 'react-router-dom' +import { HashRouter, Route } from 'react-router-dom' import ScrollToTop from './ScrollToTop'; +import Routes from './routes/Routes'; + + ReactDOM.render( - - + , document.getElementById('root') diff --git a/web-ui/web-react/src/pages/Menu.js b/web-ui/web-react/src/pages/Menu.js index 379eb986..ba8b834b 100644 --- a/web-ui/web-react/src/pages/Menu.js +++ b/web-ui/web-react/src/pages/Menu.js @@ -6,8 +6,8 @@ const cookies = new Cookies(); class Menu extends Component { cerrarSesion=()=>{ cookies.remove('id', {path: "/"}); - cookies.remove('name', {path: "/"}); cookies.remove('email', {path: "/"}); + cookies.remove('name', {path: "/"}); window.location.href='/'; } diff --git a/web-ui/web-react/src/routes/Routes.js b/web-ui/web-react/src/routes/Routes.js index a9d8860a..90d842a9 100644 --- a/web-ui/web-react/src/routes/Routes.js +++ b/web-ui/web-react/src/routes/Routes.js @@ -1,9 +1,11 @@ import React from 'react'; import {BrowserRouter, Switch, Route} from 'react-router-dom'; +import App from '../App'; import LoginLocalStorage from '../components/LoginLocalStorage'; import Menu from '../pages/Menu'; - function Routes() { + + return ( From e56665ff79ef37c38730cfc3e610f075df1f8823 Mon Sep 17 00:00:00 2001 From: Mariela Date: Tue, 9 Aug 2022 14:29:32 -0600 Subject: [PATCH 06/16] cambios de rutas --- .../src/components/LoginLocalStorage.js | 4 +- web-ui/web-react/src/components/MenuAdmin.js | 310 +++--------------- web-ui/web-react/src/pages/Menu.js | 2 +- web-ui/web-react/src/routes/Routes.js | 5 +- 4 files changed, 47 insertions(+), 274 deletions(-) diff --git a/web-ui/web-react/src/components/LoginLocalStorage.js b/web-ui/web-react/src/components/LoginLocalStorage.js index 6f01c4bc..5e19537d 100644 --- a/web-ui/web-react/src/components/LoginLocalStorage.js +++ b/web-ui/web-react/src/components/LoginLocalStorage.js @@ -53,7 +53,7 @@ class LoginLocalStorage extends Component { cookies.set('name', user.name, { path: "/" }); cookies.set('email', user.email, { path: "/" }); alert(`Bienvenido ${user.name}`); - window.location.href = "./menu"; + window.location.href = "./"; } else { alert('El usuario o la contraseña no son correctos'); } @@ -68,7 +68,7 @@ class LoginLocalStorage extends Component { componentDidMount() { if (cookies.get('email')) { - window.location.href = "./menu"; + window.location.href = "./"; } } diff --git a/web-ui/web-react/src/components/MenuAdmin.js b/web-ui/web-react/src/components/MenuAdmin.js index 5cca9efe..8c429942 100644 --- a/web-ui/web-react/src/components/MenuAdmin.js +++ b/web-ui/web-react/src/components/MenuAdmin.js @@ -1,143 +1,12 @@ import React, { Component } from 'react'; import Cookies from 'universal-cookie'; -import AdministradoresComunidad from './AdministradoresComunidad'; -import AdministradoresSistema from './AdministradoresSistema'; -import Communities from './components/ComunidadViviendas'; +import AdministradoresComunidad from '../components/AdministradoresComunidad'; +import AdministradoresSistema from '../components/AdministradoresSistema'; +import Communities from '../components/ComunidadViviendas'; +import Dashboard from '../templates/Dashboard'; +import { BrowserRouter, Switch, Route } from 'react-router-dom'; +const cookies = new Cookies(); -class MenuAdmin extends Component { - state = { - layoutMode - } - - - -} - -const [layoutMode, setLayoutMode] = useState('static'); -const [layoutColorMode, setLayoutColorMode] = useState('light') -const [inputStyle, setInputStyle] = useState('outlined'); -const [ripple, setRipple] = useState(true); -const [staticMenuInactive, setStaticMenuInactive] = useState(false); -const [overlayMenuActive, setOverlayMenuActive] = useState(false); -const [mobileMenuActive, setMobileMenuActive] = useState(false); -const [mobileTopbarMenuActive, setMobileTopbarMenuActive] = useState(false); -const copyTooltipRef = useRef(); -const location = useLocation(); - -const [cookies, setCookies] = useRef(); - -const handleLogout = () => { - cookies.remove('id', {path: "/"}); - cookies.remove('email', {path: "/"}); - cookies.remove('name', {path: "/"}); - window.location.href='/'; -} - -useEffect(() => { - if(!cookies.get('email')){ - window.location.href="./"; - } -}, []) - - - -PrimeReact.ripple = true; - -let menuClick = false; -let mobileTopbarMenuClick = false; - -useEffect(() => { - if (mobileMenuActive) { - addClass(document.body, "body-overflow-hidden"); - } else { - removeClass(document.body, "body-overflow-hidden"); - } -}, [mobileMenuActive]); - -useEffect(() => { - copyTooltipRef && copyTooltipRef.current && copyTooltipRef.current.updateTargetEvents(); -}, [location]); - -const onInputStyleChange = (inputStyle) => { - setInputStyle(inputStyle); -} - -const onRipple = (e) => { - PrimeReact.ripple = e.value; - setRipple(e.value) -} - -const onLayoutModeChange = (mode) => { - setLayoutMode(mode) -} - -const onColorModeChange = (mode) => { - setLayoutColorMode(mode) -} - -const onWrapperClick = (event) => { - if (!menuClick) { - setOverlayMenuActive(false); - setMobileMenuActive(false); - } - - if (!mobileTopbarMenuClick) { - setMobileTopbarMenuActive(false); - } - - mobileTopbarMenuClick = false; - menuClick = false; -} - -const onToggleMenuClick = (event) => { - menuClick = true; - - if (isDesktop()) { - if (layoutMode === 'overlay') { - if (mobileMenuActive === true) { - setOverlayMenuActive(true); - } - - setOverlayMenuActive((prevState) => !prevState); - setMobileMenuActive(false); - } - else if (layoutMode === 'static') { - setStaticMenuInactive((prevState) => !prevState); - } - } - else { - setMobileMenuActive((prevState) => !prevState); - } - - event.preventDefault(); -} - -const onSidebarClick = () => { - menuClick = true; -} - -const onMobileTopbarMenuClick = (event) => { - mobileTopbarMenuClick = true; - - setMobileTopbarMenuActive((prevState) => !prevState); - event.preventDefault(); -} - -const onMobileSubTopbarMenuClick = (event) => { - mobileTopbarMenuClick = true; - - event.preventDefault(); -} - -const onMenuItemClick = (event) => { - if (!event.item.items) { - setOverlayMenuActive(false); - setMobileMenuActive(false); - } -} -const isDesktop = () => { - return window.innerWidth >= 992; -} const menu = [ { @@ -146,163 +15,66 @@ const menu = [ { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, { label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema' }, { label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad' }, - { label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad' }, { label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas' }, - { label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos' }, - { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' }, { label: 'Log out', icon: 'pi pi-fw pi-id-card', to: '/logOut' } ] }, - { - label: 'UI Components', icon: 'pi pi-fw pi-sitemap', - items: [ - { label: 'Form Layout', icon: 'pi pi-fw pi-id-card', to: '/formlayout' }, - { label: 'Input', icon: 'pi pi-fw pi-check-square', to: '/input' }, - { label: "Float Label", icon: "pi pi-fw pi-bookmark", to: "/floatlabel" }, - { label: "Invalid State", icon: "pi pi-fw pi-exclamation-circle", to: "invalidstate" }, - { label: 'Button', icon: 'pi pi-fw pi-mobile', to: '/button' }, - { label: 'Table', icon: 'pi pi-fw pi-table', to: '/table' }, - { label: 'List', icon: 'pi pi-fw pi-list', to: '/list' }, - { label: 'Tree', icon: 'pi pi-fw pi-share-alt', to: '/tree' }, - { label: 'Panel', icon: 'pi pi-fw pi-tablet', to: '/panel' }, - { label: 'Overlay', icon: 'pi pi-fw pi-clone', to: '/overlay' }, - { label: "Media", icon: "pi pi-fw pi-image", to: "/media" }, - { label: 'Menu', icon: 'pi pi-fw pi-bars', to: '/menu' }, - { label: 'Message', icon: 'pi pi-fw pi-comment', to: '/messages' }, - { label: 'File', icon: 'pi pi-fw pi-file', to: '/file' }, - { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', to: '/chart' }, - { label: 'Misc', icon: 'pi pi-fw pi-circle-off', to: '/misc' }, - ] - }, - { - label: 'UI Blocks', - items: [ - { label: 'Free Blocks', icon: 'pi pi-fw pi-eye', to: '/blocks', badge: "NEW" }, - { label: 'All Blocks', icon: 'pi pi-fw pi-globe', url: 'https://www.primefaces.org/primeblocks-react' } - ] - }, - { - label: 'Icons', - items: [ - { label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/icons' } - ] - }, - { - label: 'Pages', icon: 'pi pi-fw pi-clone', - items: [ - { label: 'Crud', icon: 'pi pi-fw pi-user-edit', to: '/crud' }, - { label: 'Timeline', icon: 'pi pi-fw pi-calendar', to: '/timeline' }, - { label: 'Empty', icon: 'pi pi-fw pi-circle-off', to: '/empty' } - ] - }, - { - label: 'Menu Hierarchy', icon: 'pi pi-fw pi-search', - items: [ - { - label: 'Submenu 1', icon: 'pi pi-fw pi-bookmark', - items: [ - { - label: 'Submenu 1.1', icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 1.1.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.1.2', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.1.3', icon: 'pi pi-fw pi-bookmark' }, - ] - }, - { - label: 'Submenu 1.2', icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 1.2.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.2.2', icon: 'pi pi-fw pi-bookmark' } - ] - }, - ] - }, - { - label: 'Submenu 2', icon: 'pi pi-fw pi-bookmark', - items: [ - { - label: 'Submenu 2.1', icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 2.1.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.1.2', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.1.3', icon: 'pi pi-fw pi-bookmark' }, - ] - }, - { - label: 'Submenu 2.2', icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 2.2.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.2.2', icon: 'pi pi-fw pi-bookmark' } - ] - } - ] - } - ] - } ]; -const addClass = (element, className) => { - if (element.classList) - element.classList.add(className); - else - element.className += ' ' + className; + +const handleLogout = () => { + cookies.remove('id', { path: "/" }); + cookies.remove('email', { path: "/" }); + cookies.remove('name', { path: "/" }); + window.location.href = '/'; } -const removeClass = (element, className) => { - if (element.classList) - element.classList.remove(className); - else - element.className = element.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' '); -} +class MenuAdmin extends Component { -const wrapperClass = classNames('layout-wrapper', { - 'layout-overlay': layoutMode === 'overlay', - 'layout-static': layoutMode === 'static', - 'layout-static-sidebar-inactive': staticMenuInactive && layoutMode === 'static', - 'layout-overlay-sidebar-active': overlayMenuActive && layoutMode === 'overlay', - 'layout-mobile-sidebar-active': mobileMenuActive, - 'p-input-filled': inputStyle === 'filled', - 'p-ripple-disabled': ripple === false, - 'layout-theme-light': layoutColorMode === 'light' -}); + state = { + layoutColorMode: 'light', + layoutMode: 'static', -class Menu extends Component { - cerrarSesion=()=>{ - cookies.remove('id', {path: "/"}); - cookies.remove('email', {path: "/"}); - cookies.remove('name', {path: "/"}); - window.location.href='/'; + } + + + cerrarSesion = () => { + cookies.remove('id', { path: "/" }); + cookies.remove('email', { path: "/" }); + cookies.remove('name', { path: "/" }); + window.location.href = '/'; } componentDidMount() { - if(!cookies.get('email')){ - window.location.href="./app"; + if (!cookies.get('email')) { + window.location.href = "./"; } } render() { - console.log('id: '+ cookies.get('id')); - console.log('name: '+cookies.get('name')); - console.log('email: '+cookies.get('email')); + return (
Menu Principal -
-
- - - - - -
+
+ +
+
+
+ } /> + + + +
+ +

- +
); } } -export default Menu; \ No newline at end of file +export default MenuAdmin; \ No newline at end of file diff --git a/web-ui/web-react/src/pages/Menu.js b/web-ui/web-react/src/pages/Menu.js index ba8b834b..f06ce0ad 100644 --- a/web-ui/web-react/src/pages/Menu.js +++ b/web-ui/web-react/src/pages/Menu.js @@ -8,7 +8,7 @@ class Menu extends Component { cookies.remove('id', {path: "/"}); cookies.remove('email', {path: "/"}); cookies.remove('name', {path: "/"}); - window.location.href='/'; + window.location.href='/login'; } componentDidMount() { diff --git a/web-ui/web-react/src/routes/Routes.js b/web-ui/web-react/src/routes/Routes.js index 90d842a9..9af9a965 100644 --- a/web-ui/web-react/src/routes/Routes.js +++ b/web-ui/web-react/src/routes/Routes.js @@ -2,6 +2,7 @@ import React from 'react'; import {BrowserRouter, Switch, Route} from 'react-router-dom'; import App from '../App'; import LoginLocalStorage from '../components/LoginLocalStorage'; +import MenuAdmin from '../components/MenuAdmin'; import Menu from '../pages/Menu'; function Routes() { @@ -9,8 +10,8 @@ function Routes() { return ( - - + + ); From ec0d604e34a151b6433531a0d2e34efb3f976db2 Mon Sep 17 00:00:00 2001 From: Maria Sanchez Date: Tue, 9 Aug 2022 16:03:48 -0600 Subject: [PATCH 07/16] insert react navigation and home component --- mobile-ui/App.js | 123 +---- mobile-ui/components/Home.js | 38 +- mobile-ui/components/LogIn.js | 88 ++++ mobile-ui/components/RecoverPassword.js | 13 + mobile-ui/package-lock.json | 592 ++++++++++++++++++++++++ mobile-ui/package.json | 7 + 6 files changed, 738 insertions(+), 123 deletions(-) create mode 100644 mobile-ui/components/LogIn.js create mode 100644 mobile-ui/components/RecoverPassword.js diff --git a/mobile-ui/App.js b/mobile-ui/App.js index 169933a1..9f43ccee 100644 --- a/mobile-ui/App.js +++ b/mobile-ui/App.js @@ -1,120 +1,27 @@ import React from "react"; import { - Text, - Link, - HStack, - Center, - Heading, - Switch, - useColorMode, - NativeBaseProvider, - extendTheme, - VStack, - Box, - FormControl, - Input, - Button, - Image + NativeBaseProvider } from "native-base"; -import NativeBaseIcon from "./components/NativeBaseIcon"; -import { Platform } from "react-native"; -import logo from "./assets/logo-katoikia.png" - -// Define the config -const config = { - useSystemColorMode: false, - initialColorMode: "dark", -}; - -// extend the theme -export const theme = extendTheme({ config, -colors: { - brown: "#D7A86E" -} }); - -// const logo = require('./assets/logo-katoikia.png') +import { NavigationContainer } from '@react-navigation/native'; +import { createNativeStackNavigator } from '@react-navigation/native-stack'; +import LogIn from "./components/LogIn"; +import Home from "./components/Home"; +import RecoverPassword from "./components/RecoverPassword"; +const Stack = createNativeStackNavigator(); export default function App() { return ( -
- - Katoikia logo - - Bienvenido a Katoikia - - - Su app de comunidad de confianza - - - - - Correo Electrónico - - - - Contraseña - - - Recuperar contraseña - - - - - - - -
+ + + + + + + ); -} - -// Color Switch Component -function ToggleDarkMode() { - const { colorMode, toggleColorMode } = useColorMode(); - return ( - - Dark - - Light - - ); -} +} \ No newline at end of file diff --git a/mobile-ui/components/Home.js b/mobile-ui/components/Home.js index cce81831..04070bb0 100644 --- a/mobile-ui/components/Home.js +++ b/mobile-ui/components/Home.js @@ -1,28 +1,36 @@ import React from "react"; import { Text, - Link, HStack, - Center, - Heading, - Switch, - useColorMode, NativeBaseProvider, - extendTheme, - VStack, + IconButton, Box, - FormControl, - Input, - Button, - Image + StatusBar, + Icon, + MaterialIcons, + Center } from "native-base"; export default function Home(){ return ( - - - - +
+ + + + + } /> + + Home + + + + } /> + } /> + } /> + + +
+ ) } \ No newline at end of file diff --git a/mobile-ui/components/LogIn.js b/mobile-ui/components/LogIn.js new file mode 100644 index 00000000..ed542d83 --- /dev/null +++ b/mobile-ui/components/LogIn.js @@ -0,0 +1,88 @@ +import React from "react"; +import { + Text, + Link, + HStack, + Center, + Heading, + Switch, + useColorMode, + NativeBaseProvider, + extendTheme, + VStack, + Box, + FormControl, + Input, + Button, + Image +} from "native-base"; +import logo from "../assets/logo-katoikia.png"; + + +export default function LogIn({navigation}) { + return ( + + +
+ + Katoikia logo + + + Bienvenido a Katoikia + + + Su app de comunidad de confianza + + + + + Correo Electrónico + + + + Contraseña + + navigation.navigate('Password')} + > + Recuperar contraseña + + + + + + + +
+ + + ); +} \ No newline at end of file diff --git a/mobile-ui/components/RecoverPassword.js b/mobile-ui/components/RecoverPassword.js new file mode 100644 index 00000000..62dce460 --- /dev/null +++ b/mobile-ui/components/RecoverPassword.js @@ -0,0 +1,13 @@ +import { Center } from "native-base"; +import React from "react"; + +export default function RecoverPassword () { + +return ( + +
+ + +
+) +} \ No newline at end of file diff --git a/mobile-ui/package-lock.json b/mobile-ui/package-lock.json index 51face23..860e1166 100644 --- a/mobile-ui/package-lock.json +++ b/mobile-ui/package-lock.json @@ -9,13 +9,20 @@ "version": "1.0.0", "license": "MIT", "dependencies": { + "@react-native-community/masked-view": "^0.1.11", + "@react-navigation/native": "^6.0.11", + "@react-navigation/native-stack": "^6.7.0", + "@react-navigation/stack": "^6.2.2", "expo": "^44.0.0", "expo-status-bar": "~1.2.0", "native-base": "3.4.0", "react": "17.0.1", "react-dom": "17.0.1", "react-native": "0.64.3", + "react-native-gesture-handler": "~2.1.0", + "react-native-reanimated": "~2.3.1", "react-native-safe-area-context": "3.3.2", + "react-native-screens": "~3.10.1", "react-native-svg": "12.1.1", "react-native-web": "0.17.1" }, @@ -1810,6 +1817,17 @@ "node": ">=0.1.95" } }, + "node_modules/@egjs/hammerjs": { + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz", + "integrity": "sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==", + "dependencies": { + "@types/hammerjs": "^2.0.36" + }, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/@expo/config": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/@expo/config/-/config-6.0.6.tgz", @@ -3490,6 +3508,16 @@ "node": ">= 4.0.0" } }, + "node_modules/@react-native-community/masked-view": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/@react-native-community/masked-view/-/masked-view-0.1.11.tgz", + "integrity": "sha512-rQfMIGSR/1r/SyN87+VD8xHHzDYeHaJq6elOSCAD+0iLagXkSI2pfA0LmSXP21uw5i3em7GkkRjfJ8wpqWXZNw==", + "deprecated": "Repository was moved to @react-native-masked-view/masked-view", + "peerDependencies": { + "react": ">=16.0", + "react-native": ">=0.57" + } + }, "node_modules/@react-native/assets": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@react-native/assets/-/assets-1.0.0.tgz", @@ -3505,6 +3533,116 @@ "resolved": "https://registry.npmjs.org/@react-native/polyfills/-/polyfills-1.0.0.tgz", "integrity": "sha512-0jbp4RxjYopTsIdLl+/Fy2TiwVYHy4mgeu07DG4b/LyM0OS/+lPP5c9sbnt/AMlnF6qz2JRZpPpGw1eMNS6A4w==" }, + "node_modules/@react-navigation/core": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.2.2.tgz", + "integrity": "sha512-gEJ1gRqt1EIqRrnJIpSQ0wWJRue9maAQNKYrlQ0a/LSKErF3g6w+sD2wW4Bbb1yj88pGhKeuI4wdB9MVK766Pg==", + "dependencies": { + "@react-navigation/routers": "^6.1.1", + "escape-string-regexp": "^4.0.0", + "nanoid": "^3.1.23", + "query-string": "^7.0.0", + "react-is": "^16.13.0" + }, + "peerDependencies": { + "react": "*" + } + }, + "node_modules/@react-navigation/core/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@react-navigation/core/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, + "node_modules/@react-navigation/elements": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.4.tgz", + "integrity": "sha512-O0jICpjn3jskVo4yiWzZozmj7DZy1ZBbn3O7dbenuUjZSj/cscjwaapmZZFGcI/IMmjmx8UTKsybhCFEIbGf3g==", + "peerDependencies": { + "@react-navigation/native": "^6.0.0", + "react": "*", + "react-native": "*", + "react-native-safe-area-context": ">= 3.0.0" + } + }, + "node_modules/@react-navigation/native": { + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.11.tgz", + "integrity": "sha512-z0YTB7Czdb9SNjxfzcFNB3Vym0qmUcxpiYGOOXX8PH0s+xlIs/w+2RVp6YAvAC48A30o7MMCYqy5OeR6lrtWHg==", + "dependencies": { + "@react-navigation/core": "^6.2.2", + "escape-string-regexp": "^4.0.0", + "fast-deep-equal": "^3.1.3", + "nanoid": "^3.1.23" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, + "node_modules/@react-navigation/native-stack": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.7.0.tgz", + "integrity": "sha512-03CuSwbBvP9+iXgjrTRRw+aog+KZXbhPzqCWVExzIWNOzf5/PJEcdtlm9KDrx2aHHDtDA6LRLKQA4UIlJOmNzA==", + "dependencies": { + "@react-navigation/elements": "^1.3.4", + "warn-once": "^0.1.0" + }, + "peerDependencies": { + "@react-navigation/native": "^6.0.0", + "react": "*", + "react-native": "*", + "react-native-safe-area-context": ">= 3.0.0", + "react-native-screens": ">= 3.0.0" + } + }, + "node_modules/@react-navigation/native/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@react-navigation/routers": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.1.tgz", + "integrity": "sha512-mWWj2yh4na/OBaE7bWrft4kdAtxnG8MlV6ph3Bi6tHqgcnxENX+dnQY6y0qg/6E7cmMlaJg5nAC5y4Enr5ir8A==", + "dependencies": { + "nanoid": "^3.1.23" + } + }, + "node_modules/@react-navigation/stack": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.2.2.tgz", + "integrity": "sha512-P9ZfmluOXNmbs7YdG1UWS1fAh87Yse9aX8TgqOz4FlHEm5q7g5eaM35QgWByt+wif3UiqE40D8wXpqRQvMgPWg==", + "dependencies": { + "@react-navigation/elements": "^1.3.4", + "color": "^4.2.3", + "warn-once": "^0.1.0" + }, + "peerDependencies": { + "@react-navigation/native": "^6.0.0", + "react": "*", + "react-native": "*", + "react-native-gesture-handler": ">= 1.0.0", + "react-native-safe-area-context": ">= 3.0.0", + "react-native-screens": ">= 3.0.0" + } + }, "node_modules/@react-stately/checkbox": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/@react-stately/checkbox/-/checkbox-3.2.0.tgz", @@ -3947,6 +4085,16 @@ "@types/node": "*" } }, + "node_modules/@types/hammerjs": { + "version": "2.0.41", + "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz", + "integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA==" + }, + "node_modules/@types/invariant": { + "version": "2.2.35", + "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.35.tgz", + "integrity": "sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg==" + }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -4843,6 +4991,18 @@ "node": ">=0.10.0" } }, + "node_modules/color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "dependencies": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "engines": { + "node": ">=12.5.0" + } + }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -4856,6 +5016,31 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "node_modules/color/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "node_modules/colorette": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", @@ -5860,6 +6045,11 @@ "node": ">=0.10.0" } }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, "node_modules/fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", @@ -5929,6 +6119,14 @@ "node": ">=8" } }, + "node_modules/filter-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", + "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", @@ -6306,6 +6504,19 @@ "node": ">=8" } }, + "node_modules/hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "dependencies": { + "react-is": "^16.7.0" + } + }, + "node_modules/hoist-non-react-statics/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -7960,6 +8171,11 @@ "mkdirp": "bin/cmd.js" } }, + "node_modules/mockdate": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz", + "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==" + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -7975,6 +8191,17 @@ "thenify-all": "^1.0.0" } }, + "node_modules/nanoid": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -8749,6 +8976,23 @@ "once": "^1.3.1" } }, + "node_modules/query-string": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz", + "integrity": "sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==", + "dependencies": { + "decode-uri-component": "^0.2.0", + "filter-obj": "^1.1.0", + "split-on-first": "^1.0.0", + "strict-uri-encode": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/querystringify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", @@ -8835,6 +9079,17 @@ "react": "17.0.1" } }, + "node_modules/react-freeze": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.3.tgz", + "integrity": "sha512-ZnXwLQnGzrDpHBHiC56TXFXvmolPeMjTn1UOm610M4EXGzbEDR7oOIyS2ZiItgbs6eZc4oU/a0hpk8PrcKvv5g==", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "react": ">=17.0.0" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -8898,6 +9153,18 @@ "nullthrows": "^1.1.1" } }, + "node_modules/react-native-gesture-handler": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.1.3.tgz", + "integrity": "sha512-y5W2MVB+J6vjIT/mUidDv0BqVRbWXn0cP7R2o6fsSYsHh9M0btT979+bCI7nPuhmRHjkhg5xCm4HNMIH0IQO4w==", + "dependencies": { + "@egjs/hammerjs": "^2.0.17", + "hoist-non-react-statics": "^3.3.0", + "invariant": "^2.2.4", + "lodash": "^4.17.21", + "prop-types": "^15.7.2" + } + }, "node_modules/react-native-iphone-x-helper": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", @@ -8918,6 +9185,25 @@ "react-native": ">=0.48.4" } }, + "node_modules/react-native-reanimated": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.3.3.tgz", + "integrity": "sha512-uQofwsWUoKLY4QDgSdNbRxnqQDaQEPLLBNO9SP64JfQ2fDRJD5rjb4d3S29F0z9FqTnsWEwTL2Sl0spdx9xvHA==", + "dependencies": { + "@babel/plugin-transform-object-assign": "^7.10.4", + "@types/invariant": "^2.2.35", + "invariant": "^2.2.4", + "lodash.isequal": "^4.5.0", + "mockdate": "^3.0.2", + "react-native-screens": "^3.4.0", + "string-hash-64": "^1.0.3" + }, + "peerDependencies": { + "react": "*", + "react-native": "*", + "react-native-gesture-handler": "*" + } + }, "node_modules/react-native-safe-area-context": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz", @@ -8927,6 +9213,19 @@ "react-native": "*" } }, + "node_modules/react-native-screens": { + "version": "3.10.2", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.10.2.tgz", + "integrity": "sha512-bMKSpwMeqAoXBqTJiDEG1ogM1cMk66sEmpp/4dGqdX59v+OwMqPeTuBk37qaSuS7gPOFFKsNW2X3ymGvBT4iEw==", + "dependencies": { + "react-freeze": "^1.0.0", + "warn-once": "^0.1.0" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/react-native-svg": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-12.1.1.tgz", @@ -9690,6 +9989,19 @@ "plist": "^3.0.5" } }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/simple-swizzle/node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -9948,6 +10260,14 @@ "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", "deprecated": "See https://github.com/lydell/source-map-url#deprecated" }, + "node_modules/split-on-first": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", + "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==", + "engines": { + "node": ">=6" + } + }, "node_modules/split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -10089,6 +10409,14 @@ "node": ">= 0.10.0" } }, + "node_modules/strict-uri-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==", + "engines": { + "node": ">=4" + } + }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -10097,6 +10425,11 @@ "safe-buffer": "~5.1.0" } }, + "node_modules/string-hash-64": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz", + "integrity": "sha512-D5OKWKvDhyVWWn2x5Y9b+37NUllks34q1dCDhk/vYcso9fmhs+Tl3KR/gE4v5UNj2UA35cnX4KdVVGkG1deKqw==" + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -10643,6 +10976,11 @@ "makeerror": "1.0.12" } }, + "node_modules/warn-once": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.1.tgz", + "integrity": "sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q==" + }, "node_modules/wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", @@ -12132,6 +12470,14 @@ "minimist": "^1.2.0" } }, + "@egjs/hammerjs": { + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz", + "integrity": "sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==", + "requires": { + "@types/hammerjs": "^2.0.36" + } + }, "@expo/config": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/@expo/config/-/config-6.0.6.tgz", @@ -13485,6 +13831,12 @@ "ora": "^3.4.0" } }, + "@react-native-community/masked-view": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/@react-native-community/masked-view/-/masked-view-0.1.11.tgz", + "integrity": "sha512-rQfMIGSR/1r/SyN87+VD8xHHzDYeHaJq6elOSCAD+0iLagXkSI2pfA0LmSXP21uw5i3em7GkkRjfJ8wpqWXZNw==", + "requires": {} + }, "@react-native/assets": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@react-native/assets/-/assets-1.0.0.tgz", @@ -13500,6 +13852,81 @@ "resolved": "https://registry.npmjs.org/@react-native/polyfills/-/polyfills-1.0.0.tgz", "integrity": "sha512-0jbp4RxjYopTsIdLl+/Fy2TiwVYHy4mgeu07DG4b/LyM0OS/+lPP5c9sbnt/AMlnF6qz2JRZpPpGw1eMNS6A4w==" }, + "@react-navigation/core": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.2.2.tgz", + "integrity": "sha512-gEJ1gRqt1EIqRrnJIpSQ0wWJRue9maAQNKYrlQ0a/LSKErF3g6w+sD2wW4Bbb1yj88pGhKeuI4wdB9MVK766Pg==", + "requires": { + "@react-navigation/routers": "^6.1.1", + "escape-string-regexp": "^4.0.0", + "nanoid": "^3.1.23", + "query-string": "^7.0.0", + "react-is": "^16.13.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + } + } + }, + "@react-navigation/elements": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.4.tgz", + "integrity": "sha512-O0jICpjn3jskVo4yiWzZozmj7DZy1ZBbn3O7dbenuUjZSj/cscjwaapmZZFGcI/IMmjmx8UTKsybhCFEIbGf3g==", + "requires": {} + }, + "@react-navigation/native": { + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.11.tgz", + "integrity": "sha512-z0YTB7Czdb9SNjxfzcFNB3Vym0qmUcxpiYGOOXX8PH0s+xlIs/w+2RVp6YAvAC48A30o7MMCYqy5OeR6lrtWHg==", + "requires": { + "@react-navigation/core": "^6.2.2", + "escape-string-regexp": "^4.0.0", + "fast-deep-equal": "^3.1.3", + "nanoid": "^3.1.23" + }, + "dependencies": { + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + } + } + }, + "@react-navigation/native-stack": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.7.0.tgz", + "integrity": "sha512-03CuSwbBvP9+iXgjrTRRw+aog+KZXbhPzqCWVExzIWNOzf5/PJEcdtlm9KDrx2aHHDtDA6LRLKQA4UIlJOmNzA==", + "requires": { + "@react-navigation/elements": "^1.3.4", + "warn-once": "^0.1.0" + } + }, + "@react-navigation/routers": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.1.tgz", + "integrity": "sha512-mWWj2yh4na/OBaE7bWrft4kdAtxnG8MlV6ph3Bi6tHqgcnxENX+dnQY6y0qg/6E7cmMlaJg5nAC5y4Enr5ir8A==", + "requires": { + "nanoid": "^3.1.23" + } + }, + "@react-navigation/stack": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.2.2.tgz", + "integrity": "sha512-P9ZfmluOXNmbs7YdG1UWS1fAh87Yse9aX8TgqOz4FlHEm5q7g5eaM35QgWByt+wif3UiqE40D8wXpqRQvMgPWg==", + "requires": { + "@react-navigation/elements": "^1.3.4", + "color": "^4.2.3", + "warn-once": "^0.1.0" + } + }, "@react-stately/checkbox": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/@react-stately/checkbox/-/checkbox-3.2.0.tgz", @@ -13846,6 +14273,16 @@ "@types/node": "*" } }, + "@types/hammerjs": { + "version": "2.0.41", + "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz", + "integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA==" + }, + "@types/invariant": { + "version": "2.2.35", + "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.35.tgz", + "integrity": "sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg==" + }, "@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -14551,6 +14988,30 @@ "object-visit": "^1.0.0" } }, + "color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "requires": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "dependencies": { + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + } + } + }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -14564,6 +15025,15 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, + "color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "requires": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "colorette": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", @@ -15360,6 +15830,11 @@ } } }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, "fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", @@ -15423,6 +15898,11 @@ "to-regex-range": "^5.0.1" } }, + "filter-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", + "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==" + }, "finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", @@ -15704,6 +16184,21 @@ "source-map": "^0.7.3" } }, + "hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "requires": { + "react-is": "^16.7.0" + }, + "dependencies": { + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + } + } + }, "http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -17044,6 +17539,11 @@ "minimist": "^1.2.6" } }, + "mockdate": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz", + "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==" + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -17059,6 +17559,11 @@ "thenify-all": "^1.0.0" } }, + "nanoid": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -17645,6 +18150,17 @@ "once": "^1.3.1" } }, + "query-string": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz", + "integrity": "sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==", + "requires": { + "decode-uri-component": "^0.2.0", + "filter-obj": "^1.1.0", + "split-on-first": "^1.0.0", + "strict-uri-encode": "^2.0.0" + } + }, "querystringify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", @@ -17696,6 +18212,12 @@ "scheduler": "^0.20.1" } }, + "react-freeze": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.3.tgz", + "integrity": "sha512-ZnXwLQnGzrDpHBHiC56TXFXvmolPeMjTn1UOm610M4EXGzbEDR7oOIyS2ZiItgbs6eZc4oU/a0hpk8PrcKvv5g==", + "requires": {} + }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -17765,6 +18287,18 @@ "nullthrows": "^1.1.1" } }, + "react-native-gesture-handler": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.1.3.tgz", + "integrity": "sha512-y5W2MVB+J6vjIT/mUidDv0BqVRbWXn0cP7R2o6fsSYsHh9M0btT979+bCI7nPuhmRHjkhg5xCm4HNMIH0IQO4w==", + "requires": { + "@egjs/hammerjs": "^2.0.17", + "hoist-non-react-statics": "^3.3.0", + "invariant": "^2.2.4", + "lodash": "^4.17.21", + "prop-types": "^15.7.2" + } + }, "react-native-iphone-x-helper": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", @@ -17780,12 +18314,35 @@ "react-native-iphone-x-helper": "^1.0.3" } }, + "react-native-reanimated": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.3.3.tgz", + "integrity": "sha512-uQofwsWUoKLY4QDgSdNbRxnqQDaQEPLLBNO9SP64JfQ2fDRJD5rjb4d3S29F0z9FqTnsWEwTL2Sl0spdx9xvHA==", + "requires": { + "@babel/plugin-transform-object-assign": "^7.10.4", + "@types/invariant": "^2.2.35", + "invariant": "^2.2.4", + "lodash.isequal": "^4.5.0", + "mockdate": "^3.0.2", + "react-native-screens": "^3.4.0", + "string-hash-64": "^1.0.3" + } + }, "react-native-safe-area-context": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz", "integrity": "sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q==", "requires": {} }, + "react-native-screens": { + "version": "3.10.2", + "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.10.2.tgz", + "integrity": "sha512-bMKSpwMeqAoXBqTJiDEG1ogM1cMk66sEmpp/4dGqdX59v+OwMqPeTuBk37qaSuS7gPOFFKsNW2X3ymGvBT4iEw==", + "requires": { + "react-freeze": "^1.0.0", + "warn-once": "^0.1.0" + } + }, "react-native-svg": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-12.1.1.tgz", @@ -18384,6 +18941,21 @@ "plist": "^3.0.5" } }, + "simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "requires": { + "is-arrayish": "^0.3.1" + }, + "dependencies": { + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + } + } + }, "sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -18592,6 +19164,11 @@ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, + "split-on-first": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", + "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==" + }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -18703,6 +19280,11 @@ "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz", "integrity": "sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==" }, + "strict-uri-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==" + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -18711,6 +19293,11 @@ "safe-buffer": "~5.1.0" } }, + "string-hash-64": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz", + "integrity": "sha512-D5OKWKvDhyVWWn2x5Y9b+37NUllks34q1dCDhk/vYcso9fmhs+Tl3KR/gE4v5UNj2UA35cnX4KdVVGkG1deKqw==" + }, "string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -19111,6 +19698,11 @@ "makeerror": "1.0.12" } }, + "warn-once": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.1.tgz", + "integrity": "sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q==" + }, "wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", diff --git a/mobile-ui/package.json b/mobile-ui/package.json index beda4bbf..7b717cc6 100644 --- a/mobile-ui/package.json +++ b/mobile-ui/package.json @@ -17,13 +17,20 @@ "eject": "expo eject" }, "dependencies": { + "@react-native-community/masked-view": "^0.1.11", + "@react-navigation/native": "^6.0.11", + "@react-navigation/native-stack": "^6.7.0", + "@react-navigation/stack": "^6.2.2", "expo": "^44.0.0", "expo-status-bar": "~1.2.0", "native-base": "3.4.0", "react": "17.0.1", "react-dom": "17.0.1", "react-native": "0.64.3", + "react-native-gesture-handler": "~2.1.0", + "react-native-reanimated": "~2.3.1", "react-native-safe-area-context": "3.3.2", + "react-native-screens": "~3.10.1", "react-native-svg": "12.1.1", "react-native-web": "0.17.1" }, From e059363d53f4c5f832a2e715b9ef027a90a947be Mon Sep 17 00:00:00 2001 From: Mariela Date: Tue, 9 Aug 2022 17:04:40 -0600 Subject: [PATCH 08/16] =?UTF-8?q?segunda=20forma=20de=20inicio=20de=20sesi?= =?UTF-8?q?=C3=B3n,=20realizad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/LoginLocalStorage.js | 6 +- web-ui/web-react/src/components/MenuAdmin.js | 57 ++++++++++++------- web-ui/web-react/src/pages/Menu.js | 2 +- web-ui/web-react/src/routes/Routes.js | 2 +- 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/web-ui/web-react/src/components/LoginLocalStorage.js b/web-ui/web-react/src/components/LoginLocalStorage.js index 5e19537d..2fe0332f 100644 --- a/web-ui/web-react/src/components/LoginLocalStorage.js +++ b/web-ui/web-react/src/components/LoginLocalStorage.js @@ -53,7 +53,7 @@ class LoginLocalStorage extends Component { cookies.set('name', user.name, { path: "/" }); cookies.set('email', user.email, { path: "/" }); alert(`Bienvenido ${user.name}`); - window.location.href = "./"; + window.location.href = "/"; } else { alert('El usuario o la contraseña no son correctos'); } @@ -68,7 +68,7 @@ class LoginLocalStorage extends Component { componentDidMount() { if (cookies.get('email')) { - window.location.href = "./"; + window.location.href = "/"; } } @@ -106,7 +106,7 @@ class LoginLocalStorage extends Component {
{ - cookies.remove('id', { path: "/" }); - cookies.remove('email', { path: "/" }); - cookies.remove('name', { path: "/" }); - window.location.href = '/'; -} - class MenuAdmin extends Component { - state = { - layoutColorMode: 'light', - layoutMode: 'static', + constructor(){ + super() + this.state = { + layoutColorMode: 'light', + layoutMode: 'static', + menuClick: false, + mobileTopbarMenuClick: false, + overlayMenuActive: false, + mobileMenuActive: false + } + + } + + onSidebarClick = () => { + this.setState({ + menuClick: true + }) } + onMenuItemClick = (event) => { + if (!event.item.items) { + this.state.overlayMenuActive = false; + this.state.mobileMenuActive = false; + this.setState({ + overlayMenuActive: true, + mobileMenuActive:false + }) + + } + } cerrarSesion = () => { cookies.remove('id', { path: "/" }); cookies.remove('email', { path: "/" }); cookies.remove('name', { path: "/" }); - window.location.href = '/'; + window.location.href = '/login'; } componentDidMount() { if (!cookies.get('email')) { - window.location.href = "./"; - } + window.location.href = "/login"; + } } render() { @@ -56,8 +73,10 @@ class MenuAdmin extends Component { return (
Menu Principal -
- +
+ + +
@@ -66,12 +85,10 @@ class MenuAdmin extends Component { -

-
); } diff --git a/web-ui/web-react/src/pages/Menu.js b/web-ui/web-react/src/pages/Menu.js index f06ce0ad..88758bdf 100644 --- a/web-ui/web-react/src/pages/Menu.js +++ b/web-ui/web-react/src/pages/Menu.js @@ -13,7 +13,7 @@ class Menu extends Component { componentDidMount() { if(!cookies.get('email')){ - window.location.href="./"; + window.location.href="./login"; } } diff --git a/web-ui/web-react/src/routes/Routes.js b/web-ui/web-react/src/routes/Routes.js index 9af9a965..bebacd7b 100644 --- a/web-ui/web-react/src/routes/Routes.js +++ b/web-ui/web-react/src/routes/Routes.js @@ -11,7 +11,7 @@ function Routes() { - + ); From 48f5c58f4a4025a122401581c58ed4ce2b5341fa Mon Sep 17 00:00:00 2001 From: Mariela Date: Thu, 11 Aug 2022 00:55:45 -0600 Subject: [PATCH 09/16] login for user type --- web-ui/web-react/src/App.js | 183 ++++++++++-------- web-ui/web-react/src/AppMenu.js | 5 +- web-ui/web-react/src/AppTopbar.js | 13 ++ .../src/components/LoginLocalStorage.js | 4 + web-ui/web-react/src/components/MenuAdmin.js | 5 + .../src/components/MenuAdminCommunity.js | 119 ++++++++++++ web-ui/web-react/src/index.js | 4 +- web-ui/web-react/src/routes/Routes.js | 29 ++- 8 files changed, 273 insertions(+), 89 deletions(-) create mode 100644 web-ui/web-react/src/components/MenuAdminCommunity.js diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js index 349d6c11..b7c804b0 100644 --- a/web-ui/web-react/src/App.js +++ b/web-ui/web-react/src/App.js @@ -1,6 +1,6 @@ import React, { useState, useEffect, useRef } from 'react'; import classNames from 'classnames'; -import { Route, useLocation } from 'react-router-dom'; +import { BrowserRouter, Switch, Route, useLocation } from 'react-router-dom'; import { CSSTransition } from 'react-transition-group'; import { AppTopbar } from './AppTopbar'; @@ -50,6 +50,10 @@ import './assets/demo/Demos.scss'; import './assets/layout/layout.scss'; import './App.scss'; import LogIn from './components/LogIn'; +import { useCookies } from "react-cookie"; +import LoginLocalStorage from './components/LoginLocalStorage'; + + const App = () => { const [layoutMode, setLayoutMode] = useState('static'); @@ -62,8 +66,9 @@ const App = () => { const [mobileTopbarMenuActive, setMobileTopbarMenuActive] = useState(false); const copyTooltipRef = useRef(); const location = useLocation(); + const [cookies, setCookies] = useCookies(); - const handleLogout=()=>{ + const handleLogout = () => { localStorage.clear(); window.location.reload(); } @@ -117,24 +122,6 @@ const App = () => { } const onToggleMenuClick = (event) => { - menuClick = true; - - if (isDesktop()) { - if (layoutMode === 'overlay') { - if (mobileMenuActive === true) { - setOverlayMenuActive(true); - } - - setOverlayMenuActive((prevState) => !prevState); - setMobileMenuActive(false); - } - else if (layoutMode === 'static') { - setStaticMenuInactive((prevState) => !prevState); - } - } - else { - setMobileMenuActive((prevState) => !prevState); - } event.preventDefault(); } @@ -166,18 +153,50 @@ const App = () => { return window.innerWidth >= 992; } + const menu2 = [ + { + label: 'Home', + items: [ + { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, + { label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema' }, + { label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad' }, + { label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas' }, + ] + } + ] + + + const menu3 = [ + { + label: 'Home', + items: [ + { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, + { label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos' }, + { label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad' }, + ] + }, + ] + + function menu4() { + if (cookies.type == '1') { + return menu2; + } else if (cookies.type == '2') { + return menu3; + } + } + const menu = [ { label: 'Home', items: [ - {label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/'}, - {label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema'}, - {label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad'}, - {label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad'}, - {label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas'}, - {label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos'}, - {label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn'}, - {label: 'Log out', icon: 'pi pi-fw pi-id-card', to: '/logOut'} + { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, + { label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema' }, + { label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad' }, + { label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad' }, + { label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas' }, + { label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos' }, + { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' }, + { label: 'Log out', icon: 'pi pi-fw pi-id-card', to: '/logOut' } ] }, { @@ -282,7 +301,6 @@ const App = () => { else element.className = element.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' '); } - const wrapperClass = classNames('layout-wrapper', { 'layout-overlay': layoutMode === 'overlay', 'layout-static': layoutMode === 'static', @@ -295,60 +313,69 @@ const App = () => { }); return ( -
- - + + + -
- -
+
+ -
-
- } /> - - - - - - - - - - - - - - - - - } /> - - - - - - - - - - - - + + +
+ +
+ +
+
+ + } /> + + + + + + + + + + + + + + {/**/} + + + } /> + + + + + + + + + + + + +
+ + +
+ + + + +
+
+ + - -
- - - - -
- -
); } diff --git a/web-ui/web-react/src/AppMenu.js b/web-ui/web-react/src/AppMenu.js index 7ee0e07e..7c81bc73 100644 --- a/web-ui/web-react/src/AppMenu.js +++ b/web-ui/web-react/src/AppMenu.js @@ -109,10 +109,7 @@ export const AppMenu = (props) => { return (
- - primeblocks - +
); } diff --git a/web-ui/web-react/src/AppTopbar.js b/web-ui/web-react/src/AppTopbar.js index 40e350b1..02c59e06 100644 --- a/web-ui/web-react/src/AppTopbar.js +++ b/web-ui/web-react/src/AppTopbar.js @@ -1,9 +1,21 @@ import React from 'react'; import { Link } from 'react-router-dom'; import classNames from 'classnames'; +import Cookies from 'universal-cookie'; + +const cookies = new Cookies(); export const AppTopbar = (props) => { + function cerrarSesion() { + cookies.remove('id', { path: "/" }); + cookies.remove('email', { path: "/" }); + cookies.remove('name', { path: "/" }); + cookies.remove('type', { path: "/" }); + cookies.remove('community_id', { path: "/" }); + window.location.href = '/login'; + } + return (
@@ -37,6 +49,7 @@ export const AppTopbar = (props) => { Profile +
diff --git a/web-ui/web-react/src/components/LoginLocalStorage.js b/web-ui/web-react/src/components/LoginLocalStorage.js index 2fe0332f..4e3fa806 100644 --- a/web-ui/web-react/src/components/LoginLocalStorage.js +++ b/web-ui/web-react/src/components/LoginLocalStorage.js @@ -52,6 +52,10 @@ class LoginLocalStorage extends Component { 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 != '1') { + cookies.set('community_id', user.community_id, { path: "/" }); + } alert(`Bienvenido ${user.name}`); window.location.href = "/"; } else { diff --git a/web-ui/web-react/src/components/MenuAdmin.js b/web-ui/web-react/src/components/MenuAdmin.js index e22ef17d..334ccf04 100644 --- a/web-ui/web-react/src/components/MenuAdmin.js +++ b/web-ui/web-react/src/components/MenuAdmin.js @@ -6,6 +6,7 @@ import Communities from '../components/ComunidadViviendas'; import Dashboard from '../templates/Dashboard'; import { BrowserRouter, Switch, Route } from 'react-router-dom'; import { AppMenu } from '../AppMenu'; +import { CSSTransition } from 'react-transition-group'; const cookies = new Cookies(); @@ -59,6 +60,7 @@ class MenuAdmin extends Component { cookies.remove('id', { path: "/" }); cookies.remove('email', { path: "/" }); cookies.remove('name', { path: "/" }); + cookies.remove('type', { path: "/" }); window.location.href = '/login'; } @@ -89,6 +91,9 @@ class MenuAdmin extends Component {

+ +
+
); } diff --git a/web-ui/web-react/src/components/MenuAdminCommunity.js b/web-ui/web-react/src/components/MenuAdminCommunity.js new file mode 100644 index 00000000..db982561 --- /dev/null +++ b/web-ui/web-react/src/components/MenuAdminCommunity.js @@ -0,0 +1,119 @@ +import React, { Component } from 'react'; +import Cookies from 'universal-cookie'; +import Inquilinos from './Inquilinos'; +import GuardasSeguridad from './GuardasSeguridad'; +import Dashboard from '../templates/Dashboard'; +import { BrowserRouter, Switch, Route } from 'react-router-dom'; +import { AppMenu } from '../AppMenu'; + +const cookies = new Cookies(); + +const menu = [ + { + label: 'Home', + items: [ + { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, + { label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos' }, + { label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad' }, + ] + }, +]; + +class MenuAdminCommunity extends Component { + + constructor() { + super() + this.state = { + layoutColorMode: 'light', + layoutMode: 'static', + menuClick: false, + mobileTopbarMenuClick: false, + overlayMenuActive: false, + mobileMenuActive: false + } + + } + + onSidebarClick = () => { + this.setState({ + menuClick: true + }) + + } + + onMenuItemClick = (event) => { + if (!event.item.items) { + this.setState({ + overlayMenuActive: false, + mobileMenuActive: false + }) + + } + } + + cerrarSesion = () => { + cookies.remove('id', { path: "/" }); + cookies.remove('email', { path: "/" }); + cookies.remove('name', { path: "/" }); + cookies.remove('type', { path: "/" }); + cookies.remove('community_id', { path: "/" }); + window.location.href = '/login'; + } + + componentDidMount() { + if (!cookies.get('email')) { + window.location.href = "/login"; + } + } + + + onWrapperClick = (event) => { + if (!this.state.menuClick) { + this.setState({ + overlayMenuActive: false, + mobileMenuActive: false + }) + } + + if (!this.state.mobileTopbarMenuClick) { + this.setState({ + mobileTopbarMenuClick: false, + }) + } + + this.setState({ + mobileTopbarMenuClick: false, + menuClick: false + }) + } + + render() { + + return ( + +
+ +
+ Menu Principal +
+ + + +
+ +
+
+ } /> + + +
+ +
+
+
+
+ ); + } +} + +export default MenuAdminCommunity; \ No newline at end of file diff --git a/web-ui/web-react/src/index.js b/web-ui/web-react/src/index.js index 3e9cb72d..61aad4f9 100644 --- a/web-ui/web-react/src/index.js +++ b/web-ui/web-react/src/index.js @@ -3,7 +3,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import App from './App'; //import * as serviceWorker from './serviceWorker'; -import { HashRouter, Route } from 'react-router-dom' +import { HashRouter, Route, Router } from 'react-router-dom' import ScrollToTop from './ScrollToTop'; import Routes from './routes/Routes'; @@ -12,7 +12,7 @@ import Routes from './routes/Routes'; ReactDOM.render( - + , document.getElementById('root') diff --git a/web-ui/web-react/src/routes/Routes.js b/web-ui/web-react/src/routes/Routes.js index bebacd7b..cb0800ec 100644 --- a/web-ui/web-react/src/routes/Routes.js +++ b/web-ui/web-react/src/routes/Routes.js @@ -1,17 +1,36 @@ -import React from 'react'; -import {BrowserRouter, Switch, Route} from 'react-router-dom'; +import React, { useEffect, useRef } from 'react'; +import { BrowserRouter, Switch, Route } from 'react-router-dom'; import App from '../App'; import LoginLocalStorage from '../components/LoginLocalStorage'; import MenuAdmin from '../components/MenuAdmin'; import Menu from '../pages/Menu'; +import MenuAdminCommunity from '../components/MenuAdminCommunity'; +import { useCookies } from "react-cookie"; + + function Routes() { - + const [cookies, setCookies] = useCookies(); + + + function getMenu() { + console.log(cookies.type) + switch(cookies.type) { + case '1': + return + case '2': + return + + } + } + + return ( - - + + + ); From 5ba3fce7e3a810002c523681d2724f4aa31cab3a Mon Sep 17 00:00:00 2001 From: Mariela Date: Thu, 11 Aug 2022 01:12:15 -0600 Subject: [PATCH 10/16] funcionalidad hecha --- web-ui/web-react/src/App.js | 512 ++++++++++++----------- web-ui/web-react/src/AppMenu.js | 298 +++++++------ web-ui/web-react/src/AppTopbar.js | 7 +- web-ui/web-react/src/components/LogIn.js | 3 - 4 files changed, 402 insertions(+), 418 deletions(-) diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js index 12c09705..b5137fb9 100644 --- a/web-ui/web-react/src/App.js +++ b/web-ui/web-react/src/App.js @@ -71,112 +71,112 @@ const App = () => { const location = useLocation(); const [cookies, setCookies] = useCookies(); - PrimeReact.ripple = true; + PrimeReact.ripple = true; - let menuClick = false; - let mobileTopbarMenuClick = false; + let menuClick = false; + let mobileTopbarMenuClick = false; - useEffect(() => { - if (mobileMenuActive) { - addClass(document.body, 'body-overflow-hidden'); - } else { - removeClass(document.body, 'body-overflow-hidden'); - } - }, [mobileMenuActive]); + useEffect(() => { + if (mobileMenuActive) { + addClass(document.body, 'body-overflow-hidden'); + } else { + removeClass(document.body, 'body-overflow-hidden'); + } + }, [mobileMenuActive]); - useEffect(() => { - copyTooltipRef && - copyTooltipRef.current && - copyTooltipRef.current.updateTargetEvents(); - }, [location]); + useEffect(() => { + copyTooltipRef && + copyTooltipRef.current && + copyTooltipRef.current.updateTargetEvents(); + }, [location]); - const onInputStyleChange = (inputStyle) => { - setInputStyle(inputStyle); - }; + const onInputStyleChange = (inputStyle) => { + setInputStyle(inputStyle); + }; - const onRipple = (e) => { - PrimeReact.ripple = e.value; - setRipple(e.value); - }; + const onRipple = (e) => { + PrimeReact.ripple = e.value; + setRipple(e.value); + }; - const onLayoutModeChange = (mode) => { - setLayoutMode(mode); - }; + const onLayoutModeChange = (mode) => { + setLayoutMode(mode); + }; - const onColorModeChange = (mode) => { - setLayoutColorMode(mode); - }; + const onColorModeChange = (mode) => { + setLayoutColorMode(mode); + }; - const onWrapperClick = (event) => { - if (!menuClick) { - setOverlayMenuActive(false); - setMobileMenuActive(false); - } - - if (!mobileTopbarMenuClick) { - setMobileTopbarMenuActive(false); - } - - mobileTopbarMenuClick = false; - menuClick = false; - }; - - const onToggleMenuClick = (event) => { - menuClick = true; - - if (isDesktop()) { - if (layoutMode === 'overlay') { - if (mobileMenuActive === true) { - setOverlayMenuActive(true); + const onWrapperClick = (event) => { + if (!menuClick) { + setOverlayMenuActive(false); + setMobileMenuActive(false); } - setOverlayMenuActive((prevState) => !prevState); - setMobileMenuActive(false); - } else if (layoutMode === 'static') { - setStaticMenuInactive((prevState) => !prevState); - } - } else { - setMobileMenuActive((prevState) => !prevState); - } + if (!mobileTopbarMenuClick) { + setMobileTopbarMenuActive(false); + } - event.preventDefault(); - }; + mobileTopbarMenuClick = false; + menuClick = false; + }; - const onSidebarClick = () => { - menuClick = true; - }; + const onToggleMenuClick = (event) => { + menuClick = true; - const onMobileTopbarMenuClick = (event) => { - mobileTopbarMenuClick = true; + if (isDesktop()) { + if (layoutMode === 'overlay') { + if (mobileMenuActive === true) { + setOverlayMenuActive(true); + } - setMobileTopbarMenuActive((prevState) => !prevState); - event.preventDefault(); - }; + setOverlayMenuActive((prevState) => !prevState); + setMobileMenuActive(false); + } else if (layoutMode === 'static') { + setStaticMenuInactive((prevState) => !prevState); + } + } else { + setMobileMenuActive((prevState) => !prevState); + } - const onMobileSubTopbarMenuClick = (event) => { - mobileTopbarMenuClick = true; + event.preventDefault(); + }; - event.preventDefault(); - }; + const onSidebarClick = () => { + menuClick = true; + }; - const onMenuItemClick = (event) => { - if (!event.item.items) { - setOverlayMenuActive(false); - setMobileMenuActive(false); - } - }; - const isDesktop = () => { - return window.innerWidth >= 992; - }; + const onMobileTopbarMenuClick = (event) => { + mobileTopbarMenuClick = true; + + setMobileTopbarMenuActive((prevState) => !prevState); + event.preventDefault(); + }; + + const onMobileSubTopbarMenuClick = (event) => { + mobileTopbarMenuClick = true; + + event.preventDefault(); + }; + + const onMenuItemClick = (event) => { + if (!event.item.items) { + setOverlayMenuActive(false); + setMobileMenuActive(false); + } + }; + const isDesktop = () => { + return window.innerWidth >= 992; + }; const menu2 = [ { - label: 'Home', + label: 'Inicio', items: [ { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, - { label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema' }, - { label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad' }, - { label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas' }, + { label: 'Administradores del sistema',icon: PrimeIcons.USERS, to: '/administradoresSistema' }, + { label: 'Administradores de comunidad', icon: PrimeIcons.USERS, to: '/administradoresComunidad' }, + { label: 'Comunidades', icon: PrimeIcons.BUILDING, to: '/comunidadesViviendas' }, ] } ] @@ -184,11 +184,16 @@ const App = () => { const menu3 = [ { - label: 'Home', + label: 'Inicio', items: [ { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, - { label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos' }, - { label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad' }, + { label: 'Inquilinos', icon: PrimeIcons.USERS, to: '/inquilinos' }, + { label: 'Guardas de seguridad', icon: PrimeIcons.LOCK, to: '/guardasSeguridad' }, + { + label: 'Áreas Comunes de Comunidad', + icon: PrimeIcons.BUILDING, + to: '/areasComunes', + }, ] }, ] @@ -203,184 +208,188 @@ const App = () => { const menu = [ { - label: 'Administradores del sistema', - icon: PrimeIcons.USERS, - to: '/administradoresSistema', + label: 'Inicio', + items: + [ + { + label: 'Administradores del sistema', + icon: PrimeIcons.USERS, + to: '/administradoresSistema', + }, + { + label: 'Administradores de comunidad', + icon: PrimeIcons.USERS, + to: '/administradoresComunidad', + }, + { + label: 'Guardas de seguridad', + icon: PrimeIcons.LOCK, + to: '/guardasSeguridad', + }, + { + label: 'Comunidades', + icon: PrimeIcons.BUILDING, + to: '/comunidadesViviendas', + }, + { + label: 'Inquilinos', + icon: PrimeIcons.USER, + to: '/inquilinos' + }, + { + label: 'Áreas Comunes de Comunidad', + icon: PrimeIcons.BUILDING, + to: '/areasComunes', + }, + { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' }, + ], }, { - label: 'Administradores de comunidad', - icon: PrimeIcons.USERS, - to: '/administradoresComunidad', + label: 'UI Components', + icon: 'pi pi-fw pi-sitemap', + items: [ + { + label: 'Form Layout', + icon: 'pi pi-fw pi-id-card', + to: '/formlayout', + }, + { label: 'Input', icon: 'pi pi-fw pi-check-square', to: '/input' }, + { + label: 'Float Label', + icon: 'pi pi-fw pi-bookmark', + to: '/floatlabel', + }, + { + label: 'Invalid State', + icon: 'pi pi-fw pi-exclamation-circle', + to: 'invalidstate', + }, + { label: 'Button', icon: 'pi pi-fw pi-mobile', to: '/button' }, + { label: 'Table', icon: 'pi pi-fw pi-table', to: '/table' }, + { label: 'List', icon: 'pi pi-fw pi-list', to: '/list' }, + { label: 'Tree', icon: 'pi pi-fw pi-share-alt', to: '/tree' }, + { label: 'Panel', icon: 'pi pi-fw pi-tablet', to: '/panel' }, + { label: 'Overlay', icon: 'pi pi-fw pi-clone', to: '/overlay' }, + { label: 'Media', icon: 'pi pi-fw pi-image', to: '/media' }, + { label: 'Menu', icon: 'pi pi-fw pi-bars', to: '/menu' }, + { label: 'Message', icon: 'pi pi-fw pi-comment', to: '/messages' }, + { label: 'File', icon: 'pi pi-fw pi-file', to: '/file' }, + { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', to: '/chart' }, + { label: 'Misc', icon: 'pi pi-fw pi-circle-off', to: '/misc' }, + ], }, { - label: 'Guardas de seguridad', - icon: PrimeIcons.LOCK, - to: '/guardasSeguridad', + label: 'UI Blocks', + items: [ + { + label: 'Free Blocks', + icon: 'pi pi-fw pi-eye', + to: '/blocks', + badge: 'NEW', + }, + { + label: 'All Blocks', + icon: 'pi pi-fw pi-globe', + url: 'https://www.primefaces.org/primeblocks-react', + }, + ], }, { - label: 'Comunidades', - icon: PrimeIcons.BUILDING, - to: '/comunidadesViviendas', + label: 'Icons', + items: [{ label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/icons' }], }, { - label: 'Inquilinos', - icon: PrimeIcons.USER, - to: '/inquilinos' + label: 'Pages', + icon: 'pi pi-fw pi-clone', + items: [ + { label: 'Crud', icon: 'pi pi-fw pi-user-edit', to: '/crud' }, + { label: 'Timeline', icon: 'pi pi-fw pi-calendar', to: '/timeline' }, + { label: 'Empty', icon: 'pi pi-fw pi-circle-off', to: '/empty' }, + ], }, { - label: 'Áreas Comunes de Comunidad', - icon: PrimeIcons.BUILDING, - to: '/areasComunes', + label: 'Menu Hierarchy', + icon: 'pi pi-fw pi-search', + items: [ + { + label: 'Submenu 1', + icon: 'pi pi-fw pi-bookmark', + items: [ + { + label: 'Submenu 1.1', + icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 1.1.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.1.2', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.1.3', icon: 'pi pi-fw pi-bookmark' }, + ], + }, + { + label: 'Submenu 1.2', + icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 1.2.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 1.2.2', icon: 'pi pi-fw pi-bookmark' }, + ], + }, + ], + }, + { + label: 'Submenu 2', + icon: 'pi pi-fw pi-bookmark', + items: [ + { + label: 'Submenu 2.1', + icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 2.1.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.1.2', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.1.3', icon: 'pi pi-fw pi-bookmark' }, + ], + }, + { + label: 'Submenu 2.2', + icon: 'pi pi-fw pi-bookmark', + items: [ + { label: 'Submenu 2.2.1', icon: 'pi pi-fw pi-bookmark' }, + { label: 'Submenu 2.2.2', icon: 'pi pi-fw pi-bookmark' }, + ], + }, + ], + }, + ], }, - { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' }, - ], - }, - { - label: 'UI Components', - icon: 'pi pi-fw pi-sitemap', - items: [ - { - label: 'Form Layout', - icon: 'pi pi-fw pi-id-card', - to: '/formlayout', - }, - { label: 'Input', icon: 'pi pi-fw pi-check-square', to: '/input' }, - { - label: 'Float Label', - icon: 'pi pi-fw pi-bookmark', - to: '/floatlabel', - }, - { - label: 'Invalid State', - icon: 'pi pi-fw pi-exclamation-circle', - to: 'invalidstate', - }, - { label: 'Button', icon: 'pi pi-fw pi-mobile', to: '/button' }, - { label: 'Table', icon: 'pi pi-fw pi-table', to: '/table' }, - { label: 'List', icon: 'pi pi-fw pi-list', to: '/list' }, - { label: 'Tree', icon: 'pi pi-fw pi-share-alt', to: '/tree' }, - { label: 'Panel', icon: 'pi pi-fw pi-tablet', to: '/panel' }, - { label: 'Overlay', icon: 'pi pi-fw pi-clone', to: '/overlay' }, - { label: 'Media', icon: 'pi pi-fw pi-image', to: '/media' }, - { label: 'Menu', icon: 'pi pi-fw pi-bars', to: '/menu' }, - { label: 'Message', icon: 'pi pi-fw pi-comment', to: '/messages' }, - { label: 'File', icon: 'pi pi-fw pi-file', to: '/file' }, - { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', to: '/chart' }, - { label: 'Misc', icon: 'pi pi-fw pi-circle-off', to: '/misc' }, - ], - }, - { - label: 'UI Blocks', - items: [ - { - label: 'Free Blocks', - icon: 'pi pi-fw pi-eye', - to: '/blocks', - badge: 'NEW', - }, - { - label: 'All Blocks', - icon: 'pi pi-fw pi-globe', - url: 'https://www.primefaces.org/primeblocks-react', - }, - ], - }, - { - label: 'Icons', - items: [{ label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/icons' }], - }, - { - label: 'Pages', - icon: 'pi pi-fw pi-clone', - items: [ - { label: 'Crud', icon: 'pi pi-fw pi-user-edit', to: '/crud' }, - { label: 'Timeline', icon: 'pi pi-fw pi-calendar', to: '/timeline' }, - { label: 'Empty', icon: 'pi pi-fw pi-circle-off', to: '/empty' }, - ], - }, - { - label: 'Menu Hierarchy', - icon: 'pi pi-fw pi-search', - items: [ - { - label: 'Submenu 1', - icon: 'pi pi-fw pi-bookmark', - items: [ - { - label: 'Submenu 1.1', - icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 1.1.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.1.2', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.1.3', icon: 'pi pi-fw pi-bookmark' }, - ], - }, - { - label: 'Submenu 1.2', - icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 1.2.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.2.2', icon: 'pi pi-fw pi-bookmark' }, - ], - }, - ], - }, - { - label: 'Submenu 2', - icon: 'pi pi-fw pi-bookmark', - items: [ - { - label: 'Submenu 2.1', - icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 2.1.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.1.2', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.1.3', icon: 'pi pi-fw pi-bookmark' }, - ], - }, - { - label: 'Submenu 2.2', - icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 2.2.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.2.2', icon: 'pi pi-fw pi-bookmark' }, - ], - }, - ], - }, - ], - }, - ]; + ]; - const addClass = (element, className) => { - if (element.classList) element.classList.add(className); - else element.className += ' ' + className; - }; + const addClass = (element, className) => { + if (element.classList) element.classList.add(className); + else element.className += ' ' + className; + }; - const removeClass = (element, className) => { - if (element.classList) element.classList.remove(className); - else - element.className = element.className.replace( - new RegExp( - '(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', - 'gi', - ), - ' ', - ); - }; + const removeClass = (element, className) => { + if (element.classList) element.classList.remove(className); + else + element.className = element.className.replace( + new RegExp( + '(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', + 'gi', + ), + ' ', + ); + }; - const wrapperClass = classNames('layout-wrapper', { - 'layout-overlay': layoutMode === 'overlay', - 'layout-static': layoutMode === 'static', - 'layout-static-sidebar-inactive': - staticMenuInactive && layoutMode === 'static', - 'layout-overlay-sidebar-active': - overlayMenuActive && layoutMode === 'overlay', - 'layout-mobile-sidebar-active': mobileMenuActive, - 'p-input-filled': inputStyle === 'filled', - 'p-ripple-disabled': ripple === false, - 'layout-theme-light': layoutColorMode === 'light', - }); + const wrapperClass = classNames('layout-wrapper', { + 'layout-overlay': layoutMode === 'overlay', + 'layout-static': layoutMode === 'static', + 'layout-static-sidebar-inactive': + staticMenuInactive && layoutMode === 'static', + 'layout-overlay-sidebar-active': + overlayMenuActive && layoutMode === 'overlay', + 'layout-mobile-sidebar-active': mobileMenuActive, + 'p-input-filled': inputStyle === 'filled', + 'p-ripple-disabled': ripple === false, + 'layout-theme-light': layoutColorMode === 'light', + }); return ( @@ -429,6 +438,7 @@ const App = () => { +
diff --git a/web-ui/web-react/src/AppMenu.js b/web-ui/web-react/src/AppMenu.js index dd1c636c..3f46d74c 100644 --- a/web-ui/web-react/src/AppMenu.js +++ b/web-ui/web-react/src/AppMenu.js @@ -6,179 +6,161 @@ import { Ripple } from 'primereact/ripple'; import { Badge } from 'primereact/badge'; const AppSubmenu = (props) => { - const [activeIndex, setActiveIndex] = useState(null); + const [activeIndex, setActiveIndex] = useState(null); - const onMenuItemClick = (event, item, index) => { - //avoid processing disabled items - if (item.disabled) { - event.preventDefault(); - return true; - } + const onMenuItemClick = (event, item, index) => { + //avoid processing disabled items + if (item.disabled) { + event.preventDefault(); + return true; + } - //execute command - if (item.command) { - item.command({ originalEvent: event, item: item }); - } + //execute command + if (item.command) { + item.command({ originalEvent: event, item: item }); + } - if (index === activeIndex) setActiveIndex(null); - else setActiveIndex(index); + if (index === activeIndex) setActiveIndex(null); + else setActiveIndex(index); - if (props.onMenuItemClick) { - props.onMenuItemClick({ - originalEvent: event, - item: item, - }); - } - }; + if (props.onMenuItemClick) { + props.onMenuItemClick({ + originalEvent: event, + item: item, + }); + } + }; - const onKeyDown = (event) => { - if (event.code === 'Enter' || event.code === 'Space') { - event.preventDefault(); - event.target.click(); - } - }; + const onKeyDown = (event) => { + if (event.code === 'Enter' || event.code === 'Space') { + event.preventDefault(); + event.target.click(); + } + }; - const renderLinkContent = (item) => { - let submenuIcon = item.items && ( - - ); - let badge = item.badge && ; + const renderLinkContent = (item) => { + let submenuIcon = item.items && ( + + ); + let badge = item.badge && ; - return ( - - - {item.label} - {submenuIcon} - {badge} - - - ); - }; - - const renderLink = (item, i) => { - let content = renderLinkContent(item); - - if (item.to) { - return ( - onMenuItemClick(e, item, i)} - exact - target={item.target} - > - {content} - - ); - } else { - return ( - onMenuItemClick(e, item, i)} - target={item.target} - > - {content} - - ); - } - }; - - let items = - props.items && - props.items.map((item, i) => { - let active = activeIndex === i; - let styleClass = classNames(item.badgeStyleClass, { - 'layout-menuitem-category': props.root, - 'active-menuitem': active && !item.to, - }); - - if (props.root) { return ( -
  • - {props.root === true && ( - -
    + + {item.label} + {submenuIcon} + {badge} + + + ); + }; + + const renderLink = (item, i) => { + let content = renderLinkContent(item); + + if (item.to) { + return ( + onMenuItemClick(e, item, i)} + exact + target={item.target} > - {item.label} -
    - -     - )} -
    • - ); - } else { - return ( -
  • - {renderLink(item, i)} - - - -
    • - ); - } - }); + {content} + + ); + } else { + return ( + onMenuItemClick(e, item, i)} + target={item.target} + > + {content} + + ); + } + }; - return items ? ( -
      - {items} -
    - ) : null; + let items = + props.items && + props.items.map((item, i) => { + let active = activeIndex === i; + let styleClass = classNames(item.badgeStyleClass, { + 'layout-menuitem-category': props.root, + 'active-menuitem': active && !item.to, + }); + + if (props.root) { + return ( +
  • + {props.root === true && ( + +
    + {item.label} +
    + +     + )} +
    • + ); + } else { + return ( +
  • + {renderLink(item, i)} + + + +
    • + ); + } + }); + + return items ? ( +
      + {items} +
    + ) : null; }; export const AppMenu = (props) => { - return ( -
    - - - primeblocks - -
    - ); -}; - return (
    - - + +
    ); + + + } diff --git a/web-ui/web-react/src/AppTopbar.js b/web-ui/web-react/src/AppTopbar.js index d0ad87f3..be2a90bf 100644 --- a/web-ui/web-react/src/AppTopbar.js +++ b/web-ui/web-react/src/AppTopbar.js @@ -6,12 +6,7 @@ import Cookies from 'universal-cookie'; const cookies = new Cookies(); export const AppTopbar = (props) => { - return ( -
    - - logo - KATOIKIA - + function cerrarSesion() { cookies.remove('id', { path: "/" }); diff --git a/web-ui/web-react/src/components/LogIn.js b/web-ui/web-react/src/components/LogIn.js index 466bf3d6..8777a82f 100644 --- a/web-ui/web-react/src/components/LogIn.js +++ b/web-ui/web-react/src/components/LogIn.js @@ -39,9 +39,6 @@ const LogIn = () => { {/* */}
    -
    -
    -
    ); }; From 3fc01cc033ee75f51d0b774d0ada78b85662125f Mon Sep 17 00:00:00 2001 From: Mariela Date: Fri, 12 Aug 2022 18:40:07 -0600 Subject: [PATCH 11/16] add logos app --- .../web-react/public/images/Logo_Katoikia.png | Bin 0 -> 37826 bytes .../web-react/public/images/Logo_Katoikia.svg | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 web-ui/web-react/public/images/Logo_Katoikia.png create mode 100644 web-ui/web-react/public/images/Logo_Katoikia.svg diff --git a/web-ui/web-react/public/images/Logo_Katoikia.png b/web-ui/web-react/public/images/Logo_Katoikia.png new file mode 100644 index 0000000000000000000000000000000000000000..d59e2c9a5a020b13246fd55f6daf2d01f236f7d9 GIT binary patch literal 37826 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
  • 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 + + + + + + + + From 59c0ced9184fbedf5993a0a6af8d64de45b46428 Mon Sep 17 00:00:00 2001 From: Mariela Date: Fri, 12 Aug 2022 18:40:26 -0600 Subject: [PATCH 12/16] agregar funcionalidades de validaciones en login --- web-ui/web-react/src/App.js | 94 ++++--- web-ui/web-react/src/AppTopbar.js | 89 +++++-- .../src/components/LoginLocalStorage.js | 234 ++++++++++++------ 3 files changed, 292 insertions(+), 125 deletions(-) diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js index b5137fb9..c1db2858 100644 --- a/web-ui/web-react/src/App.js +++ b/web-ui/web-react/src/App.js @@ -174,7 +174,7 @@ const App = () => { label: 'Inicio', items: [ { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, - { label: 'Administradores del sistema',icon: PrimeIcons.USERS, to: '/administradoresSistema' }, + { label: 'Administradores del sistema', icon: PrimeIcons.USERS, to: '/administradoresSistema' }, { label: 'Administradores de comunidad', icon: PrimeIcons.USERS, to: '/administradoresComunidad' }, { label: 'Comunidades', icon: PrimeIcons.BUILDING, to: '/comunidadesViviendas' }, ] @@ -198,11 +198,26 @@ const App = () => { }, ] + const menuLogin = [ + { + label: 'Inicio', + items: [ + { + label: 'Inicio de sesion', + icon: PrimeIcons.BUILDING, + to: '/login' + }, + ] + }, + ] + function menu4() { if (cookies.type == '1') { return menu2; } else if (cookies.type == '2') { return menu3; + } else { + return menuLogin; } } @@ -210,39 +225,39 @@ const App = () => { { label: 'Inicio', items: - [ - { - label: 'Administradores del sistema', - icon: PrimeIcons.USERS, - to: '/administradoresSistema', - }, - { - label: 'Administradores de comunidad', - icon: PrimeIcons.USERS, - to: '/administradoresComunidad', - }, - { - label: 'Guardas de seguridad', - icon: PrimeIcons.LOCK, - to: '/guardasSeguridad', - }, - { - label: 'Comunidades', - icon: PrimeIcons.BUILDING, - to: '/comunidadesViviendas', - }, - { - label: 'Inquilinos', - icon: PrimeIcons.USER, - to: '/inquilinos' - }, - { - label: 'Áreas Comunes de Comunidad', - icon: PrimeIcons.BUILDING, - to: '/areasComunes', - }, - { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' }, - ], + [ + { + label: 'Administradores del sistema', + icon: PrimeIcons.USERS, + to: '/administradoresSistema', + }, + { + label: 'Administradores de comunidad', + icon: PrimeIcons.USERS, + to: '/administradoresComunidad', + }, + { + label: 'Guardas de seguridad', + icon: PrimeIcons.LOCK, + to: '/guardasSeguridad', + }, + { + label: 'Comunidades', + icon: PrimeIcons.BUILDING, + to: '/comunidadesViviendas', + }, + { + label: 'Inquilinos', + icon: PrimeIcons.USER, + to: '/inquilinos' + }, + { + label: 'Áreas Comunes de Comunidad', + icon: PrimeIcons.BUILDING, + to: '/areasComunes', + }, + { label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn' }, + ], }, { label: 'UI Components', @@ -395,9 +410,10 @@ const App = () => { -

    + + {
    - + } /> + @@ -439,15 +456,12 @@ const App = () => { - -
    - +
    diff --git a/web-ui/web-react/src/AppTopbar.js b/web-ui/web-react/src/AppTopbar.js index be2a90bf..f9226f50 100644 --- a/web-ui/web-react/src/AppTopbar.js +++ b/web-ui/web-react/src/AppTopbar.js @@ -1,14 +1,17 @@ -import React from 'react'; +import React, { useState, useEffect } from 'react'; import { Link } from 'react-router-dom'; import classNames from 'classnames'; import Cookies from 'universal-cookie'; +import { Button } from 'primereact/button'; +import { Menubar } from 'primereact/menubar'; const cookies = new Cookies(); export const AppTopbar = (props) => { - + const [logged, setLogged] = useState(null); - function cerrarSesion() { + + function cerrarSesion() { cookies.remove('id', { path: "/" }); cookies.remove('email', { path: "/" }); cookies.remove('name', { path: "/" }); @@ -17,10 +20,46 @@ export const AppTopbar = (props) => { window.location.href = '/login'; } + useEffect(() => { + if (cookies.get('email')) { + setLogged(true); + } else { + setLogged(false); + }; + }, []) + + + const buttonLogout = () => { + return ( + <> +
    +
    + + ) + } + + const menuProfile = [ + { + label: 'Perfil', + icon: 'pi pi-user', + items: [ + { + label: 'Cerrar Sesion', + icon: 'pi pi-fw pi-lock', + } + ], + }, + ] + + return (
    - logo + logo KATOIKIA @@ -28,33 +67,51 @@ export const AppTopbar = (props) => { */} - + -
      - {/*
    • +
        + {/*
        • */} - {/*
      • + {/*
        • */} -
      • +
        • + + {/* + + + + + */}
    ); diff --git a/web-ui/web-react/src/components/LoginLocalStorage.js b/web-ui/web-react/src/components/LoginLocalStorage.js index 4e3fa806..fbd74f0f 100644 --- a/web-ui/web-react/src/components/LoginLocalStorage.js +++ b/web-ui/web-react/src/components/LoginLocalStorage.js @@ -1,20 +1,25 @@ import DashboardAdmin from "./DashboardAdmin"; -import React, { Component, Fragment } from 'react'; +import React, { Component, Fragment, useRef } from 'react'; import Cookies from 'universal-cookie'; import { InputText } from 'primereact/inputtext'; import { Button } from 'primereact/button'; +import { Toast } from 'primereact/toast'; const baseUrl = "http://localhost:4000/user/loginUser"; const cookies = new Cookies(); - class LoginLocalStorage extends Component { - state = { - form: { - email: '', - password: '' - }, - errorMessages:{} + constructor(props) { + super(props); + this.state = { + form: { + email: '', + password: '' + }, + errorEmail: false, + errorPassword: false, + logged: null + } } handleChange = async e => { @@ -26,6 +31,33 @@ class LoginLocalStorage extends Component { }); } + validaciones = (data) => { + let error = true; + if (data.email == '') { + this.setState({ + errorEmail: true + }) + error = true; + } else { + this.setState({ + errorEmail: false + }) + } + if (data.password == '') { + this.setState({ + errorPassword: true + }) + error = true; + } else { + this.setState({ + errorPassword: false + }) + } + + return error; + + } + iniciarSesion = async () => { const data = { email: this.state.form.email, @@ -34,40 +66,65 @@ class LoginLocalStorage extends Component { console.log(data); - await fetch(baseUrl, { - cache: 'no-cache', - method: 'POST', - body: JSON.stringify(data), - headers: { - 'Content-Type': 'application/json' - } - }) - .then(response => { - return response.json(); + if (!this.validaciones(data)) { + this.setState({ + email: true, + password: true }) - .then(response => { - console.log(response.message); - if (response.message) { - const user = response.message; - 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 != '1') { - cookies.set('community_id', user.community_id, { path: "/" }); - } - alert(`Bienvenido ${user.name}`); - window.location.href = "/"; - } else { - alert('El usuario o la contraseña no son correctos'); + await fetch(baseUrl, { + cache: 'no-cache', + method: 'POST', + body: JSON.stringify(data), + headers: { + 'Content-Type': 'application/json' } }) - .catch(error => { - console.log(error); - }) + .then(response => { + if (response.status != 201) + console.log('Ocurrió un error con el servicio: ' + response.status); + else return response.json(); + }) + .then(response => { + console.log(response.message); + + if (response.message) { + const user = response.message; + 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 != '1') { + cookies.set('community_id', user.community_id, { path: "/" }); + } + // alert(`Bienvenido ${user.name}`); + document.getElementById('notification').hidden = true; + document.getElementById('notification2').hidden = false; + document.getElementById("message2").innerHTML = `Bienvenido ${user.name}`; + //document.getElementById("message").remove('p-message p-message-error') + // document.getElementById("message").append(`Bienvenido ${user.name}`); + // document.getElementById("message").classList('p-message p-message-success') + // window.location.href = "/"; + + + } else { + document.getElementById('notification2').hidden = true; + document.getElementById('notification').hidden = false; + + + //alert('El usuario o la contraseña no son correctos'); + document.getElementById("message").innerHTML = "El usuario o la contraseña son incorrectos"; + // document.getElementById("message").remove('p-message p-message-success') + // document.getElementById("message").append('El usuario o la contraseña son incorrectos'); + // document.getElementById("message").add.className('p-message p-message-error') + } + }) + .catch(error => { + console.log(error); + }) + } } componentDidMount() { @@ -77,49 +134,88 @@ class LoginLocalStorage extends Component { } renderErrorMessage = (name) => - name === this.state.errorMessages.name && ( -
    {this.state.errorMessages.message}
    - ); + name === this.state.errorMessages.name && ( +
    {this.state.errorMessages.message}
    + ); - errors = { - email: "Correo requerido", - pass: "Contraseña requerida" - }; + errors = { + email: "Correo requerido", + pass: "Contraseña requerida" + }; render() { return ( - -
    -
    -
    + +
    +
    + +
    + +
    +
    Iniciar Sesión
    +
    + +
    + +
    +
    + + + + +
    + {this.state.errorEmail && ( + Correo electrónico es requerido + )} + +
    +
    + +
    +
    + + + + +
    + {this.state.errorPassword && ( + Contraseña es requerida + )} +
    +
    + +
    From 0dbf6acfc405298e0629cfaa4c3c564de50ebc8c Mon Sep 17 00:00:00 2001 From: Mariela Date: Fri, 12 Aug 2022 19:21:24 -0600 Subject: [PATCH 13/16] eliminar documentos innecesarios --- web-ui/web-react/src/App.js | 5 +- .../src/components/DashboardAdmin.js | 360 ------------------ .../web-react/src/components/LocalStorage.js | 17 - web-ui/web-react/src/pages/Menu.js | 35 -- web-ui/web-react/src/routes/Routes.js | 39 -- 5 files changed, 2 insertions(+), 454 deletions(-) delete mode 100644 web-ui/web-react/src/components/DashboardAdmin.js delete mode 100644 web-ui/web-react/src/components/LocalStorage.js delete mode 100644 web-ui/web-react/src/pages/Menu.js delete mode 100644 web-ui/web-react/src/routes/Routes.js diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js index c1db2858..3381887e 100644 --- a/web-ui/web-react/src/App.js +++ b/web-ui/web-react/src/App.js @@ -50,11 +50,10 @@ import './assets/demo/flags/flags.css'; import './assets/demo/Demos.scss'; import './assets/layout/layout.scss'; import './App.scss'; -import LogIn from './components/LogIn'; import { PrimeIcons } from 'primereact/api'; import AreasComunes from './components/AreasComunes'; import { useCookies } from "react-cookie"; -import LoginLocalStorage from './components/LoginLocalStorage'; +import Login from './components/Login'; @@ -425,7 +424,7 @@ const App = () => {
    - + } /> diff --git a/web-ui/web-react/src/components/DashboardAdmin.js b/web-ui/web-react/src/components/DashboardAdmin.js deleted file mode 100644 index 0911d706..00000000 --- a/web-ui/web-react/src/components/DashboardAdmin.js +++ /dev/null @@ -1,360 +0,0 @@ -import React, { useState, useEffect, useRef } from 'react'; -import classNames from 'classnames'; -import { Route, useLocation } from 'react-router-dom'; -import { CSSTransition } from 'react-transition-group'; - -import { AppTopbar } from '../AppTopbar'; -import { AppFooter } from '../AppFooter'; -import { AppMenu } from '../AppMenu'; -import { AppConfig } from '../AppConfig'; - -import Dashboard from '../templates/Dashboard'; -import ButtonDemo from '../templates/ButtonDemo'; -import ChartDemo from '../templates/ChartDemo'; -import Documentation from '../templates/Documentation'; -import FileDemo from '../templates/FileDemo'; -import FloatLabelDemo from '../templates/FloatLabelDemo'; -import FormLayoutDemo from '../templates/FormLayoutDemo'; -import InputDemo from '../templates/InputDemo'; -import ListDemo from '../templates/ListDemo'; -import MenuDemo from '../templates/MenuDemo'; -import MessagesDemo from '../templates/MessagesDemo'; -import MiscDemo from '../templates/MiscDemo'; -import OverlayDemo from '../templates/OverlayDemo'; -import MediaDemo from '../templates/MediaDemo'; -import PanelDemo from '../templates/PanelDemo'; -import TableDemo from '../templates/TableDemo'; -import TreeDemo from '../templates/TreeDemo'; -import InvalidStateDemo from '../templates/InvalidStateDemo'; -import BlocksDemo from '../templates/BlocksDemo'; -import IconsDemo from '../templates/IconsDemo'; -import AdministradoresSistema from '../components/AdministradoresSistema'; -import AdministradoresComunidad from '../components/AdministradoresComunidad'; -import GuardasSeguridad from '../components/GuardasSeguridad'; -import Communities from '../components/ComunidadViviendas'; -import Inquilinos from '../components/Inquilinos'; - -import Crud from '../pages/Crud'; -import EmptyPage from '../pages/EmptyPage'; -import TimelineDemo from '../pages/TimelineDemo'; - -import PrimeReact from 'primereact/api'; -import { Tooltip } from 'primereact/tooltip'; - -import 'primereact/resources/primereact.css'; -import 'primeicons/primeicons.css'; -import 'primeflex/primeflex.css'; -import 'prismjs/themes/prism-coy.css'; -import '../assets/demo/flags/flags.css'; -import '../assets/demo/Demos.scss'; -import '../assets/layout/layout.scss'; -import '../App.scss'; -import LogIn from '../components/LogIn'; -import LoginLocalStorage from '../components/LoginLocalStorage'; - -const DashboardAdmin = () => { - const [layoutMode, setLayoutMode] = useState('static'); - const [layoutColorMode, setLayoutColorMode] = useState('light') - const [inputStyle, setInputStyle] = useState('outlined'); - const [ripple, setRipple] = useState(true); - const [staticMenuInactive, setStaticMenuInactive] = useState(false); - const [overlayMenuActive, setOverlayMenuActive] = useState(false); - const [mobileMenuActive, setMobileMenuActive] = useState(false); - const [mobileTopbarMenuActive, setMobileTopbarMenuActive] = useState(false); - const copyTooltipRef = useRef(); - const location = useLocation(); - - const handleLogout=()=>{ - localStorage.clear(); - window.location.reload(); - } - - PrimeReact.ripple = true; - - let menuClick = false; - let mobileTopbarMenuClick = false; - - useEffect(() => { - if (mobileMenuActive) { - addClass(document.body, "body-overflow-hidden"); - } else { - removeClass(document.body, "body-overflow-hidden"); - } - }, [mobileMenuActive]); - - useEffect(() => { - copyTooltipRef && copyTooltipRef.current && copyTooltipRef.current.updateTargetEvents(); - }, [location]); - - const onInputStyleChange = (inputStyle) => { - setInputStyle(inputStyle); - } - - const onRipple = (e) => { - PrimeReact.ripple = e.value; - setRipple(e.value) - } - - const onLayoutModeChange = (mode) => { - setLayoutMode(mode) - } - - const onColorModeChange = (mode) => { - setLayoutColorMode(mode) - } - - const onWrapperClick = (event) => { - if (!menuClick) { - setOverlayMenuActive(false); - setMobileMenuActive(false); - } - - if (!mobileTopbarMenuClick) { - setMobileTopbarMenuActive(false); - } - - mobileTopbarMenuClick = false; - menuClick = false; - } - - const onToggleMenuClick = (event) => { - menuClick = true; - - if (isDesktop()) { - if (layoutMode === 'overlay') { - if (mobileMenuActive === true) { - setOverlayMenuActive(true); - } - - setOverlayMenuActive((prevState) => !prevState); - setMobileMenuActive(false); - } - else if (layoutMode === 'static') { - setStaticMenuInactive((prevState) => !prevState); - } - } - else { - setMobileMenuActive((prevState) => !prevState); - } - - event.preventDefault(); - } - - const onSidebarClick = () => { - menuClick = true; - } - - const onMobileTopbarMenuClick = (event) => { - mobileTopbarMenuClick = true; - - setMobileTopbarMenuActive((prevState) => !prevState); - event.preventDefault(); - } - - const onMobileSubTopbarMenuClick = (event) => { - mobileTopbarMenuClick = true; - - event.preventDefault(); - } - - const onMenuItemClick = (event) => { - if (!event.item.items) { - setOverlayMenuActive(false); - setMobileMenuActive(false); - } - } - const isDesktop = () => { - return window.innerWidth >= 992; - } - - const menu = [ - { - label: 'Home', - items: [ - {label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/'}, - {label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema'}, - {label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad'}, - {label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad'}, - {label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas'}, - {label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos'}, - {label: 'Log in', icon: 'pi pi-fw pi-id-card', to: '/logIn'}, - {label: 'Log out', icon: 'pi pi-fw pi-id-card', to: '/logOut'} - ] - }, - { - label: 'UI Components', icon: 'pi pi-fw pi-sitemap', - items: [ - { label: 'Form Layout', icon: 'pi pi-fw pi-id-card', to: '/formlayout' }, - { label: 'Input', icon: 'pi pi-fw pi-check-square', to: '/input' }, - { label: "Float Label", icon: "pi pi-fw pi-bookmark", to: "/floatlabel" }, - { label: "Invalid State", icon: "pi pi-fw pi-exclamation-circle", to: "invalidstate" }, - { label: 'Button', icon: 'pi pi-fw pi-mobile', to: '/button' }, - { label: 'Table', icon: 'pi pi-fw pi-table', to: '/table' }, - { label: 'List', icon: 'pi pi-fw pi-list', to: '/list' }, - { label: 'Tree', icon: 'pi pi-fw pi-share-alt', to: '/tree' }, - { label: 'Panel', icon: 'pi pi-fw pi-tablet', to: '/panel' }, - { label: 'Overlay', icon: 'pi pi-fw pi-clone', to: '/overlay' }, - { label: "Media", icon: "pi pi-fw pi-image", to: "/media" }, - { label: 'Menu', icon: 'pi pi-fw pi-bars', to: '/menu' }, - { label: 'Message', icon: 'pi pi-fw pi-comment', to: '/messages' }, - { label: 'File', icon: 'pi pi-fw pi-file', to: '/file' }, - { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', to: '/chart' }, - { label: 'Misc', icon: 'pi pi-fw pi-circle-off', to: '/misc' }, - ] - }, - { - label: 'UI Blocks', - items: [ - { label: 'Free Blocks', icon: 'pi pi-fw pi-eye', to: '/blocks', badge: "NEW" }, - { label: 'All Blocks', icon: 'pi pi-fw pi-globe', url: 'https://www.primefaces.org/primeblocks-react' } - ] - }, - { - label: 'Icons', - items: [ - { label: 'PrimeIcons', icon: 'pi pi-fw pi-prime', to: '/icons' } - ] - }, - { - label: 'Pages', icon: 'pi pi-fw pi-clone', - items: [ - { label: 'Crud', icon: 'pi pi-fw pi-user-edit', to: '/crud' }, - { label: 'Timeline', icon: 'pi pi-fw pi-calendar', to: '/timeline' }, - { label: 'Empty', icon: 'pi pi-fw pi-circle-off', to: '/empty' } - ] - }, - { - label: 'Menu Hierarchy', icon: 'pi pi-fw pi-search', - items: [ - { - label: 'Submenu 1', icon: 'pi pi-fw pi-bookmark', - items: [ - { - label: 'Submenu 1.1', icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 1.1.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.1.2', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.1.3', icon: 'pi pi-fw pi-bookmark' }, - ] - }, - { - label: 'Submenu 1.2', icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 1.2.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 1.2.2', icon: 'pi pi-fw pi-bookmark' } - ] - }, - ] - }, - { - label: 'Submenu 2', icon: 'pi pi-fw pi-bookmark', - items: [ - { - label: 'Submenu 2.1', icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 2.1.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.1.2', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.1.3', icon: 'pi pi-fw pi-bookmark' }, - ] - }, - { - label: 'Submenu 2.2', icon: 'pi pi-fw pi-bookmark', - items: [ - { label: 'Submenu 2.2.1', icon: 'pi pi-fw pi-bookmark' }, - { label: 'Submenu 2.2.2', icon: 'pi pi-fw pi-bookmark' } - ] - } - ] - } - ] - } - ]; - - const addClass = (element, className) => { - if (element.classList) - element.classList.add(className); - else - element.className += ' ' + className; - } - - const removeClass = (element, className) => { - if (element.classList) - element.classList.remove(className); - else - element.className = element.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' '); - } - - const wrapperClass = classNames('layout-wrapper', { - 'layout-overlay': layoutMode === 'overlay', - 'layout-static': layoutMode === 'static', - 'layout-static-sidebar-inactive': staticMenuInactive && layoutMode === 'static', - 'layout-overlay-sidebar-active': overlayMenuActive && layoutMode === 'overlay', - 'layout-mobile-sidebar-active': mobileMenuActive, - 'p-input-filled': inputStyle === 'filled', - 'p-ripple-disabled': ripple === false, - 'layout-theme-light': layoutColorMode === 'light' - }); - - return ( -
    - - - - -
    - -
    - -
    -
    - } /> - - - - - - - - - - - - - - - - - } /> - - - - - - - - - - - - -
    - - -
    - - - - -
    -     - - -
    - - ); - -} - -export default DashboardAdmin; diff --git a/web-ui/web-react/src/components/LocalStorage.js b/web-ui/web-react/src/components/LocalStorage.js deleted file mode 100644 index 37edbadb..00000000 --- a/web-ui/web-react/src/components/LocalStorage.js +++ /dev/null @@ -1,17 +0,0 @@ -import React, { useRef } from "react"; - -function LocalStorage(){ - const data=useRef(); - const handleClick=()=>{ - console.log(data.current.value,"initial value") - localStorage.setItem("inputValue",data.current.value) - } - console.log(localStorage.getItem("inputValue"),"****") - return( - <> - - - - ); -} -export default LocalStorage; \ No newline at end of file diff --git a/web-ui/web-react/src/pages/Menu.js b/web-ui/web-react/src/pages/Menu.js deleted file mode 100644 index 88758bdf..00000000 --- a/web-ui/web-react/src/pages/Menu.js +++ /dev/null @@ -1,35 +0,0 @@ -import React, { Component } from 'react'; -import Cookies from 'universal-cookie'; - -const cookies = new Cookies(); - -class Menu extends Component { - cerrarSesion=()=>{ - cookies.remove('id', {path: "/"}); - cookies.remove('email', {path: "/"}); - cookies.remove('name', {path: "/"}); - window.location.href='/login'; - } - - componentDidMount() { - if(!cookies.get('email')){ - window.location.href="./login"; - } - } - - render() { - console.log('id: '+ cookies.get('id')); - console.log('name: '+cookies.get('name')); - console.log('email: '+cookies.get('email')); - return ( -
    - Menu Principal - -
    - -
    - ); - } -} - -export default Menu; \ No newline at end of file diff --git a/web-ui/web-react/src/routes/Routes.js b/web-ui/web-react/src/routes/Routes.js deleted file mode 100644 index cb0800ec..00000000 --- a/web-ui/web-react/src/routes/Routes.js +++ /dev/null @@ -1,39 +0,0 @@ -import React, { useEffect, useRef } from 'react'; -import { BrowserRouter, Switch, Route } from 'react-router-dom'; -import App from '../App'; -import LoginLocalStorage from '../components/LoginLocalStorage'; -import MenuAdmin from '../components/MenuAdmin'; -import Menu from '../pages/Menu'; -import MenuAdminCommunity from '../components/MenuAdminCommunity'; -import { useCookies } from "react-cookie"; - - -function Routes() { - - const [cookies, setCookies] = useCookies(); - - - function getMenu() { - console.log(cookies.type) - switch(cookies.type) { - case '1': - return - case '2': - return - - } - } - - - return ( - - - - - - - - ); -} - -export default Routes; \ No newline at end of file From 274efecee40afa6438fac3c159eb4fd7ed41ca92 Mon Sep 17 00:00:00 2001 From: Mariela Date: Fri, 12 Aug 2022 19:22:08 -0600 Subject: [PATCH 14/16] modified modify --- web-ui/web-react/src/components/LogIn.js | 232 ++++++++++++++++++++--- 1 file changed, 203 insertions(+), 29 deletions(-) diff --git a/web-ui/web-react/src/components/LogIn.js b/web-ui/web-react/src/components/LogIn.js index 8777a82f..b70037de 100644 --- a/web-ui/web-react/src/components/LogIn.js +++ b/web-ui/web-react/src/components/LogIn.js @@ -1,45 +1,219 @@ -import React, { useState } from 'react'; +import React, { Component, Fragment, useRef } from 'react'; +import Cookies from 'universal-cookie'; import { InputText } from 'primereact/inputtext'; +import { Button } from 'primereact/button'; -const LogIn = () => { +const baseUrl = "http://localhost:4000/user/loginUser"; +const cookies = new Cookies(); - const [email, setEmail] = useState(""); - const [password, setPassword] = useState(""); +class Login extends Component { + constructor(props) { + super(props); + this.state = { + form: { + email: '', + password: '' + }, + errorEmail: false, + errorPassword: false, + logged: null + } + } + handleChange = async e => { + await this.setState({ + form: { + ...this.state.form, + [e.target.name]: e.target.value + } + }); + } - const iniciarSesion = () =>{ + validaciones = (data) => { + let error = true; + if (data.email == '') { + this.setState({ + errorEmail: true + }) + error = true; + } else { + this.setState({ + errorEmail: false + }) + } + if (data.password == '') { + this.setState({ + errorPassword: true + }) + error = true; + } else { + this.setState({ + errorPassword: false + }) + } + + return error; } - + iniciarSesion = async () => { + const data = { + email: this.state.form.email, + password: this.state.form.password + } - return ( -
    -
    -
    -
    Iniciar Sesión
    -
    -
    - - + console.log(data); + + if (!this.validaciones(data)) { + this.setState({ + email: true, + password: true + }) + await fetch(baseUrl, { + cache: 'no-cache', + method: 'POST', + body: JSON.stringify(data), + headers: { + 'Content-Type': 'application/json' + } + }) + .then(response => { + if (response.status != 201) + console.log('Ocurrió un error con el servicio: ' + response.status); + else return response.json(); + }) + .then(response => { + console.log(response.message); + + if (response.message) { + const user = response.message; + 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 != '1') { + cookies.set('community_id', user.community_id, { path: "/" }); + } + // alert(`Bienvenido ${user.name}`); + document.getElementById('notification').hidden = true; + document.getElementById('notification2').hidden = false; + + document.getElementById("message2").innerHTML = `Bienvenido ${user.name}`; + + window.location.href = "/"; + } else { + document.getElementById('notification2').hidden = true; + document.getElementById('notification').hidden = false; + + //alert('El usuario o la contraseña no son correctos'); + document.getElementById("message").innerHTML = "El usuario o la contraseña son incorrectos"; + } + }) + .catch(error => { + console.log(error); + }) + } + } + + componentDidMount() { + if (cookies.get('email')) { + window.location.href = "/"; + } + } + + renderErrorMessage = (name) => + name === this.state.errorMessages.name && ( +
    {this.state.errorMessages.message}
    + ); + + errors = { + email: "Correo requerido", + pass: "Contraseña requerida" + }; + + render() { + return ( + + + + +
    +
    + -
    - - + - {/* */} + +
    +
    + +
    +
    Iniciar Sesión
    +
    + +
    + +
    +
    + + + + +
    + {this.state.errorEmail && ( + Correo electrónico es requerido + )} + +
    +
    +
    + +
    +
    + + + + +
    + {this.state.errorPassword && ( + Contraseña es requerida + )} +
    +
    + + +
    +
    -
    -
    - - -
    +     - {/* */} -
    - ); -}; -export default LogIn \ No newline at end of file + + ); + } +} + +export default Login; \ No newline at end of file From 4bbe8dfea54038efb338052d695ab53fcd513128 Mon Sep 17 00:00:00 2001 From: Mariela Date: Fri, 12 Aug 2022 21:01:18 -0600 Subject: [PATCH 15/16] add pagina 404 --- web-ui/web-react/src/App.js | 122 ++++++--- .../src/components/{LogIn.js => LogInUser.js} | 37 +-- .../src/components/LoginLocalStorage.js | 231 ------------------ web-ui/web-react/src/components/MenuAdmin.js | 102 -------- .../src/components/MenuAdminCommunity.js | 119 --------- web-ui/web-react/src/components/Page404.js | 20 ++ 6 files changed, 131 insertions(+), 500 deletions(-) rename web-ui/web-react/src/components/{LogIn.js => LogInUser.js} (86%) delete mode 100644 web-ui/web-react/src/components/LoginLocalStorage.js delete mode 100644 web-ui/web-react/src/components/MenuAdmin.js delete mode 100644 web-ui/web-react/src/components/MenuAdminCommunity.js create mode 100644 web-ui/web-react/src/components/Page404.js diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js index 3381887e..ef05324a 100644 --- a/web-ui/web-react/src/App.js +++ b/web-ui/web-react/src/App.js @@ -53,8 +53,8 @@ import './App.scss'; import { PrimeIcons } from 'primereact/api'; import AreasComunes from './components/AreasComunes'; import { useCookies } from "react-cookie"; -import Login from './components/Login'; - +import LogInUser from './components/LogInUser'; +import Page404 from './components/Page404' const App = () => { @@ -69,6 +69,7 @@ const App = () => { const copyTooltipRef = useRef(); const location = useLocation(); const [cookies, setCookies] = useCookies(); + const [logged, setLogged] = useState() PrimeReact.ripple = true; @@ -89,6 +90,12 @@ const App = () => { copyTooltipRef.current.updateTargetEvents(); }, [location]); + + + + + + const onInputStyleChange = (inputStyle) => { setInputStyle(inputStyle); }; @@ -405,6 +412,9 @@ const App = () => { 'layout-theme-light': layoutColorMode === 'light', }); + + + return ( @@ -424,43 +434,89 @@ const App = () => {
    - - } /> + {(() => { + if (!cookies.email) { + return ( + <> + + + + + + ) + } else { + + if (cookies.type == '1') { + return ( + <> + } /> + + + + + + + ) + + } else if (cookies.type == '2') { + return ( + <> + } /> + + + + + + + ) + } else { + return ( + + ) + } + + + return ( + <> + } /> + + + + + + + + + + + + + + + {/**/} + + + } /> + + + + + + + + + + ) + + } + })()} - - - - - - - - - - - - - - {/**/} - - - } /> - - - - - - - - - - -
    - +
    diff --git a/web-ui/web-react/src/components/LogIn.js b/web-ui/web-react/src/components/LogInUser.js similarity index 86% rename from web-ui/web-react/src/components/LogIn.js rename to web-ui/web-react/src/components/LogInUser.js index b70037de..2d25e73e 100644 --- a/web-ui/web-react/src/components/LogIn.js +++ b/web-ui/web-react/src/components/LogInUser.js @@ -2,11 +2,12 @@ import React, { Component, Fragment, useRef } from 'react'; import Cookies from 'universal-cookie'; import { InputText } from 'primereact/inputtext'; import { Button } from 'primereact/button'; +import { Toast } from 'primereact/toast'; const baseUrl = "http://localhost:4000/user/loginUser"; const cookies = new Cookies(); -class Login extends Component { +class LogInUser extends Component { constructor(props) { super(props); this.state = { @@ -30,7 +31,7 @@ class Login extends Component { } validaciones = (data) => { - let error = true; + let error = false; if (data.email == '') { this.setState({ errorEmail: true @@ -87,20 +88,26 @@ class Login extends Component { if (response.message) { const user = response.message; - 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 != '1') { - cookies.set('community_id', user.community_id, { path: "/" }); + + if(user.user_type == '1' || user.user_type == '2'){ + 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 != '1') { + cookies.set('community_id', user.community_id, { path: "/" }); + } + // alert(`Bienvenido ${user.name}`); + document.getElementById('notification').hidden = true; + document.getElementById('notification2').hidden = false; + + document.getElementById("message2").innerHTML = `Bienvenido ${user.name}`; + + window.location.href = "/"; } - // alert(`Bienvenido ${user.name}`); - document.getElementById('notification').hidden = true; - document.getElementById('notification2').hidden = false; + window.location.href = "/page404"; - document.getElementById("message2").innerHTML = `Bienvenido ${user.name}`; - - window.location.href = "/"; + } else { document.getElementById('notification2').hidden = true; document.getElementById('notification').hidden = false; @@ -216,4 +223,4 @@ class Login extends Component { } } -export default Login; \ No newline at end of file +export default LogInUser; \ No newline at end of file diff --git a/web-ui/web-react/src/components/LoginLocalStorage.js b/web-ui/web-react/src/components/LoginLocalStorage.js deleted file mode 100644 index fbd74f0f..00000000 --- a/web-ui/web-react/src/components/LoginLocalStorage.js +++ /dev/null @@ -1,231 +0,0 @@ -import DashboardAdmin from "./DashboardAdmin"; -import React, { Component, Fragment, useRef } from 'react'; -import Cookies from 'universal-cookie'; -import { InputText } from 'primereact/inputtext'; -import { Button } from 'primereact/button'; -import { Toast } from 'primereact/toast'; - -const baseUrl = "http://localhost:4000/user/loginUser"; -const cookies = new Cookies(); - -class LoginLocalStorage extends Component { - constructor(props) { - super(props); - this.state = { - form: { - email: '', - password: '' - }, - errorEmail: false, - errorPassword: false, - logged: null - } - } - - handleChange = async e => { - await this.setState({ - form: { - ...this.state.form, - [e.target.name]: e.target.value - } - }); - } - - validaciones = (data) => { - let error = true; - if (data.email == '') { - this.setState({ - errorEmail: true - }) - error = true; - } else { - this.setState({ - errorEmail: false - }) - } - if (data.password == '') { - this.setState({ - errorPassword: true - }) - error = true; - } else { - this.setState({ - errorPassword: false - }) - } - - return error; - - } - - iniciarSesion = async () => { - const data = { - email: this.state.form.email, - password: this.state.form.password - } - - console.log(data); - - if (!this.validaciones(data)) { - this.setState({ - email: true, - password: true - }) - await fetch(baseUrl, { - cache: 'no-cache', - method: 'POST', - body: JSON.stringify(data), - headers: { - 'Content-Type': 'application/json' - } - }) - .then(response => { - if (response.status != 201) - console.log('Ocurrió un error con el servicio: ' + response.status); - else return response.json(); - }) - .then(response => { - console.log(response.message); - - if (response.message) { - const user = response.message; - 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 != '1') { - cookies.set('community_id', user.community_id, { path: "/" }); - } - // alert(`Bienvenido ${user.name}`); - document.getElementById('notification').hidden = true; - document.getElementById('notification2').hidden = false; - - - document.getElementById("message2").innerHTML = `Bienvenido ${user.name}`; - - //document.getElementById("message").remove('p-message p-message-error') - // document.getElementById("message").append(`Bienvenido ${user.name}`); - // document.getElementById("message").classList('p-message p-message-success') - // window.location.href = "/"; - - - } else { - document.getElementById('notification2').hidden = true; - document.getElementById('notification').hidden = false; - - - //alert('El usuario o la contraseña no son correctos'); - document.getElementById("message").innerHTML = "El usuario o la contraseña son incorrectos"; - // document.getElementById("message").remove('p-message p-message-success') - // document.getElementById("message").append('El usuario o la contraseña son incorrectos'); - // document.getElementById("message").add.className('p-message p-message-error') - } - }) - .catch(error => { - console.log(error); - }) - } - } - - componentDidMount() { - if (cookies.get('email')) { - window.location.href = "/"; - } - } - - renderErrorMessage = (name) => - name === this.state.errorMessages.name && ( -
    {this.state.errorMessages.message}
    - ); - - errors = { - email: "Correo requerido", - pass: "Contraseña requerida" - }; - - render() { - return ( - - - - -
    -
    - - - - -
    -
    - -
    -
    Iniciar Sesión
    -
    - -
    - -
    -
    - - - - -
    - {this.state.errorEmail && ( - Correo electrónico es requerido - )} - -
    -
    -
    - -
    -
    - - - - -
    - {this.state.errorPassword && ( - Contraseña es requerida - )} -
    -
    - - -
    -
    -
    -
    -     - - - - ); - } -} - -export default LoginLocalStorage; \ No newline at end of file diff --git a/web-ui/web-react/src/components/MenuAdmin.js b/web-ui/web-react/src/components/MenuAdmin.js deleted file mode 100644 index 334ccf04..00000000 --- a/web-ui/web-react/src/components/MenuAdmin.js +++ /dev/null @@ -1,102 +0,0 @@ -import React, { Component } from 'react'; -import Cookies from 'universal-cookie'; -import AdministradoresComunidad from '../components/AdministradoresComunidad'; -import AdministradoresSistema from '../components/AdministradoresSistema'; -import Communities from '../components/ComunidadViviendas'; -import Dashboard from '../templates/Dashboard'; -import { BrowserRouter, Switch, Route } from 'react-router-dom'; -import { AppMenu } from '../AppMenu'; -import { CSSTransition } from 'react-transition-group'; - -const cookies = new Cookies(); - -const menu = [ - { - label: 'Home', - items: [ - { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, - { label: 'Administradores del sistema', icon: 'pi pi-fw pi-id-card', to: '/administradoresSistema' }, - { label: 'Administradores de comunidad', icon: 'pi pi-fw pi-id-card', to: '/administradoresComunidad' }, - { label: 'Comunidadades', icon: 'pi pi-fw pi-id-card', to: '/comunidadesViviendas' }, - ] - }, -]; - -class MenuAdmin extends Component { - - constructor(){ - super() - this.state = { - layoutColorMode: 'light', - layoutMode: 'static', - menuClick: false, - mobileTopbarMenuClick: false, - overlayMenuActive: false, - mobileMenuActive: false - } - - } - - onSidebarClick = () => { - this.setState({ - menuClick: true - }) - - } - - onMenuItemClick = (event) => { - if (!event.item.items) { - this.state.overlayMenuActive = false; - this.state.mobileMenuActive = false; - this.setState({ - overlayMenuActive: true, - mobileMenuActive:false - }) - - } - } - - cerrarSesion = () => { - cookies.remove('id', { path: "/" }); - cookies.remove('email', { path: "/" }); - cookies.remove('name', { path: "/" }); - cookies.remove('type', { path: "/" }); - window.location.href = '/login'; - } - - componentDidMount() { - if (!cookies.get('email')) { - window.location.href = "/login"; - } - } - - render() { - - return ( -
    - Menu Principal -
    - - - -
    - -
    -
    - } /> - - - -
    - -
    -
    - -
    -     -
    - ); - } -} - -export default MenuAdmin; \ No newline at end of file diff --git a/web-ui/web-react/src/components/MenuAdminCommunity.js b/web-ui/web-react/src/components/MenuAdminCommunity.js deleted file mode 100644 index db982561..00000000 --- a/web-ui/web-react/src/components/MenuAdminCommunity.js +++ /dev/null @@ -1,119 +0,0 @@ -import React, { Component } from 'react'; -import Cookies from 'universal-cookie'; -import Inquilinos from './Inquilinos'; -import GuardasSeguridad from './GuardasSeguridad'; -import Dashboard from '../templates/Dashboard'; -import { BrowserRouter, Switch, Route } from 'react-router-dom'; -import { AppMenu } from '../AppMenu'; - -const cookies = new Cookies(); - -const menu = [ - { - label: 'Home', - items: [ - { label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, - { label: 'Inquilinos', icon: 'pi pi-fw pi-id-card', to: '/inquilinos' }, - { label: 'Guardas de seguridad', icon: 'pi pi-fw pi-id-card', to: '/guardasSeguridad' }, - ] - }, -]; - -class MenuAdminCommunity extends Component { - - constructor() { - super() - this.state = { - layoutColorMode: 'light', - layoutMode: 'static', - menuClick: false, - mobileTopbarMenuClick: false, - overlayMenuActive: false, - mobileMenuActive: false - } - - } - - onSidebarClick = () => { - this.setState({ - menuClick: true - }) - - } - - onMenuItemClick = (event) => { - if (!event.item.items) { - this.setState({ - overlayMenuActive: false, - mobileMenuActive: false - }) - - } - } - - cerrarSesion = () => { - cookies.remove('id', { path: "/" }); - cookies.remove('email', { path: "/" }); - cookies.remove('name', { path: "/" }); - cookies.remove('type', { path: "/" }); - cookies.remove('community_id', { path: "/" }); - window.location.href = '/login'; - } - - componentDidMount() { - if (!cookies.get('email')) { - window.location.href = "/login"; - } - } - - - onWrapperClick = (event) => { - if (!this.state.menuClick) { - this.setState({ - overlayMenuActive: false, - mobileMenuActive: false - }) - } - - if (!this.state.mobileTopbarMenuClick) { - this.setState({ - mobileTopbarMenuClick: false, - }) - } - - this.setState({ - mobileTopbarMenuClick: false, - menuClick: false - }) - } - - render() { - - return ( - -
    - -
    - Menu Principal -
    - - - -
    - -
    -
    - } /> - - -
    - -
    -
    -
    -
    - ); - } -} - -export default MenuAdminCommunity; \ No newline at end of file diff --git a/web-ui/web-react/src/components/Page404.js b/web-ui/web-react/src/components/Page404.js new file mode 100644 index 00000000..f19e4881 --- /dev/null +++ b/web-ui/web-react/src/components/Page404.js @@ -0,0 +1,20 @@ +import React from 'react'; + + +const Page404 = () => { + + return ( +
    +
    +
    +
    +
    404
    +
    No se encuentra la página
    +
    +
    +
    +
    + ) +} + +export default React.memo(Page404) From 4b08969ebe5933ca3fc308d5d6da584d39825c02 Mon Sep 17 00:00:00 2001 From: Maria Sanchez Date: Fri, 12 Aug 2022 21:56:58 -0600 Subject: [PATCH 16/16] navigation and more components --- mobile-ui/components/Home.js | 5 +-- mobile-ui/components/LogIn.js | 32 +++++++++------ mobile-ui/components/Profile.js | 0 mobile-ui/components/RecoverPassword.js | 53 ++++++++++++++++++++++--- 4 files changed, 69 insertions(+), 21 deletions(-) create mode 100644 mobile-ui/components/Profile.js diff --git a/mobile-ui/components/Home.js b/mobile-ui/components/Home.js index 04070bb0..6f35a009 100644 --- a/mobile-ui/components/Home.js +++ b/mobile-ui/components/Home.js @@ -2,7 +2,6 @@ import React from "react"; import { Text, HStack, - NativeBaseProvider, IconButton, Box, StatusBar, @@ -14,10 +13,10 @@ import { export default function Home(){ return ( -
    +
    - + } /> diff --git a/mobile-ui/components/LogIn.js b/mobile-ui/components/LogIn.js index ed542d83..c5b5e76d 100644 --- a/mobile-ui/components/LogIn.js +++ b/mobile-ui/components/LogIn.js @@ -2,22 +2,20 @@ import React from "react"; import { Text, Link, - HStack, + View, Center, Heading, - Switch, - useColorMode, - NativeBaseProvider, - extendTheme, VStack, Box, FormControl, Input, Button, - Image + Image, + TextInput } from "native-base"; import logo from "../assets/logo-katoikia.png"; - +import { Entypo } from '@expo/vector-icons'; +import { MaterialCommunityIcons } from '@expo/vector-icons'; export default function LogIn({navigation}) { return ( @@ -54,12 +52,20 @@ export default function LogIn({navigation}) { - Correo Electrónico - + Correo Electrónico + + + + + + - Contraseña - + Contraseña + + + + navigation.navigate('Password')} + > + Recuperar contraseña @@ -82,7 +90,5 @@ export default function LogIn({navigation}) {
    - - ); } \ No newline at end of file diff --git a/mobile-ui/components/Profile.js b/mobile-ui/components/Profile.js new file mode 100644 index 00000000..e69de29b diff --git a/mobile-ui/components/RecoverPassword.js b/mobile-ui/components/RecoverPassword.js index 62dce460..a16522f5 100644 --- a/mobile-ui/components/RecoverPassword.js +++ b/mobile-ui/components/RecoverPassword.js @@ -1,13 +1,56 @@ -import { Center } from "native-base"; import React from "react"; - +import { + Text, + Link, + Center, + Heading, + VStack, + Box, + FormControl, + Input, + Button + } from "native-base"; export default function RecoverPassword () { return ( +
    + + + Recupere su contraseña + + + Se le enviaran las instrucciones al correo electrónico + -
    + + + Correo Electrónico + + + + + + + +
    - -
    ) } \ No newline at end of file