sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'integration' into develop

Browse Source
This commit is contained in:
Lorenz Hilpert
2020-07-07 15:05:33 +02:00
parent 86cde05804 6a34553c9f
commit 321470797b
9 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/sales/src/app/app-configuration.ts
View File

@@ -4,6 +4,7 @@ import { AuthConfig } from 'angular-oauth2-oidc';
@Injectable()
export class AppConfiguration {
includeGoogleAnalytics = false;
title?: string;
sso: AuthConfig;

2
apps/sales/src/app/modules/product/pages/product-details/product-details.component.html
View File

@@ -109,7 +109,7 @@
</div>
</div>
<div class="avilability-status" *ngIf="!(showAvLoading | async)">
<div class="status-icons" *ngIf="!(isDownload | async)">
<div class="status-icons" *ngIf="!(isDownload | async) && !inTheCartButtonDisabled">
<div class="align-right ship-icon align-right"
*ngIf="(shippingAvailable | async) && !(deliveryError$ | async)">
<lib-icon name="Truck_Icon_grey" height="17px"></lib-icon>

1
apps/sales/src/assets/config/config.integration.json
View File

@@ -1,5 +1,6 @@
{
"includeGoogleAnalytics": false,
"title": "ISA - integration",
"sso": {
"issuer": "https://sso-test.paragon-data.de",
"clientId": "hug-isa",

1
apps/sales/src/assets/config/config.json
View File

@@ -1,5 +1,6 @@
{
"includeGoogleAnalytics": false,
"title": "ISA - local",
"sso": {
"issuer": "https://sso-test.paragon-data.de",
"clientId": "hug-isa",

1
apps/sales/src/assets/config/config.production.json
View File

@@ -1,5 +1,6 @@
{
"includeGoogleAnalytics": true,
"title": "ISA",
"sso": {
"issuer": "https://sso.paragon-data.de",
"clientId": "hug-isa",

1
apps/sales/src/assets/config/config.staging.json
View File

@@ -1,5 +1,6 @@
{
"includeGoogleAnalytics": true,
"title": "ISA - staging",
"sso": {
"issuer": "https://sso.paragon-data.de",
"clientId": "hug-isa",

1
apps/sales/src/assets/config/config.test.json
View File

@@ -1,5 +1,6 @@
{
"includeGoogleAnalytics": false,
"title": "ISA - test",
"sso": {
"issuer": "https://sso-test.paragon-data.de",
"clientId": "hug-isa",

22
apps/sales/src/index.html
View File

@@ -2,14 +2,24 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>Hima</title>
<title>ISA</title>
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" type="image/x-icon" href="favicon.ico" />
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,700" rel="stylesheet" />
<link rel="manifest" href="manifest.webmanifest" crossorigin="use-credentials" />
<link
href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,700"
rel="stylesheet"
/>
<link
rel="manifest"
href="manifest.webmanifest"
crossorigin="use-credentials"
/>
<meta name="theme-color" content="#1976d2" />
<style>
.app-loader {
@@ -47,6 +57,8 @@
<app-root>
<img src="/assets/images/Icon_Loading.svg" class="app-loader" />
</app-root>
<noscript>Please enable JavaScript to continue using this application.</noscript>
<noscript
>Please enable JavaScript to continue using this application.</noscript
>
</body>
</html>

15
apps/sales/src/main.ts
View File

@@ -19,17 +19,26 @@ if ('serviceWorker' in navigator && environment.production) {
navigator.serviceWorker.register('./ngsw-worker.js');
}
console.log('ISA Version: ', version);
console.log(`%cISA Version: ${version}`, 'font-weight: bold; font-size: 18px');
(async () => {
try {
const res = await fetch('/assets/config/config.json');
const configuration = await res.json();
platformBrowserDynamic([{ provide: AppConfiguration, useValue: configuration }])
if (configuration && configuration.title) {
document.title = configuration.title;
}
platformBrowserDynamic([
{ provide: AppConfiguration, useValue: configuration },
])
.bootstrapModule(AppModule)
.catch((err) => console.error(err));
} catch (error) {
console.error('Unable to launch Application. Configuration file "/assets/config/config.json" not found.', error);
console.error(
'Unable to launch Application. Configuration file "/assets/config/config.json" not found.',
error
);
}
})();