Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
fix(env): Change demo host url in environment
Browse files Browse the repository at this point in the history
  • Loading branch information
EndyKaufman committed Aug 7, 2017
1 parent daaffe0 commit ca4dcce
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
"prod": "environments/environment.prod.ts",
"mockapi": "environments/environment.mockapi.ts"
}
}
],
Expand Down
3 changes: 2 additions & 1 deletion demo/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { RouterModule } from '@angular/router';
import { DemoRoutes } from './app.routes';
import { DemoNavbarModule } from './demo/controls/navbar/navbar.module';
import { LaddaModule } from 'angular2-ladda';
import { DemoHttpHelper } from './demo/shared/helpers/http.helper';

@NgModule({
declarations: [
Expand Down Expand Up @@ -57,7 +58,7 @@ import { LaddaModule } from 'angular2-ladda';
{ provide: AuthHttp, useFactory: AuthHttpFactory.create, deps: [Http, RequestOptions] },
{ provide: EndpointHelper, useClass: DemoEndpointHelper },
{ provide: RepositoryHelper, useClass: RepositoryHelper },
{ provide: HttpHelper, useClass: HttpHelper }
{ provide: HttpHelper, useClass: DemoHttpHelper }
],
bootstrap: [DemoAppComponent]
})
Expand Down
11 changes: 11 additions & 0 deletions demo/src/app/demo/shared/helpers/endpoint.helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,15 @@ export class DemoEndpointHelper extends EndpointHelper {
get apiUrl() {
return environment.apiUrl;
}
actionUrl(endpointService: any, action?: any) {
let endpointServiceApiUrl = endpointService.apiUrl;
if (environment.type === 'mockapi' && endpointService.name === 'account') {
endpointServiceApiUrl += '/1';
}
if (action === undefined) {
return endpointServiceApiUrl;
} else {
return `${endpointServiceApiUrl}/${action}`;
}
};
}
16 changes: 16 additions & 0 deletions demo/src/app/demo/shared/helpers/http.helper.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Injectable } from '@angular/core';
import { Http, Headers, RequestOptions, Response } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import { AuthHttp } from 'angular2-jwt';
import { HttpHelper } from './../../../../../../src';
import { environment } from '../../../../environments/environment';

@Injectable()
export class DemoHttpHelper extends HttpHelper {

direct = environment.type === 'mockapi';

constructor(public authHttp: AuthHttp, public http: Http) {
super(authHttp, http);
}
}
5 changes: 5 additions & 0 deletions demo/src/environments/environment.mockapi.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export const environment = {
type: 'mockapi',
production: false,
apiUrl: 'https://598726293223df0011bbead7.mockapi.io/api'
};
3 changes: 2 additions & 1 deletion demo/src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const environment = {
type: 'mockapi',
production: true,
apiUrl: 'https://59683c7518a46600116d1715.mockapi.io/api'
apiUrl: 'https://598726293223df0011bbead7.mockapi.io/api'
};
1 change: 1 addition & 0 deletions demo/src/environments/environment.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const environment = {
type: 'django',
production: false,
apiUrl: 'http://localhost:5000/api'
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"build": "npm-run-all build.change-src-version build.inline-templates build.build-src-inline",
"ng": "ng",
"start": "ng serve --aot=false --host 0.0.0.0",
"mockapi": "ng serve --aot=false --host 0.0.0.0 --environment=mockapi",
"test": "npm-run-all lint build demo.build demo.add-version",
"lint": "ng lint",
"e2e": "ng e2e",
Expand Down
11 changes: 6 additions & 5 deletions src/shared/helpers/http.helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { AuthHttp } from 'angular2-jwt';
export class HttpHelper {

withCredentials = false;
direct = false;

constructor(public authHttp: AuthHttp, public http: Http) {
}
Expand All @@ -22,35 +23,35 @@ export class HttpHelper {
}

get(url: string, direct?: boolean): Observable<Response> {
if (direct) {
if (direct || this.direct) {
return this.http.get(url, this.getRequestOptions());
}
return this.authHttp.get(url, this.getRequestOptions());
}

patch(url: string, data?: any, direct?: boolean): Observable<Response> {
if (direct) {
if (direct || this.direct) {
return this.http.patch(url, this.getRequestBody(data), this.getRequestOptions());
}
return this.authHttp.patch(url, this.getRequestBody(data), this.getRequestOptions());
}

post(url: string, data?: any, direct?: boolean): Observable<Response> {
if (direct) {
if (direct || this.direct) {
return this.http.post(url, this.getRequestBody(data), this.getRequestOptions());
}
return this.authHttp.post(url, this.getRequestBody(data), this.getRequestOptions());
}

put(url: string, data?: any, direct?: boolean): Observable<Response> {
if (direct) {
if (direct || this.direct) {
return this.http.put(url, this.getRequestBody(data), this.getRequestOptions());
}
return this.authHttp.put(url, this.getRequestBody(data), this.getRequestOptions());
}

delete(url: string, direct?: boolean): Observable<Response> {
if (direct) {
if (direct || this.direct) {
return this.http.delete(url, this.getRequestOptions());
}
return this.authHttp.delete(url, this.getRequestOptions());
Expand Down

0 comments on commit ca4dcce

Please # to comment.