Merge branch 'main' into filterFee

This commit is contained in:
Tim Wijma
2022-11-03 17:17:09 +01:00
7 changed files with 93 additions and 30 deletions

View File

@@ -24,18 +24,20 @@ function showFeeds() {
}
function tweetCell(tweet) {
const date = new Date(tweet.created_at);
var cell = document.createElement("div");
cell.innerHTML =
`<div class="tweet">
<a href ="https://www.twitter.com/${tweet.user.screen_name}"><img src="${tweet.user.profile_image_url}" onerror="this.src='media/logo.png';" class="tweet-profilepicture"></a>
<div class="tweet-content">
<div class="tweet-name">
<a class="tweet-nickname" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">${tweet.user.name}</a>
<a class="tweet-username" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">@${tweet.user.screen_name}</a>
<!-- add tweet date called created_at-->
<p class="tweet-date">${tweet.created_at}</p>
<div>
<a class="tweet-nickname" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">${tweet.user.name}</a>
<a class="tweet-username" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">@${tweet.user.screen_name}</a>
</div>
<span class="tweet-date"><em>${date.getHours()}:${date.getMinutes()}</em></span>
</div>
<span class="tweet-text">${tweet.text}</span>
<a class="tweet-text" href = "https://www.twitter.com/${tweet.user.screen_name}/status/${tweet.id_str}" target = "_blank">${tweet.text}</a>
<div class="tweet-interactions">
<div class="tweet-interaction tweet-likes">
<span class="material-symbols-outlined">favorite</span>
@@ -123,7 +125,7 @@ function sortTweets(tweets, sort){
tweets.sort(function(a,b){return a.reply_count-b.reply_count})
}
}
if (sort.sortby == "date"){
if (sort.sortby == "time"){
if(sort.order == 'asc'){
tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)})
} else{