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

Checando cambios #12

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
ea4e7b3
Cambios en main.js
AdrianaRosas Jun 25, 2019
776eb92
Merge branch 'master' into rama1
AdrianaRosas Jun 25, 2019
71b38d5
Cambios en CSS en texto y tabla
AdrianaRosas Jun 26, 2019
a141179
v1
AdrianaRosas Jun 26, 2019
eb88022
v2
AdrianaRosas Jun 26, 2019
12489c5
prueba
AdrianaRosas Jun 26, 2019
2ae730a
Merge branch 'master' of https://github.com/AdrianaRosas/MEX-Data-Lov…
AdrianaRosas Jun 26, 2019
96aaf0e
prueba
AdrianaRosas Jun 26, 2019
8f62537
Visualización de las imágenes y los datos
AdrianaRosas Jun 26, 2019
5e90114
Formato de documento html
AdrianaRosas Jun 26, 2019
58ee7b0
Método de filtrado de datos
AdrianaRosas Jun 27, 2019
3fed4d5
Actualizando cambios en HTML
AdrianaRosas Jun 27, 2019
2798f32
Subiendo avances en HTML y en el archivo main.js
AdrianaRosas Jun 28, 2019
4c37dca
Subiendo HTML con imagen de fondo y cambios en el archivo main.js
AdrianaRosas Jun 28, 2019
475fe97
Cambios en HTML de imagen de fondo y en main.js
AdrianaRosas Jun 28, 2019
3d64b5b
Redacción del README y Prototipado
Thanya02 Jun 28, 2019
18beb1f
Realice cambios en el README
Thanya02 Jun 28, 2019
c1d33f7
Cambie el Prototipado
Thanya02 Jun 28, 2019
d7fb320
Nuevo Prototipo
Thanya02 Jun 28, 2019
2a1ae0b
cambios en HTML
AdrianaRosas Jun 28, 2019
cf0a0ca
Une cambios colaborativos
AdrianaRosas Jun 25, 2019
70443aa
Merge pull request #1 from Thanya02/Thanya
AdrianaRosas Jun 28, 2019
59fb66c
Elaboración de html y css
Thanya02 Jun 28, 2019
1b76cc9
Elaboración de html y css
Thanya02 Jun 28, 2019
0193afa
aceptando cambios del README
AdrianaRosas Jun 28, 2019
53b24f2
Merge pull request #2 from Thanya02/Thanya
AdrianaRosas Jun 28, 2019
5d7473e
Add files via upload
AdrianaRosas Jun 28, 2019
942558d
Merge pull request #3 from AdrianaRosas/AdrianaRosas-rama1
AdrianaRosas Jun 28, 2019
7eb157f
comparando cambios
AdrianaRosas Jun 28, 2019
53cac00
+
AdrianaRosas Jun 28, 2019
817835b
Actualizar
Thanya02 Jun 30, 2019
a1485ba
Modificación del readme y html
Thanya02 Jul 1, 2019
f8ccf50
Merge pull request #5 from AdrianaRosas/rama1
AdrianaRosas Jul 1, 2019
eeb42d8
Merge branch 'master' into Thanya
AdrianaRosas Jul 1, 2019
469542f
Merge pull request #4 from Thanya02/Thanya
AdrianaRosas Jul 1, 2019
372fb04
Cambios en README, se insertaron imágenes
AdrianaRosas Jun 25, 2019
581a683
Cambios
Thanya02 Jul 1, 2019
651f1ff
Pintando elementos en html
Thanya02 Jul 2, 2019
661a602
cambios html
Thanya02 Jul 2, 2019
3fab6f7
cambios html
Thanya02 Jul 2, 2019
efe9111
Merge branch 'master' into Thanya
Thanya02 Jul 2, 2019
93254ac
Merge pull request #6 from Thanya02/Thanya
AdrianaRosas Jul 2, 2019
aabc431
Modificación
Thanya02 Jul 2, 2019
bb1e7a2
Faltas de ortografía
Thanya02 Jul 2, 2019
1817582
Agrega funcionalidad de mostrar caracteristicas
Thanya02 Jul 2, 2019
a7bc0b9
Merge pull request #7 from Thanya02/Thanya
AdrianaRosas Jul 2, 2019
a18b223
Merge pull request #8 from AdrianaRosas/master
Thanya02 Jul 2, 2019
f616764
Modificaones en html y css
Thanya02 Jul 3, 2019
8234b89
Merge branch 'rama1' into Thanya
AdrianaRosas Jul 3, 2019
0eb357b
Merge pull request #9 from Thanya02/Thanya
AdrianaRosas Jul 3, 2019
e8ea89f
Merge branch 'master' into rama1
AdrianaRosas Jul 3, 2019
5898a89
Merge pull request #10 from AdrianaRosas/rama1
AdrianaRosas Jul 3, 2019
2b86b20
Diseño de tarjetas
Thanya02 Jul 4, 2019
a8c9dc0
Merge pull request #11 from Thanya02/master
AdrianaRosas Jul 4, 2019
b9decdb
Cambio en readme
Thanya02 Jul 4, 2019
0bec917
Merge pull request #12 from Thanya02/master
Thanya02 Jul 4, 2019
a5f3048
Merge pull request #13 from Thanya02/master
AdrianaRosas Jul 4, 2019
d7cb37c
Merge pull request #14 from AdrianaRosas/master
AdrianaRosas Jul 5, 2019
c7afb0d
Botón
Thanya02 Jul 5, 2019
e876275
leer
Thanya02 Jul 5, 2019
4ba594e
Merge pull request #15 from Thanya02/master
Thanya02 Jul 5, 2019
953abcf
Revert "Botón"
Thanya02 Jul 5, 2019
3cc4b38
Merge pull request #16 from AdrianaRosas/revert-15-master
Thanya02 Jul 5, 2019
1499b7b
Otro
AdrianaRosas Jun 28, 2019
11f5dfc
Merge pull request #17 from Thanya02/master
AdrianaRosas Jul 5, 2019
3f40ba2
leer v2
Thanya02 Jul 5, 2019
9e9ab17
botones y css
Thanya02 Jul 5, 2019
7cf64e0
Merge pull request #18 from Thanya02/master
Thanya02 Jul 5, 2019
4f1542c
v1
AdrianaRosas Jun 29, 2019
eb44927
codigo bueno
Thanya02 Jul 5, 2019
9f1789e
Merge branch 'master' of https://github.com/AdrianaRosas/MEX-Data-Lov…
Thanya02 Jul 5, 2019
1a885fb
v1
Thanya02 Jul 5, 2019
59d3983
Elaboración de botones
Thanya02 Jul 7, 2019
08420b1
Merge pull request #19 from Thanya02/master
Thanya02 Jul 7, 2019
c8f884a
funcion filtrar
AdrianaRosas Jul 8, 2019
198c628
Css
Thanya02 Jul 8, 2019
de7476a
Merge branch 'rama1' into master
Thanya02 Jul 9, 2019
29c5b25
Merge pull request #20 from Thanya02/master
Thanya02 Jul 9, 2019
c55aa5d
Merge branch 'master' into rama1
AdrianaRosas Jul 9, 2019
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
425 changes: 425 additions & 0 deletions README-EXAMPLE

