diff --git a/.github/workflows/pruebaDeploy.yml b/.github/workflows/pruebaDeploy.yml
index 5f700c9..3bfa857 100644
--- a/.github/workflows/pruebaDeploy.yml
+++ b/.github/workflows/pruebaDeploy.yml
@@ -1,7 +1,7 @@
 name: CI for ASW2122
 on:
   release:
-
+    types: [published]
 jobs:
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
diff --git a/restapi/Dockerfile b/restapi/Dockerfile
index e0e21a6..e5a95f8 100644
--- a/restapi/Dockerfile
+++ b/restapi/Dockerfile
@@ -2,6 +2,9 @@ FROM node:16.13.1
 LABEL org.opencontainers.image.source https://github.com/Arquisoft/dede_es2a
 COPY . /app
 WORKDIR /app
+
+
 #Install the dependencies
 RUN npm install
+
 CMD [ "npm", "start" ]
\ No newline at end of file
diff --git a/restapi/package-lock.json b/restapi/package-lock.json
index 9e084a0..a5e83dd 100644
--- a/restapi/package-lock.json
+++ b/restapi/package-lock.json
@@ -34,6 +34,7 @@
         "puppeteer": "^13.7.0",
         "supertest": "^6.1.6",
         "ts-jest": "^27.1.2",
+        "ts-node-dev": "^1.1.8",
         "typescript": "^4.5.4"
       }
     },
@@ -1298,12 +1299,14 @@
     "node_modules/@types/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I="
+      "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=",
+      "dev": true
     },
     "node_modules/@types/strip-json-comments": {
       "version": "0.0.30",
       "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz",
-      "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ=="
+      "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
+      "dev": true
     },
     "node_modules/@types/superagent": {
       "version": "4.1.14",
@@ -1508,6 +1511,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -1519,7 +1523,8 @@
     "node_modules/arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
     },
     "node_modules/argparse": {
       "version": "1.0.10",
@@ -1714,7 +1719,8 @@
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
     },
     "node_modules/base": {
       "version": "0.11.2",
@@ -1769,6 +1775,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1818,6 +1825,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -1827,6 +1835,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -1930,7 +1939,8 @@
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
     "node_modules/bytes": {
       "version": "3.1.1",
@@ -2029,6 +2039,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
       "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "dev": true,
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -2302,7 +2313,8 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
@@ -2397,7 +2409,8 @@
     "node_modules/create-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
     },
     "node_modules/cross-fetch": {
       "version": "3.1.5",
@@ -2664,6 +2677,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
       "engines": {
         "node": ">=0.3.1"
       }
@@ -2710,6 +2724,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz",
       "integrity": "sha1-BuRMIj9eTpTXjvnbI6ZRXOL5YqE=",
+      "dev": true,
       "dependencies": {
         "xtend": "^4.0.0"
       }
@@ -3285,6 +3300,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -3518,12 +3534,14 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
     },
     "node_modules/fsevents": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -3567,7 +3585,8 @@
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
@@ -3675,6 +3694,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -3694,6 +3714,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -3785,6 +3806,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -4059,6 +4081,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -4110,6 +4133,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -4145,6 +4169,7 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
       "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "dev": true,
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -4210,6 +4235,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4236,6 +4262,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -4247,6 +4274,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -6457,7 +6485,8 @@
     "node_modules/make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
     },
     "node_modules/makeerror": {
       "version": "1.0.12",
@@ -6604,6 +6633,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -6614,7 +6644,8 @@
     "node_modules/minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
     },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
