Merge pull request #190 from Arquisoft/develop

V1.1
Arquisoft · May 3, 2023 · 515e151 · 515e151
2 parents 6773e2a + 478582f
commit 515e151
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 33 deletions.
diff --git a/webapp/src/App.css b/webapp/src/App.css
@@ -220,4 +220,9 @@ a {
     resize: none;
     background-color: transparent;
     color: "red" !important;
+}
+
+.imgCarrusel {
+    width: 50vh;
+    height: auto;
 }
diff --git a/webapp/src/components/mainComponents/ImgCarrusel.tsx b/webapp/src/components/mainComponents/ImgCarrusel.tsx
@@ -1,12 +1,7 @@
-import ImageList from '@mui/material/ImageList';
-import ImageListItem from '@mui/material/ImageListItem';
-import { IconButton, ImageListItemBar } from '@mui/material';
-import VisibilityIcon from '@mui/icons-material/Visibility';
-import Swal from 'sweetalert2';
-import { showError } from 'utils/fieldsValidation';
+import { Box } from '@mui/material';
 
 export default function StandardImageList() {
-
+/*
     const showImg = (img: string, title: string) => {
         Swal.fire({
             html:
@@ -16,9 +11,9 @@ export default function StandardImageList() {
         }).then(() => { }).catch((e) => {
             showError("Error al mostrar fotografías", "Error inesperado mostrando la fotografía, vuelva a probar.", Swal.close)
         })
-    }
+    }*/
 
-    return (
+    return (/*
         <ImageList cols={1} data-testid="imgCarruselComp">
             <ImageListItem key="1.png">
                 <img
@@ -104,6 +99,21 @@ export default function StandardImageList() {
                     }
                 />
             </ImageListItem>
-        </ImageList>
+        </ImageList>*/
+        <Box data-testid="imgCarruselComp">
+            <img    className="imgCarrusel"
+                    src="1.png"
+                    alt="Crea tus propios mapas"
+            />
+            <img    className="imgCarrusel"
+                    src="2.png"
+                    alt="Guarda tus lugares favoritos" 
+             />
+             <img   className="imgCarrusel"
+                    src="3.png"
+                    alt="Ve los mapas de tus amigos"
+            />
+
+        </Box>
     );
 }
diff --git a/webapp/src/components/profileMenus/EditPassword.tsx b/webapp/src/components/profileMenus/EditPassword.tsx
@@ -1,4 +1,4 @@
-import { useForm, SubmitHandler } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { styled } from '@mui/material/styles';
 import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
@@ -80,7 +80,7 @@ export function EditPassword() {
         resolver: yupResolver(schema)
     });
 
-    const onSubmit: SubmitHandler<EditSchema> = data => tryToEdit(data);
+    const onSubmit = handleSubmit(data => tryToEdit(data));
 
 
     const [confirmPass, setConfirmPass] = useState('')
@@ -115,7 +115,7 @@ export function EditPassword() {
     }
 
     return (
-        <StyledBox component="form" onSubmit={handleSubmit(onSubmit)}>
+        <StyledBox component="form" onSubmit={onSubmit}>
             <ProfileTemplate>
                 <CSSTypography variant="h3" align="center"
                     data-testid="usernameEditProfile"

diff --git a/webapp/src/components/profileMenus/EditProfile.tsx b/webapp/src/components/profileMenus/EditProfile.tsx
@@ -1,4 +1,4 @@
-import { useForm, SubmitHandler } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { styled } from '@mui/material/styles';
 import Typography from '@mui/material/Typography';
 import Button from '@mui/material/Button';
@@ -88,7 +88,7 @@ export function EditProfile() {
         resolver: yupResolver(schema)
     });
 
-    const onSubmit: SubmitHandler<EditSchema> = data => tryToEdit(data);
+    const onSubmit = handleSubmit(data => tryToEdit(data));
 
     const user = getUserInSesion()
 
