machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New frontend config for webserver url to fix static asset httpGet.

Browse Source 
Removed "absolute" from config names.
This commit is contained in:
softsimon 2020-11-23 18:22:21 +07:00
parent 2054c951ae
commit 2cbf1474c3
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
6 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/mempool-frontend-config.sample.json
View File

@ -6,7 +6,8 @@
"ELECTRS_ITEMS_PER_PAGE": 25, "ELECTRS_ITEMS_PER_PAGE": 25,
"KEEP_BLOCKS_AMOUNT": 8, "KEEP_BLOCKS_AMOUNT": 8,
"SPONSORS_ENABLED": false, "SPONSORS_ENABLED": false,
"BACKEND_ABSOLUTE_URL": "http://localhost:8999", "BACKEND_URL": "http://127.0.0.1:8999",
"ELECTRS_ABSOLUTE_URL": "http://localhost:4200", "ELECTRS_URL": "http://127.0.0.1:4200",
"ELECTRS_ABSOLUTE_URL_SERVER": "http://localhost:50001" "ELECTRS_URL_SERVER": "http://127.0.0.1:50001",
"STATIC_WEBSERVER_URL": "http://127.0.0.1:4200"
} }

4
frontend/server.ts
View File

@ -68,14 +68,14 @@ export function app(): express.Express {
server.get('/api/v1/**', createProxyMiddleware({ server.get('/api/v1/**', createProxyMiddleware({
// @ts-ignore // @ts-ignore
target: win.__env.BACKEND_ABSOLUTE_URL, target: win.__env.BACKEND_URL,
changeOrigin: true, changeOrigin: true,
}, },
)); ));
server.get('/api/**', createProxyMiddleware({ server.get('/api/**', createProxyMiddleware({
// @ts-ignore // @ts-ignore
target: win.__env.ELECTRS_ABSOLUTE_URL_SERVER, target: win.__env.ELECTRS_URL_SERVER,
changeOrigin: true, changeOrigin: true,
pathRewrite: {'^/api' : '/'} pathRewrite: {'^/api' : '/'}
}, },

4
frontend/src/app/services/api.service.ts
View File

@ -23,13 +23,13 @@ export class ApiService {
} }
this.apiBaseUrl = API_BASE_URL.replace('{network}', network ? '/' + network : ''); this.apiBaseUrl = API_BASE_URL.replace('{network}', network ? '/' + network : '');
if (!stateService.isBrowser) { if (!stateService.isBrowser) {
this.apiBaseUrl = this.stateService.env.BACKEND_ABSOLUTE_URL + this.apiBaseUrl; this.apiBaseUrl = this.stateService.env.BACKEND_URL + this.apiBaseUrl;
} }
}); });
this.apiBaseUrl = API_BASE_URL.replace('{network}', ''); this.apiBaseUrl = API_BASE_URL.replace('{network}', '');
if (!stateService.isBrowser) { if (!stateService.isBrowser) {
this.apiBaseUrl = this.stateService.env.BACKEND_ABSOLUTE_URL + this.apiBaseUrl; this.apiBaseUrl = this.stateService.env.BACKEND_URL + this.apiBaseUrl;
} }
} }

13
frontend/src/app/services/assets.service.ts
View File

@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { shareReplay } from 'rxjs/operators'; import { shareReplay } from 'rxjs/operators';
import { StateService } from './state.service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -13,9 +14,15 @@ export class AssetsService {
constructor( constructor(
private httpClient: HttpClient, private httpClient: HttpClient,
private stateService: StateService,
) { ) {
this.getAssetsJson$ = this.httpClient.get('/resources/assets.json').pipe(shareReplay()); let baseApiUrl = '';
this.getAssetsMinimalJson$ = this.httpClient.get('/resources/assets.minimal.json').pipe(shareReplay()); if (!this.stateService.isBrowser) {
this.getMiningPools$ = this.httpClient.get('/resources/pools.json').pipe(shareReplay()); baseApiUrl = this.stateService.env.STATIC_WEBSERVER_URL;
}
this.getAssetsJson$ = this.httpClient.get(baseApiUrl + '/resources/assets.json').pipe(shareReplay());
this.getAssetsMinimalJson$ = this.httpClient.get(baseApiUrl + '/resources/assets.minimal.json').pipe(shareReplay());
this.getMiningPools$ = this.httpClient.get(baseApiUrl + '/resources/pools.json').pipe(shareReplay());
} }
} }

2
frontend/src/app/services/electrs-api.service.ts
View File

@ -17,7 +17,7 @@ export class ElectrsApiService {
private stateService: StateService, private stateService: StateService,
) { ) {
if (!stateService.isBrowser) { if (!stateService.isBrowser) {
API_BASE_URL = this.stateService.env.ELECTRS_ABSOLUTE_URL; API_BASE_URL = this.stateService.env.ELECTRS_URL + '/api';
} }
this.apiBaseUrl = API_BASE_URL.replace('{network}', ''); this.apiBaseUrl = API_BASE_URL.replace('{network}', '');
this.stateService.networkChanged$.subscribe((network) => { this.stateService.networkChanged$.subscribe((network) => {

6
frontend/src/app/services/state.service.ts
View File

@ -21,8 +21,10 @@ export interface Env {
SPONSORS_ENABLED: boolean; SPONSORS_ENABLED: boolean;
ELECTRS_ITEMS_PER_PAGE: number; ELECTRS_ITEMS_PER_PAGE: number;
KEEP_BLOCKS_AMOUNT: number; KEEP_BLOCKS_AMOUNT: number;
BACKEND_ABSOLUTE_URL?: string; BACKEND_URL?: string;
ELECTRS_ABSOLUTE_URL?: string; ELECTRS_URL?: string;
ELECTRS_URL_SERVER?: string;
STATIC_WEBSERVER_URL?: string;
} }
const defaultEnv: Env = { const defaultEnv: Env = {