From e835547bc97cd2d1a7cdf0349e4edfd34eb46812 Mon Sep 17 00:00:00 2001 From: "Earl M. Smith" Date: Wed, 10 Feb 2021 10:32:48 -0500 Subject: [PATCH 01/12] Created Card with hardcoded name, number, bgcolor, and image. --- imgs/pika.jpg | Bin 0 -> 34234 bytes web/index.html | 32 ++++++++++++----- web/pokemon.css | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 8 deletions(-) create mode 100644 imgs/pika.jpg create mode 100644 web/pokemon.css diff --git a/imgs/pika.jpg b/imgs/pika.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4f471b946b4246640c2684a6e77db1196f651e44 GIT binary patch literal 34234 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 Pe?k%He=-<|dpr8?K${_o literal 0 HcmV?d00001 diff --git a/web/index.html b/web/index.html index 1de928b..62c2510 100644 --- a/web/index.html +++ b/web/index.html @@ -1,11 +1,27 @@ - - - - Document - - -

Hello Pokemon!

- + + + + Pokedex + + + +

Pokedex

+ +
+
+
+
+

Pikachu

+

#025

+
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/web/pokemon.css b/web/pokemon.css new file mode 100644 index 0000000..ed1b3c7 --- /dev/null +++ b/web/pokemon.css @@ -0,0 +1,93 @@ +/* Color variables */ +:root { + --bug: #3b9950; + --dark: #5a5979; + --dragon:#61cad9; + --electric:#fbfb71; + --fairy: #ea1169; + --fighting:#ef6138; + --fire:#fd4c59; + --flying:#93b2c7; + --ghost:#906790; + --grass:#26cb4f; + --ground:#6e491f; + --ice:#d9eefa; + --normal:#c998a7; + --poison: #9b69d8; + --psychic:#f71c91; + --rock:#8a3d22; + --steel:#42bd94; + --water:#86a9fa; + --pika:#f5e652; +} + +/* Global Layout Set-up */ +* { + margin: 0; + padding: 0; + box-sizing: border-box +} + +h1 { + font-size: 4rem; + margin-top: 3rem; + margin-bottom: 3rem; + text-align: center; + text-shadow: 0 1px 0 #ccc, + 0 2px 0 #c9c9c9, + 0 3px 0 #bbb, + 0 4px 0 #b9b9b9, + 0 5px 0 #aaa, + 0 6px 1px rgba(0,0,0,.1), + 0 0 5px rgba(0,0,0,.1), + 0 1px 3px rgba(0,0,0,.3), + 0 3px 5px rgba(0,0,0,.2), + 0 5px 10px rgba(0,0,0,.25), + 0 10px 10px rgba(0,0,0,.2), + 0 20px 20px rgba(0,0,0,.15); +} + +.container { + display:flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +img { + margin-top: 50px; + max-width: 25vh; + justify-content: center; + padding-bottom: 10px; +} + +.card { + margin-top: 4rem; + background-color: var(--pika); + box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); + min-width: 15%; + padding-bottom: 2.5em; + border-style:solid; +} + +h4.pName { + margin-top: 1rem; + display: float; + float: left; + padding-right: 3rem; + font-weight: bold; +} + +h4.pNum { + margin-top: 1rem; + display: float; + float: right; + padding-left: 3rem; + font-weight: bold; +} + +.line { + height: 3.5rem; + border-bottom: .1rem solid lightgrey; + border-bottom-width: 90%; +} \ No newline at end of file From 8fdaad3230bb97db0c5545848ca91b145f772e34 Mon Sep 17 00:00:00 2001 From: Kim Lai Date: Wed, 10 Feb 2021 21:24:22 -0500 Subject: [PATCH 02/12] js files --- rest/index.js | 25 ++++++++++++++++++++----- web/index.html | 2 +- web/index.js | 9 +++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 web/index.js diff --git a/rest/index.js b/rest/index.js index bba5463..f5c4093 100644 --- a/rest/index.js +++ b/rest/index.js @@ -1,11 +1,26 @@ -const express = require('express') +const express = require('express'); +const fetch = require('node-fetch'); +const cors = require("cors"); + const app = express() -const port = 3000 +app.use(cors()) +const port = 4000 -app.get('/', (req, res) => { - res.send('Hello World!') +app.get('/all', async (req, res) => { + fetch("https://pokeapi.co/api/v2/pokemon?limit=5&offset=0") + .then((res) => res.json()) + .then((allThePokemon) => { + const requestsToMake = allThePokemon.results.map(({ url }) => + fetch(url).then((res) => res.json()) + ); + return Promise.all(requestsToMake); + }) + .then((res) => console.log({res})) + .catch(err => console.error(err)); }) + + app.listen(port, () => { console.log(`Example app listening at http://localhost:${port}`) -}) \ No newline at end of file +}) diff --git a/web/index.html b/web/index.html index 62c2510..ea621ca 100644 --- a/web/index.html +++ b/web/index.html @@ -22,6 +22,6 @@

#025

- + \ No newline at end of file diff --git a/web/index.js b/web/index.js new file mode 100644 index 0000000..f20ff54 --- /dev/null +++ b/web/index.js @@ -0,0 +1,9 @@ +const button = document.querySelector("button"); + +button.addEventListener("click", () => { + fetch("http://localhost:4000/all") + .then((res) => res.json()) + .then((pokemon) => { + console.log(pokemon); + }); + }); \ No newline at end of file From 1e58bada3f2d63d002abb6c53095d9230ab4f61f Mon Sep 17 00:00:00 2001 From: Kim Lai Date: Thu, 11 Feb 2021 08:51:22 -0500 Subject: [PATCH 03/12] fix route --- package-lock.json | 19 +++++++++++++++++++ package.json | 4 +++- rest/index.js | 20 +++++++++++--------- web/index.html | 1 + web/index.js | 2 +- 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1fca92a..197b4e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,6 +63,15 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -235,6 +244,16 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", diff --git a/package.json b/package.json index 944e450..9d13184 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,8 @@ }, "homepage": "https://github.com/code-differently/Pokedex-App#readme", "dependencies": { - "express": "^4.17.1" + "cors": "^2.8.5", + "express": "^4.17.1", + "node-fetch": "^2.6.1" } } diff --git a/rest/index.js b/rest/index.js index f5c4093..373f0d5 100644 --- a/rest/index.js +++ b/rest/index.js @@ -6,17 +6,19 @@ const app = express() app.use(cors()) const port = 4000 -app.get('/all', async (req, res) => { +app.get('/all', async (req, response) => { fetch("https://pokeapi.co/api/v2/pokemon?limit=5&offset=0") - .then((res) => res.json()) - .then((allThePokemon) => { - const requestsToMake = allThePokemon.results.map(({ url }) => - fetch(url).then((res) => res.json()) - ); + .then((res) => res.json()) + .then((allThePokemon) => { + const requestsToMake = allThePokemon.results.map(({ url }) => + fetch(url).then((res) => res.json()) + ); return Promise.all(requestsToMake); - }) - .then((res) => console.log({res})) - .catch(err => console.error(err)); + }) + .then(data => { + response.json(data) + }) + .catch(err => console.error(err)); }) diff --git a/web/index.html b/web/index.html index ea621ca..5850b5d 100644 --- a/web/index.html +++ b/web/index.html @@ -21,6 +21,7 @@

#025

+ diff --git a/web/index.js b/web/index.js index f20ff54..19e6890 100644 --- a/web/index.js +++ b/web/index.js @@ -4,6 +4,6 @@ button.addEventListener("click", () => { fetch("http://localhost:4000/all") .then((res) => res.json()) .then((pokemon) => { - console.log(pokemon); + console.log(pokemon.data); }); }); \ No newline at end of file From 07de47db0f5c93627713dca41edd89a335a40b6c Mon Sep 17 00:00:00 2001 From: "Earl M. Smith" Date: Fri, 12 Feb 2021 00:36:01 -0500 Subject: [PATCH 04/12] eBranch --- imgs/25.png | Bin 0 -> 597 bytes imgs/pika.jpg | Bin 34234 -> 0 bytes package-lock.json | 487 +++++++++++++++++++++++++++++++++++++++++++++- web/index.html | 4 +- web/pokemon.css | 13 +- 5 files changed, 493 insertions(+), 11 deletions(-) create mode 100644 imgs/25.png delete mode 100644 imgs/pika.jpg diff --git a/imgs/25.png b/imgs/25.png new file mode 100644 index 0000000000000000000000000000000000000000..81bb5a8405cfa576b22ae1d591c04f4ea217d619 GIT binary patch literal 597 zcmV-b0;>IqP)VlfDFbAy~x0L35}-jo35T0!=`Aok``|MsN+|Nqr$FNy#F00DGTPE!Ct z=GbNc00G%aL_t(o!|j&AYQjJehBqaI9<#L+QF^F{UV0L5Jt>H__9e_Eh(3VOn;;VE z1C-KJK&a_TWlxUK0*H*DF6aN zmSuo?ZL0vjmKc6y*kU39jF+g*G`VIimv79pSg$&zdCwu1)f@CKLg%*wL1e03>!&t&S}y z6J#CZQmReYWpxT*K~e&d_3%AGeg*)W273siVX*5FfOP@vAPj;&Wf;#uA@~XF3q}KC zsN^SM=&XMqF5%_8O8%Gsi j33%1F6eA-eqyMTe4|Wu1GZ@|%00000NkvXXu0mjf+o<(F literal 0 HcmV?d00001 diff --git a/imgs/pika.jpg b/imgs/pika.jpg deleted file mode 100644 index 4f471b946b4246640c2684a6e77db1196f651e44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34234 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 Pe?k%He=-<|dpr8?K${_o diff --git a/package-lock.json b/package-lock.json index 1fca92a..2e83b3f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,493 @@ { "name": "pokedex-app", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "pokedex-app", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "express": "^4.17.1" + } + }, + "node_modules/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dependencies": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "node_modules/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dependencies": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dependencies": { + "safe-buffer": "5.1.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dependencies": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", + "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.28", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz", + "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==", + "dependencies": { + "mime-db": "1.45.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "node_modules/proxy-addr": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", + "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "dependencies": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dependencies": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + }, + "node_modules/serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "engines": { + "node": ">= 0.8" + } + } + }, "dependencies": { "accepts": { "version": "1.3.7", diff --git a/web/index.html b/web/index.html index 62c2510..9919f8e 100644 --- a/web/index.html +++ b/web/index.html @@ -12,12 +12,12 @@

