-
Tallas disponibles
-
+
{tallas}
-
}/>
-
);
}
diff --git a/webapp/src/components/Home/Home.tsx b/webapp/src/components/Home/Home.tsx
index d073722..72b3a78 100644
--- a/webapp/src/components/Home/Home.tsx
+++ b/webapp/src/components/Home/Home.tsx
@@ -27,7 +27,6 @@ const Home = () => {
return (
-
@@ -71,20 +71,12 @@ const RightDetails = (parsed:parsedProduct) => {
- }
- size="medium"
- sx={{ bgcolor: '#FFFFFF', color: 'black'}}>
- Favorito
-
-
} sx={{ bgcolor: 'black' }} onClick={addToCart}>
Añadir al carrito
diff --git a/webapp/src/components/Developers/Us.tsx b/webapp/src/components/Developers/Us.tsx
new file mode 100644
index 0000000..4aad952
--- /dev/null
+++ b/webapp/src/components/Developers/Us.tsx
@@ -0,0 +1,86 @@
+import * as React from 'react';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import Divider from '@mui/material/Divider';
+import ListItemText from '@mui/material/ListItemText';
+import ListItemAvatar from '@mui/material/ListItemAvatar';
+import Avatar from '@mui/material/Avatar';
+import Typography from '@mui/material/Typography';
+import FormatListBulletedIcon from '@mui/icons-material/FormatListBulleted';
+
+const Us = () => {
+ return (
+ <>
+
diff --git a/webapp/src/test/Cart/CartButtons.test.tsx b/webapp/src/test/Cart/CartButtons.test.tsx
index 3100509..55dc725 100644
--- a/webapp/src/test/Cart/CartButtons.test.tsx
+++ b/webapp/src/test/Cart/CartButtons.test.tsx
@@ -1,10 +1,11 @@
import { render } from "@testing-library/react";
-import ShoesCart from "../../components/Cart/ShoesCart";
+import CartButtons from "../../components/Cart/CartButons";
test("Carrito vacio", async () => {
- const { getByText } = render(-
+
- {
width: '200%',
maxWidth: 500,
bgcolor: 'background.paper' }}>
-
+
+ Carrito vacio
+
+
+ ])
+ }
-
- {pedidos.map(item =>
-
-
- );
- };
- export default Requests;
diff --git a/webapp/src/test/Cart/ShoesCart.test.tsx b/webapp/src/test/Cart/ShoesCart.test.tsx
index fe5fa41..a1c705f 100644
--- a/webapp/src/test/Cart/ShoesCart.test.tsx
+++ b/webapp/src/test/Cart/ShoesCart.test.tsx
@@ -5,5 +5,6 @@ test("Carrito vacio", async () => {
const { getByText } = render(
- } sx={{ bgcolor: 'black' }} onClick={addToCart}>
+ } sx={{ bgcolor: 'black' }} onClick={addToCart}
+ data-testid="cart">
Añadir al carrito
diff --git a/webapp/src/components/Login/LoginUsrPsswd.tsx b/webapp/src/components/Login/LoginUsrPsswd.tsx
index 545f2c2..3898aee 100644
--- a/webapp/src/components/Login/LoginUsrPsswd.tsx
+++ b/webapp/src/components/Login/LoginUsrPsswd.tsx
@@ -88,7 +88,8 @@ const LoginUsrPsswd = () => {
variant="contained"
size="large"
color="primary"
- className={classes.loginBtn}>
+ className={classes.loginBtn}
+ data-testid="addUser">
Login
diff --git a/webapp/src/components/Login/Register.tsx b/webapp/src/components/Login/Register.tsx
index d431c11..bae5274 100644
--- a/webapp/src/components/Login/Register.tsx
+++ b/webapp/src/components/Login/Register.tsx
@@ -110,6 +110,7 @@ const Register = () => {
size="large"
color="primary"
className={classes.loginBtn}
+ data-testid="register"
>
Registrarse
diff --git a/webapp/src/components/Requests/ListRequests.tsx b/webapp/src/components/Requests/ListRequests.tsx
index b05e151..358bea6 100644
--- a/webapp/src/components/Requests/ListRequests.tsx
+++ b/webapp/src/components/Requests/ListRequests.tsx
@@ -26,7 +26,6 @@ const ListRequests = () => {
width: '200%',
maxWidth: 500,
bgcolor: 'background.paper' }}>
- { console.log(pedidos) }
{
Object.keys(pedidos).length !== 0 ? (
pedidos.map(item =>
diff --git a/webapp/src/test/App.test.tsx b/webapp/src/test/App.test.tsx
new file mode 100644
index 0000000..a0f27be
--- /dev/null
+++ b/webapp/src/test/App.test.tsx
@@ -0,0 +1,6 @@
+import { render } from "@testing-library/react";
+import App from "../App";
+
+test("App correcto", async () => {
+ render(
-
-
- Precio total sin gastos de Envio: {calcularValor()}
-
+ { calcularValor()>0 ? (
+ <>
+
+ Precio total sin gastos de Envio: {calcularValor()}
+
+ } sx={{ bgcolor: 'black' }} size='large' to={linkFinalizarCompra} component={Link}>
+ Loggeate para Finalizar Compra
+
+
+ ): ([
+
+
+ UPS! Parece que tu carrito está vacío
+
-
- } sx={{ bgcolor: 'black' }} size='large' to = {linkFinalizarCompra} component={Link}>
- Loggeate para Finalizar Compra
-
+ ]
+ )}
- } sx={{ bgcolor: 'black' }} onClick={addToCart}
+ } sx={{ bgcolor: 'black' }} onClick={addToCart}
data-testid="cart">
Añadir al carrito
diff --git a/webapp/src/test/Details/LeftDetails.test.tsx b/webapp/src/test/Details/LeftDetails.test.tsx
index 6fb8ec3..1542d02 100644
--- a/webapp/src/test/Details/LeftDetails.test.tsx
+++ b/webapp/src/test/Details/LeftDetails.test.tsx
@@ -1,10 +1,21 @@
import React from 'react';
import { screen, render } from "@testing-library/react";
import LeftDetails from '../../components/Details/LeftDetails';
-
+import {ObjectId} from 'bson';
+import { TypeProduct } from '../../shared/shareddtypes';
test('Left Details funcionando', async() => {
+ const strObject : ObjectId = new ObjectId("62598df82841d14b30fbd6b1");
+ const product: TypeProduct[] = [{
+ _objectId: strObject,
+ id: "1b",
+ imagen: "https://i.imgur.com/dHfRXIu.jpg",
+ nombre: "Adidas Pixar",
+ precio: 119.99,
+ descripcion: "Zapatilla con personajes de Pixar animacion"
+ }];
+
- render();
const deLado1 = screen.getByAltText("De lado 1");
expect(deLado1).toBeInTheDocument();
From 7d0730e20e05dbe9f8867d77e91dc0dd62d0d34f Mon Sep 17 00:00:00 2001
From: UO277876 <79647031+UO277876@users.noreply.github.com>
Date: Sun, 1 May 2022 02:02:57 +0200
Subject: [PATCH 59/80] Test buscar por id funcionando
---
restapi/api.ts | 39 +++++++++++++++++++++++++++++++++++++-
restapi/tests/api.test.tsx | 19 +++++++++++++++++--
2 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/restapi/api.ts b/restapi/api.ts
index 2f6a982..b6a08cc 100644
--- a/restapi/api.ts
+++ b/restapi/api.ts
@@ -2,7 +2,7 @@ import express, { Request, Response, Router } from 'express';
import { check } from 'express-validator';
import { ObjectId } from 'bson';
//import mongoose from 'mongoose';
-import { IProducto, Producto, ProductoDoc} from './modelos/productoModelo';
+import { Producto, ProductoDoc} from './modelos/productoModelo';
const api: Router = express.Router();
@@ -69,6 +69,43 @@ api.get('/products/list', async (req: Request, res: Response) => {
return res.status(200).send(resultado)
});
+ api.get('/products/detalles/:referencia', async (req: Request, res: Response) => {
+ //formato de salida que espera el front-end
+ type TypeProduct = {
+ _objectId: ObjectId;
+ id: String;
+ nombre: String;
+ precio: Number;
+ descripcion: String;
+ imagen: String;
+ }
+
+ let resultado:TypeProduct[] = new Array();
+ //Parametro referencia
+ const ref:string = req.params.referencia;
+ //Realizamos la busqueda por referencia
+ const product = await Producto.findOne({referencia: ref})
+ console.log(product);
+ if(product){
+ let entrada:ProductoDoc = product;
+ let salida: TypeProduct = ({ _objectId: entrada._id, id: "", nombre:"",precio:0,descripcion:"",imagen: "" });
+ salida.id = entrada.referencia;
+ salida.nombre = entrada.marca + " " +entrada.modelo;
+ salida.precio = entrada.precio
+ salida.descripcion = entrada.descripcion;
+
+ if (entrada.fotos.length != 0)
+ salida.imagen = entrada.fotos[0].ruta;
+ else
+ salida.imagen = "" //buscar una imagen por defecto si no hay principal
+ resultado.push(salida)
+ return res.status(200).send(resultado)
+ } else{
+ return res.status(500).json();
+ }
+
+ })
+
module.exports = api;
export default api;
\ No newline at end of file
diff --git a/restapi/tests/api.test.tsx b/restapi/tests/api.test.tsx
index 2b1e2a6..ec66a34 100644
--- a/restapi/tests/api.test.tsx
+++ b/restapi/tests/api.test.tsx
@@ -1,7 +1,7 @@
import request, { Response } from 'supertest';
import { Application } from 'express';
-import { } from '../modelos/productoModelo';
-import { Types } from 'mongoose';
+import { ProductoDoc } from '../modelos/productoModelo';
+import { ObjectId } from 'bson';
let app: Application;
//let server: http.Server;
@@ -73,6 +73,21 @@ describe('producto', () => {
expect(productos.length).toEqual(11);
});
+ /**
+ * Encontrar un producto por su referencia
+ */
+ it('find by id', async () => {
+ const strObject : ObjectId = new ObjectId("62598ac12841d14b30fbd698");
+
+ const response: Response = await request(app).get("/api/products/detalles/"+"9z");
+ const producto: [] = response.body;
+
+ // todo en orden
+ expect(response.statusCode).toBe(200);
+
+ expect(producto.length).toEqual(1);
+ });
+
/**
* Probar que no obtenemos nada al buscar un producto que no existe
From a5561aa59afc7571d7ac2d6e8c4c6c068e20e993 Mon Sep 17 00:00:00 2001
From: UO277876 <79647031+UO277876@users.noreply.github.com>
Date: Sun, 1 May 2022 02:11:33 +0200
Subject: [PATCH 60/80] test pedidos
---
restapi/api.ts | 28 +++++++++++++++++++++++++++-
restapi/tests/api.test.tsx | 26 +++++++++++++++++++++-----
2 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/restapi/api.ts b/restapi/api.ts
index b6a08cc..dc181eb 100644
--- a/restapi/api.ts
+++ b/restapi/api.ts
@@ -3,6 +3,7 @@ import { check } from 'express-validator';
import { ObjectId } from 'bson';
//import mongoose from 'mongoose';
import { Producto, ProductoDoc} from './modelos/productoModelo';
+import { Pedido, PedidoDoc } from './modelos/pedidoModelo';
const api: Router = express.Router();
@@ -85,7 +86,6 @@ api.get('/products/list', async (req: Request, res: Response) => {
const ref:string = req.params.referencia;
//Realizamos la busqueda por referencia
const product = await Producto.findOne({referencia: ref})
- console.log(product);
if(product){
let entrada:ProductoDoc = product;
let salida: TypeProduct = ({ _objectId: entrada._id, id: "", nombre:"",precio:0,descripcion:"",imagen: "" });
@@ -106,6 +106,32 @@ api.get('/products/list', async (req: Request, res: Response) => {
})
+ api.get('/pedidos/list/:usuario', async (req: Request, res: Response) => {
+ //formato de salida que espera el front-end
+ type TypeOrder = {
+ _objectId: ObjectId;
+ usuario: String;
+ precio: Number;
+ contenido: Array;
+ }
+
+ let resultado:TypeOrder[] = new Array();
+ //Parametro usuario
+ const user:string = req.params.usuario;
+ //Realizamos la busqueda por usuario
+ const orders:PedidoDoc[] = await Pedido.find({usuario: user})
+
+ for(var i=0; i< orders.length; i++) {
+ let entrada:PedidoDoc = orders[i];
+ let salida: TypeOrder = ({ _objectId: entrada._id, usuario: "", precio:0, contenido:[] });
+ salida.usuario = entrada.usuario;
+ salida.precio = entrada.precio;
+ salida.contenido = entrada.contenido;
+
+ resultado.push(salida);
+ }
+ return res.status(200).send(resultado);
+ })
module.exports = api;
export default api;
\ No newline at end of file
diff --git a/restapi/tests/api.test.tsx b/restapi/tests/api.test.tsx
index ec66a34..18b7a98 100644
--- a/restapi/tests/api.test.tsx
+++ b/restapi/tests/api.test.tsx
@@ -1,7 +1,5 @@
import request, { Response } from 'supertest';
import { Application } from 'express';
-import { ProductoDoc } from '../modelos/productoModelo';
-import { ObjectId } from 'bson';
let app: Application;
//let server: http.Server;
@@ -76,10 +74,10 @@ describe('producto', () => {
/**
* Encontrar un producto por su referencia
*/
- it('find by id', async () => {
- const strObject : ObjectId = new ObjectId("62598ac12841d14b30fbd698");
+ it('find by referencia', async () => {
+ const referencia = "9z";
- const response: Response = await request(app).get("/api/products/detalles/"+"9z");
+ const response: Response = await request(app).get("/api/products/detalles/"+ referencia);
const producto: [] = response.body;
// todo en orden
@@ -100,4 +98,22 @@ describe('producto', () => {
// El código de respuesta debería ser 404 (no encontrado)
expect(response.statusCode).toBe(404);
});
+});
+
+describe('pedidos', () => {
+ /**
+ * Encontrar los pedidos de un usuario
+ */
+ it('can be listed by user', async () => {
+ const user = "admin";
+
+ const response: Response = await request(app).get("/api/pedidos/list/" + user);
+ const pedidos: [] = response.body;
+
+ // todo en orden
+ expect(response.statusCode).toBe(200);
+
+ // admin tiene 3 pedidos
+ expect(pedidos.length).toEqual(3);
+ });
});
\ No newline at end of file
From c1dffe6587af0928cddc17ed134a61572e0fb062 Mon Sep 17 00:00:00 2001
From: UO277876 <79647031+UO277876@users.noreply.github.com>
Date: Sun, 1 May 2022 02:29:57 +0200
Subject: [PATCH 61/80] Arreglados test + code smells
---
restapi/tests/api.test.tsx | 3 ---
restapi/tests/servidor_test.tsx | 1 -
webapp/src/components/Details/LeftDetails.tsx | 1 +
webapp/src/test/Cart/CartButtons.test.tsx | 4 ++--
webapp/src/test/Details/LeftDetails.test.tsx | 14 ++------------
5 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/restapi/tests/api.test.tsx b/restapi/tests/api.test.tsx
index 18b7a98..239154e 100644
--- a/restapi/tests/api.test.tsx
+++ b/restapi/tests/api.test.tsx
@@ -65,7 +65,6 @@ describe('producto', () => {
const response: Response = await request(app).get("/api/products/list");
const productos: [] = response.body;
- // todo en orden
expect(response.statusCode).toBe(200);
expect(productos.length).toEqual(11);
@@ -80,7 +79,6 @@ describe('producto', () => {
const response: Response = await request(app).get("/api/products/detalles/"+ referencia);
const producto: [] = response.body;
- // todo en orden
expect(response.statusCode).toBe(200);
expect(producto.length).toEqual(1);
@@ -110,7 +108,6 @@ describe('pedidos', () => {
const response: Response = await request(app).get("/api/pedidos/list/" + user);
const pedidos: [] = response.body;
- // todo en orden
expect(response.statusCode).toBe(200);
// admin tiene 3 pedidos
diff --git a/restapi/tests/servidor_test.tsx b/restapi/tests/servidor_test.tsx
index 1a98fb5..7ba7113 100644
--- a/restapi/tests/servidor_test.tsx
+++ b/restapi/tests/servidor_test.tsx
@@ -4,7 +4,6 @@
*/
const { MongoMemoryServer } = require("mongodb-memory-server");
- // const mongod = await MongoMemoryServer.create();
const express = require('express');
const cors = require('cors');
const mongoose = require('mongoose');
diff --git a/webapp/src/components/Details/LeftDetails.tsx b/webapp/src/components/Details/LeftDetails.tsx
index fb4118c..fe5c09d 100644
--- a/webapp/src/components/Details/LeftDetails.tsx
+++ b/webapp/src/components/Details/LeftDetails.tsx
@@ -17,6 +17,7 @@ const LeftDetails = (parsed:parsedProduct) => {
);
diff --git a/webapp/src/test/Cart/CartButtons.test.tsx b/webapp/src/test/Cart/CartButtons.test.tsx
index ce20252..46b2643 100644
--- a/webapp/src/test/Cart/CartButtons.test.tsx
+++ b/webapp/src/test/Cart/CartButtons.test.tsx
@@ -5,8 +5,8 @@ import CartButtons from "../../components/Cart/CartButons";
test("CartButons basico", async () => {
const { getByText } = render();
- const deLado1 = screen.getByAltText("De lado 1");
- expect(deLado1).toBeInTheDocument();
- const diagonalFrente = screen.getByAltText("Diagonal de frente");
- expect(diagonalFrente).toBeInTheDocument();
- const deLado2 = screen.getByAltText("De lado 2");
- expect(deLado2).toBeInTheDocument();
- const deArriba = screen.getByAltText("De arriba");
- expect(deArriba).toBeInTheDocument();
- const deAtras = screen.getByAltText("De atras");
- expect(deAtras).toBeInTheDocument();
- const deAbajo = screen.getByAltText("Abajo");
- expect(deAbajo).toBeInTheDocument();
+ const imagen = screen.getByAltText("imagen1");
+ expect(imagen).toBeInTheDocument();
});
\ No newline at end of file
From 403a722d2fe40240ccdfdb66d12c84d74f0ade9f Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 13:17:28 +0200
Subject: [PATCH 62/80] prueba 10
---
restapi/server.ts | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/restapi/server.ts b/restapi/server.ts
index bd2d5e6..1856457 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -6,7 +6,7 @@ import { productoRouter } from './rutas/productoRutas';
import { usuarioRouter } from './rutas/usuarioRutas';
import { pedidoRouter } from './rutas/pedidoRutas';
import "dotenv/config";
-
+import path from "path";
const app = express()
app.use(json())
app.use(cors())
@@ -15,6 +15,9 @@ app.use(productoRouter)
app.use(usuarioRouter)
app.use(pedidoRouter)
+app.get("*", (req, res) => {
+ res.sendFile(path.join(__dirname, "..", "..", "..", "webapp", "build", "index.html"));
+});
mongoose
.connect(`${process.env.MONGODB_URI}`, {
useNewUrlParser: true,
From 632f04b1af001490b30105a4ed1c76e107bb1783 Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 13:27:18 +0200
Subject: [PATCH 63/80] prueba heroku 11
---
restapi/server.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/restapi/server.ts b/restapi/server.ts
index 1856457..b36a3fc 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -15,6 +15,8 @@ app.use(productoRouter)
app.use(usuarioRouter)
app.use(pedidoRouter)
+app.use(express.static(path.join(__dirname, "..", "..", "..", "webapp", "build")))
+
app.get("*", (req, res) => {
res.sendFile(path.join(__dirname, "..", "..", "..", "webapp", "build", "index.html"));
});
From a930e7b8b71730ac3f7284fc4683e336a777453c Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 13:42:38 +0200
Subject: [PATCH 64/80] prueba 12
---
restapi/config.ts | 15 +++++++++++++++
restapi/server.ts | 30 ++++++++++++------------------
2 files changed, 27 insertions(+), 18 deletions(-)
create mode 100644 restapi/config.ts
diff --git a/restapi/config.ts b/restapi/config.ts
new file mode 100644
index 0000000..d9eb5e1
--- /dev/null
+++ b/restapi/config.ts
@@ -0,0 +1,15 @@
+import dotenv from 'dotenv';
+import path from 'path';
+
+if (process.env.NODE_ENV != 'production') {
+ dotenv.config({path: path.resolve(__dirname, '.env')});
+}
+
+const config = {
+ jwt_secret: process.env.JWT_SECRET || 'unsafe_jwt_secret',
+ mongoose: {
+ uri: 'mongodb+srv://admin:admin1234@dede-es3a.thyhc.mongodb.net/dede?retryWrites=true&w=majority'
+ },
+}
+
+export default config;
\ No newline at end of file
diff --git a/restapi/server.ts b/restapi/server.ts
index b36a3fc..895227b 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -2,9 +2,11 @@ import express from 'express';
import cors from "cors";
import mongoose from 'mongoose';
import { json } from 'body-parser';
+import config from './config'
import { productoRouter } from './rutas/productoRutas';
import { usuarioRouter } from './rutas/usuarioRutas';
import { pedidoRouter } from './rutas/pedidoRutas';
+import http from 'http';
import "dotenv/config";
import path from "path";
const app = express()
@@ -20,21 +22,13 @@ app.use(express.static(path.join(__dirname, "..", "..", "..", "webapp", "build")
app.get("*", (req, res) => {
res.sendFile(path.join(__dirname, "..", "..", "..", "webapp", "build", "index.html"));
});
-mongoose
- .connect(`${process.env.MONGODB_URI}`, {
- useNewUrlParser: true,
- useUnifiedTopology: true
- })
- .then(() => console.log("Conectado a la base de datos MongoDB "))
- .catch((err) => console.error("Error al conectar a MongoDB", err));
-
-//Heroku asigna el puerto de forma dinámica. (process.env.PORT)
-const PORT = process.env.PORT || 5000
-
-app
- .listen(PORT, (): void => {
- console.log(`REST api escuchando en el puerto ${PORT}`);
- })
- .on("error", (error: Error) => {
- console.error("Error ocurrido: " + error.message);
- });
+mongoose.Promise = global.Promise;
+mongoose.connect(config.mongoose.uri)
+ .catch(err => console.error(err))
+ .then(() => {
+ // Server Setup
+ const port = process.env.PORT || 8000
+ http.createServer(app).listen(port, () => {
+ console.log(`\x1b[32m`, `Server listening on: ${port}`, `\x1b[0m`)
+ });
+ });
From 5029b53eb50b411be0b8866be8706338ae65c31a Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 13:53:07 +0200
Subject: [PATCH 65/80] prueba 12
---
webapp/Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index aff0cd5..3d8fe01 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -6,7 +6,6 @@ WORKDIR /app
RUN npm install
#Create an optimized version of the webapp
-RUN npm run build
#Ver como podemos llamar npm run prod aquí
-CMD [ "npm", "run", "prod" ]
\ No newline at end of file
+CMD [ "npm","start","run", "prod" ]
\ No newline at end of file
From c1ba8102ec6c9979baa7aadf73c533ea2aafc051 Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 14:11:40 +0200
Subject: [PATCH 66/80] prueba 12
---
restapi/server.ts | 2 +-
webapp/Dockerfile | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/restapi/server.ts b/restapi/server.ts
index 895227b..2fb08f6 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -1,4 +1,4 @@
-import express from 'express';
+import express, {Request, Response} from 'express';
import cors from "cors";
import mongoose from 'mongoose';
import { json } from 'body-parser';
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 3d8fe01..aff0cd5 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -6,6 +6,7 @@ WORKDIR /app
RUN npm install
#Create an optimized version of the webapp
+RUN npm run build
#Ver como podemos llamar npm run prod aquí
-CMD [ "npm","start","run", "prod" ]
\ No newline at end of file
+CMD [ "npm", "run", "prod" ]
\ No newline at end of file
From c6b01e87cb83ef136ef8eedfea550cb40fa10004 Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 14:29:08 +0200
Subject: [PATCH 67/80] prueba 13
---
package-lock.json | 23 ++++++++++-
package.json | 3 +-
restapi/package-lock.json | 87 +++++++++++++++++++++++++++++++++++++++
restapi/package.json | 1 +
restapi/server.ts | 9 +++-
5 files changed, 118 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 3b048ce..9a0b812 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "dede_es3a-1",
+ "name": "dede_es3a",
"lockfileVersion": 2,
"requires": true,
"packages": {
@@ -17,7 +17,8 @@
"prom-client": "^14.0.1"
},
"devDependencies": {
- "@types/mongoose": "^5.11.97"
+ "@types/mongoose": "^5.11.97",
+ "@types/morgan": "^1.9.3"
}
},
"node_modules/@ampproject/remapping": {
@@ -2137,6 +2138,15 @@
"mongoose": "*"
}
},
+ "node_modules/@types/morgan": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.9.3.tgz",
+ "integrity": "sha512-BiLcfVqGBZCyNCnCH3F4o2GmDLrpy0HeBVnNlyZG4fo88ZiE9SoiBe3C+2ezuwbjlEyT+PDZ17//TAlRxAn75Q==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
"node_modules/@types/n3": {
"version": "1.10.4",
"resolved": "https://registry.npmjs.org/@types/n3/-/n3-1.10.4.tgz",
@@ -12001,6 +12011,15 @@
"mongoose": "*"
}
},
+ "@types/morgan": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.9.3.tgz",
+ "integrity": "sha512-BiLcfVqGBZCyNCnCH3F4o2GmDLrpy0HeBVnNlyZG4fo88ZiE9SoiBe3C+2ezuwbjlEyT+PDZ17//TAlRxAn75Q==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ },
"@types/n3": {
"version": "1.10.4",
"resolved": "https://registry.npmjs.org/@types/n3/-/n3-1.10.4.tgz",
diff --git a/package.json b/package.json
index 77f771b..aca04e9 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
"prom-client": "^14.0.1"
},
"devDependencies": {
- "@types/mongoose": "^5.11.97"
+ "@types/mongoose": "^5.11.97",
+ "@types/morgan": "^1.9.3"
}
}
diff --git a/restapi/package-lock.json b/restapi/package-lock.json
index f40a901..cabd87d 100644
--- a/restapi/package-lock.json
+++ b/restapi/package-lock.json
@@ -17,6 +17,7 @@
"express-validator": "^6.14.0",
"mongodb-memory-server": "^8.5.2",
"mongoose": "^5.10.0",
+ "morgan": "^1.10.0",
"node-fetch": "^2.6.7",
"prom-client": "^14.0.1",
"supertest": "^6.2.3"
@@ -1571,6 +1572,22 @@
}
]
},
+ "node_modules/basic-auth": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+ "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+ "dependencies": {
+ "safe-buffer": "5.1.2"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/basic-auth/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -4491,6 +4508,29 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
+ "node_modules/morgan": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+ "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+ "dependencies": {
+ "basic-auth": "~2.0.1",
+ "debug": "2.6.9",
+ "depd": "~2.0.0",
+ "on-finished": "~2.3.0",
+ "on-headers": "~1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/morgan/node_modules/depd": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
"node_modules/mpath": {
"version": "0.8.4",
"resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.4.tgz",
@@ -4665,6 +4705,14 @@
"node": ">= 0.8"
}
},
+ "node_modules/on-headers": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+ "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
"node_modules/once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -7429,6 +7477,21 @@
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
},
+ "basic-auth": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+ "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+ "requires": {
+ "safe-buffer": "5.1.2"
+ },
+ "dependencies": {
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ }
+ }
+ },
"binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -9645,6 +9708,25 @@
"integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==",
"requires": {}
},
+ "morgan": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+ "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+ "requires": {
+ "basic-auth": "~2.0.1",
+ "debug": "2.6.9",
+ "depd": "~2.0.0",
+ "on-finished": "~2.3.0",
+ "on-headers": "~1.0.2"
+ },
+ "dependencies": {
+ "depd": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+ }
+ }
+ },
"mpath": {
"version": "0.8.4",
"resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.4.tgz",
@@ -9777,6 +9859,11 @@
"ee-first": "1.1.1"
}
},
+ "on-headers": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+ "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
+ },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
diff --git a/restapi/package.json b/restapi/package.json
index 64f38a5..aa4640b 100644
--- a/restapi/package.json
+++ b/restapi/package.json
@@ -17,6 +17,7 @@
"express-validator": "^6.14.0",
"mongodb-memory-server": "^8.5.2",
"mongoose": "^5.10.0",
+ "morgan": "^1.10.0",
"node-fetch": "^2.6.7",
"prom-client": "^14.0.1",
"supertest": "^6.2.3"
diff --git a/restapi/server.ts b/restapi/server.ts
index 2fb08f6..b2c0455 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -1,6 +1,7 @@
import express, {Request, Response} from 'express';
import cors from "cors";
import mongoose from 'mongoose';
+import morgan from 'morgan';
import { json } from 'body-parser';
import config from './config'
import { productoRouter } from './rutas/productoRutas';
@@ -10,9 +11,13 @@ import http from 'http';
import "dotenv/config";
import path from "path";
const app = express()
-app.use(json())
-app.use(cors())
+app.use(cors({
+ origin: ['http://localhost:3000'] // Fronted URL goes here
+}));
+app.use(morgan('dev'));
+app.use(express.json()) // for parsing application/json
+app.use(express.urlencoded({extended: true})) // for parsing application/x-www-form-urlencoded
app.use(productoRouter)
app.use(usuarioRouter)
app.use(pedidoRouter)
From 648a4dedd4afa2f8fc620b49ad5886a811fa6048 Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 14:38:15 +0200
Subject: [PATCH 68/80] prueba 15
---
restapi/server.ts | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/restapi/server.ts b/restapi/server.ts
index b2c0455..87fe78f 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -12,9 +12,7 @@ import "dotenv/config";
import path from "path";
const app = express()
-app.use(cors({
- origin: ['http://localhost:3000'] // Fronted URL goes here
-}));
+
app.use(morgan('dev'));
app.use(express.json()) // for parsing application/json
app.use(express.urlencoded({extended: true})) // for parsing application/x-www-form-urlencoded
From fe09574c7fcb5ca423e6beac3525ad526f0fa6a0 Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 14:48:16 +0200
Subject: [PATCH 69/80] prueba 15
---
restapi/server.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/restapi/server.ts b/restapi/server.ts
index 87fe78f..cce612c 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -13,17 +13,17 @@ import path from "path";
const app = express()
-app.use(morgan('dev'));
-app.use(express.json()) // for parsing application/json
-app.use(express.urlencoded({extended: true})) // for parsing application/x-www-form-urlencoded
+app.use(json())
+app.use(cors())
+
app.use(productoRouter)
app.use(usuarioRouter)
app.use(pedidoRouter)
-app.use(express.static(path.join(__dirname, "..", "..", "..", "webapp", "build")))
+app.use(express.static(path.join(__dirname, "..", "webapp", "build")))
app.get("*", (req, res) => {
- res.sendFile(path.join(__dirname, "..", "..", "..", "webapp", "build", "index.html"));
+ res.sendFile(path.join(__dirname, "..", "webapp", "build", "index.html"));
});
mongoose.Promise = global.Promise;
mongoose.connect(config.mongoose.uri)
From bf30e434740bd937b8fdb2c8dcf79049ba9bf129 Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 15:22:42 +0200
Subject: [PATCH 70/80] prueba 16
---
restapi/server.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/restapi/server.ts b/restapi/server.ts
index cce612c..cc256c9 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -1,7 +1,6 @@
import express, {Request, Response} from 'express';
import cors from "cors";
import mongoose from 'mongoose';
-import morgan from 'morgan';
import { json } from 'body-parser';
import config from './config'
import { productoRouter } from './rutas/productoRutas';
From 1def8e231624c8099aff505384fcc272a0a0cda5 Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 15:22:47 +0200
Subject: [PATCH 71/80] prueba 16
---
webapp/server.ts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/webapp/server.ts b/webapp/server.ts
index 9736571..784241d 100644
--- a/webapp/server.ts
+++ b/webapp/server.ts
@@ -1,4 +1,5 @@
import express,{Application} from 'express';
+import path from "path";
//for using an import here we need to configure the tsconfig.json
//setting the option module to commonjs
@@ -14,7 +15,11 @@ export
return port;
}
-app.use(express.static('build'))
+ app.use(express.static(path.join(__dirname, 'build')));
+
+ app.get('/*', function (req, res) {
+ res.sendFile(path.join(__dirname, 'build', 'index.html'));
+ });
app.listen(port, ():void => {
console.log('Webapp started on port '+ port);
From b10da41ff80384ce4019387cb57342477543747a Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 15:37:57 +0200
Subject: [PATCH 72/80] despliegue funcionando solucionado problema Cannot Get/
---
webapp/src/components/Login/FormLogIn.tsx | 4 ++--
webapp/src/components/Login/Register.tsx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/webapp/src/components/Login/FormLogIn.tsx b/webapp/src/components/Login/FormLogIn.tsx
index 47d78ad..3b58ddc 100644
--- a/webapp/src/components/Login/FormLogIn.tsx
+++ b/webapp/src/components/Login/FormLogIn.tsx
@@ -34,7 +34,7 @@ const useStyles = makeStyles((theme: Theme) =>
const FormLogIn = () => {
const classes = useStyles();
const [idp, setIdp] = useState("https://inrupt.net");
- const [currentUrl, setCurrentUrl] = useState("https://localhost:3000");
+ const [currentUrl, setCurrentUrl] = useState(window.location.protocol + '//' + window.location.host + '/');
useEffect(() => {
setCurrentUrl(window.location.href);
@@ -56,7 +56,7 @@ const FormLogIn = () => {
onChange={(e) => setIdp(e.target.value)}
InputProps={{
endAdornment: (
-
+
diff --git a/webapp/src/components/Login/Register.tsx b/webapp/src/components/Login/Register.tsx
index bae5274..78db363 100644
--- a/webapp/src/components/Login/Register.tsx
+++ b/webapp/src/components/Login/Register.tsx
@@ -54,7 +54,7 @@ const Register = () => {
// Almacenamos el usuario en sesión
sessionStorage.setItem('user',JSON.stringify(item));
alert("Usuario añadido");
- window.location.href='http://localhost:3000/';
+ window.location.href = window.location.protocol + '//' + window.location.host + '/'
}
else{
alert("Credenciales inválidas");
From bc41d5a6efb5aab1341e60280e5b5e68f97c1495 Mon Sep 17 00:00:00 2001
From: UO271447
Date: Sun, 1 May 2022 15:38:13 +0200
Subject: [PATCH 73/80] solucionado problema Cannot Get /
---
webapp/src/components/Login/LoginUsrPsswd.tsx | 1 -
webapp/src/components/POD/GastosEnvio.tsx | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/webapp/src/components/Login/LoginUsrPsswd.tsx b/webapp/src/components/Login/LoginUsrPsswd.tsx
index b2af724..29cee52 100644
--- a/webapp/src/components/Login/LoginUsrPsswd.tsx
+++ b/webapp/src/components/Login/LoginUsrPsswd.tsx
@@ -55,7 +55,6 @@ const LoginUsrPsswd = () => {
sessionStorage.setItem('user', parsedUser.username);
// Redirigimos a inicio
//window.location.href='http://localhost:3000/';
- console.log('Te como el pito');
window.location.href = window.location.protocol + '//' + window.location.host + '/'
}
}
diff --git a/webapp/src/components/POD/GastosEnvio.tsx b/webapp/src/components/POD/GastosEnvio.tsx
index 11c336c..06888ca 100644
--- a/webapp/src/components/POD/GastosEnvio.tsx
+++ b/webapp/src/components/POD/GastosEnvio.tsx
@@ -81,7 +81,7 @@ function GastosEnvio(): JSX.Element {
- } size='large' onClick={FinishBuying} href='http://localhost:3000'>
+ } size='large' onClick={FinishBuying} href={window.location.protocol + '//' + window.location.host + '/'}>
Finalizar Compra
From a66b80a1b3e443a958e03ccc7679a536d075ee62 Mon Sep 17 00:00:00 2001
From: UO271447