Feature/test footer

CHANGELOG.md

@@ -18,3 +18,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [unreleased]: https://github.com/frlp-utn-ingsoft/shopp/compare/v1.0.0...HEAD
 [1.0.0]: https://github.com/frlp-utn-ingsoft/shopp/releases/tag/v1.0.0
+
+## [1.2.6] - 2022-06-22
+
+### Added
+Footer con datos de contacto 
+Descripción de todos los  producto
+
+
+### Fixed:
+Se añadió la traducción de las categorías
+Se anadió el mensaje de carrito vacío
+Se eliminó el botón anterior de la primer página
+Se eliminó el botón siguiente de la última página
+Se corrigió el bug del package de deploy
+Se corrigieron las dependencias a utilizar
+
+### Metrics:
+Performance inicial: 87% / Performance final: 100%
+Accessibility inicial: 91% / Accessibility final: 100%
+Best Practices inicial: 83% / Best Practices final: 100%
+SEO inicial: 92% / SEO final: 92%

fixtures/products.json

@@ -3,72 +3,84 @@
         "discount": 5,
         "name": "Placard",
         "price": 50000,
+        "description":"Placard de algarrobo de 1.90 x 0.30 x 2.5",
         "type": "home"
     },
     {
         "discount": 10,
         "name": "Mesa",
         "price": 25000,
+        "description":"Mesa de pino de 1.60 x 0.80",
         "type": "home"
     },
     {
         "discount": 0,
         "name": "Silla",
         "price": 5000,
+        "description":"Silla de pino 'confy', ideal para el estudiante",
         "type": "home"
     },
     {
         "discount": 0,
         "name": "Mesa de Luz",
         "price": 8000,
+        "description":"Mesa de pino de 1.60 x 0.80",
         "type": "home"
     },
     {
         "discount": 0,
         "name": "Sillon",
         "price": 85000,
+        "description":"Sillon sofa 2 cuerpos",
         "type": "home"
     },
     {
         "discount": 0,
         "name": "Cama",
         "price": 45000,
+        "description":"Cama dos plazas king",
         "type": "home"
     },
     {
         "discount": 0,
         "name": "Rack TV",
         "price": 25000,
+        "description":"Rack TV nordico ",
         "type": "home"
     },
     {
         "discount": 0,
         "name": "TV",
         "price": 55000,
+        "description":"Smart TV 45 pulgadas",
         "type": "electronics"
     },
     {
         "discount": 0,
         "name": "PS4",
         "price": 75000,
+        "description":"Sony PS4 edición Destiny - Incluye destiny 2 de regalo",
         "type": "electronics"
     },
     {
         "discount": 0,
         "name": "PS5",
         "price": 175000,
+        "description":"Nueva PS5 con 3 juegos de regalo. Edición física",
         "type": "electronics"
     },
     {
         "discount": 0,
         "name": "Barra de sonido",
         "price": 35000,
+        "description": "Barra de sonido Skull Candy con bluetoth de última generación",
         "type": "electronics"
     },
     {
         "discount": 0,
         "name": "Laptop",
         "price": 350000,
+        "description": "Laptop MSI de 15.2 pulgadas, intel core I7, 16 GB de ram y placa de video Nvidia GTX 1660",
         "type": "electronics"
     }
 ]

package.json

