Skip to content

Commit 0e9aff7

Browse files
RupeshiyaRupeshiya
committed
Merge branch 'master' of https://github.com/codeuino/Social-Platform-Donut into issue#100
2 parents 10fc89d + a6163b9 commit 0e9aff7

File tree

13 files changed

+163
-278
lines changed

13 files changed

+163
-278
lines changed

‎READMEassets/Home.jpg‎

49.2 KB
Loading

‎READMEassets/Info.png‎

187 KB
Loading

‎READMEassets/about.jpg‎

74.2 KB
Loading

‎READMEassets/about2.jpg‎

34.4 KB
Loading

‎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" : "",

‎package-lock.json‎

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

‎routes/profile.routes.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ route.get('/profileview/:sd', auth, url, profileController.profileViewSd);
2626

2727
route.post('/publish',auth ,url, profileController.publish);
2828

29-
route.post('/upvote', auth,url, jsonParser, profileController.upvote);
3029

31-
route.post('/downvote', url, jsonParser, profileController.downvote);
30+
route.post('/upDownVote',auth,url,jsonParser,profileController.upDownVote);
31+
3232

3333
route.get('/ch2',auth, profileController.ch2);
3434

‎schema/project.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const mongoose=require('mongoose');
2-
const schema=mongoose.Schema;
3-
const project=new schema({
1+
const mongoose = require('mongoose');
2+
const schema = mongoose.Schema;
3+
const project = new schema({
44
pname:{
55
type:String
66
},
@@ -28,5 +28,5 @@ const project=new schema({
2828

2929
});
3030

31-
const proj=mongoose.model('project',project);
31+
const proj = mongoose.model('project',project);
3232
module.exports=proj;

‎schema/user.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const mongoose=require('mongoose');
2-
const Schema=mongoose.Schema;
3-
const bycrypt=require('bcrypt-nodejs');
1+
const mongoose = require('mongoose');
2+
const Schema = mongoose.Schema;
3+
const bycrypt = require('bcrypt-nodejs');
44
const user=new Schema({
55
fname:{
66
type:String
@@ -62,9 +62,9 @@ user.pre('save',function(next){
6262
});
6363
});
6464

65-
user.methods.compare=function(pass){
65+
user.methods.compare = function(pass){
6666
return bycrypt.compareSync(pass,this.password);
6767
};
6868

69-
const use=mongoose.model('user',user);
70-
module.exports=use;
69+
const use = mongoose.model('user',user);
70+
module.exports = use;

‎views/all.ejs‎

Lines changed: 1 addition & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525

2626
</head>
27-
2827
<body id="page-top">
29-
3028
<!-- Navigation -->
3129
<nav class="navbar navbar-expand-lg navbar-light fixed-top" id="mainNav">
3230
<div class="container">
@@ -55,9 +53,6 @@
5553
</ul>
5654
</div>
5755
</div>
58-
59-
60-
6156
</nav>
6257

6358

@@ -97,102 +92,13 @@
9792
</div>
9893
</div>
9994
<div class="modal-footer">
100-
Are you a Organisation? <a href="#">Click Here</a>
95+
Are you a Organisation? <a href="signup_community.html">Click Here</a>
10196
</div>
10297
</div>
10398
</div>
10499
</div>
105100
</div>
106101
</div>
107-
108-
<!-- Login/SignUp Modal -->
109-
<!--
110-
<div class="modal fade" id="loginSignup" tabindex="-1" role="dialog" aria-labelledby="loginSignupLabel" aria-hidden="true">
111-
<div class="modal-dialog modal-lg" role="document">
112-
<div class="modal-content">
113-
<div class="modal-body">
114-
<div id="SignUp" class="container">
115-
<ul class="nav nav-tabs signup-tabs text-center">
116-
<li class="active" id="userSignuptab">
117-
<a href="#userSignUp" data-toggle="tab"><p>User Sign Up</p></a>
118-
</li>
119-
<li id="commSignuptab">
120-
<a href="#commSignUp" data-toggle="tab"><p>Community Sign Up</p></a>
121-
</li>
122-
</ul>
123-
124-
<div class="tab-content">
125-
<div class="tab-pane active" id="userSignUp">
126-
<form action="/auth/userlogin" class="signupform" method="post" onsubmit="return(validate());">
127-
<div class="form-row">
128-
<div class="form-group col-md-6">
129-
<label for="fname">First Name</label>
130-
<input type="text" class="form-control" id="fname" name="fname" placeholder="First Name" required autocomplete="off">
131-
</div>
132-
<div class="form-group col-md-6">
133-
<label for="lname">Last Name</label>
134-
<input type="text" class="form-control" id="lname" placeholder="Last Name" name="lanme" required autocomplete="off">
135-
</div>
136-
</div>
137-
<div class="form-group">
138-
<label for="email">Email address</label>
139-
<input type="email" class="form-control" id="email" placeholder="Email Address" required autocomplete="off" name="email" />
140-
</div>
141-
<div class="form-row">
142-
<div class="form-group col-md-6">
143-
<label for="dob">Date of Birth</label>
144-
<input type="date" class="form-control" id="dob" placeholder="Date of Birth- DD/MM/YY" name="dob" required autocomplete="off">
145-
</div>
146-
<div class="form-group col-md-6">
147-
<label for="drop">Gender</label><br>
148-
<select name="Gender" id="drop" class="form-control" required>
149-
<option value="" disabled selected>Gender M/F/Other</option>
150-
<option value="1" name="unknown">Don't want to tell</option>
151-
<option value="2" name="male">Male</option>
152-
<option value="3" name="female">Female</option>
153-
<option value="4" name="other">Other</option>
154-
</select>
155-
</div>
156-
</div>
157-
<div class="form-group">
158-
<label for="github">Github Profile</label>
159-
<input type="text" class="form-control" id="github" placeholder="Github Handle link" required autocomplete="off" name="github" />
160-
</div>
161-
<div class="form-group">
162-
<label for="username">Username</label>
163-
<input type="text" class="form-control" id="username" placeholder="Email username" required autocomplete="off" name="username" />
164-
</div>
165-
<div class="form-row">
166-
<div class="form-group col-md-6">
167-
<label for="pass">First Name</label>
168-
<input type="password" class="form-control" id="pass" name="pass" placeholder="Enter Password" required autocomplete="off">
169-
</div>
170-
<div class="form-group col-md-6">
171-
<label for="cpass">Last Name</label>
172-
<input type="password" class="form-control" id="cpass" placeholder="Confirm Password" required autocomplete="off">
173-
</div>
174-
</div>
175-
<div class="form-check">
176-
<input class="form-check-input" type="checkbox" value="" name="check" id="check">
177-
<label class="form-check-label" for="check">
178-
I accept the<small>Code of Conduct</small> of this community
179-
</label>
180-
</div>
181-
<div class="signup-btn">
182-
<button type="submit" class="btn btn-primary submit-btn">Submit</button>
183-
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
184-
</div>
185-
</form>
186-
</div>
187-
<div class="tab-pane" id="commSignUp">
188-
<h3>Notice the gap between the content and tab after applying a background color</h3>
189-
</div>
190-
</div>
191-
</div>
192-
</div>
193-
</div>
194-
</div>
195-
</div>-->
196102
</header>
197103

198104

0 commit comments

Comments
 (0)