Merge branch 'master' of https://git.loafle.net/overflow/overflow-webapp

src/app/packages/member/component/reset-password/reset-password.module.ts

@@ -1,11 +1,18 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ResetPasswordComponent } from './reset-password.component';
+import { RouterModule } from '@angular/router';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MaterialModule } from 'app/commons/ui/material/material.module';
 
 
 @NgModule({
   imports: [
     CommonModule,
+    RouterModule,
+    FormsModule,
+    ReactiveFormsModule,
+    MaterialModule,
   ],
   declarations: [
     ResetPasswordComponent,

src/app/packages/member/component/signin/signin.component.html

@@ -1,6 +1,6 @@
 <mat-card>
   <mat-card-title>Signin
-      <a class="redirect" [routerLink]="['/auth/sigup']">Register an account</a>
+      <a class="redirect" [routerLink]="['/auth/signup']">Register an account</a>
   </mat-card-title>
   <mat-card-content>
       <form fxLayout="column" fxLayoutAlign="start stretch" [formGroup]="signinForm" (ngSubmit)="login()">
@@ -18,7 +18,13 @@
           <div *ngIf="formErrors.password" class="help is-danger">
               {{ formErrors.password }}
           </div>
-          <button mat-raised-button color="primary" type="submit" [disabled]="!signinForm.valid" (click)="signin()">log in</button>
+        <!--[disabled]="!signinForm.valid"-->
+          <button mat-raised-button color="accent" type="submit"  (click)="signin()">log in</button>
       </form>
   </mat-card-content>
+
+  <mat-card-subtitle>
+    <button mat-raised-button mat-warn color="warn"  (click)="signin()">Forgot Password</button>
+    <button mat-raised-button color="primary" (click)="signin()">Sign Up</button>
+  </mat-card-subtitle>
 </mat-card>

src/app/packages/member/component/signup/signup.component.html

@@ -45,7 +45,9 @@
       <div *ngIf="formErrors.company" class="help is-danger">
         {{ formErrors.company }}
       </div>
-
+      <mat-card-title>
+        <a class="redirect" [routerLink]="['/auth/signin']">confirm</a>
+      </mat-card-title>
       <button mat-raised-button color="primary" type="submit" [disabled]="!signupForm.valid" (click)="signup()">Signup</button>
     </form>
   </mat-card-content>

src/app/pages/auth/auth-page-routing.module.ts

@@ -20,3 +20,4 @@ const routes: Routes = [
   exports: [RouterModule]
 })
 export class AuthPageRoutingModule { }
+

src/app/pages/auth/reset-password/reset-password-page.module.ts

@@ -2,13 +2,16 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ResetPasswordPageRoutingModule } from './reset-password-page-routing.module';
 import { ResetPasswordPageComponent } from './reset-password-page.component';
-import { MemberModule } from 'app/packages/member/member.module';
+import {ResetPasswordModule} from 'app/packages/member/component/reset-password/reset-password.module';
+import {FlexLayoutModule} from '@angular/flex-layout';
+
 
 @NgModule({
   imports: [
     CommonModule,
     ResetPasswordPageRoutingModule,
-    MemberModule
+    ResetPasswordModule,
+    FlexLayoutModule
   ],
   declarations: [
     ResetPasswordPageComponent,