signin page button add & modify

This commit is contained in:
geek 2018-02-01 18:38:36 +09:00
parent 0836cf68af
commit 8adba4c3fc
6 changed files with 25 additions and 6 deletions

View File

@ -1,11 +1,18 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { ResetPasswordComponent } from './reset-password.component'; 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({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
RouterModule,
FormsModule,
ReactiveFormsModule,
MaterialModule,
], ],
declarations: [ declarations: [
ResetPasswordComponent, ResetPasswordComponent,

View File

@ -1,6 +1,6 @@
<mat-card> <mat-card>
<mat-card-title>Signin <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-title>
<mat-card-content> <mat-card-content>
<form fxLayout="column" fxLayoutAlign="start stretch" [formGroup]="signinForm" (ngSubmit)="login()"> <form fxLayout="column" fxLayoutAlign="start stretch" [formGroup]="signinForm" (ngSubmit)="login()">
@ -18,7 +18,13 @@
<div *ngIf="formErrors.password" class="help is-danger"> <div *ngIf="formErrors.password" class="help is-danger">
{{ formErrors.password }} {{ formErrors.password }}
</div> </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> </form>
</mat-card-content> </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> </mat-card>

View File

@ -45,7 +45,9 @@
<div *ngIf="formErrors.company" class="help is-danger"> <div *ngIf="formErrors.company" class="help is-danger">
{{ formErrors.company }} {{ formErrors.company }}
</div> </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> <button mat-raised-button color="primary" type="submit" [disabled]="!signupForm.valid" (click)="signup()">Signup</button>
</form> </form>
</mat-card-content> </mat-card-content>

View File

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

View File

@ -2,13 +2,16 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { ResetPasswordPageRoutingModule } from './reset-password-page-routing.module'; import { ResetPasswordPageRoutingModule } from './reset-password-page-routing.module';
import { ResetPasswordPageComponent } from './reset-password-page.component'; 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({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
ResetPasswordPageRoutingModule, ResetPasswordPageRoutingModule,
MemberModule ResetPasswordModule,
FlexLayoutModule
], ],
declarations: [ declarations: [
ResetPasswordPageComponent, ResetPasswordPageComponent,