diff --git a/src/app/modules/shared/utils/utils.ts b/src/app/modules/shared/utils/utils.ts index dfa6bf9..e912609 100644 --- a/src/app/modules/shared/utils/utils.ts +++ b/src/app/modules/shared/utils/utils.ts @@ -10,20 +10,20 @@ export function valueOr(value: T, or: T): T { const MEDIA_TYPE_PDF = 'application/pdf' const MEDIA_TYPE_JPG = 'image/jpeg' -export function openPdf(url: string) { - openUrl(url, MEDIA_TYPE_PDF) +export function openPdf(uri: string) { + openFileUri(uri, MEDIA_TYPE_PDF) } -export function openJpg(url: string) { - openUrl(url, MEDIA_TYPE_JPG) +export function openJpg(uri: string) { + openFileUri(uri, MEDIA_TYPE_JPG) } export function openTouchUpKit(touchUpKit: TouchUpKit) { openRawUrl(`${environment.apiUrl}/touchupkit/pdf?project=${touchUpKit.project}`) } -export function openUrl(url: string, mediaType: string) { - openRawUrl(`${url}&mediaType=${encodeURIComponent(mediaType)}`) +export function openFileUri(uri: string, mediaType: string) { + openRawUrl(`${environment.apiBaseUrl}${uri}&mediaType=${encodeURIComponent(mediaType)}`) } export function openRawUrl(url: string) { diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index ae45e0b..c62f514 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,4 +1,5 @@ export const environment = { production: true, + apiBaseUrl: window.location.origin, apiUrl: window.location.origin + '/api' }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8a40323..e5b8c49 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,6 +4,7 @@ export const environment = { production: false, + apiBaseUrl: 'http://localhost:9090', apiUrl: 'http://localhost:9090/api' };