From 173565a2b326dec9a2e38da640eddc9367e4d4d1 Mon Sep 17 00:00:00 2001 From: danbart Date: Fri, 19 Jun 2020 00:23:48 -0600 Subject: [PATCH 1/6] updateDatos --- .gitignore | 2 +- package.json | 1 + src/client.ts | 38 ++++++++++++++++++++++++++++++++++++++ src/index.ts | 35 ++++++++++++++++++++++++++++++++++- yarn.lock | 5 +++++ 5 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 src/client.ts diff --git a/.gitignore b/.gitignore index a91eeca..c0c2c62 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ /node_modules /dist /data -src/client.ts \ No newline at end of file +src/datos.ts \ No newline at end of file diff --git a/package.json b/package.json index 2bc6d97..8b0e219 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "ajv": "^6.12.2", "axios": "^0.19.2", "bcryptjs": "^2.4.3", + "dotenv": "^8.2.0", "express": "^4.17.1", "ts-node-dev": "^1.0.0-pre.44" }, diff --git a/src/client.ts b/src/client.ts new file mode 100644 index 0000000..91e8dcf --- /dev/null +++ b/src/client.ts @@ -0,0 +1,38 @@ +import { resolve } from 'path'; +import {config} from 'dotenv'; +import axios from 'axios' +import { datos } from './datos' + +config({path: resolve(__dirname, "./.env")}); + +const url = 'http://95.217.235.69/' +// const url = 'http://localhost/' + +export const getInfo = async () => { + datos.credentials.password = process.env.PASSWORD + const urlString = url+datos.contactInfo.emailAddress + + const data = await axios.get(urlString ,{ + headers: { + "Content-Type": "application/json", + "x-password": datos.credentials.password + } + }).then(res => { + return res.data + }).catch(err => { + return err + }) + + return data +} + +export const sendInfo = async () => { + datos.credentials.password = process.env.PASSWORD + const data = axios.post(url,datos).then(res => { + return (res.status, res.data) + }).catch(err => { + return err + }) + return data +} + diff --git a/src/index.ts b/src/index.ts index 513b905..3ecdbd9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,11 +4,42 @@ import express from "express"; import fs from "fs"; import schema from "./schema.json"; import server from "./server"; +import { sendInfo, getInfo } from './client'; export const router = express.Router({ strict: true, }); +// mis rutas +server.get("/setData", async (req: Request, res: Response) => { + try{ + const datos = await sendInfo() + res.json({ + datos + }) + } catch(err){ + res.json({ + status: "400", + message: err + }) + } +}) + +server.get("/getData", async (req: Request, res: Response) => { + + try { + + const datos = await getInfo() + res.json({ + datos + }) + } catch(error){ + res.json({ + error + }) + } +}) + server.get("/:emailAddress", async (req: Request, res: Response) => { const message = "Acceso inválido mi chavo. ¿Proporcionaste la contraseña en el parámetro x-password de los headers?"; @@ -64,7 +95,7 @@ server.post("/", async (req: Request, res: Response) => { } const fileName = req.body?.contactInfo?.emailAddress; - + req.body.credentials.password = await hash( req.body.credentials.password, await genSalt(), @@ -87,6 +118,8 @@ server.post("/", async (req: Request, res: Response) => { } }); + + server.listen("80", () => { console.log("listening"); }); diff --git a/yarn.lock b/yarn.lock index a12cac9..bc63c18 100644 --- a/yarn.lock +++ b/yarn.lock @@ -202,6 +202,11 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +dotenv@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" + integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== + dynamic-dedupe@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz#06e44c223f5e4e94d78ef9db23a6515ce2f962a1" From 683b07816d190e7e86d0e01735a1cc3c29da31f2 Mon Sep 17 00:00:00 2001 From: danbart Date: Fri, 19 Jun 2020 19:10:38 -0600 Subject: [PATCH 2/6] update comentarios --- .gitignore | 2 +- src/client.ts | 3 ++- src/datos.ts | 30 ++++++++++++++++++++++++++++++ src/index.ts | 35 +---------------------------------- 4 files changed, 34 insertions(+), 36 deletions(-) create mode 100644 src/datos.ts diff --git a/.gitignore b/.gitignore index c0c2c62..a91eeca 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ /node_modules /dist /data -src/datos.ts \ No newline at end of file +src/client.ts \ No newline at end of file diff --git a/src/client.ts b/src/client.ts index 91e8dcf..38dcf53 100644 --- a/src/client.ts +++ b/src/client.ts @@ -6,7 +6,6 @@ import { datos } from './datos' config({path: resolve(__dirname, "./.env")}); const url = 'http://95.217.235.69/' -// const url = 'http://localhost/' export const getInfo = async () => { datos.credentials.password = process.env.PASSWORD @@ -36,3 +35,5 @@ export const sendInfo = async () => { return data } +getInfo(); +sendInfo(); \ No newline at end of file diff --git a/src/datos.ts b/src/datos.ts new file mode 100644 index 0000000..245e418 --- /dev/null +++ b/src/datos.ts @@ -0,0 +1,30 @@ +export const datos = { + contactInfo: { + fullName: "Danilo Antonio Solórzano Rodas", + emailAddress: "danilo_solorzano06@hotmail.com", + }, + github: { + profileURL: "https://github.com/danbart", + username: "danbart", + }, + credentials: { + password: "", + }, +personalInfo: { + questions: [ + { + question: "If I was a Sr. Programmer, I would like to build:", + answer: "Respuesta: Una plataforma educativa que ayude a las persones médiate interacciones a mejorar su ortografía de una forma divertida, que esta no sirva para corregir textos si no que la gente aprenda las reglas gramaticales y ortográficas.", + }, + { + question: + "Por favor indica el URL que me lleva a la línea de código de la definición de React.useEffect", + answer: "Respuesta: React.useEffect es un hook de react que es un efecto secundario que nos sirve para refrescar un parte del código cuando exista un cambio dentro de un estado. ", + }, + { + question: "code is poetry, because:", + answer: "Respuesta: Los códigos son poesía por que son un conjunto de elementos que forman un lenguaje de programación siendo este una creación estética y artística.", + }, + ], +}, +} diff --git a/src/index.ts b/src/index.ts index 3ecdbd9..513b905 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,42 +4,11 @@ import express from "express"; import fs from "fs"; import schema from "./schema.json"; import server from "./server"; -import { sendInfo, getInfo } from './client'; export const router = express.Router({ strict: true, }); -// mis rutas -server.get("/setData", async (req: Request, res: Response) => { - try{ - const datos = await sendInfo() - res.json({ - datos - }) - } catch(err){ - res.json({ - status: "400", - message: err - }) - } -}) - -server.get("/getData", async (req: Request, res: Response) => { - - try { - - const datos = await getInfo() - res.json({ - datos - }) - } catch(error){ - res.json({ - error - }) - } -}) - server.get("/:emailAddress", async (req: Request, res: Response) => { const message = "Acceso inválido mi chavo. ¿Proporcionaste la contraseña en el parámetro x-password de los headers?"; @@ -95,7 +64,7 @@ server.post("/", async (req: Request, res: Response) => { } const fileName = req.body?.contactInfo?.emailAddress; - + req.body.credentials.password = await hash( req.body.credentials.password, await genSalt(), @@ -118,8 +87,6 @@ server.post("/", async (req: Request, res: Response) => { } }); - - server.listen("80", () => { console.log("listening"); }); From f7f31312712b23e712c0e9869c109b612aea530d Mon Sep 17 00:00:00 2001 From: danbart Date: Fri, 19 Jun 2020 19:15:16 -0600 Subject: [PATCH 3/6] data --- src/client.ts | 2 +- src/{datos.ts => data.ts} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/{datos.ts => data.ts} (100%) diff --git a/src/client.ts b/src/client.ts index 38dcf53..15927d4 100644 --- a/src/client.ts +++ b/src/client.ts @@ -1,7 +1,7 @@ import { resolve } from 'path'; import {config} from 'dotenv'; import axios from 'axios' -import { datos } from './datos' +import { datos } from './data' config({path: resolve(__dirname, "./.env")}); diff --git a/src/datos.ts b/src/data.ts similarity index 100% rename from src/datos.ts rename to src/data.ts From c907110257c94d54905d7c32442b6e7708e470dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danilo=20Sol=C3=B3rzano?= Date: Fri, 19 Jun 2020 22:04:35 -0600 Subject: [PATCH 4/6] Update src/data.ts sugerencia Co-authored-by: Gus --- src/data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data.ts b/src/data.ts index 245e418..d5c83c0 100644 --- a/src/data.ts +++ b/src/data.ts @@ -14,7 +14,7 @@ personalInfo: { questions: [ { question: "If I was a Sr. Programmer, I would like to build:", - answer: "Respuesta: Una plataforma educativa que ayude a las persones médiate interacciones a mejorar su ortografía de una forma divertida, que esta no sirva para corregir textos si no que la gente aprenda las reglas gramaticales y ortográficas.", + answer: "Respuesta: Una plataforma educativa que ayude a las personas mediante interacciones a mejorar su ortografía de una forma divertida, que esta no sirva para corregir textos si no que la gente aprenda las reglas gramaticales y ortográficas.", }, { question: From d0a391975397f0ab99c6e11c21cff2c1b9c1116b Mon Sep 17 00:00:00 2001 From: danbart Date: Fri, 19 Jun 2020 22:16:58 -0600 Subject: [PATCH 5/6] cambio de respuesta --- src/data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data.ts b/src/data.ts index d5c83c0..3aee28f 100644 --- a/src/data.ts +++ b/src/data.ts @@ -19,7 +19,7 @@ personalInfo: { { question: "Por favor indica el URL que me lleva a la línea de código de la definición de React.useEffect", - answer: "Respuesta: React.useEffect es un hook de react que es un efecto secundario que nos sirve para refrescar un parte del código cuando exista un cambio dentro de un estado. ", + answer: "https://github.com/facebook/react/blob/b34f042e5b6fa30c645b71d38a0b1ecf785af2cc/packages/react/src/ReactHooks.js#L96", }, { question: "code is poetry, because:", From 25e3e1f28d53f4b0e5dd90c87c5c61078f6b049d Mon Sep 17 00:00:00 2001 From: danbart Date: Sat, 20 Jun 2020 12:16:05 -0600 Subject: [PATCH 6/6] =?UTF-8?q?prettier=20en=20archivos=20y=20eliminaci?= =?UTF-8?q?=C3=B3n=20de=20dotenv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - src/client.ts | 6 +----- src/data.ts | 57 +++++++++++++++++++++++++++------------------------ yarn.lock | 5 ----- 4 files changed, 31 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 8b0e219..2bc6d97 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "ajv": "^6.12.2", "axios": "^0.19.2", "bcryptjs": "^2.4.3", - "dotenv": "^8.2.0", "express": "^4.17.1", "ts-node-dev": "^1.0.0-pre.44" }, diff --git a/src/client.ts b/src/client.ts index 15927d4..220604e 100644 --- a/src/client.ts +++ b/src/client.ts @@ -1,10 +1,6 @@ -import { resolve } from 'path'; -import {config} from 'dotenv'; -import axios from 'axios' +import axios from 'axios' import { datos } from './data' -config({path: resolve(__dirname, "./.env")}); - const url = 'http://95.217.235.69/' export const getInfo = async () => { diff --git a/src/data.ts b/src/data.ts index 3aee28f..13acd13 100644 --- a/src/data.ts +++ b/src/data.ts @@ -1,30 +1,33 @@ export const datos = { - contactInfo: { - fullName: "Danilo Antonio Solórzano Rodas", - emailAddress: "danilo_solorzano06@hotmail.com", - }, - github: { - profileURL: "https://github.com/danbart", - username: "danbart", - }, - credentials: { - password: "", - }, -personalInfo: { + contactInfo: { + fullName: "Danilo Antonio Solórzano Rodas", + emailAddress: "danilo_solorzano06@hotmail.com", + }, + github: { + profileURL: "https://github.com/danbart", + username: "danbart", + }, + credentials: { + password: "", + }, + personalInfo: { questions: [ - { - question: "If I was a Sr. Programmer, I would like to build:", - answer: "Respuesta: Una plataforma educativa que ayude a las personas mediante interacciones a mejorar su ortografía de una forma divertida, que esta no sirva para corregir textos si no que la gente aprenda las reglas gramaticales y ortográficas.", - }, - { - question: - "Por favor indica el URL que me lleva a la línea de código de la definición de React.useEffect", - answer: "https://github.com/facebook/react/blob/b34f042e5b6fa30c645b71d38a0b1ecf785af2cc/packages/react/src/ReactHooks.js#L96", - }, - { - question: "code is poetry, because:", - answer: "Respuesta: Los códigos son poesía por que son un conjunto de elementos que forman un lenguaje de programación siendo este una creación estética y artística.", - }, + { + question: "If I was a Sr. Programmer, I would like to build:", + answer: + "Respuesta: Una plataforma educativa que ayude a las personas mediante interacciones a mejorar su ortografía de una forma divertida, que esta no sirva para corregir textos si no que la gente aprenda las reglas gramaticales y ortográficas.", + }, + { + question: + "Por favor indica el URL que me lleva a la línea de código de la definición de React.useEffect", + answer: + "https://github.com/facebook/react/blob/b34f042e5b6fa30c645b71d38a0b1ecf785af2cc/packages/react/src/ReactHooks.js#L96", + }, + { + question: "code is poetry, because:", + answer: + "Respuesta: Los códigos son poesía por que son un conjunto de elementos que forman un lenguaje de programación siendo este una creación estética y artística.", + }, ], -}, -} + }, +}; diff --git a/yarn.lock b/yarn.lock index bc63c18..a12cac9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -202,11 +202,6 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== -dotenv@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" - integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== - dynamic-dedupe@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz#06e44c223f5e4e94d78ef9db23a6515ce2f962a1"