Merge pull request #21 from DTS-STN/develop

Merge develop to main
DTS-STN · Dec 14, 2021 · e9d06a9 · e9d06a9 · vercel · Dec 14, 2021
2 parents 79657ff + 9fe696a
commit e9d06a9
Show file tree

Hide file tree

Showing 54 changed files with 2,203 additions and 1,593 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'daily'
+    target-branch: 'develop'
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -4,4 +4,4 @@
 
 ### Success Criteria
 
-### Addtional Notes
+### Additional Notes
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -9,4 +9,4 @@ List of proposed changes:
 
 ### What to test for/How to test
 
-### Addtional Notes
+### Additional Notes
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/eligibility-estimator.iml b/.idea/eligibility-estimator.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
diff --git a/.idea/runConfigurations/Jest__API_Tests.xml b/.idea/runConfigurations/Jest__API_Tests.xml
diff --git a/.idea/runConfigurations/npm__dev.xml b/.idea/runConfigurations/npm__dev.xml
diff --git a/.idea/runConfigurations/npm__reformat.xml b/.idea/runConfigurations/npm__reformat.xml
diff --git a/.idea/scopes/Backend.xml b/.idea/scopes/Backend.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.teamcity/README.md b/.teamcity/README.md
@@ -2,7 +2,7 @@
 
 In order to deploy with TeamCity, two approaches can be taken.
 
-1.  You can configure everthing from the TC UI, however, it is easier but not recommended compared to the second option.
+1.  You can configure everything from the TC UI, however, it is easier but not recommended compared to the second option.
 2.  Taking the Configuration as Code approach allows developers to edit the deployment configurations from teh code. Thus enabling programmers to create Pull Requests for reviews. In addition, configuration as code enables more flexibility.
 
 The files in the current folder `.teamcity` are an example of what it would look like for an application called single-tier-application.
diff --git a/__tests__/pages/api/factory.ts b/__tests__/pages/api/factory.ts
@@ -4,7 +4,7 @@ import {
   CalculationInput,
   ResponseError,
   ResponseSuccess,
-} from '../../../utils/api/types'
+} from '../../../utils/api/definitions/types'
 
 interface MockResponseObject<T extends ResponseSuccess | ResponseError> {
   status: number
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		### Success Criteria

		### Addtional Notes
		### Additional Notes
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ List of proposed changes:

		### What to test for/How to test

		### Addtional Notes
		### Additional Notes