Skip to content

Commit

Permalink
new files to remove
Browse files Browse the repository at this point in the history
  • Loading branch information
fhernand0705 committed Nov 16, 2018
2 parents b3ddc78 + e3acada commit 546ba3e
Show file tree
Hide file tree
Showing 100 changed files with 6,093 additions and 109 deletions.
Binary file removed .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
Binary file removed images/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1 id="gym-name" class="text-focus-in"></h1>
<section id="outer-circle">
<img src="" id="inner-circle" class="heartbeat">
</section>
<div id="carouselExampleControls" class="carousel slide" data-ride="carousel">
<div id="carouselExampleControls" class="carousel slide" data-ride="carousel" data-interval="false">
<div class="carousel-inner">
<div class="carousel-item active">
<div class="container">
Expand Down
129 changes: 58 additions & 71 deletions main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion main.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 82 additions & 18 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ let christel = new Trainer('Christel');
let ahmet = new Trainer('Ahmet');
let freddy = new Trainer('Freddy');

newPokemon('rowlet', olivia);
newPokemon('diglett', olivia);
newPokemon('lickitung', olivia);
newPokemon('ninetales', olivia);
newPokemon('porygon', olivia);
newPokemon('nidorina', olivia);
newPokemon('flareon', christel);
newPokemon('kadabra', christel);
newPokemon('dewgong', christel);
Expand All @@ -142,26 +142,25 @@ newPokemon('entei', freddy);

setTimeout(function() {
writeToScreen(freddy, 'row2');
}, 250);
}, 500);
setTimeout(function() {
writeToScreen(christel, 'row4');
}, 250);
}, 500);
setTimeout(function() {
writeToScreen(ahmet, 'row6');
}, 250);
}, 500);
setTimeout(function() {
writeToScreen(olivia, 'row8');
}, 250);
}, 500);

let counter = 0;
function writeToScreen(trainer, placement) {
let counter = 0;
var h3 = document.createElement('h3');
var nameText = document.createTextNode(trainer.name);
h3.appendChild(nameText);
h3.classList.add('animated');
h3.classList.add('slideInRight');
h3.classList.add('delay-0.8s');
h3.addEventListener('click', revertColumns);
if (trainer.name == 'Olivia') {
document.getElementById('title4').appendChild(h3);
} else if (trainer.name == 'Christel') {
Expand All @@ -171,7 +170,6 @@ function writeToScreen(trainer, placement) {
} else if (trainer.name == 'Freddy') {
document.getElementById('title1').appendChild(h3);
}
console.log(trainer.team);
for (i in trainer.team) {
let grid = document.getElementById(placement);
let div = document.createElement('div');
Expand All @@ -180,6 +178,8 @@ function writeToScreen(trainer, placement) {
div.style.transition = 'all 2s';
div.setAttribute('id', 'p'+ counter);
div.setAttribute('onclick', 'selectPokemon(p'+counter+')');
h3.setAttribute('onclick', 'revertColumns(p'+counter+')');

div.style.backgroundImage = 'url(https://assets.pokemon.com/assets/cms2/img/pokedex/full/' + trainer.team[i]['id'] + '.png)';
let h2 = document.createElement('h2');
h2.innerHTML = trainer.team[i]['name'];
Expand Down Expand Up @@ -297,6 +297,36 @@ function selectPokemon(divID) {
let p = divID.children[2];
ul.classList.toggle('hidden', false);
p.classList.toggle('hidden', false);
switch (divID.id) {
case 'p0':
case 'p1':
case 'p2':
var p0 = document.getElementById('p0');
var p1 = document.getElementById('p1');
var p2 = document.getElementById('p2');
break;
case 'p3':
case 'p4':
case 'p5':
var p0 = document.getElementById('p3');
var p1 = document.getElementById('p4');
var p2 = document.getElementById('p5');
break;
case 'p6':
case 'p7':
case 'p8':
var p0 = document.getElementById('p6');
var p1 = document.getElementById('p7');
var p2 = document.getElementById('p8');
break;
case 'p9':
case 'p10':
case 'p11':
var p0 = document.getElementById('p9');
var p1 = document.getElementById('p10');
var p2 = document.getElementById('p11');
break;
}
if (divID == p0) {
p1.classList.toggle('col-md-4', false);
p1.classList.toggle('col-md-1', true);
Expand Down Expand Up @@ -351,14 +381,45 @@ function selectPokemon(divID) {
}
}

setTimeout (function() {
var p0 = document.getElementById('p0');
var p1 = document.getElementById('p1');
var p2 = document.getElementById('p2');
}, 200);


function revertColumns() {
function revertColumns(divID) {
divID.classList.toggle('col-md-1', false);
divID.classList.toggle('col-md-4', true);
divID.classList.toggle('col-md-10', false);
divID.firstChild.classList.toggle('rotate', true);
let ul = divID.children[1];
let p = divID.children[2];
ul.classList.toggle('hidden', false);
p.classList.toggle('hidden', false);
switch (divID.id) {
case 'p0':
case 'p1':
case 'p2':
var p0 = document.getElementById('p0');
var p1 = document.getElementById('p1');
var p2 = document.getElementById('p2');
break;
case 'p3':
case 'p4':
case 'p5':
var p0 = document.getElementById('p3');
var p1 = document.getElementById('p4');
var p2 = document.getElementById('p5');
break;
case 'p6':
case 'p7':
case 'p8':
var p0 = document.getElementById('p6');
var p1 = document.getElementById('p7');
var p2 = document.getElementById('p8');
break;
case 'p9':
case 'p10':
case 'p11':
var p0 = document.getElementById('p9');
var p1 = document.getElementById('p10');
var p2 = document.getElementById('p11');
break;
}
p0.classList.toggle('col-md-4', true);
p0.classList.toggle('col-md-10', false);
p0.classList.toggle('col-md-1', false);
Expand All @@ -368,6 +429,9 @@ function revertColumns() {
p2.classList.toggle('col-md-4', true);
p2.classList.toggle('col-md-10', false);
p2.classList.toggle('col-md-1', false);
p0.firstChild.classList.toggle('rotate', false);
p1.firstChild.classList.toggle('rotate', false);
p2.firstChild.classList.toggle('rotate', false);
p0.children[1].classList.toggle('hidden', true);
p0.children[2].classList.toggle('hidden', true);
p1.children[1].classList.toggle('hidden', true);
Expand Down
12 changes: 12 additions & 0 deletions node_modules/animate.css/.editorconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions node_modules/animate.css/.prettierignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions node_modules/animate.css/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 546ba3e

Please sign in to comment.