Compare commits
8 Commits
heroku-por
...
email_to_a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f53d60ab0f | ||
|
|
6821054494 | ||
|
|
cb34890583 | ||
|
|
2669aaa9eb | ||
|
|
13a9886292 | ||
|
|
a6df827cd1 | ||
|
|
b67b15c4b9 | ||
|
|
a4ed76e29b |
@@ -1,8 +1,4 @@
|
|||||||
const Sequelize = require("sequelize");
|
const Sequelize = require("sequelize");
|
||||||
const sequelize = new Sequelize("sql7276322", "sql7276322", "RS53ihYlg9", {
|
const sequelize = new Sequelize(process.env.JAWSDB_URL);
|
||||||
host: "sql7.freemysqlhosting.net",
|
|
||||||
dialect: "mysql",
|
|
||||||
operatorsAliases: false
|
|
||||||
});
|
|
||||||
|
|
||||||
module.exports = sequelize;
|
module.exports = sequelize;
|
||||||
|
|||||||
1168
backend/package-lock.json
generated
1168
backend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,20 +0,0 @@
|
|||||||
{
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +1,8 @@
|
|||||||
const scrapTheItems = require("./scraptheitems");
|
const scrapTheItems = require("./scraptheitems");
|
||||||
const convertToDate = require("./convertToDate");
|
const convertToDate = require("./convertToDate");
|
||||||
const sgMail = require("@sendgrid/mail");
|
const AWS = require('aws-sdk');
|
||||||
// should be process.env.SENDGRID_API_KEY
|
AWS.config.update({region: 'eu-central-1'});
|
||||||
sgMail.setApiKey(
|
|
||||||
"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"
|
|
||||||
);
|
|
||||||
|
|
||||||
async function sendNotification(marketAlert) {
|
async function sendNotification(marketAlert) {
|
||||||
const { id, email, olx_url, last_date } = marketAlert;
|
const { id, email, olx_url, last_date } = marketAlert;
|
||||||
@@ -18,16 +16,43 @@ async function sendNotification(marketAlert) {
|
|||||||
(mes, item) => mes + `<strong>${item.url} i ${item.price}</strong>`,
|
(mes, item) => mes + `<strong>${item.url} i ${item.price}</strong>`,
|
||||||
""
|
""
|
||||||
);
|
);
|
||||||
const msg = {
|
|
||||||
to: email,
|
// Create sendEmail params
|
||||||
from: "test@example.com",
|
var params = {
|
||||||
subject: "Market Alert",
|
Destination: { /* required */
|
||||||
text: "New items on olx",
|
CcAddresses: [
|
||||||
html: message
|
],
|
||||||
|
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) {
|
if (message) {
|
||||||
await sgMail.send(msg);
|
const sendPromise = new AWS.SES({apiVersion: '2010-12-01'}).sendEmail(params).promise();
|
||||||
|
await sendPromise;
|
||||||
return { id, date: String(convertToDate(lastDate)) };
|
return { id, date: String(convertToDate(lastDate)) };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = sendNotification;
|
module.exports = sendNotification;
|
||||||
|
|||||||
@@ -2,19 +2,19 @@ import React from "react";
|
|||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
import withStyles from "@material-ui/core/styles/withStyles";
|
import withStyles from "@material-ui/core/styles/withStyles";
|
||||||
import { connect } from "react-redux";
|
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 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 ItemsContainer from "./items/itemscontainer/ItemsContainer";
|
||||||
import NotificationModal from "./NotificationModal";
|
import NotificationModal from "./NotificationModal";
|
||||||
|
|
||||||
import dashboardStyle from "assets/dashboardStyle.js";
|
import dashboardStyle from "../assets/dashboardStyle.js";
|
||||||
|
|
||||||
const mapStateToProps = state => {
|
const mapStateToProps = state => {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import DialogContent from "@material-ui/core/DialogContent";
|
|||||||
import DialogActions from "@material-ui/core/DialogActions";
|
import DialogActions from "@material-ui/core/DialogActions";
|
||||||
import Slide from "@material-ui/core/Slide";
|
import Slide from "@material-ui/core/Slide";
|
||||||
import withStyles from "@material-ui/core/styles/withStyles";
|
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 Button from "@material-ui/core/Button";
|
||||||
import IconButton from "@material-ui/core/IconButton";
|
import IconButton from "@material-ui/core/IconButton";
|
||||||
import Close from "@material-ui/icons/Close";
|
import Close from "@material-ui/icons/Close";
|
||||||
|
|||||||
@@ -12,16 +12,15 @@ import ExpandMore from "@material-ui/icons/ExpandMore";
|
|||||||
import Collapse from "@material-ui/core/Collapse";
|
import Collapse from "@material-ui/core/Collapse";
|
||||||
import StarBorder from "@material-ui/icons/StarBorder";
|
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 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 * as Nekretnine from "./categories/Nekretnine";
|
||||||
|
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { CATEGORY_SELECT } from "constants/actionTypes";
|
import { CATEGORY_SELECT } from "../constants/actionTypes";
|
||||||
|
|
||||||
const options = [
|
const options = [
|
||||||
{ value: "Nekretnine", label: "Nekretnine" }
|
{ value: "Nekretnine", label: "Nekretnine" }
|
||||||
|
|||||||
@@ -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
|
|
||||||
};
|
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import * as Filters from "./AllFiltersDefined";
|
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 = (
|
const Kanton = (
|
||||||
<DropDownWrapper componentName="Lokacija" {...Filters.lokacijaOptions} />
|
<DropDownWrapper componentName="Lokacija" {...Filters.lokacijaOptions} />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { WrapAll } from "components/widgets/CollapseWrapperAll";
|
import { WrapAll } from "../../widgets/CollapseWrapperAll";
|
||||||
import {
|
import {
|
||||||
Kanton,
|
Kanton,
|
||||||
Grad,
|
Grad,
|
||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
Vrsta,
|
Vrsta,
|
||||||
Kvadratura,
|
Kvadratura,
|
||||||
DodatnoZaKucu
|
DodatnoZaKucu
|
||||||
} from "components/filters/NekretnineFilter/index";
|
} from "../../filters/NekretnineFilter/index";
|
||||||
|
|
||||||
const KuceFilters = [
|
const KuceFilters = [
|
||||||
Kanton,
|
Kanton,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { WrapAll } from "components/widgets/CollapseWrapperAll";
|
import { WrapAll } from "../../widgets/CollapseWrapperAll";
|
||||||
import {
|
import {
|
||||||
Kanton,
|
Kanton,
|
||||||
Grad,
|
Grad,
|
||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
Vrsta,
|
Vrsta,
|
||||||
Kvadratura,
|
Kvadratura,
|
||||||
DodatnoZaStan
|
DodatnoZaStan
|
||||||
} from "components/filters/NekretnineFilter/index";
|
} from "../../filters/NekretnineFilter/index";
|
||||||
|
|
||||||
const StanFilters = [
|
const StanFilters = [
|
||||||
Kanton,
|
Kanton,
|
||||||
|
|||||||
@@ -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;
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { optionchangewrapper } from "utils/optionchangewrapper";
|
import { optionchangewrapper } from "../../utils/optionchangewrapper";
|
||||||
import Checkbox from "@material-ui/core/Checkbox";
|
import Checkbox from "@material-ui/core/Checkbox";
|
||||||
import Radio from "@material-ui/core/Radio";
|
import Radio from "@material-ui/core/Radio";
|
||||||
import "assets/checkboxAndRadioStyle.css";
|
import "../../assets/checkboxAndRadioStyle.css";
|
||||||
|
|
||||||
class CheckboxAndRadioWrapper extends React.Component {
|
class CheckboxAndRadioWrapper extends React.Component {
|
||||||
optionChange = (option, optionName, type) => {
|
optionChange = (option, optionName, type) => {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { connect } from "react-redux";
|
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 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 Collapse from "@material-ui/core/Collapse";
|
||||||
import ListItem from "@material-ui/core/ListItem";
|
import ListItem from "@material-ui/core/ListItem";
|
||||||
import ListItemIcon from "@material-ui/core/ListItemIcon";
|
import ListItemIcon from "@material-ui/core/ListItemIcon";
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import React from "react";
|
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 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 List from "@material-ui/core/List";
|
||||||
import ListItem from "@material-ui/core/ListItem";
|
import ListItem from "@material-ui/core/ListItem";
|
||||||
import ListItemIcon from "@material-ui/core/ListItemIcon";
|
import ListItemIcon from "@material-ui/core/ListItemIcon";
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { optionchangewrapper } from "utils/optionchangewrapper";
|
import { optionchangewrapper } from "../../utils/optionchangewrapper";
|
||||||
|
|
||||||
import withStyles from "@material-ui/core/styles/withStyles";
|
import withStyles from "@material-ui/core/styles/withStyles";
|
||||||
import List from "@material-ui/core/List";
|
import List from "@material-ui/core/List";
|
||||||
import ListItem from "@material-ui/core/ListItem";
|
import ListItem from "@material-ui/core/ListItem";
|
||||||
import ListItemIcon from "@material-ui/core/ListItemIcon";
|
import ListItemIcon from "@material-ui/core/ListItemIcon";
|
||||||
import ListItemText from "@material-ui/core/ListItemText";
|
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";
|
import StarBorder from "@material-ui/icons/StarBorder";
|
||||||
|
|
||||||
class DropdownWrapper extends React.Component {
|
class DropdownWrapper extends React.Component {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { Range } from "rc-slider";
|
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 "rc-slider/assets/index.css";
|
||||||
import Input from "@material-ui/core/Input";
|
import Input from "@material-ui/core/Input";
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React from "react";
|
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 {
|
class SelectDisplayCheckboxWrapper extends React.Component {
|
||||||
render() {
|
render() {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { CATEGORY_SELECT } from "constants/actionTypes";
|
import { CATEGORY_SELECT } from "../constants/actionTypes";
|
||||||
|
|
||||||
export default (state = null, action) => {
|
export default (state = null, action) => {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import {
|
|||||||
SUBCATEGORY_SELECT,
|
SUBCATEGORY_SELECT,
|
||||||
CATEGORY_SELECT,
|
CATEGORY_SELECT,
|
||||||
OPTION_CHANGE
|
OPTION_CHANGE
|
||||||
} from "constants/actionTypes";
|
} from "../constants/actionTypes";
|
||||||
|
|
||||||
export default (state = [], action) => {
|
export default (state = [], action) => {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
|
|||||||
@@ -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) => {
|
export default (state = false, action) => {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import {
|
|||||||
SUBCATEGORY_SELECT,
|
SUBCATEGORY_SELECT,
|
||||||
CATEGORY_SELECT,
|
CATEGORY_SELECT,
|
||||||
OPTION_CHANGE
|
OPTION_CHANGE
|
||||||
} from "constants/actionTypes";
|
} from "../constants/actionTypes";
|
||||||
|
|
||||||
export default (state = {}, action) => {
|
export default (state = {}, action) => {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { SUBCATEGORY_SELECT, CATEGORY_SELECT } from "constants/actionTypes";
|
import { SUBCATEGORY_SELECT, CATEGORY_SELECT } from "../constants/actionTypes";
|
||||||
|
|
||||||
export default (state = {}, action) => {
|
export default (state = {}, action) => {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import {
|
|||||||
OPTION_EXPAND_CHANGE,
|
OPTION_EXPAND_CHANGE,
|
||||||
CATEGORY_SELECT,
|
CATEGORY_SELECT,
|
||||||
SUBCATEGORY_SELECT
|
SUBCATEGORY_SELECT
|
||||||
} from "constants/actionTypes";
|
} from "../constants/actionTypes";
|
||||||
|
|
||||||
export default (state = {}, action) => {
|
export default (state = {}, action) => {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { USER_DATA_CHANGED } from "constants/actionTypes";
|
import { USER_DATA_CHANGED } from "../constants/actionTypes";
|
||||||
|
|
||||||
export default (state = {}, action) => {
|
export default (state = {}, action) => {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import {
|
|||||||
MODAL_CLOSE,
|
MODAL_CLOSE,
|
||||||
MODAL_OPEN,
|
MODAL_OPEN,
|
||||||
USER_DATA_CHANGED
|
USER_DATA_CHANGED
|
||||||
} from "constants/actionTypes";
|
} from "../constants/actionTypes";
|
||||||
|
|
||||||
const mapStateToProps = state => {
|
const mapStateToProps = state => {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { OPTION_CHANGE } from "constants/actionTypes";
|
import { OPTION_CHANGE } from "../constants/actionTypes";
|
||||||
|
|
||||||
const mapStateToProps = state => {
|
const mapStateToProps = state => {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { SUBCATEGORY_SELECT } from "constants/actionTypes";
|
import { SUBCATEGORY_SELECT } from "../constants/actionTypes";
|
||||||
|
|
||||||
const mapStateToProps = state => {
|
const mapStateToProps = state => {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
let express = require("express");
|
let express = require("express");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const bodyParser = require("body-parser");
|
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 Twocheckout = require("2checkout-node");
|
||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
@@ -95,10 +95,11 @@ app.post("/payforalert", function(request, response) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.use(express.static(path.join(__dirname, 'frontend-react/build')));
|
||||||
|
|
||||||
// Anything that doesn't match the above, send back index.html
|
// Anything that doesn't match the above, send back index.html
|
||||||
app.get('*', (req, res) => {
|
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}!`));
|
app.listen(port, () => console.log(`Example app listening on port ${port}!`));
|
||||||
93
package-lock.json
generated
93
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "marketalarm",
|
"name": "marketalarm",
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -130,6 +130,22 @@
|
|||||||
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
|
||||||
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
|
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
|
||||||
},
|
},
|
||||||
|
"aws-sdk": {
|
||||||
|
"version": "2.422.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.422.0.tgz",
|
||||||
|
"integrity": "sha512-t/hUQcRVhbw3EPS84d7YqwIAMSXHT5V/s6m0ivgLjIXnzRng0qRD1KGTkoLkXnY+X/o/NdvVIIfLfO4VF8xqMw==",
|
||||||
|
"requires": {
|
||||||
|
"buffer": "4.9.1",
|
||||||
|
"events": "1.1.1",
|
||||||
|
"ieee754": "1.1.8",
|
||||||
|
"jmespath": "0.15.0",
|
||||||
|
"querystring": "0.2.0",
|
||||||
|
"sax": "1.2.1",
|
||||||
|
"url": "0.10.3",
|
||||||
|
"uuid": "3.3.2",
|
||||||
|
"xml2js": "0.4.19"
|
||||||
|
}
|
||||||
|
},
|
||||||
"aws-sign2": {
|
"aws-sign2": {
|
||||||
"version": "0.7.0",
|
"version": "0.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
|
||||||
@@ -140,6 +156,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
|
||||||
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
|
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
|
||||||
},
|
},
|
||||||
|
"base64-js": {
|
||||||
|
"version": "1.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
|
||||||
|
"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
|
||||||
|
},
|
||||||
"bcrypt-pbkdf": {
|
"bcrypt-pbkdf": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
|
||||||
@@ -175,6 +196,16 @@
|
|||||||
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
|
||||||
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
|
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
|
||||||
},
|
},
|
||||||
|
"buffer": {
|
||||||
|
"version": "4.9.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
|
||||||
|
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
|
||||||
|
"requires": {
|
||||||
|
"base64-js": "^1.0.2",
|
||||||
|
"ieee754": "^1.1.4",
|
||||||
|
"isarray": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"bytes": {
|
"bytes": {
|
||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
|
||||||
@@ -395,6 +426,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
|
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
|
||||||
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
|
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
|
||||||
},
|
},
|
||||||
|
"events": {
|
||||||
|
"version": "1.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
|
||||||
|
"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
|
||||||
|
},
|
||||||
"express": {
|
"express": {
|
||||||
"version": "4.16.4",
|
"version": "4.16.4",
|
||||||
"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
|
"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
|
||||||
@@ -573,6 +609,11 @@
|
|||||||
"safer-buffer": ">= 2.1.2 < 3"
|
"safer-buffer": ">= 2.1.2 < 3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"ieee754": {
|
||||||
|
"version": "1.1.8",
|
||||||
|
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
|
||||||
|
"integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
|
||||||
|
},
|
||||||
"inflection": {
|
"inflection": {
|
||||||
"version": "1.12.0",
|
"version": "1.12.0",
|
||||||
"resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
|
"resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
|
||||||
@@ -603,11 +644,21 @@
|
|||||||
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
|
||||||
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
|
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
|
||||||
},
|
},
|
||||||
|
"isarray": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
|
||||||
|
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
|
||||||
|
},
|
||||||
"isstream": {
|
"isstream": {
|
||||||
"version": "0.1.2",
|
"version": "0.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
|
||||||
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
|
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
|
||||||
},
|
},
|
||||||
|
"jmespath": {
|
||||||
|
"version": "0.15.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
|
||||||
|
"integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
|
||||||
|
},
|
||||||
"jsbn": {
|
"jsbn": {
|
||||||
"version": "0.1.1",
|
"version": "0.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
|
||||||
@@ -825,6 +876,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
|
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
|
||||||
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
|
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
|
||||||
},
|
},
|
||||||
|
"querystring": {
|
||||||
|
"version": "0.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
|
||||||
|
"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
|
||||||
|
},
|
||||||
"range-parser": {
|
"range-parser": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
|
||||||
@@ -897,6 +953,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
|
||||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
||||||
},
|
},
|
||||||
|
"sax": {
|
||||||
|
"version": "1.2.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
|
||||||
|
"integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
|
||||||
|
},
|
||||||
"semver": {
|
"semver": {
|
||||||
"version": "5.6.0",
|
"version": "5.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
|
||||||
@@ -1102,6 +1163,22 @@
|
|||||||
"punycode": "^2.1.0"
|
"punycode": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"url": {
|
||||||
|
"version": "0.10.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
|
||||||
|
"integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
|
||||||
|
"requires": {
|
||||||
|
"punycode": "1.3.2",
|
||||||
|
"querystring": "0.2.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"punycode": {
|
||||||
|
"version": "1.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
|
||||||
|
"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"util-deprecate": {
|
"util-deprecate": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
|
||||||
@@ -1145,6 +1222,20 @@
|
|||||||
"@types/node": "*"
|
"@types/node": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"xml2js": {
|
||||||
|
"version": "0.4.19",
|
||||||
|
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
|
||||||
|
"integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
|
||||||
|
"requires": {
|
||||||
|
"sax": ">=0.6.0",
|
||||||
|
"xmlbuilder": "~9.0.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"xmlbuilder": {
|
||||||
|
"version": "9.0.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
|
||||||
|
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
|
||||||
|
},
|
||||||
"yallist": {
|
"yallist": {
|
||||||
"version": "2.1.2",
|
"version": "2.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
|
||||||
|
|||||||
21
package.json
21
package.json
@@ -1,10 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "marketalarm",
|
"name": "marketalarm",
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"description": "Market Alarm",
|
"description": "Market Alarm",
|
||||||
"main": "./backend/index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"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": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -16,10 +18,13 @@
|
|||||||
"node": "11.10.x"
|
"node": "11.10.x"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
},
|
"2checkout-node": "0.0.1",
|
||||||
"scripts": {
|
"@sendgrid/mail": "^6.3.1",
|
||||||
"test": "echo \"Error: no test specified\" && exit 1",
|
"aws-sdk": "^2.422.0",
|
||||||
"start": "node ./backend/index.js",
|
"cheerio": "^1.0.0-rc.2",
|
||||||
"heroku-postbuild": "cd frontend-react && npm install && npm run build && cd .. && cd backend && npm install"
|
"express": "^4.16.4",
|
||||||
|
"mysql2": "^1.6.4",
|
||||||
|
"node-fetch": "^2.3.0",
|
||||||
|
"sequelize": "^4.42.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user