Merge branch 'feature/dashboard' into dev
This commit is contained in:
commit
e65af5336f
7 files changed
+154
-57
No files matched your search
@@ -3,7 +3,7 @@ const MongoStore = require("connect-mongo");
|
||||
const session = require("express-session");
|
||||
const express = require('express');
|
||||
const path = require('path');
|
||||
const joi = require('joi');
|
||||
const joi = require('joi');
|
||||
require('dotenv').config();
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ const port = process.env.PORT || 3000;
|
||||
|
||||
const mongoURI = process.env.mongoURI || "mongodb://localhost:27017/";
|
||||
const database = process.env.database || "knoldus"; // Database name
|
||||
const secret = process.env.secret || "123-secret-xyz";
|
||||
const secret = process.env.secret || "123-secret-xyz";
|
||||
|
||||
/*** Sessions ***/
|
||||
app.use(session({
|
||||
@@ -24,7 +24,7 @@ app.use(session({
|
||||
}));
|
||||
|
||||
app.set('view engine', 'ejs');
|
||||
app.set('views',path.join(__dirname, 'src/views'));
|
||||
app.set('views', path.join(__dirname, 'src/views'));
|
||||
app.use(express.urlencoded({ extended: true }));
|
||||
app.use("/static", express.static("./src/public"));
|
||||
app.use("/images", express.static("./src/public/images"));
|
||||
@@ -36,7 +36,7 @@ const { connectMongo, getCollection } = require("./src/database/connection");
|
||||
let users;
|
||||
async function initDatabase() {
|
||||
const db = await connectMongo(mongoURI, database);
|
||||
|
||||
|
||||
// For any collection, init here
|
||||
users = await getCollection(db, "users");
|
||||
plans = await getCollection(db, "plans");
|
||||
@@ -46,7 +46,7 @@ async function initDatabase() {
|
||||
|
||||
app.get('/', (req, res) => {
|
||||
if (!req.session.errMessage) req.session.errMessage = "";
|
||||
res.render('landing');
|
||||
res.render('dashboard');
|
||||
return res.status(status.Ok);
|
||||
});
|
||||
|
||||
@@ -60,7 +60,7 @@ app.get('/signup', (req, res) => {
|
||||
app.get('/login', (req, res) => {
|
||||
if (req.session.authenticated) {
|
||||
res.redirect("/home");
|
||||
return res.status(status.Ok);
|
||||
return res.status(status.Ok);
|
||||
}
|
||||
res.render('login', { errMessage: req.session.errMessage });
|
||||
return res.status(status.Ok);
|
||||
@@ -96,10 +96,10 @@ initDatabase().then(() => {
|
||||
app.get('/*splat', (req, res) => {
|
||||
res.send('404 Not Found');
|
||||
return res.status(status.NotFound);
|
||||
});
|
||||
});
|
||||
|
||||
// Start app
|
||||
app.listen(port, () => {
|
||||
console.log(`Server listening on port ${port}`);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user