diff --git a/README.md b/README.md
index 5a940e0..cfb7401 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,7 @@ The purpose of this project is to build a web application that enables subscribi
ENV:
JAWSDB_URL='mysql://sq4dlf9mz49avli0:gqy5vzmzyhp0837x@tuy8t6uuvh43khkk.cbetxkdyhwsb.us-east-1.rds.amazonaws.com:3306/rxhzg1550441ftqk'
+
+Run with:
+$ npm start
+
diff --git a/app/controllers/dobrodosli.js b/app/controllers/dobrodosli.js
new file mode 100644
index 0000000..499fa72
--- /dev/null
+++ b/app/controllers/dobrodosli.js
@@ -0,0 +1,7 @@
+const getDobrodosli = (req,res) => {
+ res.render('dobrodosli', { nextStep: '/vrstanekretnine' } );
+}
+
+module.exports = {
+ getDobrodosli
+};
diff --git a/app/controllers/vrsta_nekretnine.js b/app/controllers/vrsta_nekretnine.js
index cb34ae5..924034f 100644
--- a/app/controllers/vrsta_nekretnine.js
+++ b/app/controllers/vrsta_nekretnine.js
@@ -1,5 +1,5 @@
const getVrstaNekretnine = (req,res) => {
- res.render('vrsta_nekretnine');
+ res.render('vrsta_nekretnine', { nextStep: '/' } );
}
module.exports = {
diff --git a/app/views/dobrodosli.ejs b/app/views/dobrodosli.ejs
new file mode 100644
index 0000000..d921a63
--- /dev/null
+++ b/app/views/dobrodosli.ejs
@@ -0,0 +1,3 @@
+
+
+
diff --git a/app/views/layout.ejs b/app/views/layout.ejs
new file mode 100644
index 0000000..c61a0ca
--- /dev/null
+++ b/app/views/layout.ejs
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+ Something in your body:
+
+
+ <%-body%>
+
+
diff --git a/app/views/vrsta_nekretnine.ejs b/app/views/vrsta_nekretnine.ejs
index 4e01020..f7cff55 100644
--- a/app/views/vrsta_nekretnine.ejs
+++ b/app/views/vrsta_nekretnine.ejs
@@ -1 +1,3 @@
-Hamo
+
+ >>>
+
diff --git a/index.js b/index.js
index ac3d953..1c6fa40 100644
--- a/index.js
+++ b/index.js
@@ -1,3 +1,4 @@
+const dobrodosli = require('./app/controllers/dobrodosli').getDobrodosli;
const getVrstaNekretnine = require('./app/controllers/vrsta_nekretnine').getVrstaNekretnine;
let express = require("express");
@@ -8,6 +9,7 @@ const sendNotification = require("./app/lib/sendnotification");
const scrapTheItems = require("./app/lib/scraptheitems");
const sequelize = require("./app/db/db");
const Twocheckout = require("2checkout-node");
+const layout = require('express-layout');
const app = express();
app.use(bodyParser.json());
@@ -17,6 +19,7 @@ const port = process.env.PORT || 5000;
app.set('views', path.join(__dirname, '/app/views'));
app.set('view engine', 'ejs');
+app.use(layout());
app.get("/api/sendnotifications", async function(req, res) {
@@ -101,6 +104,7 @@ app.post("/api/payforalert", function(request, response) {
});
});
-app.get('/', getVrstaNekretnine);
+app.get('/', dobrodosli);
+app.get('/vrstanekretnine', getVrstaNekretnine);
app.listen(port, () => console.log(`Example app listening on port ${port}!`));
diff --git a/package-lock.json b/package-lock.json
index 61bfc89..61874ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -473,6 +473,19 @@
"vary": "~1.1.2"
}
},
+ "express-ejs-layouts": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/express-ejs-layouts/-/express-ejs-layouts-2.5.0.tgz",
+ "integrity": "sha512-27Kza3FR8UqvQsq1ewaxC2IwpgrQttYDEFN5s8D74Fv1VPdzsXFWsiKhPMlNauG+DrgMAmh7FhQl5hKHffd+wQ=="
+ },
+ "express-layout": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/express-layout/-/express-layout-0.1.0.tgz",
+ "integrity": "sha1-gydvJEO27QEQGyl03N0addWlmAY=",
+ "requires": {
+ "obj-extend": "~0.1.0"
+ }
+ },
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -821,6 +834,11 @@
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
},
+ "obj-extend": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/obj-extend/-/obj-extend-0.1.0.tgz",
+ "integrity": "sha1-u0SKR3X7les0p4H5CLusLfI9u1s="
+ },
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
diff --git a/package.json b/package.json
index 0dc5d34..411e433 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,8 @@
"cheerio": "^1.0.0-rc.2",
"ejs": "^2.6.1",
"express": "^4.16.4",
+ "express-ejs-layouts": "^2.5.0",
+ "express-layout": "^0.1.0",
"mysql2": "^1.6.4",
"node-fetch": "^2.3.0",
"react-step-wizard": "^5.1.0",