Twitter Live Feed working (CONFLICT RESOLVED)

This commit is contained in:
jacktjong
2022-11-02 11:47:10 +01:00
parent a576e76e8a
commit c31d514753
2 changed files with 0 additions and 72 deletions

View File

@@ -25,33 +25,6 @@ function getCSSVariable(name) {
function tweetCell(tweet) {
var cell = document.createElement("div");
cell.innerHTML =
<<<<<<< Updated upstream
'<div class="tweet">'+
'<img src="' + tweet.user.profile_image_url + '" alt="" class="tweet-profilepicture">' +
'<div class="tweet-content">' +
'<div class="tweet-name">'+
'<span class="tweet-nickname">'+tweet.user.name+' </span>'+
'<span class="tweet-username">@'+tweet.user.screen_name+'</span>'+
'</div>'+
'<span class="tweet-text">'+tweet.text+'</span>'+
'<div class="tweet-interactions">'+
'<div class="tweet-interaction tweet-likes">'+
'<span class="material-symbols-outlined">favorite</span>'+
'<span>'+tweet.favorite_count+'</span>'+
'</div>'+
'<div class="tweet-interaction tweet-retweets">'+
'<span class="material-symbols-outlined">repeat</span>'+
'<span>'+tweet.retweet_count+'</span>'+
'</div>'+
'<div class="tweet-interaction tweet-replies">'+
'<span class="material-symbols-outlined">chat_bubble</span>'+
'<span>'+tweet.reply_count+'</span>'+
'</div>'+
'</div>'+
'</div>'+
'</div>';
parent.append(cell);
=======
`<div class="tweet">
<img src="${tweet.user.profile_image_url}" alt="" class="tweet-profilepicture">
<div class="tweet-content">
@@ -77,7 +50,6 @@ function tweetCell(tweet) {
</div>
</div>`
return cell
>>>>>>> Stashed changes
}
$(document).on('tweet', console.log(tweet));