Refactorized. Fixed build bug locally. Will test bug in Heroku.

VctorAHernndez · Feb 2, 2020 · 2ab767c · 2ab767c
1 parent 2b5fc83
commit 2ab767c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 34 deletions.
diff --git a/client/src/App.css b/client/src/App.css
@@ -21,6 +21,16 @@ header {
 }
 
 /* FILTERS */
+.keyword-input {
+    width: 80% !important;
+    margin: 8px !important;
+}
+
+.filter-selects {
+    margin: 8px !important;
+    width: 150px;
+}
+
 .switch-label {
     color: #808080;
 }
@@ -142,7 +152,6 @@ code {
 /* FOOTER */
 footer {
     display: flex;
-    /* justify-content: center; */
     align-items: center;
     text-align: center;
     width: 100vw;
@@ -164,9 +173,16 @@ footer {
     }
 
     #lead-subtitle {
-        font-size: 0.7rem;
+        font-size: 0.75rem;
         text-align: center;
         margin-top: 0.5rem;
+        padding: 0 0.8rem;
+    }
+
+    /* FILTERS */
+    .keyword-input,
+    .filter-selects {
+        width: calc(100% - 16px) !important;
     }
 
     /* RESTAURANT LIST */

diff --git a/client/src/components/Filters.jsx b/client/src/components/Filters.jsx
@@ -13,19 +13,6 @@ import {
     isWidthUp,
     withWidth
 } from '@material-ui/core/';
-import { withStyles } from '@material-ui/core/styles';
-import PropTypes from 'prop-types';
-
-const styles = theme => ({
-    root: {
-        margin: theme.spacing(1),
-        width: 150
-    },
-    keywords: {
-        margin: theme.spacing(1),
-        width: "80%"
-    }
-});
 
 class Filters extends Component {
 
@@ -41,10 +28,6 @@ class Filters extends Component {
         };
     }
 
-    static propTypes = {
-        classes: PropTypes.object.isRequired
-    };
-
     handleChange(event) {
         if(this.props.firstSearch) this.props.handleFirstSearch();
         const { name, value } = event.target;
@@ -53,7 +36,7 @@ class Filters extends Component {
 
     render() {
 
-        const { classes, isEnglish } = this.props;
+        const { isEnglish } = this.props;
 
         return (
             <div>
@@ -67,7 +50,7 @@ class Filters extends Component {
                     borderColor="grey.300" 
                     borderRadius="borderRadius"
                 >
-                    <FormControl fullWidth className={classes.keywords}>
+                    <FormControl fullWidth className="keyword-input">
                         <TextField
                             name="keyword"
                             value={this.state.keyword}
@@ -89,9 +72,8 @@ class Filters extends Component {
                     borderRadius="borderRadius"
                 >
 
-                    <FormControl 
-                        style={isWidthUp('sm', this.props.width) ? {} : { width: "calc(100% - 16px)"}}
-                        className={classes.root}
+                    <FormControl
+                        className="filter-selects"
                     >
                         <InputLabel>{isEnglish ? "Category" : "Categoría"}</InputLabel>
                         <Select
@@ -113,9 +95,8 @@ class Filters extends Component {
                         </Select>
                     </FormControl>
 
-                    <FormControl 
-                        style={isWidthUp('sm', this.props.width) ? {} : { width: "calc(100% - 16px)"}}
-                        className={classes.root}
+                    <FormControl
+                        className="filter-selects"
                     >
                         <InputLabel>{isEnglish ? "Area" : "Área"}</InputLabel>
                         <Select
@@ -134,9 +115,8 @@ class Filters extends Component {
                         </Select>
                     </FormControl>
 
-                    <FormControl 
-                        style={isWidthUp('sm', this.props.width) ? {} : { width: "calc(100% - 16px)"}}
-                        className={classes.root}
+                    <FormControl
+                        className="filter-selects"
                     >
                         <InputLabel>{isEnglish ? "Environment" : "Ambiente"}</InputLabel>
                         <Select
@@ -158,7 +138,7 @@ class Filters extends Component {
                     </FormControl>
 
                     <Hidden smDown>
-                        <FormControl className={classes.root}>
+                        <FormControl className="filter-selects">
                             <InputLabel>{isEnglish ? "Sort by" : "Ordenar por"}</InputLabel>
                             <Select
                                 name="sortField"
@@ -190,4 +170,4 @@ class Filters extends Component {
     }
 }
 
-export default withWidth()(withStyles(styles)(Filters));
+export default withWidth()(Filters);
diff --git a/client/src/components/RestaurantList.jsx b/client/src/components/RestaurantList.jsx
@@ -66,7 +66,7 @@ function RestaurantList(props) {
     } else {
         if(restaurants.length > 0) {
             grid = (
-                <GridList cols={getGridListCols()} style={{maxWidth: "100vw"}}>
+                <GridList cols={getGridListCols()}>
                     {restaurants.map(rest => (
                         <GridListTile
                             title={rest.name}

diff --git a/package.json b/package.json
@@ -7,6 +7,9 @@
     "start": "node server/index.js",
     "heroku-postbuild": "cd server && npm install && cd ../client && npm install && npm run build"
   },
+  "engines": {
+    "node": "12.14.1"
+  },
   "keywords": [],
   "author": "",
   "license": "ISC"

diff --git a/server/index.js b/server/index.js
@@ -7,7 +7,7 @@ app.use(express.urlencoded({ extended: true }));
 
 if(process.env.NODE_ENV === 'production') {
     app.use(express.static(path.join(__dirname, '../client/build')));
-    app.get('*', (req, res) => {
+    app.get('/', (req, res) => {
         res.sendFile(path.join(__dirname, '../client/build/index.html'));
     });
 }