From d25377cdbe2c8aa41a101176a2aa48a1d2168c85 Mon Sep 17 00:00:00 2001
From: dan <ofbadmin@ofbbutte.com>
Date: Wed, 24 Jul 2019 22:33:06 -0600
Subject: [PATCH] Update environments

---
 Client/angular.json                                       | 8 ++++++++
 .../missionary-form-page.component.html                   | 4 ++--
 .../missionary-form-page.component.ts                     | 8 ++++++++
 Client/src/environments/environment.prod.ts               | 1 +
 Client/src/environments/environment.test.ts               | 7 +++++++
 git-post-receive                                          | 8 +++++++-
 6 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 Client/src/environments/environment.test.ts

diff --git a/Client/angular.json b/Client/angular.json
index 1bfdc65..bebfb85 100644
--- a/Client/angular.json
+++ b/Client/angular.json
@@ -29,6 +29,14 @@
             "scripts": []
           },
           "configurations": {
+            "test": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.test.ts"
+                }
+              ]
+            },
             "production": {
               "fileReplacements": [
                 {
diff --git a/Client/src/app/components/missionary-form-page/missionary-form-page.component.html b/Client/src/app/components/missionary-form-page/missionary-form-page.component.html
index 2adb858..8cf266a 100644
--- a/Client/src/app/components/missionary-form-page/missionary-form-page.component.html
+++ b/Client/src/app/components/missionary-form-page/missionary-form-page.component.html
@@ -18,7 +18,7 @@
       </p>
       <br><br>
       <form [formGroup]="form" (ngSubmit)="onSubmit()">
-        <mat-form-field class="w-50">
+        <mat-form-field class="w-50" [class.background-error]="hasErrors('name')">
           <mat-label>Name</mat-label>
           <input matInput type="text" formControlName="name" required>
         </mat-form-field>
@@ -205,7 +205,7 @@
         </mat-form-field>
         <label id="fellowshipAssociationLabel">Do you claim identity with any group or fellowship such as BBF, GARB, FBF, Other?</label>
         <mat-form-field class="w-100" floatLabel="never">
-          <textarea matInput type="text" placeholder="Your Answer" formControlName="fellowshipAssocation" required></textarea>
+          <textarea matInput type="text" placeholder="Your Answer" formControlName="fellowshipAssociation" required></textarea>
         </mat-form-field>
         <label id="collegeRecommendationsLabel">To a young person asking you to recommend a Christian College, list two or three Christian Colleges, in order of preference, which you would recommend?</label>
         <label class="sub">Please list the name, city, and state for each</label>
diff --git a/Client/src/app/components/missionary-form-page/missionary-form-page.component.ts b/Client/src/app/components/missionary-form-page/missionary-form-page.component.ts
index 2110ca8..931cbde 100644
--- a/Client/src/app/components/missionary-form-page/missionary-form-page.component.ts
+++ b/Client/src/app/components/missionary-form-page/missionary-form-page.component.ts
@@ -120,6 +120,14 @@ export class MissionaryFormPageComponent implements OnInit {
     }
   }
 
+  hasErrors(formControlName: string): boolean {
+    let res = this.form.get(formControlName) && typeof this.form.get(formControlName).errors !== 'undefined';
+    if (res === true) {
+      res = this.form.get(formControlName).dirty || (this.form.get(formControlName).touched && this.form.get(formControlName).valid === false);
+    }
+    return res;
+  }
+
   onSubmit(){
     this.errorMessages = [];
     if (this.errorMessages.length > 0){ return; }
diff --git a/Client/src/environments/environment.prod.ts b/Client/src/environments/environment.prod.ts
index 3eb3975..9e05a23 100644
--- a/Client/src/environments/environment.prod.ts
+++ b/Client/src/environments/environment.prod.ts
@@ -1,5 +1,6 @@
 export const environment = {
   production: true,
+  environment: 'prod',
   baseUrl: "",
   baseApi: "https://ofbbutte.com/2/api"
 };
diff --git a/Client/src/environments/environment.test.ts b/Client/src/environments/environment.test.ts
new file mode 100644
index 0000000..dc6d869
--- /dev/null
+++ b/Client/src/environments/environment.test.ts
@@ -0,0 +1,7 @@
+export const environment = {
+    production: false,
+    environment: 'test',
+    baseUrl: "",
+    baseApi: "https://test.ofbbutte.com/2/api"
+  };
+  
\ No newline at end of file
diff --git a/git-post-receive b/git-post-receive
index d55e558..8516cfe 100644
--- a/git-post-receive
+++ b/git-post-receive
@@ -29,7 +29,13 @@ if [ "$BUILD_ANGULAR" = true ]; then
 	echo "Installing Client Node Modules"
 	../../bin/node ../../bin/npm install --silent --scripts-prepend-node-path
 	echo "Building Angular Application"
-	../../bin/node node_modules/@angular/cli/bin/ng build --prod
+	if [ "$BRANCH" = master ]; then
+		../../bin/node node_modules/@angular/cli/bin/ng build --prod --configuration=production
+	fi
+	if [ "$BRANCH" = test ]; then
+		../../bin/node node_modules/@angular/cli/bin/ng build --prod --configuration=test
+	fi
+	
 	cd ../../
 	rm -r -f www/
 	mv tempcheckout/Server/www/ www/