From 4bac188060cf419efbce3a2305f8c612bfebb92b Mon Sep 17 00:00:00 2001 From: Amol Sontakke Date: Thu, 28 Nov 2024 19:29:55 +0530 Subject: [PATCH 1/3] Added lfx footer Signed-off-by: Amol Sontakke --- package.json | 3 ++- src/app/app.component.html | 3 ++- src/app/app.component.ts | 7 ------- src/main.ts | 2 +- yarn.lock | 17 +++++++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index cf7be264..95d42662 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "https://www.linuxfoundation.org/" }, "engines": { - "node": ">=16.0.0", + "node": ">=12.0.0", "npm": ">=8.0.0" }, "version": "1.0.0", @@ -56,6 +56,7 @@ "@fortawesome/fontawesome-free": "^6.4.0", "@ng-bootstrap/ng-bootstrap": "^6.1.0", "@silvermine/serverless-plugin-cloudfront-lambda-edge": "^2.1.1", + "@linuxfoundation/lfx-ui-core": "^0.0.12", "aws-sdk": "2.1558.0", "@types/node": "^18.16.0", "auth0-spa-js": "^1.6.5", diff --git a/src/app/app.component.html b/src/app/app.component.html index 77f4c2f6..c6b3fbb3 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -6,5 +6,6 @@ - +
+
\ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index e2cbffae..bc8ca9f4 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -26,7 +26,6 @@ export class AppComponent { ngOnInit() { this.mountHeader(); this.hasExpanded = true; - this.mountFooter(); } private mountHeader(): void { @@ -35,10 +34,4 @@ export class AppComponent { script.setAttribute('async', 'true'); document.head.appendChild(script); } - - private mountFooter(): void { - const script = document.createElement('script'); - script.setAttribute('src', EnvConfig.default[AppSettings.LFX_FOOTER]); - document.head.appendChild(script); - } } diff --git a/src/main.ts b/src/main.ts index 4a19aed3..5f2879b5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,7 +3,7 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - +import '@linuxfoundation/lfx-ui-core'; import { AppModule } from './app/app.module'; import { environment } from './environments/environment'; diff --git a/yarn.lock b/yarn.lock index d955fbde..46f3b87b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1442,6 +1442,11 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== +"@linuxfoundation/lfx-ui-core@^0.0.12": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@linuxfoundation/lfx-ui-core/-/lfx-ui-core-0.0.12.tgz#69b89fb82bc3ddc2343f140a87c5c43bae230801" + integrity sha512-yOGk9URri2/Ojp611cCloORO0PuMdjJD8Og6emhLV9+dMvArweTRzLTTOsTAJp7Y1ZtzZA81xMG24nwu/0fyag== + "@ng-bootstrap/ng-bootstrap@^6.1.0": version "6.2.0" resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-6.2.0.tgz#0506d612ca6002bd8fa398d006fa2641013e11d4" @@ -2502,10 +2507,10 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-sdk@2.1363.0: - version "2.1363.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1363.0.tgz#30c3b7fe999ee2ba1103a533ea27e1b0f5708e1f" - integrity sha512-M2MZZXehgi/EMQv5GlzRkn3TlhoOYHg2cYdSAAqhjv67WaEG50MjaQy5vRvfN1i8XvB24aJFJ5pCrx69TaCaIg== +aws-sdk@2.1558.0: + version "2.1558.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1558.0.tgz#e62f58a1ef3886a57b9e524b65541ad6efad0a30" + integrity sha512-lxaPHlLg5EfVK5yg2dAJ1k1BJgxUoTODYk8yMPFAjMwNIN302b8D8XYNucstm7urgiykW3zEtRDeNaX9oc6RQA== dependencies: buffer "4.9.2" events "1.1.1" @@ -2516,7 +2521,7 @@ aws-sdk@2.1363.0: url "0.10.3" util "^0.12.4" uuid "8.0.0" - xml2js "0.5.0" + xml2js "0.6.2" aws-sdk@^2.1404.0: version "2.1407.0" @@ -11224,7 +11229,7 @@ ws@^6.2.1, ws@^7.5.3, ws@^7.5.5, ws@^7.5.9, ws@~8.11.0: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -xml2js@0.5.0, xml2js@^0.4.17, xml2js@^0.5.0: +xml2js@0.5.0, xml2js@0.6.2, xml2js@^0.4.17, xml2js@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA== From 84b1cdd840e5de0c3cee60fa8a7cfc71fe6f3725 Mon Sep 17 00:00:00 2001 From: Amol Sontakke Date: Thu, 28 Nov 2024 19:30:33 +0530 Subject: [PATCH 2/3] Added lfx footer Signed-off-by: Amol Sontakke --- src/app/app.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index bc8ca9f4..e486c5ed 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -2,9 +2,7 @@ // SPDX-License-Identifier: MIT import { Component } from '@angular/core'; -import { AppSettings } from './config/app-settings'; import { LfxHeaderService } from './shared/services/lfx-header.service'; -import { EnvConfig } from './config/cla-env-utils'; import { environment } from 'src/environments/environment'; @Component({ From 65cf853da862126f3ca44164d1f8a71573c9442f Mon Sep 17 00:00:00 2001 From: Amol Sontakke Date: Tue, 3 Dec 2024 11:10:10 +0530 Subject: [PATCH 3/3] Added some margin to bottom Signed-off-by: Amol Sontakke --- src/app/app.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index c6b3fbb3..6f88048f 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -6,6 +6,6 @@ -
+
\ No newline at end of file