h3n3/cadhub
1
0
Fork 0
Code Issues 35 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #243 from Irev-Dev/kurt/242

Browse Source 
Move local development openSCAD url to env vars
This commit was merged in pull request #243.
This commit is contained in:
Kurt Hutten
2021-03-13 17:26:56 +11:00
committed by GitHub
parent 0f41622566 39f408bd49
commit ba45e3ea57
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/docker/README.md
View File

@@ -13,20 +13,21 @@ You'll need to have Docker installed
Because of the way the docker containers to be deployed as lambdas on aws are somewhat specialised for the purpose we're using `docker-compose` to spin one up for each function/endpoint. So we've added a aws-emulation layer Because of the way the docker containers to be deployed as lambdas on aws are somewhat specialised for the purpose we're using `docker-compose` to spin one up for each function/endpoint. So we've added a aws-emulation layer
first cd into this folder `cd api/src/docker`
then Then cd into this folder `cd api/src/docker` and:
```bash ```bash
docker-compose up --build docker-compose up --build
``` ```
The first time you run the, when it has to build the main image it will take some time, but launching again will be quicker. The first time you run this, it has to build the main image it will take some time, but launching again will be quicker.
After which we'll also spin up a light express server to act as an emulator to transform some the request from the front end into how the lambda's expect them. After which we'll also spin up a light express server to act as an emulator to transform some the request from the front end into how the lambda's expect them.
``` ```
yarn install yarn install
yarn emulate yarn emulate
``` ```
You can now change the url in `web/src/helpers/cadPackages/openScadController.js` from the aws url to `http://localhost:8080` You can now add OPENSCAD_BASE_URL="http://localhost:8080" to you .env file and restart your main dev process (`yarn rw dev`)
comment that line out if you want to go back to using the aws endpoint (and restart the dev process).
If you change anything in the `api/src/docker/openscad` directory, you will need to stop the docker process and restart it (will be fairly quick if you're only changing the js) If you change anything in the `api/src/docker/openscad` directory, you will need to stop the docker process and restart it (will be fairly quick if you're only changing the js)

4
web/src/helpers/cadPackages/openScadController.js
View File

@@ -1,5 +1,5 @@
// const openScadBaseURL = 'http://localhost:8080' // for local development let openScadBaseURL =
const openScadBaseURL = process.env.OPENSCAD_BASE_URL ||
'https://x2wvhihk56.execute-api.us-east-1.amazonaws.com/dev' 'https://x2wvhihk56.execute-api.us-east-1.amazonaws.com/dev'
export const render = async ({ code, settings }) => { export const render = async ({ code, settings }) => {