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 ( - - + + );