From 27fa72162788dd8d120cfa305411478899b6c160 Mon Sep 17 00:00:00 2001 From: Nedim Uka Date: Wed, 15 May 2019 15:27:10 +0200 Subject: [PATCH] Renaming to english --- README.md | 9 ++++- app/controllers/{grad.js => city.js} | 16 ++++----- app/controllers/dobrodosli.js | 7 ---- .../{mjesto.js => neighborhoods.js} | 17 +++++---- ...sta_nekretnine.js => real_estate_types.js} | 17 +++++---- app/controllers/welcome.js | 7 ++++ app/helpers/url.js | 1 - app/public/main.css | 4 +-- app/views/city.ejs | 31 ++++++++++++++++ app/views/grad.ejs | 25 ------------- app/views/mjesto.ejs | 25 ------------- app/views/neighborhood.ejs | 31 ++++++++++++++++ app/views/real_estate_type.ejs | 35 +++++++++++++++++++ app/views/vrsta_nekretnine.ejs | 29 --------------- app/views/{dobrodosli.ejs => welcome.ejs} | 4 +-- index.js | 26 +++++++------- 16 files changed, 153 insertions(+), 131 deletions(-) rename app/controllers/{grad.js => city.js} (68%) delete mode 100644 app/controllers/dobrodosli.js rename app/controllers/{mjesto.js => neighborhoods.js} (59%) rename app/controllers/{vrsta_nekretnine.js => real_estate_types.js} (62%) create mode 100644 app/controllers/welcome.js create mode 100644 app/views/city.ejs delete mode 100644 app/views/grad.ejs delete mode 100644 app/views/mjesto.ejs create mode 100644 app/views/neighborhood.ejs create mode 100644 app/views/real_estate_type.ejs delete mode 100644 app/views/vrsta_nekretnine.ejs rename app/views/{dobrodosli.ejs => welcome.ejs} (65%) diff --git a/README.md b/README.md index b35ce40..0c19539 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,15 @@ The purpose of this project is to build a web application that enables subscribing to notifications when new products are published on various ad based marketplaces. The MVP will be only based on OLX.ba +Create postgres docker image +docker build -t marketalerts . + Run postgres image with: docker run --name pg_test -d -p 5432:5432 marketalerts -Run with: +Run migrations in app folder +npx sequelize db:migrate + +Run app with: +$ npm install $ npm start diff --git a/app/controllers/grad.js b/app/controllers/city.js similarity index 68% rename from app/controllers/grad.js rename to app/controllers/city.js index b3f6294..0be41f4 100644 --- a/app/controllers/grad.js +++ b/app/controllers/city.js @@ -2,26 +2,26 @@ const db = require('../models/index'); const { currentRERequest } = require('../helpers/url'); const { regions } = require('../helpers/codes'); -const gradovi = regions(); +const cities = regions(); -const getGrad = (req,res) => { +const getCity = (req,res) => { const nextStep = req.query.nextStep || '/'; - res.render('grad', { + res.render('city', { nextStep, - gradovi + cities }); } -const postGrad = async (req, res) => { +const postCity = async (req, res) => { const request = await currentRERequest(req); const nextStep = req.query.nextStep || `/mjesto/${request.uniqueId}`; - request.city = req.body.grad; + request.city = req.body.city; await request.save(); res.redirect(nextStep) } module.exports = { - getGrad, - postGrad + getCity, + postCity }; diff --git a/app/controllers/dobrodosli.js b/app/controllers/dobrodosli.js deleted file mode 100644 index 499fa72..0000000 --- a/app/controllers/dobrodosli.js +++ /dev/null @@ -1,7 +0,0 @@ -const getDobrodosli = (req,res) => { - res.render('dobrodosli', { nextStep: '/vrstanekretnine' } ); -} - -module.exports = { - getDobrodosli -}; diff --git a/app/controllers/mjesto.js b/app/controllers/neighborhoods.js similarity index 59% rename from app/controllers/mjesto.js rename to app/controllers/neighborhoods.js index e281fb4..031a120 100644 --- a/app/controllers/mjesto.js +++ b/app/controllers/neighborhoods.js @@ -2,25 +2,24 @@ const db = require('../models/index'); const { currentRERequest } = require('../helpers/url'); const { places } = require('../helpers/codes'); -const getMjesto = async (req,res) => { +const getNeighborhood = async (req,res) => { let request = await currentRERequest(req); - const mjesta = places(request.city); + const neighborhoods = places(request.city); const nextStep = req.query.nextStep || '/'; - res.render('mjesto', { + res.render('neighborhood', { nextStep, - mjesta + neighborhoods }); } -const postMjesto = async (req, res) => { +const postgNeighborhood = async (req, res) => { let request = await currentRERequest(req); - request.place = req.body.mjesto; - console.log("AAA ", req.body); + request.neighborhood = req.body.neighborhood; await request.save(); res.send("Result is " + JSON.stringify(request)); } module.exports = { - getMjesto, - postMjesto + getNeighborhood, + postgNeighborhood }; diff --git a/app/controllers/vrsta_nekretnine.js b/app/controllers/real_estate_types.js similarity index 62% rename from app/controllers/vrsta_nekretnine.js rename to app/controllers/real_estate_types.js index 1bc6ab8..40f5d6e 100644 --- a/app/controllers/vrsta_nekretnine.js +++ b/app/controllers/real_estate_types.js @@ -1,25 +1,24 @@ const db = require('../models/index'); -const vrsteNekretnina = [ +const realEstateTypes = [ { ime: "Kuća", id: "kuca" }, { ime: "Stan", id: "stan" }, { ime: "Vikendica", id: "vikendica" } ]; -const getVrstaNekretnine = (req,res) => { +const getRealEstateTypes = (req,res) => { const nextStep = req.query.nextStep; - res.render('vrsta_nekretnine', { + res.render('real_estate_type', { nextStep, - vrste: vrsteNekretnina + realEstateTypes: realEstateTypes }); } -const postVrstaNekretnine = (req, res) => { +const postRealEstateTypes = (req, res) => { let nextStep = req.query.nextStep; - db.RealEstateRequest.create({ - realEstateType: req.body.vrsta + realEstateType: req.body.realestatetype }).then( (result) => { nextStep = nextStep || `/grad/${result.uniqueId}`; res.redirect(nextStep); @@ -30,6 +29,6 @@ const postVrstaNekretnine = (req, res) => { } module.exports = { - getVrstaNekretnine, - postVrstaNekretnine + getRealEstateTypes, + postRealEstateTypes }; diff --git a/app/controllers/welcome.js b/app/controllers/welcome.js new file mode 100644 index 0000000..0c638ad --- /dev/null +++ b/app/controllers/welcome.js @@ -0,0 +1,7 @@ +const getWelcome = (req,res) => { + res.render('welcome', { nextStep: '/vrstanekretnine' } ); +} + +module.exports = { + getWelcome +}; diff --git a/app/helpers/url.js b/app/helpers/url.js index 7cde84a..9c685dd 100644 --- a/app/helpers/url.js +++ b/app/helpers/url.js @@ -5,7 +5,6 @@ const currentRERequest = async (req) => { if(!uniqueId) return null; const request = await db.RealEstateRequest.findOne({ where: {uniqueId} }); - console.log("Request ", request); return request; } diff --git a/app/public/main.css b/app/public/main.css index 2278871..5653fe5 100644 --- a/app/public/main.css +++ b/app/public/main.css @@ -1,8 +1,8 @@ -.dobrodosli-center-button { +.welcome-center-button { width: 100%; } -.dobrodosli-big-logo { +.welcome-big-logo { font-size: 200pt; background-image: url(./images/logo.png); background-size: contain; diff --git a/app/views/city.ejs b/app/views/city.ejs new file mode 100644 index 0000000..65fe696 --- /dev/null +++ b/app/views/city.ejs @@ -0,0 +1,31 @@ +
+

U kojoj regiji tražite nekretninu?

+
+ +
+
+
    + <% for(const city of cities) { %> +
  • +
    <%= city.ime %> + + send + +
    +
    • + <% } %> +
+ +
+
+ + + diff --git a/app/views/grad.ejs b/app/views/grad.ejs deleted file mode 100644 index ee28d77..0000000 --- a/app/views/grad.ejs +++ /dev/null @@ -1,25 +0,0 @@ -
-

U kojoj regiji tražite nekretninu?

-
- -
-
-
    - <% for(const grad of gradovi) { %> -
  • <%= grad.ime %>send
    • - <% } %> -
- -
-
- - - diff --git a/app/views/mjesto.ejs b/app/views/mjesto.ejs deleted file mode 100644 index d07e29d..0000000 --- a/app/views/mjesto.ejs +++ /dev/null @@ -1,25 +0,0 @@ -
-

U kojem mjestu tražite nekretninu?

-
- -
-
-
    - <% for(const mjesto of mjesta) { %> -
  • <%= mjesto.ime %>send
    • - <% } %> -
- -
-
- - - diff --git a/app/views/neighborhood.ejs b/app/views/neighborhood.ejs new file mode 100644 index 0000000..a62de1d --- /dev/null +++ b/app/views/neighborhood.ejs @@ -0,0 +1,31 @@ +
+

U kojem mjestu tražite nekretninu?

+
+ +
+
+
    + <% for(const neighborhood of neighborhoods) { %> +
  • +
    <%= neighborhood.ime %> + + send + +
    +
    • + <% } %> +
+ +
+
+ + + diff --git a/app/views/real_estate_type.ejs b/app/views/real_estate_type.ejs new file mode 100644 index 0000000..1c93803 --- /dev/null +++ b/app/views/real_estate_type.ejs @@ -0,0 +1,35 @@ +
+

Koju nekretninu tražite?

+
+ +
+
+
    + <% for(const realEstatetype of realEstateTypes) { %> +
  • +
    <%= realEstatetype.ime %> + + send + +
    +
    • + <% } %> +
+ +
+
+ + + + + + + diff --git a/app/views/vrsta_nekretnine.ejs b/app/views/vrsta_nekretnine.ejs deleted file mode 100644 index 79bd1c1..0000000 --- a/app/views/vrsta_nekretnine.ejs +++ /dev/null @@ -1,29 +0,0 @@ -
-

Koju nekretninu tražite?

-
- -
-
-
    - <% for(let vrsta of vrste) { %> -
  • <%= vrsta.ime %>send
    • - <% } %> -
- -
-
- - - - - - - diff --git a/app/views/dobrodosli.ejs b/app/views/welcome.ejs similarity index 65% rename from app/views/dobrodosli.ejs rename to app/views/welcome.ejs index 72b7118..e3e09ee 100644 --- a/app/views/dobrodosli.ejs +++ b/app/views/welcome.ejs @@ -1,7 +1,7 @@
- +
Sve nekretnine dostupne u oglasima.
@@ -10,7 +10,7 @@
- + Javi mi
diff --git a/index.js b/index.js index 55eeb3c..53e352c 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,7 @@ -const dobrodosli = require('./app/controllers/dobrodosli').getDobrodosli; -const { getVrstaNekretnine, postVrstaNekretnine} = require('./app/controllers/vrsta_nekretnine'); -const { getGrad, postGrad } = require('./app/controllers/grad'); -const { getMjesto, postMjesto } = require('./app/controllers/mjesto'); +const welcome = require('./app/controllers/welcome').getWelcome; +const { getRealEstateTypes, postRealEstateTypes} = require('./app/controllers/real_estate_types'); +const { getCity, postCity } = require('./app/controllers/city'); +const { getNeighborhood, postgNeighborhood } = require('./app/controllers/neighborhoods'); let express = require("express"); const path = require("path"); @@ -108,18 +108,18 @@ app.post("/api/payforalert", function(request, response) { }); }); -app.get('/', dobrodosli); -app.get('/vrstanekretnine/:request_id', getVrstaNekretnine); -app.get('/vrstanekretnine', getVrstaNekretnine); +app.get('/', welcome); +app.get('/vrstanekretnine/:request_id', getRealEstateTypes); +app.get('/vrstanekretnine', getRealEstateTypes); -app.post('/vrstanekretnine/:request_id', postVrstaNekretnine); -app.post('/vrstanekretnine', postVrstaNekretnine); +app.post('/vrstanekretnine/:request_id', postRealEstateTypes); +app.post('/vrstanekretnine', postRealEstateTypes); -app.get('/grad/:request_id', getGrad); -app.post('/grad/:request_id', postGrad); +app.get('/grad/:request_id', getCity); +app.post('/grad/:request_id', postCity); -app.get('/mjesto/:request_id', getMjesto); -app.post('/mjesto/:request_id', postMjesto); +app.get('/mjesto/:request_id', getNeighborhood); +app.post('/mjesto/:request_id', postgNeighborhood); app.use('/assets', express.static('./app/public'))