IT-Academy-BCN · David-oss6 · Feb 28, 2023 · Feb 28, 2023 · Mar 9, 2023 · Mar 16, 2023
diff --git a/README.md b/README.md
@@ -1,52 +1,17 @@
-# Node Initial Demo
-
-### Project Structure
-
-Main structure of node.js project. Folders / files:
-
-- <b>\_\_tests__</b>. Tests folder. See [Jest Docs](https://jestjs.io/es-ES/docs/configuration) and [Chai Docs](https://www.chaijs.com/)
-- <b>app</b>:
-    - <b>config</b>
-    - <b>controllers</b>
-    - <b>middlewares</b>
-    - <b>models</b>
-    - <b>routes</b>
-    - <b>helpers</b>
-    - <b>app.js</b>. Entry point.
-- <b>package.json</b>.
-- <b>.env</b>. Environment descriptor. See [dotenv doc](https://www.npmjs.com/package/dotenv).
-
-Extras:
-- <b>.eslintrc</b>. Linter JS, static code analyzer. See [EsLint Docs](https://eslint.org/docs/user-guide/configuring/configuration-files).
-- <b>.prettierignore</b>. Code formatter. See [Prettier Config](https://prettier.io/docs/en/configuration.html) and [Prettier Ignore](https://prettier.io/docs/en/ignore.html).
-- <b>.ecosystem.config.js</b>. Process Manage at runtime. See [PM2 Docs](https://pm2.keymetrics.io/).
-
-### Import project for use with Visual Studio Code
-
-Follow the steps below:
-* Fork the project from https://github.com/IT-Academy-BCN/nodeInitialDemo
-* Clone your fork of the project from the Github Platform. Execute:
-  ```
-  git clone https://github.com/your_username_here/nodeInitialDemo
-  ```
-* Open the project downloaded
-  ![Open Project](img/VSC_open.png)
-
-
-### Import project for use with WebStorm
-
-Follow the steps below:
-* Fork the project from https://github.com/IT-Academy-BCN/nodeInitialDemo
-* Clone your fork of the project from the Github Platform. Execute:
-  ```
-  git clone https://github.com/your_username_here/nodeInitialDemo
-  ```
-* Open the project downloaded
-![Open Project](img/webstorm_open.png)
-
-
-### Utilities
-
-* [Node Developers Guide](https://nodejs.dev/learn)
-* **.gitignore file** configuration. See [Official Docs](https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files).
-* **Git branches**. See [Official Docs](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell)
+# Entrega 4.1
+
+## Requiere instalar dependencias:
+
+
+## Funcionamiento
+
+- npm i --> para instalar dependencias
+
+- npm run --> start para ejecutar la aplicación
+
+## POSTMAN COLLECTION
+
+- importar archivo desde postman: entrega41.postman_collection.json
+
+
+
diff --git a/__tests__/primerTest.ts b/__tests__/primerTest.ts
@@ -0,0 +1,11 @@
+// import getPokemon from "../app/controllers/getPokemon";
+
+// ///PASO 1
+// describe("Test controlladores", () => {
+//     test("getPokemon", () => {
+//         const req: Request = {}
+//         const res:object = {}
+//         const result: object = {}
+//         expect(getPokemon(req, res)).toBe(result);
+//     })    
+// });
diff --git a/app/app.js b/app/app.js
diff --git a/app/app.ts b/app/app.ts
@@ -0,0 +1,20 @@
+const express = require("express")
+const app = express()
+const fileUpload = require("express-fileupload")
+
+import userRouter from "./routes/users"
+import imgRouter from "./routes/imgRouter"
+import timeRouter from "./routes/timeRouter"
+import pokemonRouter from "./routes/pokemonRouter"
+
+app.use(fileUpload())
+app.use(express.json())
+app.use(userRouter) // nivell 1 exercici 1
+app.use(imgRouter) // nivell 1 exercici 2
+app.use(timeRouter) /// NIVELL 2
+app.use(pokemonRouter) // NIVEL 3
+
+const port: string | number = process.env.PORT || 5000
+app.listen(port, (): void => {
+  console.log(`Server iniciado en puerto ${port}`)
+})
diff --git a/app/config/config.js b/app/config/config.js
diff --git a/app/controllers/controller.js b/app/controllers/controller.js
diff --git a/app/controllers/getPokemon.ts b/app/controllers/getPokemon.ts
@@ -0,0 +1,18 @@
+import axios from 'axios'
+import {Request, Response} from 'express'
+
+const getPokemon = async (req: Request, res: Response) => {
+  const id:number = parseInt(req.params.id)  
+  const buscarPokemon = async (id: number): Promise<object> => {
+    let x = await axios(`https://pokeapi.co/api/v2/pokemon/${id}`).then(
+      (res: any) =>
+      (res = {
+        nom: res.data.species.name,
+        pes: res.data.weight,
+      })
+    )
+    return x
+  }
+  res.send(await buscarPokemon(id))
+}
+export default getPokemon
diff --git a/app/controllers/getUsers.ts b/app/controllers/getUsers.ts
@@ -0,0 +1,7 @@
+import {Request, Response} from 'express'
+
+const getUsers = (req: Request, res: Response): void => {
+  res.send([{ name: "David", age: 37, pass: 123 }, `Request url: ${req.url}`])
+}
+
+export default getUsers
diff --git a/app/controllers/postImg.ts b/app/controllers/postImg.ts
@@ -0,0 +1,14 @@
+const mymetypes = ["image/jpg", "image/png", "image/gif"]
+const dirname = "./app/upload/"
+
+const postImg = (req: any, res: any): Response => {
+  if (!req.files) {
+    return res.status(400).send("No file attached")
+  }
+  if (mymetypes.includes(req.files.imagen.mimetype)) {
+    req.files.imagen.mv(dirname + Date.now() + req.files.imagen.name)
+    return res.status(200).send("image uploaded")
+  } else return res.status(400).send("JPG/PNG/GIF Only")
+}
+
+export default postImg
diff --git a/app/controllers/postTime.ts b/app/controllers/postTime.ts
@@ -0,0 +1,7 @@
+import {Request, Response} from 'express'
+const postTime = (_req: Request, res: Response): void => {
+  const day = new Date()
+  res.status(200).send(day)
+}
+
+export default postTime
diff --git a/app/helpers/helper.js b/app/helpers/helper.js
diff --git a/__tests__/app.test.js → app/img/aaaaForzarFallo.txt b/__tests__/app.test.js → app/img/aaaaForzarFallo.txt
diff --git a/app/img/mario.png b/app/img/mario.png
diff --git a/app/middlewares/middleware.js b/app/middlewares/middleware.js
diff --git a/app/middlewares/nivell2exercici1.ts b/app/middlewares/nivell2exercici1.ts
@@ -0,0 +1,12 @@
+import { NextFunction } from "connect"
+import {Request, Response} from 'express'
+
+const middle = (req: Request, res: Response, next: NextFunction) => {  
+  if (!req.body.password) {
+    res.status(401).send('Req.body no contiene password')    
+  }
+  if(req.body.password){next()}
+
+}
+
+export default middle
diff --git a/app/middlewares/setAllowOrigin.ts b/app/middlewares/setAllowOrigin.ts
@@ -0,0 +1,7 @@
+import { NextFunction } from 'connect'
+import {Request, Response} from 'express' 
+
+export const setAllowOrigin = (_req: Request, res: Response, next: NextFunction): void=>{
+  res.set("Access-Control-Allow-Origin", "*")   
+  next()
+}
diff --git a/app/middlewares/setCache.ts b/app/middlewares/setCache.ts
@@ -0,0 +1,7 @@
+import { NextFunction } from 'connect'
+import {Request, Response} from 'express' 
+
+export const setCache = (_req: Request, res: Response, next: NextFunction): void=>{  
+  res.set("Cache-Control", "no-cache")
+  next()
+}
diff --git a/app/models/model.js b/app/models/model.js
diff --git a/app/routes/imgRouter.ts b/app/routes/imgRouter.ts
@@ -0,0 +1,8 @@
+import express from "express"
+import postImg from "../controllers/postImg"
+
+const router = express.Router()
+
+router.post("/img", postImg)
+
+export default router
diff --git a/app/routes/pokemonRouter.ts b/app/routes/pokemonRouter.ts
@@ -0,0 +1,8 @@
+import express from 'express'
+import getPokemon from "../controllers/getPokemon"
+
+const router = express.Router()
+
+router.get("/pokemon/:id", getPokemon)
+
+export default router
diff --git a/app/routes/route.js b/app/routes/route.js
diff --git a/app/routes/timeRouter.ts b/app/routes/timeRouter.ts
@@ -0,0 +1,14 @@
+import express from 'express'
+import postTime from "../controllers/postTime"
+import middle from '../middlewares/nivell2exercici1'
+import { setCache } from '../middlewares/setCache'
+import { setAllowOrigin } from '../middlewares/setAllowOrigin'
+
+const router = express.Router()
+
+router.use(setAllowOrigin)
+router.use(setCache)
+router.use(middle)
+router.post("/time", postTime)
+
+export default router
diff --git a/app/routes/users.ts b/app/routes/users.ts
@@ -0,0 +1,7 @@
+import express from 'express'
+import getUsers from '../controllers/getUsers'
+
+const router = express.Router()
+router.get("/", getUsers)
+
+export default router
diff --git a/app/upload/1679933221625mario.png b/app/upload/1679933221625mario.png
diff --git a/app/upload/1679936406963mario.png b/app/upload/1679936406963mario.png
diff --git a/app/upload/1679936421463mario.png b/app/upload/1679936421463mario.png
diff --git a/app/upload/1679936497474mario.png b/app/upload/1679936497474mario.png
diff --git a/app/upload/1679936563926mario.png b/app/upload/1679936563926mario.png
diff --git a/app/upload/1679936650310mario.png b/app/upload/1679936650310mario.png
diff --git a/app/upload/1679936676618mario.png b/app/upload/1679936676618mario.png
diff --git a/app/upload/1679936968605mario.png b/app/upload/1679936968605mario.png
diff --git a/build/app.js b/build/app.js
@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express = require("express");
+const app = express();
+const fileUpload = require("express-fileupload");
+const users_1 = __importDefault(require("./routes/users"));
+const imgRouter_1 = __importDefault(require("./routes/imgRouter"));
+const timeRouter_1 = __importDefault(require("./routes/timeRouter"));
+const pokemonRouter_1 = __importDefault(require("./routes/pokemonRouter"));
+const nivell2exercici1_1 = __importDefault(require("./middlewares/nivell2exercici1"));
+app.use(fileUpload());
+app.use(express.json());
+app.use(users_1.default); // nivell 1 exercici 1
+app.use(imgRouter_1.default); // nivell 1 exercici 2
+app.use(nivell2exercici1_1.default, timeRouter_1.default); /// NIVELL 2
+app.use(pokemonRouter_1.default); // NIVEL 3
+const port = process.env.PORT || 5000;
+app.listen(port, () => {
+    console.log(`Server iniciado en puerto ${port}`);
+});
diff --git a/build/controllers/getPokemon.js b/build/controllers/getPokemon.js
@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
+const getPokemon = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    const id = req.params.id;
+    const buscarPokemon = (id) => {
+        let x = axios_1.default(`https://pokeapi.co/api/v2/pokemon/${id}`).then((res) => (res = {
+            nom: res.data.species.name,
+            pes: res.data.weight,
+        }));
+        return x;
+    };
+    res.send(yield buscarPokemon(id));
+});
+exports.default = getPokemon;
diff --git a/build/controllers/getUsers.js b/build/controllers/getUsers.js
@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const getUsers = (req, res) => {
+    res.send([{ name: "David", age: 37, pass: 123 }, `Request url: ${req.url}`]);
+};
+exports.default = getUsers;
diff --git a/build/controllers/postImg.js b/build/controllers/postImg.js
@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mymetypes = ["image/jpg", "image/png", "image/gif"];
+const dirname = "./app/upload/";
+const postImg = (req, res) => {
+    if (!req.files) {
+        return res.status(400).send("No file attached");
+    }
+    if (mymetypes.includes(req.files.imagen.mimetype)) {
+        req.files.imagen.mv(dirname + Date.now() + req.files.imagen.name);
+        return res.status(200).send("image uploaded");
+    }
+    else
+        return res.status(400).send("JPG/PNG/GIF Only");
+};
+exports.default = postImg;
diff --git a/build/controllers/postTime.js b/build/controllers/postTime.js
@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const postTime = (_req, res) => {
+    const day = new Date();
+    res.send(day);
+};
+exports.default = postTime;
diff --git a/build/middlewares/nivell2exercici1.js b/build/middlewares/nivell2exercici1.js
@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const middle = (req, res, next) => {
+    res.set("Cache-Control", "no-cache");
+    res.header("Access-Control-Allow-Origin", "*");
+    req.body = { name: "David", age: 37, password: "asd" };
+    // console.log(req.body);
+    if (!req.body.password) {
+        res.status = 401;
+        // res.send(res.status);
+    }
+    next();
+};
+exports.default = middle;
diff --git a/build/routes/imgRouter.js b/build/routes/imgRouter.js
@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const postImg_1 = __importDefault(require("../controllers/postImg"));
+const router = express_1.default.Router();
+router.post("/img", postImg_1.default);
+exports.default = router;
diff --git a/build/routes/pokemonRouter.js b/build/routes/pokemonRouter.js
@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const getPokemon_1 = __importDefault(require("../controllers/getPokemon"));
+const router = express_1.default.Router();
+router.get("/pokemon/:id", getPokemon_1.default);
+exports.default = router;
diff --git a/build/routes/timeRouter.js b/build/routes/timeRouter.js
@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const postTime_1 = __importDefault(require("../controllers/postTime"));
+const router = express_1.default.Router();
+router.post("/time", postTime_1.default);
+exports.default = router;
diff --git a/build/routes/users.js b/build/routes/users.js
@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const getUsers_1 = __importDefault(require("../controllers/getUsers"));
+const router = express_1.default.Router();
+router.get("/", getUsers_1.default);
+exports.default = router;