Skip to content

Commit 54f613a

Browse files
mark-nakachonmark-nakachon
authored
Merge branch 'development' into development
2 parents 6a33bca + 1d7a23e commit 54f613a

File tree

8 files changed

+241
-412
lines changed

8 files changed

+241
-412
lines changed

‎controller/profile.controller.js

Lines changed: 146 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,146 @@
1-
const user = require('../schema/user.js');
2-
const proj = require('../schema/project.js');
3-
4-
module.exports = {
5-
search: function(req, res) {
6-
console.log(req.body);
7-
},
8-
check: function(req, res) {
9-
console.log(req.body);
10-
},
11-
profileId: function(req, res) {
12-
user.findOne({ Eid: req.user.Eid }).then(function(us) {
13-
req.params.id = us.Eid;
14-
res.redirect('/profile/profileview/' + req.params.id);
15-
});
16-
},
17-
profileViewSd: function(req, res) {
18-
proj.find({ pid: req.params.sd }).then(function(ques) {
19-
user.findOne({ Eid: req.params.sd }).then(function(use) {
20-
res.render('other-landing', { use: use, ques: ques, sign: req.user });
21-
});
22-
});
23-
},
24-
publish: function(req, res) {
25-
new proj({
26-
pname: req.body.contentname,
27-
pid: req.user.Eid,
28-
github: req.body.git,
29-
Lang: req.body.genre,
30-
content: req.body.cont,
31-
upvote: '',
32-
downvote: '',
33-
proid: Math.floor(Math.random() * 100000)
34-
})
35-
.save()
36-
.then(function() {
37-
res.redirect('/profile/profileview/' + req.user.Eid);
38-
});
39-
},
40-
upvote: function(req, res) {
41-
var p = 0;
42-
43-
var check = 0;
44-
var comment = ' ';
45-
for (q = 0; q < proj.downvote.length; q++) {
46-
if (req.body.client == proj.downvote[q]) {
47-
comment = 'Cannot upvote and downvote a post ';
48-
check = 1;
49-
break;
50-
}
51-
}
52-
53-
if (check == 1) {
54-
res.send({ proj, comment });
55-
} else {
56-
for (v = 0; v < proj.upvote.length; v++) {
57-
if (req.body.client == proj.upvote[v]) {
58-
p = 1;
59-
proj.upvote.pop(req.body.client);
60-
proj.save();
61-
console.log('already present');
62-
break;
63-
}
64-
}
65-
66-
if (p == 0) {
67-
proj.upvote.push(req.body.client);
68-
proj.save();
69-
}
70-
71-
res.send({ comment, proj });
72-
}
73-
},
74-
downvote: function(req, res) {
75-
proj.findOne({ proid: req.body.project }).then(function(proj) {
76-
var p = 0;
77-
var check = 0;
78-
var comment = '';
79-
80-
for (q = 0; q < proj.upvote.length; q++) {
81-
if (req.body.client == proj.upvote[q]) {
82-
comment = 'Cannot do upvote downvote at same post';
83-
check = 1;
84-
break;
85-
}
86-
}
87-
88-
if (check == 1) {
89-
res.send({ comment, proj });
90-
} else {
91-
for (v = 0; v < proj.downvote.length; v++) {
92-
if (req.body.client == proj.downvote[v]) {
93-
p = 1;
94-
proj.downvote.pop(req.body.client);
95-
proj.save();
96-
console.log('already present');
97-
break;
98-
}
99-
}
100-
101-
if (p == 0) {
102-
proj.downvote.push(req.body.client);
103-
proj.save();
104-
}
105-
106-
res.send({ comment, proj });
107-
}
108-
});
109-
},
110-
ch2: function(req, res) {
111-
res.render('main-landing', { sign: req.user });
112-
},
113-
up: function(req, res) {
114-
res.send('success');
115-
},
116-
dashBoard: function(req, res) {
117-
res.render('dashboard', { user: req.user });
118-
},
119-
setting: function(req, res) {
120-
res.render('setting', { user: req.user });
121-
},
122-
updateDetails: function(req, res) {
123-
user.findOne({ Eid: req.user.Eid }).then(function(data) {
124-
(data.fname = req.body.fname),
125-
(data.lname = req.body.lname),
126-
(data.bio = req.body.bio),
127-
(data.college = req.body.college),
128-
(data.email = req.body.email),
129-
(data.github = req.body.githubUrl),
130-
(data.linkedin = req.body.linkedinUrl),
131-
(data.city = req.body.city),
132-
(data.country = req.body.country),
133-
(data.lang = req.body.languages),
134-
(data.facebook = req.body.facebookUrl);
135-
data.save();
136-
res.send('success');
137-
});
138-
},
139-
getDetails: function(req, res) {
140-
user.findOne({ Eid: req.user.Eid }).then(function(data) {
141-
res.send(data);
142-
});
143-
}
144-
/*updatebio: function(req, res) {
145-
console.log(req);
146-
user.findOne({ Eid: req.user.Eid }).then(function(data) {
147-
data.fname = req.body.bio;
148-
data.save();
149-
});
150-
}*/
151-
};
1+
const user = require('../schema/user.js');
2+
const proj = require('../schema/project.js');
3+
4+
module.exports = {
5+
search: function(req, res) {
6+
console.log(req.body);
7+
},
8+
check: function(req, res) {
9+
console.log(req.body);
10+
},
11+
profileId: function(req, res) {
12+
user.findOne({ Eid: req.user.Eid }).then(function(us) {
13+
req.params.id = us.Eid;
14+
res.redirect('/profile/profileview/' + req.params.id);
15+
});
16+
},
17+
profileViewSd: function(req, res) {
18+
proj.find({ pid: req.params.sd }).then(function(ques) {
19+
user.findOne({ Eid: req.params.sd }).then(function(use) {
20+
res.render('other-landing', { use: use, ques: ques, sign: req.user });
21+
});
22+
});
23+
},
24+
publish: function(req, res) {
25+
new proj({
26+
pname: req.body.contentname,
27+
pid: req.user.Eid,
28+
github: req.body.git,
29+
Lang: req.body.genre,
30+
content: req.body.cont,
31+
upvote: '',
32+
downvote: '',
33+
proid: Math.floor(Math.random() * 100000)
34+
})
35+
.save()
36+
.then(function() {
37+
res.redirect('/profile/profileview/' + req.user.Eid);
38+
});
39+
},
40+
upvote: function(req, res) {
41+
var p = 0;
42+
43+
var check = 0;
44+
var comment = ' ';
45+
for (q = 0; q < proj.downvote.length; q++) {
46+
if (req.body.client == proj.downvote[q]) {
47+
comment = 'Cannot upvote and downvote a post ';
48+
check = 1;
49+
break;
50+
}
51+
}
52+
53+
if (check == 1) {
54+
res.send({ proj, comment });
55+
} else {
56+
for (v = 0; v < proj.upvote.length; v++) {
57+
if (req.body.client == proj.upvote[v]) {
58+
p = 1;
59+
proj.upvote.pop(req.body.client);
60+
proj.save();
61+
console.log('already present');
62+
break;
63+
}
64+
}
65+
66+
if (p == 0) {
67+
proj.upvote.push(req.body.client);
68+
proj.save();
69+
}
70+
71+
res.send({ comment, proj });
72+
}
73+
},
74+
downvote: function(req, res) {
75+
proj.findOne({ proid: req.body.project }).then(function(proj) {
76+
var p = 0;
77+
var check = 0;
78+
var comment = '';
79+
80+
for (q = 0; q < proj.upvote.length; q++) {
81+
if (req.body.client == proj.upvote[q]) {
82+
comment = 'Cannot do upvote downvote at same post';
83+
check = 1;
84+
break;
85+
}
86+
}
87+
88+
if (check == 1) {
89+
res.send({ comment, proj });
90+
} else {
91+
for (v = 0; v < proj.downvote.length; v++) {
92+
if (req.body.client == proj.downvote[v]) {
93+
p = 1;
94+
proj.downvote.pop(req.body.client);
95+
proj.save();
96+
console.log('already present');
97+
break;
98+
}
99+
}
100+
101+
if (p == 0) {
102+
proj.downvote.push(req.body.client);
103+
proj.save();
104+
}
105+
106+
res.send({ comment, proj });
107+
}
108+
});
109+
},
110+
ch2: function(req, res) {
111+
res.render('main-landing', { sign: req.user });
112+
},
113+
up: function(req, res) {
114+
res.send('success');
115+
},
116+
dashBoard: function(req, res) {
117+
res.render('dashboard', { user: req.user });
118+
},
119+
setting: function(req, res) {
120+
res.render('setting', { user: req.user });
121+
},
122+
updateDetails: function(req, res) {
123+
user.findOne({ Eid: req.user.Eid }).then(function(data) {
124+
(data.fname = req.body.fname),
125+
(data.lname = req.body.lname),
126+
(data.bio = req.body.bio),
127+
(data.college = req.body.college),
128+
(data.email = req.body.email),
129+
(data.github = req.body.githubUrl),
130+
(data.linkedin = req.body.linkedinUrl),
131+
(data.city = req.body.city),
132+
(data.country = req.body.country),
133+
(data.lang = req.body.languages),
134+
(data.facebook = req.body.facebookUrl);
135+
data.save();
136+
res.send('success');
137+
});
138+
},
139+
getDetails: function(req, res) {
140+
user.findOne({ Eid: req.user.Eid }).then(function(data) {
141+
res.send(data);
142+
});
143+
}
144+
145+
};
146+