@@ -5,7 +5,7 @@
     "main": "src/index.js",
     "scripts": {
         "db:fixture": "node ./fixtures/index.js",
-        "start": "node ./src/index.js",
+        "start": "node ./fixtures/index.js && node ./src/index.js",
         "dev": "nodemon ./src/index.js -e js,css,html",
         "test": "jest",
         "test:coverage": "jest --collectCoverage",
@@ -33,14 +33,14 @@
         "morgan": "^1.10.0",
         "nunjucks": "^3.2.3",
         "sequelize": "^6.19.0",
-        "sqlite3": "^5.0.8"
+        "sqlite3": "^5.0.8",
+        "detect-port": "^1.3.0"
     },
     "devDependencies": {
         "@lhci/cli": "^0.9.0",
         "@testing-library/jest-dom": "^5.16.4",
         "@testing-library/dom": "^8.13.0",
         "babel-jest": "^28.1.0",
-        "detect-port": "^1.3.0",
         "eslint": "^8.15.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-jest": "^26.1.5",

src/models/product.js

@@ -26,6 +26,10 @@ const Product = db.define(
             allowNull: false,
             values: ProductType.types,
         },
+        description : {
+            type: Sequelize.STRING,
+            allowNull: false,
+        },
         discount: {
             type: Sequelize.NUMBER,
             allowNull: false,
@@ -85,8 +89,9 @@ const createProduct = ({
     price = 0.0,
     type = ProductType.HOME,
     discount = 0.0,
+    description ='',
 } = {}) => {
-    return Product.create({ name, price, type, discount });
+    return Product.create({ name, price, type, discount, description });
 };
 
 /**
@@ -97,12 +102,12 @@ const createProduct = ({
  */
 const updateProduct = async (
     id,
-    { name = '', price = 0.0, type = ProductType.HOME, discount = 0.0 } = {}
+    { name = '', price = 0.0, type = ProductType.HOME, discount = 0.0, description='' } = {}
 ) => {
     const product = await findById(id);
 
     if (product != null) {
-        return product.update({ name, price, type, discount });
+        return product.update({ name, price, type, discount, description });
     }
     return null;
 };

src/public/css/style.css

@@ -25,3 +25,48 @@ body {
     list-style: none;
     display: flex;
 }
+
+footer{
+    width: 100%;
+    padding: 50px 0px;
+}
+
+.container_footer{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    max-width: 1200px;
+    margin: auto;
+    margin-top: 10px;
+}
+
+.box__footer{
+    display: flex;
+    flex-direction: column;
+    padding: 40px;
+
+}
+
+.box__footer h2{
+    margin-bottom: 30px;
+    color:black;
+    font-weight: 700;
+}
+
+.box__footer p{
+    margin-top: 10px;
+    color: black;
+    font-weight: 600;
+}
+
+.box__footer p:hover{
+    opacity: 0.8;
+}
+
+p {
+    color: black;
+}
+
+.black {
+    color: black;
+}

src/views/_nav.html

@@ -11,14 +11,14 @@
                     aria-describedby="search-btn">
                 <button class="btn btn-light" type="button">
                     <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
-                    <span class="sr-only" id="search-btn">Buscar</span>
+                    <span class="sr-only" id="search-btn-buscar">Buscar</span>
                 </button>
             </div>
         </form>
 
         <a href="/cart" class="btn btn-light">
             <i class="fa-solid fa-cart-shopping" aria-hidden="true"></i>
-            <span class="sr-only" id="search-btn">Carrito</span>
+            <span class="sr-only" id="search-btn-carrito">Carrito</span>
         </a>
     </div>
 </nav>

src/views/_pagination.html

@@ -2,7 +2,9 @@
     <nav class="pagination fs-5">
         <ul class="hstack gap-3">
             <li class="pagination__prev">
-                <a href="?page={{ currentPage - 1 }}">< Anterior</a>
+                {% if currentPage !== 1 %}
+                <a href="?page={{ currentPage - 1 }}" class="black">< Anterior</a>
+                {% endif %}
             </li>
 
             <li>
@@ -12,7 +14,9 @@
             </li>
 
             <li class="pagination__next">
-                <a href="?page={{ currentPage + 1 }}">Siguiente ></a>
+                {% if currentPage !== totalPages %}
+                <a href="?page={{ currentPage + 1 }}" class="black">Siguiente ></a>
+                {% endif %}
             </li>
         </ul>
     </nav>

src/views/_product-card.html

@@ -2,21 +2,30 @@
 <div class="product card">
     <div class="card-body d-flex flex-row">
         <img
+            srcset="https://via.placeholder.com/300 300w"
             src="https://via.placeholder.com/150"
             alt="foto de un {{ product.name }}"
-            width="150px"
+            width="150w"
+            height="150w"
             class="rounded"
             loading="async"
         />
         <div class="ms-3">
             <h5 class="card-title mb-0">{{ product.name }}</h5>
             <p class="card-text">
-                <small class="text-muted">{{ product.type }}</small>
+                <small class="text-muted black">
+                    {% if product.type == 'home' %}
+                        Hogar
+                    {% elif product.type == 'electronics'%}
+                        Electrónicos
+                    {% endif %}
+                </small>
             </p>
+            <p style="font-size: 1.25rem"> {{ product.description }}</p>
             <p class="fs-3">$ {{ product.price }}</p>
 
             {% if (product.discount > 0) %}
-                <p class="small" data-testid="discount">{{ product.discount }} %</p>
+                <p class="small black" data-testid="discount">{{ product.discount }} %</p>
             {% endif %}
         </div>
 
@@ -25,7 +34,7 @@ <h5 class="card-title mb-0">{{ product.name }}</h5>
             {% if (not product.CartProduct ) %}
                 <form action="/cart" method="POST">
                     <input type="text" class="d-none" name="productid" value="{{ product.id }}">
-                    <button type="submit" class="btn btn-outline-primary">Agregar a carrito</button>
+                    <button type="submit" class="btn btn-outline-primary black">Agregar a carrito</button>
                 </form>
             {% else %}
                 <div class="product__quantity fs-4 bold">