From 9314e4d866b16b64e5e74be3be1b34b5aeb4065f Mon Sep 17 00:00:00 2001 From: Jonathan David Krucheski Date: Tue, 23 Mar 2021 09:19:41 -0300 Subject: [PATCH] fix mostrarError function --- .env | 17 +++++++++++++++++ src/components/EditarTemporal.js | 11 +++++++---- src/components/EditarUsuario.js | 11 +++++++---- src/components/ListaTemporales.js | 2 -- src/components/Ruta2.js | 9 --------- src/components/Ruta3.js | 9 --------- src/pages/TodasLasMediciones.js | 12 +++++++----- src/pages/UsersScreen.js | 25 +++++++++++++++++-------- 8 files changed, 55 insertions(+), 41 deletions(-) create mode 100644 .env delete mode 100644 src/components/Ruta2.js delete mode 100644 src/components/Ruta3.js diff --git a/.env b/.env new file mode 100644 index 0000000..a8ea798 --- /dev/null +++ b/.env @@ -0,0 +1,17 @@ +REACT_APP_API=http://138.117.79.139:3001 +REACT_APP_SOCKET=http://138.117.79.139:3004 + +REACT_APP_ADMIN=$REACT_APP_API/admins +REACT_APP_ADMIN_WHOAMI=$REACT_APP_ADMIN/whoami +REACT_APP_ADMIN_LOGIN=$REACT_APP_ADMIN/login +REACT_APP_ADMIN_SIGNUP=$REACT_APP_ADMIN/signup + +REACT_APP_USUARIOS=$REACT_APP_API/usuarios +REACT_APP_USUARIOS_UPDATE=$REACT_APP_USUARIOS/update +REACT_APP_USUARIOS_SIGNUP=$REACT_APP_USUARIOS/signup +REACT_APP_USUARIOS_DELETE=$REACT_APP_USUARIOS/delete + +REACT_APP_TEMPORALES=$REACT_APP_API/temporales +REACT_APP_TEMPORALES_DELETE=$REACT_APP_TEMPORALES/delete + +REACT_APP_MEASURE=$REACT_APP_API/measure \ No newline at end of file diff --git a/src/components/EditarTemporal.js b/src/components/EditarTemporal.js index 59d46e8..ffe578e 100644 --- a/src/components/EditarTemporal.js +++ b/src/components/EditarTemporal.js @@ -1,6 +1,6 @@ import React from "react"; - -export default function Singup({ mostrarError, thisAdmin, usuarioAeditar, setUsuarioAeditar, isExpanded, toggleExpansion, actualizarUsuaruio }) { +import Swal from 'sweetalert2' +export default function Singup({ thisAdmin, usuarioAeditar, setUsuarioAeditar, isExpanded, toggleExpansion, actualizarUsuaruio }) { console.log("EditarTemporal", thisAdmin) function handleInputChange(e) { setUsuarioAeditar({ @@ -16,8 +16,11 @@ export default function Singup({ mostrarError, thisAdmin, usuarioAeditar, setUsu try { await actualizarUsuaruio(usuarioAeditar) } catch (error) { - mostrarError(error) - console.log(error); + Swal.fire({ + icon: 'error', + title: 'Oops...', + text: error?.response?.data?.message, + }) } } diff --git a/src/components/EditarUsuario.js b/src/components/EditarUsuario.js index 300eac7..6992706 100644 --- a/src/components/EditarUsuario.js +++ b/src/components/EditarUsuario.js @@ -1,6 +1,6 @@ import React from "react"; - -export default function Singup({ mostrarError, thisAdmin, usuarioAeditar, setUsuarioAeditar, isExpanded, toggleExpansion, actualizarUsuaruio, actualizarVistaUsuarios }) { +import Swal from 'sweetalert2' +export default function Singup({ thisAdmin, usuarioAeditar, setUsuarioAeditar, isExpanded, toggleExpansion, actualizarUsuaruio, actualizarVistaUsuarios }) { function handleInputChange(e) { setUsuarioAeditar({ ...usuarioAeditar, @@ -17,8 +17,11 @@ export default function Singup({ mostrarError, thisAdmin, usuarioAeditar, setUsu actualizarVistaUsuarios() //window.location = "/lista"; } catch (error) { - //mostrarError(error.response.data) - console.log(error); + Swal.fire({ + icon: 'error', + title: 'Oops...', + text: error?.response?.data?.message, + }) } } diff --git a/src/components/ListaTemporales.js b/src/components/ListaTemporales.js index 6a91e01..e3e4871 100644 --- a/src/components/ListaTemporales.js +++ b/src/components/ListaTemporales.js @@ -3,8 +3,6 @@ import { useTable, useSortBy, usePagination } from "react-table"; import Axios from "axios"; import Swal from 'sweetalert2' - - function Table({ columns, data, thisAdmin, isExpanded, toggleExpansion, setUsuarioAeditar, actualizarVistaTemporales }) { async function deleteTemporal(rfid) { try { diff --git a/src/components/Ruta2.js b/src/components/Ruta2.js deleted file mode 100644 index 06cec58..0000000 --- a/src/components/Ruta2.js +++ /dev/null @@ -1,9 +0,0 @@ -import React from "react"; - -export const Ruta2 = () => { - return ( -
- Ruta 2 -
- ); -}; diff --git a/src/components/Ruta3.js b/src/components/Ruta3.js deleted file mode 100644 index 45db20e..0000000 --- a/src/components/Ruta3.js +++ /dev/null @@ -1,9 +0,0 @@ -import React from "react"; - -export const Ruta3 = () => { - return ( -
- Ruta 3 -
- ); -}; diff --git a/src/pages/TodasLasMediciones.js b/src/pages/TodasLasMediciones.js index 0fd4b78..485a74e 100644 --- a/src/pages/TodasLasMediciones.js +++ b/src/pages/TodasLasMediciones.js @@ -3,7 +3,7 @@ import Fechas from "../components/Fechas"; import Tabla from "../components/ListaMediciones"; import Axios from "axios"; -export const TodasLasMediciones= ({ thisAdmin, mostrarError })=> { +export const TodasLasMediciones= ({ thisAdmin })=> { const [mediciones, setMediciones] = useState([]); const [fecha, setFecha] = useState({ @@ -34,9 +34,11 @@ export const TodasLasMediciones= ({ thisAdmin, mostrarError })=> { }); setMediciones(aux) } catch (error) { - console.log(error); - - mostrarError(error.response.data) + Swal.fire({ + icon: 'error', + title: 'Oops...', + text: error?.response?.data?.message, + }) } } @@ -48,7 +50,7 @@ export const TodasLasMediciones= ({ thisAdmin, mostrarError })=> { return (
- +
diff --git a/src/pages/UsersScreen.js b/src/pages/UsersScreen.js index 24acfa9..f3db279 100644 --- a/src/pages/UsersScreen.js +++ b/src/pages/UsersScreen.js @@ -1,12 +1,12 @@ import React, { useState, useEffect } from "react"; import Axios from "axios"; - +import Swal from 'sweetalert2' import Editar from "../components/EditarUsuario"; import MedidasPorUsuarios from "../components/MedidasPorUsuarios" import ListaUsuarios from "../components/ListaUsuarios"; -export const UsersScreen =({ mostrarError, thisAdmin }) =>{ +export const UsersScreen =({ thisAdmin }) =>{ const [isExpanded, toggleExpansion] = useState(false); const [expandMedidas, toggleExpandMedidas] = useState(false); const [usuarios, setUsuarios] = useState([]); @@ -50,7 +50,11 @@ export const UsersScreen =({ mostrarError, thisAdmin }) =>{ setUsuarios(usuarios.reverse()); } catch (error) { //console.log(error); - mostrarError(error.data) + Swal.fire({ + icon: 'error', + title: 'Oops...', + text: error?.response?.data?.message, + }) } } solicitarUsuarios(); @@ -86,8 +90,11 @@ export const UsersScreen =({ mostrarError, thisAdmin }) =>{ }); setMedidas(aux); } catch (error) { - mostrarError(error.response.data.error) - console.log(error); + Swal.fire({ + icon: 'error', + title: 'Oops...', + text: error?.response?.data?.message, + }) } } @@ -111,8 +118,11 @@ export const UsersScreen =({ mostrarError, thisAdmin }) =>{ console.log(usuarios) setUsuarios(usuarios.reverse()); } catch (error) { - console.log(error); - mostrarError(error.data) + Swal.fire({ + icon: 'error', + title: 'Oops...', + text: error?.response?.data?.message, + }) } } @@ -132,7 +142,6 @@ export const UsersScreen =({ mostrarError, thisAdmin }) =>{