From 6f60b76ea01fccfab4572654c80b2af67d99aa7b Mon Sep 17 00:00:00 2001 From: Kendrick Mausolf Date: Tue, 7 Apr 2020 20:59:03 -0700 Subject: [PATCH 1/5] docs(deliverable-instructions): clarify deliverable instructions --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 442bb088..e3586213 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,14 @@ This project represents a challenge to test your git flow, programming, and trou ## Challenge Instructions You will begin by creating a fork of this repository to your own Github account. All work will be completed and reviewed within your own fork. Please do not create a Pull Request (PR) back into this repository. -Once you have created your fork, review the Issues labeled `challenge task` [HERE](https://github.com/Shift3/react-challenge-project/issues?q=is%3Aissue+is%3Aopen+label%3A%22challenge+task%22). Work on each task in a new branch. Once the work is completed, create a Pull Request from the working branch to your `master` branch and reference the Issue you are working on. These open PRs will be the final submission which Shift3 will review. +Once you have created your fork, review the Issues labeled `challenge task` [HERE](https://github.com/Shift3/react-challenge-project/issues?q=is%3Aissue+is%3Aopen+label%3A%22challenge+task%22). Shift3's standard for branching is as follows: + +- Maintain a `master` and development (`dev`) branch on the repository +- For each new feature (issue), create a branch based off of your `dev` branch + - Once your feature has been completed, submit a Pull Request from your feature branch to your `dev` branch + - If you have a reviewer on your repository, once your Pull Request has been approved, merge your feature branch back into `dev` + - Otherwise, submit the Pull Request and merge it into your `dev` branch +- Once the work has been completed, create a Pull Request from the working branch to your `master` branch and reference the Issue you are working on. These open PRs will be the final submission which Shift3 will review. Once you are ready to submit your work, send an email to your Shift3 contact with a link to your fork. From b594ef17c6d455514b9854128a7e41032864c1f8 Mon Sep 17 00:00:00 2001 From: Kendrick Mausolf Date: Tue, 7 Apr 2020 21:01:29 -0700 Subject: [PATCH 2/5] docs(deliverable-instructions): clarify repo instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e3586213..60a83113 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ You will begin by creating a fork of this repository to your own Github account. Once you have created your fork, review the Issues labeled `challenge task` [HERE](https://github.com/Shift3/react-challenge-project/issues?q=is%3Aissue+is%3Aopen+label%3A%22challenge+task%22). Shift3's standard for branching is as follows: -- Maintain a `master` and development (`dev`) branch on the repository +- Maintain a `master` and development (`dev`) branch on your fork - For each new feature (issue), create a branch based off of your `dev` branch - Once your feature has been completed, submit a Pull Request from your feature branch to your `dev` branch - If you have a reviewer on your repository, once your Pull Request has been approved, merge your feature branch back into `dev` From 7aedc3017bce668136c53e5aad49dff0b8f1e322 Mon Sep 17 00:00:00 2001 From: Corey Shuman Date: Mon, 15 Jun 2020 13:34:55 -0700 Subject: [PATCH 3/5] fix(docker): fixed volume path for Ubuntu Support --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 233e8b5e..b5930a39 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - server volumes: - ./application:/home/node/application - - home/node/application/node_modules + - /home/node/application/node_modules server: build: './server' @@ -23,7 +23,7 @@ services: - database volumes: - ./server:/home/node/server - - home/node/server/node_modules + - /home/node/server/node_modules database: image: "mongo" networks: From 49ff6baf6f6d443fe4ea99931edd02a1ae265f09 Mon Sep 17 00:00:00 2001 From: Corey Shuman Date: Mon, 15 Jun 2020 13:51:50 -0700 Subject: [PATCH 4/5] docs(readme): improve installation instructions; add Linux link --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 60a83113..a69f02d6 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,10 @@ This is a multi-container docker environment that utilizes Docker to create thre ## Project Requirements - Docker - - [For Mac Users](https://docs.docker.com/docker-for-mac/install/) - - [For Windows 10 Pro/Enterprise Users](https://docs.docker.com/docker-for-windows/install/) - - [For Windows 7 or Windows 10 home Users](https://docs.docker.com/toolbox/toolbox_install_windows/) - - Kitematic should come automatically installed, with Docker, but make sure you have it available, it will be very useful in managine containers + - For Mac Users: [Docker Desktop for Mac](https://docs.docker.com/docker-for-mac/install/) + - For Windows 10 Pro/Enterprise Users: [Docker Desktop for Windows](https://docs.docker.com/docker-for-windows/install/) + - For Windows 7 or Windows 10 home Users: [Docker Toolbox](https://docs.docker.com/toolbox/toolbox_install_windows/) + - For Linux Users (follow link and choose your Distro): [Docker Engine](https://docs.docker.com/engine/install/) - Do not have anything running on the required ports (3000 for client, 4000 for server, 27017 for mongo.) ## Running the project From 545aba7eeec4d5c0af3692432d9b5a465a8d34e4 Mon Sep 17 00:00:00 2001 From: Neda Rohani Date: Mon, 27 Jul 2020 14:44:45 -0700 Subject: [PATCH 5/5] fix: incorrect state variable name in setState --- application/src/components/order-form/orderForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/components/order-form/orderForm.js b/application/src/components/order-form/orderForm.js index 29258203..139e7251 100644 --- a/application/src/components/order-form/orderForm.js +++ b/application/src/components/order-form/orderForm.js @@ -20,7 +20,7 @@ class OrderForm extends Component { } menuItemChosen(event) { - this.setState({ item: event.target.value }); + this.setState({ order_item: event.target.value }); } menuQuantityChosen(event) {