Large diffs are not rendered by default.

430 changes: 53 additions & 377 deletions README.md

Large diffs are not rendered by default.

Binary file added Thumbs.db
Binary file not shown.
Binary file added iconos/fonts/iconos-web.eot
Binary file not shown.
501 changes: 501 additions & 0 deletions iconos/fonts/iconos-web.svg
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 iconos/fonts/iconos-web.ttf
Binary file not shown.
Binary file added iconos/fonts/iconos-web.woff
Binary file not shown.
1,499 changes: 1,499 additions & 0 deletions iconos/style.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
for(personajes in RICKANDMORTY.results){
console.log(RICKANDMORTY.results[personajes].origin.url);
}

//console.log(RICKANDMORTY.results[0].image);


Binary file added rick-and-morty-folder-icon-43801.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 rick-and-morty-folder-icon-43803-Windows.ico
Binary file not shown.
Binary file added rick-and-morty-folder-icon-43819-Windows.ico
Binary file not shown.
Binary file added rick-and-morty-serie.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 rick-morty4-rewisor.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/PM-icon-207.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/Thumbs.db
Binary file not shown.
8 changes: 0 additions & 8 deletions src/data.js
Original file line number Diff line number Diff line change
@@ -1,8 +0,0 @@
// esta es una función de ejemplo
// puedes ver como agregamos la función a nuestro objeto global window

const example = () => {
return 'example';
};

window.example = example;
Binary file added src/fondo22.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/imagen5.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/Hist-usuario (2).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.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/Thumbs.db
Binary file not shown.
Binary file added src/imagenes/Usuario.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/imagen1.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/imagen2.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/imagen3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
165 changes: 157 additions & 8 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,166 @@
<html>
<head>
<meta charset="utf-8">
<title>Data Lovers</title>
<link rel="shortcut icon" href="PM-icon-207.png">
<link rel="shortcut icon" href="https://scontent-mia3-2.cdninstagram.com/vp/3f268ef7e4cbdf16b0b298535fb3a095/5D98AB2E/t51.2885-15/sh0.08/e35/s640x640/60896059_363526267614915_9022280140086626890_n.jpg?_nc_ht=scontent-mia3-2.cdninstagram.com"/>
<link href="https://fonts.googleapis.com/css?family=Amatic+SC|Dosis|Titillium+Web&display=swap" rel="stylesheet">
<title>Rick & Morty API Universe</title>

<link rel="stylesheet" href="style.css" />

<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Dosis:400,600&display=swap" rel="stylesheet">


<!-- <script src="./data/steam/steam.js"></script> -->
<script src="./data/rickandmorty/rickandmorty.js"></script>
</head>
<body>
<div id="root"></div>
<!-- <script src="./data/injuries/injuries.js"></script> -->
<!-- <script src="./data/pokemon/pokemon.js"></script> -->
<!-- <script src="./data/steam/steam.js"></script> -->
<!-- <script src="./data/worldbank/worldbank.js"></script> -->
<!-- <script src="./data/lol/lol.js"></script> -->
<script src="data.js"></script>

