From a80bcf9d3e20aaa5c588dc91fd2b3ab39c876795 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 Jan 2020 18:24:54 +0100 Subject: [PATCH] Add environment --- src/app/components/profile/profile.component.ts | 5 +++-- src/app/services/profile/profile.service.ts | 2 +- src/environments/environment.prod.ts | 3 ++- src/environments/environment.ts | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts index cd29dd3..ff163ee 100644 --- a/src/app/components/profile/profile.component.ts +++ b/src/app/components/profile/profile.component.ts @@ -6,6 +6,7 @@ import { RequestService } from 'src/app/services/request/request.service'; import { DatasharingService } from '../../services/datasharing.service'; import { ProfileService } from 'src/app/services/profile/profile.service'; import { HttpClient } from '@angular/common/http'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-profile', @@ -72,9 +73,9 @@ export class ProfileComponent implements OnInit { const formData: any = new FormData(); formData.append('profilePicture', event.target.files[0]); - this.http.post('https://greenvironment.net/upload', formData).subscribe( + this.http.post(environment.greenvironmentUrl, formData).subscribe( (response: any) => { - this.userProfile.profilePicture = 'https://greenvironment.net/' + response.filename; + this.userProfile.profilePicture = environment.greenvironmentUrl + response.filename; }, (error) => console.log(error) ); diff --git a/src/app/services/profile/profile.service.ts b/src/app/services/profile/profile.service.ts index 3de1124..67069a7 100644 --- a/src/app/services/profile/profile.service.ts +++ b/src/app/services/profile/profile.service.ts @@ -82,7 +82,7 @@ export class ProfileService { profile.friendCount = response.data.getUser.friendCount; profile.groupCount = response.data.getUser.groupCount; if (response.data.getUser.profilePicture) { - profile.profilePicture = 'https://greenvironment.net/' + response.data.getUser.profilePicture; + profile.profilePicture = environment.greenvironmentUrl + response.data.getUser.profilePicture; } else { profile.profilePicture = 'assets/images/account_circle-24px.svg'; } diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 1bcd4f6..73d5691 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,4 +1,5 @@ export const environment = { production: true, - graphQLUrl: '/graphql' + graphQLUrl: '/graphql', + greenvironmentUrl: '', }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8ddcf48..062be1b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,8 @@ export const environment = { production: false, - graphQLUrl: 'https://greenvironment.net/graphql' + graphQLUrl: 'https://greenvironment.net/graphql', + greenvironmentUrl: 'https://greenvironment.net/', }; /*