Updated to newest node, refactored for heroku

frontend-react/src/components/App.js

@@ -2,19 +2,19 @@ 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 { ITEMS_CHANGED, USER_DATA_CHANGED } from "../constants/actionTypes";
-import { areObjectEqual } from "utils/helpers";
+import { areObjectEqual } from "../utils/helpers";
-import { createOlxLink } from "utils/createOlxLink";
+import { createOlxLink } from "../utils/createOlxLink";
 import axios from "axios";
 
-import image from "assets/img/sidebar-1.jpg";
+import image from "../assets/img/sidebar-1.jpg";
-import logo from "assets/img/reactlogo.png";
+import logo from "../assets/img/reactlogo.png";
 
-import Sidebar from "components/Sidebar.js";
+import Sidebar from "../components/Sidebar.js";
 import ItemsContainer from "./items/itemscontainer/ItemsContainer";
 import NotificationModal from "./NotificationModal";
 
-import dashboardStyle from "assets/dashboardStyle.js";
+import dashboardStyle from "../assets/dashboardStyle.js";
 
 const mapStateToProps = state => {
   return {

frontend-react/src/components/NotificationModal.js

@@ -5,8 +5,8 @@ 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 { notificationmodalwrapper } from "../utils/notificationmodalwrapper";
-import modalStyle from "assets/modalStyle.js";
+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";

frontend-react/src/components/Sidebar.js

@@ -12,16 +12,15 @@ 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 sidebarStyle from "../assets/sidebarStyle.js";
-import CollapseWrapperStyled from "components/widgets/CollapseWrapperStyled";
+import CollapseWrapperStyled from "../components/widgets/CollapseWrapperStyled";
 import DeepCategoryWrapper from "./widgets/DeepCategoryWrapper";
-import { hoc } from "utils/helpers";
+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";
+import { CATEGORY_SELECT } from "../constants/actionTypes";
 
 const options = [
   { value: "Nekretnine", label: "Nekretnine" }

frontend-react/src/components/categories/Vozila.js

@@ -1,20 +0,0 @@
-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
-};

frontend-react/src/components/filters/NekretnineFilter/index.js

@@ -1,9 +1,9 @@
 import React from "react";
 import * as Filters from "./AllFiltersDefined";
-import CheckboxAndRadioWrapper from "components/widgets/CheckboxAndRadioWrapper";
+import CheckboxAndRadioWrapper from "../../widgets/CheckboxAndRadioWrapper";
-import SelectDisplayCheckboxWrapper from "components/widgets/SelectDisplayCheckboxWrapper";
+import SelectDisplayCheckboxWrapper from "../../widgets/SelectDisplayCheckboxWrapper";
-import RangeWrapper from "components/widgets/RangeWrapper";
+import RangeWrapper from "../../widgets/RangeWrapper";
-import DropDownWrapper from "components/widgets/DropDownWrapper";
+import DropDownWrapper from "../../widgets/DropDownWrapper";
 
 const Kanton = (
   <DropDownWrapper componentName="Lokacija" {...Filters.lokacijaOptions} />

frontend-react/src/components/subcategories/nekretnine/Kuce.js

@@ -1,4 +1,4 @@
-import { WrapAll } from "components/widgets/CollapseWrapperAll";
+import { WrapAll } from "../../widgets/CollapseWrapperAll";
 import {
   Kanton,
   Grad,
@@ -7,7 +7,7 @@ import {
   Vrsta,
   Kvadratura,
   DodatnoZaKucu
-} from "components/filters/NekretnineFilter/index";
+} from "../../filters/NekretnineFilter/index";
 
 const KuceFilters = [
   Kanton,

frontend-react/src/components/subcategories/nekretnine/Stanovi.js

@@ -1,4 +1,4 @@
-import { WrapAll } from "components/widgets/CollapseWrapperAll";
+import { WrapAll } from "../../widgets/CollapseWrapperAll";
 import {
   Kanton,
   Grad,
@@ -7,7 +7,7 @@ import {
   Vrsta,
   Kvadratura,
   DodatnoZaStan
-} from "components/filters/NekretnineFilter/index";
+} from "../../filters/NekretnineFilter/index";
 
 const StanFilters = [
   Kanton,

frontend-react/src/components/subcategories/vozila/Automobili.js

@@ -1,29 +0,0 @@
-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;

frontend-react/src/components/widgets/CheckboxAndRadioWrapper.js

@@ -1,8 +1,8 @@
 import React from "react";
-import { optionchangewrapper } from "utils/optionchangewrapper";
+import { optionchangewrapper } from "../../utils/optionchangewrapper";
 import Checkbox from "@material-ui/core/Checkbox";
 import Radio from "@material-ui/core/Radio";
-import "assets/checkboxAndRadioStyle.css";
+import "../../assets/checkboxAndRadioStyle.css";
 
 class CheckboxAndRadioWrapper extends React.Component {
   optionChange = (option, optionName, type) => {

frontend-react/src/components/widgets/CollapseWrapperStyled.js

@@ -1,9 +1,9 @@
 import React from "react";
 import { connect } from "react-redux";
-import { OPTION_EXPAND_CHANGE } from "constants/actionTypes";
+import { OPTION_EXPAND_CHANGE } from "../../constants/actionTypes";
 
 import withStyles from "@material-ui/core/styles/withStyles";
-import sidebarStyle from "assets/sidebarStyle.js";
+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";

frontend-react/src/components/widgets/DeepCategoryWrapper.js

@@ -1,9 +1,9 @@
 import React from "react";
-import { subcategorywrapper } from "utils/subcategorywrapper";
+import { subcategorywrapper } from "../../utils/subcategorywrapper";
-import { hoc } from "utils/helpers";
+import { hoc } from "../../utils/helpers";
 
 import withStyles from "@material-ui/core/styles/withStyles";
-import sidebarStyle from "assets/sidebarStyle.js";
+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";

frontend-react/src/components/widgets/DropDownWrapper.js

@@ -1,12 +1,12 @@
 import React from "react";
-import { optionchangewrapper } from "utils/optionchangewrapper";
+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 sidebarStyle from "../../assets/sidebarStyle.js";
 import StarBorder from "@material-ui/icons/StarBorder";
 
 class DropdownWrapper extends React.Component {

frontend-react/src/components/widgets/RangeWrapper.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { Range } from "rc-slider";
-import { optionchangewrapper } from "utils/optionchangewrapper";
+import { optionchangewrapper } from "../../utils/optionchangewrapper";
-import "assets/rangeStyle.css";
+import "../../assets/rangeStyle.css";
 import "rc-slider/assets/index.css";
 import Input from "@material-ui/core/Input";
 

frontend-react/src/components/widgets/SelectDisplayCheckboxWrapper.js

@@ -1,6 +1,6 @@
 import React from "react";
-import CheckboxAndRadioWrapper from "components/widgets/CheckboxAndRadioWrapper";
+import CheckboxAndRadioWrapper from "../../components/widgets/CheckboxAndRadioWrapper";
-import { optionchangewrapper } from "utils/optionchangewrapper";
+import { optionchangewrapper } from "../../utils/optionchangewrapper";
 
 class SelectDisplayCheckboxWrapper extends React.Component {
   render() {

frontend-react/src/reducers/category.js

@@ -1,4 +1,4 @@
-import { CATEGORY_SELECT } from "constants/actionTypes";
+import { CATEGORY_SELECT } from "../constants/actionTypes";
 
 export default (state = null, action) => {
 	switch (action.type) {

frontend-react/src/reducers/items.js

@@ -3,7 +3,7 @@ import {
   SUBCATEGORY_SELECT,
   CATEGORY_SELECT,
   OPTION_CHANGE
-} from "constants/actionTypes";
+} from "../constants/actionTypes";
 
 export default (state = [], action) => {
   switch (action.type) {

frontend-react/src/reducers/modal.js

@@ -1,4 +1,4 @@
-import { MODAL_CLOSE, MODAL_OPEN } from "constants/actionTypes";
+import { MODAL_CLOSE, MODAL_OPEN } from "../constants/actionTypes";
 
 export default (state = false, action) => {
   switch (action.type) {

frontend-react/src/reducers/options.js

@@ -2,7 +2,7 @@ import {
 	SUBCATEGORY_SELECT,
 	CATEGORY_SELECT,
 	OPTION_CHANGE
-} from "constants/actionTypes";
+} from "../constants/actionTypes";
 
 export default (state = {}, action) => {
 	switch (action.type) {

frontend-react/src/reducers/subcategory.js

@@ -1,4 +1,4 @@
-import { SUBCATEGORY_SELECT, CATEGORY_SELECT } from "constants/actionTypes";
+import { SUBCATEGORY_SELECT, CATEGORY_SELECT } from "../constants/actionTypes";
 
 export default (state = {}, action) => {
   switch (action.type) {

frontend-react/src/reducers/uiexpand.js

@@ -2,7 +2,7 @@ import {
   OPTION_EXPAND_CHANGE,
   CATEGORY_SELECT,
   SUBCATEGORY_SELECT
-} from "constants/actionTypes";
+} from "../constants/actionTypes";
 
 export default (state = {}, action) => {
   switch (action.type) {

frontend-react/src/reducers/userdata.js

@@ -1,4 +1,4 @@
-import { USER_DATA_CHANGED } from "constants/actionTypes";
+import { USER_DATA_CHANGED } from "../constants/actionTypes";
 
 export default (state = {}, action) => {
   switch (action.type) {

frontend-react/src/utils/notificationmodalwrapper.js

@@ -3,7 +3,7 @@ import {
   MODAL_CLOSE,
   MODAL_OPEN,
   USER_DATA_CHANGED
-} from "constants/actionTypes";
+} from "../constants/actionTypes";
 
 const mapStateToProps = state => {
   return {

frontend-react/src/utils/optionchangewrapper.js

@@ -1,5 +1,5 @@
 import { connect } from "react-redux";
-import { OPTION_CHANGE } from "constants/actionTypes";
+import { OPTION_CHANGE } from "../constants/actionTypes";
 
 const mapStateToProps = state => {
 	return {

frontend-react/src/utils/subcategorywrapper.js

@@ -1,5 +1,5 @@
 import { connect } from "react-redux";
-import { SUBCATEGORY_SELECT } from "constants/actionTypes";
+import { SUBCATEGORY_SELECT } from "../constants/actionTypes";
 
 const mapStateToProps = state => {
 	return {

index.js

@@ -1,10 +1,10 @@
 let express = require("express");
 const path = require("path");
 const bodyParser = require("body-parser");
-const MarketAlert = require("./MarketAlert");
+const MarketAlert = require("./backend/MarketAlert");
-const sendNotification = require("./utils/sendnotification");
+const sendNotification = require("./backend/utils/sendnotification");
-const scrapTheItems = require("./utils/scraptheitems");
+const scrapTheItems = require("./backend/utils/scraptheitems");
-const sequelize = require("./db.js");
+const sequelize = require("./backend/db.js");
 const Twocheckout = require("2checkout-node");
 
 const app = express();
@@ -98,7 +98,7 @@ app.post("/payforalert", function(request, response) {
 
 // Anything that doesn't match the above, send back index.html
 app.get('*', (req, res) => {
-  res.sendFile(path.join(__dirname + '/../frontend-react/build/index.html'))
+  res.sendFile(path.join(__dirname + './frontend-react/build/index.html'))
 })
 
 app.listen(port, () => console.log(`Example app listening on port ${port}!`));

package.json

@@ -2,9 +2,11 @@
   "name": "marketalarm",
   "version": "1.0.0",
   "description": "Market Alarm",
-  "main": "./backend/index.js",
+  "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "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",
@@ -16,10 +18,12 @@
     "node": "11.10.x"
   },
   "dependencies": {
-  },
+    "2checkout-node": "0.0.1",
-  "scripts": {
+    "@sendgrid/mail": "^6.3.1",
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "cheerio": "^1.0.0-rc.2",
-    "start": "node ./backend/index.js",
+    "express": "^4.16.4",
-    "heroku-postbuild": "cd frontend-react && npm install && npm run build && cd .. && cd backend && npm install"
+    "mysql2": "^1.6.4",
+    "node-fetch": "^2.3.0",
+    "sequelize": "^4.42.0"
   }
 }