Renaming to english

Dockerize database

See merge request saburly/marketalarm/web!2

Dockerfile

@@ -0,0 +1,48 @@
+#
+# example Dockerfile for https://docs.docker.com/engine/examples/postgresql_service/
+#
+
+FROM ubuntu:16.04
+
+# Add the PostgreSQL PGP key to verify their Debian packages.
+# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
+
+# Add PostgreSQL's repository. It contains the most recent stable release
+#     of PostgreSQL, ``9.3``.
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+
+# Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3
+#  There are some warnings (in red) that show up during the build. You can hide
+#  them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y python-software-properties software-properties-common postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
+
+# Note: The official Debian and Ubuntu images automatically ``apt-get clean``
+# after each ``apt-get``
+
+# Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed``
+USER postgres
+
+# Create a PostgreSQL role named ``docker`` with ``docker`` as the password and
+# then create a database `docker` owned by the ``docker`` role.
+# Note: here we use ``&&\`` to run commands one after the other - the ``\``
+#       allows the RUN command to span multiple lines.
+RUN    /etc/init.d/postgresql start &&\
+    psql --command "CREATE USER docker WITH SUPERUSER PASSWORD 'docker';" &&\
+    createdb -O docker marketalerts
+
+# Adjust PostgreSQL configuration so that remote connections to the
+# database are possible.
+RUN echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/9.3/main/pg_hba.conf
+
+# And add ``listen_addresses`` to ``/etc/postgresql/9.3/main/postgresql.conf``
+RUN echo "listen_addresses='*'" >> /etc/postgresql/9.3/main/postgresql.conf
+
+# Expose the PostgreSQL port
+EXPOSE 5432
+
+# Add VOLUMEs to allow backup of config, logs and databases
+VOLUME  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
+
+# Set the default command to run when starting the container
+CMD ["/usr/lib/postgresql/9.3/bin/postgres", "-D", "/var/lib/postgresql/9.3/main", "-c", "config_file=/etc/postgresql/9.3/main/postgresql.conf"]

README.md

@@ -3,10 +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 .
 
-ENV: 
-JAWSDB_URL='mysql://sq4dlf9mz49avli0:gqy5vzmzyhp0837x@tuy8t6uuvh43khkk.cbetxkdyhwsb.us-east-1.rds.amazonaws.com:3306/rxhzg1550441ftqk'
+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 
-

app/config/config.json

@@ -1,6 +1,10 @@
 {
   "development": {
-    "use_env_variable": "JAWSDB_URL"
+    "username": "docker",
+    "password": "docker",
+    "database": "marketalerts",
+    "port": "5432",
+    "dialect": "postgres"
   },
   "test": {
     "use_env_variable": "JAWSDB_URL"

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
 };

app/controllers/dobrodosli.js

@@ -1,7 +0,0 @@
-const getDobrodosli = (req,res) => {
-  res.render('dobrodosli', { nextStep: '/vrstanekretnine' } );
-}
-
-module.exports = { 
-  getDobrodosli
-};

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
 };

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
 };

app/controllers/welcome.js

@@ -0,0 +1,7 @@
+const getWelcome = (req,res) => {
+  res.render('welcome', { nextStep: '/vrstanekretnine' } );
+}
+
+module.exports = { 
+  getWelcome
+};

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;
 }
 

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;

app/views/city.ejs

@@ -0,0 +1,31 @@
+<div class="row center-align">
+  <h2>U kojoj regiji tražite nekretninu?</h2>
+</div>
+
+<form method="POST" id="form-city">
+<div class="row center-align">
+  <ul class="collection with-header">
+    <% for(const city of cities) { %> 
+    <li class="collection-item" > 
+      <div id="<%= city.id %>" ><%= city.ime %>
+        <a href="#!" class="secondary-content">
+          <i class="material-icons">send</i>
+        </a>
+      </div>
+    </li>
+    <% } %>
+  </ul>
+  <input type="hidden" name="city" id="city" />
+</div>
+</form>
+
+<script>
+ $(document).ready( () => {
+   $(".collection-item").click( (e) => {
+     const clickedId = $(e.target).attr("id"); 
+     $("#city").val(clickedId);
+     $("#form-city").submit();  
+   });
+ });
+</script>
+

