From fafdbf60bb6e5c700d32f9fcdf566231136016a1 Mon Sep 17 00:00:00 2001
From: Dan Nelson <dan@cybertooth.io>
Date: Wed, 23 Jan 2019 13:51:58 -0700
Subject: [PATCH] #9 Fixing a fucked merge.  Goddam it.

---
 app/router.js                                 |  2 -
 app/routes/protected/change-password.js       | 33 -------------
 app/routes/protected/update-profile.js        | 36 --------------
 app/templates/protected/change-password.hbs   | 45 ------------------
 app/templates/protected/update-profile.hbs    | 47 -------------------
 .../routes/protected/change-password-test.js  | 11 -----
 .../routes/protected/update-profile-test.js   | 11 -----
 7 files changed, 185 deletions(-)
 delete mode 100644 app/routes/protected/change-password.js
 delete mode 100644 app/routes/protected/update-profile.js
 delete mode 100644 app/templates/protected/change-password.hbs
 delete mode 100644 app/templates/protected/update-profile.hbs
 delete mode 100644 tests/unit/routes/protected/change-password-test.js
 delete mode 100644 tests/unit/routes/protected/update-profile-test.js

diff --git a/app/router.js b/app/router.js
index 2239713..acf14c6 100644
--- a/app/router.js
+++ b/app/router.js
@@ -27,8 +27,6 @@ Router.map(function () {
       this.route('address');
       this.route('locale-timezone');
     });
-    this.route('change-password');
-    this.route('update-profile');
   });
   this.route('login');
   this.route('sign-up');
