Merged from main

This commit is contained in:
2022-11-02 13:57:56 +01:00
6 changed files with 34 additions and 13 deletions

View File

Binary file not shown.

View File

@@ -90,20 +90,33 @@
</div> </div>
</div> </div>
<div class="centercol column"> <div class="centercol column">
<span class="colheader">Filtered Cluccs</span> <h1 class="colheader">FILTERED CLUCCS</h1>
</div> </div>
<div class="rightcol column"> <div class="rightcol column">
<div class="searchcontainer column"> <div class="searchcontainer column">
<input class = "searchbar" type = "text" placeholder="SEARCH CLUCCS..."> <input class = "searchbar" type = "text" placeholder="SEARCH CLUCCS...">
<button class = "button">SORT BY</button> <button class = "button">SORT BY</button>
<button class = "button">BLOCKED WORDS</button> <button class = "button">BLOCKED WORDS</button>
<button class = "button">POPULARITY FILTER</button> <button class = "button">POPULARITY FILTER</button>
</div> </div>
<div class="popchart column"> <div class="popchart column">
<h1 class="colheader chartheader">SPORTS POPULARITY CHART</h1> <h1 class="colheader chartheader">SPORTS POPULARITY CHART</h1>
</div> </div>
</div> </div>
</div> </div>
-->
<div class = "maintable">
<div class = "leftcol">
<h1 class = 'colheader'>LATEST CLUCCS</h1>
</div>
<div class="centercol">
<h1 class = 'colheader'>FILTERED CLUCCS</h1>
</div>
<div class = "searchbar"></div>
<div class = "popchart">
<h1 class = 'colheader'>SPORTS POPULARITY CHART</h1>
</div>
</div>
</div> </div>
</div> </div>
<script src="/lib/jquery-2.1.1.min.js"></script> <script src="/lib/jquery-2.1.1.min.js"></script>

View File

@@ -50,11 +50,11 @@ function tweetCell(tweet) {
var cell = document.createElement("div"); var cell = document.createElement("div");
cell.innerHTML = cell.innerHTML =
`<div class="tweet"> `<div class="tweet">
<img src="${tweet.user.profile_image_url}" onerror="this.src='media/logo.png'" class="tweet-profilepicture"> <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-content">
<div class="tweet-name"> <div class="tweet-name">
<span class="tweet-nickname">${tweet.user.name}</span> <a class="tweet-nickname" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">${tweet.user.name}</a>
<span class="tweet-username">@${tweet.user.screen_name}</span> <a class="tweet-username" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">@${tweet.user.screen_name}</a>
</div> </div>
<span class="tweet-text">${tweet.text}</span> <span class="tweet-text">${tweet.text}</span>
<div class="tweet-interactions"> <div class="tweet-interactions">
@@ -172,5 +172,3 @@ function sortTweets(tweets, likesDes=null, retweets=null, replies=null){
} }
return tweets return tweets
} }
var tweets = [{"likes": 2},{"likes": 3},{"likes": 5},{"likes": 1}]

View File

@@ -122,10 +122,20 @@ body {
} }
.tweet-nickname { .tweet-nickname {
color: white;
text-decoration: none;
font-weight: bold;
}
.tweet-nickname:active {
color: white;
text-decoration: underline;
font-weight: bold; font-weight: bold;
} }
.tweet-username { .tweet-username {
color: white;
text-decoration: none;
opacity: 0.8; opacity: 0.8;
} }

View File

Binary file not shown.

View File

Binary file not shown.