diff --git a/README.md b/README.md index 4e2bf97..d1839da 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,13 @@ ssh-add You can deploy the projects independently or both together with the following commands. -Deploy frontend and backend concurrently. +When deploying for the first time, use the following + +```sh +bash install-deploy.sh +``` + +Post that deployment of frontend and backend can be done concurrently. ```sh bash deploy-all.sh diff --git a/clone-sources.sh b/clone-sources.sh index 0206fc5..d12db93 100644 --- a/clone-sources.sh +++ b/clone-sources.sh @@ -1,3 +1,5 @@ git clone https://github.com/GeriLife/wellbeing.git +cd wellbeing/app && meteor npm i && cd ../../ -git clone https://github.com/GeriLife/wellbeing-client.git \ No newline at end of file +git clone https://github.com/GeriLife/wellbeing-client.git +cd wellbeing-client/frontend && yarn && cd ../../ \ No newline at end of file diff --git a/deploy-all.sh b/deploy-all.sh index 42c07a4..4177965 100644 --- a/deploy-all.sh +++ b/deploy-all.sh @@ -1 +1,4 @@ -./node_modules/.bin/concurrently "./deploy-backend.sh" "./deploy-frontend.sh" \ No newline at end of file +cd wellbeing/app && meteor npm i && cd ../../ +cd wellbeing-client/frontend && yarn && cd ../../ + +sh ./deploy-backend.sh \ No newline at end of file diff --git a/install-deploy.sh b/install-deploy.sh new file mode 100644 index 0000000..65b2e96 --- /dev/null +++ b/install-deploy.sh @@ -0,0 +1,2 @@ +sh clone-sources.sh +sh ./deploy-backend.sh \ No newline at end of file diff --git a/package.json b/package.json index 192366f..91d3dfc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "author": "Brylie Christopher Oxley ", "license": "MIT", "private": false, - "dependencies": { - "concurrently": "^6.0.0" - } + "scripts": { + "deploy-frontend": "cd wellbeing-client/frontend && yarn serve" + }, + "dependencies": {} }