diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index d475e2c..9c3e68e 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -31,6 +31,6 @@ describe('AppComponent', () => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!'); + expect(compiled.querySelector('h1').textContent).toContain('app works!'); })); }); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d3fe8ed..5caff32 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,3 +1,6 @@ + +import { HttpModule } from '@angular/http'; + import { FileUploadMasterPageComponent } from './file-upload-master-page/file-upload-master-page.component'; import { ChartModule } from 'angular2-highcharts'; import { HighchartsStatic } from 'angular2-highcharts/dist/HighchartsService'; @@ -61,6 +64,7 @@ export function highchartsFactory() { ], imports: [ BrowserModule, + HttpModule, AppRoutingModule, SDKBrowserModule.forRoot(), FormsModule, @@ -71,7 +75,7 @@ export function highchartsFactory() { Ng2GoogleChartsModule, ChartModule ], - providers: [AuthGuard, AuthService, ChatService, { + providers: [AuthGuard, AuthService, ChatService, HttpModule, { provide: HighchartsStatic, useFactory: highchartsFactory }], diff --git a/src/app/file-upload-master-page/file-upload-advance-page/file-upload-advance-page.component.spec.ts b/src/app/file-upload-master-page/file-upload-advance-page/file-upload-advance-page.component.spec.ts index 747b7f0..2da498c 100644 --- a/src/app/file-upload-master-page/file-upload-advance-page/file-upload-advance-page.component.spec.ts +++ b/src/app/file-upload-master-page/file-upload-advance-page/file-upload-advance-page.component.spec.ts @@ -1,5 +1,5 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - +import { FormsModule } from '@angular/forms'; import { FileUploadAdvancedPageComponent } from './file-upload-advance-page.component'; describe('HomePageComponent', () => { @@ -8,6 +8,7 @@ describe('HomePageComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ + imports: [ FormsModule ], declarations: [ FileUploadAdvancedPageComponent ] }) .compileComponents(); diff --git a/src/app/file-upload-master-page/file-upload-advance-page/file-upload-advance-page.component.ts b/src/app/file-upload-master-page/file-upload-advance-page/file-upload-advance-page.component.ts index 3c11eb6..7dec4ae 100644 --- a/src/app/file-upload-master-page/file-upload-advance-page/file-upload-advance-page.component.ts +++ b/src/app/file-upload-master-page/file-upload-advance-page/file-upload-advance-page.component.ts @@ -6,7 +6,8 @@ import { NgModel, FormsModule } from '@angular/forms'; @Component({ selector: 'app-home-page', templateUrl: './file-upload-advance-page.component.html', - styleUrls: ['./file-upload-advance-page.component.scss'] + styleUrls: ['./file-upload-advance-page.component.scss'], + providers: [StorageSimpleUploadApi], }) export class FileUploadAdvancedPageComponent implements OnInit { diff --git a/src/app/file-upload-master-page/file-upload-master-page.component.ts b/src/app/file-upload-master-page/file-upload-master-page.component.ts index 5c72581..271fa64 100644 --- a/src/app/file-upload-master-page/file-upload-master-page.component.ts +++ b/src/app/file-upload-master-page/file-upload-master-page.component.ts @@ -6,7 +6,8 @@ import { NgModel, FormsModule } from '@angular/forms'; @Component({ selector: 'app-home-page', templateUrl: './file-upload-master-page.component.html', - styleUrls: ['./file-upload-master-page.component.scss'] + styleUrls: ['./file-upload-master-page.component.scss'], + providers: [StorageSimpleUploadApi], }) export class FileUploadMasterPageComponent implements OnInit { diff --git a/src/app/file-upload-master-page/file-upload-page/file-upload-page.component.spec.ts b/src/app/file-upload-master-page/file-upload-page/file-upload-page.component.spec.ts index c076579..92423e2 100644 --- a/src/app/file-upload-master-page/file-upload-page/file-upload-page.component.spec.ts +++ b/src/app/file-upload-master-page/file-upload-page/file-upload-page.component.spec.ts @@ -1,5 +1,5 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - +import { FormsModule } from '@angular/forms'; import { FileUploadPageComponent } from './file-upload-page.component'; describe('HomePageComponent', () => { @@ -8,6 +8,7 @@ describe('HomePageComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ + imports: [ FormsModule ], declarations: [ FileUploadPageComponent ] }) .compileComponents(); diff --git a/src/app/file-upload-master-page/file-upload-page/file-upload-page.component.ts b/src/app/file-upload-master-page/file-upload-page/file-upload-page.component.ts index 062af6f..e355a76 100644 --- a/src/app/file-upload-master-page/file-upload-page/file-upload-page.component.ts +++ b/src/app/file-upload-master-page/file-upload-page/file-upload-page.component.ts @@ -6,7 +6,8 @@ import { NgModel, FormsModule } from '@angular/forms'; @Component({ selector: 'app-home-page', templateUrl: './file-upload-page.component.html', - styleUrls: ['./file-upload-page.component.scss'] + styleUrls: ['./file-upload-page.component.scss'], + providers: [StorageSimpleUploadApi], }) export class FileUploadPageComponent implements OnInit { diff --git a/src/app/home-page/chat-room-page/chat-room-page.component.spec.ts b/src/app/home-page/chat-room-page/chat-room-page.component.spec.ts index f76666f..9570bfc 100644 --- a/src/app/home-page/chat-room-page/chat-room-page.component.spec.ts +++ b/src/app/home-page/chat-room-page/chat-room-page.component.spec.ts @@ -1,5 +1,5 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - +import { Http, HttpModule } from '@angular/http'; import { ChatRoomPageComponent } from './chat-room-page.component'; describe('ChatRoomPageComponent', () => { @@ -8,6 +8,7 @@ describe('ChatRoomPageComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ + providers: [Http, HttpModule], declarations: [ ChatRoomPageComponent ] }) .compileComponents(); diff --git a/src/app/home-page/chat-room-page/chat-room-page.component.ts b/src/app/home-page/chat-room-page/chat-room-page.component.ts index 395f479..0d249b6 100644 --- a/src/app/home-page/chat-room-page/chat-room-page.component.ts +++ b/src/app/home-page/chat-room-page/chat-room-page.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { ChatService } from '../../chat.service'; import { RoomchatApi } from '../../../shared/services/custom/Roomchat'; -import { Http, Response } from '@angular/http'; +import { Http, HttpModule, Response } from '@angular/http'; import { ChatdetailApi } from '../../../shared/services/custom/Chatdetail'; import { RealTime } from '../../../shared/services/core/real.time'; import { FireLoopRef } from '../../../shared/models/FireLoopRef'; @@ -13,7 +13,8 @@ import 'rxjs/add/operator/switchMap'; @Component({ selector: 'app-chat-room-page', templateUrl: './chat-room-page.component.html', - styleUrls: ['./chat-room-page.component.scss'] + styleUrls: ['./chat-room-page.component.scss'], + providers: [Http, HttpModule], }) export class ChatRoomPageComponent implements OnInit { diff --git a/src/app/home-page/crud-page/crud-page.component.ts b/src/app/home-page/crud-page/crud-page.component.ts index 8f03b83..a38d33b 100644 --- a/src/app/home-page/crud-page/crud-page.component.ts +++ b/src/app/home-page/crud-page/crud-page.component.ts @@ -1,13 +1,15 @@ import { ProfiledataApi } from './../../../shared/services/custom/Profiledata'; import { StorageSimpleUploadApi } from './../../../shared/services/custom/StorageSimpleUpload'; + import { LoopBackConfig } from './../../../shared/lb.config'; -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Injectable } from '@angular/core'; import { UUID } from 'angular2-uuid'; @Component({ selector: 'app-crud-page', templateUrl: './crud-page.component.html', - styleUrls: ['./crud-page.component.scss'] + styleUrls: ['./crud-page.component.scss'], + providers: [StorageSimpleUploadApi], }) export class CrudPageComponent implements OnInit { diff --git a/src/app/home-page/home-page.component.spec.ts b/src/app/home-page/home-page.component.spec.ts index 8220af0..9106014 100644 --- a/src/app/home-page/home-page.component.spec.ts +++ b/src/app/home-page/home-page.component.spec.ts @@ -1,3 +1,5 @@ +import { Router } from '@angular/router'; +import { HttpModule, Http } from '@angular/http'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HomePageComponent } from './home-page.component'; @@ -8,6 +10,7 @@ describe('HomePageComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ + providers: [Http, HttpModule, Router], declarations: [ HomePageComponent ] }) .compileComponents(); diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts index b2b00fa..eb6127e 100644 --- a/src/app/home-page/home-page.component.ts +++ b/src/app/home-page/home-page.component.ts @@ -1,10 +1,12 @@ +import { HttpModule, Http } from '@angular/http'; import { Router } from '@angular/router'; import { AuthService } from './../auth.service'; import { Component, OnInit } from '@angular/core'; + @Component({ selector: 'app-home-page', templateUrl: './home-page.component.html', - styleUrls: ['./home-page.component.scss'] + styleUrls: ['./home-page.component.scss'], }) export class HomePageComponent implements OnInit { @@ -12,7 +14,7 @@ export class HomePageComponent implements OnInit { showMiniMenu: Boolean = false; displayChart: String = 'none'; - + constructor( public authService: AuthService, private router: Router, diff --git a/src/shared/index.ts b/src/shared/index.ts index ebef823..69a38d1 100644 --- a/src/shared/index.ts +++ b/src/shared/index.ts @@ -74,7 +74,8 @@ import { ProfiledataApi } from './services/custom/Profiledata'; exports: [ ], providers: [ ErrorHandler, - SocketConnection + SocketConnection, + HttpModule ] }) export class SDKBrowserModule {