Merge pull request #437 from communitybridge/reset-main

Reset to main

Author: amolsontakke3576

README.md

@@ -26,7 +26,7 @@ Once the CLA is signed, the GitHub pull request status is updated.
 
 ## Documentation
 
-Please see our [online product documentation](https://docs.linuxfoundation.org/lfx/easycla) for a complete product
+Please see our [online product documentation](https://docs.linuxfoundation.org/lfx/v/v2/easycla) for a complete product
 overview.
 
 ## License

src/app/app.component.html

@@ -4,6 +4,6 @@
 
 <div class="fix-header-margin">
   <app-alert></app-alert>
-    <router-outlet></router-outlet>
+  <router-outlet></router-outlet>
 </div>
 <lfx-footer></lfx-footer>

src/app/app.component.scss

@@ -4,4 +4,4 @@
   margin-top: 35px;
   padding: 25px 0 0 0;
   min-height: calc(100vh - 125px);
-}
+}

src/app/app.component.ts

@@ -1,10 +1,8 @@
 // Copyright The Linux Foundation and each contributor to CommunityBridge.
 // SPDX-License-Identifier: MIT
 
-
-// To run this project you required node version 12.0.0 or higher, yarn 1.13.0 or higher.
-
 import { Component } from '@angular/core';
+import { LfxHeaderService } from './shared/services/lfx-header.service';
 import { environment } from 'src/environments/environment';
 
 @Component({
@@ -13,9 +11,19 @@ import { environment } from 'src/environments/environment';
   styleUrls: ['./app.component.scss'],
 })
 export class AppComponent {
+  title = 'easycla-contributor-console';
+  hasExpanded: boolean;
+  links: any[];
+
+  constructor(private lfxHeaderService: LfxHeaderService) {}
+
+  onToggled() {
+    this.hasExpanded = !this.hasExpanded;
+  }
 
   ngOnInit() {
     this.mountHeader();
+    this.hasExpanded = true;
   }
 
   private mountHeader(): void {

src/app/config/app-settings.ts

@@ -49,5 +49,4 @@ export class AppSettings {
     public static GITLAB_DOMAIN = "gitlab.com";
     public static GITLAB = "Gitlab";
     public static SUPPORT_TICKET_LINK = 'https://jira.linuxfoundation.org/plugins/servlet/theme/portal/4/create/143';
-    public static ACCEPTED_TERMS = 'acceptedTerms';
 }

src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html

@@ -102,14 +102,8 @@
               </div>
             </div>
           </div>
-        
-          <div class="row justify-content-center" style="margin: 30px 0 30px 0;">
-            <div class="col-12">
-              <app-consent (termAccepted)="hasTermAccepted = $event"></app-consent>
-            </div>
-          </div>
 
-          <div class="col-12 buttons">
+          <div class="col-12 buttons" [ngClass]="{ 'mt-30': selectedCompany }">
             <div class="row justify-content-center align-items-center">
               <div class="col-xs-6 col-sm-6 col-md-4 col-lg-3">
                 <button
@@ -125,9 +119,9 @@
                 <button
                   tabindex="-1"
                   type="button"
-                  [disabled]="selectedCompany === '' || !hasTermAccepted"
+                  [disabled]="selectedCompany === ''"
                   class="btn inactive"
-                  [ngClass]="{ active: selectedCompany !== '' && hasTermAccepted }"
+                  [ngClass]="{ active: selectedCompany !== '' }"
                   (click)="onClickProceed()"
                 >
                   Proceed

src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.scss

@@ -37,6 +37,10 @@
       position: relative;
     }
 
+    .mt-30 {
+      margin-top: 30px !important;
+    }
+
     .building-icon {
       float: right;
       margin-top: -32px;
@@ -105,6 +109,7 @@
     }
 
     .buttons {
+      margin-top: 100px;
       .btn {
         text-align: center;
         background: #ffffff;

src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.ts

@@ -58,7 +58,6 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
   mySubscription: Subscription;
   proccedWithExistingOrganization: Subscription;
   attempt: boolean;
-  hasTermAccepted = false;
 
   constructor(
     private route: ActivatedRoute,

src/app/modules/dashboard/container/cla-dashboard/cla-dashboard.component.html

@@ -49,6 +49,7 @@
                     </div>
                 </div>
             </div>
+
             <div class="deskop-view">
                 <div class="row">
                     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">

src/app/modules/individual-contributor/component/docusign-signature-model/docusign-signature-model.component.html

@@ -33,21 +33,15 @@
                     </div>
                 </div>
 
-                <div class="row justify-content-center" style="margin: 30px 0 30px 0;">
-                    <div class="col-12">
-                      <app-consent (termAccepted)="hasTermAccepted = $event"></app-consent>
-                    </div>
-                  </div>
-
                 <div class="row buttons justify-content-center align-items-center">
                     <div class="col-xs-6 col-sm-6 col-md-5 col-lg-5">
                         <button tabindex="-1" type="button" class="btn" (click)="onClickBack()">
                             GO BACK
                         </button>
                     </div>
                     <div class="col-xs-6 col-sm-6 col-md-5 col-lg-5">
-                        <button tabindex="-1" type="button" [disabled]="status!=='Completed' || !hasTermAccepted"
-                            [ngClass]="{'blue':status==='Completed' && hasTermAccepted}" class="btn gray" (click)="onClickSignCLA()">
+                        <button tabindex="-1" type="button" [disabled]="status!=='Completed'"
+                            [ngClass]="{'blue':status==='Completed'}" class="btn gray" (click)="onClickSignCLA()">
                             SIGN CLA</button>
                     </div>
                 </div>