Merge branch 'main' into dev

This commit is contained in:
Ben Grant 2021-05-24 21:27:36 +10:00
commit 4bd088e938
3 changed files with 5 additions and 14 deletions

View file

@ -7,7 +7,7 @@ Align your schedules to find the perfect time that works for everyone.
## Setup ## Setup
1. Clone the repo. 1. Clone the repo.
2. Run `yarn` in both folders. 2. Run `yarn` in both backend and frontend folders.
3. Run `node index.js` in the backend folder to start the API. 3. Run `node index.js` in the backend folder to start the API.
4. Run `yarn start` in the frontend folder to start the front end. 4. Run `yarn start` in the frontend folder to start the front end.
@ -21,8 +21,8 @@ The browser extension in `crabfit-browser-extension` can be tested by first runn
2. Run `./deploy.sh` to compile and deploy. 2. Run `./deploy.sh` to compile and deploy.
### Backend ### Backend
1. Deploy the backend `cd crabfit-backend && gcloud app deploy --project=crabfit --version=v1` 1. In the backend folder `cd crabfit-backend`
2. Deploy the endpoints service `cd crabfit-backend && gcloud endpoints services deploy swagger.yaml` 2. Deploy the backend `gcloud app deploy --project=crabfit --version=v1`
### Browser extension ### Browser extension
Compress everything inside the `crabfit-browser-extension` folder and use that zip to deploy using Chrome web store and Mozilla Add-on store. Compress everything inside the `crabfit-browser-extension` folder and use that zip to deploy using Chrome web store and Mozilla Add-on store.

View file

@ -1,11 +1,2 @@
runtime: nodejs runtime: nodejs10
service: api service: api
env: flex
automatic_scaling:
min_num_instances: 1
max_num_instances: 2
endpoints_api_service:
name: api-dot-crabfit.appspot.com
rollout_strategy: managed

View file

@ -7,7 +7,7 @@
"license": "MIT", "license": "MIT",
"private": true, "private": true,
"engines": { "engines": {
"node": ">= 10.0.0" "node": ">=10.0.0"
}, },
"scripts": { "scripts": {
"start": "node index.js" "start": "node index.js"