Skip to content

Commit 1290189

Browse files
committed
wip
-Need to figure out what to do with BaseRequestOptions Headers Jsonp JsonpModule MockBackend, MockConnection RequestOptions RequestOptionsArgs Response ResponseOptions XHRBackend URLSearchParams
1 parent bc2ed1d commit 1290189

88 files changed

Lines changed: 483 additions & 506 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
"node_modules"
99
],
1010
"dependencies": {
11-
"@angular/animations": "4.4.3",
12-
"@angular/common": "4.4.3",
13-
"@angular/compiler": "4.4.3",
14-
"@angular/core": "4.4.3",
15-
"@angular/flex-layout": "2.0.0-rc.1",
16-
"@angular/forms": "4.4.3",
17-
"@angular/http": "4.4.3",
18-
"@angular/material": "2.0.0-beta.7",
19-
"@angular/platform-browser": "4.4.3",
20-
"@angular/platform-browser-dynamic": "4.4.3",
21-
"@angular/router": "4.4.6",
11+
"@angular/animations": "5.0.1",
12+
"@angular/cdk": "5.0.0-rc0",
13+
"@angular/common": "5.0.1",
14+
"@angular/compiler": "5.0.1",
15+
"@angular/core": "5.0.1",
16+
"@angular/flex-layout": "2.0.0-beta.10-4905443",
17+
"@angular/forms": "5.0.1",
18+
"@angular/material": "5.0.0-rc0",
19+
"@angular/platform-browser": "5.0.1",
20+
"@angular/platform-browser-dynamic": "5.0.1",
21+
"@angular/router": "5.0.1",
2222
"@angularclass/form-validators": "^1.0.12",
2323
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
24-
"@ngrx/db": "2.0.2",
24+
"@ngrx/db": "2.1.0",
2525
"@ngrx/effects": "4.0.5",
2626
"@ngrx/router-store": "4.0.4",
2727
"@ngrx/store": "4.0.3",
@@ -37,8 +37,8 @@
3737
"angular2-infinite-scroll": "0.3.43",
3838
"angular2-moment": "1.7.0",
3939
"angular2-notifications": "0.7.7",
40-
"angularfire2": "2.0.0-beta.8",
41-
"angularfire2-offline": "2.0.7",
40+
"angularfire2": "4.0.0-rc0",
41+
"angularfire2-offline": "4.3.1",
4242
"animate.css": "3.5.2",
4343
"bootstrap": "4.0.0-beta",
4444
"chart.js": "1.1.1",
@@ -54,19 +54,20 @@
5454
"jquery-slimscroll": "1.3.8",
5555
"leaflet-map": "0.2.1",
5656
"moment": "2.18.1",
57-
"ng-jhipster": "0.2.12",
57+
"ng-jhipster": "0.3.0",
5858
"ng2-handsontable": "1.0.3",
5959
"ng2-slim-loading-bar": "4.0.0",
60-
"ng2-webstorage": "1.8.0",
60+
"ng2-webstorage": "2.0.0",
6161
"ngrx-store-freeze": "0.2.0",
6262
"ngrx-store-localstorage": "0.2.2",
63-
"ngx-cookie": "1.0.0",
63+
"ngx-cookie": "2.0.0",
6464
"ngx-infinite-scroll": "0.5.1",
6565
"ngx-pipes": "1.6.5",
6666
"ngx-uploader": "3.3.11",
6767
"normalize.css": "7.0.0",
6868
"reflect-metadata": "0.1.10",
6969
"roboto-fontface": "0.8.0",
70+
"rxjs": "5.5.2",
7071
"simple-peer": "8.1.1",
7172
"sortablejs": "1.6.1",
7273
"swagger-ui": "3.2.2",

src/main/webapp/app/account/activate/activate.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Injectable } from '@angular/core';
2-
import { Http, Response, URLSearchParams } from '@angular/http';
2+
import { HttpClient } from '@angular/common/http';
33
import { Observable } from 'rxjs/Observable';
44

