Added migrations

Sendnotification moved to the lambda / has bugs
Serverless handler stub created
2019-03-10 05:23:52 +01:00 · 2019-03-08 06:24:10 +01:00 · 2019-03-07 06:24:08 +01:00
98 changed files with 23426 additions and 1443 deletions
--- a/1
+++ b/1
@@ -1 +0,0 @@
-web: node ./index.js
--- a/README.md
+++ b/README.md
@@ -1,12 +1,4 @@
 # web


-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
-
-
-ENV: 
-JAWSDB_URL='mysql://sq4dlf9mz49avli0:gqy5vzmzyhp0837x@tuy8t6uuvh43khkk.cbetxkdyhwsb.us-east-1.rds.amazonaws.com:3306/rxhzg1550441ftqk'
-
-Run with: 
-$ npm start 
-
+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
--- a/app/controllers/dobrodosli.js
+++ b/app/controllers/dobrodosli.js
@@ -1,7 +0,0 @@
-const getDobrodosli = (req,res) => {
-  res.render('dobrodosli', { nextStep: '/vrstanekretnine' } );
-}
-
-module.exports = { 
-  getDobrodosli
-};
--- a/app/controllers/vrsta_nekretnine.js
+++ b/app/controllers/vrsta_nekretnine.js
@@ -1,7 +0,0 @@
-const getVrstaNekretnine = (req,res) => {
-  res.render('vrsta_nekretnine', { nextStep: '/' } );
-}
-
-module.exports = { 
-  getVrstaNekretnine
-};
--- a/app/db/db.js
+++ b/app/db/db.js
@@ -1,4 +0,0 @@
-const Sequelize = require("sequelize");
-const sequelize = new Sequelize(process.env.JAWSDB_URL);
-
-module.exports = sequelize;
--- a/app/lib/sendnotification.js
+++ b/app/lib/sendnotification.js
@@ -1,58 +0,0 @@
-const scrapTheItems = require("./scraptheitems");
-const convertToDate = require("./convertToDate");
-const AWS = require('aws-sdk');
-AWS.config.update({region: 'eu-central-1'});
-
-
-async function sendNotification(marketAlert) {
-  const { id, email, olx_url, last_date } = marketAlert;
-  let url =
-    "https://www.olx.ba/pretraga?" + olx_url + "&sort_order=desc&sort_po=datum";
-  let newItems = await scrapTheItems(url);
-  let lastDate = newItems.length && newItems[0].date;
-  let message =
-    newItems.length &&
-    newItems.reduce(
-      (mes, item) => mes + `<strong>${item.url} i  ${item.price}</strong>`,
-      ""
-    );
-
-  // Create sendEmail params 
-  var params = {
-    Destination: { /* required */
-      CcAddresses: [
-      ],
-      ToAddresses: [
-        email
-      ]
-    },
-    Message: { /* required */
-      Body: { /* required */
-        Html: {
-         Charset: "UTF-8",
-         Data: message
-        },
-        Text: {
-         Charset: "UTF-8",
-         Data: message // TODO: convert to text
-        }
-       },
-     Subject: {
-      Charset: 'UTF-8',
-      Data: 'Javimi alert'
-     }
-    },
-    Source: 'info@saburly.com', /* required */
-    ReplyToAddresses: [
-       'info@saburly.com',
-    ],
-  };
-
-  if (message) {
-    const sendPromise = new AWS.SES({apiVersion: '2010-12-01'}).sendEmail(params).promise();
-    await sendPromise; 
-    return { id, date: String(convertToDate(lastDate)) };
-  }
-}
-
-module.exports = sendNotification;
--- a/app/views/dobrodosli.ejs
+++ b/app/views/dobrodosli.ejs
@@ -1,3 +0,0 @@
-
-<a href="<%= nextStep %>"><button>Kreni</button></a>
-
--- a/app/views/layout.ejs
+++ b/app/views/layout.ejs
@@ -1,14 +0,0 @@
-<!doctype> 
-<html>
-  <head>
-  <link rel="stylesheet" href="http://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.css" />
-<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
-<script src="http://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.js"></script>
-  </head>
-  <body>
-    Something in your body: 
-
-
-    <%-body%>
-  </body>
-</html>
--- a/app/views/vrsta_nekretnine.ejs
+++ b/app/views/vrsta_nekretnine.ejs
@@ -1,3 +0,0 @@
-
-    <a href="<%= nextStep %>"> >>> </a>
-
--- a/backend/.env
+++ b/backend/.env
@@ -0,0 +1,19 @@
+AWS_ENVIRONMENT=development
+AWS_ACCESS_KEY_ID=your_key
+AWS_SECRET_ACCESS_KEY=your_secret
+AWS_PROFILE=
+AWS_SESSION_TOKEN=
+AWS_ROLE_ARN=your_amazon_role
+AWS_REGION=us-east-1
+AWS_FUNCTION_NAME=
+AWS_HANDLER=index.handler
+AWS_MEMORY_SIZE=128
+AWS_TIMEOUT=3
+AWS_DESCRIPTION=
+AWS_RUNTIME=nodejs6.10
+AWS_VPC_SUBNETS=
+AWS_VPC_SECURITY_GROUPS=
+AWS_TRACING_CONFIG=
+AWS_LOGS_RETENTION_IN_DAYS=
+EXCLUDE_GLOBS="event.json"
+PACKAGE_DIRECTORY=build
--- a/backend/.gitignore
+++ b/backend/.gitignore
--- a/app/models/MarketAlert.js
+++ b/app/models/MarketAlert.js
@@ -1,5 +1,5 @@
 const Sequelize = require("sequelize");
