Skip to content

Commit 8d1c1e3

Browse files
AuraOfDivinityAuraOfDivinity
committed
Requested changes
1 parent fe1aa8a commit 8d1c1e3

File tree

18 files changed

+667
-650
lines changed

18 files changed

+667
-650
lines changed

‎.env.dev‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
PORT=5000
22
NODE_ENV="development"
33
JWT_SECRET="thisismysupersecrettokenjustkidding"
4-
DATABASE_URL="mongodb+srv://asel123:asel123@socialmediaappcluster-leoir.mongodb.net/example"
4+
DATABASE_URL="mongodb://localhost:27017/donut-development"
55
SENDGRID_API_KEY = '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'
6-
AWS_BUCKET_NAME=donutproposals
7-
AWS_ACCESS_KEY_ID=AKIASECEF4XZS5OLND4S
8-
AWS_SECRET_ACCESS_KEY=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
9-
AWS_REGION=ap-south-1
10-
AWS_UPLOADED_FILE_URL_LINK=https://donutproposals.s3.ap-south-1.amazonaws.com/
6+
SOCKET_PORT = 8810

‎app.js‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
require("./config/mongoose");
2-
const express = require("express");
3-
const logger = require("morgan");
4-
const cookieParser = require("cookie-parser");
5-
const createError = require("http-errors");
6-
const path = require("path");
7-
const socket = require("socket.io");
8-
const multer = require("multer");
9-
const bodyParser = require("body-parser");
10-
const cors = require("cors");
11-
const fileConstants = require("./config/fileHandlingConstants");
1+
require('./config/mongoose')
2+
const express = require('express')
3+
const logger = require('morgan')
4+
const cookieParser = require('cookie-parser')
5+
const createError = require('http-errors')
6+
const path = require('path')
7+
const socket = require('socket.io')
8+
const multer = require('multer')
9+
const bodyParser = require('body-parser')
10+
const cors = require('cors')
11+
const fileConstants = require('./config/fileHandlingConstants')
1212

13-
const indexRouter = require("./app/routes/index");
14-
const authRouter = require("./app/routes/auth");
15-
const usersRouter = require("./app/routes/user");
16-
const postRouter = require("./app/routes/post");
17-
const eventRouter = require("./app/routes/event");
18-
const shortUrlRouter = require("./app/routes/urlShortner");
19-
const organizationRouter = require("./app/routes/organisation");
20-
const commentRouter = require("./app/routes/comment");
21-
const projectRouter = require("./app/routes/project");
22-
const notificationRouter = require("./app/routes/notification");
23-
const proposalRouter = require("./app/routes/proposal");
13+
const indexRouter = require('./app/routes/index')
14+
const authRouter = require('./app/routes/auth')
15+
const usersRouter = require('./app/routes/user')
16+
const postRouter = require('./app/routes/post')
17+
const eventRouter = require('./app/routes/event')
18+
const shortUrlRouter = require('./app/routes/urlShortner')
19+
const organizationRouter = require('./app/routes/organisation')
20+
const commentRouter = require('./app/routes/comment')
21+
const projectRouter = require('./app/routes/project')
22+
const notificationRouter = require('./app/routes/notification')
23+
const proposalRouter = require('./app/routes/proposal')
2424

25-
const app = express();
26-
const server = require("http").Server(app);
25+
const app = express()
26+
const server = require('http').Server(app)
2727

28-
app.use(cors());
28+
app.use(cors())
2929

30-
app.use(bodyParser.json({ limit: "200mb" }));
31-
app.use(bodyParser.urlencoded(fileConstants.fileParameters));
30+
app.use(bodyParser.json({ limit: '200mb' }))
31+
app.use(bodyParser.urlencoded(fileConstants.fileParameters))
3232

33-
const memoryStorage = multer.memoryStorage();
34-
app.use(multer({ storage: memoryStorage }).single("file"));
33+
const memoryStorage = multer.memoryStorage()
34+
app.use(multer({ storage: memoryStorage }).single('file'))
3535

36-
server.listen(process.env.SOCKET_PORT || 8810);
36+
server.listen(process.env.SOCKET_PORT || 8810)
3737
// WARNING: app.listen(80) will NOT work here!
3838

39-
const io = socket.listen(server);
40-
let count = 0;
41-
io.on("connection", (socket) => {
42-
console.log("socket connected count ", count++);
43-
io.emit("user connected");
44-
});
39+
const io = socket.listen(server)
40+
let count = 0
41+
io.on('connection', (socket) => {
42+
console.log('socket connected count ', count++)
43+
io.emit('user connected')
44+
})
4545

4646
// view engine setup
47-
app.set("views", path.join(__dirname, "views"));
48-
app.set("view engine", "ejs");
47+
app.set('views', path.join(__dirname, 'views'))
48+
app.set('view engine', 'ejs')
4949

