Merge pull request #31 from Waterclone/develop

Develop
Waterclone · Aug 31, 2023 · 8846912 · 8846912
2 parents a7ed6dd + 0522175
commit 8846912
Show file tree

Hide file tree

Showing 137 changed files with 1,388 additions and 1,663 deletions.
diff --git a/.github/workflows/pr-develop-to-webapp.yml b/.github/workflows/pr-develop-to-webapp.yml
@@ -1,7 +1,7 @@
 # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 
-name: Merge to Main
+name: Merge to Develop
 
 on:
   pull_request:

diff --git a/.github/workflows/pr-main-to-webapp.yml b/.github/workflows/pr-main-to-webapp.yml
@@ -1,7 +1,7 @@
 # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 
-name: Merge to Develop
+name: Merge to Main
 
 on:
   pull_request:

diff --git a/.github/workflows/pu-feature.yml b/.github/workflows/pu-feature.yml
@@ -29,15 +29,15 @@ jobs:
       - name: Run Tests
         run: npm test
 
-  security:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: Set up Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "16.x"
-      - name: Run Snyk to check for vulnerabilities
-        uses: snyk/actions/node@master
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+  # security:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - name: Set up Node.js
+  #       uses: actions/setup-node@v2
+  #       with:
+  #         node-version: "16.x"
+  #     - name: Run Snyk to check for vulnerabilities
+  #       uses: snyk/actions/node@master
+  #       env:
+  #         SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
diff --git a/coverage/clover.xml b/coverage/clover.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1693345969692" clover="3.2.0">
-  <project timestamp="1693345969692" name="All files">
+<coverage generated="1693459450202" clover="3.2.0">
+  <project timestamp="1693459450202" name="All files">
     <metrics statements="47" coveredstatements="47" conditionals="34" coveredconditionals="34" methods="5" coveredmethods="5" elements="86" coveredelements="86" complexity="0" loc="47" ncloc="47" packages="1" files="3" classes="3"/>
-    <file name="carValueServices.ts" path="/Users/jenehamahona/Documents/Mission Ready/Level 5/Mission 3/MR-L5-Mission3-2/Server/src/services/carValueServices.ts">
+    <file name="carValueServices.ts" path="/Users/jimson/Desktop/Final_m3/MR-L5-Mission-3-2/src/services/carValueServices.ts">
       <metrics statements="13" coveredstatements="13" conditionals="9" coveredconditionals="9" methods="1" coveredmethods="1"/>
       <line num="1" count="1" type="stmt"/>
       <line num="2" count="8" type="stmt"/>
@@ -18,7 +18,7 @@
       <line num="20" count="4" type="stmt"/>
       <line num="21" count="4" type="stmt"/>
     </file>
-    <file name="quoteServices.ts" path="/Users/jenehamahona/Documents/Mission Ready/Level 5/Mission 3/MR-L5-Mission3-2/Server/src/services/quoteServices.ts">
+    <file name="quoteServices.ts" path="/Users/jimson/Desktop/Final_m3/MR-L5-Mission-3-2/src/services/quoteServices.ts">
       <metrics statements="15" coveredstatements="15" conditionals="9" coveredconditionals="9" methods="2" coveredmethods="2"/>
       <line num="1" count="1" type="stmt"/>
       <line num="2" count="12" type="cond" truecount="4" falsecount="0"/>
@@ -36,7 +36,7 @@
       <line num="26" count="4" type="stmt"/>
       <line num="28" count="4" type="stmt"/>
     </file>
-    <file name="riskServices.ts" path="/Users/jenehamahona/Documents/Mission Ready/Level 5/Mission 3/MR-L5-Mission3-2/Server/src/services/riskServices.ts">
+    <file name="riskServices.ts" path="/Users/jimson/Desktop/Final_m3/MR-L5-Mission-3-2/src/services/riskServices.ts">
       <metrics statements="19" coveredstatements="19" conditionals="16" coveredconditionals="16" methods="2" coveredmethods="2"/>
       <line num="1" count="1" type="stmt"/>
       <line num="2" count="10" type="cond" truecount="2" falsecount="0"/>

diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
diff --git a/coverage/lcov-report/carValueServices.ts.html b/coverage/lcov-report/carValueServices.ts.html
@@ -136,7 +136,7 @@ <h1><a href="index.html">All files</a> carValueServices.ts</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2023-08-29T21:52:49.677Z
+                at 2023-08-31T05:24:10.197Z
             </div>
         <script src="prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html
@@ -131,7 +131,7 @@ <h1>All files</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2023-08-29T21:52:49.677Z
+                at 2023-08-31T05:24:10.197Z
             </div>
         <script src="prettify.js"></script>
         <script>

diff --git a/node_modules/.bin/acorn b/node_modules/.bin/acorn
diff --git a/node_modules/.bin/browserslist b/node_modules/.bin/browserslist
diff --git a/node_modules/.bin/esparse b/node_modules/.bin/esparse
diff --git a/node_modules/.bin/esvalidate b/node_modules/.bin/esvalidate
diff --git a/node_modules/.bin/import-local-fixture b/node_modules/.bin/import-local-fixture
diff --git a/node_modules/.bin/jest b/node_modules/.bin/jest
diff --git a/node_modules/.bin/js-yaml b/node_modules/.bin/js-yaml
diff --git a/node_modules/.bin/jsesc b/node_modules/.bin/jsesc
diff --git a/node_modules/.bin/json5 b/node_modules/.bin/json5
diff --git a/node_modules/.bin/mime b/node_modules/.bin/mime
diff --git a/node_modules/.bin/mkdirp b/node_modules/.bin/mkdirp
diff --git a/node_modules/.bin/node-which b/node_modules/.bin/node-which
diff --git a/node_modules/.bin/parser b/node_modules/.bin/parser
diff --git a/node_modules/.bin/resolve b/node_modules/.bin/resolve
diff --git a/node_modules/.bin/rimraf b/node_modules/.bin/rimraf
diff --git a/node_modules/.bin/semver b/node_modules/.bin/semver
diff --git a/node_modules/.bin/tree-kill b/node_modules/.bin/tree-kill
diff --git a/node_modules/.bin/ts-jest b/node_modules/.bin/ts-jest
diff --git a/node_modules/.bin/ts-node b/node_modules/.bin/ts-node
diff --git a/node_modules/.bin/ts-node-cwd b/node_modules/.bin/ts-node-cwd