Pokedex

-
+

Pikachu

#025

- +
diff --git a/web/pokemon.css b/web/pokemon.css index ed1b3c7..3eb37c2 100644 --- a/web/pokemon.css +++ b/web/pokemon.css @@ -18,7 +18,6 @@ --rock:#8a3d22; --steel:#42bd94; --water:#86a9fa; - --pika:#f5e652; } /* Global Layout Set-up */ @@ -55,15 +54,13 @@ h1 { } img { - margin-top: 50px; - max-width: 25vh; - justify-content: center; - padding-bottom: 10px; + width: 80%; + height: auto; } .card { + background-color: var(--electric); margin-top: 4rem; - background-color: var(--pika); box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); min-width: 15%; padding-bottom: 2.5em; @@ -74,7 +71,7 @@ h4.pName { margin-top: 1rem; display: float; float: left; - padding-right: 3rem; + padding-right: 2rem; font-weight: bold; } @@ -82,7 +79,7 @@ h4.pNum { margin-top: 1rem; display: float; float: right; - padding-left: 3rem; + padding-left: 2rem; font-weight: bold; } From 12b84cef31ad0e547e92371dd674b40ad8c365dc Mon Sep 17 00:00:00 2001 From: "Earl M. Smith" Date: Fri, 12 Feb 2021 00:48:41 -0500 Subject: [PATCH 05/12] collab pull/push to sync --- package-lock.json | 51 ++++++++++++++++++++++++++++++++++++++++++++++- package.json | 4 +++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e83b3f..4506968 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,9 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "express": "^4.17.1" + "cors": "^2.8.5", + "express": "^4.17.1", + "node-fetch": "^2.6.1" } }, "node_modules/accepts": { @@ -89,6 +91,18 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -312,6 +326,22 @@ "node": ">= 0.6" } }, + "node_modules/node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -548,6 +578,15 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -720,6 +759,16 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", diff --git a/package.json b/package.json index 944e450..9d13184 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,8 @@ }, "homepage": "https://github.com/code-differently/Pokedex-App#readme", "dependencies": { - "express": "^4.17.1" + "cors": "^2.8.5", + "express": "^4.17.1", + "node-fetch": "^2.6.1" } } From 3c18d6fdfe85f0ad54ccafe1f07903ff404ee94e Mon Sep 17 00:00:00 2001 From: Kim Lai Date: Fri, 12 Feb 2021 11:05:00 -0500 Subject: [PATCH 06/12] add fixed data to route --- rest/index.js | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/rest/index.js b/rest/index.js index 373f0d5..e3e4ede 100644 --- a/rest/index.js +++ b/rest/index.js @@ -6,19 +6,27 @@ const app = express() app.use(cors()) const port = 4000 -app.get('/all', async (req, response) => { - fetch("https://pokeapi.co/api/v2/pokemon?limit=5&offset=0") + + +app.get('/all/:count', async (req, response) => { + const count = req.params.count; + fetch(`https://pokeapi.co/api/v2/pokemon?limit=${count}&offset=0`) .then((res) => res.json()) .then((allThePokemon) => { - const requestsToMake = allThePokemon.results.map(({ url }) => - fetch(url).then((res) => res.json()) - ); - return Promise.all(requestsToMake); - }) + const requestsToMake = allThePokemon.results.map(({ url }) => + fetch(url).then((res) => res.json()) + ); + return Promise.all(requestsToMake); + }) .then(data => { - response.json(data) + let responseResult = []; + for( let i = 0; i < count; i++){ + let responseObject = { id: data[i].id, name: data[i].name, type: data[i].types[0].type.name, image: data[i].sprites.back_default}; + responseResult.push(responseObject); + } + response.json(responseResult); }) - .catch(err => console.error(err)); + .catch(err => console.error(err)); }) From a748d114eb7f9b34904cbb337d3583dcdad8671d Mon Sep 17 00:00:00 2001 From: Kim Lai Date: Fri, 12 Feb 2021 11:16:09 -0500 Subject: [PATCH 07/12] final response from route fixed --- rest/index.js | 2 +- web/index.html | 13 +++++++++---- web/index.js | 9 ++++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/rest/index.js b/rest/index.js index e3e4ede..f4093b3 100644 --- a/rest/index.js +++ b/rest/index.js @@ -33,4 +33,4 @@ app.get('/all/:count', async (req, response) => { app.listen(port, () => { console.log(`Example app listening at http://localhost:${port}`) -}) +}) \ No newline at end of file diff --git a/web/index.html b/web/index.html index 64e259e..4671b1d 100644 --- a/web/index.html +++ b/web/index.html @@ -8,21 +8,26 @@