app/views/grad.ejs

@@ -1,25 +0,0 @@
-<div class="row center-align">
-  <h2>U kojoj regiji tražite nekretninu?</h2>
-</div>
-
-<form method="POST" id="form-grad">
-<div class="row center-align">
-  <ul class="collection with-header">
-    <% for(const grad of gradovi) { %> 
-    <li class="collection-item" > <div id="<%= grad.id %>" ><%= grad.ime %><a href="#!" class="secondary-content"><i class="material-icons">send</i></a></div></li>
-    <% } %>
-  </ul>
-  <input type="hidden" name="grad" id="grad" />
-</div>
-</form>
-
-<script>
- $(document).ready( () => {
-   $(".collection-item").click( (e) => {
-     const clickedId = $(e.target).attr("id"); 
-     $("#grad").val(clickedId);
-     $("#form-grad").submit();  
-   });
- });
-</script>
-

app/views/mjesto.ejs

@@ -1,25 +0,0 @@
-<div class="row center-align">
-  <h2>U kojem mjestu tražite nekretninu?</h2>
-</div>
-
-<form method="POST" id="form-mjesto">
-<div class="row center-align">
-  <ul class="collection with-header">
-    <% for(const mjesto of mjesta) { %> 
-    <li class="collection-item" > <div id="<%= mjesto.id %>" ><%= mjesto.ime %><a href="#!" class="secondary-content"><i class="material-icons">send</i></a></div></li>
-    <% } %>
-  </ul>
-  <input type="hidden" name="mjesto" id="mjesto" />
-</div>
-</form>
-
-<script>
- $(document).ready( () => {
-   $(".collection-item").click( (e) => {
-     const clickedId = $(e.target).attr("id"); 
-     $("#mjesto").val(clickedId);
-     $("#form-mjesto").submit();  
-   });
- });
-</script>
-

app/views/neighborhood.ejs

@@ -0,0 +1,31 @@
+<div class="row center-align">
+  <h2>U kojem mjestu tražite nekretninu?</h2>
+</div>
+
+<form method="POST" id="form-neighborhood">
+<div class="row center-align">
+  <ul class="collection with-header">
+    <% for(const neighborhood of neighborhoods) { %> 
+    <li class="collection-item" > 
+      <div id="<%= neighborhood.id %>" ><%= neighborhood.ime %>
+        <a href="#!" class="secondary-content">
+          <i class="material-icons">send</i>
+        </a>
+      </div>
+    </li>
+    <% } %>
+  </ul>
+  <input type="hidden" name="neighborhood" id="neighborhoods" />
+</div>
+</form>
+
+<script>
+ $(document).ready( () => {
+   $(".collection-item").click( (e) => {
+     const clickedId = $(e.target).attr("id"); 
+     $("#neighborhood").val(clickedId);
+     $("#form-neighborhood").submit();  
+   });
+ });
+</script>
+

app/views/real_estate_type.ejs

@@ -0,0 +1,35 @@
+<div class="row center-align">
+  <h2>Koju nekretninu tražite?</h2>
+</div>
+
+<form method="POST" id="form-real-estate-type">
+<div class="row center-align">
+  <ul class="collection with-header">
+    <% for(const realEstatetype of realEstateTypes) { %> 
+    <li class="collection-item" > 
+      <div id="<%= realEstatetype.id %>" ><%= realEstatetype.ime %>
+        <a href="#!" class="secondary-content">
+          <i class="material-icons">send</i>
+        </a>
+      </div>
+    </li>
+    <% } %>
+  </ul>
+  <input type="hidden" name="realestatetype" id="realestatetype" />
+</div>
+</form>
+
+<script>
+ $(document).ready( () => {
+   $(".collection-item").click( (e) => {
+     const clickedId = $(e.target).attr("id"); 
+     $("#realestatetype").val(clickedId);
+     $("#form-real-estate-type").submit();  
+   });
+ });
+</script>
+
+
+
+
+

