Added update confirmation modal

Clean up log and commented out code

More console statements removed

Add language and icons to modal

client/app/components/subscription-form.js

@@ -12,6 +12,9 @@ export default class SubscriptionFormComponent extends Component {
 
     isSubmitting = false;
 
+    showSubscriptionUpdateConfirmationModal = false;
+    updateStatus = "none";
+
     previousSubscriptions = {};
     previousIsCommunityDistrict = false;
 
@@ -130,7 +133,6 @@ export default class SubscriptionFormComponent extends Component {
         }
       }
 
-      console.log(requestBody);
       const response = await fetch(`${ENV.host}/subscribers${this.args.isUpdate ? (`/`+ this.args.id) : ''}`, {
         method: this.args.isUpdate ? 'PATCH' : 'POST',
         headers: {
@@ -140,11 +142,21 @@ export default class SubscriptionFormComponent extends Component {
       });
 
       await response.json();
-      console.log("response", response);
 
-      if (!response.ok) throw await response.json();
+      if (!response.ok) {
+        set(this, 'showSubscriptionUpdateConfirmationModal', true);
+        set(this, 'updateStatus', "error");
+        throw await response.json();
+      }
+
       if (!this.args.isUpdate) window.location.pathname = '/subscribed';
 
       set(this, 'isSubmitting', false);
+
+      if(this.args.isUpdate) {
+        set(this, 'showSubscriptionUpdateConfirmationModal', true);
+        set(this, 'updateStatus', "success");
+      }
+
     }
 }

client/app/components/subscription-update-confirmation-modal.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default class SubscriptionUpdateConfirmationModalComponent extends Component {
+}

client/app/routes/subscription-update.js

@@ -9,7 +9,6 @@ export default Route.extend({
 
     const body = await response.json();
     if (!response.ok) throw await response.json();
-console.log("body", body)
 
     var subscriptions = { CW: (body.subscriptions["CW"] === 1) };
     const districts = lookupCommunityDistrict();
@@ -20,7 +19,6 @@ console.log("body", body)
         subscriptions[district.code] = false;
       }
     }
-console.log("model", { email: body.email, subscriptions })
     return { id, email: body.email, subscriptions };
   },
 });

client/app/styles/modules/_m-subscription-form.scss

@@ -165,4 +165,28 @@ input[type=checkbox] {
 
 .update-type-label {
     padding-left: 10px;
-}
+}
+
+.subscription-update-confirmation-modal {
+    font-size: 1.25rem;
+    div > span.frown {
+        color: $red-muted;
+    }
+    span {
+
+        color:#008e50;
+      }
+    p {
+        font-size: 1rem;
+    }
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+}
+
+.home-button {
+    display: flex;
+    width: 100%;
+    justify-content: center;
+    // padding-top: 200px;
+}

client/app/templates/components/subscription-form.hbs

@@ -20,7 +20,6 @@
             </li>
             <li>
                 <div class="update-type-item">
-{{log "isCommunityDistrict" isCommunityDistrict}}                    
                     <Input @id="community-district-checkbox" @type="checkbox" @checked={{isCommunityDistrict}}
                         {{on "change" this.closeAllAccordions}}/>
                     <div class="update-type-label">
@@ -74,4 +73,5 @@
         {{/if}}
         <a class="button primary no-margin {{if this.canBeSubmitted "" "disabled"}}" type="submit" {{action "subscribe"}}>{{if this.args.isUpdate "Update" "Subscribe"}}</a>
     </div>
-</form>
+</form>
+<SubscriptionUpdateConfirmationModal @showSubscriptionUpdateConfirmationModal={{showSubscriptionUpdateConfirmationModal}} @updateStatus={{updateStatus}} />

client/app/templates/components/subscription-update-confirmation-modal.hbs

@@ -0,0 +1,26 @@
+{{#if this.showSubscriptionUpdateConfirmationModal}}
+<div class="reveal-overlay" style="display:block; background-color: rgba(241, 242, 244, 0.45)">
+  <div class="reveal-overlay-target"></div>
+  <div class="reveal info-modal" role="dialog" aria-hidden="false" tabindex="-1" style="display:block;"
+    data-test-info-modal>
+    <div class="subscription-update-confirmation-modal">
+      {{#if (eq this.updateStatus "success")}}
+      <div><span>{{fa-icon icon='check-circle' prefix='far' size='2x'}}</span></div>
+      <div>Your subscription settings have been updated.
+        <p>The changes will be reflected in the system in a few minutes.</p>
+      </div>
+      {{else if (eq this.updateStatus "error")}}
+      <div>
+        <span class="frown">{{fa-icon icon='frown' prefix='far' size='2x'}}</span>
+      </div>
+      <div> <p> There was an error with your submission. Please try again in a few minutes.</p>
+      </div>
+      {{/if}}
+    </div>
+
+    <div class="home-button">
+      <LinkTo class="button primary align-middle" @route="show-geography">Home</LinkTo>
+    </div>
+  </div>
+</div>
+{{/if}}

client/app/templates/subscription-update.hbs

@@ -9,12 +9,6 @@
                         <p></p>
                     <div class="update-type-question">To unsubscribe from a Community District or Citywide, uncheck the selected options below.</div>
                 </div>
-
-{{log "this.model.subscriptions" this.model.subscriptions}}
-{{log "this.model.email" this.model.email}}                    
-
-                    {{log "this.model.id" this.model.id}}
-
                     <SubscriptionForm @subscriptions={{this.model.subscriptions}} @email={{this.model.email}} @isUpdate={{true}} @id={{this.model.id}}>
                         <div class="subscribe-section">
                             <div class="subscribe-input-group">

server/src/subscriber/subscriber.service.ts

@@ -109,8 +109,7 @@ export class SubscriberService {
    * @returns {object}
    */
   async checkCreate(importId: string, @Res() response, counter: number = 0, checksBeforeFail: number, pauseBetweenChecks: number, errorInfo: any) {
-    console.log("checking again");
-    if(counter >= checksBeforeFail) {
+     if(counter >= checksBeforeFail) {
       console.error({
         code: 408,
         message: `Polling limit of ${checksBeforeFail} checks with a ${pauseBetweenChecks/1000} second delay between each has been reached.`,
@@ -263,13 +262,10 @@ export class SubscriberService {
       }
     }
 
-    console.log("request", request);
-
     // https://www.twilio.com/docs/sendgrid/api-reference/contacts/add-or-update-a-contact
     try {
       const result = await this.client.request(request);
-      console.log(result);
-      return { isError: false, result: result };
+       return { isError: false, result: result };
     } catch (error) {
       return { isError: true, ...error };
     }