Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
cfa33b7
prueba
paula-plaza Apr 21, 2020
feec5d6
cambios html
paula-plaza Apr 25, 2020
86a782a
Agregando cambios en html y CSS pagina principal
EliHidalgo Apr 28, 2020
47f070f
Modificacion HTML principal y CSS
EliHidalgo Apr 28, 2020
58f0cf6
Cambios en CSS, primer intento responsive y pruebas main.js
EliHidalgo Apr 30, 2020
613cddf
Modificando el responsive
EliHidalgo Apr 30, 2020
07ece40
Otro intento mas con el responsive
EliHidalgo Apr 30, 2020
8570803
Funcionalidad filtro por Tipo y muestra la card chica con el pokemon
EliHidalgo May 3, 2020
8b6bdcf
Cambios en la data que muestra, probando funciones
EliHidalgo May 4, 2020
d9602f0
Pequeños cambios
EliHidalgo May 4, 2020
c06df00
Merge pull request #1 from EliHidalgo/master
paula-plaza May 4, 2020
6a9973d
Merge pull request #1 from paula-plaza/master
paula-plaza May 4, 2020
daf3e60
read me1
paula-plaza May 5, 2020
b5be426
Merge pull request #2 from paula-plaza/master
EliHidalgo May 5, 2020
a41e3b7
Imagenes de logo e inicio, variables en js
EliHidalgo May 5, 2020
a1ad9da
imagen read me
paula-plaza May 5, 2020
69560c2
Merge pull request #3 from paula-plaza/master
EliHidalgo May 5, 2020
50999e0
Modal del filtro tipo listo y algunos test de funcion
EliHidalgo May 5, 2020
f101660
Merge branch 'master' of https://github.com/EliHidalgo/SCL013-data-lo…
EliHidalgo May 5, 2020
5cc2537
readme2
paula-plaza May 6, 2020
22f4d00
Merge pull request #4 from paula-plaza/master
EliHidalgo May 6, 2020
6c6f34a
Modificando estilos de card pokemon
EliHidalgo May 6, 2020
9a063f3
Intento de responsive de segunda y tercera historia de usuario
EliHidalgo May 6, 2020
df56a32
Estilos para el responsive de segunda y tercera HU
EliHidalgo May 6, 2020
fe59ad5
Responsive historias de usuario hasta la 6
EliHidalgo May 6, 2020
ac2f454
Menu responsive tipo hamburguesa
EliHidalgo May 7, 2020
3cc99e2
ordenar por sortdata
paula-plaza May 7, 2020
17d27e8
Merge pull request #5 from paula-plaza/master
EliHidalgo May 7, 2020
09a90c4
Modificación de estilo para responsive
EliHidalgo May 7, 2020
2b757e9
Responsive y limpieza de innerHTML en funcion sort
EliHidalgo May 7, 2020
73f081d
Otro intento mas con responsive
EliHidalgo May 7, 2020
b75e2a4
vamos por otra
EliHidalgo May 7, 2020
b3768b1
nuevo responsive
EliHidalgo May 7, 2020
3cd36ea
dar funcion a searchBar
paula-plaza May 8, 2020
46ae4d3
Merge pull request #6 from paula-plaza/master
EliHidalgo May 8, 2020
a89067c
Revisión de código y realización de test unitarios
EliHidalgo May 8, 2020
dc97b6e
Test unitarios aplicados
EliHidalgo May 9, 2020
0959f48
Test unitarios y sortData
EliHidalgo May 9, 2020
1f2ea5c
readme3 e imagenes
paula-plaza May 10, 2020
05b2224
Merge pull request #7 from paula-plaza/master
EliHidalgo May 10, 2020
62500b7
readme 4 e imagen inicio
paula-plaza May 11, 2020
6aa1017
Merge pull request #8 from paula-plaza/master
EliHidalgo May 11, 2020
02b2d0e
probando con webkit
EliHidalgo May 11, 2020
3aeed69
responsive con search bar y webkit
EliHidalgo May 11, 2020
e30b1e8
readme 76474847 e imagenes nuevas
paula-plaza May 12, 2020
108404e
Merge pull request #9 from paula-plaza/master
EliHidalgo May 12, 2020
736b48f
readme 873636 y cambio css
paula-plaza May 12, 2020
0795736
Merge pull request #10 from paula-plaza/master
EliHidalgo May 12, 2020
f8b13c9
imagenes
paula-plaza May 13, 2020
a0f7eba
Merge pull request #11 from paula-plaza/master
EliHidalgo May 13, 2020
a9df517
readme final
paula-plaza May 13, 2020
d1ce199
Merge pull request #12 from paula-plaza/master
EliHidalgo May 13, 2020
3d28fe7
Responsive y replace de español
EliHidalgo May 13, 2020
6cacfb3
Responsive again
EliHidalgo May 13, 2020
124dac4
problemas con responsive
EliHidalgo May 14, 2020
08abe95
Responsive
EliHidalgo May 14, 2020
5e31e1e
Responsive footer
EliHidalgo May 19, 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
632 changes: 243 additions & 389 deletions README.md