50-
app.use(logger("tiny"));
51-
app.use(express.json());
52-
app.use(express.urlencoded({ extended: false }));
53-
app.use(cookieParser());
54-
app.use(express.static(path.join(__dirname, "public")));
50+
app.use(logger('tiny'))
51+
app.use(express.json())
52+
app.use(express.urlencoded({ extended: false }))
53+
app.use(cookieParser())
54+
app.use(express.static(path.join(__dirname, 'public')))
5555
app.use((req, res, next) => {
56-
req.io = io;
57-
next();
58-
});
56+
req.io = io
57+
next()
58+
})
5959

60-
app.use("/notification", notificationRouter);
61-
app.use("/", indexRouter);
62-
app.use("/auth", authRouter);
63-
app.use("/user", usersRouter);
64-
app.use("/post", postRouter);
65-
app.use("/org", organizationRouter);
66-
app.use("/event", eventRouter);
67-
app.use("/shortUrl", shortUrlRouter);
68-
app.use("/comment", commentRouter);
69-
app.use("/project", projectRouter);
70-
app.use("/proposal", proposalRouter);
60+
app.use('/notification', notificationRouter)
61+
app.use('/', indexRouter)
62+
app.use('/auth', authRouter)
63+
app.use('/user', usersRouter)
64+
app.use('/post', postRouter)
65+
app.use('/org', organizationRouter)
66+
app.use('/event', eventRouter)
67+
app.use('/shortUrl', shortUrlRouter)
68+
app.use('/comment', commentRouter)
69+
app.use('/project', projectRouter)
70+
app.use('/proposal', proposalRouter)
7171

7272
// catch 404 and forward to error handler
7373
app.use(function (req, res, next) {
74-
next(createError(404, "route doesn't exist"));
75-
});
74+
next(createError(404, "route doesn't exist"))
75+
})
7676

7777
// error handler
7878
app.use(function (err, req, res, next) {
7979
// set locals, only providing error in development
80-
res.locals.message = err.message;
81-
res.locals.error = req.app.get("env") === "development" ? err : {};
80+
res.locals.message = err.message
81+
res.locals.error = req.app.get('env') === 'development' ? err : {}
8282

8383
// render the error page
84-
res.status(err.status || 500);
85-
res.render("error");
86-
});
84+
res.status(err.status || 500)
85+
res.render('error')
86+
})
8787

88-
module.exports = { app, io };
88+
module.exports = { app, io }

‎app/controllers/notification.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const HANDLER = require("../utils/response-helper");
2-
const HttpStatus = require("http-status-codes");
3-
const Notifications = require("../models/Notifications");
4-
const helper = require("../utils/paginate");
5-
const User = require("../models/User");
6-
const ProposalNotifications = require("../models/ProposalNotification");
1+
const HANDLER = require('../utils/response-helper')
2+
const HttpStatus = require('http-status-codes')
3+
const Notifications = require('../models/Notifications')
4+
const helper = require('../utils/paginate')
5+
const User = require('../models/User')
6+
const ProposalNotifications = require('../models/ProposalNotification')
77

88
module.exports = {
99
// GET ALL THE NOTIFICATIONS FOR ALL
@@ -16,40 +16,40 @@ module.exports = {
1616
)
1717
.lean()
1818
.sort({ createdAt: -1 })
19-
.exec();
20-
return res.status(HttpStatus.OK).json({ notifications });
19+
.exec()
20+
return res.status(HttpStatus.OK).json({ notifications })
2121
} catch (error) {
22-
HANDLER.handleError(res, error);
22+
HANDLER.handleError(res, error)
2323
}
2424
},
2525
// GET LOGGED IN USER NOTIFICATIONS
2626
getUserNotification: async (req, res, next) => {
27-
const userId = req.user._id;
27+
const userId = req.user._id
2828
try {
29-
const user = await User.findById(userId);
29+
const user = await User.findById(userId)
3030
if (!user) {
3131
return res
3232
.status(HttpStatus.BAD_REQUEST)
33-
.json({ msg: "No such user exists!" });
33+
.json({ msg: 'No such user exists!' })
3434
}
3535
// get all notifications of existing user
36-
const notifications = user.notifications;
36+
const notifications = user.notifications
3737
if (notifications.length === 0) {
38-
return res.status(HttpStatus.OK).json({ msg: "No new notifications!" });
38+
return res.status(HttpStatus.OK).json({ msg: 'No new notifications!' })
3939
}
40-
return res.status(HttpStatus.OK).json({ notifications });
40+
return res.status(HttpStatus.OK).json({ notifications })
4141
} catch (error) {
42-
HANDLER.handleError(res, error);
42+
HANDLER.handleError(res, error)
4343
}
4444
},
4545

4646
getProposalNotifications: async (req, res, next) => {
4747
try {
48-
const notifications = await ProposalNotifications.find({});
49-
console.log(notifications);
50-
return res.status(HttpStatus.OK).json({ notifications });
48+
const notifications = await ProposalNotifications.find({})
49+
console.log(notifications)
50+
return res.status(HttpStatus.OK).json({ notifications })
5151
} catch (error) {
52-
HANDLER.handleError(res, error);
52+
HANDLER.handleError(res, error)
5353
}
54-
},
55-
};
54+
}
55+
}

0 commit comments

Comments
 (0)