<!-- Icono ir abajo -->
<span class="icon-circle-down"></span>

<!-- redes sociales -->
<div class="wrapper">
<div class="title">
<p>Simple hover effect only use CSS3</p>
</div>
<div class="buttons">
<div class="button button-fb">
<i class="fa fa-facebook"></i>
</div>
<div class="button button-tw">
<i class="fa fa-twitter"></i>
</div>
<div class="button button-go">
<i class="fa fa-google-plus"></i>
</div>
</div>
</div>


<!-- presentación pagina -->
<section class="informacion">
<div class="Textear"></div>
<p>Rick es un brillante científico un tanto borracho que secuestra
<br>
a su irritable nieto adolescente Morty para vivir aventuras en
<br>
otros mundos y en dimensiones alternativas, te animas
<br>
a conocer mas sobre estos y otros personajes.</p>
</div>
</aside>

<!-- <div><a href="#" class="btn-empezar">Empezar</a></div> -->
</section>

<!-- tabla -->
<table class="table">
<thead>
<th>TOP RANKING</th>
</thead>
<tbody>
<tr>
<td class="tabla">Rick Sánchez</td>
<td>1</td>
</tr>
<tr>
<td class="tabla">Morty Smith</td>
<td>2</td>
</tr>
<tr>
<td class="tabla">Mr. Poopybutthole</td>
<td>3</td>
</tr>
<tr>
<td class="tabla">Evil Morty</td>
<td>4</td>
</tr>
<tr>
<td class="tabla">Squanchy</td>
<td>5</td>
</tr>
</tbody>

<tfoot>
</tfoot>
</table>
<!-- boton abajo -->
<div class="abajo">
<a href="" id="down" class="button"><i class="far fa-arrow-alt-circle-down"></i></a>
<div class="slide">
<div id="facts">
</div>
</div>



<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>

<!-- sección video -->
<section>
<h1>Avances de la nueva temporada</h1>
<h2>Noviembre 2019</h2>

<div id="video" class="contenedor-video">
<video width= "1200px" height="1000px" class="fm-video video-js vjs-16-9 vjs-big-play-centered" data-setup="{}" controls preload="auto">
<source src="video/rick_y_morty_temp4.mp4" type="video/mp4">
</video>

</div>

</section>
<br>
<br>
<br>
<br>
<br>

<section id="info" class="hide">
<div class=" info">
<div class= "ordenar-boton">
<select name="filter" id="filter">
<option value="filter">Filtrar</option>
<option value="nombre.name">Nombre</option>
<option value="species.species">Especies</option>
<option value="location.name">Dimensión</option>
<option value="origin.name">Origen</option>
</select>

<select id="choose-fruit-multiple" multiple>
<option value="1">Apple</option>
<option value="2">Orange</option>
<option value="3">Banana</option>
<option value="4">Guava</option>
<option value="5">Grapes</option>
</select>
</div>
</div>

</select>
</div>
<br>
<br>
<br>
<div id="contenedor">
<section class="data" id='data'>
</div>
</section>

<script src="main.js"></script>
<script src="data.js"></script>
</body>
</html>


Binary file added src/inicio.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 86 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@



for(personajes in RICKANDMORTY.results){
// console.log(RICKANDMORTY.results[personajes].image);
//console.log(RICKANDMORTY.results[personajes].gender);

for(personajes in RICKANDMORTY.results){
// console.log(RICKANDMORTY.results[personajes].image);


for(personajes in RICKANDMORTY.results){
// console.log(RICKANDMORTY.results[personajes].image);
//console.log(RICKANDMORTY.results[personajes].gender);





}
const data = RICKANDMORTY.results;
// const data RICKANDMORTY.results
const paraPintar = document.getElementById ('data');

//filtrar data

const muestraData = () => {
let str = '';
data.forEach(element => {
str += `<div class="tarjeta">
<div class= "caras">
<div class="nombre">
<p> ${element.name}</p></div>
<br>
<div class="img">
<img src="${element.image}"></img>
</div>
<div class= "info">
<p> Status: ${element.status} </p>
<p> Especie: ${element.species} </p>
<p> tamaño: ${element.origin.name} </p>
<p> Origen: ${element.location.name}</p>
</div>
</div>
</div>`
});

paraPintar.innerHTML = str;

}
muestraData();


//Filtrar
const filtrarData = (prop, val) => {
let str = '';
data.forEach(element => {

//console.log(element[prop])

if(element[prop] == val) {
str += `<div class="tarjeta">
<div class="nombre">
<p> ${element.name}</p></div>
<br>
<div class="img">
<img src="${element.image}"></img>
</div>
<div class= "info">

<p> Status: ${element.status} </p>
<p> Especie: ${element.species} </p>
<p> tamaño: ${element.origin.name} </p>
<p> Origen: ${element.location.name}</p>
</div>
</div>`
}


});


console.log(str);

}
filtrarData('status', 'Alive')
Loading