Pokedex

+ + + +
-
+

Pikachu

#025

- +
- + + - \ No newline at end of file + diff --git a/web/index.js b/web/index.js index 19e6890..a26ceb3 100644 --- a/web/index.js +++ b/web/index.js @@ -1,9 +1,12 @@ const button = document.querySelector("button"); +const inputText = document.querySelector("#numberOfPokemons"); button.addEventListener("click", () => { - fetch("http://localhost:4000/all") + let input = inputText.value; + fetch(`http://localhost:4000/all/${input}`) .then((res) => res.json()) .then((pokemon) => { - console.log(pokemon.data); + + console.log(pokemon); }); - }); \ No newline at end of file + }); From 6569909ca528dcace7631ba9c05cf9b97475b8ee Mon Sep 17 00:00:00 2001 From: "Earl M. Smith" Date: Fri, 12 Feb 2021 17:38:15 -0500 Subject: [PATCH 08/12] html changes --- web/index.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/index.html b/web/index.html index 4671b1d..787ee0f 100644 --- a/web/index.html +++ b/web/index.html @@ -8,10 +8,11 @@

Pokedex

- - - - +
+ + + +
@@ -21,7 +22,7 @@

Pikachu

#025

- +
From 210f029d6dbff2b538c97d3c91f677d4a2f02a1f Mon Sep 17 00:00:00 2001 From: "Earl M. Smith" Date: Fri, 12 Feb 2021 19:58:54 -0500 Subject: [PATCH 09/12] added pokemon type color classes --- web/pokemon.css | 79 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) diff --git a/web/pokemon.css b/web/pokemon.css index 3eb37c2..4920284 100644 --- a/web/pokemon.css +++ b/web/pokemon.css @@ -1,5 +1,5 @@ /* Color variables */ -:root { +/* :root { --bug: #3b9950; --dark: #5a5979; --dragon:#61cad9; @@ -18,7 +18,7 @@ --rock:#8a3d22; --steel:#42bd94; --water:#86a9fa; -} +} */ /* Global Layout Set-up */ * { @@ -87,4 +87,77 @@ h4.pNum { height: 3.5rem; border-bottom: .1rem solid lightgrey; border-bottom-width: 90%; -} \ No newline at end of file +} + +.bug { + background-color: #3b9950; +} + +.dark { + background-color: #5a5979; +} + +.dragon { + background-color: #61cad9; +} + +.electric { + background-color: #fbfb71; +} + +.fairy { + background-color: #ea1169; +} + +.fighting { + background-color: #ef6138; +} + + +.fire { + background-color: #fd4c59; +} + +.flying { + background-color: #93b2c7; +} + +.ghost { + background-color: #906790; +} + +.grass { + background-color: #26cb4f; +} + +.ground { + background-color: #6e491f; +} + +.ice { + background-color: #d9eefa; +} + +.normal { + background-color: #c998a7; +} + +.poison { + background-color: #9b69d8; +} + +.psychic { + background-color: #f71c91; +} + +.rock { + background-color: #8a3d22; +} + +.steel { + background-color: #42bd94; +} + +.water { + background-color: #86a9fa +}; \ No newline at end of file From c038997a0d68e8fa9ec18c509f67360cc3d56b59 Mon Sep 17 00:00:00 2001 From: Kim Lai Date: Sun, 14 Feb 2021 14:00:47 -0500 Subject: [PATCH 10/12] card --- package-lock.json | 517 +--------------------------------------------- web/index.html | 13 +- web/index.js | 24 ++- web/pokemon.css | 165 +++++++++++++-- 4 files changed, 179 insertions(+), 540 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4506968..197b4e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,523 +1,8 @@ { "name": "pokedex-app", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "pokedex-app", - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "cors": "^2.8.5", - "express": "^4.17.1", - "node-fetch": "^2.6.1" - } - }, - "node_modules/accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dependencies": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" - }, - "node_modules/body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "dependencies": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "dependencies": { - "safe-buffer": "5.1.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" - }, - "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" - }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", - "dependencies": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "dependencies": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mime-db": { - "version": "1.45.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", - "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.28", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz", - "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==", - "dependencies": { - "mime-db": "1.45.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "node_modules/negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", - "engines": { - "node": "4.x || >=6.0.0" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" - }, - "node_modules/proxy-addr": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", - "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", - "dependencies": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "dependencies": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "node_modules/send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "dependencies": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" - }, - "node_modules/serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", - "dependencies": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" - }, - "node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "engines": { - "node": ">= 0.8" - } - } - }, "dependencies": { "accepts": { "version": "1.3.7", diff --git a/web/index.html b/web/index.html index 4671b1d..e5abdb3 100644 --- a/web/index.html +++ b/web/index.html @@ -14,7 +14,7 @@

Pokedex

-
+
diff --git a/web/index.js b/web/index.js index a26ceb3..51d87de 100644 --- a/web/index.js +++ b/web/index.js @@ -1,5 +1,6 @@ const button = document.querySelector("button"); const inputText = document.querySelector("#numberOfPokemons"); +const container = document.querySelector(".container"); button.addEventListener("click", () => { let input = inputText.value; @@ -7,6 +8,27 @@ button.addEventListener("click", () => { .then((res) => res.json()) .then((pokemon) => { - console.log(pokemon); + pokemon.map(i =>showPokemon(i.id, i.name, i.type, i.image)); + }); }); + + +function showPokemon(id, name, type, image){ + + let div = document.createElement('div'); + let divInnerHtml = + `
+
+
+

${name}

+

${id}

+
+
+ +
` + div.innerHTML = divInnerHtml; + div.classList.add(type); + container.appendChild(div); +} \ No newline at end of file diff --git a/web/pokemon.css b/web/pokemon.css index 3eb37c2..10c03b6 100644 --- a/web/pokemon.css +++ b/web/pokemon.css @@ -1,24 +1,4 @@ -/* Color variables */ -:root { - --bug: #3b9950; - --dark: #5a5979; - --dragon:#61cad9; - --electric:#fbfb71; - --fairy: #ea1169; - --fighting:#ef6138; - --fire:#fd4c59; - --flying:#93b2c7; - --ghost:#906790; - --grass:#26cb4f; - --ground:#6e491f; - --ice:#d9eefa; - --normal:#c998a7; - --poison: #9b69d8; - --psychic:#f71c91; - --rock:#8a3d22; - --steel:#42bd94; - --water:#86a9fa; -} + /* Global Layout Set-up */ * { @@ -87,4 +67,145 @@ h4.pNum { height: 3.5rem; border-bottom: .1rem solid lightgrey; border-bottom-width: 90%; -} \ No newline at end of file +} + +* { + margin: 0; + padding: 0; + box-sizing: border-box +} + +h1 { + font-size: 4rem; + margin-top: 3rem; + margin-bottom: 3rem; + text-align: center; + text-shadow: 0 1px 0 #ccc, + 0 2px 0 #c9c9c9, + 0 3px 0 #bbb, + 0 4px 0 #b9b9b9, + 0 5px 0 #aaa, + 0 6px 1px rgba(0,0,0,.1), + 0 0 5px rgba(0,0,0,.1), + 0 1px 3px rgba(0,0,0,.3), + 0 3px 5px rgba(0,0,0,.2), + 0 5px 10px rgba(0,0,0,.25), + 0 10px 10px rgba(0,0,0,.2), + 0 20px 20px rgba(0,0,0,.15); +} + +.container { + display:flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +img { + width: 80%; + height: auto; +} + +.card { + background-color: var(--electric); + margin-top: 4rem; + box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); + min-width: 15%; + padding-bottom: 2.5em; + border-style:solid; +} + +h4.pName { + margin-top: 1rem; + display: float; + float: left; + padding-right: 2rem; + font-weight: bold; +} + +h4.pNum { + margin-top: 1rem; + display: float; + float: right; + padding-left: 2rem; + font-weight: bold; +} + +.line { + height: 3.5rem; + border-bottom: .1rem solid lightgrey; + border-bottom-width: 90%; +} + +.bug { + background-color: #3b9950; +} + +.dark { + background-color: #5a5979; +} + +.dragon { + background-color: #61cad9; +} + +.electric { + background-color: #fbfb71; +} + +.fairy { + background-color: #ea1169; +} + +.fighting { + background-color: #ef6138; +} + + +.fire { + background-color: #fd4c59; +} + +.flying { + background-color: #93b2c7; +} + +.ghost { + background-color: #906790; +} + +.grass { + background-color: #26cb4f; +} + +.ground { + background-color: #6e491f; +} + +.ice { + background-color: #d9eefa; +} + +.normal { + background-color: #c998a7; +} + +.poison { + background-color: #9b69d8; +} + +.psychic { + background-color: #f71c91; +} + +.rock { + background-color: #8a3d22; +} + +.steel { + background-color: #42bd94; +} + +.water { + background-color: #86a9fa +}; From 5d8d183e20c4545b690c6ab74b1fd7575f8b31ab Mon Sep 17 00:00:00 2001 From: "Earl M. Smith" Date: Sun, 14 Feb 2021 20:53:41 -0500 Subject: [PATCH 11/12] configure css grid, added # before the number, change image to front sprite instead of back --- rest/index.js | 2 +- web/index.html | 8 ++------ web/index.js | 2 +- web/pokemon.css | 32 ++++++++++++++++++-------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/rest/index.js b/rest/index.js index f4093b3..1cff3c2 100644 --- a/rest/index.js +++ b/rest/index.js @@ -21,7 +21,7 @@ app.get('/all/:count', async (req, response) => { .then(data => { let responseResult = []; for( let i = 0; i < count; i++){ - let responseObject = { id: data[i].id, name: data[i].name, type: data[i].types[0].type.name, image: data[i].sprites.back_default}; + let responseObject = { id: data[i].id, name: data[i].name, type: data[i].types[0].type.name, image: data[i].sprites.front_default}; responseResult.push(responseObject); } response.json(responseResult); diff --git a/web/index.html b/web/index.html index 6134bdf..7317723 100644 --- a/web/index.html +++ b/web/index.html @@ -11,13 +11,9 @@

Pokedex

- + -
- -
- - +
diff --git a/web/index.js b/web/index.js index 51d87de..c87c3ba 100644 --- a/web/index.js +++ b/web/index.js @@ -22,7 +22,7 @@ function showPokemon(id, name, type, image){

${name}

-

${id}

+

#${id}

Date: Sun, 14 Feb 2021 21:06:51 -0500 Subject: [PATCH 12/12] added margin space on input/button --- web/index.html | 10 ++++++---- web/pokemon.css | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/web/index.html b/web/index.html index 7317723..6a5ff05 100644 --- a/web/index.html +++ b/web/index.html @@ -8,10 +8,12 @@

Pokedex

- - - - + +
+ + + +
diff --git a/web/pokemon.css b/web/pokemon.css index 4c3d40f..7236f0a 100644 --- a/web/pokemon.css +++ b/web/pokemon.css @@ -34,6 +34,10 @@ h1 { grid-template-columns: auto auto auto auto; } +.pButton { + margin-left: 3rem; + margin-bottom: 5rem; +} img { margin-left: auto;