diff --git a/servicio-usuarios/src/schemas/user.schema.ts b/servicio-usuarios/src/schemas/user.schema.ts
index f09a3231..160a5951 100644
--- a/servicio-usuarios/src/schemas/user.schema.ts
+++ b/servicio-usuarios/src/schemas/user.schema.ts
@@ -39,6 +39,9 @@ export class User {
@Prop()
number_house?: string;
+
+ @Prop()
+ token?: string;
}
export const UserSchema = SchemaFactory.createForClass(User);
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 2015ef45..b9e289a1 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -101,13 +101,14 @@ export class UsersService {
let passwordEncriptada = Md5.init(password);
if (res[0].password == passwordEncriptada) {
resolve(res[0]);
+ console.log(res[0])
} else {
resolve(null);
}
}
});
});
-
+ console.log(await userReturn);
return userReturn;
}
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 10393ffd..cbdfe8aa 100644
--- a/web-ui/web-react/public/assets/themes/khaki/theme.css
+++ b/web-ui/web-react/public/assets/themes/khaki/theme.css
@@ -7156,4 +7156,11 @@
.status.status--1 {
background: #565656;
color: #f7f9f7;
+}
+
+
+.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 46d3b946..01c0e9ac 100644
--- a/web-ui/web-react/src/App.js
+++ b/web-ui/web-react/src/App.js
@@ -1,6 +1,7 @@
import React, { useState, useEffect, useRef } from 'react';
import classNames from 'classnames';
import { Route, useLocation } from 'react-router-dom';
+import { BrowserRouter, Switch } from 'react-router-dom'
import { CSSTransition } from 'react-transition-group';
import { AppTopbar } from './AppTopbar';
@@ -33,7 +34,7 @@ import AdministradoresComunidad from './components/AdministradoresComunidad';
import GuardasSeguridad from './components/GuardasSeguridad';
import Communities from './components/ComunidadViviendas';
import Inquilinos from './components/Inquilinos';
-
+import Dashboard2 from './components/Dashboard';
import Crud from './pages/Crud';
import EmptyPage from './pages/EmptyPage';
import TimelineDemo from './pages/TimelineDemo';
@@ -53,6 +54,7 @@ import LogIn from './components/LogIn';
import { PrimeIcons } from 'primereact/api';
import AreasComunes from './components/AreasComunes';
+
const App = () => {
const [layoutMode, setLayoutMode] = useState('static');
const [layoutColorMode, setLayoutColorMode] = useState('light');
@@ -348,105 +350,26 @@ const App = () => {
'layout-theme-light': layoutColorMode === 'light',
});
+
+ const [token, setToken] = useState();
+
+ if(!token) {
+ return