‎db/projects.txt

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"_id" : ObjectId("5b5201258bf7024f24e85126"),
3-
"upvote" : [
4-
""
5-
],
6-
"downvote" : [
7-
""
8-
],
3+
"upDownVote":{},
94
"pname" : "My first project",
105
"pid" : "104495411584749551646",
116
"github" : "xyz",
@@ -16,13 +11,7 @@
1611
},
1712
{
1813
"_id" : ObjectId("5b4f8beb7186aa40844df9b2"),
19-
"upvote" : [
20-
"",
21-
"104495411584749551646"
22-
],
23-
"downvote" : [
24-
""
25-
],
14+
"upDownVote" :{},
2615
"pname" : "My first project",
2716
"pid" : "104495411584749551646",
2817
"github" : "xyz",
@@ -33,13 +22,7 @@
3322
},
3423
{
3524
"_id" : ObjectId("5b5c2a66bb47f62b54a8ee40"),
36-
"upvote" : [
37-
""
38-
],
39-
"downvote" : [
40-
"",
41-
"104495411584749551646"
42-
],
25+
"upDownVote":{},
4326
"pname" : "My first project",
4427
"pid" : "115169838008905885474",
4528
"github" : "xyz",
@@ -50,13 +33,7 @@
5033
},
5134
{
5235
"_id" : ObjectId("5b5c83880380e426bce91822"),
53-
"upvote" : [
54-
""
55-
],
56-
"downvote" : [
57-
"",
58-
"104495411584749551646"
59-
],
36+
"upDownVote":{},
6037
"pname" : "My first ",
6138
"pid" : "104495411584749551646",
6239
"github" : "",

0 commit comments

Comments
 (0)