From 5e645b4ce5eafb47ec390468fb7bd3bfdd4291f6 Mon Sep 17 00:00:00 2001
From: Jogesh <jogesh.sharma06@gmail.com>
Date: Mon, 8 Jul 2019 17:30:17 +0530
Subject: [PATCH] Minor fixes
---
Dockerfile | 2 +-
docker-compose.yaml | 2 --
routes/front.js | 13 +++----------
server.js | 16 ++++++++--------
views/todos.ejs | 2 +-
5 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index c81df47..5d4f728 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
FROM node:10-alpine
# Create app directory
-WORKDIR /usr/src/app
+WORKDIR /var/www/todoapp
# Bundle app source
COPY . .
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8a678ea..a72caf4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -13,8 +13,6 @@ services:
environment:
- NODE_ENV=development
- PORT=3000
- command:
- sh -c 'npm i && node server.js'
mongo:
image: mongo
diff --git a/routes/front.js b/routes/front.js
index 9941b98..1971a6f 100644
--- a/routes/front.js
+++ b/routes/front.js
@@ -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 : {})
+ });
});
});
diff --git a/server.js b/server.js
index 2cdbfe4..e067d19 100644
--- a/server.js
+++ b/server.js
@@ -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}`);
diff --git a/views/todos.ejs b/views/todos.ejs
index 0cee400..49eb9aa 100644
--- a/views/todos.ejs
+++ b/views/todos.ejs
@@ -52,7 +52,7 @@
</ul>
<% } else { %>
<div class="text-center"><strong>Please add some task.</strong></div>
- <% }%>
+ <% } %>
</div>
</div>
</div>
--
GitLab