Try to fix heroku

MarkusPaulsen · Nov 13, 2019 · 0b3c96a · 0b3c96a
1 parent 1868960
commit 0b3c96a
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 12 deletions.
diff --git a/.env b/.env
@@ -0,0 +1 @@
+theSpoon_jwtPrivateKey=mySecureKey
diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web: node server.js
diff --git a/mobileApp/components/login/login.js b/mobileApp/components/login/login.js
@@ -32,7 +32,7 @@ export default class LoginScreen extends Component {
               password: this.state.password,
               isRestaurantOwner: false})
           ;
-          let res = await fetch('http://192.168.1.110:5000/api/user/login/', {
+          let res = await fetch('http://thespoon.herokuapp.com/api/user/login/', {
               method: 'POST',
               headers: {
                   Accept: 'application/json',

diff --git a/server.js b/server.js
@@ -53,7 +53,7 @@ app.get("*", (req, res) => {
 
 //END OF THE REQUIRED CODE TO MAKE THE DEPLOY WORK
 
-const port = process.env.PORT || 5000;
+const port = process.env.PORT || 80;
 
 app.listen(port, () => console.log('Server started on port ' + port));
 
diff --git a/thespoon/src/components/authentification/LogIn.js b/thespoon/src/components/authentification/LogIn.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { ajax } from 'rxjs/ajax';
 import paths from '../../constants/paths';
 import { IconExit, IconEmail, IconPassword } from '../Icons';
-import {Modal} from "react-bootstrap";
+import {Modal, DropdownButton, Dropdown} from "react-bootstrap";
 import FilterLink from "../../containers/FilterModalLink";
 import {authentificationModalVisibilityFilters} from "../../constants/authentificationModalVisibiltyFilters";
 import Form from 'react-validation/build/form';
@@ -39,6 +39,8 @@ class LogIn extends Component {
 
     this.submitted = false;
     this.handleSubmit = this.handleSubmit.bind(this);
+    this.activateIsRestaurantOwner = this.activateIsRestaurantOwner.bind(this);
+    this.deactivateIsRestaurantOwner = this.activateIsRestaurantOwner.bind(this);
   }
 
   handleSubmit = event => {
@@ -57,14 +59,15 @@ class LogIn extends Component {
 
           if (validation.isValid) {
             let thisTemp = this;
-            console.log(paths['restApi']['login']);
+            console.log(this.state);
             ajax({
               url: paths['restApi']['login'],
               method: 'POST',
-              headers: {},
+              headers: {'Content-Type': 'application/json'},
               body: {
-                email: this.state.email,
-                password:this.state.password
+                username: this.state.username,
+                password: this.state.password,
+                isRestaurantOwner: this.state.isRestaurantOwner,
               }
             }).subscribe(
                 function (next) {
@@ -81,7 +84,15 @@ class LogIn extends Component {
           }
         }
     );
-  }
+  };
+
+  activateIsRestaurantOwner = () => {
+    this.setState({ isRestaurantOwner: true })
+  };
+
+  deactivateIsRestaurantOwner = () => {
+    this.setState({ isRestaurantOwner: false })
+  };
 
   render() {
     let validation = this.submitted ?                         // if the form has been submitted at least once
@@ -93,6 +104,13 @@ class LogIn extends Component {
             <div className="sign-up">
               <Form ref={ (c) => { this.form = c; }} onSubmit={this.handleSubmit}>
                 <h2 className="title">Log in</h2>
+                <div className="input-field">
+                  <DropdownButton id="dropdown-basic-button" title="Dropdown button">
+                    <Dropdown.Item onClick={this.activateIsRestaurantOwner}>Restaurant Owner</Dropdown.Item>
+                    <Dropdown.Item onClick={this.deactivateIsRestaurantOwner}>Customer</Dropdown.Item>
+                  </DropdownButton>
+                </div>
+
                 <div className="input-field">
                   <IconEmail />
                   <Input type="username" id="username" name="username" placeholder="Username"/>

diff --git a/thespoon/src/components/authentification/RegisterCustomer.js b/thespoon/src/components/authentification/RegisterCustomer.js
@@ -89,7 +89,7 @@ class RegisterCustomer extends Component  {
                     ajax({
                         url: paths['restApi']['registrationCustomer'],
                         method: 'POST',
-                        headers: {},
+                        headers: {'Content-Type': 'application/json'},
                         body: {
                             email: this.state.email,
                             password:this.state.password,

diff --git a/thespoon/src/components/authentification/RegisterRestaurantowner.js b/thespoon/src/components/authentification/RegisterRestaurantowner.js
@@ -104,12 +104,12 @@ class RegisterRestaurantowner extends Component  {
                     ajax({
                         url: paths['restApi']['registrationRestaurantOwner'],
                         method: 'POST',
-                        headers: {},
+                        headers: {'Content-Type': 'application/json'},
                         body: {
                             email: this.state.email,
                             password:this.state.password,
                             username: this.state.username,
-                            firstName:this.state.firstName,
+                            name:this.state.firstName,
                             surname:this.state.surname
                         }
                     }).subscribe(

diff --git a/thespoon/src/constants/paths.js b/thespoon/src/constants/paths.js
@@ -1,4 +1,4 @@
-let BACKEND = "localhost:80";
+let BACKEND = "thespoon.herokuapp.com";
 
 const paths = {
     restApi: {