Merge branch 'fixRegistrationBranch'

Author: Max

client/package-lock.json

@@ -9,7 +9,9 @@ class SignUpForm extends Component{
     super(props);
 
     this.state = {
-      displayname: '',
+      firstName: '',
+      lastName: '',
+      username: '',
       email:'', //UUID
       firstName:'',
       lastName:'',
@@ -85,6 +87,7 @@ class SignUpForm extends Component{
       try{
         await Auth.signUp({username: email, password: password,});
         console.log("Signed up successfully!");
+        this.handleCreateNewUser();
         this.setState({ step: 1 });
       }catch(err){
         console.log("Error signing up: ", err);
@@ -127,9 +130,12 @@ class SignUpForm extends Component{
       }
     }
 
-    Create_New_User = async () => { 
+    handleCreateNewUser = async () => { 
+      console.log("Trying to add user to DB");
       const Url="https://0o1szwcqn7.execute-api.us-west-2.amazonaws.com/pj-stage-login-v2/user";
       const _data={
+        "firstname": this.state.firstName,
+        "lastname": this.state.lastName,
         "username": this.state.username,
         "email": this.state.email,
         "location": this.state.location,
@@ -202,10 +208,10 @@ class SignUpForm extends Component{
                         type="text"
                         id="firstName"
                         className="FormField__Input"
-                        placeholder="Enter your last name"
+                        placeholder="Enter your first name"
                         name="firstName"
                         required="required"
-                        value={this.state.fistName}
+                        value={this.state.firstName}
                         onChange={this.updateFirstName.bind(this)}
                         />
                     </div>

client/src/components/Login/SignUpForm.js

@@ -243,6 +243,79 @@ class NewItemPage extends Component {
         return false;
     };
 
+    render() {
+        return (
+            <div class="mt-2 p-4">
+                <NavBar></NavBar>
+                {/* <div class="form-group">
+                    <label for="title-input" >What is your meal?</label>
+                    <input type="text" class="form-control" id="title-input" placeholder="ex Hamburger, Tofu, Sushi..." ref={this.mealNameInput}></input>
+                </div> */}
+                <InputField labelName="What is your meal?" placeHolder="Hamburger, Tofu, Sushi..." input={this.mealNameInput} />
+
+                <div class="row justify-content-center p-4 border bg-light" id="photo-and-description">
+
+                    <form class="md-form w-50 p-4">
+                        <div class="file-field">
+                            <div class="z-depth-1-half mb-4">
+                                <img id="FoodImage" src="https://mdbootstrap.com/img/Photos/Others/placeholder.jpg" class="img-fluid"
+                                    alt="example placeholder"></img>
+                            </div>
+                        </div>
+                        <div class="d-flex justify-content-center">
+                            <div class="btn btn-mdb-color btn-rounded float-left">
+                                <span>Choose file</span>
+                                <input type="file" id="photoFile" onChange="updatePhoto"></input>
+                            </div>
+                        </div>
+
+                        <InputField labelName="Tags" placeHolder="Seafood, Spanish..." input={this.mealTagsInput} />
+                        <InputField labelName="Ingredients" placeHolder="" input={this.mealIngredientsInput} />
+                        <InputField labelName="Allergy" placeHolder="Peanuts, Milk..." input={this.mealAllergyInput} />
+                        {/* <div label="food-tags">
+                            <label for="foodTagsBox">Tags:</label>
+                            <input type="text" class="form-control" id="foodTagsBox" placeholder="Seafood, Spanish..." ref={this.mealTagsInput}></input>
+                        </div>
+                        <div label="ingredients">
+                            <label for="ingredientsField">Ingredients:</label>
+                            <input type="text" class="form-control" id="ingredientsField" placeholder="" ref={this.mealIngredientsInput}></input>
+                        </div>
+                        <div label="allergy-info">
+                            <label for="allergyBox">Allergy:</label>
+                            <input type="text" class="form-control" id="allergyBox" placeholder="Peanuts, Milk..." ref={this.mealAllergyInput}></input>
+                        </div> */}
+                    </form>
+
+                    <div label="right column" class="w-50 p-4">
+                        <div label="food-description">
+                            <label for="foodDescriptionBox">Food Description</label>
+                            <textarea class="form-control rounded-0" id="foodDescriptionBox" rows="10" ref={this.mealDescriptionInput}></textarea>
+                        </div>
+
+                        <label for="price">Price:</label>
+
+                        <div>
+                            <CurrencyInput value={this.state.amount} onChangeEvent={this.handleChange}/>
+                        </div>
+
+                        {/* <div class="input-group mb-3">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text">$</span>
+                            </div>
+                            <input type="text" class="form-control" aria-label="Amount" ref={this.mealPriceInput}></input>
+                        </div> */}
+
+                        {/* <label for="quantity">Quantity:</label>
+                        <input type="text" class="form-control" ref={this.mealQuantityInput}></input> */}
+                        <InputField labelName="Quantity" placeHolder="" input={this.mealQuantityInput} />
+
+                        <button class="btn btn-success mt-4" type="button" onClick={() => this.handleAddMeal()} >Submit Listing</button>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+
 }
 
 export default NewItemPage;