app/views/vrsta_nekretnine.ejs

@@ -1,29 +0,0 @@
-<div class="row center-align">
-  <h2>Koju nekretninu tražite?</h2>
-</div>
-
-<form method="POST" id="form-vrsta">
-<div class="row center-align">
-  <ul class="collection with-header">
-    <% for(let vrsta of vrste) { %> 
-    <li class="collection-item" > <div id="<%= vrsta.id %>" ><%= vrsta.ime %><a href="#!" class="secondary-content"><i class="material-icons">send</i></a></div></li>
-    <% } %>
-  </ul>
-  <input type="hidden" name="vrsta" id="vrsta" />
-</div>
-</form>
-
-<script>
- $(document).ready( () => {
-   $(".collection-item").click( (e) => {
-     const clickedId = $(e.target).attr("id"); 
-     $("#vrsta").val(clickedId);
-     $("#form-vrsta").submit();  
-   });
- });
-</script>
-
-
-
-
-

app/views/welcome.ejs

@@ -1,7 +1,7 @@
 
 <!--   -->
 <div class="row center-align">
-    <span class="dobrodosli-big-logo">🤙</span>
+    <span class="welcome-big-logo">🤙</span>
 </div>
 <div class="row center-align">
   <div>Sve nekretnine dostupne u oglasima.</div>
@@ -10,7 +10,7 @@
 </div>
 <div class="row">
 <div class="col s6 push-s3">
-<a href="<%= nextStep %>" class="dobrodosli-center-button waves-effect waves-light btn">
+<a href="<%= nextStep %>" class="welcome-center-button waves-effect waves-light btn">
   Javi mi
 </a>
 </div>

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'))

package-lock.json

@@ -239,6 +239,11 @@
         "isarray": "^1.0.0"
       }
     },
+    "buffer-writer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
+      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="
+    },
     "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -473,11 +478,6 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
-    "denque": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.0.tgz",
-      "integrity": "sha512-gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ=="
-    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -519,6 +519,11 @@
         "domelementtype": "1"
       }
     },
+    "dotenv": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
+      "integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g=="
+    },
     "dottie": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.1.tgz",
@@ -787,14 +792,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "generate-function": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
-      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
-      "requires": {
-        "is-property": "^1.0.2"
-      }
-    },
     "generic-pool": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.5.0.tgz",
@@ -954,11 +951,6 @@
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
     },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
-    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -1062,11 +1054,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
       "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
     },
-    "long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
-    },
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -1182,9 +1169,9 @@
       "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
     },
     "moment-timezone": {
-      "version": "0.5.23",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz",
-      "integrity": "sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==",
+      "version": "0.5.25",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.25.tgz",
+      "integrity": "sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw==",
       "requires": {
         "moment": ">= 2.9.0"
       }
@@ -1194,39 +1181,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "mysql2": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-1.6.5.tgz",
-      "integrity": "sha512-zedaOOyb3msuuZcJJnxIX/EGOpmljDG7B+UevRH5lqcv+yhy9eCwkArBz8/AO+/rlY3/oCsOdG8R5oD6k0hNfg==",
-      "requires": {
-        "denque": "^1.4.0",
-        "generate-function": "^2.3.1",
-        "iconv-lite": "^0.4.24",
-        "long": "^4.0.0",
-        "lru-cache": "^4.1.3",
-        "named-placeholders": "^1.1.2",
-        "seq-queue": "^0.0.5",
-        "sqlstring": "^2.3.1"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
-      }
-    },
-    "named-placeholders": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz",
-      "integrity": "sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==",
-      "requires": {
-        "lru-cache": "^4.1.3"
-      }
-    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -1373,6 +1327,11 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
+    "packet-reader": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
+      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
+    },
     "parse5": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
