Skip to content
Snippets Groups Projects
Commit 5e645b4c authored by Jogesh's avatar Jogesh
Browse files

Minor fixes

parent 5bfd1231
No related branches found
No related tags found
No related merge requests found
FROM node:10-alpine
# Create app directory
WORKDIR /usr/src/app
WORKDIR /var/www/todoapp
# Bundle app source
COPY . .
......
......@@ -13,8 +13,6 @@ services:
environment:
- NODE_ENV=development
- PORT=3000
command:
sh -c 'npm i && node server.js'
mongo:
image: mongo
......
......@@ -8,16 +8,9 @@ router.get('/', (req, res) => {
Todo.find({}, (err, todos) => {
if(Object.keys(todos).length > 0) {
res.render("todos", {
tasks: todos
});
}
else {
res.render("todos", {
tasks: {}
});
}
res.render("todos", {
tasks: (Object.keys(todos).length > 0 ? todos : {})
});
});
});
......
......@@ -3,26 +3,26 @@ const bodyParse = require('body-parser');
const app = require('express')();
const moment = require('moment');
// Fontend route
const FrontRouter = require('./routes/front');
app.locals.moment = moment;
// Set ejs template engine
app.set('view engine', 'ejs');
app.use(bodyParse.urlencoded({extended: false}));
app.use(bodyParse.urlencoded({extended: false}));
app.locals.moment = moment;
// Database connection
const db = require('./config/keys').mongoProdURI;
mongoose
.connect(db, {useNewUrlParser: true})
.then(() => {
console.log(`Mongodb Connected`);
})
.catch((error) => {
console.log(error);
});
.then(() => console.log(`Mongodb Connected`))
.catch(error => console.log(error));
app.use(FrontRouter);
const PORT = process.env.PORT || 3000;
app.listen(PORT, () => {
console.log(`Server listening on port ${PORT}`);
......
......@@ -52,7 +52,7 @@
</ul>
<% } else { %>
<div class="text-center"><strong>Please add some task.</strong></div>
<% }%>
<% } %>
</div>
</div>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment