Fix Forgot password link

service-bot · Mar 30, 2018 · 04cf17d · 04cf17d
1 parent ebdf010
commit 04cf17d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -7,7 +7,8 @@
     "build": "./node_modules/.bin/webpack",
     "dev-client": "./node_modules/.bin/webpack-dev-server --port 3002 --content-base public/",
     "fullStart": "./node_modules/.bin/webpack && node ./bin/start",
-    "debug": "node $NODE_DEBUG_OPTION ./bin/start"
+    "debug": "node $NODE_DEBUG_OPTION ./bin/start",
+    "test": "jest"
   },
   "repository": {
     "type": "git",
@@ -113,10 +114,12 @@
   },
   "devDependencies": {
     "babel-plugin-transform-async-to-generator": "^6.24.1",
+    "jest": "^22.4.2",
     "react-hot-loader": "^3.0.0-beta.7",
+    "servicebot-client": "^1.0.3",
     "supertest": "^3.0.0",
     "tape": "^4.8.0",
-    "uglifyjs-webpack-plugin": "^1.0.1",
+    "uglifyjs-webpack-plugin": "^1.2.4",
     "webpack-dev-server": "^1.14.1"
   }
 }
diff --git a/views/components/elements/forms/login.jsx b/views/components/elements/forms/login.jsx
@@ -183,14 +183,16 @@ class Login extends React.Component {
                                     <button onClick={this.handleLogin} type='submit'
                                             className="btn btn-raised btn-lg btn-primary btn-block">Sign in
                                     </button>
+                                    <p className="sign-up-link">
+                                        <Link to={{pathname: "/forgot-password", state: {fromLogin: false}}}> Forgot
+                                            Password</Link>
+                                    </p>
                                     {(this.props.options && this.props.options.allow_registration.value == 'true') &&
                                     <p className="sign-up-link">Don't have an account?
                                         <span><Link to={{
                                             pathname: "/signup",
                                             state: {fromLogin: true}
-                                        }}> Sign up here</Link> or </span>
-                                        <Link to={{pathname: "/forgot-password", state: {fromLogin: false}}}> Forgot
-                                            Password</Link>
+                                        }}> Sign up here</Link></span>
                                     </p>
                                     }
                                 </form>