From 1b312a8f2812d65c6a213a1876d87985d6143843 Mon Sep 17 00:00:00 2001 From: Sword Date: Tue, 11 Jun 2024 08:51:07 +0800 Subject: [PATCH 01/14] for local docker build --- Dockerfile | 2 ++ src/environments/globals.prod.ts | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..84bcdb24 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,2 @@ +FROM nginx +COPY dist/ /usr/share/nginx/html \ No newline at end of file diff --git a/src/environments/globals.prod.ts b/src/environments/globals.prod.ts index 5cddd4f1..31cf2315 100644 --- a/src/environments/globals.prod.ts +++ b/src/environments/globals.prod.ts @@ -7,10 +7,10 @@ export const debug = false; // Base path variables -export const base_path = "https://nimble-platform.salzburgresearch.at/nimble"; -export const ub_base = "https://nimble-platform.salzburgresearch.at/ub-search"; -export const idpURL = "https://nimble-platform.salzburgresearch.at:8080/auth/realms/master"; -export const collab_path = "http://nimble.eu-de.containers.appdomain.cloud/collaborations"; +export const base_path = "https://nimble.kolayam.co.uk"; +export const ub_base = "https://nimble.kolayam.co.uk/ub-search"; +export const idpURL = "https://keycloak.kolayam.co.uk/auth/realms/master"; +export const collab_path = "https://keycloak.kolayam.co.uk/collaborations"; export const pw_reset_link = idpURL + "/login-actions/reset-credentials?client_id=nimble_client"; export const frontendURL = base_path + "/frontend/"; @@ -25,15 +25,15 @@ export const data_channel_endpoint = `${base_path}/data-channel`; export const data_aggregation_endpoint = `${base_path}/data-aggregation`; export const trust_service_endpoint = `${base_path}/trust`; export const indexing_service_endpoint = `${base_path}/index`; -export const rocketChatEndpoint = `https://efpf-security-portal.salzburgresearch.at/chat`; +export const rocketChatEndpoint = `${base_path}/chat`; export const logstash_endpoint = `${base_path}/logstash`; export const kibana_endpoint = `${base_path}/kibana/app/kibana`; export const delegate_endpoint = `${base_path}:9265`; -export const agent_mgmt_endpoint = `http://159.69.214.42/agents`; +export const agent_mgmt_endpoint = `${base_path}/agents`; export const collaboration_endpoint = `${collab_path}`; -export const certificate_of_origin_endpoint = `http://161.156.70.125:7695`; -export const legislation_endpoint = `http://77.230.101.223/nimsys`; -export const eFactory_indexing_endpoint = "https://efpf-security-portal.salzburgresearch.at/api/index"; +export const certificate_of_origin_endpoint = `${base_path}/certificate`; +export const legislation_endpoint = `${base_path}/nimsys`; +export const eFactory_indexing_endpoint = `${base_path}/api/index`; // Explorative Search endpoints From b47507fcda8a52b84153fa22b56634cc587f98b9 Mon Sep 17 00:00:00 2001 From: Sword Date: Wed, 12 Jun 2024 14:36:37 +0800 Subject: [PATCH 02/14] update style --- package.json | 56 ++--- src/app/app.component.html | 7 +- src/app/globals.ts | 261 ++++----------------- src/app/user-mgmt/user-form.component.html | 2 +- src/assets/css/global-styles.css | 2 +- src/assets/images/logo_mvp.png | Bin 34632 -> 19761 bytes src/assets/pdf/eula.pdf | Bin 412630 -> 105017 bytes src/environments/globals.dev.ts | 6 +- src/environments/globals.ecohouse.ts | 4 +- src/environments/globals.efac-sme.ts | 2 +- src/environments/globals.efac.ts | 6 +- src/environments/globals.fmp-staging.ts | 4 +- src/environments/globals.fmp.ts | 4 +- src/environments/globals.k8s-srfg.ts | 6 +- src/environments/globals.k8s.ts | 6 +- src/environments/globals.mvp2.ts | 6 +- src/environments/globals.mvp3.ts | 4 +- src/environments/globals.prod.ts | 6 +- src/environments/globals.staging.ts | 6 +- 19 files changed, 93 insertions(+), 295 deletions(-) diff --git a/package.json b/package.json index 741ccc0f..1d385ff2 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "zone.js": "~0.8" }, "devDependencies": { + "@ngtools/webpack": "~7.3", "@types/angular": "~1.6", "@types/angular-animate": "~1.5", "@types/angular-cookies": "~1.4", @@ -72,14 +73,32 @@ "@types/angular-resource": "~1.5", "@types/angular-route": "~1.3", "@types/angular-sanitize": "~1.3", + "@types/core-js": "~2.5", "@types/file-saver": "~1.3", - "@types/jasmine": "~2.8", + "@types/jasmine": "^3.6.11", + "@types/jquery": "~3.3", "@types/lunr": "~2.1", + "@types/node": "~10.12", "@types/underscore": "~1.8", + "angular-router-loader": "~0.8", + "angular2-template-loader": "~0.6", + "awesome-typescript-loader": "~5.2", "babel-cli": "~6.26", + "babel-core": "~6.26", + "babel-loader": "~7.1", "babel-preset-angular2": "~0.0", + "babel-preset-env": "~1.7", "canonical-path": "~0.0", + "clean-webpack-plugin": "~0.1", "concurrently": "~3.6", + "copy-webpack-plugin": "~5.0", + "cross-env": "~5.2", + "css-loader": "~1.0", + "cssnano": "~4.1", + "del-cli": "~1.1", + "file-loader": "~4.0", + "html-loader": "~0.5", + "html-webpack-plugin": "4.0.0-beta.5", "http-server-legacy": "~0.11", "jasmine": "~3.2", "jasmine-core": "~3.1", @@ -89,48 +108,29 @@ "karma-jasmine": "~1.1", "karma-jasmine-html-reporter": "~1.1", "karma-phantomjs-launcher": "~1.0", + "lite-server": "~2.4", "lodash": "~4.17", + "mini-css-extract-plugin": "~0.7", + "node-sass": "~4.12", + "optimize-css-assets-webpack-plugin": "~5.0", "phantomjs-prebuilt": "~2.1", "protractor": "~5.3", "rollup": "~0.57", "rollup-plugin-commonjs": "~9.1", "rollup-plugin-node-resolve": "~3.3", "rollup-plugin-uglify": "~3.0", - "source-map-explorer": "~1.5", - "tslint": "~5.10", - "typings": "~2.1", - "@ngtools/webpack": "~7.3", - "@types/core-js": "~2.5", - "@types/node": "~10.12", - "angular-router-loader": "~0.8", - "angular2-template-loader": "~0.6", - "awesome-typescript-loader": "~5.2", - "babel-core": "~6.26", - "babel-loader": "~7.1", - "babel-preset-env": "~1.7", - "clean-webpack-plugin": "~0.1", - "copy-webpack-plugin": "~5.0", - "cross-env": "~5.2", - "css-loader": "~1.0", - "cssnano": "~4.1", - "del-cli": "~1.1", - "file-loader": "~4.0", - "html-loader": "~0.5", - "html-webpack-plugin": "4.0.0-beta.5", - "lite-server": "~2.4", - "mini-css-extract-plugin": "~0.7", - "node-sass": "~4.12", - "optimize-css-assets-webpack-plugin": "~5.0", "sass-loader": "~7.1", + "source-map-explorer": "~1.5", "style-loader": "~0.23", "to-string-loader": "~1.1", + "tslint": "~5.10", "typescript": "~3.2", + "typings": "~2.1", "uglifyjs-webpack-plugin": "~2.0", "webpack": "~4.29", "webpack-cli": "~3.2", "webpack-dev-server": "~3.1", - "webpack-merge": "~4.2", - "@types/jquery": "~3.3" + "webpack-merge": "~4.2" }, "repository": {} } diff --git a/src/app/app.component.html b/src/app/app.component.html index d45e2f11..174d6dc8 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -181,13 +181,13 @@ -