Skip to content

Commit

Permalink
Merge pull request #9 from justindurocher/Clearing-404-Error
Browse files Browse the repository at this point in the history
javascript-articles-api
  • Loading branch information
justindurocher committed Jan 15, 2020
2 parents 526766d + e337514 commit 38c873b
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 123 deletions.
126 changes: 81 additions & 45 deletions assets/js/script.js
@@ -1,50 +1,86 @@
// variable to hold the total number of games from RAWG
let totalGames;
// variable to increment if the random game query was successful
let randomGameCount = 0;
let gameImageDisplayIndex = 1;
///////////////////////// Articles function/////////////
let totalArticles;
let articleDisplayIndex = 1;
$.ajax({
articleUrl:'https://newsapi.org/v2/everything' + 'from=2020-01-13&' +'sortBy=popularity&' +'apiKey=5b70edca1d034d86b9a94213f1344c61',
method:"GET"
}).then(function(response) {
totalArticles = response.count;
console.log(totalArticles);
console.log(articleUrl)
console.log(response.image === randomGameCount);
});

// query RAWG to get total number of games
$.ajax({
url: 'https://api.rawg.io/api/games',
method: 'GET'
articleUrl:'https://newsapi.org/v2/everything?' + 'from=2020-01-13&' +'sortBy=popularity&' +'apiKey=5b70edca1d034d86b9a94213f1344c61',
method:"GET"
}).then(function(response) {
totalGames = response.count;
console.log(totalGames);
threeRandomGames();
var img = $('#image-header').attr({
'src': "https//newsapi.org/v2/sources?" + response.article.urlToImage + 'png',
'alt': response.article.urlToImage
})
if( response) {
articleCount ++;
let ID = '#image-header-' + articleDisplayIndex;
if (image === randomGameCount) {
///Display placeholder image////
} else{
$(ID).attr('src', response.data.artciles.urlToImage);
}
articleDisplayIndex++;
}})
///////////////// Grab the images for the articles////////////












}).fail(function(response) {
// console.log('fail');
// console.log(response);
if (randomGameCount < 3) {
threeRandomGames();
}
});
}
///////variable to the total number of articles/////

// let totalArticles;

// ///////variable increment if th erandom article was successful/////
// let articleDisplayIndex = 1;


// ////query to get the total number of articles/////
// $.ajax({
// url:"https://newsapi.org/v2/everything?apiKey=5b70edca1d034d86b9a94213f1344c61" + image,
// method:"GET"
// }).then(function(response) {
// totalArticles = response.count;
// console.log(totalArticles);
// console.log(response.image === null);
// var image = data.articles.urlToImage;
// });

// get 3 random games
function threeRandomGames() {
let randNum = Math.floor(Math.random() * totalGames);
// console.log(randNum);

$.ajax({
url: 'https://api.rawg.io/api/games/' + randNum,
method: 'GET'
}).then(function(response) {
// console.log('then');
// console.log(response);
console.log(response.background_image === null);
if (response) {
randomGameCount++;
let elID = '#game-thumb-' + gameImageDisplayIndex;
if (response.background_image === null) {
// Display a placeholder image
} else {
$(elID).attr('src', response.background_image);
}

gameImageDisplayIndex++;
}
if (randomGameCount < 3) {
threeRandomGames();
}
}).fail(function(response) {
// console.log('fail');
// console.log(response);
if (randomGameCount < 3) {
threeRandomGames();
}
});
}
// $.ajax({
// url:"https://newsapi.org/v2/everything?apiKey=5b70edca1d034d86b9a94213f1344c61" + image ,
// method:"GET"
// }).then(function(response) {
// var image = data.articles.urlToImage;
// if( response) {
// articleCount ++;
// let ID = "image header" + articleDisplayIndex;
// if (image === null) {
// ///Display placeholder image////
// } else{
// $(ID).attr('src', response.image);
// }
// articleDisplayIndex++;
// }})
81 changes: 3 additions & 78 deletions index.html
Expand Up @@ -100,7 +100,7 @@ <h2>Games</h2>
<div class="column">
<div class="ui raised segment">
<div class="ui placeholder">
<div class="image header">
<div id="image-header-1">
<div class="line"></div>
<div class="line"></div>
</div>
Expand All @@ -114,7 +114,7 @@ <h2>Games</h2>
<div class="column">
<div class="ui raised segment">
<div class="ui placeholder">
<div class="image header">
<div id ="image-header-2">
<div class="line"></div>
<div class="line"></div>
</div>
Expand All @@ -128,82 +128,7 @@ <h2>Games</h2>
<div class="column">
<div class="ui raised segment">
<div class="ui placeholder">
<div class="image header">
<div class="line"></div>
<div class="line"></div>
</div>
<div class="paragraph">
<div class="medium line"></div>
<div class="short line"></div>
</div>
</div>
</div>
</div>
</div>
<!----Fitst Part to Comic Section-->
<div class="ten wide column holder">
<div class="ui three cards">
<div class="ui card">
<div class="content">
<div class="ui placeholder">
<div class="rectangular image"></div>
</div>
</div>
</div>
<div class="ui card">
<div class="content">
<div class="ui placeholder">
<div class="rectangular image"></div>
</div>
</div>
</div>
<div class="ui card">
<div class="content">
<div class="ui placeholder">
<div class="rectangular image"></div>
</div>
</div>
</div>
</div>
<div class="three wide column">
<img>
</div>
</div>
<h3>Comics</h3>
<!---------SUB Section for the Comics section-->
<div class="ui three column stackable grid">
<div class="column">
<div class="ui raised segment">
<div class="ui placeholder">
<div class="image header">
<div class="line"></div>
<div class="line"></div>
</div>
<div class="paragraph">
<div class="medium line"></div>
<div class="short line"></div>
</div>
</div>
</div>
</div>
<div class="column">
<div class="ui raised segment">
<div class="ui placeholder">
<div class="image header">
<div class="line"></div>
<div class="line"></div>
</div>
<div class="paragraph">
<div class="medium line"></div>
<div class="short line"></div>
</div>
</div>
</div>
</div>
<div class="column">
<div class="ui raised segment">
<div class="ui placeholder">
<div class="image header">
<div id="image-header-3">
<div class="line"></div>
<div class="line"></div>
</div>
Expand Down

0 comments on commit 38c873b

Please sign in to comment.