@@ -1416,6 +1375,85 @@
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
+    "pg": {
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-7.10.0.tgz",
+      "integrity": "sha512-aE6FZomsyn3OeGv1oM50v7Xu5zR75c15LXdOCwA9GGrfjXsQjzwYpbcTS6OwEMhYfZQS6m/FVU/ilPLiPzJDCw==",
+      "requires": {
+        "buffer-writer": "2.0.0",
+        "packet-reader": "1.0.0",
+        "pg-connection-string": "0.1.3",
+        "pg-pool": "^2.0.4",
+        "pg-types": "~2.0.0",
+        "pgpass": "1.x",
+        "semver": "4.3.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
+          "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c="
+        }
+      }
+    },
+    "pg-connection-string": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
+      "integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc="
+    },
+    "pg-int8": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
+    },
+    "pg-pool": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.6.tgz",
+      "integrity": "sha512-hod2zYQxM8Gt482q+qONGTYcg/qVcV32VHVPtktbBJs0us3Dj7xibISw0BAAXVMCzt8A/jhfJvpZaxUlqtqs0g=="
+    },
+    "pg-types": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.0.1.tgz",
+      "integrity": "sha512-b7y6QM1VF5nOeX9ukMQ0h8a9z89mojrBHXfJeSug4mhL0YpxNBm83ot2TROyoAmX/ZOX3UbwVO4EbH7i1ZZNiw==",
+      "requires": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      }
+    },
+    "pgpass": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz",
+      "integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
+      "requires": {
+        "split": "^1.0.0"
+      }
+    },
+    "postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="
+    },
+    "postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU="
+    },
+    "postgres-date": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz",
+      "integrity": "sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA=="
+    },
+    "postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "requires": {
+        "xtend": "^4.0.0"
+      }
+    },
     "proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -1594,15 +1632,10 @@
         "statuses": "~1.4.0"
       }
     },
-    "seq-queue": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
-      "integrity": "sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4="
-    },
     "sequelize": {
-      "version": "4.43.0",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.43.0.tgz",
-      "integrity": "sha512-GkwGFVREKBf/ql6W6RXwXy1fzb/HOk0lmOBbcQrJMvJtB65Jfg7CUh+sENh0deuWk5s79JedgZJ/yEjvtzHXaQ==",
+      "version": "4.43.2",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.43.2.tgz",
+      "integrity": "sha512-EA3V1AsxVjf2EtGbdEoa9Fe5rSAqy5g4OsX0VwtU6iMezTjIYTCXV8o6mG7i6u3lu4Zc7JWZ6XwhS0k79pT/EQ==",
       "requires": {
         "bluebird": "^3.5.0",
         "cls-bluebird": "^2.1.0",
@@ -1702,10 +1735,13 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
-    "sqlstring": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
-      "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A="
+    "split": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "requires": {
+        "through": "2"
+      }
     },
     "sshpk": {
       "version": "1.16.1",
@@ -1790,6 +1826,11 @@
         "terraformer": "~1.0.5"
       }
     },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
     "timers-ext": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
@@ -1997,6 +2038,11 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
     },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+    },
     "y18n": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",

package.json

@@ -22,14 +22,15 @@
     "aws-sdk": "^2.422.0",
     "cheerio": "^1.0.0-rc.2",
     "compression": "^1.7.4",
+    "dotenv": "^7.0.0",
     "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",
+    "pg": "^7.10.0",
     "react-step-wizard": "^5.1.0",
-    "sequelize": "^4.42.0",
+    "sequelize": "^4.43.2",
     "sequelize-cli": "^5.4.0"
   }
 }