diff --git a/rapstore-frontend/src/app/app-detail/app-detail.component.html b/rapstore-frontend/src/app/app-detail/app-detail.component.html
index 896798c6..708125fe 100644
--- a/rapstore-frontend/src/app/app-detail/app-detail.component.html
+++ b/rapstore-frontend/src/app/app-detail/app-detail.component.html
@@ -23,8 +23,7 @@
EXTERNAL
-
+
diff --git a/rapstore-frontend/src/app/app-detail/app-detail.component.ts b/rapstore-frontend/src/app/app-detail/app-detail.component.ts
index afea8741..0356e7be 100644
--- a/rapstore-frontend/src/app/app-detail/app-detail.component.ts
+++ b/rapstore-frontend/src/app/app-detail/app-detail.component.ts
@@ -2,7 +2,7 @@ import {Component, OnInit, Input} from '@angular/core';
import {Application} from '../models';
import {AppService} from '../appservice.service';
import {ActivatedRoute, Router} from '@angular/router';
-import {Subscription} from 'rxjs/Subscription';
+import {Subscription} from 'rxjs';
import {AuthService} from '../auth.service';
import {UserService} from '../user.service';
import {User} from '../models';
diff --git a/rapstore-frontend/src/app/app-uploader/app-uploader.component.ts b/rapstore-frontend/src/app/app-uploader/app-uploader.component.ts
index c9178cb3..b8bbc6d8 100644
--- a/rapstore-frontend/src/app/app-uploader/app-uploader.component.ts
+++ b/rapstore-frontend/src/app/app-uploader/app-uploader.component.ts
@@ -1,3 +1,5 @@
+
+import {map} from 'rxjs/operators';
import {Component, OnInit} from '@angular/core';
import {Http, RequestOptions, Headers} from '@angular/http';
import {AuthService} from '../auth.service';
@@ -60,8 +62,8 @@ export class AppUploaderComponent implements OnInit {
headers.append('Authorization', 'Token ' + this.AuthService.get_token());
headers.append('Accept', 'application/json');
let options = new RequestOptions({headers: headers});
- this.http.post(`${this.baseurl}/api/app/`, formData, options)
- .map(res => res.json())
+ this.http.post(`${this.baseurl}/api/app/`, formData, options).pipe(
+ map(res => res.json()))
.subscribe(
data => this.message = `Successfully uploaded your app "${this.form.value.name}" ! The app will be under a review process in order to make it public.`,
err => {
diff --git a/rapstore-frontend/src/app/app.component.ts b/rapstore-frontend/src/app/app.component.ts
index 9b3391ba..26502343 100644
--- a/rapstore-frontend/src/app/app.component.ts
+++ b/rapstore-frontend/src/app/app.component.ts
@@ -1,6 +1,6 @@
import {Component, OnDestroy, OnInit, HostListener} from '@angular/core';
import {BrowserIntegrationService} from './browser-integration.service';
-import {Subscription} from 'rxjs/Subscription';
+import {Subscription} from 'rxjs';
import {AuthService} from './auth.service';
import {UserService} from './user.service';
import {FeedbackService} from './feedback.service';
@@ -8,7 +8,7 @@ import {Router} from '@angular/router';
import {User} from './models';
import {AppService} from './appservice.service';
import {environment} from '../environments/environment';
-import 'rxjs/add/operator/take';
+
@Component({
selector: 'app-root',
diff --git a/rapstore-frontend/src/app/app.module.ts b/rapstore-frontend/src/app/app.module.ts
index 6e09637d..89ba7f87 100644
--- a/rapstore-frontend/src/app/app.module.ts
+++ b/rapstore-frontend/src/app/app.module.ts
@@ -3,9 +3,9 @@ import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {FormsModule} from '@angular/forms';
import {HttpModule} from '@angular/http';
-import {NguUtilityModule} from 'ngu-utility/dist';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ReactiveFormsModule } from '@angular/forms';
+import { AvatarModule } from 'ngx-avatar';
import {AppComponent} from './app.component';
@@ -62,11 +62,11 @@ import { FormElementComponent } from './form-element/form-element.component';
FeedbackComponent,
],
imports: [
+ AvatarModule,
CommonModule,
BrowserModule,
FormsModule,
ReactiveFormsModule,
- NguUtilityModule,
AppRoutingModule,
HttpModule,
BrowserAnimationsModule,
diff --git a/rapstore-frontend/src/app/appservice.service.ts b/rapstore-frontend/src/app/appservice.service.ts
index cab6febf..406a97c8 100644
--- a/rapstore-frontend/src/app/appservice.service.ts
+++ b/rapstore-frontend/src/app/appservice.service.ts
@@ -1,9 +1,11 @@
+
+import {map} from 'rxjs/operators';
import {Injectable} from '@angular/core';
import {Application} from './models';
-import {Observable} from 'rxjs/Observable';
+import {Observable} from 'rxjs';
import {AuthService} from './auth.service';
import {Http, RequestOptions, Headers, ResponseContentType} from '@angular/http';
-import 'rxjs/add/operator/map';
+
import {environment} from '../environments/environment';
@Injectable()
@@ -20,14 +22,14 @@ export class AppService {
let headers = new Headers({'Content-Type': 'application/json'});
let options = new RequestOptions({headers: headers});
- return this.http.get(`${this.baseUrl}/api/app/`).map(res => res.json());
+ return this.http.get(`${this.baseUrl}/api/app/`).pipe(map(res => res.json()));
}
get(id: number): Observable
{
let headers = new Headers({'Content-Type': 'application/json'});
let options = new RequestOptions({headers: headers});
- return this.http.get(`${this.baseUrl}/api/app/${id}/`).map(res => res.json());
+ return this.http.get(`${this.baseUrl}/api/app/${id}/`).pipe(map(res => res.json()));
}
getAuthHeaders(): Headers {
@@ -41,7 +43,7 @@ export class AppService {
let headers = this.getAuthHeaders();
headers.append('Content-Type', 'application/json');
- let request = this.http.get(`${this.baseUrl}/api/app/${id}/build/?board=${board}&type=${type}`, new RequestOptions({headers: headers})).map(res => res.json());
+ let request = this.http.get(`${this.baseUrl}/api/app/${id}/build/?board=${board}&type=${type}`, new RequestOptions({headers: headers})).pipe(map(res => res.json()));
let task_id, poll_id;
request.subscribe(
res => {
@@ -72,7 +74,7 @@ export class AppService {
let headers = this.getAuthHeaders();
headers.append('Content-Type', 'application/json');
- return this.http.get(`${this.baseUrl}/api/buildmanager/${task_id}/status/`, new RequestOptions({headers: headers})).map(res => res.json());
+ return this.http.get(`${this.baseUrl}/api/buildmanager/${task_id}/status/`, new RequestOptions({headers: headers})).pipe(map(res => res.json()));
}
fetch_file(task_id) {
diff --git a/rapstore-frontend/src/app/auth.service.ts b/rapstore-frontend/src/app/auth.service.ts
index d29841b1..895efa91 100644
--- a/rapstore-frontend/src/app/auth.service.ts
+++ b/rapstore-frontend/src/app/auth.service.ts
@@ -1,7 +1,8 @@
+
+import {map} from 'rxjs/operators';
import {Injectable, Output, EventEmitter} from '@angular/core';
import {Http, Response, RequestOptions, Headers} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import {BehaviorSubject} from 'rxjs/BehaviorSubject';
+import {Observable, BehaviorSubject} from 'rxjs';
import {UserService} from './user.service';
import {User} from './models';
import {environment} from '../environments/environment';
@@ -23,8 +24,8 @@ export class AuthService {
login(username: string, password: string): Observable {
const url = `${this.base_url}/auth/`;
- return this.http.post(url, JSON.stringify({username: username, password: password}), {headers: this.headers})
- .map((response: Response) => {
+ return this.http.post(url, JSON.stringify({username: username, password: password}), {headers: this.headers}).pipe(
+ map((response: Response) => {
const data = response.json();
const token = data && data.token;
if (token) {
@@ -35,7 +36,7 @@ export class AuthService {
this.refresh(false);
return false;
}
- });
+ }));
}
perform_login(username: string, token: boolean) {
@@ -61,14 +62,14 @@ export class AuthService {
get_github_url() {
const url = `${this.base_url}/social/url/github/`;
- return this.http.get(url, {headers: this.headers, withCredentials: true}).map(res => res.json());
+ return this.http.get(url, {headers: this.headers, withCredentials: true}).pipe(map(res => res.json()));
}
get_social_token(code: string, state: string) {
const url = `${this.base_url}/social/login/github/`;
- return this.http.post(url, JSON.stringify({code: code, state: state}), {headers: this.headers, withCredentials: true}).map((response: Response) => {
+ return this.http.post(url, JSON.stringify({code: code, state: state}), {headers: this.headers, withCredentials: true}).pipe(map((response: Response) => {
let res = response.json();
this.perform_login(res.username, res.token);
return true;
- });
+ }));
}
}
diff --git a/rapstore-frontend/src/app/board.service.ts b/rapstore-frontend/src/app/board.service.ts
index 5aafb104..8eb62132 100644
--- a/rapstore-frontend/src/app/board.service.ts
+++ b/rapstore-frontend/src/app/board.service.ts
@@ -1,7 +1,9 @@
+
+import {map} from 'rxjs/operators';
import {Injectable} from '@angular/core';
import {Http, Response, RequestOptions, Headers} from '@angular/http';
import {Board} from './models';
-import {Observable} from 'rxjs/Observable';
+import {Observable} from 'rxjs';
import {environment} from '../environments/environment';
import {AuthService} from './auth.service';
@@ -16,7 +18,7 @@ export class BoardService {
getAll(): Observable {
let headers = new Headers({'Content-Type': 'application/json'});
let options = new RequestOptions({headers: headers});
- return this.http.get(`${this.baseUrl}/api/board/`).map(res => res.json());
+ return this.http.get(`${this.baseUrl}/api/board/`).pipe(map(res => res.json()));
}
getAuthOptions(): RequestOptions {
@@ -27,7 +29,7 @@ export class BoardService {
}
getSupported(app_id: number): Observable {
let options = this.getAuthOptions();
- return this.http.get(`${this.baseUrl}/api/app/${app_id}/supported_boards/`, options).map(res => res.json());
+ return this.http.get(`${this.baseUrl}/api/app/${app_id}/supported_boards/`, options).pipe(map(res => res.json()));
}
}
diff --git a/rapstore-frontend/src/app/browser-integration.service.ts b/rapstore-frontend/src/app/browser-integration.service.ts
index ace2225f..bc7d9da9 100644
--- a/rapstore-frontend/src/app/browser-integration.service.ts
+++ b/rapstore-frontend/src/app/browser-integration.service.ts
@@ -1,6 +1,5 @@
import {Injectable} from '@angular/core';
-import {Observable} from 'rxjs/Observable';
-import {Subject} from 'rxjs/Subject';
+import {Observable, Subject} from 'rxjs';
@Injectable()
export class BrowserIntegrationService {
diff --git a/rapstore-frontend/src/app/feedback.service.ts b/rapstore-frontend/src/app/feedback.service.ts
index 9d88bf8f..13a2e52d 100644
--- a/rapstore-frontend/src/app/feedback.service.ts
+++ b/rapstore-frontend/src/app/feedback.service.ts
@@ -1,3 +1,5 @@
+
+import {map} from 'rxjs/operators';
import {Injectable} from '@angular/core';
import {Http, Response, RequestOptions, Headers} from '@angular/http';
import {Feedback} from './models';
@@ -13,7 +15,7 @@ export class FeedbackService {
sendFeedback(feedback: Feedback) {
const authHeaders = new Headers(this.contentType);
- return this.http.post(`${this.baseUrl}/api/feedback/`, feedback, new RequestOptions({headers: authHeaders})).map(res => res.json());
+ return this.http.post(`${this.baseUrl}/api/feedback/`, feedback, new RequestOptions({headers: authHeaders})).pipe(map(res => res.json()));
}
}
diff --git a/rapstore-frontend/src/app/login/login.component.ts b/rapstore-frontend/src/app/login/login.component.ts
index 88018b58..8f95a90d 100644
--- a/rapstore-frontend/src/app/login/login.component.ts
+++ b/rapstore-frontend/src/app/login/login.component.ts
@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core';
import {AuthService} from '../auth.service';
import {Router, ActivatedRoute, Params} from '@angular/router';
-import {Subscription} from 'rxjs/Subscription';
+import {Subscription} from 'rxjs';
import {UserService} from '../user.service';
import {User} from '../models';
diff --git a/rapstore-frontend/src/app/logout/logout.component.ts b/rapstore-frontend/src/app/logout/logout.component.ts
index faa11e6d..a5f401d5 100644
--- a/rapstore-frontend/src/app/logout/logout.component.ts
+++ b/rapstore-frontend/src/app/logout/logout.component.ts
@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core';
import {Router, ActivatedRoute} from '@angular/router';
import {AuthService} from '../auth.service';
-import {Subscription} from 'rxjs/Subscription';
+import {Subscription} from 'rxjs';
import {AppService} from '../appservice.service';
@Component({
diff --git a/rapstore-frontend/src/app/missing-components-label-section/missing-components-label-section.component.ts b/rapstore-frontend/src/app/missing-components-label-section/missing-components-label-section.component.ts
index 6ef27c68..fc737a1f 100644
--- a/rapstore-frontend/src/app/missing-components-label-section/missing-components-label-section.component.ts
+++ b/rapstore-frontend/src/app/missing-components-label-section/missing-components-label-section.component.ts
@@ -1,6 +1,6 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import {BrowserIntegrationService} from '../browser-integration.service';
-import {Subscription} from 'rxjs/Subscription';
+import {Subscription} from 'rxjs';
@Component({
selector: 'app-missing-components-label-section',
diff --git a/rapstore-frontend/src/app/signup/signup.component.ts b/rapstore-frontend/src/app/signup/signup.component.ts
index 7dd39c2b..a3d69c8d 100644
--- a/rapstore-frontend/src/app/signup/signup.component.ts
+++ b/rapstore-frontend/src/app/signup/signup.component.ts
@@ -1,5 +1,5 @@
import {Component, OnInit} from '@angular/core';
-import {Subscription} from 'rxjs/Subscription';
+import {Subscription} from 'rxjs';
import {Router, ActivatedRoute} from '@angular/router';
import {UserService} from '../user.service';
import {AuthService} from '../auth.service';
diff --git a/rapstore-frontend/src/app/user.service.ts b/rapstore-frontend/src/app/user.service.ts
index c698e745..5035278f 100644
--- a/rapstore-frontend/src/app/user.service.ts
+++ b/rapstore-frontend/src/app/user.service.ts
@@ -1,3 +1,5 @@
+
+import {map} from 'rxjs/operators';
import {Injectable, Output, EventEmitter} from '@angular/core';
import {Http, Response, RequestOptions, Headers} from '@angular/http';
import {AuthService} from './auth.service';
@@ -13,11 +15,11 @@ export class UserService {
}
get() {
- return this.http.get(this.url, this.getAuthOptions()).map(res => res.json());
+ return this.http.get(this.url, this.getAuthOptions()).pipe(map(res => res.json()));
}
update(user: User) {
- return this.http.put(`${this.url}update/`, user, this.getAuthOptions()).map(res => res.json());
+ return this.http.put(`${this.url}update/`, user, this.getAuthOptions()).pipe(map(res => res.json()));
}
getAuthOptions(): RequestOptions {
@@ -28,7 +30,7 @@ export class UserService {
register(signup: Signup) {
const authHeaders = new Headers(this.contentType);
- return this.http.post(`${this.url}register/`, signup, new RequestOptions({headers: authHeaders})).map(res => res.json());
+ return this.http.post(`${this.url}register/`, signup, new RequestOptions({headers: authHeaders})).pipe(map(res => res.json()));
}
}