diff --git a/app/routes/protected/change-password.js b/app/routes/protected/change-password.js
deleted file mode 100644
index f0da661..0000000
--- a/app/routes/protected/change-password.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { inject as service } from '@ember/service';
-import { hash } from 'rsvp';
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-  actions: {
-    changePassword(currentPassword, newPassword) {
-      this.get('awsAmplifyAuthService')
-        .changePassword(currentPassword, newPassword)
-        .then(() => {
-          this.transitionTo('protected.index')
-            .then(newRoute => newRoute.get('notify').success('Your password was updated successfully.'));
-        })
-        .catch(response => {
-          this.get('notify').error('Your password cannot be changed.');
-          console.warn('ERRORS', response);
-        });
-      return false;
-    }
-  },
-
-  /**
-   * @see `ember-simple-auth-aws-amplify`
-   */
-  awsAmplifyAuthService: service(),
-
-  model() {
-    return hash({
-      currentPassword: '',
-      newPassword: ''
-    })
-  }
-});
diff --git a/app/routes/protected/update-profile.js b/app/routes/protected/update-profile.js
deleted file mode 100644
index b0aeb05..0000000
--- a/app/routes/protected/update-profile.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { inject as service } from '@ember/service';
-import { hash } from 'rsvp';
-import { getOwner } from '@ember/application';
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-  actions: {
-    update(subjectAttributes) {
-      this.get('awsAmplifyAuthService')
-        .updateUserAttributes(subjectAttributes)
-        .then(() => {
-          getOwner(this).lookup('session:main').restore();  // TODO: NOT LOVING THIS
-          this.get('notify').success('Your profile was updated successfully.');
-        })
-        .catch((response) => {
-          console.error('Error', response);
-          this.get('notify').error('Failed to update your profile.');
-        });
-      return false;
-    }
-  },
-
-  /**
-   * @see `ember-simple-auth-aws-amplify`
-   */
-  awsAmplifyAuthService: service(),
-
-  model() {
-    return hash({
-      family_name: this.get('session.data.authenticated.cognitoUser.attributes.family_name'),
-      given_name: this.get('session.data.authenticated.cognitoUser.attributes.given_name')
-    });
-  },
-
-  session: service()
-});
diff --git a/app/templates/protected/change-password.hbs b/app/templates/protected/change-password.hbs
deleted file mode 100644
index 2f7427d..0000000
--- a/app/templates/protected/change-password.hbs
+++ /dev/null
@@ -1,45 +0,0 @@
-<section class="my-3">
-  <div class="container">
-    <div class="row">
-      <div class="offset-md-3 col-md-6">
-        <fieldset>
-          <legend>Change My Password</legend>
-          <form class="form" onsubmit={{action
-            (route-action "changePassword" model.currentPassword model.newPassword)}}>
-            <div class="form-group">
-              <label for="js-current-password" class="control-label">Current Password</label>
-              {{input
-                aria-describedby="js-current-password-help"
-                autocomplete="current-password"
-                autofocus=true
-                class="form-control"
-                id="js-current-password"
-                placeholder="Current Password"
-                type="password"
-                value=model.currentPassword
-              }}
-              <small id="js-current-password-help" class="form-text text-muted">What is your current password?</small>
-            </div>
-            <div class="form-group">
-              <label for="js-new-password" class="control-label">New Password</label>
-              {{input
-                aria-describedby="js-new-password-help"
-                class="form-control"
-                id="js-new-password"
-                placeholder="New Password"
-                type="password"
-                value=model.newPassword
-              }}
-              <small id="js-new-password-help" class="form-text text-muted">What is your new password?</small>
-            </div>
-            <div class="form-group text-right">
-              <button class="btn btn-outline-primary" type="submit">
-                Change Password
-              </button>
-            </div>
-          </form>
-        </fieldset>
-      </div>
-    </div>
-  </div>
-</section>
\ No newline at end of file
diff --git a/app/templates/protected/update-profile.hbs b/app/templates/protected/update-profile.hbs
deleted file mode 100644
index 08f68c5..0000000
--- a/app/templates/protected/update-profile.hbs
+++ /dev/null
@@ -1,47 +0,0 @@
-<section class="my-3">
-  <div class="container">
-    <div class="row">
-      <div class="offset-md-3 col-md-6">
-        <fieldset>
-          <legend>Update Profile</legend>
-          <form class="form" onsubmit={{action (route-action "update" model)}}>
-            <div class="form-group">
-              <label for="js-given-name" class="control-label">Given Name</label>
-              {{input
-                aria-describedby="js-given-name-help"
-                autofocus=true
-                class="form-control"
-                id="js-given-name"
-                placeholder="Given Name"
-                type="text"
-                value=model.given_name
-              }}
-              <small id="js-given-name-help" class="form-text text-muted">
-                What is your given/first name?
-              </small>
-            </div>
-            <div class="form-group">
-              <label for="js-family-name" class="control-label">Family Name</label>
-              {{input
-                aria-describedby="js-family-name-help"
-                class="form-control"
-                id="js-family-name"
-                placeholder="Family Name"
-                type="text"
-                value=model.family_name
-              }}
-              <small id="js-family-name-help" class="form-text text-muted">
-                What is your family/last name?
-              </small>
-            </div>
-            <div class="form-group text-right">
-              <button class="btn btn-outline-primary" type="submit">
-                Update
-              </button>
-            </div>
-          </form>
-        </fieldset>
-      </div>
-    </div>
-  </div>
-</section>
\ No newline at end of file
diff --git a/tests/unit/routes/protected/change-password-test.js b/tests/unit/routes/protected/change-password-test.js
deleted file mode 100644
index 8a4fd34..0000000
--- a/tests/unit/routes/protected/change-password-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Route | protected/change-password', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    let route = this.owner.lookup('route:protected/change-password');
-    assert.ok(route);
-  });
-});
diff --git a/tests/unit/routes/protected/update-profile-test.js b/tests/unit/routes/protected/update-profile-test.js
deleted file mode 100644
index 1414422..0000000
--- a/tests/unit/routes/protected/update-profile-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Route | protected/update-profile', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    let route = this.owner.lookup('route:protected/update-profile');
-    assert.ok(route);
-  });
-});