From c20ab68ae957d6c63e6a92d61de5359d2d8f7746 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Thu, 8 Oct 2020 06:44:10 -0400 Subject: [PATCH 1/2] fix: Add package-lock.json to front-end Dockerfile --- front-end/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/front-end/Dockerfile b/front-end/Dockerfile index 2e7842e..d789897 100644 --- a/front-end/Dockerfile +++ b/front-end/Dockerfile @@ -3,6 +3,7 @@ FROM node:14-alpine WORKDIR /visual-programming/front-end COPY package.json . +COPY package-lock.json . RUN npm install From 52204eabe86b97bf504792190357af39e87e3373 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Thu, 8 Oct 2020 06:44:42 -0400 Subject: [PATCH 2/2] docs: Add note about URL where app is running to README --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a7d0934..c72a87f 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,12 @@ Note: there [is a known issue with `react-scripts` v3.4.1](https://github.com/fa that may cause the front-end container to exit with code 0. If this happens, you can add `-e CI=true` to the `docker-run` command above for the front-end. -NOTE: For development outside of Docker, change ./front-end/package.json from "proxy": "http://back-end:8000" to "http://localhost:8000" to work. +NOTE: For development outside of Docker, change `./front-end/package.json` +from `"proxy": "http://back-end:8000"` to `"proxy": http://localhost:8000"` to work. +After the Docker containers are started, and both front- and back-ends are running, +you can access the application by loading [http://localhost:3000/](http://localhost:3000/) +in your browser. ## Serve locally @@ -140,6 +144,10 @@ npm install npm start ``` +By default, the `react-scripts` should open your default browser to the main +application page. If not, you can go to [http://localhost:3000/](http://localhost:3000/) +in your browser. + # CLI PyWorkflow also provides a command-line interface to execute pre-built workflows without the client or server running. The CLI is packaged in the `back-end`