Large diffs are not rendered by default.

56 changes: 49 additions & 7 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,51 @@
// estas funciones son de ejemplo
import pokemon from './data/pokemon/pokemon.js';

export const example = () => {
return 'example';
};
const pokemonDatos = pokemon.pokemon;

export const anotherExample = () => {
return 'OMG';
};
export const imgOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.img);
}

export const nameOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.name);
}

export const numOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.num);
}

export const typeOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.type);
}

export const heightOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.height);
}

export const weightOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.weight);
}

export const candyOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.candy);
}

export const candyCountOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.candy_count).map((x) => x !== undefined ? x : "No aplica");
}

export const weaknessesOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.weaknesses);
}

export const nextEvolutionOfPokemon = (newFilter, condition) => {
return pokemonDatos.filter((pokemon) => pokemon[newFilter].includes(condition)).map((pokemon) => pokemon.next_evolution);
}

export const sortData = (data, sortBy, condition) => {
if (condition === "aToZ") {
return data.sort((a, b) => (a[sortBy] > b[sortBy]) ? 1 : -1);
} else {
return data.sort((a, b) => (a[sortBy] < b[sortBy]) ? 1 : -1);
}
}
Binary file added src/imagenes/Digrama_Flujo.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 src/imagenes/Filtrado por debilidad.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 src/imagenes/Filtrando por tipo.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 src/imagenes/Logo Pokedata[14903].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 src/imagenes/Primera pantalla logo.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 src/imagenes/Profigma_P1.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 src/imagenes/Profigma_P2.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 src/imagenes/Profigma_P3.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 src/imagenes/Version mobile1.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 src/imagenes/Version mobile3.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 src/imagenes/Version mobile4.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 src/imagenes/Version mobile5.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 src/imagenes/busqueda pokemon y modal.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 src/imagenes/header.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 src/imagenes/maze1.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 src/imagenes/maze2.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 src/imagenes/maze3.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 src/imagenes/maze4.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 src/imagenes/maze5.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 src/imagenes/ordenado alfabeticamente.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 src/imagenes/pantalla inicio-explicativa.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 src/imagenes/pantalla mobile2.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 src/imagenes/pokeFriends-inicio.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 src/imagenes/prototipo_papel1.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 src/imagenes/prototipo_papel2.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 src/imagenes/version mobile6.PNG
126 changes: 117 additions & 9 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,120 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<link rel="stylesheet" href="style.css" />
</head>
<body>
<div id="root"></div>
<script src="main.js" type="module"></script>
</body>

<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<meta content="width=device-width, initial-scale=1" name="viewport" />
<link rel="stylesheet" href="style.css">
<script src="https://kit.fontawesome.com/3b4f19e26f.js" crossorigin="anonymous"></script>
</head>

<body>


<!-- Header y logo -->
<section id="header">
<a href="index.html" title="Home" class="pokeDataImage">
<img src="imagenes/header.png" alt="header Pokedata" id="logo">
</a>
</section>

