Merge pull request samvloeberghs#27 from samvloeberghs/stylecleanup

Stylecleanup

Author: samvloeberghs

src/app/app.html renamed to src/app/app.component.html

@@ -7,10 +7,10 @@ import { AppState } from './app.service';
  * Top Level Component
  */
 @Component({
-  selector: 'app',
+  selector: 'sv-app',
   providers: [],
-  styles: [require('./app.scss')],
-  template: require('./app.html'),
+  styles: [require('./app.component.scss')],
+  template: require('./app.component.html'),
   encapsulation: ViewEncapsulation.None
 })
 

src/app/app.scss renamed to src/app/app.component.scss

@@ -1,16 +1,14 @@
-import { NgModule } from "@angular/core";
-import { BrowserModule } from "@angular/platform-browser";
-import { RouterModule } from "@angular/router";
-import { HttpModule } from "@angular/http";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { RouterModule } from '@angular/router';
+import { HttpModule } from '@angular/http';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
-import { AppComponent } from "./app.component";
-import { AppState } from "./app.service";
-import { ROUTES } from "./app.routes";
-import { Login } from "./login/login.component";
-import { Register } from "./register/register.component";
-import { SetNewPassword } from "./set-new-password/setNewPassword.component";
-import { ForgotPassword } from "./forgot-password/forgotPassword.component";
+import { AppComponent, ROUTES, AppState } from './';
+import { Login } from './login';
+import { Register } from './register';
+import { SetNewPassword } from './set-new-password';
+import { ForgotPassword } from './forgot-password';
 
 const APP_PROVIDERS = [
   AppState

src/app/app.component.ts

@@ -1,9 +1,9 @@
 import { Routes } from '@angular/router';
 
-import { Login } from "./login/login.component";
-import { Register } from "./register/register.component";
-import { ForgotPassword } from "./forgot-password/forgotPassword.component";
-import { SetNewPassword } from "./set-new-password/setNewPassword.component";
+import { Login } from './login';
+import { Register } from './register';
+import { ForgotPassword } from './forgot-password';
+import { SetNewPassword } from './set-new-password';
 
 export const ROUTES: Routes = [
   {path: '', component: Login},

src/app/app.module.ts

@@ -4,15 +4,15 @@ import { HmrState } from 'angular2-hmr';
 @Injectable()
 export class AppState {
   // HmrState uis used by HMR to track the any state during reloading
-  @HmrState() _state = {};
+  @HmrState() state = {};
 
   constructor() {
 
   }
 
   // already return a clone of the current state
   get state() {
-    return this._state = this._clone(this._state);
+    return this.state = this.clone(this.state);
   }
 
   // never allow mutation
@@ -29,11 +29,11 @@ export class AppState {
 
   set(prop: string, value: any) {
     // internally mutate our state
-    return this._state[prop] = value;
+    return this.state[prop] = value;
   }
 
 
-  _clone(object) {
+  clone(object) {
     // simple object clone
     return JSON.parse(JSON.stringify(object));
   }

src/app/app.routes.ts

@@ -1,4 +1,4 @@
-import { FormControl } from "@angular/forms";
+import { FormControl } from '@angular/forms';
 
 interface EmailValidatorFn {
   [key: string]: boolean;
@@ -8,7 +8,7 @@ export class EmailValidator {
   static validEmail(control: FormControl): EmailValidatorFn {
     let value = control.value;
     /* tslint:disable */
-    const EMAIL_REGEXP = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    const EMAIL_REGEXP = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@']+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
     /* tslint:enable */
     if (value.length <= 5 || !EMAIL_REGEXP.test(control.value)) {
       return {

src/app/app.service.ts

@@ -1,27 +1,27 @@
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators, FormControl } from "@angular/forms";
+import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
 
 import { EmailValidator } from '../email-validator';
 
 @Component({
-  selector: 'forgot-password',
+  selector: 'sv-forgot-password',
   providers: [],
-  styles: [require('./forgotPassword.scss')],
-  template: require('./forgotPassword.html')
+  styles: [require('./forgotPassword.component.scss')],
+  template: require('./forgotPassword.component.html')
 })
 export class ForgotPassword implements OnInit {
 
   form: FormGroup;
   submitted = false;
   validSubmit = false;
 
-  constructor(private _fb: FormBuilder) {
+  constructor(private fb: FormBuilder) {
 
   }
 
   ngOnInit() {
 
-    this.form = this._fb.group({
+    this.form = this.fb.group({
       email: new FormControl('',
         Validators.compose([
           Validators.required,