@@ -120,7 +120,7 @@ export function EditProfile() {
     }
 
     return (
-        <StyledBox component="form" onSubmit={handleSubmit(onSubmit)}>
+        <StyledBox component="form" onSubmit={onSubmit}>
 
             <ProfileTemplate>
                 <CSSTypography variant="h3" align="center"

diff --git a/webapp/src/components/userIdentification/LoginForm.tsx b/webapp/src/components/userIdentification/LoginForm.tsx
@@ -1,4 +1,4 @@
-import { useForm, SubmitHandler } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { styled } from '@mui/material/styles';
 import SForm from './SesionForm';
 import TextField from '@mui/material/TextField';
@@ -70,7 +70,7 @@ export function Login() {
     //#endregion
 
     //#region METODOS DE CLASE
-    const onSubmit: SubmitHandler<User> = data => tryLogin(data);
+    const onSubmit = handleSubmit(data => tryLogin(data));
 
     const tryLogin = (user: User) => {
         login(user).then(function (userApi: User) {
@@ -102,7 +102,7 @@ export function Login() {
                 Inicia sesión
             </CSSTypography>
 
-            <Box component="form" onSubmit={handleSubmit(onSubmit)} noValidate sx={{ mt: "1em" }}>
+            <Box component="form" onSubmit={onSubmit} noValidate sx={{ mt: "1em" }}>
                 <CSSTextField
                     sx={{ mb: "0.5em" }}
                     id="outlined-required"

diff --git a/webapp/src/components/userIdentification/SignupForm.tsx b/webapp/src/components/userIdentification/SignupForm.tsx
@@ -1,4 +1,4 @@
-import { useForm, SubmitHandler } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { styled } from '@mui/material/styles';
 import SForm from './SesionForm';
 import TextField from '@mui/material/TextField';

diff --git a/webapp/src/components/windowComponents/friends/FriendManagerPanel.tsx b/webapp/src/components/windowComponents/friends/FriendManagerPanel.tsx
@@ -14,7 +14,7 @@ import { FriendsComponent } from './FriendsComponent';
 import { FriendRequestsComponent } from './FriendRequestsComponent'
 import NotificationsActiveIcon from '@mui/icons-material/NotificationsActive';
 import GroupIcon from '@mui/icons-material/Group';
-import { useForm, SubmitHandler } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { temporalSuccessMessage } from 'utils/MessageGenerator';
 import { showError } from 'utils/fieldsValidation';
 import { verMapaDeAmigo } from 'podManager/MapManager';
@@ -107,7 +107,7 @@ export const FriendManagerPanel = () => {
     const { register, handleSubmit, formState: { errors } } = useForm<User>();
 
 
-    const onSubmit: SubmitHandler<User> = data => searchUser(data);
+    const onSubmit = handleSubmit(data => searchUser(data));
 
     const searchUser = async (user: User) => {
         await searchUserByUsername(user.username).then(async (res) => {
@@ -166,7 +166,7 @@ export const FriendManagerPanel = () => {
                         <HorizontalDivider light color="#81c784" />
                         {op === "main" ?
                             <>
-                                <AddFriendBox data-testid="addFriendForm" component="form" onSubmit={handleSubmit(onSubmit)}>
+                                <AddFriendBox data-testid="addFriendForm" component="form" onSubmit={onSubmit}>
                                     <AccountCircle sx={{ color: 'action.active', mr: 1, my: 0.5 }} />
                                     <TextField
                                         label="Añadir un amigo"

diff --git a/webapp/src/components/windowComponents/groups/groupViews/AddGroupForm.tsx b/webapp/src/components/windowComponents/groups/groupViews/AddGroupForm.tsx
@@ -1,6 +1,6 @@
 import { useNavigate } from 'react-router-dom';
 import { styled } from '@mui/material/styles';
-import { SubmitHandler, useForm } from 'react-hook-form';
+import { useForm } from 'react-hook-form';
 import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import Button from '@mui/material/Button';
@@ -77,15 +77,15 @@ export function AddGroupForm(props: { refresh: any }) {
         resolver: yupResolver(schema)
     });
 
-    const onSubmit: SubmitHandler<GroupSchema> = async(data: any) => {
-        await crearGrupo(data.groupName, session).then((grupo: Group) => {
+    const onSubmit = handleSubmit((data: any) => {
+        crearGrupo(data.groupName, session).then((grupo: Group) => {
             navigate("/home/groups/main")
             props.refresh()
             temporalSuccessMessage("Grupo <em><b>" + grupo.name + "</b></em> creado correctamente. ¡A añadir lugares se ha dicho!");
         }).catch((e: any) => {
             temporalSuccessMessage("Se ha creado todo correctamente en el POD. ¡A añadir grupos se ha dicho!");
         })
-    }
+    })
 
     const navigate = useNavigate()
 
@@ -98,7 +98,7 @@ export function AddGroupForm(props: { refresh: any }) {
                 <Typography color="black">Nuevo grupo</Typography>
             </Breadcrumbs>
         </div>
-        <Box component="form" onSubmit={handleSubmit(onSubmit)}>
+        <Box component="form" onSubmit={onSubmit}>
             <CSSTypography variant="body1" align="center"
                 sx={{ mt: "1.5em", mb: "1em" }}>
                 Nuevo grupo de lugares

diff --git a/webapp/src/components/windowComponents/places/placeViews/AddPlaceForm.tsx b/webapp/src/components/windowComponents/places/placeViews/AddPlaceForm.tsx
@@ -263,7 +263,7 @@ export default function AddPlaceForm(props: { refresh: any }) {
 
     }
 
-    const onSubmit = (data: any) => {
+    const onSubmit = handleSubmit((data: any) => {
         if (selectedImage !== null) {
 
             const fd = new FormData();
@@ -277,7 +277,7 @@ export default function AddPlaceForm(props: { refresh: any }) {
         } else { addPlaceToGroup(data, ""); }
 
 
-    };
+    })
 
     const handleCategoryChange = (event: SelectChangeEvent) => {
         setCategory(event.target.value as string);
@@ -318,7 +318,7 @@ export default function AddPlaceForm(props: { refresh: any }) {
                     <Typography color="text.primary">Nuevo lugar</Typography>
                 </Breadcrumbs>
             </div>
-            <Box component="form" onSubmit={handleSubmit(onSubmit)}>
+            <Box component="form" onSubmit={onSubmit}>
                 <CSSTypography variant="body1" align="center"
                     sx={{ mt: "0.5em", mb: "0.5em" }}>
                     Añadir lugar

diff --git a/webapp/src/test/mainComponents/ImgCarrusel.test.tsx b/webapp/src/test/mainComponents/ImgCarrusel.test.tsx
@@ -9,7 +9,7 @@ test('renders img carrusel', () => {
     let linkElement = screen.getByTestId("imgCarruselComp");
     expect(linkElement).toBeInTheDocument();
 });
-
+/*
 test('renders click on img view button', () => {
     render(
         <ImgCarrusel />
@@ -20,4 +20,4 @@ test('renders click on img view button', () => {
     fireEvent.click(button);
     linkElement = screen.getByTestId("carruselImg");
     expect(linkElement).toBeInTheDocument();
-});
+});*/