Skip to content

Commit

Permalink
Merge pull request #244 from Arquisoft/Ana-Ultima
Browse files Browse the repository at this point in the history
  • Loading branch information
uo278290 authored May 3, 2022
2 parents 8ca46eb + bd9d36e commit 1d5f7f5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ You can get more information about the respository in the other README files:
- Webapp: https://github.com/Arquisoft/dede_es2c/tree/master/webapp
- Restapi: https://github.com/Arquisoft/dede_es2c/tree/master/restapi


Two videos have been made explaining how the application works, the links to these are:
- [Administrator's vision](https://youtu.be/ZRobGjPoAA8)
- [Client's vision](https://www.youtube.com/watch?v=-E7908j38X0)

## Team members
- Ruben Rubio Del Castillo - UO276255
- Darío Martínez Bajo - UO278290
Expand Down
4 changes: 4 additions & 0 deletions README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ Encontrarás más información sobre el repositorio en los otros archivos README
- Webapp: https://github.com/Arquisoft/dede_es2c/tree/master/webapp
- Restapi: https://github.com/Arquisoft/dede_es2c/tree/master/restapi

Se han realizado dos videos explicando el funcionamiento de la aplicación, los links a estos son:
- [Visión Administrador](https://youtu.be/ZRobGjPoAA8)
- [Visión Cliente](https://www.youtube.com/watch?v=-E7908j38X0)

## Integrantes del grupo:
- Ruben Rubio Del Castillo - UO276255
- Darío Martínez Bajo - UO278290
Expand Down
2 changes: 1 addition & 1 deletion webapp/e2e/steps/Order.steps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ defineFeature(feature, test => {
});

then('An error should appear', async () => {
await expect(page3).toMatch('El titular no puede ser vacío')
await expect(page3).toMatch('Formato fecha incorrecto')
});
})

Expand Down
2 changes: 1 addition & 1 deletion webapp/src/pages/utils/HelpPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const HelpPage = () => {
<p>Esta página web presneta dos vistas, una para cliente y otra para administrador. A continuación se muestran
dos videos de como funciona cada una de ellas
</p>
<iframe width="560" height="315" src="https://www.youtube.com/embed/EMk6nom1aS4" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"></iframe>
<iframe width="560" height="315" src="https://www.youtube.com/embed/-E7908j38X0" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"></iframe>

<p>El vídeo que se muestra a continuación sería de como funciona la aplicación desde una vista de administrador</p>
<iframe width="560" height="315" src="https://www.youtube.com/embed/ZRobGjPoAA8" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" ></iframe>
Expand Down

0 comments on commit 1d5f7f5

Please sign in to comment.