diff --git a/src/app/app.component.html b/src/app/app.component.html index 2e435e31..45c48a6a 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -4,30 +4,6 @@
-
-
- - - - -
    -
  • located in Cuba, Iran, North Korea, Syria, the Crimea Region of Ukraine, or the Russian-controlled areas of the Donetsk or Luhansk regions of Ukraine; -
  • -
  • owned or controlled by, acting for or on behalf of, or an individual or entity that has in the past acted for or on behalf of the Government of Cuba, - Iran, North Korea, Syria, or Venezuela; or
  • -
  • listed as a blocked person by the U.S. Department of the Treasury’s - Office of Foreign Assets Control (OFAC) - or directly or indirectly owned 50 percent or more by such a listed person -
  • -
-
- -
-
-
-
-
diff --git a/src/app/app.component.scss b/src/app/app.component.scss index afb89874..8ad4ef07 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -4,38 +4,4 @@ margin-top: 35px; padding: 25px 0 0 0; min-height: calc(100vh - 125px); -} - -.consent-title{ - font-size: 24px; - font-weight: bold; - margin-bottom: 20px; - text-align: center; -} - -.vcenter-item{ - display: flex; - align-items: center; - justify-content: center; -} -/* Some custom styles to beautify this example */ -.wrapper{ - font-size: 16px; - min-height: calc(100vh - 250px); -} - -.button { - width: 120px; - padding: 5px; - margin-top: 15px; - border-radius: 25px; - color: #fff; - background-color: #0099cc; - font-family: "SourceSansPro"; - font-weight: bold; - border: none; - - &.gray { - background-color: gray !important; - } -} +} \ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8bed84a0..76bee0ef 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,8 +6,6 @@ import { Component } from '@angular/core'; import { environment } from 'src/environments/environment'; -import { StorageService } from './shared/services/storage.service'; -import { AppSettings } from './config/app-settings'; @Component({ selector: 'app-root', @@ -15,30 +13,11 @@ import { AppSettings } from './config/app-settings'; styleUrls: ['./app.component.scss'], }) export class AppComponent { - hasTermAccepted: boolean; - showDashboard: boolean; - - constructor(private storageService: StorageService) { - this.showDashboard = false; - this.hasTermAccepted = false; - } ngOnInit() { this.mountHeader(); } - onClickTermAccepted(event:boolean) { - this.hasTermAccepted = event - this.storageService.setItem(AppSettings.ACCEPTED_TERMS, this.hasTermAccepted); - } - - onClickContinue() { - if(this.hasTermAccepted) { - this.storageService.setItem(AppSettings.ACCEPTED_TERMS, true); - this.showDashboard = true; - } - } - private mountHeader(): void { const script = document.createElement('script'); script.setAttribute('src', environment.lfxHeader + '/lfx-header-v2.js'); diff --git a/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html b/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html index d77e60f9..1a5d17ab 100644 --- a/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html +++ b/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html @@ -102,8 +102,14 @@ + +
+
+ +
+
-
+
-
diff --git a/src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.html b/src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.html index 2c8ed99e..bdab4413 100644 --- a/src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.html +++ b/src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.html @@ -33,6 +33,12 @@
+
+
+ +
+
+
-
diff --git a/src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.ts b/src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.ts index bd27e5b3..519d1d32 100644 --- a/src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.ts +++ b/src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.ts @@ -19,6 +19,7 @@ export class DocusignSignatureModelComponent { title: string; message: string; + hasTermAccepted = false; constructor( private storageService: StorageService, diff --git a/src/app/shared/components/consent/consent.component.html b/src/app/shared/components/consent/consent.component.html new file mode 100644 index 00000000..55873eb8 --- /dev/null +++ b/src/app/shared/components/consent/consent.component.html @@ -0,0 +1,21 @@ + + +
+
+ + + +
    +
  • located in Cuba, Iran, North Korea, Syria, the Crimea Region of Ukraine, or the Russian-controlled areas of the Donetsk or Luhansk regions of Ukraine; +
  • +
  • owned or controlled by, acting for or on behalf of, or an individual or entity that has in the past acted for or on behalf of the Government of Cuba, + Iran, North Korea, Syria, or Venezuela; or
  • +
  • listed as a blocked person by the U.S. Department of the Treasury’s + Office of Foreign Assets Control (OFAC) + or directly or indirectly owned 50 percent or more by such a listed person +
  • +
+
+
\ No newline at end of file diff --git a/src/app/shared/components/consent/consent.component.scss b/src/app/shared/components/consent/consent.component.scss new file mode 100644 index 00000000..bee5c085 --- /dev/null +++ b/src/app/shared/components/consent/consent.component.scss @@ -0,0 +1,13 @@ +/* Copyright The Linux Foundation and each contributor to CommunityBridge. + SPDX-License-Identifier: MIT */ + +.consent-title{ + font-size: 24px; + font-weight: bold; + margin-bottom: 5px; + text-align: center; + } + /* Some custom styles to beautify this example */ + .wrapper{ + font-size: 16px; + } diff --git a/src/app/shared/components/consent/consent.component.spec.ts b/src/app/shared/components/consent/consent.component.spec.ts new file mode 100644 index 00000000..92d0e3cf --- /dev/null +++ b/src/app/shared/components/consent/consent.component.spec.ts @@ -0,0 +1,29 @@ +// Copyright The Linux Foundation and each contributor to CommunityBridge. +// SPDX-License-Identifier: MIT + + +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ConsentComponent } from './consent.component'; + +describe('ConsentComponent', () => { + let component: ConsentComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ConsentComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ConsentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/components/consent/consent.component.ts b/src/app/shared/components/consent/consent.component.ts new file mode 100644 index 00000000..17eadc8c --- /dev/null +++ b/src/app/shared/components/consent/consent.component.ts @@ -0,0 +1,25 @@ +// Copyright The Linux Foundation and each contributor to CommunityBridge. +// SPDX-License-Identifier: MIT + + +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; + +@Component({ + selector: 'app-consent', + templateUrl: './consent.component.html', + styleUrls: ['./consent.component.scss'] +}) +export class ConsentComponent implements OnInit { + + @Input() hasTermAccepted = false; + @Output() termAccepted: EventEmitter = new EventEmitter(); + constructor() { } + + ngOnInit(): void { + } + + onClickTermAccepted(event:boolean) { + this.hasTermAccepted = event + this.termAccepted.emit(event) + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 4ff2a4c7..ade16a1c 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -18,6 +18,7 @@ import { InterceptorService } from './services/interceptor.service'; import { AuthComponent } from './components/auth/auth.component'; import { FooterComponent } from './components/footer/footer.component'; import { CommonModule } from '@angular/common'; +import { ConsentComponent } from './components/consent/consent.component'; @NgModule({ declarations: [ @@ -31,7 +32,8 @@ import { CommonModule } from '@angular/common'; TrimCharactersPipe, CheckboxComponent, AuthComponent, - FooterComponent + FooterComponent, + ConsentComponent ], imports: [ CommonModule @@ -46,7 +48,8 @@ import { CommonModule } from '@angular/common'; ProjectTitleComponent, TrimCharactersPipe, CheckboxComponent, - FooterComponent + FooterComponent, + ConsentComponent ], providers: [StorageService, AuthService, LfxHeaderService, InterceptorService] })