From 08b7568b1f7980ca224d6fe81a2f52eb78597440 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 Date: Wed, 18 May 2022 18:05:43 -0700 Subject: [PATCH 01/30] Testing CI --- .github/workflows/node.js.yml | 33 +++++++++++++++++++++++++++++++++ .vscode/settings.json | 11 +++++++++++ aws-exports.js | 8 ++++++++ backend.js | 2 +- 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/node.js.yml create mode 100644 .vscode/settings.json create mode 100644 aws-exports.js diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml new file mode 100644 index 0000000..49a41b2 --- /dev/null +++ b/.github/workflows/node.js.yml @@ -0,0 +1,33 @@ +name: Node.js CI + +on: + push: + branches: [TASK-cloudDB, ci-with-testing] + pull_request: + branches: [TASK-cloudDB, ci-with-testing] + +jobs: + build: + runs-on: ${{ matrix.os }} #ubuntu-latest + + strategy: + matrix: + os: [ubuntu-latest] # macos-latest, windows-latest + node-version: [16.x] + #See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + cache: "npm" + - run: npm ci + - run: npm run build --if-present + - run: npm test + - uses: akhileshns/heroku-deploy@v3.12.12 + with: + heroku_api_key: ${{ec86b22f-c068-4d5c-b1ba-feda0410744e}} + heroku_app_name: "dog-grooming-api" + heroku_email: "arun.gan1234@gmail.com" diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0c7066e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "files.exclude": { + "amplify/.config": true, + "amplify/**/*-parameters.json": true, + "amplify/**/amplify.state": true, + "amplify/**/transform.conf.json": true, + "amplify/#current-cloud-backend": true, + "amplify/backend/amplify-meta.json": true, + "amplify/backend/awscloudformation": true + } +} diff --git a/aws-exports.js b/aws-exports.js new file mode 100644 index 0000000..6957222 --- /dev/null +++ b/aws-exports.js @@ -0,0 +1,8 @@ +/* eslint-disable */ +// WARNING: DO NOT EDIT. This file is automatically generated by AWS Amplify. It will be overwritten. + +const awsmobile = { + aws_project_region: "us-west-2", +}; + +export default awsmobile; diff --git a/backend.js b/backend.js index 1592cd6..3c8a705 100644 --- a/backend.js +++ b/backend.js @@ -10,7 +10,7 @@ const server = express(); const port = 5000; server.use(cors()); server.use(express.json()); - +//GH actions test //Get requests------------------------------------------------------------------------------------------------------- server.get("/", (req, res) => { res.redirect("/appointments"); From 87e15c49cdd0e37bb6741b10358dd3759499791b Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:10:07 -0700 Subject: [PATCH 02/30] Delete aws-exports.js --- aws-exports.js | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 aws-exports.js diff --git a/aws-exports.js b/aws-exports.js deleted file mode 100644 index 6957222..0000000 --- a/aws-exports.js +++ /dev/null @@ -1,8 +0,0 @@ -/* eslint-disable */ -// WARNING: DO NOT EDIT. This file is automatically generated by AWS Amplify. It will be overwritten. - -const awsmobile = { - aws_project_region: "us-west-2", -}; - -export default awsmobile; From 5f902e7eec174830f3cabbab08dffbf592977fe3 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:10:27 -0700 Subject: [PATCH 03/30] Delete .vscode directory --- .vscode/settings.json | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 0c7066e..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "files.exclude": { - "amplify/.config": true, - "amplify/**/*-parameters.json": true, - "amplify/**/amplify.state": true, - "amplify/**/transform.conf.json": true, - "amplify/#current-cloud-backend": true, - "amplify/backend/amplify-meta.json": true, - "amplify/backend/awscloudformation": true - } -} From db78b57b19fae1a388b6324e1da90534d2e4b3d5 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:20:16 -0700 Subject: [PATCH 04/30] Update node.js.yml --- .github/workflows/node.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 49a41b2..824fe33 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -2,9 +2,9 @@ name: Node.js CI on: push: - branches: [TASK-cloudDB, ci-with-testing] + branches: [main, ci-with-testing] pull_request: - branches: [TASK-cloudDB, ci-with-testing] + branches: [main, ci-with-testing] jobs: build: From b6bc452e3ba36204d457b951d034c5fdecc90579 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:22:24 -0700 Subject: [PATCH 05/30] Update node.js.yml --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 824fe33..2eaa3e0 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,6 +28,6 @@ jobs: - run: npm test - uses: akhileshns/heroku-deploy@v3.12.12 with: - heroku_api_key: ${{ec86b22f-c068-4d5c-b1ba-feda0410744e}} + heroku_api_key: ${ec86b22f-c068-4d5c-b1ba-feda0410744e} heroku_app_name: "dog-grooming-api" heroku_email: "arun.gan1234@gmail.com" From 30ebaac4f214876c350079e332f92ef2fe608b16 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:30:38 -0700 Subject: [PATCH 06/30] Update dogServicesInMemorytest.test.js --- .../Tests/dogServicesInMemorytest.test.js | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/DB-Modules/Tests/dogServicesInMemorytest.test.js b/DB-Modules/Tests/dogServicesInMemorytest.test.js index aa17d2b..859e49c 100644 --- a/DB-Modules/Tests/dogServicesInMemorytest.test.js +++ b/DB-Modules/Tests/dogServicesInMemorytest.test.js @@ -158,21 +158,21 @@ describe("Get clients for ids", () => { }); //Get Record------------------------------------------------------| - test("Get dog by id -- Valid ID", async () => { - const dummyDog = { - name: "Kali", - breed: "Chow", - clientId: allClients[0]._id, - }; - const result = new dogModel(dummyDog); - const addedDog = await result.save(); - const foundDog = await dogServices.getDogById(addedDog._id); - expect(foundDog).toBeDefined(); - expect(foundDog._id).toStrictEqual(addedDog._id); - expect(foundDog.name).toBe(addedDog.name); - expect(foundDog.breed).toBe(addedDog.breed); - expect(foundDog.clientId).toStrictEqual(addedDog.clientId); - }); + // test("Get dog by id -- Valid ID", async () => { +// const dummyDog = { +// name: "Kali", +// breed: "Chow", +// clientId: allClients[0]._id, +// }; +// const result = new dogModel(dummyDog); +// const addedDog = await result.save(); +// const foundDog = await dogServices.getDogById(addedDog._id); +// expect(foundDog).toBeDefined(); +// expect(foundDog._id).toStrictEqual(addedDog._id); +// expect(foundDog.name).toBe(addedDog.name); +// expect(foundDog.breed).toBe(addedDog.breed); +// expect(foundDog.clientId).toStrictEqual(addedDog.clientId); +// }); //Create Record------------------------------------------------------| test("Adding dog -- Successful path", async () => { From 888173a841a89a16f91333d1a013fec607b1ba60 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:45:18 -0700 Subject: [PATCH 07/30] Update node.js.yml --- .github/workflows/node.js.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 2eaa3e0..56e7c52 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -26,8 +26,8 @@ jobs: - run: npm ci - run: npm run build --if-present - run: npm test - - uses: akhileshns/heroku-deploy@v3.12.12 - with: - heroku_api_key: ${ec86b22f-c068-4d5c-b1ba-feda0410744e} - heroku_app_name: "dog-grooming-api" - heroku_email: "arun.gan1234@gmail.com" +# - uses: akhileshns/heroku-deploy@v3.12.12 +# with: +# heroku_api_key: ${ec86b22f-c068-4d5c-b1ba-feda0410744e} +# heroku_app_name: "dog-grooming-api" +# heroku_email: "arun.gan1234@gmail.com" From d8755b0df7488c37b8c9a0e2f611315a28e61bdc Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:50:03 -0700 Subject: [PATCH 08/30] Update node.js.yml --- .github/workflows/node.js.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 56e7c52..74b86ad 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -26,8 +26,8 @@ jobs: - run: npm ci - run: npm run build --if-present - run: npm test -# - uses: akhileshns/heroku-deploy@v3.12.12 -# with: -# heroku_api_key: ${ec86b22f-c068-4d5c-b1ba-feda0410744e} -# heroku_app_name: "dog-grooming-api" -# heroku_email: "arun.gan1234@gmail.com" + - uses: akhileshns/heroku-deploy@v3.12.12 + with: + heroku_api_key: ${{ec86b22f-c068-4d5c-b1ba-feda0410744e.HEROKU_API_KEY}} + heroku_app_name: "dog-grooming-api" + heroku_email: "arun.gan1234@gmail.com" From c4e6886e466bbf99806a9b197d67ccf4a7e17ec1 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:50:34 -0700 Subject: [PATCH 09/30] Update node.js.yml --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 74b86ad..1b7d9eb 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,6 +28,6 @@ jobs: - run: npm test - uses: akhileshns/heroku-deploy@v3.12.12 with: - heroku_api_key: ${{ec86b22f-c068-4d5c-b1ba-feda0410744e.HEROKU_API_KEY}} + heroku_api_key: ${ec86b22f-c068-4d5c-b1ba-feda0410744e.HEROKU_API_KEY} heroku_app_name: "dog-grooming-api" heroku_email: "arun.gan1234@gmail.com" From 26b200d768ad5067d93124b2e417fe3e248bd56c Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:55:57 -0700 Subject: [PATCH 10/30] Update node.js.yml --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 1b7d9eb..43c3e8b 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,6 +28,6 @@ jobs: - run: npm test - uses: akhileshns/heroku-deploy@v3.12.12 with: - heroku_api_key: ${ec86b22f-c068-4d5c-b1ba-feda0410744e.HEROKU_API_KEY} + heroku_api_key: ${secrets.HEROKU_API_KEY} heroku_app_name: "dog-grooming-api" heroku_email: "arun.gan1234@gmail.com" From 7a0163384fb619b8cb4af13bc26853e7e8c49ba4 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 18:56:14 -0700 Subject: [PATCH 11/30] Testing CD --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..e8f79ea --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: npm start \ No newline at end of file From 2f8812a0cc4f6eb04a6731edc8992c30648f788b Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 18 May 2022 19:02:57 -0700 Subject: [PATCH 12/30] Update node.js.yml --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 43c3e8b..3c8a715 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,6 +28,6 @@ jobs: - run: npm test - uses: akhileshns/heroku-deploy@v3.12.12 with: - heroku_api_key: ${secrets.HEROKU_API_KEY} + heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: "dog-grooming-api" heroku_email: "arun.gan1234@gmail.com" From cafa544336452ca0e358a7a1a8eb222f4d081ec9 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Wed, 25 May 2022 10:33:54 -0700 Subject: [PATCH 13/30] Update node.js.yml --- .github/workflows/node.js.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 3c8a715..6c261fa 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -15,6 +15,7 @@ jobs: os: [ubuntu-latest] # macos-latest, windows-latest node-version: [16.x] #See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + # steps: - uses: actions/checkout@v2 From 14b0c8ca554e1c59352acd76250e15347e3ec9f7 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Fri, 27 May 2022 10:24:02 -0700 Subject: [PATCH 14/30] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7ef7b24..f199fe8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # BE-scheduling +Accessible Link: +https://dog-grooming-api.herokuapp.com/ UI Protoyping Schema: https://www.figma.com/file/YFBYd05CtpXAUl1H2whxEb/Rush%3A-Web-app-prototyping-kit-(Community)?node-id=102%3A408 From 41a15a91b6c1eca9c2f3cc33cfb41533a3fff0b8 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Sat, 28 May 2022 19:05:42 -0700 Subject: [PATCH 15/30] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index f199fe8..1548035 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,15 @@ Accessible Link: https://dog-grooming-api.herokuapp.com/ +CI/CD Steps: +npm ci +npm run build --if-present +npm test +with: + heroku_api_key: ${{secrets.HEROKU_API_KEY}} + heroku_app_name: "dog-grooming-api" + heroku_email: {"user@gmail.com"} + UI Protoyping Schema: https://www.figma.com/file/YFBYd05CtpXAUl1H2whxEb/Rush%3A-Web-app-prototyping-kit-(Community)?node-id=102%3A408 From e79d3a174a36c26cc8593b68b5a5199c8c1ee149 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Sat, 28 May 2022 19:08:51 -0700 Subject: [PATCH 16/30] Update README.md --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1548035..092b792 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,12 @@ Accessible Link: https://dog-grooming-api.herokuapp.com/ -CI/CD Steps: -npm ci -npm run build --if-present -npm test -with: +# CI/CD Steps: + npm ci + npm run build --if-present + npm test + +# Include CI/CD details heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: "dog-grooming-api" heroku_email: {"user@gmail.com"} From 815dd0ce7648cd2b8ce9e8402156ce41c8984125 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Sat, 28 May 2022 19:14:44 -0700 Subject: [PATCH 17/30] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 092b792..8827440 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # BE-scheduling -Accessible Link: +# Accessible FrontEnd Link: +https://dog-groomings.herokuapp.com/ + +# Accessible BackEnd Link: https://dog-grooming-api.herokuapp.com/ # CI/CD Steps: From 47a883fbdbab0d312eda03c8b84f1ff4de40de1e Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Sat, 28 May 2022 19:15:40 -0700 Subject: [PATCH 18/30] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8827440..91702e1 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # BE-scheduling -# Accessible FrontEnd Link: +## Accessible FrontEnd Link: https://dog-groomings.herokuapp.com/ -# Accessible BackEnd Link: +## Accessible BackEnd Link: https://dog-grooming-api.herokuapp.com/ # CI/CD Steps: From c9524d08ca34c6965f83b7f9b087d19f2ebf2366 Mon Sep 17 00:00:00 2001 From: PhilippeWS <91435899+PhilippeWS@users.noreply.github.com> Date: Sat, 28 May 2022 19:17:16 -0700 Subject: [PATCH 19/30] Create README.md --- README.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 91702e1..b4e64a2 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,19 @@ # BE-scheduling -## Accessible FrontEnd Link: -https://dog-groomings.herokuapp.com/ - -## Accessible BackEnd Link: +Accessible Link: https://dog-grooming-api.herokuapp.com/ +## Quick Start Instructions + 1. Clone Github Repository to Local Machine. + 2. Run `npm install` to install all necessary packages. + 3. Create .env file in the root folder. + 4. Add the following variables + `MONGODB_URI: Description: The URL to the cloud hosted DB + PASSWORD_SALT: Salt used in encrypting passwords + TOKEN_SECRET: Used to verifty user JWT + PORT: Port to utilize should the connection to the cloud hosted DB fail` + 5. Run `npm run dev` to launch. + # CI/CD Steps: npm ci npm run build --if-present From d8f2aaa73a66eb7a39d55b5eb2ba32ec2d2e1b1b Mon Sep 17 00:00:00 2001 From: PhilippeWS <91435899+PhilippeWS@users.noreply.github.com> Date: Sat, 28 May 2022 19:17:44 -0700 Subject: [PATCH 20/30] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b4e64a2..304d53b 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ https://dog-grooming-api.herokuapp.com/ 2. Run `npm install` to install all necessary packages. 3. Create .env file in the root folder. 4. Add the following variables - `MONGODB_URI: Description: The URL to the cloud hosted DB - PASSWORD_SALT: Salt used in encrypting passwords - TOKEN_SECRET: Used to verifty user JWT - PORT: Port to utilize should the connection to the cloud hosted DB fail` + `MONGODB_URI: Description: The URL to the cloud hosted DB` + `PASSWORD_SALT: Salt used in encrypting passwords` + `TOKEN_SECRET: Used to verifty user JWT` + `PORT: Port to utilize should the connection to the cloud hosted DB fail` 5. Run `npm run dev` to launch. # CI/CD Steps: From 2a6b71262828755fe81d4e7f650cc0cf4bc6170c Mon Sep 17 00:00:00 2001 From: PhilippeWS <91435899+PhilippeWS@users.noreply.github.com> Date: Sat, 28 May 2022 19:18:44 -0700 Subject: [PATCH 21/30] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 304d53b..a0e1998 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ https://dog-grooming-api.herokuapp.com/ 2. Run `npm install` to install all necessary packages. 3. Create .env file in the root folder. 4. Add the following variables - `MONGODB_URI: Description: The URL to the cloud hosted DB` - `PASSWORD_SALT: Salt used in encrypting passwords` - `TOKEN_SECRET: Used to verifty user JWT` - `PORT: Port to utilize should the connection to the cloud hosted DB fail` + `MONGODB_URI: Description: The URL to the cloud hosted DB ` + `PASSWORD_SALT: Salt used in encrypting passwords ` + `TOKEN_SECRET: Used to verifty user JWT ` + `PORT: Port to utilize should the connection to the cloud hosted DB fail ` 5. Run `npm run dev` to launch. # CI/CD Steps: From 01003760e1e041ce9ffec31fa7aeb8013efff93b Mon Sep 17 00:00:00 2001 From: PhilippeWS <91435899+PhilippeWS@users.noreply.github.com> Date: Sat, 28 May 2022 19:19:37 -0700 Subject: [PATCH 22/30] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a0e1998..24707c5 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ https://dog-grooming-api.herokuapp.com/ 1. Clone Github Repository to Local Machine. 2. Run `npm install` to install all necessary packages. 3. Create .env file in the root folder. - 4. Add the following variables - `MONGODB_URI: Description: The URL to the cloud hosted DB ` - `PASSWORD_SALT: Salt used in encrypting passwords ` - `TOKEN_SECRET: Used to verifty user JWT ` - `PORT: Port to utilize should the connection to the cloud hosted DB fail ` + 4. Add the following variables: + `MONGODB_URI: Description: The URL to the cloud hosted DB` + `PASSWORD_SALT: Salt used in encrypting passwords` + `TOKEN_SECRET: Used to verifty user JWT` + `PORT: Port to utilize should the connection to the cloud hosted DB fail` 5. Run `npm run dev` to launch. # CI/CD Steps: From 59bf71273f80566c92fed4e083ac086fd189ca89 Mon Sep 17 00:00:00 2001 From: PhilippeWS <91435899+PhilippeWS@users.noreply.github.com> Date: Sat, 28 May 2022 19:20:21 -0700 Subject: [PATCH 23/30] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 24707c5..803f444 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ https://dog-grooming-api.herokuapp.com/ 2. Run `npm install` to install all necessary packages. 3. Create .env file in the root folder. 4. Add the following variables: - `MONGODB_URI: Description: The URL to the cloud hosted DB` - `PASSWORD_SALT: Salt used in encrypting passwords` - `TOKEN_SECRET: Used to verifty user JWT` - `PORT: Port to utilize should the connection to the cloud hosted DB fail` + `MONGODB_URI:` Description: The URL to the cloud hosted DB + `PASSWORD_SALT:` Salt used in encrypting passwords + `TOKEN_SECRET:` Used to verifty user JWT + `PORT:` Port to utilize should the connection to the cloud hosted DB fail 5. Run `npm run dev` to launch. # CI/CD Steps: From 0cc6273980f4da5bfd364ee8c5bee812d2516f28 Mon Sep 17 00:00:00 2001 From: PhilippeWS <91435899+PhilippeWS@users.noreply.github.com> Date: Sat, 28 May 2022 19:20:32 -0700 Subject: [PATCH 24/30] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 803f444..36426fd 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ https://dog-grooming-api.herokuapp.com/ 4. Add the following variables: `MONGODB_URI:` Description: The URL to the cloud hosted DB `PASSWORD_SALT:` Salt used in encrypting passwords - `TOKEN_SECRET:` Used to verifty user JWT + `TOKEN_SECRET:` Used to verifty user JWT `PORT:` Port to utilize should the connection to the cloud hosted DB fail 5. Run `npm run dev` to launch. From b5786685de3880ad975538fce150132200c2d549 Mon Sep 17 00:00:00 2001 From: PhilippeWS <91435899+PhilippeWS@users.noreply.github.com> Date: Sat, 28 May 2022 19:22:49 -0700 Subject: [PATCH 25/30] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 36426fd..90feb62 100644 --- a/README.md +++ b/README.md @@ -30,5 +30,6 @@ https://www.figma.com/file/YFBYd05CtpXAUl1H2whxEb/Rush%3A-Web-app-prototyping-ki Product Spec Documentation: https://docs.google.com/document/d/1-tYBP6pn_fnwizhPB3ZhvTtMLqb8_aKRsvDxsaNPS-c/edit?usp=sharing +![In-Memory-Code-Covage](https://user-images.githubusercontent.com/91435899/170849346-31e03fe4-dae9-43dd-89f2-1bb9bec9787b.png) -![mock-code-coverage](https://user-images.githubusercontent.com/74291980/162647492-b4ae9cc9-0118-4f10-8c76-60d5583747f1.PNG) +![Mock-Code-Coverage](https://user-images.githubusercontent.com/74291980/162647492-b4ae9cc9-0118-4f10-8c76-60d5583747f1.PNG) From 669841d8511fa8217aab3f0171b87c44a38c3bbe Mon Sep 17 00:00:00 2001 From: PhilippeWS <91435899+PhilippeWS@users.noreply.github.com> Date: Sat, 28 May 2022 19:27:08 -0700 Subject: [PATCH 26/30] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 90feb62..96927f8 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,8 @@ https://www.figma.com/file/YFBYd05CtpXAUl1H2whxEb/Rush%3A-Web-app-prototyping-ki Product Spec Documentation: https://docs.google.com/document/d/1-tYBP6pn_fnwizhPB3ZhvTtMLqb8_aKRsvDxsaNPS-c/edit?usp=sharing -![In-Memory-Code-Covage](https://user-images.githubusercontent.com/91435899/170849346-31e03fe4-dae9-43dd-89f2-1bb9bec9787b.png) - -![Mock-Code-Coverage](https://user-images.githubusercontent.com/74291980/162647492-b4ae9cc9-0118-4f10-8c76-60d5583747f1.PNG) +# Testing Coverage Reports +In Memory Tests +![In-Memory-Code-Covage](https://user-images.githubusercontent.com/91435899/170849346-31e03fe4-dae9-43dd-89f2-1bb9bec9787b.png) +Mock Tests +![Mock-Code-Coverage](https://user-images.githubusercontent.com/74291980/162647492-b4ae9cc9-0118-4f10-8c76-60d5583747f1.PNG) From 25eccbf615b74152a9bcd954329b608617c20125 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Sat, 28 May 2022 20:38:57 -0700 Subject: [PATCH 27/30] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 96927f8..86e9964 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # BE-scheduling -Accessible Link: +## Accessible FrontEnd Link: +https://dog-groomings.herokuapp.com/ + +## Accessible BackEnd Link: https://dog-grooming-api.herokuapp.com/ ## Quick Start Instructions From 057565997cccbd2962e1cfaac593452284eb1e0f Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Sat, 28 May 2022 20:45:03 -0700 Subject: [PATCH 28/30] Update README.md --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 86e9964..9e4907a 100644 --- a/README.md +++ b/README.md @@ -17,20 +17,26 @@ https://dog-grooming-api.herokuapp.com/ `PORT:` Port to utilize should the connection to the cloud hosted DB fail 5. Run `npm run dev` to launch. -# CI/CD Steps: +## CI/CD Steps: npm ci npm run build --if-present npm test -# Include CI/CD details +## Include CI/CD details heroku_api_key: ${{secrets.HEROKU_API_KEY}} heroku_app_name: "dog-grooming-api" heroku_email: {"user@gmail.com"} + +## Automated Acceptance Testing + ### `npx cypress open` - UI Protoyping Schema: +Launches the test runner for Cypress API.\ +See the section about [running tests](https://docs.cypress.io/guides/core-concepts/writing-and-organizing-tests#Hooks) for more information. + +## UI Protoyping Schema: https://www.figma.com/file/YFBYd05CtpXAUl1H2whxEb/Rush%3A-Web-app-prototyping-kit-(Community)?node-id=102%3A408 -Product Spec Documentation: +## Product Spec Documentation: https://docs.google.com/document/d/1-tYBP6pn_fnwizhPB3ZhvTtMLqb8_aKRsvDxsaNPS-c/edit?usp=sharing # Testing Coverage Reports From 3dcdc93000b8b0bba61bd44f35548f5f9868ffc9 Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Sat, 28 May 2022 20:54:42 -0700 Subject: [PATCH 29/30] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9e4907a..eee38dd 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ https://www.figma.com/file/YFBYd05CtpXAUl1H2whxEb/Rush%3A-Web-app-prototyping-ki https://docs.google.com/document/d/1-tYBP6pn_fnwizhPB3ZhvTtMLqb8_aKRsvDxsaNPS-c/edit?usp=sharing # Testing Coverage Reports -In Memory Tests +###In Memory Tests ![In-Memory-Code-Covage](https://user-images.githubusercontent.com/91435899/170849346-31e03fe4-dae9-43dd-89f2-1bb9bec9787b.png) -Mock Tests -![Mock-Code-Coverage](https://user-images.githubusercontent.com/74291980/162647492-b4ae9cc9-0118-4f10-8c76-60d5583747f1.PNG) +###Mock Tests +![mock-tests-coverage](https://user-images.githubusercontent.com/74291980/170851364-90bb1ff9-4377-46ff-a7be-b0584ef5a5ff.PNG) + From 30cf1d4891884564ff358077cc16d8b38cbe6a2f Mon Sep 17 00:00:00 2001 From: Arun-Ganesh07 <74291980+Arun-Ganesh07@users.noreply.github.com> Date: Sat, 28 May 2022 20:54:57 -0700 Subject: [PATCH 30/30] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eee38dd..99d2223 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,8 @@ https://www.figma.com/file/YFBYd05CtpXAUl1H2whxEb/Rush%3A-Web-app-prototyping-ki https://docs.google.com/document/d/1-tYBP6pn_fnwizhPB3ZhvTtMLqb8_aKRsvDxsaNPS-c/edit?usp=sharing # Testing Coverage Reports -###In Memory Tests +### In Memory Tests ![In-Memory-Code-Covage](https://user-images.githubusercontent.com/91435899/170849346-31e03fe4-dae9-43dd-89f2-1bb9bec9787b.png) -###Mock Tests +### Mock Tests ![mock-tests-coverage](https://user-images.githubusercontent.com/74291980/170851364-90bb1ff9-4377-46ff-a7be-b0584ef5a5ff.PNG)