Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

h2 Texto #1

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
5da8273
primer h1 en index
SharonHQ Aug 6, 2020
2882694
Merge pull request #1 from SharonHQ/master
VivianBritez Aug 6, 2020
eed3719
texto en readme
VivianBritez Aug 6, 2020
72392c0
Cambio en H2
VivianBritez Aug 6, 2020
61f885c
HU Order number
SharonHQ Aug 18, 2020
304a34d
Merge pull request #2 from SharonHQ/master
VivianBritez Aug 18, 2020
d7f964a
cambios realizados
VivianBritez Aug 18, 2020
5fe2fe0
cambios
VivianBritez Aug 18, 2020
3d8fe6d
HU order alfabeticamente
VivianBritez Aug 18, 2020
a1e17fd
dataTest
VivianBritez Aug 18, 2020
91f12df
test de order completados
VivianBritez Aug 19, 2020
9078e12
cambiando order a objeto con métodos
SharonHQ Aug 19, 2020
b3e3fc1
instalando dependencias
SharonHQ Aug 20, 2020
20041ba
order como objeto
SharonHQ Aug 20, 2020
e91edd7
Merge pull request #3 from SharonHQ/master
VivianBritez Aug 20, 2020
d5da04f
page
VivianBritez Aug 20, 2020
b85f652
Solo de prueba
VivianBritez Aug 20, 2020
7ec3e64
refactoriación del código y mejoras en el css
SharonHQ Aug 20, 2020
7646609
Merge pull request #4 from SharonHQ/master
VivianBritez Aug 20, 2020
1b7ac71
agregando media querys para primeras historias
SharonHQ Aug 22, 2020
fd8bb28
Merge pull request #5 from SharonHQ/master
VivianBritez Aug 22, 2020
ffaf545
filter generation name
SharonHQ Aug 24, 2020
40e4ec1
Merge pull request #6 from SharonHQ/master
VivianBritez Aug 24, 2020
57a498b
filter-type
VivianBritez Aug 24, 2020
4d3b27c
test y weakness
VivianBritez Aug 26, 2020
d0d2868
filter two types
SharonHQ Aug 26, 2020
b033bec
Merge pull request #7 from SharonHQ/master
VivianBritez Aug 26, 2020
140789f
label closed
SharonHQ Aug 28, 2020
131d27f
Merge pull request #8 from SharonHQ/master
VivianBritez Aug 28, 2020
d510584
weaknesses
VivianBritez Aug 28, 2020
40ca322
nuevos cambios
SharonHQ Aug 31, 2020
9db32ad
Merge pull request #9 from SharonHQ/master
VivianBritez Aug 31, 2020
fc13a87
Search box new
SharonHQ Aug 31, 2020
3b3a69e
Merge pull request #10 from SharonHQ/master
VivianBritez Sep 1, 2020
bc973a0
Cambios en los estilos
SharonHQ Sep 1, 2020
4609d59
Merge pull request #11 from SharonHQ/master
VivianBritez Sep 1, 2020
d70c194
filter final
SharonHQ Sep 1, 2020
e1c60d6
Merge pull request #12 from SharonHQ/master
VivianBritez Sep 1, 2020
0fca80d
search
VivianBritez Sep 2, 2020
8c6cb13
Search num & name
SharonHQ Sep 3, 2020
21b516e
Merge pull request #13 from SharonHQ/master
VivianBritez Sep 3, 2020
63a5043
pokemon view
SharonHQ Sep 3, 2020
b514cef
Merge pull request #14 from SharonHQ/master
VivianBritez Sep 3, 2020
18dd56e
Fetch
VivianBritez Sep 3, 2020
ba46753
Basic Data
SharonHQ Sep 4, 2020
e466308
Merge pull request #15 from SharonHQ/master
VivianBritez Sep 4, 2020
9305be8
overview y abilities
SharonHQ Sep 5, 2020
6392ecd
Merge pull request #16 from SharonHQ/master
VivianBritez Sep 5, 2020
c235b48
implementando tablas y media querys en pokemon View
SharonHQ Sep 6, 2020
19da98e
Merge pull request #17 from SharonHQ/master
VivianBritez Sep 6, 2020
76ea6da
Readme
SharonHQ Sep 7, 2020
77da0bf
overview
VivianBritez Sep 8, 2020
2bd0f55
Merge pull request #18 from SharonHQ/master
VivianBritez Sep 8, 2020
499f788
Merge branch 'master' of https://github.com/VivianBritez/LIM013-data-…
VivianBritez Sep 8, 2020
88aab15
overview-1
VivianBritez Sep 8, 2020
9ed6adb
implementando overview
SharonHQ Sep 8, 2020
15d7cbf
Merge pull request #19 from SharonHQ/master
VivianBritez Sep 8, 2020
5e7d340
stats
VivianBritez Sep 8, 2020
348aaef
base stats y test terminados
VivianBritez Sep 9, 2020
65e92a2
loading
VivianBritez Sep 9, 2020
468fa8b
loading cargado
VivianBritez Sep 9, 2020
57c36fc
the end
VivianBritez Sep 9, 2020
5f4ada3
loading-the end
VivianBritez Sep 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
460 changes: 53 additions & 407 deletions README.md

