Updated faq styles

package.json

@@ -24,16 +24,15 @@
     "@angular/router": "^6.0.3",
     "angular2-text-mask": "^9.0.0",
     "core-js": "^2.5.4",
-    "ng-multiselect-dropdown": "^0.2.3",
+    "missing": "0.0.1",
     "ngx-perfect-scrollbar": "^6.3.1",
     "rxjs": "^6.0.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^6.0.3",
     "@angular-devkit/build-angular": "~0.6.6",
-    "typescript": "~2.7.2",
-    "@angular/cli": "~6.0.7",
+    "@angular/cli": "^6.2.3",
+    "@angular/compiler-cli": "^6.0.3",
     "@angular/language-service": "^6.0.3",
     "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.3",
@@ -46,8 +45,9 @@
     "karma-coverage-istanbul-reporter": "~2.0.0",
     "karma-jasmine": "~1.1.1",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.3.0",
+    "protractor": "^5.4.1",
     "ts-node": "~5.0.1",
-    "tslint": "~5.9.1"
+    "tslint": "~5.9.1",
+    "typescript": "~2.7.2"
   }
 }

src/app/account/account.model.ts

@@ -9,4 +9,9 @@ export class UserInput {
 export class Credentials {
     email: string = "";
     password: string = "";
+}
+
+export class PasswordReset {
+    password: string = "";
+    password_confirmation: string = "";
 }

src/app/account/account.service.ts

@@ -1,5 +1,5 @@
 import { User } from './../shared/user/user.model';
-import { UserInput, Credentials } from './account.model';
+import { UserInput, Credentials, PasswordReset } from './account.model';
 import { environment } from './../../environments/environment';
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
@@ -34,11 +34,34 @@ export class AccountService {
         )
     }
 
+    resetPassword(email: string): Observable<User> {
+        let emailJSON = {"email": email}
+
+        return this.httpClient.post<User>(environment.baseUrl + "/users/request_password_token", emailJSON, httpOptions)
+        .pipe(
+            catchError(this.handleError)
+        )
+    }
+
+    setNewPassword(passwords: PasswordReset, resetToken: string): Observable<User> {
+        let newHttpOptions = {
+            headers: new HttpHeaders({ 
+                'Content-Type': 'application/json',
+                'X-WWW-RESET-PASSWORD-TOKEN': resetToken
+            })
+        };
+        return this.httpClient.post<User>(environment.baseUrl + "/users/reset_password", passwords, newHttpOptions)
+        .pipe(
+            catchError(this.handleError)
+        )
+    }
+
     logout() {
         //Unset session variables and return to home
         window.sessionStorage.removeItem('application id');
         window.sessionStorage.removeItem('user id');
         window.sessionStorage.removeItem('auth token');
+        window.sessionStorage.removeItem('admin');
 
         this.router.navigate(['']);
     }

src/app/account/login/login.component.html

@@ -26,6 +26,7 @@ <h3 style="text-align: center;">Login to Spartahack</h3>
                 </form>
                 <p class="text-danger mt-3" *ngIf="error != ''" [innerHTML]='error'></p>
                 <p class="new mt-3">New? Create an account <a (click)="onCreate()">here</a></p>
+                <p class="new">Forgot your password? Reset it <a (click)="onResetPassword()">here</a></p>
             </div>
         </div>
     </div>

src/app/account/login/login.component.ts

@@ -1,3 +1,4 @@
+import { UserService } from './../../shared/user/user.service';
 import { Router } from '@angular/router';
 import { AccountService } from './../account.service';
 import { Component, OnInit } from '@angular/core';
