Copy changes and some small fixes

app/components/password/forgot-password.js

@@ -28,7 +28,7 @@ export default Component.extend({
   forgotPasswordTask: task(function* (email) {
     try {
       yield get(this, 'forgotPassword')(email);
-      get(this, 'flashMessages').clearMessages().success('If your email is associated with an account registered here, a password reset link has been sent to it.');
+      get(this, 'flashMessages').clearMessages().success("Check your email for a link to reset your password. If it doesn't appear within a few minutes, check your spam folder or double-check whether you have an account with this email.");
       set(this, 'error', null);
     } catch(e) {
       set(this, 'error', e);

app/components/password/reset-password.js

@@ -33,7 +33,7 @@ export default Component.extend({
   resetPasswordTask: task(function* (password, passwordConfirmation) {
     try {
       yield get(this, 'resetPassword')(password, passwordConfirmation);
-      get(this, 'flashMessages').clearMessages().success('You are now logged in');
+      get(this, 'flashMessages').clearMessages().success("Your password has been reset and you're now signed in.");
       set(this, 'error', null);
     } catch(e) {
       set(this, 'error', e);

app/routes/password/reset.js

@@ -24,10 +24,10 @@ export default Route.extend({
         data: {
           token: get(this, 'controller.token'),
           password,
-          passwordConfirmation
+          "password-confirmation": passwordConfirmation
         }
-      }).then((json) => {
-        return get(this, 'session').authenticate('authenticator:jwt', { identification: json.email, password });
+      }).then((response) => {
+        return get(this, 'session').authenticate('authenticator:jwt', { identification: response.email, password });
       });
     }
   }

app/templates/components/login-form.hbs

@@ -21,7 +21,7 @@
   </div>
 
   {{#link-to 'password.forgot' classNames="t-forgot-password"}}
-    Forgot password
+    Forgot your password?
   {{/link-to}}
 
   {{#if errors}}

app/templates/components/password/forgot-password.hbs

@@ -1,7 +1,8 @@
 <div class="container">
   <form>
+    <h2>Reset your password</h2>
 
-    <p data-test-id="forgot-password-header">Enter your email and we'll send you a link to reset your password</p>
+    <p data-test-id="forgot-password-header">Enter your email and we'll send you a link to reset your password.</p>
 
     <div class="input-group">
       {{#auto-focus}}
@@ -11,7 +12,7 @@
 
     <div class="input-group">
       <button id="reset-password" class="default" type="submit" disabled={{isLoading}} {{action "forgotPassword" email}}>
-       Forgot password
+       Send password reset email
       </button>
     </div>
 

app/templates/components/password/reset-password.hbs

@@ -1,5 +1,7 @@
 <div class="container">
   <form>
+    <h2>Change your password</h2>
+
     <div class="input-group">
       <label data-test-id="password-label">Password</label>
       {{#auto-focus}}
@@ -8,7 +10,7 @@
     </div>
 
     <div class="input-group">
-      <label data-test-id="password-confirmation-label">Confirm Password</label>
+      <label data-test-id="password-confirmation-label">Confirm password</label>
       {{input id="password-confirmation" class="has-progress" name="password" type="password" autocomplete="off" value=passwordConfirmation}}
     </div>
 

package.json

@@ -98,9 +98,6 @@
     "normalize.css": "^6.0.0",
     "yuidoc-ember-theme": "^1.3.0"
   },
-  "dependencies": {
-    "node-sass": "latest"
-  },
   "engines": {
     "node": ">= 4"
   },

yarn.lock

@@ -126,7 +126,7 @@ ajv-keywords@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
-ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.7.0:
   version "4.11.5"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
   dependencies:
@@ -1786,10 +1786,6 @@ caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
 ceibo@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ceibo/-/ceibo-2.0.0.tgz#9a61eb054a91c09934588d4e45d9dd2c3bf04eee"
@@ -4361,10 +4357,6 @@ handlebars@^4.0.1, handlebars@^4.0.4, handlebars@^4.0.6:
   optionalDependencies:
     uglify-js "^2.6"
 
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
@@ -4374,13 +4366,6 @@ har-validator@~2.0.6:
     is-my-json-valid "^2.12.4"
     pinkie-promise "^2.0.0"
 
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
 has-ansi@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
@@ -5700,6 +5685,29 @@ node-sass@^4.1.0, node-sass@latest:
     sass-graph "^2.1.1"
     stdout-stream "^1.4.0"
 
+node-sass@^4.5.3:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568"
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash.assign "^4.2.0"
+    lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.3.2"
+    node-gyp "^3.3.1"
+    npmlog "^4.0.0"
+    request "^2.79.0"
+    sass-graph "^2.1.1"
+    stdout-stream "^1.4.0"
+
 node-slackr@^0.1.0:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/node-slackr/-/node-slackr-0.1.4.tgz#625da8ac93c00f251b7ad6d713d6009e75ffa3ca"
@@ -6022,10 +6030,6 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -6144,7 +6148,7 @@ q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
-qs@6.4.0, qs@^6.2.0, qs@~6.4.0:
+qs@6.4.0, qs@^6.2.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
@@ -6553,10 +6557,6 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
-
 safe-json-parse@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
@@ -7188,12 +7188,6 @@ tryor@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"