Large diffs are not rendered by default.

Binary file added image/AF-inicio-desktop.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/AF-inicio-mobile.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/AF-pokemon-mobile.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/AF-pokemon.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/HU/cont.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/HU/filterregion.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/HU/filtertype.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/HU/orderalpha.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/HU/ordernum.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/HU/search.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/HU/view.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/index.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/order.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/paper.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/pokeball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/pokemon.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/wireframes.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5,267 changes: 5,267 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

50 changes: 26 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
{
"name": "data-lovers",
"version": "1.0.0",
"main": "src/index.html",
"license": "MIT",
"scripts": {
"htmlhint": "htmlhint src/*.html test/*.html",
"eslint": "eslint --ext .js src/ test/",
"pretest": "npm run eslint && npm run htmlhint",
"test": "jest --verbose --coverage",
"open-coverage-report": "opener ./coverage/lcov-report/index.html",
"start": "serve src/",
"deploy": "gh-pages -d src"
},
"dependencies": {
"@babel/core": "^7.6.2",
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
"babel-jest": "^24.9.0",
"eslint": "^5.9.0",
"gh-pages": "^2.1.1",
"htmlhint": "^0.11.0",
"jest": "^24.9.0",
"opener": "^1.5.1",
"serve": "^11.0.0"
}
"name": "data-lovers",
"version": "1.0.0",
"main": "src/index.html",
"license": "MIT",
"scripts": {
"htmlhint": "htmlhint src/*.html test/*.html",
"eslint": "eslint --ext .js src/ test/",
"pretest": "npm run eslint && npm run htmlhint",
"test": "jest --verbose --coverage",
"open-coverage-report": "opener ./coverage/lcov-report/index.html",
"start": "serve src/",
"deploy": "gh-pages -d src"
},
"dependencies": {
"@babel/core": "^7.6.2",
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
"babel-jest": "^24.9.0",
"gh-pages": "^2.1.1",
"jest": "^24.9.0",
"opener": "^1.5.1",
"serve": "^11.0.0"
},
"devDependencies": {
"eslint": "^5.16.0",
"htmlhint": "^0.11.0"
}
}
96 changes: 89 additions & 7 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,91 @@
// estas funciones son de ejemplo

