Change BaseField import order - fixes #58 #62

Author: neroniaky

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.2.0-beta.1
+**Bugfixes:**
+- Changed import order of BaseField to fix angular-cli import
+
 ## v0.2.0-beta.1
 **Breaking changes:**
 - Added Quickstart UI Module (README pending)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular2-token",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0-beta.2",
   "description": "Angular2 service for token based authentication",
   "main": "./angular2-token.js",
   "typings": "./angular2-token.d.ts",

src/a2t-ui/a2t-shared/a2t-form/a2t-form-field/a2t-form-field.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormGroup, AbstractControl } from '@angular/forms';
 
-import { BaseField } from '../';
+import { BaseField } from '../../../';
 
 @Component({
     selector:       'a2t-form-field',

src/a2t-ui/a2t-shared/a2t-form/a2t-form.component.ts

@@ -2,7 +2,6 @@ import { Component }  from '@angular/core';
 
 import {
     A2tFormService,
-    BaseField,
     A2tFormFieldComponent
 } from './';
 

src/a2t-ui/a2t-shared/a2t-form/a2t-form.model.ts

@@ -3,7 +3,7 @@ import { FormGroup, FormControl } from '@angular/forms';
 import { Subject } from 'rxjs/Subject';
 
 import { SignInData } from '../../../angular2-token.model';
-import { BaseField } from './';
+import { BaseField } from '../../';
 
 @Injectable()
 export class A2tFormService {

src/a2t-ui/a2t-shared/a2t-form/a2t-form.service.ts

@@ -1,5 +1,3 @@
-export * from './a2t-form.model';
-
 export * from './a2t-form.service';
 
 export * from './a2t-form-field/a2t-form-field.component';

src/a2t-ui/a2t-shared/a2t-form/index.ts

@@ -1,4 +1,3 @@
-export * from './a2t-form/a2t-form.model';
 export * from './a2t-form/a2t-form.service';
 
 export * from './a2t-shared.module';

src/a2t-ui/a2t-shared/index.ts

@@ -1,8 +1,26 @@
 import { Validators } from '@angular/forms';
 
-import {
-    BaseField
-} from './';
+export class BaseField{
+    value: string;
+    key: string;
+    label: string;
+    type: string;
+    validators: any[];
+
+    constructor(options: {
+        value?: string,
+        key?: string,
+        label?: string,
+        type?: string,
+        validators?: any[],
+    } = {}) {
+        this.value = options.value;
+        this.key = options.key || '';
+        this.label = options.label || '';
+        this.validators = options.validators === undefined ? [] : options.validators;
+        this.type = options.type || '';
+    }
+}
 
 export const SIGN_IN_FORM: BaseField[] = [
     new BaseField({