Skip to content

Commit 0fe2bcc

Browse files
SysSn13SysSn13
committed
add rankings-controller, replace search feature with exact username match and update UI
1 parent ad5dd14 commit 0fe2bcc

File tree

12 files changed

+445
-349
lines changed

12 files changed

+445
-349
lines changed

‎controllers/rankingsController.js‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
const { isNumeric } = require("../helpers");
2+
const Contest = require("../models/contest");
3+
4+
exports.get = async function (req, res) {
5+
try {
6+
let entries = 25;
7+
let { contestSlug, page } = req.params;
8+
if (page == null) {
9+
page = "1";
10+
}
11+
if (!isNumeric(page)) {
12+
res.sendStatus(404);
13+
return;
14+
}
15+
page = parseInt(page);
16+
if (page < 1) {
17+
res.sendStatus(404);
18+
return;
19+
}
20+
let toSkip = (page - 1) * entries;
21+
let contest = await Contest.findOne(
22+
{ _id: contestSlug },
23+
{
24+
rankings: { $slice: [toSkip, entries] },
25+
title: 1,
26+
user_num: 1,
27+
rankings_fetched: 1,
28+
}
29+
);
30+
31+
if (!contest || !contest.rankings_fetched) {
32+
res.sendStatus(404);
33+
return;
34+
}
35+
const totalPages = Math.ceil(contest.user_num / 25);
36+
if (page > totalPages) {
37+
res.sendStatus(404);
38+
return;
39+
}
40+
res.render("ranking", {
41+
contest,
42+
totalPages,
43+
page,
44+
searchResult: false,
45+
title: `${contest.title} | Leetcode Rating Predictor`,
46+
});
47+
} catch (err) {
48+
console.error(err);
49+
res.sendStatus(500);
50+
}
51+
};
52+
53+
exports.search = async function (req, res) {
54+
try {
55+
let { user } = req.body;
56+
user = user.trim();
57+
const result = await Contest.aggregate([
58+
{
59+
$project: {
60+
contest_id: 1,
61+
_id: 1,
62+
rankings: 1,
63+
},
64+
},
65+
{ $match: { _id: req.params.contestSlug } },
66+
{ $unwind: "$rankings" },
67+
{ $match: { "rankings._id": user } },
68+
]);
69+
const searchResult = result.map((item) => item.rankings);
70+
res.render("ranking", {
71+
contest: {
72+
_id: req.params.contestSlug,
73+
rankings: searchResult,
74+
},
75+
page: 1,
76+
totalPages: 1,
77+
searchResult: true,
78+
title: `Search | ${_id} | Leetcode Rating Predictor`,
79+
});
80+
} catch (error) {
81+
console.error(err);
82+
res.sendStatus(500);
83+
}
84+
};

‎main.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ if (process.env.NODE_ENV !== "production") {
33
}
44
const express = require("express");
55
const expressLayouts = require("express-ejs-layouts");
6+
const bodyParser = require("body-parser");
67

78
// database
89
const mongoose = require("mongoose");
@@ -33,6 +34,7 @@ if (process.env.WEB == true) {
3334
app.set("views", __dirname + "/views");
3435
app.set("layout", "layouts/layout");
3536
app.use(expressLayouts);
37+
app.use(bodyParser.urlencoded({ extended: true }));
3638
app.use(express.static("public"));
3739
app.use("/", webRouter);
3840
console.info("WEB is up.");

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77
},
88
"main": "server.js",
99
"scripts": {
10-
"start": "node main.js --max_old_space_size=512",
11-
"dev": "nodemon main.js --max_old_space_size=1024 --trace-warnings",
10+
"start": "node main.js --max_old_space_size=1024",
11+
"dev": "nodemon --max_old_space_size=1024 --trace-warnings main.js",
1212
"buildAddon": "npm run build --prefix ./services/predict-addon/"
1313
},
1414
"keywords": [],
1515
"author": "Sudesh Chaudhary <sudeshchaudhary1122@gmail.com> (https://github.com/SysSn13)",
1616
"license": "MIT",
1717
"dependencies": {
1818
"@bull-board/express": "^3.3.1",
19+
"body-parser": "^1.19.0",
1920
"bull": "^3.27.0",
2021
"ejs": "^3.1.6",
2122
"express": "^4.17.1",

‎public/stylesheets/main.css‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
body{
2+
color:#333;
3+
}
4+
5+
#forkMe {
6+
top: 3em;
7+
right: -6em;
8+
color: #fff;
9+
display: block;
10+
position: fixed;
11+
text-align: center;
12+
text-decoration: none;
13+
letter-spacing: .06em;
14+
background-color: #455a64;
15+
padding: 0.5em 5em 0.4em 5em;
16+
text-shadow: 0 0 0.75em #444;
17+
box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
18+
transform: rotate(45deg) scale(0.75,1);
19+
font: bold 16px/1.2em Arial, Sans-Serif;
20+
-webkit-text-shadow: 0 0 0.75em #444;
21+
-webkit-box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
22+
-webkit-transform: rotate(45deg) scale(0.75,1);
23+
z-index:10;
24+
}
25+
#forkMe:before {
26+
content: '';
27+
top: 0;
28+
left: 0;
29+
right: 0;
30+
bottom: 0;
31+
position: absolute;
32+
margin: -0.3em -5em;
33+
transform: scale(0.7);
34+
-webkit-transform: scale(0.7);
35+
border: 2px rgba(255,255,255,0.7) dashed;
36+
}
37+
#forkMe:hover {opacity: 0.9;}
38+
39+
a {
40+
color: #1890ff;
41+
text-decoration: none;
42+
background-color: transparent;
43+
outline: none;
44+
cursor: pointer;
45+
-webkit-transition: color 0.3s;
46+
-o-transition: color 0.3s;
47+
transition: color 0.3s;
48+
-webkit-text-decoration-skip: objects;
49+
}
50+
.btn-primary{
51+
background-color: #337ab7 !important;
52+
border-color: #337ab7 !important;
53+
color:white !important;
54+
}
55+
.bg-primary{
56+
background-color: #337ab7 !important;
57+
color: white !important;
58+
}
59+
.btn-primary:focus, .btn-primary:active {
60+
background-color: #337ab7 !important;
61+
border-color: #337ab7 !important;
62+
box-shadow: 0 0 0 0.25rem rgb(102 151 193) !important;
63+
}