@@ -6664,6 +6695,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -6975,6 +7007,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7129,6 +7162,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -7351,6 +7385,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7367,7 +7402,8 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
@@ -7390,6 +7426,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -7819,6 +7856,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -7882,6 +7920,7 @@
       "version": "1.20.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
       "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
       "dependencies": {
         "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
@@ -7953,6 +7992,7 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -8777,6 +8817,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8799,6 +8840,7 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -9049,6 +9091,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -9075,6 +9118,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9317,6 +9361,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -9362,6 +9407,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
       "bin": {
         "tree-kill": "cli.js"
       }
@@ -9414,6 +9460,7 @@
       "version": "9.1.1",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
       "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+      "dev": true,
       "dependencies": {
         "arg": "^4.1.0",
         "create-require": "^1.1.0",
@@ -9439,6 +9486,7 @@
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ts-node-dev/-/ts-node-dev-1.1.8.tgz",
       "integrity": "sha512-Q/m3vEwzYwLZKmV6/0VlFxcZzVV/xcgOt+Tx/VjaaRHyiBcFlV0541yrT09QjzzCxlDZ34OzKjrFAynlmtflEg==",
+      "dev": true,
       "dependencies": {
         "chokidar": "^3.5.1",
         "dynamic-dedupe": "^0.3.0",
@@ -9472,6 +9520,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz",
       "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==",
+      "dev": true,
       "dependencies": {
         "@types/strip-bom": "^3.0.0",
         "@types/strip-json-comments": "0.0.30",
@@ -9543,6 +9592,7 @@
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
       "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -9914,7 +9964,8 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "node_modules/write-file-atomic": {
       "version": "3.0.3",
@@ -9974,6 +10025,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
       "engines": {
         "node": ">=0.4"
       }
@@ -10034,6 +10086,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -11079,12 +11132,14 @@
     "@types/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I="
+      "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=",
+      "dev": true
     },
     "@types/strip-json-comments": {
       "version": "0.0.30",
       "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz",
-      "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ=="
+      "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==",
+      "dev": true
     },
     "@types/superagent": {
       "version": "4.1.14",
@@ -11249,6 +11304,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -11257,7 +11313,8 @@
     "arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
     },
     "argparse": {
       "version": "1.0.10",
@@ -11407,7 +11464,8 @@
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
     },
     "base": {
       "version": "0.11.2",
@@ -11443,7 +11501,8 @@
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true
     },
     "bintrees": {
       "version": "1.0.1",
@@ -11487,6 +11546,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -11496,6 +11556,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
       "requires": {
         "fill-range": "^7.0.1"
       }
@@ -11563,7 +11624,8 @@
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
     "bytes": {
       "version": "3.1.1",
@@ -11634,6 +11696,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
       "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "dev": true,
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -11857,7 +11920,8 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
     "content-disposition": {
       "version": "0.5.4",
@@ -11934,7 +11998,8 @@
     "create-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
     },
     "cross-fetch": {
       "version": "3.1.5",
@@ -12148,7 +12213,8 @@
     "diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true
     },
     "diff-sequences": {
       "version": "27.4.0",
@@ -12182,6 +12248,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz",
       "integrity": "sha1-BuRMIj9eTpTXjvnbI6ZRXOL5YqE=",
+      "dev": true,
       "requires": {
         "xtend": "^4.0.0"
       }
@@ -12630,6 +12697,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -12794,12 +12862,14 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
     },
     "fsevents": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "optional": true
     },
     "ftp": {
@@ -12835,7 +12905,8 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
     },
     "gensync": {
       "version": "1.0.0-beta.2",
@@ -12913,6 +12984,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -12926,6 +12998,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -13000,6 +13073,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -13198,6 +13272,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -13243,6 +13318,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
@@ -13274,6 +13350,7 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
       "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "dev": true,
       "requires": {
         "has": "^1.0.3"
       }
@@ -13317,7 +13394,8 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
     },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
@@ -13335,6 +13413,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -13342,7 +13421,8 @@
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -15107,7 +15187,8 @@
     "make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
     },
     "makeerror": {
       "version": "1.0.12",
@@ -15220,6 +15301,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -15227,7 +15309,8 @@
     "minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
     },
     "mixin-deep": {
       "version": "1.3.2",
@@ -15266,7 +15349,8 @@
     "mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true
     },
     "mkdirp-classic": {
       "version": "0.5.3",
@@ -15515,7 +15599,8 @@
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "npm-run-path": {
       "version": "4.0.1",
@@ -15635,6 +15720,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -15793,7 +15879,8 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
     },
     "path-key": {
       "version": "3.1.1",
@@ -15804,7 +15891,8 @@
     "path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -15826,7 +15914,8 @@
     "picomatch": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true
     },
     "pirates": {
       "version": "4.0.4",
@@ -16142,6 +16231,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
@@ -16190,6 +16280,7 @@
       "version": "1.20.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
       "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
       "requires": {
         "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
@@ -16242,6 +16333,7 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -16892,7 +16984,8 @@
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "devOptional": true
     },
     "source-map-resolve": {
       "version": "0.5.3",
@@ -16911,6 +17004,7 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -17123,7 +17217,8 @@
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
     },
     "strip-eof": {
       "version": "1.0.0",
@@ -17140,7 +17235,8 @@
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
     },
     "superagent": {
       "version": "6.1.0",
@@ -17333,6 +17429,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
       "requires": {
         "is-number": "^7.0.0"
       }
@@ -17365,7 +17462,8 @@
     "tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true
     },
     "ts-jest": {
       "version": "27.1.2",
@@ -17387,6 +17485,7 @@
       "version": "9.1.1",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
       "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+      "dev": true,
       "requires": {
         "arg": "^4.1.0",
         "create-require": "^1.1.0",
@@ -17400,6 +17499,7 @@
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ts-node-dev/-/ts-node-dev-1.1.8.tgz",
       "integrity": "sha512-Q/m3vEwzYwLZKmV6/0VlFxcZzVV/xcgOt+Tx/VjaaRHyiBcFlV0541yrT09QjzzCxlDZ34OzKjrFAynlmtflEg==",
+      "dev": true,
       "requires": {
         "chokidar": "^3.5.1",
         "dynamic-dedupe": "^0.3.0",
@@ -17417,6 +17517,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz",
       "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==",
+      "dev": true,
       "requires": {
         "@types/strip-bom": "^3.0.0",
         "@types/strip-json-comments": "0.0.30",
@@ -17472,7 +17573,8 @@
     "typescript": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
-      "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg=="
+      "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
+      "dev": true
     },
     "unbzip2-stream": {
       "version": "1.4.3",
@@ -17759,7 +17861,8 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "write-file-atomic": {
       "version": "3.0.3",
@@ -17801,7 +17904,8 @@
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
     },
     "y18n": {
       "version": "5.0.8",
@@ -17849,7 +17953,8 @@
     "yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true
     }
   }
 }
diff --git a/restapi/routes/juguete.router.ts b/restapi/routes/juguete.router.ts
index a0497b9..1a567c2 100644
--- a/restapi/routes/juguete.router.ts
+++ b/restapi/routes/juguete.router.ts
@@ -157,5 +157,26 @@ jugueteRouter.post("/addStock/:nombre", async (req:Request,res:Response) => {
         res.status(500).send("Error al añadir stock al juguete")
     }
 });
+/*
+jugueteRouter.post("/subtock/:nombre", async (req:Request,res:Response) => {
+    try{
+        const filter = {
+            nombre: req.params.nombre,
+        }
+
+        var juguete = await JugueteRepository.findJuguete(filter); 
 
+        const stock = {stock: juguete.stock - req.body.stock}
+        
+        var jugueteActualizado = await JugueteRepository.updateJuguete(filter,stock);
+        if(jugueteActualizado){
+            res.send("Stock del juguete restado correctamente");
+        } else{
+            res.status(500).send("No se pudo restar stock al producto")
+        }
+    }catch (error){
+        res.status(500).send("Error al restar stock al juguete")
+    }
+});
+*/
 export default jugueteRouter;
diff --git a/restapi/routes/pedido.router.ts b/restapi/routes/pedido.router.ts
index 6e9cff6..3de5410 100644
--- a/restapi/routes/pedido.router.ts
+++ b/restapi/routes/pedido.router.ts
@@ -153,7 +153,7 @@ pedidoRouter.get("/byUser/:user", async(req:Request,res:Response)=>{
             res.send("El usuario no existe");
         }
         else{
-            var pedidos = await Pedido.find({"usuario":usuario._id});
+            var pedidos = await Pedido.find({"usuario":usuario._id}).populate("juguetes._id");
             if(pedidos.length > 0){
                 res.send(pedidos);
             }else{
diff --git a/restapi/server.ts b/restapi/server.ts
index f2f56f3..2e64206 100644
--- a/restapi/server.ts
+++ b/restapi/server.ts
@@ -9,7 +9,7 @@ import { pedidoRouter } from "./routes/pedido.router";
 import { usuarioRouter } from "./routes/usuario.router";
 
 const app: Application = express();
-const port: number = 5000;
+const port  = process.env.PORT ||  5000;
 
 
 require('dotenv').config()
@@ -17,8 +17,8 @@ let bd = require('./modules/gestorDB')
 let {config} = require('./modules/cloudinary');
 
 const options: cors.CorsOptions = {
-  origin: ['http://localhost:3000']
-  //origin: ['https://dede-es2a-webapp.herokuapp.com']
+  //origin: ['http://localhost:3000']
+  origin: ['https://dede-es2a-webapp.herokuapp.com']
 };
 
 const metricsMiddleware:RequestHandler = promBundle({includeMethod: true});
diff --git a/webapp/server.ts b/webapp/server.ts
index b49cf27..6ffca85 100644
--- a/webapp/server.ts
+++ b/webapp/server.ts
@@ -3,7 +3,7 @@ import express,{Application} from 'express';
 //setting the option module to commonjs
 
 var app: Application = express()
-const port: number = 3000;
+const port = process.env.PORT  || 3000;
 
 app.use(express.static('build'))
 
diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx
index fc4eb1d..837059b 100644
--- a/webapp/src/App.tsx
+++ b/webapp/src/App.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from 'react-query';
 
 
-import React, { useEffect, useState } from "react"
+import { useEffect, useState } from "react"
 
 //Components
 import Item from './Item/Item';
@@ -18,6 +18,7 @@ import AddShoppingCartIcon from '@material-ui/icons/AddShoppingCart';
 import Badge from '@material-ui/core/Badge';
 import Home from './paginas/Home';
 import ContactUs from './paginas/ContactUs';
+import HistorialPedidos from './componentes/Pedidos/historial';
 //Styles
 import { Wrapper, StyledButton } from './App.styles';
 //import Profile from './componentes/loginSOLID/Profile';
@@ -86,7 +87,7 @@ const App = () => {
 
   //const {data, isLoading, error} =useQuery<CartItemType[]>('products', getProducts);
   //AÑADIDO----------------------------------------------------------------------
-  const { data, isLoading, error } = useQuery<Juguete[]>('juguetes', getJuguetes);
+  const { data, isLoading } = useQuery<Juguete[]>('juguetes', getJuguetes);
 
 
   useEffect(() => {
@@ -135,7 +136,8 @@ const App = () => {
       }
       //2. El producto no está en el carrito, tenemos que añadirlo como uno nuevo
       //Entonces lo que hacemos es retornar el estado previo (prev) y le añadimos una nueva casilla que tienen el clickedItem con un amount de 1
-      var mapeadoCarrito = [...prev, { ...clickedItem, cantidad: 1 }];
+      // var mapeadoCarrito = [...prev, { ...clickedItem, cantidad: 1 }];
+      mapeadoCarrito = [...prev, { ...clickedItem, cantidad: 1 }];
       return mapeadoCarrito;
     })
 
@@ -150,7 +152,8 @@ const App = () => {
           var mc = [...ack, { ...item, cantidad: item.cantidad - 1 }]
           return mc;
         } else {
-          var mc = [...ack, item];
+          // var mc = [...ack, item];
+          mc = [...ack, item];
           return mc;
         }
       }, [] as Juguete[])
@@ -165,35 +168,246 @@ const App = () => {
   //console.log('aaaaaaaaaaa \n aaaaaaaaaaaa \n aaaaaaaaaaaaaaa');
 
   return (
-    <>
+    <>  
+    <Wrapper>
+    <Navbar />
       <BrowserRouter>
         <Routes>
           <Route path="/home" element={
-            <Wrapper>
-              <Navbar />
-              <CategoriesBar/>
+
               <Home />
-              <Footer />
-            </Wrapper>
           }
           />
-          <Route path="" element={
-            <Wrapper>
-              <Navbar />
+          <Route path="/nostalgia" element={  
+            <div className='page-container'>
+            <div className='content-wrap'>
               <CategoriesBar/>
-              <Home />
-              <Footer />
-            </Wrapper>
+              {
+               localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
+                 <></>
+                 :
+                 <div >
+                   <Drawer  anchor='right' open={cartOpen} onClose={() => setCartOpen(false)}>
+                     <Cart
+                       cartItems={cartItems}
+                       addToCart={handleAddToCart}
+                       removeFromCart={handleRemoveFromCart}
+                     />
+                   </Drawer>
+                   <StyledButton id="botonCarritoDesplegar" onClick={() => setCartOpen(true)}>
+                     <Badge badgeContent={getTotalItems(cartItems)} color='error'>
+                       <AddShoppingCartIcon fontSize="large" htmlColor='#000000' />
+                     </Badge>
+                   </StyledButton>
+                 </div>
+             }       
+                <Grid container spacing={3}>
+                {data?.map(item => {
+                  return item.categoria=="nostalgia"?
+                  <Grid item key={item.id} xs={12} sm={4}>                    
+                    <Item item={item} handleAddToCart={handleAddToCart} />
+                  </Grid>
+                  :
+                  <></>
+          })}
+              </Grid>
+              </div>
+              </div>
+          }
+          />
+
+      <Route path="/vehiculo" element={      
+        <div className='page-container'>
+        <div className='content-wrap'>
+          <CategoriesBar/>
+          {
+           localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
+             <></>
+             :
+             <div >
+               <Drawer  anchor='right' open={cartOpen} onClose={() => setCartOpen(false)}>
+                 <Cart
+                   cartItems={cartItems}
+                   addToCart={handleAddToCart}
+                   removeFromCart={handleRemoveFromCart}
+                 />
+               </Drawer>
+               <StyledButton id="botonCarritoDesplegar" onClick={() => setCartOpen(true)}>
+                 <Badge badgeContent={getTotalItems(cartItems)} color='error'>
+                   <AddShoppingCartIcon fontSize="large" htmlColor='#000000' />
+                 </Badge>
+               </StyledButton>
+             </div>
+         }   
+                <Grid container spacing={3}>
+                {data?.map(item => {
+                  return item.categoria=="vehiculo"?
+                  <Grid item key={item.id} xs={12} sm={4}>                    
+                    <Item item={item} handleAddToCart={handleAddToCart} />
+                  </Grid>
+                  :
+                  <></>
+          })}
+              </Grid>
+              </div>
+              </div>
+          }
+          />
+           <Route path="/peluche" element={   
+              <div className='page-container'>
+              <div className='content-wrap'>
+                <CategoriesBar/>
+                {
+                 localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
+                   <></>
+                   :
+                   <div >
+                     <Drawer  anchor='right' open={cartOpen} onClose={() => setCartOpen(false)}>
+                       <Cart
+                         cartItems={cartItems}
+                         addToCart={handleAddToCart}
+                         removeFromCart={handleRemoveFromCart}
+                       />
+                     </Drawer>
+                     <StyledButton id="botonCarritoDesplegar" onClick={() => setCartOpen(true)}>
+                       <Badge badgeContent={getTotalItems(cartItems)} color='error'>
+                         <AddShoppingCartIcon fontSize="large" htmlColor='#000000' />
+                       </Badge>
+                     </StyledButton>
+                   </div>
+               }   
+                <Grid container spacing={3}>
+                {data?.map(item => {
+                  return item.categoria=="peluche"?
+                  <Grid item key={item.id} xs={12} sm={4}>                    
+                    <Item item={item} handleAddToCart={handleAddToCart} />
+                  </Grid>
+                  :
+                  <></>
+          })}
+              </Grid>
+              </div>
+              </div>
+          }
+          />
+             <Route path="/musical" element={      
+               <div className='page-container'>
+               <div className='content-wrap'>
+                 <CategoriesBar/>
+                 {
+                  localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
+                    <></>
+                    :
+                    <div >
+                      <Drawer  anchor='right' open={cartOpen} onClose={() => setCartOpen(false)}>
+                        <Cart
+                          cartItems={cartItems}
+                          addToCart={handleAddToCart}
+                          removeFromCart={handleRemoveFromCart}
+                        />
+                      </Drawer>
+                      <StyledButton id="botonCarritoDesplegar" onClick={() => setCartOpen(true)}>
+                        <Badge badgeContent={getTotalItems(cartItems)} color='error'>
+                          <AddShoppingCartIcon fontSize="large" htmlColor='#000000' />
+                        </Badge>
+                      </StyledButton>
+                    </div>
+                }
+                <Grid container spacing={3}>
+                {data?.map(item => {
+                  return item.categoria=="musical"?
+                  <Grid item key={item.id} xs={12} sm={4}>                    
+                    <Item item={item} handleAddToCart={handleAddToCart} />
+                  </Grid>
+                  :
+                  <></>
+          })}
+              </Grid>
+              </div>
+            </div>
+          }
+          />
+             <Route path="/bebes" element={      
+                <div className='page-container'>
+                <div className='content-wrap'>
+                  <CategoriesBar/>
+                  {
+                   localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
+                     <></>
+                     :
+                     <div >
+                       <Drawer  anchor='right' open={cartOpen} onClose={() => setCartOpen(false)}>
+                         <Cart
+                           cartItems={cartItems}
+                           addToCart={handleAddToCart}
+                           removeFromCart={handleRemoveFromCart}
+                         />
+                       </Drawer>
+                       <StyledButton id="botonCarritoDesplegar" onClick={() => setCartOpen(true)}>
+                         <Badge badgeContent={getTotalItems(cartItems)} color='error'>
+                           <AddShoppingCartIcon fontSize="large" htmlColor='#000000' />
+                         </Badge>
+                       </StyledButton>
+                     </div>
+                 }
+                <Grid container spacing={3}>
+                {data?.map(item => {
+                  return item.categoria=="bebes"?
+                  <Grid item key={item.id} xs={12} sm={4}>                    
+                    <Item item={item} handleAddToCart={handleAddToCart} />
+                  </Grid>
+                  :
+                  <></>
+          })}
+              </Grid>
+              </div>
+            </div>
+          }
+          />
+              <Route path="/otros" element={      
+                 <div className='page-container'>
+                 <div className='content-wrap'>
+                   <CategoriesBar/>
+                   {
+                    localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
+                      <></>
+                      :
+                      <div >
+                        <Drawer  anchor='right' open={cartOpen} onClose={() => setCartOpen(false)}>
+                          <Cart
+                            cartItems={cartItems}
+                            addToCart={handleAddToCart}
+                            removeFromCart={handleRemoveFromCart}
+                          />
+                        </Drawer>
+                        <StyledButton id="botonCarritoDesplegar" onClick={() => setCartOpen(true)}>
+                          <Badge badgeContent={getTotalItems(cartItems)} color='error'>
+                            <AddShoppingCartIcon fontSize="large" htmlColor='#000000' />
+                          </Badge>
+                        </StyledButton>
+                      </div>
+                  }
+                <Grid container spacing={3}>
+                {data?.map(item => {
+                  return item.categoria=="otros"?
+                  <Grid item key={item.id} xs={12} sm={4}>                    
+                    <Item item={item} handleAddToCart={handleAddToCart} />
+                  </Grid>
+                  :
+                  <></>
+          })}
+              </Grid>
+              </div>
+            </div>
           }
           />
+
           <Route path="/productos" element={
             <div className='page-container'>
-              <Wrapper>
                 <div className='content-wrap'>
-                  <Navbar />
-
+                  <CategoriesBar/>
                   {
-                    localStorage.getItem("isAdmin")=="true" ? // isAdmin ?
+                    localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
                       <></>
                       :
                       <div >
@@ -219,22 +433,15 @@ const App = () => {
                     ))}
                   </Grid>
                 </div>
-                <Footer />
-              </Wrapper>
             </div>
           } />
            <Route path="/juguete/categoria/nostalgia" element={
             <div className='page-container'>
-              <Wrapper>
                 <div className='content-wrap'>
-                  <Navbar />
-
-                  {
-                    
-                    localStorage.getItem("isAdmin")=="true" ? // isAdmin ?
+                 {
+                    localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
                       <></>
                       :
-                   
                       <div >
                         <Drawer  anchor='right' open={cartOpen} onClose={() => setCartOpen(false)}>
                           <Cart
@@ -258,117 +465,67 @@ const App = () => {
                     ))}
                   </Grid>
                 </div>
-                <Footer />
-              </Wrapper>
             </div>
           } />
-
           <Route path="/edit" element={
-            localStorage.getItem("isAdmin")=="true" ? // isAdmin?
-              <Wrapper>
-                <Navbar />
+            localStorage.getItem("isAdmin")==="true" ? // isAdmin?
                 <EditForm />
-                <Footer />
-              </Wrapper>
               :
-              <Wrapper>
-                <Navbar />
                 <h1>No tiene acceso a esa dirección</h1>
-                <Footer />
-              </Wrapper>
           } />
-
           <Route path="/contactanos" element={
-           localStorage.getItem("isAdmin")=="true" ? // isAdmin?
-              <Wrapper>
-                <Navbar />
+           localStorage.getItem("isAdmin")==="true" ? // isAdmin?
                 <h1>No tiene acceso a esa dirección</h1>
-                <Footer />
-              </Wrapper>
               :
-              <Wrapper>
-                <Navbar />
                 <ContactUs />
-                <Footer />
-              </Wrapper>
           } />
-
           <Route path="confirmar-pedido" element={
-            localStorage.getItem("isAdmin")=="true" ? // isAdmin?
-              <Wrapper>
-                <Navbar />
+            localStorage.getItem("isAdmin")==="true" ? // isAdmin?
                 <h1>No tiene acceso a esa dirección</h1>
-                <Footer />
-              </Wrapper>
               :
-              <Wrapper>
-                <Navbar />
                 <ProcesoPago
                   cartItems={cartItems.slice()}
                 />
-                <Footer />
-              </Wrapper>
           }
           />
           <Route path="/perfilPod" element={
-            localStorage.getItem("isAdmin")=="true" ? // isAdmin?
-              <Wrapper>
-                <Navbar />
+            localStorage.getItem("isAdmin")==="true" ? // isAdmin?
                 <h1>No tiene acceso a esa dirección</h1>
-                <Footer />
-              </Wrapper>
               :
-              <Wrapper>
-                <Navbar />
-                
-                <Footer />
-              </Wrapper>
+              <></>
           }
           />
           <Route path="/loginPago" element={
-            localStorage.getItem("isAdmin")=="true" ? // isAdmin?
-              <Wrapper>
-                <Navbar />
+            localStorage.getItem("isAdmin")==="true" ? // isAdmin?
                 <h1>No tiene acceso a esa dirección</h1>
-                <Footer />
-              </Wrapper>
               :
-              <Wrapper>
-                <Navbar />
                 <LoginForm />
-                <Footer />
-              </Wrapper>
           }
           />
-          <Route path="/logoutPago" element={
+          <Route path="/pedidos" element={
             localStorage.getItem("isAdmin")=="true" ? // isAdmin?
-              <Wrapper>
-                <Navbar />
                 <h1>No tiene acceso a esa dirección</h1>
-                <Footer />
-              </Wrapper>
               :
-              <Wrapper>
-                <Navbar />
+                <HistorialPedidos />
+          }
+          />
+          <Route path="/logoutPago" element={
+            localStorage.getItem("isAdmin")==="true" ? // isAdmin?
+                <h1>No tiene acceso a esa dirección</h1>
+              :
                 <LogoutForm />
-                <Footer />
-              </Wrapper>
           }
           />
           <Route path="/*" element={
-            <Wrapper>
-              <Navbar />
               <h1>No existe esa dirección</h1>
-              <Footer />
-            </Wrapper>
           } />
-
         </Routes>
       </BrowserRouter>
+      <Footer />
+      </Wrapper>
     </>
   );
 
 };
 
-
 export default App;
diff --git a/webapp/src/Item/Item.tsx b/webapp/src/Item/Item.tsx
index 947f006..128f04d 100644
--- a/webapp/src/Item/Item.tsx
+++ b/webapp/src/Item/Item.tsx
@@ -44,11 +44,11 @@ const Item: React.FC<Props> = ({ item, handleAddToCart }) => {
                         <h3>{item.nombre}</h3>
                         <p>{item.descripcion}</p>
                         <h3>€{item.precio}</h3>
-                        <Button onClick={() => {
+                        <Button id="botonEditar" onClick={() => {
                             // añadir al localStorage el Item para poder coger sus datos
                             navigate("/edit");
                         }}>Editar producto</Button>
-                        <Button onClick={() => {
+                        <Button id="botonAnadir" onClick={() => {
                             addStock(item.nombre);
                         }}>Añadir existencias</Button>
                     </div>
diff --git a/webapp/src/PayForm/CategoriesBar.tsx b/webapp/src/PayForm/CategoriesBar.tsx
index 7042259..2211fa7 100644
--- a/webapp/src/PayForm/CategoriesBar.tsx
+++ b/webapp/src/PayForm/CategoriesBar.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { Link } from '@mui/material';
 import styled from 'styled-components';
 import './categories.css';
+import { Juguete } from '../shared/sharedJuguete';
 const NavigationWrapper = styled.nav`
  display: flex;
  width: 70%;
@@ -9,21 +10,32 @@ const NavigationWrapper = styled.nav`
  justify-content: space-between;
 `
 
-const Separator = styled.hr`
- height: 10%;
+const StyledLink = styled.a`
+color: #ffffff;
+`
+
+const Separator = styled.div`
+ height: 5px;
  width: 70%;
  border-radius: 14px;
- margin: 0 auto;
- background-color: #d1626f;
+ align-content: center;
+ margin: 5px auto;
+ background-color: #d3707c;
 `
 
-
 const CategoriesBar = ()=> {
+    let juguetes:Juguete[];
+
     return(
         <>
     <NavigationWrapper>
-        <Link className="linkCategorie" href="/juguete/categoria/nostalgia">Nostalgia</Link>
-        <Link className="linkCategorie" href="/productos">Productos</Link>
+        <StyledLink className="linkCategorie" href="/nostalgia" >Nostalgia</StyledLink>
+        <StyledLink className="linkCategorie" href="/vehiculo">Vehiculos</StyledLink>
+        <StyledLink className="linkCategorie" href="/musical">Musicales</StyledLink>
+        <StyledLink className="linkCategorie" href="/peluche">Peluche</StyledLink>
+        <StyledLink className="linkCategorie" href="/bebes">Bebés</StyledLink>
+        <StyledLink className="linkCategorie" href="/otros">Otros</StyledLink>
+       
     </NavigationWrapper>
     <Separator/>
     </>
diff --git a/webapp/src/PayForm/ProcesoPago.tsx b/webapp/src/PayForm/ProcesoPago.tsx
index 3eef478..62bfff7 100644
--- a/webapp/src/PayForm/ProcesoPago.tsx
+++ b/webapp/src/PayForm/ProcesoPago.tsx
@@ -3,8 +3,8 @@ import CartItem from '../CartItem/CartItem';
 import * as React from "react";
 import Paper from "@mui/material/Paper";
 //Styles
-import {Wrapper} from '../Cart/Cart.styles';
-import {toast} from 'react-toastify';
+import { Wrapper } from '../Cart/Cart.styles';
+import { toast } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 
 import Stepper from "@material-ui/core/Stepper";
@@ -15,7 +15,7 @@ import Container from "@mui/material/Container";
 //Types
 import { CartItemType } from '../App';
 
-import {Juguete} from '../shared/sharedJuguete';
+import { Juguete } from '../shared/sharedJuguete';
 
 import Shipping from './Shipping';
 import Delivery from './Delivery';
@@ -34,30 +34,29 @@ type Props = {
 */
 
 type Props = {
-    cartItems: Juguete[];
+  cartItems: Juguete[];
 };
-let condPedido= true;
-let gastosEnvio:any; 
+let condPedido = true;
+let gastosEnvio: any;
 
 //Procesar pedido
-async function finalizarPedido(precioGastosDeEnvio : string,juguetes: Juguete[], email:string): Promise<any> {
-  
-  
-  let p:number = parseFloat(precioGastosDeEnvio);
-  const calculateTotal = (items:Juguete[]) =>
-    items.reduce((ack:number, item) => ack + item.cantidad*item.precio,0);
-    var price:number;
-    price = calculateTotal(juguetes);
+
+async function finalizarPedido(precioGastosDeEnvio: string, juguetes: Juguete[], email: string): Promise<any> {
+  let p: number = parseFloat(precioGastosDeEnvio);
+  const calculateTotal = (items: Juguete[]) =>
+    items.reduce((ack: number, item) => ack + item.cantidad * item.precio, 0);
+  var price: number;
+  price = calculateTotal(juguetes);
   const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/'
   let response = await fetch(apiEndPoint + 'pedido', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ 
-        "precioGastosDeEnvio":p,
-        "precioSinIva": price,
-        "usuario": email,
-        "productos":juguetes
-      })
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      "precioGastosDeEnvio": p,
+      "precioSinIva": price,
+      "usuario": email,
+      "productos": juguetes
+    })
   });
   return response;
 }
@@ -67,138 +66,137 @@ async function getGastosEnvio(): Promise<any> {
   const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/'
   let response = await fetch(apiEndPoint + 'pedido/gastosEnvio/', {
     method: 'POST',
-    headers: {'Content-Type':'application/json'},
-    body: JSON.stringify({"direccion":localStorage.getItem("direccion")})
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ "direccion": localStorage.getItem("direccion") })
   }).then(resp => resp.json())
-  .then(data => {
-    gastosEnvio = Number(data).toFixed(2);
-  });
+    .then(data => {
+      gastosEnvio = Number(data).toFixed(2);
+    });
 
   return response;
 }
 
 toast.configure();
-const ProcesoPago:React.FC<Props> = ({cartItems}) => {
-    const {user} = useAuth0();
-    const [pasoActual, setPasoActual] = React.useState(0);
-    const siguientePaso = () => {
+const ProcesoPago: React.FC<Props> = ({ cartItems }) => {
+  const { user } = useAuth0();
+  const [pasoActual, setPasoActual] = React.useState(0);
+  const siguientePaso = () => {
+    setPasoActual((pasoPrevio) => pasoPrevio + 1);
+  };
+
+  let email: string = user?.email != null ?
+    user?.email
+    : "";
+  const siguientePasoGuardarPedido = () => {
+    finalizarPedido(gastosEnvio, cartItems, email);
+    setPasoActual((pasoPrevio) => pasoPrevio + 1);
+  };
+
+  const siguientePasoSiPodCalcularEnvio = async () => {
+    if (localStorage.getItem("direccion") == null || localStorage.getItem("direccion") == "") {
+      toast.warn("Por favor, inicie sesión con su POD para que podamos obtener su dirección", { position: toast.POSITION.TOP_CENTER })
+    } else {
+      let variable = await getGastosEnvio();
+      if (gastosEnvio == 0.00 || localStorage.getItem("direccion") == "null") {
+        toast.error("Su dirección no fue encontrada, lo sentimos. Para solucionar el problema " +
+          "modifique la dirección de su POD", { position: toast.POSITION.TOP_CENTER })
+      } else {
         setPasoActual((pasoPrevio) => pasoPrevio + 1);
-      };
+      }
+    }
+  };
+  const steps = ["Envío", "Entrega", "Resumen", "¡Pedido Finalizado!"]
+
+  const pasoAnterior = () => {
+    setPasoActual((pasoPrevio) => pasoPrevio - 1);
+  };
+
+  const [deliveryCost, setDeliveryCost] = React.useState<number>(Number());
+  const [address, setAddress] = React.useState("");
+  const [deliveryDate, setDeliveryDate] = React.useState("");
+
+  const getPaso = (stepIndex: number) => {
+    switch (stepIndex) {
+      case 0:
+        condPedido = true;
+        return (
+          <Shipping
+            cartItems={cartItems}
+            siguientePaso={siguientePasoSiPodCalcularEnvio}
+            setDeliveryCost={setDeliveryCost}
+            deliveryCost={deliveryCost}
+            setAddress={setAddress}
+
+          />
+        );
+      case 1:
+        return (
+          <Delivery
+            cartItems={cartItems}
+            siguientePaso={siguientePaso}
+            deliveryCost={gastosEnvio}
+            setDeliveryCost={setDeliveryCost}
+            setAddress={setAddress}
+            address={address}
+            setDeliveryDate={setDeliveryDate}
+          />
+        );
+      case 2:
 
-      let email:string = user?.email != null ?
-      user?.email
-      : "";
-      const siguientePasoGuardarPedido = () => {
-        finalizarPedido(gastosEnvio,cartItems, email);
-        setPasoActual((pasoPrevio) => pasoPrevio + 1);
-      };
-
-      const siguientePasoSiPodCalcularEnvio = async () => {
-        if(localStorage.getItem("direccion")==null || localStorage.getItem("direccion")=="") {
-          toast.warn("Por favor, inicie sesión con su POD para que podamos obtener su dirección", {position: toast.POSITION.TOP_CENTER})
-        } else {
-          let variable = await getGastosEnvio();
-          console.log(gastosEnvio);
-          if(gastosEnvio==0.00) {
-            toast.error("Su dirección no fue encontrada, lo sentimos. Para solucionar el problema "+
-           "modifique la dirección de su POD", {position: toast.POSITION.TOP_CENTER})
-          } else {
-          setPasoActual((pasoPrevio) => pasoPrevio + 1);
-          }
-        }
-      };
-
-      const steps = ["Envío", "Entrega", "Resumen", "¡Pedido Finalizado!"]
-      
-      const pasoAnterior = () => {
-        setPasoActual((pasoPrevio) => pasoPrevio - 1);
-      };
-
-      const [deliveryCost, setDeliveryCost] = React.useState<number>(Number());
-      const [address, setAddress] = React.useState("");
-      const [deliveryDate, setDeliveryDate] = React.useState("");
-
-      const getPaso = (stepIndex: number) => {
-        switch (stepIndex) {
-          case 0:
-            condPedido=true;
-            return (
-              <Shipping
-                cartItems={cartItems}
-                siguientePaso={siguientePasoSiPodCalcularEnvio}
-                setDeliveryCost={setDeliveryCost}
-                deliveryCost={deliveryCost}
-                setAddress={setAddress}
-                
-              />
-            );
-          case 1:
-            return (
-              <Delivery
-                cartItems={cartItems}
-                siguientePaso={siguientePaso}
-                deliveryCost={gastosEnvio}
-                setDeliveryCost={setDeliveryCost}
-                setAddress={setAddress}
-                address={address}
-                setDeliveryDate={setDeliveryDate}
-              />
-            );
-          case 2:
-            
-            return (
-              <Review
-                cartItems={cartItems}
-                siguientePaso={siguientePasoGuardarPedido}
-                deliveryCost={gastosEnvio}
-                setDeliveryCost={setDeliveryCost}
-                setAddress={siguientePaso}
-                address={address}
-                deliveryDate={deliveryDate}
-              />
-            );
-          case 3:
-            return <FinalizedOrder
+        return (
+          <Review
+            cartItems={cartItems}
+            siguientePaso={siguientePasoGuardarPedido}
+            deliveryCost={gastosEnvio}
+            setDeliveryCost={setDeliveryCost}
+            setAddress={siguientePaso}
+            address={address}
+            deliveryDate={deliveryDate}
+          />
+        );
+      case 3:
+        return (
+          <FinalizedOrder
             cartItems={cartItems}
             siguientePaso={siguientePaso}
             deliveryCost={gastosEnvio}
             setDeliveryCost={setDeliveryCost}
             setAddress={siguientePaso}
             address={address}
-            deliveryDate={deliveryDate} />;
-            
-        }
-      };
-
-
-
-      return (
-        <React.Fragment>
-           <Stepper
-            activeStep={pasoActual}
-            alternativeLabel
-          >
-            {steps.map((label) => (
-              <Step key={label}>
-                <StepLabel>{label}</StepLabel>
-              </Step>
-            ))}
-          </Stepper>
-          <Paper
-          elevation = {12}
-          sx={{ my: { xs: 2, md: 4 }, p: { xs: 2, md: 3 } }}
-        >
-    <Container component="main" maxWidth="lg" sx={{ mb: 8 }}>
-
-        <React.Fragment>    
-              {getPaso(pasoActual)}
-        </React.Fragment>
-    
+            deliveryDate={deliveryDate}
+          />
+        );
+
+    }
+  };
+
+  return (
+    <React.Fragment>
+      <Stepper
+        activeStep={pasoActual}
+        alternativeLabel
+      >
+        {steps.map((label) => (
+          <Step key={label}>
+            <StepLabel>{label}</StepLabel>
+          </Step>
+        ))}
+      </Stepper>
+      <Paper
+        elevation={12}
+        sx={{ my: { xs: 2, md: 4 }, p: { xs: 2, md: 3 } }}
+      >
+        <Container component="main" maxWidth="lg" sx={{ mb: 8 }}>
+
+          <React.Fragment>
+            {getPaso(pasoActual)}
+          </React.Fragment>
+
         </Container>
-        </Paper>
-        </React.Fragment>
-      )
-      
+      </Paper>
+    </React.Fragment>
+  )
+
 };
 //El boton se utilizara para obtener el pod del usuario, faltaría la función onClickl
 export default ProcesoPago;
\ No newline at end of file
diff --git a/webapp/src/PayForm/categories.css b/webapp/src/PayForm/categories.css
index 7e1c161..4fe42c4 100644
--- a/webapp/src/PayForm/categories.css
+++ b/webapp/src/PayForm/categories.css
@@ -8,4 +8,7 @@
     padding:16px;
     border-radius: 32px;
 }
+.linkCategorie:hover {
+    color:rgb(255, 255, 255);
+}
 
diff --git a/webapp/src/componentes/Login/LoginButton.tsx b/webapp/src/componentes/Login/LoginButton.tsx
index cd9de7f..ff0a7d2 100644
--- a/webapp/src/componentes/Login/LoginButton.tsx
+++ b/webapp/src/componentes/Login/LoginButton.tsx
@@ -1,22 +1,13 @@
 import { useAuth0 } from '@auth0/auth0-react';
-import { useEffect } from 'react';
 import { Usuario } from '../../shared/sharedUser';
-import { useQuery } from 'react-query';
-import Ayuda from './Ayuda';
-import Item from '../../Item/Item';
-import LinearProgess from '@material-ui/core/LinearProgress';
 
 import { Juguete } from '../../shared/sharedJuguete';
-
-var email: string;
-var usuario: any;
-var isAdmin: any;
-
+/*
 async function getData(): Promise<any> {
     //const { data } = useQuery<Usuario>('usuario', checkUserInBD);
     //usuario = data;
 }
-
+*/
 export async function getJuguetes(): Promise<Juguete[]> {
     const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/'
     //const apiEndPoint= process.env.REACT_APP_API_URI || 'https://dede-en2a-restapi.herokuapp.com'
@@ -24,12 +15,12 @@ export async function getJuguetes(): Promise<Juguete[]> {
     //The objects returned by the api are directly convertible to User objects
     console.log(response.json());
     return response.json();
-  }
+}
 
 export async function checkUserInBD(): Promise<Usuario[]> {
     const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/'
     //const apiEndPoint= process.env.REACT_APP_API_URI || 'https://dede-en2a-restapi.herokuapp.com'
-    let response = await fetch(apiEndPoint +"usuario");
+    let response = await fetch(apiEndPoint + "usuario");
     //The objects returned by the api are directly convertible to User objects
     console.log(response.json());
     return response.json();
@@ -37,29 +28,26 @@ export async function checkUserInBD(): Promise<Usuario[]> {
 
 
 const LoginButton = () => {
-    const { loginWithRedirect, isAuthenticated, user } = useAuth0();
+    const { loginWithRedirect } = useAuth0();
     
-    const { data, isLoading, error } =   useQuery<Usuario[]>('us', checkUserInBD);
-    isAdmin=false;
-    console.log(data?.length);
+    //const { data, isLoading, error } =   useQuery<Usuario[]>('us', checkUserInBD);
+    //isAdmin=false;
+    //console.log(data?.length);
     
     return <button className='btn btn-primary-login' id="registerButton" onClick={() => {
         loginWithRedirect();
-        if (isLoading) return <LinearProgess />;
+        //if (isLoading) return <LinearProgess />;
          
-        email = user?.email != null ? user?.email : "";
+       // email = user?.email != null ? user?.email : "";
 
-        console.log(email);
-        localStorage.setItem("isAdmin",isAdmin);
+       // console.log(email);
+      //  localStorage.setItem("isAdmin",isAdmin);
         const localUser = localStorage.getItem("user");
         if (localUser) {
-            let user = JSON.parse(localUser);
+            //let user = 
+            JSON.parse(localUser);
         } else {
             localStorage.setItem("user", JSON.stringify([]));
-            localStorage.setItem("isAdmin", user?.email != null ?
-                user?.email
-                : ""
-            );
         }
 
     }}>Registrarse</button>;
diff --git a/webapp/src/componentes/Navbar/Menitems.tsx b/webapp/src/componentes/Navbar/Menitems.tsx
index 3c08027..7f35186 100644
--- a/webapp/src/componentes/Navbar/Menitems.tsx
+++ b/webapp/src/componentes/Navbar/Menitems.tsx
@@ -8,5 +8,10 @@ export const MenuItems =[
         title: 'Productos',
         url:'productos',
         cName:'nav-links'
+    },
+    {
+        title: 'Historial Pedidos',
+        url:'pedidos',
+        cName:'nav-links'
     }
 ]
\ No newline at end of file
diff --git a/webapp/src/componentes/Navbar/Navbar.tsx b/webapp/src/componentes/Navbar/Navbar.tsx
index da408b7..d5ec6ec 100644
--- a/webapp/src/componentes/Navbar/Navbar.tsx
+++ b/webapp/src/componentes/Navbar/Navbar.tsx
@@ -1,11 +1,9 @@
-import { Component } from 'react';
 import { MenuItems } from "./Menitems"
 import { MenuItemsAdmin } from "./MenitemsAdmin"
 import './Navbar.css'
 import LoginButton from '../Login/LoginButton';
 import { useAuth0 } from '@auth0/auth0-react';
 import LogoutButton from '../Login/LogoutButton';
-import ProfileImg from '../Login/ProfileImg';
 import ProfileName from '../Login/ProfileName';
 
 
@@ -22,7 +20,7 @@ const Navbar = () => {
                 <i className={state.clicked ? 'fas fa-times' : 'fas fa-bars'}></i>
             </div>
             {
-                localStorage.getItem("isAdmin")=="true" ? // isAdmin ?
+                localStorage.getItem("isAdmin")==="true" ? // isAdmin ?
                     <ul className={state.clicked ? 'nav-menu active' :
                         'nav-menu'}>
                         {MenuItemsAdmin.map((item, index) => {
diff --git a/webapp/src/componentes/Pedidos/PedidoItem.tsx b/webapp/src/componentes/Pedidos/PedidoItem.tsx
new file mode 100644
index 0000000..2fbbec4
--- /dev/null
+++ b/webapp/src/componentes/Pedidos/PedidoItem.tsx
@@ -0,0 +1,41 @@
+import Button from '@material-ui/core/Button';
+//types
+import { CartItemType } from '../../App';
+import Item from '../../Item/Item';
+import { Juguete } from '../../shared/sharedJuguete';
+import Paper from "@mui/material/Paper";
+//Styles
+import { Wrapper } from '../../CartItem/CartItem.styles';
+import { Box } from '@material-ui/core';
+import './pedidos.css';
+
+/*type Props = {
+    item: CartItemType;
+    addToCart: (clickedItem: CartItemType) => void;
+    removeFromCart: (id:number) => void;
+}*/
+
+type Props = {
+    item: Juguete;
+    cantidad: number;
+}
+
+
+const PedidoItem: React.FC<Props> = ({ item, cantidad }) => (
+
+
+    <Paper className='pedidoItem' elevation={2} sx={{ my: { xs: 4, md: 4 } }}>
+        <h3>{item.nombre}: {cantidad} uds.</h3>
+        <img src={item.imagen} alt={item.nombre} width="100" />
+    </Paper>
+)
+
+export default PedidoItem;
+
+/*
+<div>
+                <p>Cantidad: <b>{cantidad}</b></p>
+                <p>Total: <b>{(cantidad * item.precio).toFixed(2)}€</b></p>
+            </div>
+
+*/
\ No newline at end of file
diff --git a/webapp/src/componentes/Pedidos/historial.tsx b/webapp/src/componentes/Pedidos/historial.tsx
new file mode 100644
index 0000000..54f2acc
--- /dev/null
+++ b/webapp/src/componentes/Pedidos/historial.tsx
@@ -0,0 +1,74 @@
+import { useQuery } from 'react-query';
+import { useAuth0 } from '@auth0/auth0-react';
+import { Pedido } from '../../shared/sharedPedido';
+import PedidoItem from './PedidoItem';
+import './pedidos.css';
+
+var correo: string;
+var numero: number;
+
+async function getPedidos(): Promise<Pedido[]> {
+    const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/'
+    //const apiEndPoint= process.env.REACT_APP_API_URI || 'https://dede-en2a-restapi.herokuapp.com'
+    let response = await fetch(apiEndPoint + "pedido/byUser/" + correo);
+    //The objects returned by the api are directly convertible to User objects
+    let j = response.json();
+    console.log(response.json());
+    return j;
+}
+
+const HistorialPedidos = () => {
+    const { user } = useAuth0();
+    correo = user?.email === undefined || user?.email == null ? "" : user?.email;
+    // coger pedidos del usuario de la Base de datos
+    const { data } = useQuery<Pedido[]>('pedidos', getPedidos);
+    numero = 0;
+    if (correo === '') {
+        return (
+            <div>
+                <h2>Debe registrarse primero para ver su historial de pedidos</h2>
+            </div>
+        );
+    } else {
+        return (
+            <div>
+                <h1>Mis Pedidos</h1>
+                <p>{data?.map(pedido => (
+                    <div>
+                        <h2 className='numeroPedido'>{++numero}. Precio total del pedido: <b>{(pedido.precioFinal).toFixed(2)}€</b></h2>
+                        {pedido.juguetes.map(item => (
+                            <PedidoItem
+                                key={item._id.id}
+                                item={item._id}
+                                cantidad={item.cantidad}
+                            />
+                        ))}
+                    </div>
+                ))}</p>
+            </div>
+        );
+    }
+    /*
+    <p>Juguetes: {pedido.juguetes.map(juguete => {
+                            nombre = juguete._id.nombre
+                        })}{nombre}</p>
+
+    {cartItems.map(item=>(
+                <CartItem 
+                    key={item.id}
+                    item={item}
+                    addToCart={addToCart}
+                    removeFromCart={removeFromCart}
+                />
+            ))}
+
+
+    {data?.map(item => (
+        <Grid item key={item.id} xs={12} sm={4}>
+          <Item item={item} handleAddToCart={handleAddToCart} />
+        </Grid>
+      ))}
+      */
+}
+
+export default HistorialPedidos;
\ No newline at end of file
diff --git a/webapp/src/componentes/Pedidos/pedidos.css b/webapp/src/componentes/Pedidos/pedidos.css
new file mode 100644
index 0000000..95d7013
--- /dev/null
+++ b/webapp/src/componentes/Pedidos/pedidos.css
@@ -0,0 +1,10 @@
+.pedidoItem {
+    display: grid;
+	gap: 1em;
+	grid-template-columns: repeat(2, 1fr);
+    margin-left: 6em;
+}
+
+.numeroPedido {
+    font-size: 1.8em;
+}
\ No newline at end of file
diff --git a/webapp/src/paginas/Home.tsx b/webapp/src/paginas/Home.tsx
index 1e12e0b..934c345 100644
--- a/webapp/src/paginas/Home.tsx
+++ b/webapp/src/paginas/Home.tsx
@@ -1,4 +1,5 @@
 import { useAuth0 } from "@auth0/auth0-react";
+import { Usuario } from "../shared/sharedUser";
 import "./Pag.css"
 
 // Variable para almacenar si el usuario autenticado existe o no en la bd
@@ -15,6 +16,7 @@ export async function checkUserInBDByEmail(email:string): Promise<any> {
     .then(usuario => {
       userExists = usuario.isAdmin;
       console.log(usuario.isAdmin);
+      localStorage.setItem("isAdmin", usuario.isAdmin);
     });
     //The objects returned by the api are directly convertible to User objects
     return response;
@@ -34,11 +36,20 @@ async function addUserToBD(email:string): Promise<any> {
   
     return response;
   }
-
+/*
+  export async function checkUserInBD(): Promise<Usuario[]> {
+    const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/'
+    //const apiEndPoint= process.env.REACT_APP_API_URI || 'https://dede-en2a-restapi.herokuapp.com'
+    let response = await fetch(apiEndPoint +"usuario");
+    //The objects returned by the api are directly convertible to User objects
+    console.log(response.json());
+    return response.json();
+}
+*/
 const Home = () => {
    
     const {isAuthenticated, user} = useAuth0();
-
+    let usuario:Usuario;
     if(isAuthenticated){
         // comprobamos si ya existe en la bd
         let email:any = user?.email;
diff --git a/webapp/src/shared/sharedPedido.ts b/webapp/src/shared/sharedPedido.ts
new file mode 100644
index 0000000..de08cb2
--- /dev/null
+++ b/webapp/src/shared/sharedPedido.ts
@@ -0,0 +1,10 @@
+import { Usuario } from './sharedUser';
+import { Juguete } from './sharedJuguete';
+
+export type Pedido = {
+    id:number;
+    precioGastosDeEnvio: number;
+    precioFinal: number;
+    juguetes: [{_id:Juguete, cantidad: number}];
+    usuario: Usuario;
+}
\ No newline at end of file
diff --git a/webapp/src/tests/dynamicrouting.test.tsx b/webapp/src/tests/dynamicrouting.test.tsx
index 712803b..efb7e33 100644
--- a/webapp/src/tests/dynamicrouting.test.tsx
+++ b/webapp/src/tests/dynamicrouting.test.tsx
@@ -8,6 +8,16 @@ import Footer from '../componentes/Footer/Footer';
 import Home from '../paginas/Home';
 import ContactUs from '../paginas/ContactUs';
 import App from '../App';
+import Item from '../Item/Item';
+import { Juguete } from '../shared/sharedJuguete';
+import ProcesoPago from '../PayForm/ProcesoPago';
+import Shipping from '../PayForm/Shipping';
+import Delivery from '../PayForm/Delivery';
+import Review from '../PayForm/Review';
+import FinalizedOrder from '../PayForm/FinalizedOrder';
+import PedidoItem from '../componentes/Pedidos/PedidoItem';
+import HistorialPedidos from '../componentes/Pedidos/historial';
+import LoginForm from '../componentes/loginSOLID/LoginForm';
 
 test('navbar is rendered', () => {
   const component = render(<Navbar/>)
@@ -30,6 +40,114 @@ test('footer is rendered', () => {
   expect(component.container).toHaveTextContent('Uniovi')
 })
 
+test('App is rendered', () => {
+  const component = render(<App/>)
+
+  expect(component.container).toHaveTextContent('DeNostalgia')
+})
+
+
+test('Item is rendered', () => {
+  const component = render(<Item item={{
+    id: 0,
+    nombre: 'Pikachu',
+    descripcion: 'juguete',
+    precio: 2,
+    imagen: '',
+    categoria: 'nostalgia',
+    cantidad: 1
+  }} handleAddToCart={function (clickedItem: Juguete): void {
+  } }/>)
+
+
+
+  expect(component.container).toHaveTextContent('Pikachu')
+})
+
+test('Payform is rendered', () => {
+  const component = render(<ProcesoPago cartItems={[]}/>)
+
+  expect(component.container).toHaveTextContent('Envío')
+})
+
+test('Shipping is rendered', () => {
+  const component = render(<Shipping cartItems={[]} setDeliveryCost={function (n: number): void {
+  } } deliveryCost={0} siguientePaso={function (): void {
+  } } setAddress={function (n: string): void {
+  } } />)
+
+  expect(component.container).toHaveTextContent('Resumen')
+})
+
+test('Delivery is rendered', () => {
+  const component = render(<Delivery cartItems={[]} setDeliveryCost={function (n: number): void {
+  } } deliveryCost={0} siguientePaso={function (): void {
+  } } setAddress={function (n: string): void {
+  } } address={''} setDeliveryDate={function (n: string): void {
+  } } />)
+
+  expect(component.container).toHaveTextContent('Resumen')
+})
+test('Review is rendered', () => {
+  const component = render(<Review cartItems={[]} setDeliveryCost={function (n: number): void {
+  } } deliveryCost={0} siguientePaso={function (): void {
+  } } setAddress={function (n: string): void {
+  } } address={''} deliveryDate={''}  />)
+
+  expect(component.container).toHaveTextContent('Entrega')
+})
+
+test('Finalized ordder is rendered', () => {
+  const component = render(<FinalizedOrder  />)
+
+  expect(component.container).toHaveTextContent('finalizado')
+})
+
+test('PedidoItem ordder is rendered', () => {
+  const component = render(<PedidoItem item={{
+    id: 0,
+    nombre: 'Pikachu',
+    descripcion: 'juguete',
+    precio: 0,
+    imagen: '',
+    categoria: 'nostalgia',
+    cantidad: 2
+  }} cantidad={2}  />)
+
+  expect(component.container).toHaveTextContent('Pikachu')
+})
+
+
+test('Finalized ordder is rendered', () => {
+  const component = render(<FinalizedOrder  />)
+
+  expect(component.container).toHaveTextContent('finalizado')
+})
+
+test('Historial pedidos is rendered', () => {
+  const component = render(<HistorialPedidos  />)
+
+  expect(component.container).toHaveTextContent('pedidos')
+})
+
+
+test('Login button is rendered', () => {
+  const component = render(<LoginButton  />)
+
+  expect(component.container).toHaveTextContent('Registrarse')
+})
+
+test('Login form is rendered', () => {
+  const component = render(<LoginForm  />)
+
+  expect(component.container).toHaveTextContent('Registrarse')
+})
+test('Logout button is rendered', () => {
+  const component = render(<LogoutButton  />)
+
+  expect(component.container).toHaveTextContent('dirección')
+})
+
 test('clicking home nav-button', () => {
   const component = render(<Navbar/>)
 
@@ -41,6 +159,8 @@ test('clicking home nav-button', () => {
   //expect(component.container).toHaveTextContent('Bienvenido')
 })
 
+
+
 //Falta hacer que funcione render(<App>)
 /*
 test('clicking products nav-button', () => {