merge conflicts

Author: mjhea0

README.md

@@ -3,7 +3,11 @@ version: 0.2
 env:
   variables:
     AWS_REGION: "us-west-1"
+<<<<<<< HEAD
     REACT_APP_API_SERVICE_URL: "http://flask-react-alb-166710978.us-west-1.elb.amazonaws.com"
+=======
+    REACT_APP_API_SERVICE_URL: "http://flask-react-alb-1132421372.us-west-1.elb.amazonaws.com"
+>>>>>>> e4f2f7071947d2dfd2a942b8fa916b92744eb446
 
 phases:
   pre_build:

buildspec.yml

@@ -1,12 +1,22 @@
 import React, { Component } from "react";
 import axios from "axios";
+<<<<<<< HEAD
 import { Route, Routes } from "react-router-dom";
 import Modal from "react-modal";
 
 import About from "./components/About";
 import AddUser from "./components/AddUser";
 import LoginForm from "./components/LoginForm";
 import Message from "./components/Message";
+=======
+import { Route, Switch } from "react-router-dom";
+
+import AddUser from "./components/AddUser";
+import About from "./components/About";
+import LoginForm from "./components/LoginForm";
+import Message from "./components/Message";
+import Modal from "react-modal";
+>>>>>>> e4f2f7071947d2dfd2a942b8fa916b92744eb446
 import NavBar from "./components/NavBar";
 import RegisterForm from "./components/RegisterForm";
 import UsersList from "./components/UsersList";
@@ -41,7 +51,11 @@ class App extends Component {
 
   componentDidMount() {
     this.getUsers();
+<<<<<<< HEAD
   }
+=======
+  };
+>>>>>>> e4f2f7071947d2dfd2a942b8fa916b92744eb446
 
   addUser = (data) => {
     axios

services/client/package-lock.json

@@ -7,7 +7,7 @@
 cli = FlaskGroup(create_app=create_app)
 
 
-@cli.command("recreate_db")
+@cli.command('recreate_db')
 def recreate_db():
     db.drop_all()
     db.create_all()
@@ -21,5 +21,5 @@ def seed_db():
     db.session.commit()
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     cli()

services/client/src/App.jsx

@@ -41,7 +41,9 @@ def test_add_user_invalid_json_keys(test_app, test_database):
     client = test_app.test_client()
     resp = client.post(
         "/users",
-        data=json.dumps({"email": "john@testdriven.io"}),
+        data=json.dumps(
+            {"email": "john@testdriven.io", "password": "greaterthaneight"}
+        ),
         content_type="application/json",
     )
     data = json.loads(resp.data.decode())

services/users/manage.py

@@ -54,7 +54,9 @@ def test_add_user_invalid_json_keys(test_app, monkeypatch):
     client = test_app.test_client()
     resp = client.post(
         "/users",
-        data=json.dumps({"email": "john@testdriven.io"}),
+        data=json.dumps(
+            {"email": "john@testdriven.io", "password": "greaterthaneight"}
+        ),
         content_type="application/json",
     )
     data = json.loads(resp.data.decode())
@@ -66,7 +68,7 @@ def test_add_user_duplicate_email(test_app, monkeypatch):
     def mock_get_user_by_email(email):
         return True
 
-    def mock_add_user(username, email, password):
+    def mock_add_user(username, email):
         return True
 
     monkeypatch.setattr(

services/users/src/tests/test_users.py

@@ -1,4 +1,3 @@
 provider "aws" {
   region = var.region
-  profile = "personal"
 }