‎public/stylesheets/tablestyle.css‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
html,
2-
body,
3-
.intro {
4-
height: 100%;
5-
}
6-
71
table td,
82
table th {
93
text-overflow: ellipsis;
@@ -40,13 +34,31 @@ html,
4034

4135
.pagination > .active > a
4236
{
43-
color: white;
44-
background-color: #000000 !Important;
45-
border: solid 1px #000000 !Important;
37+
color: #000000;
38+
background-color: #337ab7 !important;
39+
border: solid 1px #337ab7 !important;
4640
}
4741

4842
.pagination > .active > a:hover
4943
{
50-
background-color: #000000 !Important;
51-
border: solid 1px #000000;
52-
}
44+
background-color: #4c85b8 !important;
45+
border: solid 1px #4c85b8;
46+
}
47+
table,tbody, td, tfoot, th, thead, tr{
48+
border-style:none !important;
49+
}
50+
51+
table {
52+
border-radius: .4em;
53+
overflow: hidden;
54+
}
55+
56+
.table thead th {
57+
border-bottom: 2px solid #6685a5 !important;
58+
}
59+
.dataTables_filter{
60+
margin-bottom: 1em !important;
61+
padding: 1px;
62+
}
63+
64+

‎routes/index.js‎

Lines changed: 10 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,23 @@
11
const express = require("express");
22
const Contest = require("../models/contest");
3-
const { fetchContest, fetchContestRankings } = require("../services/contests");
43
const router = express.Router();
5-
4+
const rankingsController = require("../controllers/rankingsController");
65
router.get("/", async (req, res) => {
76
try {
87
let contests = await Contest.find({}, { rankings: 0 }).sort({
98
startTime: "desc",
109
});
11-
res.render("contests/index", { contests: contests });
12-
} catch (error) {
13-
console.log("Error while fetching contests list: ", error);
14-
res.send(error.message);
15-
}
16-
});
17-
18-
router.get("/contests/:contestSlug/ranking/:page", async (req, res) => {
19-
try {
20-
let pageCount = 25;
21-
let { contestSlug, page } = req.params;
22-
if (page == null) {
23-
page = "1";
24-
}
25-
if (!isNumeric(page)) {
26-
throw Error("Invalid page number");
27-
}
28-
let intPage = parseInt(page);
29-
if (page % 1) {
30-
intPage++;
31-
}
32-
page = intPage;
33-
let toSkip = (page - 1) * pageCount;
34-
let contests = await Contest.findOne(
35-
{ _id: contestSlug },
36-
{ rankings: { $slice: [toSkip, pageCount] } }
37-
);
38-
let totalPages = 100;
39-
if (contests == null) {
40-
throw Error("Invalid Contest");
41-
}
42-
if (contests.num_user) {
43-
totalPages = parseInt(contests.num_user / 50);
44-
if ((contests.num_user / 25) % 1) {
45-
totalPages++;
46-
}
47-
}
48-
if (page > totalPages) {
49-
throw Error("Page not found");
50-
}
51-
res.render("contests/ranking", { contests, totalPages, page });
52-
} catch (error) {
53-
console.log(error.message);
54-
res.send(error.message);
55-
}
56-
});
57-
router.post("/contests/:contestSlug/ranking/search", async (req, res) => {
58-
try {
59-
console.log(req.params);
60-
let { user } = req.body;
61-
let contests = await Contest.find({ _id: req.params.contestSlug });
62-
let searchResult = [];
63-
for (let i = 0; i < contests[0].rankings.length; i++) {
64-
if (contests[0].rankings[i]._id.includes(user)) {
65-
searchResult.push(contests[0].rankings[i]);
66-
}
67-
}
68-
res.render("contests/search", {
69-
searchResult,
70-
contestSlug: req.params.contestSlug,
10+
res.render("index", {
11+
contests: contests,
12+
title: "Leetcode Rating Predictor",
7113
});
72-
} catch (error) {
73-
console.log(error.message);
74-
res.send(error.message);
14+
} catch (err) {
15+
console.error(err);
16+
res.sendStatus(500);
7517
}
7618
});
7719

78-
function isNumeric(value) {
79-
return /^\d+$/.test(value);
80-
}
20+
router.get("/contests/:contestSlug/ranking/:page", rankingsController.get);
21+
router.post("/contests/:contestSlug/ranking/search", rankingsController.search);
22+
8123
module.exports = router;

‎views/contests/index.ejs‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)