WIP: ncats branch attempt in merge angular upgrade

src/app/core/admin/cv-management/cv-term-dialog/cv-term-dialog.component.scss

@@ -1,85 +1,87 @@
 .form-row {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-end;
+    width:100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
 }
 
 .double-row {
-  justify-content: space-evenly;
+    justify-content: space-evenly;
 }
 
 .validation {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  margin-bottom: 5px;
+display:flex;
+flex-direction: column;
+width: 100%;  
+margin-bottom:5px;
 }
 
 .ERROR {
-  background-color: var(--regular-red-color);
-  color: var(--error-dialog-color);
-  background-color: var(--error-dialog-bg-color);
-  padding: 4px 5px;
-  margin-right: 5px;
-  border-radius: 5px;
+        background-color: var(--regular-red-color);
+        color: var(--error-dialog-color);
+        background-color: var(--error-dialog-bg-color);
+        padding: 4px 5px;
+        margin-right: 5px;
+        border-radius: 5px;
 }
 
 .WARNING {
-  color: var(--warning-dialog-color);
-  background-color: var(--warning-dialog-bg-color);
-  padding: 4px 5px;
-  margin-right: 5px;
-  border-radius: 5px;
+    color: var(--warning-dialog-color);
+    background-color: var(--warning-dialog-bg-color);
+    padding: 4px 5px;
+    margin-right: 5px;
+    border-radius: 5px;
 }
 
 .INFO {
-  color: var(--regular-black-color);
-  background-color: var(--regular-lightgray-color);
-  padding: 4px 5px;
-  margin-right: 5px;
-  border-radius: 5px;
+    color: var(--regular-black-color);
+    background-color: var(--regular-lightgray-color);
+    padding: 4px 5px;
+    margin-right: 5px;
+    border-radius: 5px;
 }
 
 .message {
-  padding-top: 5px;
-  padding-left: 15px;
+    padding-top: 5px;
+    padding-left: 15px;
 }
 .content-fix {
-  min-height: 250px;
-  padding: 15px 20px;
+    min-height: 250px;
+    padding: 15px 20px;
+    /* __aw__ see if need for ncats branch */
+    overflow: scroll;
 }
 
 .src-column {
-  display: flex;
-  flex-direction: column;
-  width: 50%;
+    display: flex;
+    flex-direction:column;
+    width:50%;   
 }
 
 .actions {
-  height: 75px;
+    height: 75px;
 }
 
 .title {
-  height: 42px;
+    height: 42px;
   font-size: 32px;
   font-weight: 500;
   letter-spacing: normal;
   margin-bottom: 20px;
 }
 
 .loading-container {
-  max-height: calc(100% - 150px);
-  min-height: 250px;
-  width: 100%;
-  align-content: center;
+    max-height: calc(100% - 150px);
+    min-height: 250px;
+    width: 100%;
+    align-content: center;
 }
 
 ::ng-deep .mat-mdc-dialog-container .mdc-dialog__surface {
-  height: unset !important;
+    height: unset !important;
   max-height: 90vh;
 }
 
 .delete-icon {
-  margin-bottom: 20px;
+    margin-bottom: 20px;
 }

src/app/core/app.module.ts

@@ -121,11 +121,20 @@ import { UserQueryListDialogComponent } from '@gsrs-core/bulk-search/user-query-
 import { ListCreateDialogComponent } from '@gsrs-core/substances-browse/list-create-dialog/list-create-dialog.component';
 import { ImportScrubberComponent } from '@gsrs-core/admin/import-management/import-scrubber/import-scrubber.component';
 import { PrivacyStatementModule } from './privacy-statement/privacy-statement.module';
+
+// ncats branch begin 
+import { TopContentSpacerComponent } from './spacers/top-content-spacer.component';
+import { BottomContentSpacerComponent } from './spacers/bottom-content-spacer.component';
+import { FooterComponent } from './footer/footer.component';
+
+// ncats branch end 
+
 import { CsrfTokenInterceptor } from '@gsrs-core/auth/csrf-token.interceptor';
 import { CrossEntitySearchModule } from '../fda/cross-entity-search/cross-entity-search.module';
 import { FileSelectModule } from './file-select/file-select.module';
 import { NitrosamineStandaloneModule } from './nitrosamine-standalone/nitrosamine-standalone.module';
 import { MatDividerModule } from '@angular/material/divider';