<!-- Sección para menú responsive-->
<section id="menuResponsive">
<input type="checkbox" id="btn-menu-responsive">
<label for="btn-menu-responsive"><span><i class="btn-menu fas fa-bars"></i></span></label>

<!--contenedor de botones de filtrado-->
<section id="menu">
<select id="selectType" class="droplists">
<option value="" disabled selected>TIPO DE POKÉMON</option>
<option value="Water">Agua</option>
<option value="Fire">Fuego</option>
<option value="Normal">Normal</option>
<option value="Grass">Planta</option>
<option value="Electric">Eléctrico</option>
<option value="Ice">Hielo</option>
<option value="Fighting">Pelea</option>
<option value="Poison">Veneno</option>
<option value="Ground">Tierra</option>
<option value="Flying">Volador</option>
<option value="Psychic">Psíquicos</option>
<option value="Bug">Bicho</option>
<option value="Rock">Roca</option>
<option value="Ghost">Fantasma</option>
<option value="Dragon">Dragón</option>
</select>

<select id="selectWeak" class="droplists">
<option value="" disabled selected>DEBILIDAD CONTRA</option>
<option value="Water">Agua</option>
<option value="Fire">Fuego</option>
<option value="Grass">Planta</option>
<option value="Electric">Eléctrico</option>
<option value="Ice">Hielo</option>
<option value="Fighting">Pelea</option>
<option value="Poison">Veneno</option>
<option value="Ground">Tierra</option>
<option value="Flying">Volador</option>
<option value="Psychic">Psíquicos</option>
<option value="Bug">Bicho</option>
<option value="Rock">Roca</option>
<option value="Ghost">Fantasma</option>
<option value="Dragon">Dragón</option>
<option value="Dark">Siniéstro</option>
<option value="Steel">Metal</option>
<option value="Fairy">Hada</option>
</select>

<select id="selectOrder" class="droplists">
<option value="" disabled selected>ORDENAR POR</option>
<option value="aToZ">A-Z</option>
<option value="zToA">Z-A</option>
</select>
</section>

<!--búsqueda input-->
<div id="searchInput">
<input type="text" id="searchBar" placeholder=" Buscar ej.: vulpix"><i class="search fas fa-search"></i>
</div>

</section>

<section id="welcomePage">
<div id="welcome" class="welcomeText">
<h1>PoKéData GO </h1>
<p>Es una web dirigida a todos los jugadores amantes de Pokémon GO.</p>
<p>En nuestra página podrás encontrar tus pokémon por tipo y debilidades, así como conocer las características de
tu pokémon favorito o el de tu contrincante.</p>
<h3>¡Explora y conviertete en el mejor Entrenador Pokémon!</h3>
</div>

<div class="pokeFriends">
<img src="imagenes/pokeFriends-inicio.jpg" id="welcomeImage">
</div>

</section>
<!--contenedor para mostrar mensaje de tipo de pokémon en vista-->
<section id="topMessageOfType"></section>
<!--contenedor para mostrar HTML dinámico con las cards de pokémon-->
<section id="root"></section>

<footer id="footer">
<div class="copyright">
<p class="footerCopyright">PoKéDaTa GO 2020. Derechos Reservados. Desarrollo e implementación por Eliana Hidalgo y
Paula Plaza</p>
</div>

<div class="socialMedia">
<a href="https://www.youtube.com/user/pokemon" target="_blank"><i class="icon fab fa-youtube"></i></a>
<a href="https://www.instagram.com/pokemon/" target="_blank"><i class="icon fab fa-instagram"></i></a>
<a href="https://www.facebook.com/Pokemon/" target="_blank"><i class="icon fab fa-facebook-square"></i></a>
<a href="https://twitter.com/pokemon" target="_blank"><i class="icon fab fa-twitter"></i></a>
</div>
</footer>

<script src="main.js" type="module"></script>

</body>

</html>
Loading