Skip to content

Commit 800dc12

Browse files
SysSn13SysSn13
committed
fix MLE error, table design
1 parent 616281e commit 800dc12

File tree

11 files changed

+2393
-168
lines changed

11 files changed

+2393
-168
lines changed

‎package-lock.json‎

Lines changed: 2243 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "server.js",
66
"scripts": {
77
"start": "node server.js",
8-
"devStart": "nodemon server.js"
8+
"dev": "nodemon server.js"
99
},
1010
"keywords": [],
1111
"author": "",

‎public/stylesheets/tablestyle.css‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ html,
1010
white-space: nowrap;
1111
overflow: hidden;
1212
}
13-
14-
thead th {
15-
color: #fff;
16-
}
17-
13+
1814
.card {
1915
border-radius: .5rem;
2016
}
@@ -26,21 +22,31 @@ html,
2622
.table-scroll table thead th {
2723
font-size: 1.25rem;
2824
}
29-
30-
.pagination {
31-
display: inline-block;
25+
.pagination > li > a
26+
{
27+
background-color: white;
28+
color: #000000;
3229
}
33-
34-
.pagination a {
35-
color: black;
36-
float: left;
37-
padding: 8px 16px;
38-
text-decoration: none;
30+
31+
.pagination > li > a:focus,
32+
.pagination > li > a:hover,
33+
.pagination > li > span:focus,
34+
.pagination > li > span:hover
35+
{
36+
color: #5a5a5a;
37+
background-color: #eee;
38+
border-color: #ddd;
3939
}
40-
41-
.pagination a.active {
42-
background-color: #5bc0de ;
43-
color: white;
40+
41+
.pagination > .active > a
42+
{
43+
color: white;
44+
background-color: #000000 !Important;
45+
border: solid 1px #000000 !Important;
4446
}
45-
46-
.pagination a:hover:not(.active) {background-color: #ddd;}
47+
48+
.pagination > .active > a:hover
49+
{
50+
background-color: #000000 !Important;
51+
border: solid 1px #000000;
52+
}

‎routes/index.js‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,45 @@ const router = express.Router()
99

1010
router.get('/',async (req,res) => {
1111
try {
12-
let contests = await contest.find({}).sort({'startTime':'desc'})
12+
let contests = await contest.find({},{rankings:0}).sort({'startTime':'desc'})
1313
res.render('contests/index',{contests:contests})
1414
}
1515
catch(error) {
16-
console.log("error has occurred")
16+
console.log("Error while fetching contests list: ",error)
1717
res.send(error.message)
1818
}
1919
})
2020

2121
router.get('/contests/:contestSlug/ranking/:page', async (req,res) => {
2222
try {
23-
let pageCount = 50
23+
let pageCount = 25
2424
let {contestSlug, page} = req.params
25-
let intPage = parseInt(page)
26-
if(page!=intPage){
27-
throw Error('Page number should be an integer')
25+
if(page==null){
26+
page ="1"
27+
}
28+
if(!isNumeric(page)){
29+
throw Error('Invalid page number')
2830
}
31+
let intPage = parseInt(page)
2932
if(page%1){
3033
intPage++;
3134
}
3235
page = intPage
3336
let toSkip = (page - 1)*pageCount
34-
let contests = await contest.find({_id:contestSlug}, { 'rankings': { $slice: [toSkip,pageCount] }})
37+
let contests = await contest.findOne({_id:contestSlug}, { 'rankings': { $slice: [toSkip,pageCount] }})
3538
let totalPages = 100
36-
if(contests[0]==null){
39+
if(contests==null){
3740
throw Error("Invalid Contest")
3841
}
39-
if(contests[0].num_user){
40-
totalPages = parseInt(contests[0].num_user/50)
41-
if(contests[0].num_user/50%1){
42+
if(contests.num_user){
43+
totalPages = parseInt(contests.num_user/50)
44+
if(contests.num_user/25%1){
4245
totalPages++;
4346
}
4447
}
45-
46-
//console.log(contests)
47-
//res.send(contests[0]['rankings'])
48+
if(page>totalPages){
49+
throw Error("Page not found")
50+
}
4851
res.render('contests/ranking', {contests,totalPages,page})
4952
}
5053
catch(error){
@@ -74,4 +77,7 @@ router.post('/contests/:contestSlug/ranking/search', async (req,res) => {
7477
}
7578
})
7679

80+
function isNumeric(value) {
81+
return /^\d+$/.test(value);
82+
}
7783
module.exports = router

‎server.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ app.use('/',indexRouter)
2626
app.listen(process.env.PORT || 3000)
2727

2828
// const predict = require('./services/predict')
29+
// const schedualing = require('./services/scheduling')
30+
// schedualing.fetchAllContests()

‎services/contests.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const fetchContest = async () => {
124124
}
125125
const getContestRankings = async function(contestSlug){
126126
let contest = await Contest.findById(contestSlug)
127-
if(!contest){
127+
if(!contest || !contest.rankings || !contest.rankings.length){
128128
contest = await fetchContestRankings(contestSlug)
129129
}
130130
return contest

‎services/scheduling.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,14 @@ const job = schedule.scheduleJob({hour: 00, minute: 00,},async function(){
1717
}
1818
}
1919
});
20+
21+
// const fetchNow = async function(){
22+
// let contestList = await fetchContest()
23+
// for(let i=0;i<contestList.length;i++){
24+
// if(contestList[i].rankings && contestList[i].rankings.length>0)
25+
// break;
26+
// await getContestRankings(contestList[i].titleSlug)
27+
// }
28+
29+
// }
30+
// exports.fetchAllContests = fetchNow

‎views/contests/index.ejs‎

Lines changed: 42 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,48 @@
1-
21
<link rel="stylesheet" href="/stylesheets/tablestyle.css">
2+
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.24/css/jquery.dataTables.min.css">
3+
4+
<section class="intro">
5+
<h1 class="mb-5 mt-5" style="text-align: center; ">Leetcode Contests</h1>
6+
<div class="container">
7+
<div class="row justify-content-center">
8+
<div class="col-12">
39

4-
<section class="intro" >
5-
<h1 class="mb-5 mt-5" style="text-align: center; ">Leetcode Contests</h1>
6-
<div class="bg-image h-100" >
7-
<div class="mask d-flex align-items-center h-100">
8-
<div class="container">
9-
<div class="row justify-content-center">
10-
<div class="col-12">
11-
<div class="card">
12-
<div class="card-body p-0">
13-
<div class="table-responsive table-scroll" data-mdb-perfect-scrollbar="true" style="position: relative; height: 700px">
14-
<table id="data" class="table table-striped mb-0">
15-
<thead style="background-color: #002d72;">
16-
<tr>
17-
<th scope="col">Contest Name</th>
18-
<th scope="col">Type</th>
19-
<th scope="col">Start Time</th>
20-
<th scope="col">Duration</th>
21-
22-
</tr>
23-
</thead>
24-
<tbody>
25-
<% for( let contest of contests ) { %>
26-
<tr>
27-
<td><a href="/contests/<%= contest._id %>/ranking/1"><%= contest._id %></a> </td>
28-
<% if (contest.startTime>Date.now()) { %>
29-
<td>Upcoming</td>
30-
<% } else { %>
31-
<td>Virtual</td>
32-
<% } %>
33-
<td><%= contest.startTime %></td>
34-
<td><%= (contest.endTime - contest.startTime)/60000 %> minutes</td>
35-
36-
</tr>
37-
<% } %>
38-
39-
40-
</tbody>
41-
</table>
42-
</div>
43-
</div>
44-
</div>
45-
</div>
46-
</div>
10+
<div class="table-responsive table-scroll">
11+
<table id="contest-table" class="table table-striped hover">
12+
<thead>
13+
<tr>
14+
<th scope="col">Contest Name</th>
15+
<th scope="col">Type</th>
16+
<th scope="col">Start Time</th>
17+
<th scope="col">Duration</th>
18+
</tr>
19+
</thead>
20+
<tbody>
21+
<% for( let contest of contests ) { %>
22+
<tr>
23+
<td><a href="/contests/<%= contest._id %>/ranking/1" style="text-decoration:none"><%= contest._id %></a> </td>
24+
<% if (contest.startTime>Date.now()) { %>
25+
<td>Upcoming</td>
26+
<% } else { %>
27+
<td>Virtual</td>
28+
<% } %>
29+
<td><%= contest.startTime %></td>
30+
<td><%= (contest.endTime - contest.startTime)/60000 %> minutes</td>
31+
</tr>
32+
<% } %>
33+
</tbody>
34+
</table>
4735
</div>
4836
</div>
4937
</div>
50-
</section>
51-
<script>
52-
$(document).ready(function(){
53-
$('#data').after('<div id="nav" class="pagination"></div>');
54-
var rowsShown = 50;
55-
var rowsTotal = $('#data tbody tr').length;
56-
var numPages = rowsTotal/rowsShown;
57-
for(i = 0;i < numPages;i++) {
58-
var pageNum = i + 1;
59-
$('#nav').append('<a href="#" rel="'+i+'">'+pageNum+'</a> ');
60-
}
61-
$('#data tbody tr').hide();
62-
$('#data tbody tr').slice(0, rowsShown).show();
63-
$('#nav a:first').addClass('active');
64-
$('#nav a').bind('click', function(){
38+
</div>
39+
</section>
6540

66-
$('#nav a').removeClass('active');
67-
$(this).addClass('active');
68-
var currPage = $(this).attr('rel');
69-
var startItem = currPage * rowsShown;
70-
var endItem = startItem + rowsShown;
71-
$('#data tbody tr').css('opacity','0.0').hide().slice(startItem, endItem).
72-
css('display','table-row').animate({opacity:1}, 300);
73-
});
74-
});
75-
</script>
41+
<script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.24/js/jquery.dataTables.js"></script>
42+
<script>
43+
$(document).ready(function () {
44+
$('#contest-table').DataTable({
45+
"ordering": false
46+
})
47+
});
48+
</script>

0 commit comments

Comments
 (0)