export const example = () => {
return 'example';
export const order = {
num1_N: function(data) {
return data.sort((a, b) => {
if (a.num < b.num) {
return -1;
}
if (a.num > b.num) {
return 1;
}
return 0;
});
},
numN_1: function(data) {
return data.sort((b, a) => {
if (a.num < b.num) {
return -1;
}
if (a.num > b.num) {
return 1;
}
return 0;
});
},
nameA_Z: function(data) {
return data.sort((a, b) => {
if (a.name < b.name) {
return -1;
}
if (a.name > b.name) {
return 1;
}
return 0;
});
},
nameZ_A: function(data) {
return data.sort((b, a) => {
if (a.name < b.name) {
return -1;
}
if (a.name > b.name) {
return 1;
}
return 0;
});
},
};

export const anotherExample = () => {
return 'OMG';
};
export const filter = {
region: function(data, value) {
let pokemons = data;
if (value == null) {
return pokemons;
} else {
const pokemonRegion = pokemons.filter(function(pokemon) {
return pokemon.generation.name === value;
});
return pokemonRegion;
}
},
type: function(data, value) {
let pokemons = data;
if (value.length == 0) {
return pokemons;
} else {
const pokemonType = pokemons.filter(function(pokemon) {
let array = pokemon.type;
if (value.length > 1) {
return (
(array[0] === value[0] || array[1] === value[0]) &&
(array[0] === value[1] || array[1] === value[1])
);
} else {
return array[0] === value[0] || array[1] === value[0];
}
});
return pokemonType;
}
},

searchByName: (data, value) => {
value = value.toLowerCase();
const pokemon = data.filter(function(item) {
if (item.num.includes(value) || item.name.includes(value)) {
return true;
} else {
return false;
}
});
return pokemon;
},
}
134 changes: 125 additions & 9 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,128 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<link rel="stylesheet" href="style.css" />
</head>
<body>
<div id="root"></div>

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, user-sacalable=no" />
<title>Pokedex</title>
<link href="style.css" rel="stylesheet" type="text/css" />
<link href="responsive.css" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css2?family=Press+Start+2P&display=swap" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css2?family=Russo+One&display=swap" rel="stylesheet" />
</head>

<body>
<!--All content begins here-->
<div id="container">

<!--Header containing logo, title and navigation menu-->
<header id="header">
<div id="logo">
<img id="image-logo" src="https://pngimg.com/uploads/pokeball/pokeball_PNG8.png" width="50px" />
<h1 id="pokedex">POKEDEX</h1>
</div>
<div id="nav-drop">
<input id="box-icon-menu" type="checkbox" name="menu" />
<label id="label-nav" for="box-icon-menu"><i id="menu-icon" class="fas fa-search"></i></label>
<div id="search">
<div id="search-box">
<i class="fas fa-search"></i>
<input type="search" id="inputSearch" placeholder="Search by number or name" autocomplete="off" spellcheck="false" />
</div>
</div>

</div>
</header>
<!--End of header-->

<!--div that contains general information about the page-->
<div id="information">
<iframe src="https://www.youtube.com/embed/pChaiOKV1vA?controls=0" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"></iframe>
<h2>Find all the information of your favorite pokemon</h2>
<h3>Discover the<strong> pokemon’s </strong>world</h3>
</div>
<!--end of div "information"-->

<!--Buttons section (order & filter)-->
<div id="button-order-filter">
<!--only button order-->
<div id="button-order">
<button type="button" id="order" class="btn-order-filter">
ORDER <i class="fas fa-caret-down"></i>
</button>
<ul id="order-drop-down" class="drop-down">
<li id="num1_N">
<i class="fas fa-sort-numeric-down"></i>Lower number</li>
<li id="numN_1"><i class="fas fa-sort-numeric-down-alt"></i>Top number</li>
<li id="nameA_Z"><i class="fas fa-sort-alpha-up"></i>A - Z</li>
<li id="nameZ_A"><i class="fas fa-sort-alpha-up-alt"></i>Z - A</li>
</ul>
</div>
<!--End button order-->

<!--Only button filter-->
<div id="button-filter">
<button type="button" id="filter" class="btn-order-filter">
FILTER <i class="fas fa-filter"></i>
</button>
<ul id="ul-filter" class="drop-down">
<li><i class="fas fa-ghost"></i> Type</li>
<select name="select" id="select-type" size="6">
<option value="bug">Bug</option>
<option value="dark">Dark</option>
<option value="dragon">Dragon</option>
<option value="electric">Electric</option>
<option value="fairy">Fairy</option>
<option value="fighting">Fighting</option>
<option value="fire">Fire</option>
<option value="flying">Flying</option>
<option value="ghost">Ghost</option>
<option value="grass">Grass</option>
<option value="ground">Ground</option>
<option value="ice">Ice</option>
<option value="normal">Normal</option>
<option value="poison">Poison</option>
<option value="psychic">Psychic</option>
<option value="rock">Rock</option>
<option value="steel">Steel</option>
<option value="water">Water</option>
</select>
<li><i class="fas fa-location-arrow"></i> Region</li>
<select name="select" id="select-region" size="2">
<option value="kanto">Kanto</option>
<option value="johto">Johto</option>
</select>
</ul>

</div>
<!--End button filter-->
</div>

<!--End of buttons section (order & filter)-->
<div id="labelToFilter">
</div>
<!--paragraph with pokemon number on screen-->
<div id="p-count">
<p id="count">251 Pokemons found</p>
</div>
<!--End of paragraph with pokemon number on screen-->

<!--All the pokemon with their information-->
<div id="content"></div>
<!--End div all the pokemon with their information-->

<!--Button to see more pokemon-->
<div id="box-more">
<button type="button" id="more">See more</button>
</div>
<!--End button to see more-->
</div>
<footer>Vivian & Sharon with <i class="fas fa-heart"></i> and a lot of <i class="fas fa-coffee"></i> </footer>
<!--All content ends here-->
<script src="main.js" type="module"></script>
</body>
</html>
<script src="https://kit.fontawesome.com/0451b6060d.js" crossorigin="anonymous"></script>

</body>

</html>
Loading