+import { TopBannerComponent } from './misc/top-banner.component';
 @NgModule({
   declarations: [
     AppComponent,
@@ -165,8 +174,11 @@ import { MatDividerModule } from '@angular/material/divider';
     MergeActionDialogComponent,
     UserQueryListDialogComponent,
     ListCreateDialogComponent,
-    ImportScrubberComponent
-
+    ImportScrubberComponent,
+    TopBannerComponent,
+    TopContentSpacerComponent,
+    BottomContentSpacerComponent,
+    FooterComponent
   ],
   imports: [
     BrowserModule,

src/app/core/auth/login/login.component.html

@@ -1,5 +1,6 @@
 <div class="login-container">
-  <mat-card class="login-card" *ngIf="isLoaded">
+  <!-- ncats branch -->
+  <mat-card class="login-card" *ngIf="isLoaded && showLogin">
     <mat-card-title> Login </mat-card-title>
     <mat-card-content class="login-card-content">
       <form class="login-form" [formGroup]="loginForm">
@@ -33,7 +34,7 @@
       </button>
     </mat-card-actions>
   </mat-card>
-
+  
   <br />
   <div
     *ngIf="loadedComponents && loadedComponents.userRegistration"

src/app/core/auth/login/login.component.ts

@@ -32,6 +32,9 @@ export class LoginComponent implements OnInit, OnDestroy {
   private newuserinfo = {};
   private emailFormUserRegConf: any = undefined;
   public emailFormUserRegActive: boolean = false;
+  // ncats branch begin
+  public showLogin = false;
+ // ncats branch end
 
   constructor(
     private authService: AuthService,
@@ -53,7 +56,21 @@ export class LoginComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.loadingService.setLoading(true);
-    // As we develop more types of userRegistration, make a utility service to provide configuration information.  
+    // As we develop more types of userRegistration, make a utility service to provide configuration information. 
+
+    // ncats branch begin
+
+    if(this.configService.configData.showLogin === undefined) {
+      this.showLogin = true;
+    } else {
+      if(this.configService.configData.showLogin === false) { 
+        this.showLogin = false;
+      } else {
+        this.showLogin = true;
+      }
+    }
+    // ncats branch end
+
     this.loadedComponents = this.configService.configData.loadedComponents || null;
     if(typeof this.configService.configData.userRegistration !== "undefined" ) {
       this.emailFormUserRegConf =

src/app/core/base/base.component.html

@@ -1,5 +1,14 @@
+<!-- ncats branch begin (2 open divs) -->
+<div class="base-page-wrapper">
+  <div *ngIf = "showTopBanner" class="top-banner"> 
+    <app-top-banner></app-top-banner>
+  </div>
+
+  <div [ngClass]="['base-menu-wrapper', (showTopBanner) ? 'base-menu-wrapper-with-top-banner': '']">
+
+    <!-- ncats branch begin end -->
 <mat-toolbar
-  class="mat-elevation-z3"
+  class="mat-elevation-z3"  
   color="primary"
   *ngIf="
     showHeaderBar === 'true' &&
@@ -294,6 +303,8 @@
   >
   </app-substance-text-search>
   <div class="user-section">
+   <!-- ncats branch begin --> 
+   <div *ngIf="showLoginButton">
     <button
       mat-button
       class="login-link"
@@ -302,6 +313,7 @@
     >
       Login
     </button>
+   </div>    <!-- ncats branch end --> 
     <div class="logged-in" *ngIf="auth">
       <div class="user-actions">
         <button
@@ -392,6 +404,39 @@
 <div *ngIf="isPfdaVersion">
   <app-pfda-toolbar></app-pfda-toolbar>
 </div>
+
+<div [ngClass]="['base-main-wrapper', (showTopBanner) ? 'base-main-wrapper-with-top-banner': '']">
+
 <app-session-expiration></app-session-expiration>
 <app-loading></app-loading>
+
+<!--
+
+ncats branch begin, probably not needed.
+
+<div *ngIf = "showTopBanner"> 
+    <app-top-content-spacer></app-top-content-spacer>
+</div> -->
+
+<!-- <div style="height: 92px; clear: both;">&nbsp;</div>
+
+ncats branch end
+ -->
+
 <router-outlet></router-outlet>
+
+  <!-- ncats branch begin --> 
+  <div *ngIf="showFooter">
+      <app-bottom-content-spacer></app-bottom-content-spacer>
+  </div>
+</div>
+</div>   <!-- ncats branch fragment ngClass.2 bottom -->
+
+</div>
+
+<div *ngIf="showFooter" class="footer-wrapper">
+  <app-footer></app-footer>
+</div>
+ <!-- ncats branch end --> 
+
+

src/app/core/base/base.component.scss

@@ -1,5 +1,46 @@
 @use "../../../styles/variables" as *;
 
+/* ncats branch begin */
+.base-page-wrapper {
+  width: 100%;
+  display: inline;
+  position: fixed;
+  top: 0px;
+}
+
+.base-menu-wrapper {
+  width: 100%;
+  display: inline;
+
+  position: fixed;
+  top: 0px;
+}
+
+.base-menu-wrapper-with-top-banner mat-toolbar{
+  top: 32px !important; 
+}
+
+.base-main-wrapper {
+  overflow: scroll;
+  height:100%;
+  width: 100%;
+  display: inline;
+  position: fixed;
+  top: 64px;
+}
+
+.base-main-wrapper-with-top-banner {
+  top: 102px !important; 
+}
+
+.base-main-notification-wrapper {
+  width: 100%;
+  display: inline;
+  position: fixed;
+
+}
+/* ncats branch end */
+
 .version {
   color: var(--version-text-color);
   font-size: 10pt;
@@ -252,3 +293,5 @@ button.mat-mdc-button.top-button {
     display: none !important;
   }
 }
+
+