@@ -18,6 +19,7 @@ export class LoginComponent implements OnInit {
 
     constructor(
         private accountService: AccountService,
+        private userService: UserService,
         private router: Router
     ) { }
 
@@ -27,6 +29,11 @@ export class LoginComponent implements OnInit {
         this.router.navigate(['create']);
     }
 
+    onResetPassword() {
+        //navigate to reset page
+        this.router.navigate(['send-reset']);
+    }
+
     onSubmit() {
         this.error = "";
 
@@ -39,11 +46,16 @@ export class LoginComponent implements OnInit {
                 //Required to be passed in every header for restricted access pages
                 window.sessionStorage.setItem('auth token', String(response.auth_token))
 
+                //Set admin status. If they are not an admin on login, they never will be.
+                if(response.role == "organizer" || response.role == "director") {
+                    window.sessionStorage.setItem('admin', "True");
+                }
+
                 //Navigate Based on application status
                 if(response.application_id == null)
                 {
                     //If not applied, go to apply
-                    this.router.navigate(['apply'])
+                    this.router.navigate(['application'])
                 }
                 else
                 {

src/app/account/reset/reset.component.html

@@ -0,0 +1,33 @@
+<local-header [title]="'Reset'"></local-header>
+
+<div class="row justify-content-center">
+    <div class="col-sm col-md-8 mt-4"> 
+        <h3 style="text-align: center;">Reset Password</h3>
+    </div>
+</div>
+<div class="row justify-content-center">
+    <div class="col-sm col-md-6">
+        <div class="card">
+            <div class="card-body">
+                <h5 *ngIf="!submitted" class="card-title" style="color: black;">Reset your password</h5>
+                <form #resetForm="ngForm" *ngIf="!submitted">
+                    <div class="form-group">
+                        <label for="password">New Password</label>
+                        <input type="password" class="form-control" id="password" placeholder="strong but memorable" maxlength="30"
+                            required [(ngModel)]="passwords.password" name="password" #password="ngModel"> 
+                        <small *ngIf="!(password.valid || password.pristine)" class="form-text text-danger">Password is Required</small>
+                    </div>
+                    <div class="form-group">
+                        <label for="password_confirmation">Confirm Password</label>
+                        <input type="password" class="form-control" id="password_confirmation" placeholder="same as above" maxlength="30"
+                            required [(ngModel)]="passwords.password_confirmation" name="password_confirmation" #passwordc="ngModel"> 
+                        <small *ngIf="!(passwordc.valid || passwordc.pristine)" class="form-text text-danger">Confirmation is Required</small>
+                    </div>
+                    <button [disabled]="!resetForm.valid" (click)="onSubmit()" class="btn btn-primary mr-2">Submit!</button>
+                </form>
+                <p class="text-danger mt-3" *ngIf="error != ''" [innerHTML]='error'></p>
+                <p class="login text-dark mt-3" *ngIf="submitted">Your password has been reset.  <a style="color: blue;text-decoration: underline;cursor: pointer;" (click)="onLogin()">Login Now!</a></p>
+            </div>
+        </div>
+    </div>
+</div>

src/app/account/reset/reset.component.ts

@@ -0,0 +1,68 @@
+import { PasswordReset } from './../account.model';
+import { Component, OnInit } from '@angular/core';
+import { AccountService } from '../account.service';
+import { Router, ActivatedRoute } from '@angular/router';
+
+@Component({
+    selector: 'reset',
+    templateUrl: 'reset.component.html'
+})
+
+export class ResetComponent implements OnInit {
+
+    submitted = false;
+    passwords: PasswordReset = new PasswordReset();
+    resetToken: string = "";
+
+    error: string = "";
+
+    constructor(
+        private accountService: AccountService,
+        private activatedRoute: ActivatedRoute,
+        private router: Router
+    ) { }
+
+    ngOnInit() { 
+        this.resetToken = this.activatedRoute.snapshot.params['token'];
+    }
+
+    onLogin() {
+        this.router.navigate(['login']);
+    }
+
+    onSubmit() {
+
+        this.error = "";
+
+        //actually make the password reset call
+        this.accountService.setNewPassword(this.passwords, this.resetToken).subscribe(
+            data => { this.submitted = true; },
+            error => {
+                if(!this.isEmpty(error.error_list))
+                {
+                    console.log('here');
+                    for (var key in error.error_list) {
+                        if (error.error_list.hasOwnProperty(key)) {
+                            this.error = error.error_list[key];
+                        }
+                    }
+                }
+                else
+                {
+                    this.error = "Something is not right! Ensure your passwords match and try again."
+                }
+            }
+        );
+
+
+    }
+
+    isEmpty(obj) {
+        for(var key in obj) {
+            if(obj.hasOwnProperty(key))
+                return false;
+        }
+        return true;
+    }
+
+}

src/app/account/reset/send-reset.component.html

@@ -0,0 +1,30 @@
+<local-header [title]="'Reset'"></local-header>
+
+<div class="row justify-content-center">
+    <div class="col-sm col-md-8 mt-4"> 
+        <h3 style="text-align: center;">Reset Password</h3>
+    </div>
+</div>
+<div class="row justify-content-center">
+    <div class="col-sm col-md-6">
+        <div class="card">
+            <div class="card-body">
+                <div *ngIf="!passwordReset">
+                    <p style="color: black">Enter your email, and we'll send you a link to reset your password!</p>
+                    <form #sendResetForm="ngForm">
+                        <div class="form-group">
+                            <label for="resetEmail">Email</label>
+                            <input type="text" class="form-control" id="resetEmail" maxlength="50"
+                                required [(ngModel)]="resetEmail" name="resetEmail" #resetEmailText="ngModel"> 
+                            <small *ngIf="!(resetEmailText.valid || resetEmailText.pristine)" class="form-text text-danger">Email is Required</small>
+                        </div>
+                        <button type="button" [disabled]="!sendResetForm.valid" (click)="onResetConfirm()" class="btn btn-primary mr-2">Submit</button>
+                        <button type="button" (click)="onResetCancel()" class="btn btn-primary mr-2">Cancel</button>
+                    </form>
+                    <p class="text-danger mt-3" *ngIf="error != ''" [innerHTML]='error'></p>
+                </div>
+                <p *ngIf="passwordReset" style="color: black" class="mt-3">Your password has been reset. If you have an account, you should recieve an email shortly.</p>
+            </div>
+        </div>
+    </div>
+</div>

src/app/account/reset/send-reset.component.ts

@@ -0,0 +1,42 @@
+import { Component, OnInit } from '@angular/core';
+import { AccountService } from '../account.service';
+import { Router } from '@angular/router';
+
+@Component({
+    selector: 'send-reset',
+    templateUrl: 'send-reset.component.html'
+})
+
+export class SendResetComponent implements OnInit {
+
+    passwordReset = false;
+    resetEmail: string = "";
+
+    error: string = "";
+
+    constructor(
+        private accountService: AccountService,
+        private router: Router
+    ) { }
+
+    ngOnInit() { }
+
+    onResetCancel() {
+        //Navigate back to login page
+        this.router.navigate(['login']);
+    }
+
+    onResetConfirm() {
+        //actually make the password reset call
+        this.accountService.resetPassword(this.resetEmail).subscribe(
+            data => { this.passwordReset = true; },
+            error => {
+                this.error = error.error_list.email
+            }
+        );
+
+
+    }
+
+
+}

src/app/admin/admin.component.html

@@ -0,0 +1,7 @@
+<local-header [title]="'Admin Dashboard'"></local-header>
+
+<div class="row mb-2">
+    <div class="col-12 col-md-6 mb-2 tall-column">
+        <button class="btn btn-primary btn-block" (click)="onReview()">Review Applications</button>
+    </div>
+</div>

src/app/admin/admin.component.scss

@@ -0,0 +1,15 @@
+.btn {
+    background-color: #20044f;
+    border-color: #ff0062;
+    font-size: 1rem;
+} 
+.btn-warning {
+    background-color: #ff0062;
+    color: #20044f;
+}
+.tall-column {
+    height: 200%;
+}
+.btn-block {
+    font-size: 2rem;
+}

src/app/admin/admin.component.ts

@@ -0,0 +1,35 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { User } from '../shared/user/user.model';
+import { UserService } from '../shared/user/user.service';
+
+@Component({
+    selector: 'admin',
+    templateUrl: 'admin.component.html',
+    styleUrls: ['admin.component.scss']
+})
+
+export class AdminComponent implements OnInit {
+
+    user: User;
+
+    constructor(
+        private userService: UserService,
+        private router: Router
+    ) { }
+
+    ngOnInit() {
+        //Is Logged in?
+        if(!this.userService.isUserLoggedIn()) {
+            //redirect to login
+            this.router.navigate(['login']);
+        }
+        else if(!this.userService.isAdmin()) {
+            this.router.navigate(['']);
+        }
+    }
+
+    onReview() {
+        this.router.navigate(['admin/review']);
+    }
+}