110swag / flashy-frontend

Download as
Browse Code ยป

Commit 6bd138fc7187baff4998bd28696e2233ef566974

Authored by Melody
2 parents bac1b3d8de e45e7d8a26
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

Merge branch 'master' of git.ucsd.edu:110swag/flashy-frontend

Showing 4 changed files Side-by-side Diff

config.js View file @ 6bd138f
... ... @@ -67,8 +67,7 @@
67 67 controller: 'RequestResetController'
68 68 }).
69 69 state('resetpassword', {
70   - url: '/resetpassword',
71   - url: '/resetpassword/*',
  70 + url: '/resetpassword/{uid}/{token}',
72 71 templateUrl: 'templates/resetpassword.html',
73 72 controller: 'ResetPasswordController'
74 73 });
templates/login.html View file @ 6bd138f
1 1 <div class="row">
2 2 <div class="offset-s2 col s8">
3 3 <ul class="tabs">
4   - <div class="row">
5 4 <li class="tab col s6 "><a href="#register-tab">Sign Up</a></li>
6 5 <li class="tab col s6 "><a class="active" href="#login-tab">Login</a></li>
7   - </div>
8 6 </ul>
9 7 </div>
10 8 </div>
templates/requestpasswordreset.html View file @ 6bd138f
1 1 <div class="row" ng-show="success">
2   - <h1>Request sent! Check your email in a few minutes.</h1>
  2 + <h1>Request sent!</h1>
  3 + <h1>Check your email in a few minutes.</h1>
3 4 </div>
4 5  
5 6 <div class="row" ng-hide="success">
templates/resetpassword.html View file @ 6bd138f
1   -<div class="row" ng-hide="success">
  1 +<div class="row" ng-show="success">
2 2 <h1>Reset password successful!</h1>
3 3 </div>
4 4  
5   -<div class="container" ng-show="success">
  5 +<div class="container" ng-hide="success">
6 6 <div class="row">
7 7 <div class="offset-s2 col s8">
8 8 <div class="card">