55
@Injectable()
66
export class ActivateService {
77

8-
constructor(private http: Http) {}
8+
constructor(private http: HttpClient) { }
99

1010
get(key: string): Observable<any> {
1111
const params: URLSearchParams = new URLSearchParams();

src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
2-
import { Renderer, ElementRef } from '@angular/core';
2+
import { Renderer2, ElementRef } from '@angular/core';
33
import { ActivatedRoute } from '@angular/router';
44
import { LoginModalService } from '../../../shared';
55
import { GreatBigExampleApplicationTestModule } from '../../../../mocks/test.module';
@@ -29,7 +29,7 @@ describe('Component Tests', () => {
2929
useValue: new MockActivatedRoute({ 'key': 'XYZPDQ' })
3030
},
3131
{
32-
provide: Renderer,
32+
provide: Renderer2,
3333
useValue: {
3434
invokeElementMethod(renderElement: any, methodName: string, args?: any[]) { }
3535
}

src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit, AfterViewInit, Renderer, ElementRef } from '@angular/core';
1+
import { Component, OnInit, AfterViewInit, Renderer2, ElementRef } from '@angular/core';
22
import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
33
import { ActivatedRoute } from '@angular/router';
44

@@ -23,7 +23,7 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
2323
private passwordResetFinishService: PasswordResetFinishService,
2424
private loginModalService: LoginModalService,
2525
private route: ActivatedRoute,
26-
private elementRef: ElementRef, private renderer: Renderer
26+
private elementRef: ElementRef, private renderer: Renderer2
2727
) {
2828
}
2929

@@ -37,7 +37,7 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
3737

3838
ngAfterViewInit() {
3939
if (this.elementRef.nativeElement.querySelector('#password') != null) {
40-
this.renderer.invokeElementMethod(this.elementRef.nativeElement.querySelector('#password'), 'focus', []);
40+
this.renderer.invokeElementMethod(this.elementRef.nativeElement.querySelector('#password'), 'focus', []);
4141
}
4242
}
4343

@@ -47,7 +47,7 @@ export class PasswordResetFinishComponent implements OnInit, AfterViewInit {
4747
if (this.resetAccount.password !== this.confirmPassword) {
4848
this.doNotMatch = 'ERROR';
4949
} else {
50-
this.passwordResetFinishService.save({key: this.key, newPassword: this.resetAccount.password}).subscribe(() => {
50+
this.passwordResetFinishService.save({ key: this.key, newPassword: this.resetAccount.password }).subscribe(() => {
5151
this.success = 'OK';
5252
}, () => {
5353
this.success = null;
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { Injectable } from '@angular/core';
2-
import { Http } from '@angular/http';
2+
import { HttpClient } from '@angular/common/http';
33
import { Observable } from 'rxjs/Observable';
44

55
@Injectable()
66
export class PasswordResetFinishService {
77

8-
constructor(private http: Http) {}
8+
constructor(private http: HttpClient) { }
99

10-
save(keyAndPassword: any): Observable<any> {
11-
return this.http.post('api/account/reset_password/finish', keyAndPassword);
12-
}
10+
save(keyAndPassword: any): Observable<any> {
11+
return this.http.post('api/account/reset_password/finish', keyAndPassword);
12+
}
1313
}

src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
2-
import { Renderer, ElementRef } from '@angular/core';
2+
import { Renderer2, ElementRef } from '@angular/core';
33
import { Observable } from 'rxjs/Observable';
44
import { GreatBigExampleApplicationTestModule } from '../../../../mocks/test.module';
55
import { PasswordResetInitComponent } from './password-reset-init.component';
66
import { PasswordResetInitService } from './password-reset-init.service';
77

88
describe('Component Tests', () => {
99

10-
describe('PasswordResetInitComponent', function() {
10+
describe('PasswordResetInitComponent', function () {
1111
let fixture: ComponentFixture<PasswordResetInitComponent>;
1212
let comp: PasswordResetInitComponent;
1313

@@ -18,7 +18,7 @@ describe('Component Tests', () => {
1818
providers: [
1919
PasswordResetInitService,
2020
{
21-
provide: Renderer,
21+
provide: Renderer2,
2222
useValue: {
2323
invokeElementMethod(renderElement: any, methodName: string, args?: any[]) { }
2424
}

src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit, AfterViewInit, Renderer, ElementRef } from '@angular/core';
1+
import { Component, OnInit, AfterViewInit, Renderer2, ElementRef } from '@angular/core';
22

33
import { PasswordResetInitService } from './password-reset-init.service';
44

@@ -15,7 +15,7 @@ export class PasswordResetInitComponent implements OnInit, AfterViewInit {
1515
constructor(
1616
private passwordResetInitService: PasswordResetInitService,
1717
private elementRef: ElementRef,
18-
private renderer: Renderer
18+
private renderer: Renderer2
1919
) {
2020
}
2121

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { Injectable } from '@angular/core';
2-
import { Http } from '@angular/http';
2+
import { HttpClient } from '@angular/common/http';
33
import { Observable } from 'rxjs/Observable';
44

55
@Injectable()
66
export class PasswordResetInitService {
77

8-
constructor(private http: Http) {}
8+
constructor(private http: HttpClient) { }
99

10-
save(mail: string): Observable<any> {
11-
return this.http.post('api/account/reset_password/init', mail);
12-
}
10+
save(mail: string): Observable<any> {
11+
return this.http.post('api/account/reset_password/init', mail);
12+
}
1313
}

src/main/webapp/app/account/password/password-strength-bar.component.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, ElementRef, Input, Renderer } from '@angular/core';
1+
import { Component, ElementRef, Input, Renderer2 } from '@angular/core';
22

33
@Component({
44
selector: 'jhi-password-strength-bar',
@@ -21,7 +21,7 @@ export class PasswordStrengthBarComponent {
2121

2222
colors = ['#F00', '#F90', '#FF0', '#9F0', '#0F0'];
2323

24-
constructor(private renderer: Renderer, private elementRef: ElementRef) { }
24+
constructor(private renderer: Renderer2, private elementRef: ElementRef) { }
2525

2626
measureStrength(p: string): number {
2727

@@ -33,7 +33,7 @@ export class PasswordStrengthBarComponent {
3333
const symbols = regex.test(p);
3434

3535
const flags = [lowerLetters, upperLetters, numbers, symbols];
36-
const passedMatches = flags.filter( (isMatchedFlag: boolean) => {
36+
const passedMatches = flags.filter((isMatchedFlag: boolean) => {
3737
return isMatchedFlag === true;
3838
}).length;
3939

@@ -64,23 +64,23 @@ export class PasswordStrengthBarComponent {
6464
} else {
6565
idx = 4;
6666
}
67-
return {idx: idx + 1, col: this.colors[idx]};
67+
return { idx: idx + 1, col: this.colors[idx] };
6868
};
6969

7070
@Input()
7171
set passwordToCheck(password: string) {
7272
if (password) {
7373
const c = this.getColor(this.measureStrength(password));
7474
const element = this.elementRef.nativeElement;
75-
if ( element.className ) {
76-
this.renderer.setElementClass(element, element.className , false);
75+
if (element.className) {
76+
this.renderer.addClass(element, element.className);
7777
}
7878
const lis = element.getElementsByTagName('li');
7979
for (let i = 0; i < lis.length; i++) {
8080
if (i < c.idx) {
81-
this.renderer.setElementStyle(lis[i], 'backgroundColor', c.col);
81+
this.renderer.setStyle(lis[i], 'backgroundColor', c.col);
8282
} else {
83-
this.renderer.setElementStyle(lis[i], 'backgroundColor', '#DDD');
83+
this.renderer.setStyle(lis[i], 'backgroundColor', '#DDD');
8484
}
8585
}
8686
}

src/main/webapp/app/account/password/password.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Injectable } from '@angular/core';
2-
import { Http } from '@angular/http';
2+
import { HttpClient } from '@angular/common/http';
33
import { Observable } from 'rxjs/Observable';
44

55
@Injectable()
66
export class PasswordService {
77

8-
constructor(private http: Http) {}
8+
constructor(private http: HttpClient) { }
99

1010
save(newPassword: string): Observable<any> {
1111
return this.http.post('api/account/change_password', newPassword);

0 commit comments

Comments
 (0)