From 44924aefcc0e19a6c6431940799824fdd1fbb6b4 Mon Sep 17 00:00:00 2001 From: nixa <4dmitr@gmail.com> Date: Fri, 8 Jul 2016 13:10:36 +0300 Subject: [PATCH] feat(forms): update forms to latest version --- .../components/ckeditor/ckeditor.component.ts | 13 +++++++------ src/app/pages/login/login.component.ts | 6 +++--- src/app/pages/login/login.html | 6 +++--- src/app/pages/register/register.component.ts | 8 ++++---- src/app/pages/register/register.html | 10 +++++----- src/app/theme/validators/email.validator.ts | 8 ++++---- .../theme/validators/equalPasswords.validator.ts | 10 +++++----- 7 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/app/pages/editors/components/ckeditor/ckeditor.component.ts b/src/app/pages/editors/components/ckeditor/ckeditor.component.ts index 7c9240bd..94c7a6b2 100644 --- a/src/app/pages/editors/components/ckeditor/ckeditor.component.ts +++ b/src/app/pages/editors/components/ckeditor/ckeditor.component.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; import {CKEditor} from 'ng2-ckeditor'; -import {BaCard} from "../../../../theme/components/baCard/baCard.component"; +import {BaCard} from '../../../../theme/components/baCard'; import './ckeditor.loader.ts'; @@ -11,11 +11,12 @@ import './ckeditor.loader.ts'; }) export class Ckeditor { - private ckeditorContent; - private config; - + public ckeditorContent:string = '

Hello CKEditor

'; + public config = { + uiColor: '#F0F3F4', + height: '600' + }; + constructor() { - this.ckeditorContent = `

Hello CKEditor

`; - this.config = {uiColor: '#F0F3F4', height: '600'}; } } diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 63eea4f8..b02adda0 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from '@angular/core'; -import {FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators, AbstractControl} from '@angular/common'; +import {FormGroup, AbstractControl, FormBuilder, Validators} from '@angular/forms'; @Component({ selector: 'login', @@ -10,7 +10,7 @@ import {FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators, AbstractControl} }) export class Login { - public form:ControlGroup; + public form:FormGroup; public email:AbstractControl; public password:AbstractControl; public submitted:boolean = false; @@ -24,7 +24,7 @@ export class Login { this.email = this.form.controls['email']; this.password = this.form.controls['password']; } - + public onSubmit(values:Object):void { this.submitted = true; if (this.form.valid) { diff --git a/src/app/pages/login/login.html b/src/app/pages/login/login.html index 651be29c..9ca1ef9f 100644 --- a/src/app/pages/login/login.html +++ b/src/app/pages/login/login.html @@ -3,19 +3,19 @@

Sign in to ng2-admin

New to ng2-admin? Sign up! -
+
- +
- +
diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts index 1d06b645..9af4e225 100644 --- a/src/app/pages/register/register.component.ts +++ b/src/app/pages/register/register.component.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from '@angular/core'; -import {FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators, AbstractControl} from '@angular/common'; +import {FormGroup, AbstractControl, FormBuilder, Validators} from '@angular/forms'; import {EmailValidator, EqualPasswordsValidator} from '../../theme/validators'; @Component({ @@ -11,12 +11,12 @@ import {EmailValidator, EqualPasswordsValidator} from '../../theme/validators'; }) export class Register { - public form:ControlGroup; + public form:FormGroup; public name:AbstractControl; public email:AbstractControl; public password:AbstractControl; public repeatPassword:AbstractControl; - public passwords:ControlGroup; + public passwords:FormGroup; public submitted:boolean = false; @@ -33,7 +33,7 @@ export class Register { this.name = this.form.controls['name']; this.email = this.form.controls['email']; - this.passwords = this.form.controls['passwords']; + this.passwords = this.form.controls['passwords']; this.password = this.passwords.controls['password']; this.repeatPassword = this.passwords.controls['repeatPassword']; } diff --git a/src/app/pages/register/register.html b/src/app/pages/register/register.html index b04dd7a5..a82baf6d 100644 --- a/src/app/pages/register/register.html +++ b/src/app/pages/register/register.html @@ -3,33 +3,33 @@

Sign up to ng2-admin

Already have an ng2-admin account? Sign in! - +
- +
- +
- +
- + Passwords don't match.
diff --git a/src/app/theme/validators/email.validator.ts b/src/app/theme/validators/email.validator.ts index f31fc8fa..a23f8533 100644 --- a/src/app/theme/validators/email.validator.ts +++ b/src/app/theme/validators/email.validator.ts @@ -1,14 +1,14 @@ -import {Control} from '@angular/common'; +import {AbstractControl} from '@angular/forms'; export class EmailValidator { - public static validate(c: Control) { + public static validate(c:AbstractControl) { let EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i; - + return EMAIL_REGEXP.test(c.value) ? null : { validateEmail: { valid: false } }; } -} \ No newline at end of file +} diff --git a/src/app/theme/validators/equalPasswords.validator.ts b/src/app/theme/validators/equalPasswords.validator.ts index d843f3c6..d5cbc40e 100644 --- a/src/app/theme/validators/equalPasswords.validator.ts +++ b/src/app/theme/validators/equalPasswords.validator.ts @@ -1,11 +1,11 @@ -import {Control, ControlGroup} from '@angular/common'; +import {FormGroup} from '@angular/forms'; export class EqualPasswordsValidator { public static validate(firstField, secondField) { - - return (c: ControlGroup) => { - + + return (c:FormGroup) => { + return (c.controls && c.controls[firstField].value == c.controls[secondField].value) ? null : { passwordsEqual: { valid: false @@ -13,4 +13,4 @@ export class EqualPasswordsValidator { }; } } -} \ No newline at end of file +}