-const sequelize = require("../db/db");
+const sequelize = require("./db.js");
 const MarketAlert = sequelize.define("market_alert", {
  id: {
    type: Sequelize.INTEGER,
--- a/backend/README.md
+++ b/backend/README.md
@@ -0,0 +1,4 @@
+# How to deploy automatically: 
+
+1. set up aws cli with aws configure 
+
--- a/backend/db.js
+++ b/backend/db.js
@@ -0,0 +1,8 @@
+const Sequelize = require("sequelize");
+const sequelize = new Sequelize("sql7276322", "sql7276322", "RS53ihYlg9", {
+  host: "sql7.freemysqlhosting.net",
+  dialect: "mysql",
+  operatorsAliases: false
+});
+
+module.exports = sequelize;
--- a/backend/index.js
+++ b/backend/index.js
@@ -1,15 +1,11 @@
-const dobrodosli = require('./app/controllers/dobrodosli').getDobrodosli;
-const getVrstaNekretnine = require('./app/controllers/vrsta_nekretnine').getVrstaNekretnine;
-
 let express = require("express");
 const path = require("path");
 const bodyParser = require("body-parser");
-const MarketAlert = require("./app/models/MarketAlert");
-const sendNotification = require("./app/lib/sendnotification");
-const scrapTheItems = require("./app/lib/scraptheitems");
-const sequelize = require("./app/db/db");
+const MarketAlert = require("./MarketAlert");
+const sendNotification = require("./utils/sendnotification");
+const scrapTheItems = require("./utils/scraptheitems");
+const sequelize = require("./db.js");
 const Twocheckout = require("2checkout-node");
-const layout = require('express-layout');

 const app = express();
 app.use(bodyParser.json());
@@ -17,12 +13,7 @@ app.use(bodyParser.urlencoded({ extended: true }));

 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) {
+app.get("/sendnotifications", async function(req, res) {
  let marketAlerts = await MarketAlert.findAll();

  let lastDateUpdate = await Promise.all(
@@ -43,7 +34,7 @@ app.get("/api/sendnotifications", async function(req, res) {
    );
 });

-app.get("/api/items/:url", async (req, res) => {
+app.get("/items/:url", async (req, res) => {
  let url =
    "https://www.olx.ba/pretraga?" +
    req.params.url +
@@ -55,23 +46,21 @@ app.get("/api/items/:url", async (req, res) => {
  });
 });

-app.post("/api/marketalerts", function(req, res) {
+app.post("/marketalerts", function(req, res) {
  const { email, last_date, olx_url } = req.body;
  console.log(email, last_date, olx_url);
-  sequelize.sync().then(() => {
-    MarketAlert.create({
-      olx_url,
-      last_date,
-      email
-    })
-      .then(() => {
-        res.json({ message: "Market Alert Created!" });
-      })
-      .catch(e => console.error(e));
-  });
+  res.json({ message: "Market Alert Created!" });
+  // sequelize.sync().then(() =>
+  //   MarketAlert.create({
+  //     olx_url,
+  //     last_date,
+  //     email
+  //   })
+  // );
+  // res.json({ message: "Market Alert Created!" });
 });

-app.post("/api/payforalert", function(request, response) {
+app.post("/payforalert", function(request, response) {
  let tco = new Twocheckout({
    sellerId: "901402692",
    privateKey: "A28DCE5F-9292-405C-8161-F84D8BB83AFC",
@@ -104,7 +93,4 @@ app.post("/api/payforalert", function(request, response) {
  });
 });

-app.get('/', dobrodosli); 
-app.get('/vrstanekretnine', getVrstaNekretnine); 
-
 app.listen(port, () => console.log(`Example app listening on port ${port}!`));
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/package.json
+++ b/backend/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "backend",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Ehvan Gradanin",
+  "license": "ISC",
+  "dependencies": {
+    "2checkout-node": "0.0.1",
+    "@sendgrid/mail": "^6.3.1",
+    "cheerio": "^1.0.0-rc.2",
+    "express": "^4.16.4",
+    "mysql2": "^1.6.4",
+    "node-fetch": "^2.3.0",
+    "sequelize": "^4.42.0"
+  }
+}
--- a/backend/utils/arethereanynewitems.js
+++ b/backend/utils/arethereanynewitems.js
--- a/backend/utils/convertToDate.js
+++ b/backend/utils/convertToDate.js
--- a/backend/utils/scraptheitems.js
+++ b/backend/utils/scraptheitems.js
--- a/backend/utils/sendnotification.js
+++ b/backend/utils/sendnotification.js
@@ -0,0 +1,33 @@
+const scrapTheItems = require("./scraptheitems");
+const convertToDate = require("./convertToDate");
+const sgMail = require("@sendgrid/mail");
+// should be process.env.SENDGRID_API_KEY
+sgMail.setApiKey(
+  "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"
+);
+
+async function sendNotification(marketAlert) {
+  const { id, email, olx_url, last_date } = marketAlert;
+  let url =
+    "https://www.olx.ba/pretraga?" + olx_url + "&sort_order=desc&sort_po=datum";
+  let newItems = await scrapTheItems(url);
+  let lastDate = newItems.length && newItems[0].date;
+  let message =
+    newItems.length &&
+    newItems.reduce(
+      (mes, item) => mes + `<strong>${item.url} i  ${item.price}</strong>`,
+      ""
+    );
+  const msg = {
+    to: email,
+    from: "test@example.com",
+    subject: "Market Alert",
+    text: "New items on olx",
+    html: message
+  };
+  if (message) {
+    await sgMail.send(msg);
+    return { id, date: String(convertToDate(lastDate)) };
+  }
+}
+module.exports = sendNotification;
--- a/frontend-react/.gitignore
+++ b/frontend-react/.gitignore
@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
--- a/frontend-react/README.md
+++ b/frontend-react/README.md
@@ -0,0 +1,68 @@
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.<br>
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.<br>
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.<br>
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.<br>
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br>
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+### Code Splitting
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
+
+### Analyzing the Bundle Size
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
+
+### Making a Progressive Web App
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
+
+### Advanced Configuration
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
+
+### Deployment
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
+
+### `npm run build` fails to minify
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
--- a/frontend-react/package-lock.json
+++ b/frontend-react/package-lock.json
--- a/frontend-react/package.json
+++ b/frontend-react/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "frontend-react",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@material-ui/core": "^3.9.0",
+    "@material-ui/icons": "^3.0.2",
+    "axios": "^0.18.0",
+    "history": "^4.7.2",
+    "prettier": "^1.15.3",
+    "rc-slider": "^8.6.4",
+    "react": "^16.7.0",
+    "react-dom": "^16.7.0",
+    "react-redux": "^6.0.0",
+    "react-router-dom": "^4.3.1",
+    "react-scripts": "^2.1.5",
+    "react-select": "^2.2.0",
+    "redux": "^4.0.1",
+    "redux-devtools-extension": "^2.13.7",
+    "redux-logger": "^3.0.6"
+  },
+  "scripts": {
+    "start": "NODE_PATH=src/ react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": "react-app"
+  },
+  "proxy": "http://localhost:5000/",
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
+}
--- a/frontend-react/public/favicon.ico
+++ b/frontend-react/public/favicon.ico
--- a/frontend-react/public/index.html
+++ b/frontend-react/public/index.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta name="theme-color" content="#000000" />
+    <!--
+      manifest.json provides metadata used when your web app is added to the
+      homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:400,700|Material+Icons"
+    />
+    <link rel="stylesheet" href="./style.css" />
+    <script
+      type="text/javascript"
+      src="https://www.2checkout.com/checkout/api/2co.min.js"
+    ></script>
+
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>
--- a/frontend-react/public/manifest.json
+++ b/frontend-react/public/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
--- a/frontend-react/public/style.css
+++ b/frontend-react/public/style.css
@@ -0,0 +1,8 @@
+html {
+  font-family: Roboto, sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+* {
+  font-family: Roboto, serif;
+}
--- a/frontend-react/src/assets/checkboxAndRadioStyle.css
+++ b/frontend-react/src/assets/checkboxAndRadioStyle.css
@@ -0,0 +1,10 @@
+.radio-style {
+  color: #e91e63 !important;
+}
+
+.checkbox-style {
+  color: #e91e63 !important;
+}
+.label-style {
+  color: white;
+}
--- a/frontend-react/src/assets/dashboardStyle.js
+++ b/frontend-react/src/assets/dashboardStyle.js
@@ -0,0 +1,26 @@
+import { drawerWidth, transition } from "./globalStyle";
+
+const appStyle = theme => ({
+  wrapper: {
+    top: "0",
+    display: "grid",
+    minHeight: "750px",
+    "grid-template-columns": `${drawerWidth}px 1fr`,
+    "grid-template-areas": `"sidebar content"`,
+    [theme.breakpoints.down("sm")]: {
+      "grid-template-areas": `"sidebar" "content"`,
+      "grid-template-columns": "1fr",
+      "grid-template-rows": "auto 1fr"
+    }
+  },
+  mainPanel: {
+    ...transition,
+    overflowScrolling: "touch",
+    "grid-area": "content",
+    zIndex: "1",
+    backgroundColor: "#272727",
+    backgroundImage: "linear-gradient(180deg,#272727, #21525f)"
+  }
+});
+
+export default appStyle;
--- a/frontend-react/src/assets/globalStyle.js
+++ b/frontend-react/src/assets/globalStyle.js
@@ -0,0 +1,42 @@
+const drawerWidth = 360;
+
+const transition = {
+  transition: "all 0.33s cubic-bezier(0.685, 0.0473, 0.346, 1)"
+};
+
+const boxShadow = {
+  boxShadow:
+    "0 10px 30px -12px rgba(0, 0, 0, 0.42), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2)"
+};
+
+const defaultFont = {
+  fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
+  fontWeight: "300",
+  lineHeight: "1.5em"
+};
+
+const primaryColor = "#e91e63";
+
+const primaryBoxShadow = {
+  boxShadow:
+    "0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(233, 30, 99, 0.4)"
+};
+
+const defaultBoxShadow = {
+  border: "0",
+  borderRadius: "3px",
+  boxShadow:
+    "0 10px 20px -12px rgba(0, 0, 0, 0.42), 0 3px 20px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2)",
+  padding: "10px 0",
+  transition: "all 150ms ease 0s"
+};
+
+export {
+  drawerWidth,
+  transition,
+  boxShadow,
+  defaultFont,
+  primaryColor,
+  primaryBoxShadow,
+  defaultBoxShadow
+};
--- a/frontend-react/src/assets/img/reactlogo.png
+++ b/frontend-react/src/assets/img/reactlogo.png
--- a/frontend-react/src/assets/img/sidebar-1.jpg
+++ b/frontend-react/src/assets/img/sidebar-1.jpg
--- a/frontend-react/src/assets/modalStyle.js
+++ b/frontend-react/src/assets/modalStyle.js
@@ -0,0 +1,115 @@
+const modalStyle = {
+  modal: {
+    borderRadius: "6px",
+    backgroundColor: "#010000"
+  },
+  modalHeader: {
+    borderBottom: "none",
+    paddingTop: "24px",
+    paddingRight: "24px",
+    paddingBottom: "0",
+    paddingLeft: "24px",
+    minHeight: "16.43px",
+    color: "white"
+  },
+  modalTitle: {
+    margin: "0",
+    lineHeight: "1.42857143"
+  },
+  modalCloseButton: {
+    color: "white",
+    marginTop: "-12px",
+    WebkitAppearance: "none",
+    padding: "0",
+    cursor: "pointer",
+    background: "0 0",
+    border: "0",
+    fontSize: "inherit",
+    opacity: ".9",
+    textShadow: "none",
+    fontWeight: "700",
+    lineHeight: "1",
+    float: "right"
+  },
+  modalClose: {
+    width: "16px",
+    height: "16px"
+  },
+  modalBody: {
+    paddingTop: "24px",
+    paddingRight: "24px",
+    paddingBottom: "16px",
+    paddingLeft: "24px",
+    position: "relative"
+  },
+  modalFooter: {
+    padding: "15px",
+    textAlign: "right",
+    paddingTop: "0",
+    margin: "0"
+  },
+  modalFooterCenter: {
+    marginLeft: "auto",
+    marginRight: "auto"
+  },
+  whiteText: {
+    color: "white"
+  },
+  inputStyle: {
+    color: "white",
+    "&:after": {
+      borderBottom: "1px solid #e91e63"
+    }
+  },
+  saveButton: {
+    backgroundColor: "#e91e63 !important",
+    color: "white !important"
+  },
+  closeButton: {
+    backgroundColor: "white",
+    color: "#e91e63"
+  },
+  checkBoxStyle: {
+    color: "#e91e63 !important"
+  },
+  tooltip: {
+    padding: "10px 15px",
+    minWidth: "130px",
+    color: "#e91e63",
+    lineHeight: "1.7em",
+    background: "white",
+    border: "none",
+    borderRadius: "3px",
+    boxShadow:
+      "0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.2)",
+    maxWidth: "200px",
+    textAlign: "center",
+    fontFamily: '"Helvetica Neue",Helvetica,Arial,sans-serif',
+    fontSize: "0.875em",
+    fontStyle: "normal",
+    fontWeight: "400",
+    textShadow: "none",
+    textTransform: "none",
+    letterSpacing: "normal",
+    wordBreak: "normal",
+    wordSpacing: "normal",
+    wordWrap: "normal",
+    whiteSpace: "normal",
+    lineBreak: "auto",
+    zIndex: 5000
+  },
+  buttonStyle: {
+    width: "150px",
+    margin: "0 auto",
+    position: "relative",
+    borderRadius: "8px",
+    display: "block",
+    padding: "10px 10px",
+    textAlign: "center",
+    marginBottom: "20px",
+    color: "white",
+    backgroundColor: "#e91e63",
+    border: "1px solid #e91e63"
+  }
+};
+export default modalStyle;
--- a/frontend-react/src/assets/rangeStyle.css
+++ b/frontend-react/src/assets/rangeStyle.css
@@ -0,0 +1,28 @@
+.rc-slider-handle {
+  border: solid 2px #e91e63 !important;
+}
+.rc-slider-handle:hover {
+  border: solid 2px #e91e63 !important;
+}
+.rc-slider-rail {
+  background-color: #e91e63 !important;
+  width: 20px;
+}
+.rc-slider-track {
+  background-color: grey !important;
+}
+.input-style:after {
+  border-bottom: 1px solid #e91e63 !important;
+}
+.input-style {
+  color: white !important;
+  width: 80% !important;
+  margin: 0 auto !important;
+  position: relative !important;
+  display: block !important;
+  margin: 10px auto !important;
+}
+.rc-slider {
+  width: 80% !important;
+  margin: 0 auto !important;
+}
--- a/frontend-react/src/assets/sidebarStyle.js
+++ b/frontend-react/src/assets/sidebarStyle.js
@@ -0,0 +1,171 @@
+import {
+  boxShadow,
+  defaultFont,
+  primaryColor,
+  primaryBoxShadow
+} from "./globalStyle";
+
+const sidebarStyle = theme => ({
+  drawerPaper: {
+    border: "none",
+    position: "relative",
+    "overflow-y": "auto",
+    "overflow-x": "none",
+    zIndex: "1",
+    ...boxShadow,
+    "grid-area": "sidebar",
+    [theme.breakpoints.down("sm")]: {
+      position: "relative"
+    }
+  },
+  logo: {
+    position: "relative",
+    padding: "15px 15px",
+    zIndex: "4",
+    "&:after": {
+      content: '""',
+      position: "absolute",
+      bottom: "0",
+
+      height: "1px",
+      right: "15px",
+      width: "calc(100% - 30px)",
+      backgroundColor: "rgba(180, 180, 180, 0.3)"
+    }
+  },
+  logoLink: {
+    ...defaultFont,
+    textTransform: "uppercase",
+    padding: "5px 0",
+    display: "block",
+    fontSize: "18px",
+    textAlign: "left",
+    fontWeight: "400",
+    lineHeight: "30px",
+    textDecoration: "none",
+    backgroundColor: "transparent",
+    "&,&:hover": {
+      color: "#FFFFFF"
+    }
+  },
+  logoImage: {
+    width: "30px",
+    display: "inline-block",
+    maxHeight: "30px",
+    marginLeft: "10px",
+    marginRight: "15px"
+  },
+  img: {
+    width: "35px",
+    top: "22px",
+    position: "absolute",
+    verticalAlign: "middle",
+    border: "0"
+  },
+  background: {
+    position: "absolute",
+    zIndex: "1",
+    height: "100%",
+    width: "100%",
+    display: "block",
+    top: "0",
+    left: "0",
+    backgroundSize: "cover",
+    backgroundPosition: "center center",
+    "&:after": {
+      position: "absolute",
+      zIndex: "3",
+      width: "100%",
+      height: "100%",
+      content: '""',
+      display: "block",
+      background: "#000",
+      opacity: ".8"
+    }
+  },
+  list: {
+    marginTop: "20px",
+    paddingLeft: "0",
+    paddingTop: "0",
+    paddingBottom: "0",
+    marginBottom: "0",
+    listStyle: "none",
+    position: "unset"
+  },
+  item: {
+    position: "relative",
+    display: "block",
+    textDecoration: "none",
+    "&:hover,&:focus,&:visited,&": {
+      color: "#FFFFFF"
+    }
+  },
+  itemLink: {
+    width: "auto",
+    transition: "all 300ms linear",
+    margin: "10px 15px 0",
+    borderRadius: "3px",
+    position: "relative",
+    display: "block",
+    padding: "10px 15px",
+    backgroundColor: "transparent",
+    ...defaultFont
+  },
+  itemIcon: {
+    width: "24px",
+    height: "30px",
+    fontSize: "24px",
+    lineHeight: "30px",
+    float: "left",
+    marginRight: "15px",
+    textAlign: "center",
+    verticalAlign: "middle",
+    color: "rgba(255, 255, 255, 0.8)"
+  },
+  itemText: {
+    ...defaultFont,
+    margin: "0",
+    lineHeight: "30px",
+    fontSize: "14px",
+    color: "#FFFFFF"
+  },
+  whiteFont: {
+    color: "#FFFFFF"
+  },
+
+  sidebarWrapper: {
+    width: "360px",
+    position: "relative",
+    overflow: "auto",
+    zIndex: "4",
+    overflowScrolling: "touch"
+  },
+  whiteText: {
+    zIndex: "5000",
+    color: "white"
+  },
+  collapsedItemStyle: {
+    zIndex: "5000",
+    color: "white",
+    "&:hover": {
+      backgroundColor: primaryColor,
+      color: "#FFFFFF",
+      ...primaryBoxShadow
+    },
+    cursor: "pointer"
+  },
+  collapse: {
+    width: "80%",
+    margin: "0 auto"
+  },
+  checkedItem: {
+    backgroundColor: primaryColor,
+    color: "#FFFFFF",
+    ...primaryBoxShadow
+  },
+  subOptionIndent: {
+    paddingLeft: "20px"
+  }
+});
+
+export default sidebarStyle;
--- a/frontend-react/src/components/App.js
+++ b/frontend-react/src/components/App.js
@@ -0,0 +1,105 @@
+import React from "react";
+import PropTypes from "prop-types";
+import withStyles from "@material-ui/core/styles/withStyles";
+import { connect } from "react-redux";
+import { ITEMS_CHANGED, USER_DATA_CHANGED } from "constants/actionTypes";
+import { areObjectEqual } from "utils/helpers";
+import { createOlxLink } from "utils/createOlxLink";
+import axios from "axios";
+
+import image from "assets/img/sidebar-1.jpg";
+import logo from "assets/img/reactlogo.png";
+
+import Sidebar from "components/Sidebar.js";
+import ItemsContainer from "./items/itemscontainer/ItemsContainer";
+import NotificationModal from "./NotificationModal";
+
+import dashboardStyle from "assets/dashboardStyle.js";
+
+const mapStateToProps = state => {
+  return {
+    category: state.category,
+    options: state.options,
+    subcategory: state.subcategory,
+    items: state.items,
+    userdata: state.userdata
+  };
+};
+
+const mapDispatchToProps = dispatch => ({
+  onItemsChanged: items => dispatch({ type: ITEMS_CHANGED, items }),
+  onUserDataChange: change => dispatch({ type: USER_DATA_CHANGED, ...change })
+});
+
+let lastUpdateTime = null;
+let interval = null;
+class App extends React.Component {
+  componentDidMount() {
+    interval = setInterval(() => {
+      if (lastUpdateTime && Date.now() - lastUpdateTime > 2000) {
+        const {
+          category,
+          options,
+          subcategory,
+          onItemsChanged,
+          onUserDataChange
+        } = this.props;
+        let url = createOlxLink(category, subcategory, options);
+        url = encodeURI(url);
+        onUserDataChange({ info: "olx_url", value: url });
+        if (url) {
+          axios
+            .get(`/items/${url}`)
+            .then(response => {
+              onItemsChanged(response.data.items);
+              onUserDataChange({
+                info: "last_date",
+                value: response.data.last_date
+              });
+            })
+            .catch(error => console.log(error));
+        }
+        lastUpdateTime = null;
+      }
+    }, 1000);
+  }
+
+  componentWillUnmount() {
+    clearInterval(interval);
+  }
+  componentWillReceiveProps(newProps) {
+    const { subcategory, category, options } = this.props;
+    if (
+      newProps.subcategory !== subcategory ||
+      newProps.category !== category ||
+      !areObjectEqual(newProps.options, options)
+    ) {
+      lastUpdateTime = Date.now();
+    }
+  }
+
+  render() {
+    const { items, classes } = this.props;
+
+    return (
+      <div className={classes.wrapper}>
+        <Sidebar logoText={"Market Alarm"} logo={logo} image={image} />
+
+        <div className={classes.mainPanel}>
+          <ItemsContainer />
+          {items.length ? <NotificationModal /> : null}
+        </div>
+      </div>
+    );
+  }
+}
+App.propTypes = {
+  classes: PropTypes.object.isRequired
+};
+
+export default withStyles(dashboardStyle)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(App)
+);
--- a/frontend-react/src/components/NotificationModal.js
+++ b/frontend-react/src/components/NotificationModal.js
@@ -0,0 +1,278 @@
+import React from "react";
+import Dialog from "@material-ui/core/Dialog";
+import DialogTitle from "@material-ui/core/DialogTitle";
+import DialogContent from "@material-ui/core/DialogContent";
+import DialogActions from "@material-ui/core/DialogActions";
+import Slide from "@material-ui/core/Slide";
+import withStyles from "@material-ui/core/styles/withStyles";
+import { notificationmodalwrapper } from "utils/notificationmodalwrapper";
+import modalStyle from "assets/modalStyle.js";
+import Button from "@material-ui/core/Button";
+import IconButton from "@material-ui/core/IconButton";
+import Close from "@material-ui/icons/Close";
+import Input from "@material-ui/core/Input";
+import Checkbox from "@material-ui/core/Checkbox";
+import FormControlLabel from "@material-ui/core/FormControlLabel";
+import Typography from "@material-ui/core/Typography";
+import Tooltip from "@material-ui/core/Tooltip";
+import axios from "axios";
+
+function Transition(props) {
+  return <Slide direction="down" {...props} />;
+}
+
+let token = "";
+class NotificationModal extends React.Component {
+  componentDidMount() {
+    console.log("load sandbox");
+    window.TCO.loadPubKey("sandbox");
+  }
+  handleOpen = () => {
+    this.props.onModalOpen();
+  };
+  handleClose = () => {
+    this.props.onModalClose();
+  };
+
+  checkEmail = email =>
+    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(
+      email
+    );
+
+  handleEmail = e => {
+    this.props.onUserDataChange({ info: "email", value: e.target.value });
+    this.props.onUserDataChange({
+      info: "validEmail",
+      value: this.checkEmail(e.target.value)
+    });
+  };
+
+  handleInput = (e, infoName) => {
+    this.props.onUserDataChange({ info: infoName, value: e.target.value });
+  };
+
+  isChecked = optionName => Boolean(this.props.userdata[optionName]);
+
+  optionChange = optionName => {
+    const { userdata } = this.props;
+    this.props.onUserDataChange({
+      info: optionName,
+      value: !userdata[optionName]
+    });
+  };
+
+  successCallback = data => {
+    token = data.response.token.token;
+    const {
+      userdata: { email, last_date, olx_url }
+    } = this.props;
+
+    axios
+      .post("/marketalerts", {
+        email,
+        last_date,
+        olx_url
+      })
+      .then(response =>
+        axios
+          .post("/payforalert", {
+            email,
+            token
+          })
+          .then(response => {
+            this.handleClose();
+            alert("Market Alert Created");
+          })
+          .catch(error => console.log(error))
+      )
+      .catch(error => console.log(error));
+  };
+
+  errorCallback = data => {
+    if (data.errorCode === 200) {
+      this.tokenRequest();
+    } else {
+      alert(data.errorMsg);
+    }
+  };
+
+  tokenRequest = () => {
+    const {
+      userdata: { ccNo, expYear, expMonth, cvv }
+    } = this.props;
+    const sellerId = "901402692";
+    const publishableKey = "93546B8D-B726-4376-A6DF-F698FD8893CA";
+    var args = {
+      sellerId,
+      publishableKey,
+      ccNo,
+      cvv,
+      expMonth,
+      expYear
+    };
+    window.TCO.requestToken(this.successCallback, this.errorCallback, args);
+  };
+
+  handleSaveMarketAlert = () => {
+    this.tokenRequest();
+  };
+
+  render() {
+    const {
+      modal,
+      classes,
+      userdata: { validEmail }
+    } = this.props;
+
+    return (
+      <div>
+        <button className={classes.buttonStyle} onClick={this.handleOpen}>
+          Napravi notifikaciju
+        </button>
+        <Dialog
+          classes={{
+            root: classes.center,
+            paper: classes.modal
+          }}
+          open={modal}
+          TransitionComponent={Transition}
+          keepMounted
+          onClose={() => this.handleClose()}
+          aria-labelledby="classic-modal-slide-title"
+          aria-describedby="classic-modal-slide-description"
+        >
+          <DialogTitle
+            id="classic-modal-slide-title"
+            disableTypography
+            className={classes.modalHeader}
+          >
+            <IconButton
+              className={classes.modalCloseButton}
+              key="close"
+              aria-label="Close"
+              color="inherit"
+              onClick={() => this.handleClose()}
+            >
+              <Close className={classes.modalClose} />
+            </IconButton>
+            <h4 className={classes.modalTitle}>Save Market Alert</h4>
+          </DialogTitle>
+          <DialogContent
+            id="classic-modal-slide-description"
+            className={classes.modalBody}
+          >
+            <FormControlLabel
+              className={classes.whiteText}
+              control={
+                <Checkbox
+                  className={classes.checkBoxStyle}
+                  checked={this.isChecked("emailChecked")}
+                  type={"checkbox"}
+                  value={""}
+                  onChange={() => this.optionChange("emailChecked")}
+                />
+              }
+              label={<Typography style={{ color: "white" }}>Email</Typography>}
+            />
+
+            {this.isChecked("emailChecked") ? (
+              <div>
+                <Input
+                  className={classes.inputStyle}
+                  placeholder="Email"
+                  inputProps={{
+                    "aria-label": "Email"
+                  }}
+                  type="email"
+                  onChange={this.handleEmail}
+                />
+                <Input
+                  className={classes.inputStyle}
+                  type="hidden"
+                  value={token}
+                />
+                <Input
+                  className={classes.inputStyle}
+                  placeholder="Card Number"
+                  inputProps={{
+                    "aria-label": "Card Number"
+                  }}
+                  required
+                  autoComplete="off"
+                  type="number"
+                  onChange={e => this.handleInput(e, "ccNo")}
+                />
+                <Input
+                  className={classes.inputStyle}
+                  placeholder="Expiration Year"
+                  inputProps={{
+                    "aria-label": "Expiration Year"
+                  }}
+                  required
+                  autoComplete="off"
+                  type="number"
+                  onChange={e => this.handleInput(e, "expYear")}
+                />
+                <Input
+                  className={classes.inputStyle}
+                  placeholder="Expiration Month"
+                  inputProps={{
+                    "aria-label": "Expiration Month"
+                  }}
+                  required
+                  autoComplete="off"
+                  type="number"
+                  onChange={e => this.handleInput(e, "expMonth")}
+                />
+                <Input
+                  className={classes.inputStyle}
+                  placeholder="CVV"
+                  inputProps={{
+                    "aria-label": "CVV"
+                  }}
+                  required
+                  autoComplete="off"
+                  type="number"
+                  onChange={e => this.handleInput(e, "cvv")}
+                />
+              </div>
+            ) : null}
+          </DialogContent>
+          <DialogActions className={classes.modalFooter}>
+            {validEmail ? (
+              <Button
+                onClick={this.handleSaveMarketAlert}
+                className={classes.saveButton}
+              >
+                Save
+              </Button>
+            ) : (
+              <Tooltip
+                title="Provide a valid email"
+                placement="top"
+                classes={{ tooltip: classes.tooltip }}
+              >
+                <div>
+                  <Button disabled className={classes.saveButton}>
+                    Save
+                  </Button>
+                </div>
+              </Tooltip>
+            )}
+
+            <Button
+              className={classes.closeButton}
+              onClick={() => this.handleClose()}
+            >
+              Close
+            </Button>
+          </DialogActions>
+        </Dialog>
+      </div>
+    );
+  }
+}
+
+export default withStyles(modalStyle)(
+  notificationmodalwrapper(NotificationModal)
+);
--- a/frontend-react/src/components/Sidebar.js
+++ b/frontend-react/src/components/Sidebar.js
@@ -0,0 +1,117 @@
+import React from "react";
+import PropTypes from "prop-types";
+
+import withStyles from "@material-ui/core/styles/withStyles";
+import List from "@material-ui/core/List";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import ListItemText from "@material-ui/core/ListItemText";
+import Dashboard from "@material-ui/icons/Dashboard";
+import ExpandLess from "@material-ui/icons/ExpandLess";
+import ExpandMore from "@material-ui/icons/ExpandMore";
+import Collapse from "@material-ui/core/Collapse";
+import StarBorder from "@material-ui/icons/StarBorder";
+
+import sidebarStyle from "assets/sidebarStyle.js";
+import CollapseWrapperStyled from "components/widgets/CollapseWrapperStyled";
+import DeepCategoryWrapper from "./widgets/DeepCategoryWrapper";
+import { hoc } from "utils/helpers";
+
+import * as Vozila from "./categories/Vozila";
+import * as Nekretnine from "./categories/Nekretnine";
+
+import { connect } from "react-redux";
+import { CATEGORY_SELECT } from "constants/actionTypes";
+
+const options = [
+  { value: "Nekretnine", label: "Nekretnine" }
+];
+
+const mapStateToProps = state => {
+  return {
+    category: state.category
+  };
+};
+
+const mapDispatchToProps = dispatch => ({
+  onCategoryChanged: option => dispatch({ type: CATEGORY_SELECT, option })
+});
+
+class Sidebar extends React.Component {
+  handleCategoryChange = selectedOption => {
+    this.props.onCategoryChanged(selectedOption);
+  };
+  render() {
+    const { classes, logo, image, logoText, category } = this.props;
+
+    return (
+      <div className={classes.drawerPaper}>
+        <div className={classes.logo}>
+          <a href="https://www.creative-tim.com" className={classes.logoLink}>
+            <div className={classes.logoImage}>
+              <img src={logo} alt="logo" className={classes.img} />
+            </div>
+            {logoText}
+          </a>
+        </div>
+        <div className={classes.sidebarWrapper}>
+          <List role="menu">
+            <Collapse in={true} timeout="auto" unmountOnExit>
+              <List disablePadding>
+                {options.map(({ label, value }, index) => (
+                  <ListItem
+                    onClick={() => this.handleCategoryChange({ label, value })}
+                    className={
+                      classes.nested +
+                      " " +
+                      classes.collapsedItemStyle +
+                      " " +
+                      (category && category.value === value
+                        ? classes.checkedItem
+                        : "")
+                    }
+                    key={index}
+                  >
+                    <ListItemIcon className={classes.whiteText}>
+                      <StarBorder />
+                    </ListItemIcon>
+                    <ListItemText
+                      className={classes.whiteText}
+                      primary={label}
+                      disableTypography={true}
+                    />
+                  </ListItem>
+                ))}
+              </List>
+            </Collapse>
+
+            {hoc(category && category.value, {
+              Nekretnine: (
+                <CollapseWrapperStyled componentName="Podkategorija">
+                  <DeepCategoryWrapper {...Nekretnine.properties} />
+                </CollapseWrapperStyled>
+              )
+            })}
+          </List>
+        </div>
+        {image !== undefined ? (
+          <div
+            className={classes.background}
+            style={{ backgroundImage: "url(" + image + ")" }}
+          />
+        ) : null}
+      </div>
+    );
+  }
+}
+
+Sidebar.propTypes = {
+  classes: PropTypes.object.isRequired
+};
+
+export default withStyles(sidebarStyle)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(Sidebar)
+);
--- a/frontend-react/src/components/categories/Nekretnine.js
+++ b/frontend-react/src/components/categories/Nekretnine.js
@@ -0,0 +1,17 @@
+import React from "react";
+
+import Stanovi from "../subcategories/nekretnine/Stanovi";
+import Kuce from "../subcategories/nekretnine/Kuce";
+
+const options = [{ value: 23, label: "Stanovi" }, { value: 24, label: "Kuce" }];
+const depth = 0;
+const childrenComponents = {
+  23: <Stanovi />,
+  24: <Kuce />
+};
+
+export const properties = {
+  options,
+  depth,
+  childrenComponents
+};
--- a/frontend-react/src/components/categories/Vozila.js
+++ b/frontend-react/src/components/categories/Vozila.js
@@ -0,0 +1,20 @@
+import React from "react";
+
+import Automobili from "../subcategories/vozila/Automobili";
+import Motocikli from "../subcategories/vozila/Motocikli";
+
+const options = [
+  { value: 18, label: "Automobili" },
+  { value: 21, label: "Motocikli" }
+];
+const depth = 0;
+const childrenComponents = {
+  18: <Automobili />,
+  21: <Motocikli />
+};
+
+export const properties = {
+  options,
+  depth,
+  childrenComponents
+};
--- a/frontend-react/src/components/filters/NekretnineFilter/AllFiltersDefined.js
+++ b/frontend-react/src/components/filters/NekretnineFilter/AllFiltersDefined.js
@@ -0,0 +1,234 @@
+// Kanton/Regija
+export const lokacijaOptions = {
+  choices: [
+    { value: "9", label: "Sarajevo" },
+    { value: "2", label: "Posavski" }
+  ],
+  value: "kanton",
+  optionName: "kanton"
+};
+
+// Grad
+export const gradoviOptions = {
+  parentOptionName: "kanton",
+  checkboxOptions: {
+    "9": {
+      elements: [
+        {
+          type: "checkbox",
+          name: "Ilidza",
+          optionName: "grad-ilidza",
+          value: "3879"
+        },
+        {
+          type: "checkbox",
+          name: "Sarajevo-Centar",
+          optionName: "grad-centar",
+          value: "3812"
+        },
+        {
+          type: "checkbox",
+          name: "Hadzici",
+          optionName: "grad-hadzici",
+          value: "3817"
+        },
+        {
+          type: "checkbox",
+          name: "Ilijas",
+          optionName: "grad-ilijas",
+          value: "3892"
+        },
+        {
+          type: "checkbox",
+          name: "Sarajevo-Novi Grad",
+          optionName: "grad-novigrad",
+          value: "3969"
+        },
+        {
+          type: "checkbox",
+          name: "Sarajevo-Novo Sarajevo",
+          optionName: "grad-novosarajevo",
+          value: "5896"
+        }
+      ]
+    }
+  }
+};
+
+// Cijena
+export const cijenaRangeOptions = {
+  min: 0,
+  max: 100000,
+  defaultValues: [0, 100000],
+  step: 100,
+  optionNames: ["od", "do"]
+};
+
+// Stanje
+export const stanjeElements = [
+  {
+    type: "radio",
+    value: 0,
+    name: "Sve",
+    optionName: "stanje"
+  },
+  {
+    type: "radio",
+    value: 1,
+    name: "Novo",
+    optionName: "stanje"
+  },
+  {
+    type: "radio",
+    value: 2,
+    name: "Koristeno",
+    optionName: "stanje"
+  }
+];
+
+// Vrsta Artikla
+export const vrstaElements = [
+  {
+    value: "",
+    name: "Sve",
+    type: "radio",
+    optionName: "vrsta"
+  },
+  {
+    value: "samoprodaja",
+    name: "Prodaja",
+    type: "radio",
+    optionName: "vrsta"
+  },
+  {
+    value: "samoizdavanje",
+    name: "Iznajmljivanje",
+    type: "radio",
+    optionName: "vrsta"
+  },
+  {
+    value: "samopotraznja",
+    name: "Potražnja",
+    type: "radio",
+    optionName: "vrsta"
+  }
+];
+
+// Kvadrata
+export const velicinaRangeOptions = {
+  min: 0,
+  max: 1000,
+  defaultValues: [0, new Date().getFullYear()],
+  step: 1,
+  optionNames: ["kvadrata_min", "kvadrata_max"]
+};
+
+// Dodatno za kucu
+export const kucaElements = [
+  {
+    type: "checkbox",
+    name: "Uknjizeno",
+    optionName: "uknjizeno-zk_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Namjesteno",
+    optionName: "namjestena_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Nedavno adaptirano",
+    optionName: "nedavno-adaptirana_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Garaza",
+    optionName: "gara-a_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Balkon",
+    optionName: "balkon_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Voda",
+    optionName: "voda_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Plin",
+    optionName: "plin_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Bazen",
+    optionName: "bazen_checkbox",
+    value: "on"
+  }
+];
+
+// Dodatno za stan
+export const stanElements = [
+  {
+    type: "checkbox",
+    name: "Novogradnja",
+    optionName: "novogradnja_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Namjesten",
+    optionName: "namjesten_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Nedavno adaptiran",
+    optionName: "nedavno-adaptiran_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Uknjizeno",
+    optionName: "uknjizeno-zk_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Lift",
+    optionName: "lift_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Balkon",
+    optionName: "balkon_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Parking",
+    optionName: "parking_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "Plin",
+    optionName: "plin_checkbox",
+    value: "on"
+  },
+  {
+    type: "checkbox",
+    name: "kablovska",
+    optionName: "kablovska-tv_checkbox",
+    value: "on"
+  }
+];
--- a/frontend-react/src/components/filters/NekretnineFilter/index.js
+++ b/frontend-react/src/components/filters/NekretnineFilter/index.js
@@ -0,0 +1,72 @@
+import React from "react";
+import * as Filters from "./AllFiltersDefined";
+import CheckboxAndRadioWrapper from "components/widgets/CheckboxAndRadioWrapper";
+import SelectDisplayCheckboxWrapper from "components/widgets/SelectDisplayCheckboxWrapper";
+import RangeWrapper from "components/widgets/RangeWrapper";
+import DropDownWrapper from "components/widgets/DropDownWrapper";
+
+const Kanton = (
+  <DropDownWrapper componentName="Lokacija" {...Filters.lokacijaOptions} />
+);
+
+const Grad = (
+  <SelectDisplayCheckboxWrapper
+    componentName="Grad"
+    {...Filters.gradoviOptions}
+  />
+);
+
+const Cijena = (
+  <RangeWrapper
+    componentName="Cijena"
+    {...Filters.cijenaRangeOptions}
+    optionName="cijena"
+  />
+);
+
+const Stanje = (
+  <CheckboxAndRadioWrapper
+    componentName="Stanje"
+    elements={Filters.stanjeElements}
+  />
+);
+
+const Vrsta = (
+  <CheckboxAndRadioWrapper
+    componentName="Vrsta"
+    elements={Filters.vrstaElements}
+  />
+);
+
+const Kvadratura = (
+  <RangeWrapper
+    componentName="Velicina"
+    {...Filters.velicinaRangeOptions}
+    optionName="velicina"
+  />
+);
+
+const DodatnoZaStan = (
+  <CheckboxAndRadioWrapper
+    componentName="dodatno-za-stan"
+    elements={Filters.stanElements}
+  />
+);
+
+const DodatnoZaKucu = (
+  <CheckboxAndRadioWrapper
+    componentName="dodatno-za-kucu"
+    elements={Filters.kucaElements}
+  />
+);
+
+export {
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Kvadratura,
+  DodatnoZaStan,
+  DodatnoZaKucu
+};
--- a/frontend-react/src/components/filters/VozilaFilter/AllFiltersDefined.js
+++ b/frontend-react/src/components/filters/VozilaFilter/AllFiltersDefined.js
@@ -0,0 +1,188 @@
+// Proizvodac
+export const proizvodacOptions = {
+  choices: [{ value: "1900", label: "Audi" }, { value: "9000", label: "Ford" }],
+  value: "v_b",
+  optionName: "v_b"
+};
+
+// Kanton/Regija
+export const lokacijaOptions = {
+  choices: [
+    { value: "9", label: "Sarajevo" },
+    { value: "2", label: "Posavski" }
+  ],
+  value: "kanton",
+  optionName: "kanton"
+};
+
+// Grad
+export const gradoviOptions = {
+  parentOptionName: "kanton",
+  checkboxOptions: {
+    "9": {
+      elements: [
+        {
+          type: "checkbox",
+          name: "Ilidza",
+          optionName: "grad-ilidza",
+          value: "3879"
+        },
+        {
+          type: "checkbox",
+          name: "Sarajevo-Centar",
+          optionName: "grad-centar",
+          value: "3812"
+        },
+        {
+          type: "checkbox",
+          name: "Hadzici",
+          optionName: "grad-hadzici",
+          value: "3817"
+        },
+        {
+          type: "checkbox",
+          name: "Ilijas",
+          optionName: "grad-ilijas",
+          value: "3892"
+        },
+        {
+          type: "checkbox",
+          name: "Sarajevo-Novi Grad",
+          optionName: "grad-novigrad",
+          value: "3969"
+        },
+        {
+          type: "checkbox",
+          name: "Sarajevo-Novo Sarajevo",
+          optionName: "grad-novosarajevo",
+          value: "5896"
+        }
+      ]
+    }
+  }
+};
+
+// Cijena
+export const cijenaRangeOptions = {
+  min: 0,
+  max: 100000,
+  defaultValues: [0, 100000],
+  step: 100,
+  optionNames: ["od", "do"]
+};
+
+// Stanje
+export const stanjeElements = [
+  {
+    type: "radio",
+    value: "",
+    name: "Nova i polovna vozila",
+    optionName: "stanje"
+  },
+  {
+    type: "radio",
+    value: 1,
+    name: "Nova",
+    optionName: "stanje"
+  },
+  {
+    type: "radio",
+    value: 2,
+    name: "Polovna vozila",
+    optionName: "stanje"
+  },
+  {
+    type: "checkbox",
+    name: "Udarena vozila",
+    optionName: "udaren_checkbox",
+    value: "on"
+  }
+];
+
+// Vrsta Artikla
+export const vrstaElements = [
+  {
+    value: "",
+    name: "Sve",
+    type: "radio",
+    optionName: "vrsta"
+  },
+  {
+    value: "samoprodaja",
+    name: "Prodaja",
+    type: "radio",
+    optionName: "vrsta"
+  },
+  {
+    value: "samoizdavanje",
+    name: "Iznajmljivanje",
+    type: "radio",
+    optionName: "vrsta"
+  },
+  {
+    value: "samopotraznja",
+    name: "Potražnja",
+    type: "radio",
+    optionName: "vrsta"
+  }
+];
+
+// Godiste
+export const godisteRangeOptions = {
+  min: 1960,
+  max: new Date().getFullYear(),
+  defaultValues: [1960, new Date().getFullYear()],
+  step: 1,
+  optionNames: ["godiste_min", "godiste_max"]
+};
+
+// Kilometraza
+export const kilometrazaOptions = {
+  kilometraMin: {
+    choices: [{ value: 5000, label: "5000" }, { value: 10000, label: "10000" }],
+    value: "kilometra-a_min",
+    optionName: "kilometra-a_min"
+  },
+  kilometraMax: {
+    choices: [
+      { value: 15000, label: "15000" },
+      { value: 200000, label: "200000" }
+    ],
+    value: "kilometra-a_max",
+    optionName: "kilometra-a_max"
+  }
+};
+
+// Gorivo
+export const gorivoElements = [
+  {
+    name: "Dizel",
+    optionName: "gorivo_select_dizel",
+    type: "checkbox",
+    value: "Dizel"
+  },
+  {
+    name: "Benzin",
+    optionName: "gorivo_select_benzin",
+    type: "checkbox",
+    value: "Benzin"
+  },
+  {
+    name: "Plin",
+    optionName: "gorivo_select_plin",
+    type: "checkbox",
+    value: "Plin"
+  },
+  {
+    name: "Hibrid",
+    optionName: "gorivo_select_hibrid",
+    type: "checkbox",
+    value: "Hibrid"
+  },
+  {
+    name: "Elektro",
+    optionName: "gorivo_select_elektro",
+    type: "checkbox",
+    value: "Elektro"
+  }
+];
--- a/frontend-react/src/components/filters/VozilaFilter/index.js
+++ b/frontend-react/src/components/filters/VozilaFilter/index.js
@@ -0,0 +1,81 @@
+import React from "react";
+import * as Filters from "./AllFiltersDefined";
+import CheckboxAndRadioWrapper from "components/widgets/CheckboxAndRadioWrapper";
+import SelectDisplayCheckboxWrapper from "components/widgets/SelectDisplayCheckboxWrapper";
+import RangeWrapper from "components/widgets/RangeWrapper";
+import DropDownWrapper from "components/widgets/DropDownWrapper";
+
+const Proizvodac = (
+  <DropDownWrapper componentName="Proizvodac" {...Filters.proizvodacOptions} />
+);
+
+const Kanton = (
+  <DropDownWrapper componentName="Lokacija" {...Filters.lokacijaOptions} />
+);
+
+const Grad = (
+  <SelectDisplayCheckboxWrapper
+    componentName="Grad"
+    {...Filters.gradoviOptions}
+  />
+);
+
+const Cijena = (
+  <RangeWrapper
+    componentName="Cijena"
+    {...Filters.cijenaRangeOptions}
+    optionName="cijena"
+  />
+);
+
+const Stanje = (
+  <CheckboxAndRadioWrapper
+    componentName="Stanje"
+    elements={Filters.stanjeElements}
+  />
+);
+
+const Vrsta = (
+  <CheckboxAndRadioWrapper
+    componentName="Vrsta"
+    elements={Filters.vrstaElements}
+  />
+);
+
+const Godiste = (
+  <RangeWrapper componentName="Godiste" {...Filters.godisteRangeOptions} />
+);
+
+const KilometraMin = (
+  <DropDownWrapper
+    componentName="Min kilometraza"
+    {...Filters.kilometrazaOptions.kilometraMin}
+  />
+);
+
+const KilometraMax = (
+  <DropDownWrapper
+    componentName="Max kilometraza"
+    {...Filters.kilometrazaOptions.kilometraMax}
+  />
+);
+
+const Gorivo = (
+  <CheckboxAndRadioWrapper
+    componentName="Gorivo"
+    elements={Filters.gorivoElements}
+  />
+);
+
+export {
+  Proizvodac,
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Godiste,
+  KilometraMin,
+  KilometraMax,
+  Gorivo
+};
--- a/frontend-react/src/components/items/itemcard/ItemCard.css
+++ b/frontend-react/src/components/items/itemcard/ItemCard.css
@@ -0,0 +1,40 @@
+.item {
+  display: grid;
+  border: solid #ffc600 1px;
+  border-radius: 5px;
+  max-width: 200px;
+  min-height: 150px;
+  grid-template-areas:
+    "image"
+    "title";
+  margin: 3%;
+  background-color: #272727;
+  justify-items: center;
+  align-items: center;
+}
+
+.item > a > img {
+  width: 90%;
+  height: 90%;
+  min-height: 100px !important;
+  min-width: 150px !important;
+  grid-area: image;
+}
+.item > a {
+  text-decoration: none;
+}
+.basic-info {
+  grid-area: title;
+  width: 100%;
+  margin: 0 auto;
+  text-align: center;
+}
+
+.basic-info > h3 {
+  font-size: 90%;
+  margin: 5%;
+  margin-bottom: 0px;
+  color: #ffc600;
+  padding-bottom: 10px;
+  overflow-wrap: break-word;
+}
--- a/frontend-react/src/components/items/itemcard/ItemCard.js
+++ b/frontend-react/src/components/items/itemcard/ItemCard.js
@@ -0,0 +1,20 @@
+import React, { Component } from "react";
+import "./ItemCard.css";
+
+class ItemCard extends Component {
+  render() {
+    const { url, price, image } = this.props;
+    return (
+      <div className="item">
+        <a href={url}>
+          <img alt={image} src={image} />
+          <div className="basic-info">
+            <h3>{price}</h3>
+          </div>
+        </a>
+      </div>
+    );
+  }
+}
+
+export default ItemCard;
--- a/frontend-react/src/components/items/itemscontainer/ItemsContainer.css
+++ b/frontend-react/src/components/items/itemscontainer/ItemsContainer.css
@@ -0,0 +1,8 @@
+.items-list {
+  margin: 5%;
+  margin-top: 8%;
+  display: grid;
+  grid-gap: 5px;
+  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+  justify-items: center;
+}
--- a/frontend-react/src/components/items/itemscontainer/ItemsContainer.js
+++ b/frontend-react/src/components/items/itemscontainer/ItemsContainer.js
@@ -0,0 +1,25 @@
+import React, { Component } from "react";
+import { connect } from "react-redux";
+
+import ItemCard from "../itemcard/ItemCard";
+import "./ItemsContainer.css";
+
+const mapStateToProps = state => {
+  return {
+    items: state.items
+  };
+};
+
+class ItemContainer extends Component {
+  renderItems() {
+    let items = this.props.items;
+    return items.map((item, index) => {
+      return <ItemCard {...item} key={index} />;
+    });
+  }
+
+  render() {
+    return <div className="items-list">{this.renderItems()}</div>;
+  }
+}
+export default connect(mapStateToProps)(ItemContainer);
--- a/frontend-react/src/components/subcategories/nekretnine/Kuce.js
+++ b/frontend-react/src/components/subcategories/nekretnine/Kuce.js
@@ -0,0 +1,23 @@
+import { WrapAll } from "components/widgets/CollapseWrapperAll";
+import {
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Kvadratura,
+  DodatnoZaKucu
+} from "components/filters/NekretnineFilter/index";
+
+const KuceFilters = [
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Kvadratura,
+  DodatnoZaKucu
+];
+const Kuce = () => WrapAll(KuceFilters);
+
+export default Kuce;
--- a/frontend-react/src/components/subcategories/nekretnine/Stanovi.js
+++ b/frontend-react/src/components/subcategories/nekretnine/Stanovi.js
@@ -0,0 +1,23 @@
+import { WrapAll } from "components/widgets/CollapseWrapperAll";
+import {
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Kvadratura,
+  DodatnoZaStan
+} from "components/filters/NekretnineFilter/index";
+
+const StanFilters = [
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Kvadratura,
+  DodatnoZaStan
+];
+const Stanovi = () => WrapAll(StanFilters);
+
+export default Stanovi;
--- a/frontend-react/src/components/subcategories/vozila/Automobili.js
+++ b/frontend-react/src/components/subcategories/vozila/Automobili.js
@@ -0,0 +1,29 @@
+import { WrapAll } from "components/widgets/CollapseWrapperAll";
+import {
+  Proizvodac,
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Godiste,
+  KilometraMin,
+  KilometraMax,
+  Gorivo
+} from "components/filters/VozilaFilter/index";
+
+const AutomobiliFilters = [
+  Proizvodac,
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Godiste,
+  KilometraMin,
+  KilometraMax,
+  Gorivo
+];
+const Automobili = () => WrapAll(AutomobiliFilters);
+
+export default Automobili;
--- a/frontend-react/src/components/subcategories/vozila/Motocikli.js
+++ b/frontend-react/src/components/subcategories/vozila/Motocikli.js
@@ -0,0 +1,27 @@
+import { WrapAll } from "components/widgets/CollapseWrapperAll";
+import {
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Godiste,
+  KilometraMin,
+  KilometraMax,
+  Gorivo
+} from "components/filters/VozilaFilter/index";
+
+const MotocikliFilters = [
+  Kanton,
+  Grad,
+  Cijena,
+  Stanje,
+  Vrsta,
+  Godiste,
+  KilometraMin,
+  KilometraMax,
+  Gorivo
+];
+const Motocikli = () => WrapAll(MotocikliFilters);
+
+export default Motocikli;
--- a/frontend-react/src/components/widgets/CheckboxAndRadioWrapper.js
+++ b/frontend-react/src/components/widgets/CheckboxAndRadioWrapper.js
@@ -0,0 +1,57 @@
+import React from "react";
+import { optionchangewrapper } from "utils/optionchangewrapper";
+import Checkbox from "@material-ui/core/Checkbox";
+import Radio from "@material-ui/core/Radio";
+import "assets/checkboxAndRadioStyle.css";
+
+class CheckboxAndRadioWrapper extends React.Component {
+  optionChange = (option, optionName, type) => {
+    const optionTypePicker = {
+      radio: option.target.value,
+      checkbox: option.target.checked ? option.target.value : false
+    };
+    const { onOptionChanged } = this.props;
+    onOptionChanged({
+      optionName,
+      optionValue: optionTypePicker[type]
+    });
+  };
+  isChecked = (type, value, optionName) => {
+    const { options } = this.props;
+    return options.hasOwnProperty(optionName) && type === "checkbox"
+      ? options[optionName]
+      : options[optionName] === String(value);
+  };
+  renderElements = (elements, componentName) => {
+    return elements.map(({ type, value, name, optionName } = {}) => (
+      <label key={name + type}>
+        {type === "radio" ? (
+          <Radio
+            className="radio-style"
+            name={type === "radio" ? `${componentName}-radio` : ""}
+            type={type}
+            value={value}
+            checked={this.isChecked(type, value, optionName)}
+            onChange={option => this.optionChange(option, optionName, type)}
+          />
+        ) : (
+          <Checkbox
+            className="checkbox-style"
+            type={type}
+            value={value}
+            checked={this.isChecked(type, value, optionName)}
+            onChange={option => this.optionChange(option, optionName, type)}
+          />
+        )}
+        <span className="label-style">{name}</span>
+        <br />
+      </label>
+    ));
+  };
+
+  render() {
+    const { elements, componentName } = this.props;
+    return <div>{this.renderElements(elements, componentName)}</div>;
+  }
+}
+export default optionchangewrapper(CheckboxAndRadioWrapper);
--- a/frontend-react/src/components/widgets/CollapseWrapperAll.js
+++ b/frontend-react/src/components/widgets/CollapseWrapperAll.js
@@ -0,0 +1,13 @@
+import React from "react";
+import CollapseWrapperStyled from "./CollapseWrapperStyled";
+
+export const WrapAll = components => {
+  return components.map(comp => (
+    <CollapseWrapperStyled
+      key={comp.props.componentName}
+      componentName={comp.props.componentName}
+    >
+      {comp}
+    </CollapseWrapperStyled>
+  ));
+};
--- a/frontend-react/src/components/widgets/CollapseWrapperStyled.js
+++ b/frontend-react/src/components/widgets/CollapseWrapperStyled.js
@@ -0,0 +1,71 @@
+import React from "react";
+import { connect } from "react-redux";
+import { OPTION_EXPAND_CHANGE } from "constants/actionTypes";
+
+import withStyles from "@material-ui/core/styles/withStyles";
+import sidebarStyle from "assets/sidebarStyle.js";
+import Collapse from "@material-ui/core/Collapse";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import ListItemText from "@material-ui/core/ListItemText";
+import ExpandLess from "@material-ui/icons/ExpandLess";
+import ExpandMore from "@material-ui/icons/ExpandMore";
+import Dashboard from "@material-ui/icons/Dashboard";
+
+const mapStateToProps = state => {
+  return {
+    uiexpand: state.uiexpand
+  };
+};
+
+const mapDispatchToProps = dispatch => ({
+  onUIExpandChanged: uiExpandOption =>
+    dispatch({ type: OPTION_EXPAND_CHANGE, ...uiExpandOption })
+});
+
+class CollapseWrapperStyled extends React.Component {
+  handleClick = componentName => {
+    this.props.onUIExpandChanged({
+      controlName: componentName,
+      value: !this.props.uiexpand[componentName]
+    });
+  };
+
+  isopen = componentName => this.props.uiexpand[componentName];
+  render() {
+    let { classes, componentName } = this.props;
+    return (
+      <div>
+        <ListItem
+          className={classes.whiteText}
+          onClick={() => this.handleClick(componentName)}
+        >
+          <ListItemIcon className={classes.whiteText}>
+            <Dashboard />
+          </ListItemIcon>
+          <ListItemText
+            className={classes.whiteText}
+            inset
+            primary={componentName}
+            disableTypography={true}
+          />
+          {this.isopen(componentName) ? <ExpandLess /> : <ExpandMore />}
+        </ListItem>
+        <Collapse
+          className={classes.subOptionIndent}
+          in={this.isopen(componentName)}
+          timeout="auto"
+          unmountOnExit
+        >
+          {this.props.children}
+        </Collapse>
+      </div>
+    );
+  }
+}
+export default withStyles(sidebarStyle)(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(CollapseWrapperStyled)
+);
--- a/frontend-react/src/components/widgets/DeepCategoryWrapper.js
+++ b/frontend-react/src/components/widgets/DeepCategoryWrapper.js
@@ -0,0 +1,61 @@
+import React from "react";
+import { subcategorywrapper } from "utils/subcategorywrapper";
+import { hoc } from "utils/helpers";
+
+import withStyles from "@material-ui/core/styles/withStyles";
+import sidebarStyle from "assets/sidebarStyle.js";
+import List from "@material-ui/core/List";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import ListItemText from "@material-ui/core/ListItemText";
+import StarBorder from "@material-ui/icons/StarBorder";
+
+class DeepCategoryWrapper extends React.Component {
+  handleOptionChange = selectedOption => {
+    const { depth, onSubCategoryChanged } = this.props;
+    onSubCategoryChanged({ selectedOption, depth });
+  };
+
+  render() {
+    const { options, depth, childrenComponents, classes } = this.props;
+    const {
+      subcategory: { [depth]: deepSubCategory }
+    } = this.props;
+
+    return (
+      <div>
+        <List disablePadding>
+          {options.map(({ label, value }, index) => (
+            <ListItem
+              onClick={() => this.handleOptionChange({ label, value })}
+              className={
+                classes.nested +
+                " " +
+                classes.collapsedItemStyle +
+                " " +
+                (deepSubCategory && deepSubCategory.value === value
+                  ? classes.checkedItem
+                  : "")
+              }
+              key={index}
+            >
+              <ListItemIcon className={classes.whiteText}>
+                <StarBorder />
+              </ListItemIcon>
+              <ListItemText
+                className={classes.whiteText}
+                primary={label}
+                disableTypography={true}
+              />
+            </ListItem>
+          ))}
+        </List>
+
+        {hoc(deepSubCategory && deepSubCategory.value, childrenComponents)}
+      </div>
+    );
+  }
+}
+export default withStyles(sidebarStyle)(
+  subcategorywrapper(DeepCategoryWrapper)
+);
--- a/frontend-react/src/components/widgets/DropDownWrapper.js
+++ b/frontend-react/src/components/widgets/DropDownWrapper.js
@@ -0,0 +1,54 @@
+import React from "react";
+import { optionchangewrapper } from "utils/optionchangewrapper";
+
+import withStyles from "@material-ui/core/styles/withStyles";
+import List from "@material-ui/core/List";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import ListItemText from "@material-ui/core/ListItemText";
+import sidebarStyle from "assets/sidebarStyle.js";
+import StarBorder from "@material-ui/icons/StarBorder";
+
+class DropdownWrapper extends React.Component {
+  handleOptionChange = selectedOption => {
+    const { onOptionChanged, optionName } = this.props;
+    onOptionChanged({
+      optionName,
+      optionValue: selectedOption
+    });
+  };
+
+  render() {
+    let { value, options, choices, classes } = this.props;
+    let optionName = value;
+    return (
+      <List disablePadding>
+        {choices.map(({ label, value }, index) => (
+          <ListItem
+            onClick={() => this.handleOptionChange({ label, value })}
+            className={
+              classes.nested +
+              " " +
+              classes.collapsedItemStyle +
+              " " +
+              (options[optionName] && options[optionName].value === value
+                ? classes.checkedItem
+                : "")
+            }
+            key={index}
+          >
+            <ListItemIcon className={classes.whiteText}>
+              <StarBorder />
+            </ListItemIcon>
+            <ListItemText
+              className={classes.whiteText}
+              primary={label}
+              disableTypography={true}
+            />
+          </ListItem>
+        ))}
+      </List>
+    );
+  }
+}
+export default withStyles(sidebarStyle)(optionchangewrapper(DropdownWrapper));
--- a/frontend-react/src/components/widgets/RangeWrapper.js
+++ b/frontend-react/src/components/widgets/RangeWrapper.js
@@ -0,0 +1,70 @@
+import React from "react";
+import { Range } from "rc-slider";
+import { optionchangewrapper } from "utils/optionchangewrapper";
+import "assets/rangeStyle.css";
+import "rc-slider/assets/index.css";
+import Input from "@material-ui/core/Input";
+
+class RangeWrapper extends React.Component {
+  sendAction = (optionName, optionValue) => {
+    this.props.onOptionChanged({
+      optionName,
+      optionValue
+    });
+  };
+  handleRangeChange = ([min, max] = this.props.defaultValues) => {
+    this.inputMin.value = min;
+    this.inputMax.value = max;
+    const { optionNames } = this.props;
+    const optionValues = [min, max];
+    optionNames.forEach((optionName, index) =>
+      this.sendAction(optionName, optionValues[index])
+    );
+  };
+
+  handleInputChange = () => {
+    const { optionNames } = this.props;
+    const optionValues = [this.inputMin.value, this.inputMax.value];
+    optionNames.forEach((optionName, index) =>
+      this.sendAction(optionName, optionValues[index])
+    );
+  };
+
+  render() {
+    const { step, defaultValues, min, max } = this.props;
+    return (
+      <div>
+        <Range
+          min={min}
+          max={max}
+          defaultValue={defaultValues}
+          step={step}
+          onAfterChange={this.handleRangeChange}
+        />
+        <Input
+          placeholder="Min"
+          className="input-style"
+          inputProps={{
+            "aria-label": "Min"
+          }}
+          inputRef={node => {
+            this.inputMin = node;
+          }}
+          onChange={this.handleInputChange}
+        />
+        <Input
+          placeholder="Max"
+          className="input-style"
+          inputProps={{
+            "aria-label": "Max"
+          }}
+          inputRef={node => {
+            this.inputMax = node;
+          }}
+          onChange={this.handleInputChange}
+        />
+      </div>
+    );
+  }
+}
+export default optionchangewrapper(RangeWrapper);
--- a/frontend-react/src/components/widgets/SelectDisplayCheckboxWrapper.js
+++ b/frontend-react/src/components/widgets/SelectDisplayCheckboxWrapper.js
@@ -0,0 +1,21 @@
+import React from "react";
+import CheckboxAndRadioWrapper from "components/widgets/CheckboxAndRadioWrapper";
+import { optionchangewrapper } from "utils/optionchangewrapper";
+
+class SelectDisplayCheckboxWrapper extends React.Component {
+  render() {
+    const { options, checkboxOptions, parentOptionName } = this.props;
+    let elements =
+      options[parentOptionName] &&
+      checkboxOptions[options[parentOptionName].value].elements;
+    return elements ? (
+      <div>
+        <CheckboxAndRadioWrapper
+          componentName={`${parentOptionName}-child`}
+          elements={elements}
+        />
+      </div>
+    ) : null;
+  }
+}
+export default optionchangewrapper(SelectDisplayCheckboxWrapper);
--- a/frontend-react/src/components/widgets/SelectWrapper.js
+++ b/frontend-react/src/components/widgets/SelectWrapper.js
@@ -0,0 +1,25 @@
+import React from "react";
+import Select from "react-select";
+import { optionchangewrapper } from "utils/optionchangewrapper";
+
+class SelectWrapper extends React.Component {
+  handleOptionChange = selectedOption => {
+    const { onOptionChanged, optionName } = this.props;
+    onOptionChanged({
+      optionName,
+      optionValue: selectedOption
+    });
+  };
+
+  render() {
+    let { value, options, choices } = this.props;
+    return (
+      <Select
+        value={options[value]}
+        onChange={this.handleOptionChange}
+        options={choices}
+      />
+    );
+  }
+}
+export default optionchangewrapper(SelectWrapper);
--- a/frontend-react/src/constants/actionTypes.js
+++ b/frontend-react/src/constants/actionTypes.js
@@ -0,0 +1,8 @@
+export const CATEGORY_SELECT = "CATEGORY_SELECT";
+export const SUBCATEGORY_SELECT = "SUBCATEGORY_SELECT";
+export const OPTION_CHANGE = "OPTION_CHANGE";
+export const ITEMS_CHANGED = "ITEMS_CHANGED";
+export const MODAL_CLOSE = "MODAL_CLOSE";
+export const MODAL_OPEN = " MODAL_OPEN";
+export const USER_DATA_CHANGED = "USER_DATA_CHANGED";
+export const OPTION_EXPAND_CHANGE = "OPTION_EXPAND_CHANGE";
--- a/frontend-react/src/index.js
+++ b/frontend-react/src/index.js
@@ -0,0 +1,15 @@
+import ReactDOM from "react-dom";
+import { Provider } from "react-redux";
+import React from "react";
+import { store } from "./store";
+
+import App from "./components/App";
+import CssBaseline from "@material-ui/core/CssBaseline";
+
+ReactDOM.render(
+  <Provider store={store}>
+    <CssBaseline />
+    <App />
+  </Provider>,
+  document.getElementById("root")
+);
--- a/frontend-react/src/reducer.js
+++ b/frontend-react/src/reducer.js
@@ -0,0 +1,18 @@
+import category from "./reducers/category";
+import subcategory from "./reducers/subcategory";
+import options from "./reducers/options";
+import items from "./reducers/items";
+import modal from "./reducers/modal";
+import userdata from "./reducers/userdata";
+import uiexpand from "./reducers/uiexpand";
+import { combineReducers } from "redux";
+
+export default combineReducers({
+  category,
+  subcategory,
+  options,
+  items,
+  modal,
+  userdata,
+  uiexpand
+});
--- a/frontend-react/src/reducers/category.js
+++ b/frontend-react/src/reducers/category.js
@@ -0,0 +1,10 @@
+import { CATEGORY_SELECT } from "constants/actionTypes";
+
+export default (state = null, action) => {
+	switch (action.type) {
+		case CATEGORY_SELECT:
+			return action.option;
+		default:
+			return state;
+	}
+};
--- a/frontend-react/src/reducers/items.js
+++ b/frontend-react/src/reducers/items.js
@@ -0,0 +1,19 @@
+import {
+  ITEMS_CHANGED,
+  SUBCATEGORY_SELECT,
+  CATEGORY_SELECT,
+  OPTION_CHANGE
+} from "constants/actionTypes";
+
+export default (state = [], action) => {
+  switch (action.type) {
+    case ITEMS_CHANGED:
+      return action.items;
+    case CATEGORY_SELECT:
+    case SUBCATEGORY_SELECT:
+    case OPTION_CHANGE:
+      return [];
+    default:
+      return state;
+  }
+};
--- a/frontend-react/src/reducers/modal.js
+++ b/frontend-react/src/reducers/modal.js
@@ -0,0 +1,12 @@
+import { MODAL_CLOSE, MODAL_OPEN } from "constants/actionTypes";
+
+export default (state = false, action) => {
+  switch (action.type) {
+    case MODAL_CLOSE:
+      return false;
+    case MODAL_OPEN:
+      return true;
+    default:
+      return state;
+  }
+};
--- a/frontend-react/src/reducers/options.js
+++ b/frontend-react/src/reducers/options.js
@@ -0,0 +1,18 @@
+import {
+	SUBCATEGORY_SELECT,
+	CATEGORY_SELECT,
+	OPTION_CHANGE
+} from "constants/actionTypes";
+
+export default (state = {}, action) => {
+	switch (action.type) {
+		case OPTION_CHANGE:
+			return { ...state, [action.optionName]: action.optionValue };
+		case SUBCATEGORY_SELECT:
+			return {};
+		case CATEGORY_SELECT:
+			return {};
+		default:
+			return state;
+	}
+};
--- a/frontend-react/src/reducers/subcategory.js
+++ b/frontend-react/src/reducers/subcategory.js
@@ -0,0 +1,12 @@
+import { SUBCATEGORY_SELECT, CATEGORY_SELECT } from "constants/actionTypes";
+
+export default (state = {}, action) => {
+  switch (action.type) {
+    case SUBCATEGORY_SELECT:
+      return { ...state, [action.option.depth]: action.option.selectedOption };
+    case CATEGORY_SELECT:
+      return {};
+    default:
+      return state;
+  }
+};
--- a/frontend-react/src/reducers/uiexpand.js
+++ b/frontend-react/src/reducers/uiexpand.js
@@ -0,0 +1,18 @@
+import {
+  OPTION_EXPAND_CHANGE,
+  CATEGORY_SELECT,
+  SUBCATEGORY_SELECT
+} from "constants/actionTypes";
+
+export default (state = {}, action) => {
+  switch (action.type) {
+    case OPTION_EXPAND_CHANGE:
+      return { ...state, [action.controlName]: action.value };
+    case CATEGORY_SELECT:
+      return {};
+    case SUBCATEGORY_SELECT:
+      return { Podkategorija: state["Podkategorija"] };
+    default:
+      return state;
+  }
+};
--- a/frontend-react/src/reducers/userdata.js
+++ b/frontend-react/src/reducers/userdata.js
@@ -0,0 +1,10 @@
+import { USER_DATA_CHANGED } from "constants/actionTypes";
+
+export default (state = {}, action) => {
+  switch (action.type) {
+    case USER_DATA_CHANGED:
+      return { ...state, [action.info]: action.value };
+    default:
+      return state;
+  }
+};
--- a/frontend-react/src/serviceWorker.js
+++ b/frontend-react/src/serviceWorker.js
@@ -0,0 +1,135 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// resources are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read http://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.1/8 is considered localhost for IPv4.
+    window.location.hostname.match(
+      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+    )
+);
+
+export function register(config) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (isLocalhost) {
+        // This is running on localhost. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // Add some additional logging to localhost, pointing developers to the
+        // service worker/PWA documentation.
+        navigator.serviceWorker.ready.then(() => {
+          console.log(
+            'This web app is being served cache-first by a service ' +
+              'worker. To learn more, visit http://bit.ly/CRA-PWA'
+          );
+        });
+      } else {
+        // Is not localhost. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl, config) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then(registration => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        if (installingWorker == null) {
+          return;
+        }
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the updated precached content has been fetched,
+              // but the previous service worker will still serve the older
+              // content until all client tabs are closed.
+              console.log(
+                'New content is available and will be used when all ' +
+                  'tabs for this page are closed. See http://bit.ly/CRA-PWA.'
+              );
+
+              // Execute callback
+              if (config && config.onUpdate) {
+                config.onUpdate(registration);
+              }
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              console.log('Content is cached for offline use.');
+
+              // Execute callback
+              if (config && config.onSuccess) {
+                config.onSuccess(registration);
+              }
+            }
+          }
+        };
+      };
+    })
+    .catch(error => {
+      console.error('Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl, config) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl)
+    .then(response => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      const contentType = response.headers.get('content-type');
+      if (
+        response.status === 404 ||
+        (contentType != null && contentType.indexOf('javascript') === -1)
+      ) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then(registration => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl, config);
+      }
+    })
+    .catch(() => {
+      console.log(
+        'No internet connection found. App is running in offline mode.'
+      );
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready.then(registration => {
+      registration.unregister();
+    });
+  }
+}
--- a/frontend-react/src/store.js
+++ b/frontend-react/src/store.js
@@ -0,0 +1,11 @@
+import { applyMiddleware, createStore } from "redux";
+import { createLogger } from "redux-logger";
+import { composeWithDevTools } from "redux-devtools-extension/developmentOnly";
+import reducer from "./reducer";
+
+const getMiddleware = () => {
+	if (process.env.NODE_ENV !== "production") {
+		return applyMiddleware(createLogger());
+	}
+};
+export const store = createStore(reducer, composeWithDevTools(getMiddleware()));
--- a/frontend-react/src/utils/createOlxLink.js
+++ b/frontend-react/src/utils/createOlxLink.js
@@ -0,0 +1,38 @@
+const isObject = obj => obj === Object(obj);
+const mapOptionsToLink = options => {
+  const multipleOptions = ["grad"];
+  return Object.entries(options)
+    .filter(([optionName, optionValue]) => optionValue !== false)
+    .map(([optionName, optionValue]) =>
+      isObject(options[optionName])
+        ? [optionName, options[optionName].value]
+        : [optionName, optionValue]
+    )
+    .map(
+      ([optionName, optionValue]) =>
+        !console.log(optionName, optionValue) && [optionName, optionValue]
+    )
+    .reduce((acc, [optionName, optionValue]) => {
+      console.log(optionName, typeof optionName);
+      if (multipleOptions.some(option => ~optionName.indexOf(option))) {
+        const whatOption = multipleOptions.filter(
+          option => ~optionName.indexOf(option)
+        )[0];
+        return acc + `${whatOption}[]=${optionValue}&`;
+      }
+      return acc + `${optionName}=${optionValue}&`;
+    }, "");
+};
+
+export const createOlxLink = (category, subcategory, options) => {
+  const categoryChoice =
+    (Boolean(Object.keys(subcategory).length) &&
+      subcategory[
+        Object.keys(subcategory).reduce((max, key) => (max < key ? key : max))
+      ]) ||
+    category;
+
+  return categoryChoice
+    ? `kategorija=${categoryChoice.value}&${mapOptionsToLink(options)}`
+    : "";
+};
--- a/frontend-react/src/utils/helpers.js
+++ b/frontend-react/src/utils/helpers.js
@@ -0,0 +1,11 @@
+export const hoc = (option, componentList) => componentList[option];
+export const areObjectEqual = function checkEquality(objectA, objectB) {
+  return (
+    Object.keys(objectA).length === Object.keys(objectB).length &&
+    Object.keys(objectA).every(property =>
+      objectA[property] === Object(objectA[property])
+        ? checkEquality(objectA[property], objectB[property])
+        : objectA[property] === objectB[property]
+    )
+  );
+};
--- a/frontend-react/src/utils/notificationmodalwrapper.js
+++ b/frontend-react/src/utils/notificationmodalwrapper.js
@@ -0,0 +1,25 @@
+import { connect } from "react-redux";
+import {
+  MODAL_CLOSE,
+  MODAL_OPEN,
+  USER_DATA_CHANGED
+} from "constants/actionTypes";
+
+const mapStateToProps = state => {
+  return {
+    modal: state.modal,
+    userdata: state.userdata
+  };
+};
+
+const mapDispatchToProps = dispatch => ({
+  onModalOpen: () => dispatch({ type: MODAL_OPEN }),
+  onModalClose: () => dispatch({ type: MODAL_CLOSE }),
+  onUserDataChange: change => dispatch({ type: USER_DATA_CHANGED, ...change })
+});
+
+export const notificationmodalwrapper = component =>
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(component);
--- a/frontend-react/src/utils/optionchangewrapper.js
+++ b/frontend-react/src/utils/optionchangewrapper.js
@@ -0,0 +1,18 @@
+import { connect } from "react-redux";
+import { OPTION_CHANGE } from "constants/actionTypes";
+
+const mapStateToProps = state => {
+	return {
+		options: state.options
+	};
+};
+
+const mapDispatchToProps = dispatch => ({
+	onOptionChanged: option => dispatch({ type: OPTION_CHANGE, ...option })
+});
+
+export const optionchangewrapper = component =>
+	connect(
+		mapStateToProps,
+		mapDispatchToProps
+	)(component);
--- a/frontend-react/src/utils/subcategorywrapper.js
+++ b/frontend-react/src/utils/subcategorywrapper.js
@@ -0,0 +1,19 @@
+import { connect } from "react-redux";
+import { SUBCATEGORY_SELECT } from "constants/actionTypes";
+
+const mapStateToProps = state => {
+	return {
+		subcategory: state.subcategory
+	};
+};
+
+const mapDispatchToProps = dispatch => ({
+	onSubCategoryChanged: option =>
+		dispatch({ type: SUBCATEGORY_SELECT, option })
+});
+
+export const subcategorywrapper = component =>
+	connect(
+		mapStateToProps,
+		mapDispatchToProps
+	)(component);
--- a/ma-api/.gitignore
+++ b/ma-api/.gitignore
@@ -0,0 +1,6 @@
+# package directories
+node_modules
+jspm_packages
+
+# Serverless directories
+.serverless
--- a/ma-api/README.md
+++ b/ma-api/README.md
@@ -0,0 +1,6 @@
+# How to deploy automatically: 
+
+1. set up aws cli with aws configure 
+2. cd ma-api
+3. serverless deploy
+
--- a/ma-api/handler.js
+++ b/ma-api/handler.js
@@ -0,0 +1,83 @@
+'use strict';
+const path = require("path");
+const bodyParser = require("body-parser");
+const MarketAlert = require("./lib/MarketAlert");
+const sendNotification = require("./lib/sendnotification");
+const scrapTheItems = require("./lib/scraptheitems");
+const sequelize = require("./lib/db.js");
+const Twocheckout = require("2checkout-node");
+
+
+module.exports.sendnotification = async (event, context) => {
+  let marketAlerts = await MarketAlert.findAll();
+
+  let lastDateUpdate = await Promise.all(
+    marketAlerts
+      .map(marketAlert => {
+        const { id, email, olx_url, last_date } = marketAlert.dataValues;
+        return { id, email, olx_url, last_date };
+      })
+      .map(sendNotification)
+  );
+
+  lastDateUpdate = lastDateUpdate.filter(Boolean(dateUpdate));
+  lastDateUpdate.length &&
+    lastDateUpdate.forEach(dateUpdate =>
+      MarketAlert.update(
+        { last_date: dateUpdate.date },
+        { where: { id: dateUpdate.id } }
+      )
+    );
+
+  return {
+    statusCode: 200,
+    body: JSON.stringify({
+      message: 'Notifications sent',
+      input: event,
+    }),
+  };
+
+  // Use this code if you don't use the http event with the LAMBDA-PROXY integration
+  // return { message: 'Go Serverless v1.0! Your function executed successfully!', event };
+};
+
+
+module.exports.getitems = async (event, context) => {
+  return {
+    statusCode: 200,
+    body: JSON.stringify({
+      message: 'Get Items',
+      input: event,
+    }),
+  };
+
+  // Use this code if you don't use the http event with the LAMBDA-PROXY integration
+  // return { message: 'Go Serverless v1.0! Your function executed successfully!', event };
+};
+
+module.exports.marketalerts = async (event, context) => {
+  return {
+    statusCode: 200,
+    body: JSON.stringify({
+      message: 'Market alerts',
+      input: event,
+    }),
+  };
+
+  // Use this code if you don't use the http event with the LAMBDA-PROXY integration
+  // return { message: 'Go Serverless v1.0! Your function executed successfully!', event };
+};
+
+module.exports.payforalert = async (event, context) => {
+  return {
+    statusCode: 200,
+    body: JSON.stringify({
+      message: 'Pay for alert',
+      input: event,
+    }),
+  };
+
+  // Use this code if you don't use the http event with the LAMBDA-PROXY integration
+  // return { message: 'Go Serverless v1.0! Your function executed successfully!', event };
+};
+
--- a/ma-api/lib/MarketAlert.js
+++ b/ma-api/lib/MarketAlert.js
@@ -0,0 +1,17 @@
+const Sequelize = require("sequelize");
+const sequelize = require("./db.js");
+const MarketAlert = sequelize.define("market_alert", {
+  id: {
+    type: Sequelize.INTEGER,
+    autoIncrement: true,
+    primaryKey: true
+  },
+  olx_url: Sequelize.STRING,
+  last_date: Sequelize.STRING,
+  email: {
+    type: Sequelize.STRING,
+    allowNull: false
+  }
+});
+
+module.exports = MarketAlert;
--- a/ma-api/lib/arethereanynewitems.js
+++ b/ma-api/lib/arethereanynewitems.js
@@ -0,0 +1,8 @@
+const convertToDate = require("./convertToDate");
+function areThereAnyNewItems(lastItemDate, controlDate) {
+  if (!lastItemDate) {
+    return true;
+  }
+  return new Date(controlDate) < convertToDate(lastItemDate);
+}
+module.exports = areThereAnyNewItems;
--- a/ma-api/lib/config/config.json
+++ b/ma-api/lib/config/config.json
@@ -0,0 +1,23 @@
+{
+  "development": {
+    "username": "javimistaging",
+    "password": "10MinutaSvaki*Dan",
+    "database": "database_development",
+    "host": "javimi-staging.cluster-c52xdqogwrl2.eu-central-1.rds.amazonaws.com",
+    "dialect": "mysql"
+  },
+  "test": {
+    "username": "root",
+    "password": null,
+    "database": "database_test",
+    "host": "127.0.0.1",
+    "dialect": "mysql"
+  },
+  "production": {
+    "username": "root",
+    "password": null,
+    "database": "database_production",
+    "host": "127.0.0.1",
+    "dialect": "mysql"
+  }
+}
--- a/ma-api/lib/convertToDate.js
+++ b/ma-api/lib/convertToDate.js
@@ -0,0 +1,13 @@
+function convertToDate(date) {
+  const [dan, mjesec, godina] = date
+    .split(". u ")[0]
+    .split(".")
+    .map(el => Number(el));
+  const [sati, minute] = date
+    .split(". u ")[1]
+    .split(":")
+    .map(el => Number(el));
+  return new Date(godina, mjesec, dan, sati, minute);
+}
+
+module.exports = convertToDate;
--- a/ma-api/lib/db.js
+++ b/ma-api/lib/db.js
@@ -0,0 +1,8 @@
+const Sequelize = require("sequelize");
+const sequelize = new Sequelize("sql7276322", "sql7276322@localhost", "RS53ihYlg9", {
+  host: "sql7.freemysqlhosting.net",
+  dialect: "mysql",
+  operatorsAliases: false
+});
+
+module.exports = sequelize;
--- a/ma-api/lib/index.js
+++ b/ma-api/lib/index.js
@@ -0,0 +1,96 @@
+let express = require("express");
+const path = require("path");
+const bodyParser = require("body-parser");
+const MarketAlert = require("./MarketAlert");
+const sendNotification = require("./utils/sendnotification");
+const scrapTheItems = require("./utils/scraptheitems");
+const sequelize = require("./db.js");
+const Twocheckout = require("2checkout-node");
+
+const app = express();
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: true }));
+
+const port = process.env.PORT || 5000;
+
+app.get("/sendnotifications", async function(req, res) {
+  let marketAlerts = await MarketAlert.findAll();
+
+  let lastDateUpdate = await Promise.all(
+    marketAlerts
+      .map(marketAlert => {
+        const { id, email, olx_url, last_date } = marketAlert.dataValues;
+        return { id, email, olx_url, last_date };
+      })
+      .map(sendNotification)
+  );
+  lastDateUpdate = lastDateUpdate.filter(Boolean(dateUpdate));
+  lastDateUpdate.length &&
+    lastDateUpdate.forEach(dateUpdate =>
+      MarketAlert.update(
+        { last_date: dateUpdate.date },
+        { where: { id: dateUpdate.id } }
+      )
+    );
+});
+
+app.get("/items/:url", async (req, res) => {
+  let url =
+    "https://www.olx.ba/pretraga?" +
+    req.params.url +
+    "&sort_order=desc&sort_po=datum";
+  let appts = await scrapTheItems(url);
+  res.json({
+    last_date: appts[0] && appts[0].date,
+    items: appts
+  });
+});
+
+app.post("/marketalerts", function(req, res) {
+  const { email, last_date, olx_url } = req.body;
+  console.log(email, last_date, olx_url);
+  res.json({ message: "Market Alert Created!" });
+  // sequelize.sync().then(() =>
+  //   MarketAlert.create({
+  //     olx_url,
+  //     last_date,
+  //     email
+  //   })
+  // );
+  // res.json({ message: "Market Alert Created!" });
+});
+
+app.post("/payforalert", function(request, response) {
+  let tco = new Twocheckout({
+    sellerId: "901402692",
+    privateKey: "A28DCE5F-9292-405C-8161-F84D8BB83AFC",
+    sandbox: true
+  });
+
+  let params = {
+    merchantOrderId: "123",
+    token: request.body.token,
+    currency: "USD",
+    total: "2.00",
+    billingAddr: {
+      name: "Testing Tester",
+      addrLine1: "123 Test St",
+      city: "Sarajevo",
+      state: "BiH",
+      zipCode: "71000",
+      country: "BiH",
+      email: request.body.email,
+      phoneNumber: "5555555555"
+    }
+  };
+
+  tco.checkout.authorize(params, function(error, data) {
+    if (error) {
+      response.send(error.message);
+    } else {
+      response.send(data.response.responseMsg);
+    }
+  });
+});
+
+app.listen(port, () => console.log(`Example app listening on port ${port}!`));
--- a/ma-api/lib/migrations/20190310042110-create-market-alert.js
+++ b/ma-api/lib/migrations/20190310042110-create-market-alert.js
@@ -0,0 +1,27 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('MarketAlerts', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      olx_url: {
+        type: Sequelize.STRING
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('MarketAlerts');
+  }
+};
--- a/ma-api/lib/models/index.js
+++ b/ma-api/lib/models/index.js
@@ -0,0 +1,37 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const Sequelize = require('sequelize');
+const basename = path.basename(__filename);
+const env = process.env.NODE_ENV || 'development';
+const config = require(__dirname + '/../config/config.json')[env];
+const db = {};
+
+let sequelize;
+if (config.use_env_variable) {
+  sequelize = new Sequelize(process.env[config.use_env_variable], config);
+} else {
+  sequelize = new Sequelize(config.database, config.username, config.password, config);
+}
+
+fs
+  .readdirSync(__dirname)
+  .filter(file => {
+    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
+  })
+  .forEach(file => {
+    const model = sequelize['import'](path.join(__dirname, file));
+    db[model.name] = model;
+  });
+
+Object.keys(db).forEach(modelName => {
+  if (db[modelName].associate) {
+    db[modelName].associate(db);
+  }
+});
+
+db.sequelize = sequelize;
+db.Sequelize = Sequelize;
+
+module.exports = db;
--- a/ma-api/lib/models/marketalert.js
+++ b/ma-api/lib/models/marketalert.js
@@ -0,0 +1,10 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const MarketAlert = sequelize.define('MarketAlert', {
+    olx_url: DataTypes.STRING
+  }, {});
+  MarketAlert.associate = function(models) {
+    // associations can be defined here
+  };
+  return MarketAlert;
+};
--- a/ma-api/lib/scraptheitems.js
+++ b/ma-api/lib/scraptheitems.js
@@ -0,0 +1,42 @@
+let fetch = require("node-fetch");
+let cheerio = require("cheerio");
+const areThereAnyNewItems = require("./arethereanynewitems");
+
+async function scrapTheItems(url, controlDate, noNewItems = false) {
+  let items = [];
+  let response = await fetch(url);
+  const body = await response.text();
+  const $ = cheerio.load(body);
+  $("#rezultatipretrage")
+    .find(".listitem")
+    .each(async (index, elem) => {
+      if (noNewItems) return;
+      const itemDate = $(elem)
+        .find(".cijena > .datum > div")
+        .first()
+        .attr("data-cijelidatum");
+
+      if (controlDate && !areThereAnyNewItems(itemDate, controlDate)) {
+        noNewItems = true;
+        return;
+      }
+
+      const id = $(elem)
+        .find("a")
+        .first()
+        .attr("href");
+      const cijena = $(elem)
+        .find(".cijena > .datum > span")
+        .first()
+        .text();
+      const image = $(elem)
+        .find("a > .slika > img")
+        .first()
+        .attr("src");
+
+      items.push({ url: id, price: cijena, image, date: itemDate });
+    });
+  return items;
+}
+
+module.exports = scrapTheItems;
--- a/ma-api/lib/sendnotification.js
+++ b/ma-api/lib/sendnotification.js
@@ -0,0 +1,33 @@
+const scrapTheItems = require("./scraptheitems");
+const convertToDate = require("./convertToDate");
+const sgMail = require("@sendgrid/mail");
+// should be process.env.SENDGRID_API_KEY
+sgMail.setApiKey(
+  "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"
+);
+
+async function sendNotification(marketAlert) {
+  const { id, email, olx_url, last_date } = marketAlert;
+  let url =
+    "https://www.olx.ba/pretraga?" + olx_url + "&sort_order=desc&sort_po=datum";
+  let newItems = await scrapTheItems(url);
+  let lastDate = newItems.length && newItems[0].date;
+  let message =
+    newItems.length &&
+    newItems.reduce(
+      (mes, item) => mes + `<strong>${item.url} i  ${item.price}</strong>`,
+      ""
+    );
+  const msg = {
+    to: email,
+    from: "test@example.com",
+    subject: "Market Alert",
+    text: "New items on olx",
+    html: message
+  };
+  if (message) {
+    await sgMail.send(msg);
+    return { id, date: String(convertToDate(lastDate)) };
+  }
+}
+module.exports = sendNotification;
--- a/ma-api/package-lock.json
+++ b/ma-api/package-lock.json
--- a/ma-api/package.json
+++ b/ma-api/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "backend",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Ehvan Gradanin",
+  "license": "ISC",
+  "dependencies": {
+    "2checkout-node": "0.0.1",
+    "@sendgrid/mail": "^6.3.1",
+    "cheerio": "^1.0.0-rc.2",
+    "express": "^4.16.4",
+    "mysql2": "^1.6.4",
+    "node-fetch": "^2.3.0",
+    "sequelize": "^4.42.0",
+    "sequelize-cli": "^5.4.0"
+  }
+}
--- a/ma-api/serverless.yml
+++ b/ma-api/serverless.yml
@@ -0,0 +1,109 @@
+# Welcome to Serverless!
+#
+# This file is the main config file for your service.
+# It's very minimal at this point and uses default values.
+# You can always add more config options for more control.
+# We've included some commented out config examples here.
+# Just uncomment any of them to get that config option.
+#
+# For full config options, check the docs:
+#    docs.serverless.com
+#
+# Happy Coding!
+
+service: ma-api # NOTE: update this with your service name
+
+# You can pin your service to only deploy with a specific Serverless version
+# Check out our docs for more details
+# frameworkVersion: "=X.X.X"
+
+provider:
+  name: aws
+  runtime: nodejs8.10
+
+# you can overwrite defaults here
+#  stage: dev
+#  region: us-east-1
+
+# you can add statements to the Lambda function's IAM Role here
+#  iamRoleStatements:
+#    - Effect: "Allow"
+#      Action:
+#        - "s3:ListBucket"
+#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#    - Effect: "Allow"
+#      Action:
+#        - "s3:PutObject"
+#      Resource:
+#        Fn::Join:
+#          - ""
+#          - - "arn:aws:s3:::"
+#            - "Ref" : "ServerlessDeploymentBucket"
+#            - "/*"
+
+# you can define service wide environment variables here
+#  environment:
+#    variable1: value1
+
+# you can add packaging information here
+#package:
+#  include:
+#    - include-me.js
+#    - include-me-dir/**
+#  exclude:
+#    - exclude-me.js
+#    - exclude-me-dir/**
+
+functions:
+  sendnotification:
+    handler: handler.sendnotification
+    events:
+      - http:
+          path: notifications/send
+          method: post
+
+#    The following are a few example events you can configure
+#    NOTE: Please make sure to change your handler code to work with those events
+#    Check the event documentation for details
+#    events:
+#      - http:
+#          path: users/create
+#          method: get
+#      - websocket: $connect
+#      - s3: ${env:BUCKET}
+#      - schedule: rate(10 minutes)
+#      - sns: greeter-topic
+#      - stream: arn:aws:dynamodb:region:XXXXXX:table/foo/stream/1970-01-01T00:00:00.000
+#      - alexaSkill: amzn1.ask.skill.xx-xx-xx-xx
+#      - alexaSmartHome: amzn1.ask.skill.xx-xx-xx-xx
+#      - iot:
+#          sql: "SELECT * FROM 'some_topic'"
+#      - cloudwatchEvent:
+#          event:
+#            source:
+#              - "aws.ec2"
+#            detail-type:
+#              - "EC2 Instance State-change Notification"
+#            detail:
+#              state:
+#                - pending
+#      - cloudwatchLog: '/aws/lambda/hello'
+#      - cognitoUserPool:
+#          pool: MyUserPool
+#          trigger: PreSignUp
+
+#    Define function environment variables here
+#    environment:
+#      variable2: value2
+
+# you can add CloudFormation resource templates here
+#resources:
+#  Resources:
+#    NewResource:
+#      Type: AWS::S3::Bucket
+#      Properties:
+#        BucketName: my-new-bucket
+#  Outputs:
+#     NewOutput:
+#       Description: "Description for the output"
+#       Value: "Some output value"
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,34 +0,0 @@
-{
-  "name": "marketalarm",
-  "version": "1.0.1",
-  "description": "Market Alarm",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node ./index.js",
-    "heroku-postbuild": "cd frontend-react && npm install && npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git@gitlab.com:saburly/marketalarm/web.git"
-  },
-  "author": "Saburlije",
-  "license": "ISC",
-  "engines": {
-    "node": "11.10.x"
-  },
-  "dependencies": {
-    "2checkout-node": "0.0.1",
-    "@sendgrid/mail": "^6.3.1",
-    "aws-sdk": "^2.422.0",
-    "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",
-    "sequelize": "^4.42.0"
-  }
-}
Author	SHA1	Message	Date
Senad Uka	e356f7a177	Added migrations	2019-03-10 05:23:52 +01:00
Senad Uka	055ca54002	Sendnotification moved to the lambda / has bugs	2019-03-08 06:24:10 +01:00
Senad Uka	3f8e6438b2	Serverless handler stub created	2019-03-07 06:24:08 +01:00
				`@@ -1,3 +0,0 @@`

				`<a href="<%= nextStep %>"><button>Kreni</button></a>`