From 9eefff3abe68820e692f158fe9a6c488ec673938 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 08:36:26 -0700
Subject: [PATCH 01/28] update deps
---
.npmrc | 1 +
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.npmrc b/.npmrc
index fcdbb5524..55d5e28d6 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
@ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/
+//code.usgs.gov/api/v4/packages/npm/:_authToken=glpat-A8C9_MkxAzPXybLUQhE1
diff --git a/package-lock.json b/package-lock.json
index 52b2f63e7..b0f5ac4ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^18.23.1",
- "@ghsc/nshmp-template": "^18.2.0",
+ "@ghsc/nshmp-lib-ng": "^30.2.0",
+ "@ghsc/nshmp-template": "^20.4.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "18.23.1",
- "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-18.23.1.tgz",
- "integrity": "sha1-Tl0NKxnzEuNXYg52VYKCLgb5HUw=",
+ "version": "30.2.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.2.0.tgz",
+ "integrity": "sha1-Zw3TDLV0RdeIsXxZbObOycAz7gY=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "18.2.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-18.2.0.tgz",
- "integrity": "sha1-iR13fpkP/V5I6xH2kWTlP8xRLXE=",
+ "version": "20.4.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.4.0.tgz",
+ "integrity": "sha1-YveV6GFztejqQZSU+buTomZlYt8=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 3f7c8fe03..f7900b2cd 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^18.23.1",
- "@ghsc/nshmp-template": "^18.2.0",
+ "@ghsc/nshmp-lib-ng": "^30.2.0",
+ "@ghsc/nshmp-template": "^20.4.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From e13d33709f2c0b4d2c8d652674995dc286aa99ea Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 09:17:22 -0700
Subject: [PATCH 02/28] change color
---
.../src/app/dashboard/app.component.scss | 1 -
.../components/content/content.component.html | 2 +-
.../control-panel.component.html | 2 +-
.../src/app/dev/dashboard/app.component.scss | 1 -
.../components/content/content.component.html | 2 +-
.../components/content/content.component.html | 2 +-
.../control-panel.component.html | 1 -
.../components/content/content.component.html | 2 +-
.../components/content/content.component.html | 2 +-
.../components/content/content.component.html | 2 +-
.../event-parameters.component.html | 1 -
.../path-parameters.component.html | 1 -
.../control-panel.component.html | 4 +-
.../components/content/content.component.html | 2 +-
.../components/content/content.component.html | 2 +-
.../components/content/content.component.html | 1 -
.../components/content/content.component.scss | 4 +-
.../components/config/config.component.scss | 2 +-
.../components/content/content.component.html | 1 +
.../app/internal/dashboard/app.component.scss | 1 -
.../components/content/content.component.html | 2 +-
.../components/data/data.component.scss | 4 +-
.../components/content/content.component.scss | 2 +-
.../components/content/content.component.html | 2 +-
.../control-panel.component.html | 16 ++---
.../components/content/content.component.html | 2 +-
.../nshmp-apps/src/styles/_code-block.scss | 4 +-
.../nshmp-apps/src/styles/_dashboards.scss | 60 -------------------
projects/nshmp-apps/src/styles/_forms.scss | 2 +-
.../nshmp-apps/src/styles/_scrolling.scss | 24 +++++---
30 files changed, 47 insertions(+), 107 deletions(-)
delete mode 100644 projects/nshmp-apps/src/styles/_dashboards.scss
diff --git a/projects/nshmp-apps/src/app/dashboard/app.component.scss b/projects/nshmp-apps/src/app/dashboard/app.component.scss
index 0f4dc4d31..e69de29bb 100644
--- a/projects/nshmp-apps/src/app/dashboard/app.component.scss
+++ b/projects/nshmp-apps/src/app/dashboard/app.component.scss
@@ -1 +0,0 @@
-@import '../../styles/dashboards';
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/components/content/content.component.html b/projects/nshmp-apps/src/app/designmaps/rtgm/components/content/content.component.html
index 6ed59d79a..1a94fa2fa 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel/control-panel.component.html
index 146d47c37..03571db04 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel/control-panel.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<mat-tab label="Manual Input" bodyClass="padding-top-2">
<app-control-panel-input />
</mat-tab>
diff --git a/projects/nshmp-apps/src/app/dev/dashboard/app.component.scss b/projects/nshmp-apps/src/app/dev/dashboard/app.component.scss
index 9725bdd50..e69de29bb 100644
--- a/projects/nshmp-apps/src/app/dev/dashboard/app.component.scss
+++ b/projects/nshmp-apps/src/app/dev/dashboard/app.component.scss
@@ -1 +0,0 @@
-@import '../../../styles/dashboards';
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
index 960fb1952..3aefc5531 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.html b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.html
index cc0344672..d7c9374e4 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plot tab -->
<mat-tab label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/control-panel/control-panel.component.html
index 84de955a7..9c264a431 100644
--- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/control-panel/control-panel.component.html
@@ -54,7 +54,6 @@
<!-- Truncation -->
<mat-checkbox
- color="primary"
class="margin-left-1 truncation-checkbox"
[formControl]="form.controls.truncation"
>
diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
index 2fcea6416..ee4cbcd4b 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
index ff48cf998..5f245ea18 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
index 03f25db20..83dc659e8 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
index 8fb3b9cf3..02a33ef73 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
@@ -78,7 +78,6 @@
<div class="grid-col-8">
<mat-checkbox
class="down-dip-checkbox"
- color="primary"
[formControl]="form.controls.zHypCentered"
>
Centered down-dip
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
index 06b0961a4..039313107 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
@@ -66,7 +66,6 @@
<div class="grid-row">
<mat-checkbox
class="grid-col-12 rjb-rrup-checkbox"
- color="primary"
[formControl]="form.controls.derivePathParams"
>
Derive R<sub>JB</sub> and R<sub>RUP</sub>
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.html
index 2a0dbe5dc..655ace2f1 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.html
@@ -64,7 +64,7 @@
<!-- Target selector -->
<div class="disagg-target-selector">
<mat-radio-group
- color="primary"
+ color="accent"
[formControl]="form.controls.disaggTarget"
>
<mat-radio-button
@@ -106,7 +106,7 @@
<div class="grid-col-6 center-y">
<mat-checkbox
- color="primary"
+ color="accent"
class="padding-left-1"
[formControl]="form.controls.maxDirection"
>
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
index 50e496fd4..beb09c4cb 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
index 37f191ef2..1b255322c 100644
--- a/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
index 2c059b466..e3d7925dd 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
@@ -18,7 +18,6 @@
<mat-slide-toggle
class="logs-toolbar-item"
- color="primary"
[formControl]="form?.controls?.autoRefresh"
(change)="onRefreshChange($event)"
>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
index b691b3623..70c0c2cd2 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
@@ -26,7 +26,7 @@ $toolbarHeight: 3.5em;
}
.logs-toolbar {
- background-color: mat.m2-get-color-from-palette($nshmp-accent);
+ background-color: mat.m2-get-color-from-palette($nshmp-neutral);
font-size: clamp(8px, 6px + 1vw, 14px);
font-weight: normal;
height: $toolbarHeight;
@@ -68,5 +68,5 @@ $toolbarHeight: 3.5em;
}
body.dark-mode :host .logs-toolbar {
- background-color: mat.m2-get-color-from-palette($nshmp-accent, 900);
+ background-color: mat.m2-get-color-from-palette($nshmp-neutral, 900);
}
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
index 04f64152b..4af3df615 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
@@ -43,5 +43,5 @@
tr:hover {
cursor: pointer;
- background-color: mat.m2-get-color-from-palette($nshmp-accent);
+ background-color: mat.m2-get-color-from-palette($nshmp-neutral);
}
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html
index 29ed91b7f..e183e17f4 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html
@@ -1,5 +1,6 @@
<mat-tab-group
class="height-full"
+ color="accent"
[selectedIndex]="appService.activeTab$ | async"
>
<mat-tab label="Run nshmp-haz">
diff --git a/projects/nshmp-apps/src/app/internal/dashboard/app.component.scss b/projects/nshmp-apps/src/app/internal/dashboard/app.component.scss
index 9725bdd50..e69de29bb 100644
--- a/projects/nshmp-apps/src/app/internal/dashboard/app.component.scss
+++ b/projects/nshmp-apps/src/app/internal/dashboard/app.component.scss
@@ -1 +0,0 @@
-@import '../../../styles/dashboards';
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/content/content.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/content/content.component.html
index 0f7580af1..f82d58a2e 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
index e63791e51..bffd9d775 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
@@ -7,11 +7,11 @@ td {
body.dark-mode :host {
table {
- color: mat.m2-get-color-from-palette($nshmp-accent, 200);
+ color: mat.m2-get-color-from-palette($nshmp-neutral, 200);
th,
td {
- border: 1px solid mat.m2-get-color-from-palette($nshmp-accent, 700);
+ border: 1px solid mat.m2-get-color-from-palette($nshmp-neutral, 700);
border-left: 0;
border-right: 0;
}
diff --git a/projects/nshmp-apps/src/app/services/components/content/content.component.scss b/projects/nshmp-apps/src/app/services/components/content/content.component.scss
index 2ebdb3c72..6dbd0ce25 100644
--- a/projects/nshmp-apps/src/app/services/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/services/components/content/content.component.scss
@@ -116,7 +116,7 @@ mat-sidenav.collapsed {
body.dark-mode :host {
mat-sidenav {
- background-color: mat.m2-get-color-from-palette($nshmp-accent, 800);
+ background-color: mat.m2-get-color-from-palette($nshmp-neutral, 800);
}
.card-section h4 {
diff --git a/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html b/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
index aea11d8ac..2774d18e6 100644
--- a/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
index a2253b5e1..43d606542 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
@@ -11,7 +11,7 @@
<!-- NSHM boundary layer toggle -->
<div class="grid-col-12 nshm-boundary-toggle">
<mat-slide-toggle
- color="primary"
+ color="accent"
[formControl]="formGroup.controls.hasNshmBoundaryLayer"
>
NSHM Border
@@ -22,7 +22,7 @@
<!-- Test sites layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="primary"
+ color="accent"
[formControl]="formGroup.controls.hasTestSitesLayer"
>
Test Sites
@@ -38,7 +38,7 @@
<!-- Decollement layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="primary"
+ color="accent"
[formControl]="formGroup.controls.hasDecollementLayer"
>
Décollement Sections
@@ -49,7 +49,7 @@
<!-- Fault sections layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="primary"
+ color="accent"
[formControl]="formGroup.controls.hasFaultSectionLayer"
>
Fault Sections
@@ -60,7 +60,7 @@
<!-- Interface sections layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="primary"
+ color="accent"
[formControl]="formGroup.controls.hasInterfaceSectionsLayer"
>
Interface Sections
@@ -71,7 +71,7 @@
<!-- Zone sources layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="primary"
+ color="accent"
[formControl]="formGroup.controls.hasZoneSourcesLayer"
>
Zone Sources
@@ -83,7 +83,7 @@
<div>
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="primary"
+ color="accent"
[formControl]="formGroup.controls.hasEarthquakesLayer"
>
Latest Earthquakes
@@ -131,7 +131,7 @@
<div>
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="primary"
+ color="accent"
[formControl]="formGroup.controls.hasHazardTiles"
>
Hazard Map
diff --git a/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html b/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
index edd8a3d07..e0a46f431 100644
--- a/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full">
+<mat-tab-group class="height-full" color="accent">
<!-- Plots tab -->
<mat-tab label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/styles/_code-block.scss b/projects/nshmp-apps/src/styles/_code-block.scss
index a71ffb64c..577732142 100644
--- a/projects/nshmp-apps/src/styles/_code-block.scss
+++ b/projects/nshmp-apps/src/styles/_code-block.scss
@@ -2,7 +2,7 @@
@import '@ghsc/nshmp-template/styles/variables';
.code-block {
- background-color: mat.m2-get-color-from-palette($nshmp-accent);
+ background-color: mat.m2-get-color-from-palette($nshmp-neutral);
font-size: clamp(8px, 6px + 1vw, 14px);
line-height: clamp(0.75em, 0.5em + 1vw, 1.5em);
overflow-x: scroll;
@@ -10,5 +10,5 @@
}
body.dark-mode .code-block {
- background-color: mat.m2-get-color-from-palette($nshmp-accent, 700);
+ background-color: mat.m2-get-color-from-palette($nshmp-neutral, 700);
}
diff --git a/projects/nshmp-apps/src/styles/_dashboards.scss b/projects/nshmp-apps/src/styles/_dashboards.scss
deleted file mode 100644
index de6d86685..000000000
--- a/projects/nshmp-apps/src/styles/_dashboards.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* Styling for the dashboards
-*/
-@use '@angular/material' as mat;
-@import '@ghsc/nshmp-template/styles/variables';
-
-/* ---- Dashboards ---- */
-.dashboard {
- background-repeat: no-repeat;
- height: 100%;
- overflow: auto;
- width: 100%;
-
- .app-section {
- margin-top: clamp(1em, 1rem + 1vw, 3em);
-
- .app-section--title {
- font-size: clamp(20px, 10px + 1vw, 32px);
- font-weight: 300;
- margin: 0 16px;
- }
- }
-
- .dashboard--description {
- font-size: clamp(18px, 10px + 1vw, 24px);
- font-weight: 300;
- margin: 18px;
- }
-
- .dashboard--title {
- font-size: clamp(32px, 32px + 1vw, 64px);
- font-weight: 550;
- margin: clamp(24px, 18px + 1vw, 64px) 16px 16px 14px;
- }
-
- mat-card {
- margin: 1em;
- }
-
- mat-card:hover {
- background-color: #dedede;
- }
-
- mat-card-content {
- font-size: clamp(14px, 10px + 1vw, 22px);
- font-weight: 500;
- }
-}
-
-body:not(.dark-mode) :host {
- mat-card {
- background-color: mat.m2-get-color-from-palette($nshmp-accent);
- }
-}
-
-body.dark-mode :host {
- mat-card:hover {
- background-color: mat.m2-get-color-from-palette($nshmp-accent, 700);
- }
-}
diff --git a/projects/nshmp-apps/src/styles/_forms.scss b/projects/nshmp-apps/src/styles/_forms.scss
index fef64fd5c..5c3e21193 100644
--- a/projects/nshmp-apps/src/styles/_forms.scss
+++ b/projects/nshmp-apps/src/styles/_forms.scss
@@ -17,7 +17,7 @@ nshmp-template-control-panel form {
position: absolute;
width: $side-panel-width;
z-index: 10;
- background-color: mat.m2-get-color-from-palette($nshmp-accent);
+ background-color: mat.m2-get-color-from-palette($nshmp-neutral);
}
.form-buttons.full-width {
diff --git a/projects/nshmp-apps/src/styles/_scrolling.scss b/projects/nshmp-apps/src/styles/_scrolling.scss
index 35f7d9882..2db5e9e40 100644
--- a/projects/nshmp-apps/src/styles/_scrolling.scss
+++ b/projects/nshmp-apps/src/styles/_scrolling.scss
@@ -9,12 +9,17 @@ $spacing: 1em !default;
/* Horizontal Scrolling can be used to wrap tables and make them responsive */
.horizontal-scrolling {
- background: linear-gradient(to right, #fff 30%, rgba(255, 255, 255, 0)),
+ background:
+ linear-gradient(to right, #fff 30%, rgba(255, 255, 255, 0)),
linear-gradient(to left, #fff 30%, rgba(255, 255, 255, 0)) right,
linear-gradient(to right, rgba(0, 0, 0, 0.15), transparent 70%),
linear-gradient(to left, rgba(0, 0, 0, 0.15), transparent 70%) right;
background-repeat: no-repeat;
- background-size: 20px 100%, 20px 100%, 10px 100%, 10px 100%;
+ background-size:
+ 20px 100%,
+ 20px 100%,
+ 10px 100%,
+ 10px 100%;
background-attachment: local, local, scroll, scroll;
margin: $spacing 0 0;
overflow: auto;
@@ -26,20 +31,21 @@ $spacing: 1em !default;
}
}
-$dark-mode-accent: mat.m2-get-color-from-palette($nshmp-accent, 800);
+$dark-mode-accent: mat.m2-get-color-from-palette($nshmp-neutral, 800);
body.dark-mode {
.horizontal-scrolling {
- background: linear-gradient(
- to right,
- $dark-mode-accent 30%,
- rgba(0, 0, 0, 0)
- ),
+ background:
+ linear-gradient(to right, $dark-mode-accent 30%, rgba(0, 0, 0, 0)),
linear-gradient(to left, $dark-mode-accent 30%, rgba(0, 0, 0, 0)) right,
linear-gradient(to right, rgba(0, 0, 0, 0.25), transparent 70%),
linear-gradient(to left, rgba(0, 0, 0, 0.25), transparent 70%) right;
background-repeat: no-repeat;
- background-size: 20px 100%, 20px 100%, 10px 100%, 10px 100%;
+ background-size:
+ 20px 100%,
+ 20px 100%,
+ 10px 100%,
+ 10px 100%;
background-attachment: local, local, scroll, scroll;
}
}
--
GitLab
From 0197417e2644a5b51da8857a0521b278ec88e8d3 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 09:17:28 -0700
Subject: [PATCH 03/28] update dep
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b0f5ac4ef..e47d38c76 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.2.0",
- "@ghsc/nshmp-template": "^20.4.0",
+ "@ghsc/nshmp-lib-ng": "^30.3.0",
+ "@ghsc/nshmp-template": "^20.5.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.2.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.2.0.tgz",
- "integrity": "sha1-Zw3TDLV0RdeIsXxZbObOycAz7gY=",
+ "version": "30.3.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.3.0.tgz",
+ "integrity": "sha1-9QlqFgYK5PkULEdjl3tPTljVkug=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.4.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.4.0.tgz",
- "integrity": "sha1-YveV6GFztejqQZSU+buTomZlYt8=",
+ "version": "20.5.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.5.0.tgz",
+ "integrity": "sha1-XFzllPElJnXxuplxMYByUUUoLhM=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index f7900b2cd..e6d4838de 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.2.0",
- "@ghsc/nshmp-template": "^20.4.0",
+ "@ghsc/nshmp-lib-ng": "^30.3.0",
+ "@ghsc/nshmp-template": "^20.5.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 29ae73f19a0beb74fdaa79fd3cb95f62e0e0f73f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 09:31:01 -0700
Subject: [PATCH 04/28] add providers
---
.../nshmp-apps/src/app/error-pages/404/404.component.spec.ts | 3 ++-
.../nshmp-apps/src/app/error-pages/410/410.component.spec.ts | 3 ++-
.../nshmp-apps/src/app/error-pages/500/500.component.spec.ts | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/projects/nshmp-apps/src/app/error-pages/404/404.component.spec.ts b/projects/nshmp-apps/src/app/error-pages/404/404.component.spec.ts
index 067a50e76..8c85b4f25 100644
--- a/projects/nshmp-apps/src/app/error-pages/404/404.component.spec.ts
+++ b/projects/nshmp-apps/src/app/error-pages/404/404.component.spec.ts
@@ -1,4 +1,5 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {provideNoopAnimations} from '@angular/platform-browser/animations';
import {provideRouter} from '@angular/router';
import {Error404Component} from './404.component';
@@ -10,7 +11,7 @@ describe('Error404Component', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [Error404Component],
- providers: [provideRouter([])],
+ providers: [provideRouter([]), provideNoopAnimations()],
}).compileComponents();
});
diff --git a/projects/nshmp-apps/src/app/error-pages/410/410.component.spec.ts b/projects/nshmp-apps/src/app/error-pages/410/410.component.spec.ts
index c80da365a..d765c32ef 100644
--- a/projects/nshmp-apps/src/app/error-pages/410/410.component.spec.ts
+++ b/projects/nshmp-apps/src/app/error-pages/410/410.component.spec.ts
@@ -1,4 +1,5 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {provideNoopAnimations} from '@angular/platform-browser/animations';
import {provideRouter} from '@angular/router';
import {Error410Component} from './410.component';
@@ -10,7 +11,7 @@ describe('Error410Component', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [Error410Component],
- providers: [provideRouter([])],
+ providers: [provideRouter([]), provideNoopAnimations()],
}).compileComponents();
});
diff --git a/projects/nshmp-apps/src/app/error-pages/500/500.component.spec.ts b/projects/nshmp-apps/src/app/error-pages/500/500.component.spec.ts
index ecd1d0f3c..2512b8b74 100644
--- a/projects/nshmp-apps/src/app/error-pages/500/500.component.spec.ts
+++ b/projects/nshmp-apps/src/app/error-pages/500/500.component.spec.ts
@@ -1,4 +1,5 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {provideNoopAnimations} from '@angular/platform-browser/animations';
import {provideRouter} from '@angular/router';
import {Error500Component} from './500.component';
@@ -10,7 +11,7 @@ describe('Error500Component', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [Error500Component],
- providers: [provideRouter([])],
+ providers: [provideRouter([]), provideNoopAnimations()],
}).compileComponents();
});
--
GitLab
From 5c92baf6080b25dfdd6a98f3141ef6f6da0005a5 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 10:19:00 -0700
Subject: [PATCH 05/28] update dep
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index e47d38c76..3ecdae7be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
"@ghsc/nshmp-lib-ng": "^30.3.0",
- "@ghsc/nshmp-template": "^20.5.0",
+ "@ghsc/nshmp-template": "^20.6.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.5.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.5.0.tgz",
- "integrity": "sha1-XFzllPElJnXxuplxMYByUUUoLhM=",
+ "version": "20.6.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.6.0.tgz",
+ "integrity": "sha1-5CYbdEAdhr+nr3s7C2w023OjLJc=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index e6d4838de..562b4f799 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
"@ghsc/nshmp-lib-ng": "^30.3.0",
- "@ghsc/nshmp-template": "^20.5.0",
+ "@ghsc/nshmp-template": "^20.6.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From b1a8f435970ef9275c057cb2e6fb895bad3a0a25 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 13:59:10 -0700
Subject: [PATCH 06/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 3ecdae7be..70fbcf710 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.3.0",
- "@ghsc/nshmp-template": "^20.6.0",
+ "@ghsc/nshmp-lib-ng": "^30.5.0",
+ "@ghsc/nshmp-template": "^20.9.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.3.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.3.0.tgz",
- "integrity": "sha1-9QlqFgYK5PkULEdjl3tPTljVkug=",
+ "version": "30.5.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.5.0.tgz",
+ "integrity": "sha1-niZ8LRIyLHyIwYR6x3MFX/Kjxl0=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.6.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.6.0.tgz",
- "integrity": "sha1-5CYbdEAdhr+nr3s7C2w023OjLJc=",
+ "version": "20.9.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.9.0.tgz",
+ "integrity": "sha1-HuThX20FiOdFacKFUqLtFJP9QwM=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 562b4f799..8c07b3a8d 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.3.0",
- "@ghsc/nshmp-template": "^20.6.0",
+ "@ghsc/nshmp-lib-ng": "^30.5.0",
+ "@ghsc/nshmp-template": "^20.9.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From bb5f966c41449a4b0901363057ad10196ed3b042 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 13:59:43 -0700
Subject: [PATCH 07/28] change color palette
---
.../check-haz-jobs/components/content/content.component.scss | 4 ++--
.../submit-haz-jobs/components/config/config.component.scss | 2 +-
.../geophysical-profiles/components/data/data.component.scss | 4 ++--
.../app/services/components/content/content.component.scss | 2 +-
projects/nshmp-apps/src/styles/_code-block.scss | 4 ++--
projects/nshmp-apps/src/styles/_forms.scss | 2 +-
projects/nshmp-apps/src/styles/_scrolling.scss | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
index 70c0c2cd2..b691b3623 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
@@ -26,7 +26,7 @@ $toolbarHeight: 3.5em;
}
.logs-toolbar {
- background-color: mat.m2-get-color-from-palette($nshmp-neutral);
+ background-color: mat.m2-get-color-from-palette($nshmp-accent);
font-size: clamp(8px, 6px + 1vw, 14px);
font-weight: normal;
height: $toolbarHeight;
@@ -68,5 +68,5 @@ $toolbarHeight: 3.5em;
}
body.dark-mode :host .logs-toolbar {
- background-color: mat.m2-get-color-from-palette($nshmp-neutral, 900);
+ background-color: mat.m2-get-color-from-palette($nshmp-accent, 900);
}
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
index 4af3df615..04f64152b 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
@@ -43,5 +43,5 @@
tr:hover {
cursor: pointer;
- background-color: mat.m2-get-color-from-palette($nshmp-neutral);
+ background-color: mat.m2-get-color-from-palette($nshmp-accent);
}
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
index bffd9d775..e63791e51 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
@@ -7,11 +7,11 @@ td {
body.dark-mode :host {
table {
- color: mat.m2-get-color-from-palette($nshmp-neutral, 200);
+ color: mat.m2-get-color-from-palette($nshmp-accent, 200);
th,
td {
- border: 1px solid mat.m2-get-color-from-palette($nshmp-neutral, 700);
+ border: 1px solid mat.m2-get-color-from-palette($nshmp-accent, 700);
border-left: 0;
border-right: 0;
}
diff --git a/projects/nshmp-apps/src/app/services/components/content/content.component.scss b/projects/nshmp-apps/src/app/services/components/content/content.component.scss
index 6dbd0ce25..2ebdb3c72 100644
--- a/projects/nshmp-apps/src/app/services/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/services/components/content/content.component.scss
@@ -116,7 +116,7 @@ mat-sidenav.collapsed {
body.dark-mode :host {
mat-sidenav {
- background-color: mat.m2-get-color-from-palette($nshmp-neutral, 800);
+ background-color: mat.m2-get-color-from-palette($nshmp-accent, 800);
}
.card-section h4 {
diff --git a/projects/nshmp-apps/src/styles/_code-block.scss b/projects/nshmp-apps/src/styles/_code-block.scss
index 577732142..a71ffb64c 100644
--- a/projects/nshmp-apps/src/styles/_code-block.scss
+++ b/projects/nshmp-apps/src/styles/_code-block.scss
@@ -2,7 +2,7 @@
@import '@ghsc/nshmp-template/styles/variables';
.code-block {
- background-color: mat.m2-get-color-from-palette($nshmp-neutral);
+ background-color: mat.m2-get-color-from-palette($nshmp-accent);
font-size: clamp(8px, 6px + 1vw, 14px);
line-height: clamp(0.75em, 0.5em + 1vw, 1.5em);
overflow-x: scroll;
@@ -10,5 +10,5 @@
}
body.dark-mode .code-block {
- background-color: mat.m2-get-color-from-palette($nshmp-neutral, 700);
+ background-color: mat.m2-get-color-from-palette($nshmp-accent, 700);
}
diff --git a/projects/nshmp-apps/src/styles/_forms.scss b/projects/nshmp-apps/src/styles/_forms.scss
index 5c3e21193..fef64fd5c 100644
--- a/projects/nshmp-apps/src/styles/_forms.scss
+++ b/projects/nshmp-apps/src/styles/_forms.scss
@@ -17,7 +17,7 @@ nshmp-template-control-panel form {
position: absolute;
width: $side-panel-width;
z-index: 10;
- background-color: mat.m2-get-color-from-palette($nshmp-neutral);
+ background-color: mat.m2-get-color-from-palette($nshmp-accent);
}
.form-buttons.full-width {
diff --git a/projects/nshmp-apps/src/styles/_scrolling.scss b/projects/nshmp-apps/src/styles/_scrolling.scss
index 2db5e9e40..4ff287541 100644
--- a/projects/nshmp-apps/src/styles/_scrolling.scss
+++ b/projects/nshmp-apps/src/styles/_scrolling.scss
@@ -31,7 +31,7 @@ $spacing: 1em !default;
}
}
-$dark-mode-accent: mat.m2-get-color-from-palette($nshmp-neutral, 800);
+$dark-mode-accent: mat.m2-get-color-from-palette($nshmp-accent, 800);
body.dark-mode {
.horizontal-scrolling {
--
GitLab
From 679b3e4cb60b1de9d1b0f5ee793c098a52d38fa4 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 14:19:44 -0700
Subject: [PATCH 08/28] change color
---
.../designmaps/rtgm/components/content/content.component.html | 2 +-
.../rtgm/components/control-panel/control-panel.component.html | 2 +-
.../components/content/content.component.html | 2 +-
.../dynamic-compare/components/content/content.component.html | 2 +-
.../app/gmm/distance/components/content/content.component.html | 2 +-
.../app/gmm/magnitude/components/content/content.component.html | 2 +-
.../app/gmm/spectra/components/content/content.component.html | 2 +-
.../hazard/dynamic/components/content/content.component.html | 2 +-
.../app/hazard/static/components/content/content.component.html | 2 +-
.../submit-haz-jobs/components/content/content.component.html | 1 -
.../components/content/content.component.html | 2 +-
.../app/source/mfd/components/content/content.component.html | 2 +-
.../app/source/rates/components/content/content.component.html | 2 +-
13 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/components/content/content.component.html b/projects/nshmp-apps/src/app/designmaps/rtgm/components/content/content.component.html
index 1a94fa2fa..6ed59d79a 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel/control-panel.component.html
index 03571db04..146d47c37 100644
--- a/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/designmaps/rtgm/components/control-panel/control-panel.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<mat-tab label="Manual Input" bodyClass="padding-top-2">
<app-control-panel-input />
</mat-tab>
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
index 3aefc5531..960fb1952 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.html b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.html
index d7c9374e4..cc0344672 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plot tab -->
<mat-tab label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
index ee4cbcd4b..2fcea6416 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
index 5f245ea18..ff48cf998 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
index 83dc659e8..03f25db20 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
index beb09c4cb..50e496fd4 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
index 1b255322c..37f191ef2 100644
--- a/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html
index e183e17f4..29ed91b7f 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/content/content.component.html
@@ -1,6 +1,5 @@
<mat-tab-group
class="height-full"
- color="accent"
[selectedIndex]="appService.activeTab$ | async"
>
<mat-tab label="Run nshmp-haz">
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/content/content.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/content/content.component.html
index f82d58a2e..0f7580af1 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html b/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
index 2774d18e6..aea11d8ac 100644
--- a/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab labelClass="plots-tab" label="Plots">
<ng-template matTabContent>
diff --git a/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html b/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
index e0a46f431..edd8a3d07 100644
--- a/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group class="height-full" color="accent">
+<mat-tab-group class="height-full">
<!-- Plots tab -->
<mat-tab label="Plots">
<ng-template matTabContent>
--
GitLab
From fec30e25fa3de644cd53de384e1d41aa03172aa2 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 14:19:49 -0700
Subject: [PATCH 09/28] update deps
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 70fbcf710..cdb8bc948 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.5.0",
+ "@ghsc/nshmp-lib-ng": "^30.7.0",
"@ghsc/nshmp-template": "^20.9.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.5.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.5.0.tgz",
- "integrity": "sha1-niZ8LRIyLHyIwYR6x3MFX/Kjxl0=",
+ "version": "30.7.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.7.0.tgz",
+ "integrity": "sha1-Z50U/DRFz5Pk+VnqbDeRoi5xnB4=",
"dependencies": {
"tslib": "^2.3.0"
},
diff --git a/package.json b/package.json
index 8c07b3a8d..d66133723 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.5.0",
+ "@ghsc/nshmp-lib-ng": "^30.7.0",
"@ghsc/nshmp-template": "^20.9.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
--
GitLab
From c3cf92b84ab6891a40786abdaaad8fd4ac79f05a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 14:57:25 -0700
Subject: [PATCH 10/28] change color
---
projects/nshmp-apps/src/styles/_forms.scss | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/projects/nshmp-apps/src/styles/_forms.scss b/projects/nshmp-apps/src/styles/_forms.scss
index fef64fd5c..4ccc09922 100644
--- a/projects/nshmp-apps/src/styles/_forms.scss
+++ b/projects/nshmp-apps/src/styles/_forms.scss
@@ -18,6 +18,7 @@ nshmp-template-control-panel form {
width: $side-panel-width;
z-index: 10;
background-color: mat.m2-get-color-from-palette($nshmp-accent);
+ box-shadow: 0 0 1px rgba(0, 0, 0, 0.8);
}
.form-buttons.full-width {
@@ -37,5 +38,8 @@ nshmp-template-control-panel form {
}
body.dark-mode .form-buttons {
- background-color: #282828;
+ background-color: darken(
+ mat.m2-get-color-from-palette($nshmp-accent, 800),
+ 7
+ );
}
--
GitLab
From f64c4a94050f5feace856211c88f44634f12f101 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 15:00:44 -0700
Subject: [PATCH 11/28] change color
---
.../components/event-parameters/event-parameters.component.html | 1 +
.../components/path-parameters/path-parameters.component.html | 1 +
2 files changed, 2 insertions(+)
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
index 02a33ef73..f8987d501 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
@@ -79,6 +79,7 @@
<mat-checkbox
class="down-dip-checkbox"
[formControl]="form.controls.zHypCentered"
+ color="primary"
>
Centered down-dip
</mat-checkbox>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
index 039313107..06b0961a4 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
@@ -66,6 +66,7 @@
<div class="grid-row">
<mat-checkbox
class="grid-col-12 rjb-rrup-checkbox"
+ color="primary"
[formControl]="form.controls.derivePathParams"
>
Derive R<sub>JB</sub> and R<sub>RUP</sub>
--
GitLab
From 55fb97dd4b2b17e8d0712ecf9a6c9274f5be615e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 15:02:12 -0700
Subject: [PATCH 12/28] change color
---
.../components/control-panel/control-panel.component.html | 6 +-----
.../components/control-panel/control-panel.component.html | 8 --------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.html
index 655ace2f1..8a16b44da 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.html
@@ -63,10 +63,7 @@
<div class="display-flex">
<!-- Target selector -->
<div class="disagg-target-selector">
- <mat-radio-group
- color="accent"
- [formControl]="form.controls.disaggTarget"
- >
+ <mat-radio-group [formControl]="form.controls.disaggTarget">
<mat-radio-button
[value]="DisaggTarget.RETURN_PERIOD"
aria-label="Select return period"
@@ -106,7 +103,6 @@
<div class="grid-col-6 center-y">
<mat-checkbox
- color="accent"
class="padding-left-1"
[formControl]="form.controls.maxDirection"
>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
index 43d606542..67e0d3417 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
@@ -11,7 +11,6 @@
<!-- NSHM boundary layer toggle -->
<div class="grid-col-12 nshm-boundary-toggle">
<mat-slide-toggle
- color="accent"
[formControl]="formGroup.controls.hasNshmBoundaryLayer"
>
NSHM Border
@@ -22,7 +21,6 @@
<!-- Test sites layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="accent"
[formControl]="formGroup.controls.hasTestSitesLayer"
>
Test Sites
@@ -38,7 +36,6 @@
<!-- Decollement layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="accent"
[formControl]="formGroup.controls.hasDecollementLayer"
>
Décollement Sections
@@ -49,7 +46,6 @@
<!-- Fault sections layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="accent"
[formControl]="formGroup.controls.hasFaultSectionLayer"
>
Fault Sections
@@ -60,7 +56,6 @@
<!-- Interface sections layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="accent"
[formControl]="formGroup.controls.hasInterfaceSectionsLayer"
>
Interface Sections
@@ -71,7 +66,6 @@
<!-- Zone sources layer toggle -->
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="accent"
[formControl]="formGroup.controls.hasZoneSourcesLayer"
>
Zone Sources
@@ -83,7 +77,6 @@
<div>
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="accent"
[formControl]="formGroup.controls.hasEarthquakesLayer"
>
Latest Earthquakes
@@ -131,7 +124,6 @@
<div>
<div class="grid-col-12 layer-toggle">
<mat-slide-toggle
- color="accent"
[formControl]="formGroup.controls.hasHazardTiles"
>
Hazard Map
--
GitLab
From 09bf3c947dfc7a128a7faad5d6bcad4e9be1385d Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 15:04:19 -0700
Subject: [PATCH 13/28] add providers
---
.../control-panel/control-panel.component.ts | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.ts b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.ts
index b5df333ff..20f008792 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.ts
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.ts
@@ -1,10 +1,12 @@
-import {AsyncPipe} from '@angular/common';
import {Component, OnDestroy, OnInit} from '@angular/core';
import {ReactiveFormsModule} from '@angular/forms';
import {MatOption} from '@angular/material/core';
import {MatFormField, MatLabel} from '@angular/material/form-field';
import {MatSelect} from '@angular/material/select';
-import {MatSlideToggle} from '@angular/material/slide-toggle';
+import {
+ MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS,
+ MatSlideToggle,
+} from '@angular/material/slide-toggle';
import {NshmpLibNgHazardModelFormComponent} from '@ghsc/nshmp-lib-ng/hazard';
import {ReturnPeriod} from '@ghsc/nshmp-lib-ng/nshmp';
import {FeatureType} from '@ghsc/nshmp-utils-ts/libs/nshmp-haz/www/features-service';
@@ -26,9 +28,16 @@ import {AppService} from '../../services/app.service';
MatFormField,
MatSelect,
MatOption,
- AsyncPipe,
ReactiveFormsModule,
],
+ providers: [
+ {
+ provide: MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS,
+ useValue: {
+ color: 'primary',
+ },
+ },
+ ],
selector: 'app-control-panel',
standalone: true,
styleUrl: './control-panel.component.scss',
--
GitLab
From 9203f4cb10320ee8c1eb160ca51b8f19bab7b3de Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 16:29:55 -0700
Subject: [PATCH 14/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index cdb8bc948..1d30333f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.7.0",
- "@ghsc/nshmp-template": "^20.9.0",
+ "@ghsc/nshmp-lib-ng": "^30.8.0",
+ "@ghsc/nshmp-template": "^20.10.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.7.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.7.0.tgz",
- "integrity": "sha1-Z50U/DRFz5Pk+VnqbDeRoi5xnB4=",
+ "version": "30.8.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.8.0.tgz",
+ "integrity": "sha1-m5tWKWG70JOkkq1hgdcYEjp6Y2c=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.9.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.9.0.tgz",
- "integrity": "sha1-HuThX20FiOdFacKFUqLtFJP9QwM=",
+ "version": "20.10.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.10.0.tgz",
+ "integrity": "sha1-GMOpUZcbEwcCMVg9fSK6YAsMot0=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index d66133723..baae547dc 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.7.0",
- "@ghsc/nshmp-template": "^20.9.0",
+ "@ghsc/nshmp-lib-ng": "^30.8.0",
+ "@ghsc/nshmp-template": "^20.10.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From c68d4b4e39fc4dbaa6e61097cd0fc7ac79745e1d Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 16:30:04 -0700
Subject: [PATCH 15/28] remove providers
---
.../control-panel/control-panel.component.ts | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.ts b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.ts
index 20f008792..d0d0b89dc 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.ts
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.ts
@@ -3,10 +3,7 @@ import {ReactiveFormsModule} from '@angular/forms';
import {MatOption} from '@angular/material/core';
import {MatFormField, MatLabel} from '@angular/material/form-field';
import {MatSelect} from '@angular/material/select';
-import {
- MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS,
- MatSlideToggle,
-} from '@angular/material/slide-toggle';
+import {MatSlideToggle} from '@angular/material/slide-toggle';
import {NshmpLibNgHazardModelFormComponent} from '@ghsc/nshmp-lib-ng/hazard';
import {ReturnPeriod} from '@ghsc/nshmp-lib-ng/nshmp';
import {FeatureType} from '@ghsc/nshmp-utils-ts/libs/nshmp-haz/www/features-service';
@@ -30,14 +27,6 @@ import {AppService} from '../../services/app.service';
MatOption,
ReactiveFormsModule,
],
- providers: [
- {
- provide: MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS,
- useValue: {
- color: 'primary',
- },
- },
- ],
selector: 'app-control-panel',
standalone: true,
styleUrl: './control-panel.component.scss',
--
GitLab
From 6d67e3a5aea53e8125655c6d019a0b9522b9313e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 16:51:50 -0700
Subject: [PATCH 16/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1d30333f4..05feccce4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.8.0",
- "@ghsc/nshmp-template": "^20.10.0",
+ "@ghsc/nshmp-lib-ng": "^30.9.0",
+ "@ghsc/nshmp-template": "^20.11.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.8.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.8.0.tgz",
- "integrity": "sha1-m5tWKWG70JOkkq1hgdcYEjp6Y2c=",
+ "version": "30.9.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.9.0.tgz",
+ "integrity": "sha1-q2qAf7C5n/hp77NDuMaeH5vaDPE=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.10.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.10.0.tgz",
- "integrity": "sha1-GMOpUZcbEwcCMVg9fSK6YAsMot0=",
+ "version": "20.11.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.11.0.tgz",
+ "integrity": "sha1-UVmKiKRQQFFo0+RZYUPWV1VQrF8=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index baae547dc..20aee0fef 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.8.0",
- "@ghsc/nshmp-template": "^20.10.0",
+ "@ghsc/nshmp-lib-ng": "^30.9.0",
+ "@ghsc/nshmp-template": "^20.11.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From d1dee4aa735817912047244166b01342f842d533 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 4 Dec 2024 16:51:57 -0700
Subject: [PATCH 17/28] change color
---
projects/nshmp-apps/src/styles/_forms.scss | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/projects/nshmp-apps/src/styles/_forms.scss b/projects/nshmp-apps/src/styles/_forms.scss
index 4ccc09922..4b04af7d5 100644
--- a/projects/nshmp-apps/src/styles/_forms.scss
+++ b/projects/nshmp-apps/src/styles/_forms.scss
@@ -38,8 +38,5 @@ nshmp-template-control-panel form {
}
body.dark-mode .form-buttons {
- background-color: darken(
- mat.m2-get-color-from-palette($nshmp-accent, 800),
- 7
- );
+ background-color: mat.m2-get-color-from-palette($nshmp-accent, 800);
}
--
GitLab
From 31c3d64e807e5b43e98ecdf421cfa4b2b8811aa7 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 5 Dec 2024 08:41:25 -0700
Subject: [PATCH 18/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 05feccce4..6e00ea3f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.9.0",
- "@ghsc/nshmp-template": "^20.11.0",
+ "@ghsc/nshmp-lib-ng": "^30.10.0",
+ "@ghsc/nshmp-template": "^20.12.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.9.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.9.0.tgz",
- "integrity": "sha1-q2qAf7C5n/hp77NDuMaeH5vaDPE=",
+ "version": "30.10.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.10.0.tgz",
+ "integrity": "sha1-JJTwYrnlVHm8ebZFXNvxvv82JRg=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.11.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.11.0.tgz",
- "integrity": "sha1-UVmKiKRQQFFo0+RZYUPWV1VQrF8=",
+ "version": "20.12.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.12.0.tgz",
+ "integrity": "sha1-a4ughqhJHxxp10QmrSqgFBn/y14=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 20aee0fef..12a9a0a46 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.9.0",
- "@ghsc/nshmp-template": "^20.11.0",
+ "@ghsc/nshmp-lib-ng": "^30.10.0",
+ "@ghsc/nshmp-template": "^20.12.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 34b909fb007986e3bd68feca57bf1e28ceada6e8 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 5 Dec 2024 09:00:02 -0700
Subject: [PATCH 19/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6e00ea3f2..e2696dc1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.10.0",
- "@ghsc/nshmp-template": "^20.12.0",
+ "@ghsc/nshmp-lib-ng": "^30.11.0",
+ "@ghsc/nshmp-template": "^30.0.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.10.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.10.0.tgz",
- "integrity": "sha1-JJTwYrnlVHm8ebZFXNvxvv82JRg=",
+ "version": "30.11.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.11.0.tgz",
+ "integrity": "sha1-Kb8E/t/laJzFwvaD13VBpZpuNQo=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.12.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.12.0.tgz",
- "integrity": "sha1-a4ughqhJHxxp10QmrSqgFBn/y14=",
+ "version": "30.0.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.0.0.tgz",
+ "integrity": "sha1-z47b4cX7H1yyHiog9HUwXUvdd8M=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 12a9a0a46..eb70ff3e4 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.10.0",
- "@ghsc/nshmp-template": "^20.12.0",
+ "@ghsc/nshmp-lib-ng": "^30.11.0",
+ "@ghsc/nshmp-template": "^30.0.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 363487ca478d89819f448eda0149a56f82fcb3f6 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 5 Dec 2024 09:43:50 -0700
Subject: [PATCH 20/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index e2696dc1a..64d134687 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.11.0",
- "@ghsc/nshmp-template": "^30.0.0",
+ "@ghsc/nshmp-lib-ng": "^30.12.0",
+ "@ghsc/nshmp-template": "^30.1.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.11.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.11.0.tgz",
- "integrity": "sha1-Kb8E/t/laJzFwvaD13VBpZpuNQo=",
+ "version": "30.12.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.12.0.tgz",
+ "integrity": "sha1-ZyptuUyMwHqXlXrbETBgiwI6KR0=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "30.0.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.0.0.tgz",
- "integrity": "sha1-z47b4cX7H1yyHiog9HUwXUvdd8M=",
+ "version": "30.1.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.1.0.tgz",
+ "integrity": "sha1-EFkPWreH+BPRkquUA3YI2tV3JhA=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index eb70ff3e4..7092b0171 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.11.0",
- "@ghsc/nshmp-template": "^30.0.0",
+ "@ghsc/nshmp-lib-ng": "^30.12.0",
+ "@ghsc/nshmp-template": "^30.1.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 23510a9e180f2f8399638c4ce29d87181ea95d56 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 5 Dec 2024 15:52:24 -0700
Subject: [PATCH 21/28] add labels
---
projects/nshmp-apps/src/app/app.routes.ts | 27 +++++++++++++++++++
.../src/app/designmaps/design-maps.routes.ts | 3 +++
projects/nshmp-apps/src/app/dev/dev.routes.ts | 9 +++++++
.../nshmp-apps/src/app/dev/gmm/gmm.routes.ts | 3 +++
.../src/app/dev/hazard/hazard.routes.ts | 3 +++
.../src/app/dev/math/math.routes.ts | 3 +++
.../src/app/error-pages/error-pages.routes.ts | 9 +++++++
projects/nshmp-apps/src/app/gmm/gmm.routes.ts | 9 +++++++
.../src/app/hazard/hazard.routes.ts | 9 +++++++
.../src/app/internal/aws/aws.routes.ts | 12 +++++++++
.../src/app/internal/internal.routes.ts | 3 +++
projects/nshmp-apps/src/app/ncm/ncm.routes.ts | 3 +++
.../src/app/source/source.routes.ts | 9 +++++++
13 files changed, 102 insertions(+)
diff --git a/projects/nshmp-apps/src/app/app.routes.ts b/projects/nshmp-apps/src/app/app.routes.ts
index 005133679..8a399b38d 100644
--- a/projects/nshmp-apps/src/app/app.routes.ts
+++ b/projects/nshmp-apps/src/app/app.routes.ts
@@ -22,40 +22,64 @@ const routes: Routes = [
// NCM applications
{
children: ncmRoutes(),
+ data: {
+ label: 'NCM Dashboard',
+ },
path: 'ncm',
},
// Design maps applications
{
children: designMapsRoutes(),
+ data: {
+ label: 'Design Maps Dashboard',
+ },
path: 'designmaps',
},
// Development applications
{
children: devRoutes(),
+ data: {
+ label: 'Dev Dashboard',
+ },
path: 'dev',
},
// Ground motion model applications
{
children: gmmRoutes(),
+ data: {
+ label: 'GMM Dashboard',
+ },
path: 'gmm',
},
// Hazard applications
{
children: hazardRoutes(),
+ data: {
+ label: 'Hazard Dashboard',
+ },
path: 'hazard',
},
// Internal applications
{
children: internalRoutes(),
+ data: {
+ label: 'Internal Dashboard',
+ },
path: 'internal',
},
// Source model applications
{
children: sourceRoutes(),
+ data: {
+ label: 'Source Model Dashboard',
+ },
path: 'source',
},
// Services application
{
+ data: {
+ label: 'Services',
+ },
loadComponent: () =>
import('./services/app.component').then(com => com.AppComponent),
path: 'services',
@@ -63,6 +87,9 @@ const routes: Routes = [
// Error pages for reverse proxy errors
{
children: errorRoutes(),
+ data: {
+ label: 'Error Page',
+ },
path: 'error-pages',
},
// Catch all
diff --git a/projects/nshmp-apps/src/app/designmaps/design-maps.routes.ts b/projects/nshmp-apps/src/app/designmaps/design-maps.routes.ts
index ab715b048..2db029a41 100644
--- a/projects/nshmp-apps/src/app/designmaps/design-maps.routes.ts
+++ b/projects/nshmp-apps/src/app/designmaps/design-maps.routes.ts
@@ -7,6 +7,9 @@ const routes: Routes = [
path: '',
},
{
+ data: {
+ label: 'RTGM',
+ },
loadComponent: () =>
import('./rtgm/app.component').then(com => com.AppComponent),
path: 'rtgm',
diff --git a/projects/nshmp-apps/src/app/dev/dev.routes.ts b/projects/nshmp-apps/src/app/dev/dev.routes.ts
index 64f3fdc46..5c6129ac4 100644
--- a/projects/nshmp-apps/src/app/dev/dev.routes.ts
+++ b/projects/nshmp-apps/src/app/dev/dev.routes.ts
@@ -18,16 +18,25 @@ const routes: Routes = [
// Math applications
{
children: devMathRoutes(),
+ data: {
+ label: 'Math Dashboard',
+ },
path: 'math',
},
// Hazard applications
{
children: devHazardRoutes(),
+ data: {
+ label: 'Hazard Dashboard',
+ },
path: 'hazard',
},
// GMM applications
{
children: devGmmRoutes(),
+ data: {
+ label: 'GMM Dashboard',
+ },
path: 'gmm',
},
// Redirect AWS applications
diff --git a/projects/nshmp-apps/src/app/dev/gmm/gmm.routes.ts b/projects/nshmp-apps/src/app/dev/gmm/gmm.routes.ts
index 8cf6b0c4c..1bd5e5e8a 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/gmm.routes.ts
+++ b/projects/nshmp-apps/src/app/dev/gmm/gmm.routes.ts
@@ -8,6 +8,9 @@ const routes: Routes = [
path: '',
},
{
+ data: {
+ label: 'Hanging Wall Effects',
+ },
loadComponent: () =>
import('./hanging-wall-effects/app.component').then(
com => com.AppComponent
diff --git a/projects/nshmp-apps/src/app/dev/hazard/hazard.routes.ts b/projects/nshmp-apps/src/app/dev/hazard/hazard.routes.ts
index 8b81c2fb1..97c7d1e48 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/hazard.routes.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/hazard.routes.ts
@@ -12,6 +12,9 @@ const routes: Routes = [
},
{
canActivate: [() => inject(DynamicHazardCompareGuard).canActivate()],
+ data: {
+ label: 'Dynamic Hazard Compare',
+ },
loadComponent: () =>
import('./dynamic-compare/app.component').then(com => com.AppComponent),
path: 'dynamic-compare',
diff --git a/projects/nshmp-apps/src/app/dev/math/math.routes.ts b/projects/nshmp-apps/src/app/dev/math/math.routes.ts
index 864c1b0af..d586487f0 100644
--- a/projects/nshmp-apps/src/app/dev/math/math.routes.ts
+++ b/projects/nshmp-apps/src/app/dev/math/math.routes.ts
@@ -8,6 +8,9 @@ const routes: Routes = [
path: '',
},
{
+ data: {
+ label: 'Exceedance Explorer',
+ },
loadComponent: () =>
import('./exceedance-explorer/app.component').then(
com => com.AppComponent
diff --git a/projects/nshmp-apps/src/app/error-pages/error-pages.routes.ts b/projects/nshmp-apps/src/app/error-pages/error-pages.routes.ts
index 992113a82..5f6510e2f 100644
--- a/projects/nshmp-apps/src/app/error-pages/error-pages.routes.ts
+++ b/projects/nshmp-apps/src/app/error-pages/error-pages.routes.ts
@@ -3,16 +3,25 @@ import {Routes} from '@angular/router';
/** Error pages routes */
const routes: Routes = [
{
+ data: {
+ label: '404 Error',
+ },
loadComponent: () =>
import('./404/404.component').then(com => com.Error404Component),
path: '404',
},
{
+ data: {
+ label: '410 Error',
+ },
loadComponent: () =>
import('./410/410.component').then(com => com.Error410Component),
path: '410',
},
{
+ data: {
+ label: '500 Error',
+ },
loadComponent: () =>
import('./500/500.component').then(com => com.Error500Component),
path: '500',
diff --git a/projects/nshmp-apps/src/app/gmm/gmm.routes.ts b/projects/nshmp-apps/src/app/gmm/gmm.routes.ts
index 15ec2ed76..b42491a77 100644
--- a/projects/nshmp-apps/src/app/gmm/gmm.routes.ts
+++ b/projects/nshmp-apps/src/app/gmm/gmm.routes.ts
@@ -8,16 +8,25 @@ const routes: Routes = [
path: '',
},
{
+ data: {
+ label: 'Ground Motion vs. Distance',
+ },
loadComponent: () =>
import('./distance/app.component').then(com => com.AppComponent),
path: 'distance',
},
{
+ data: {
+ label: 'Ground Motion vs. Magnitude',
+ },
loadComponent: () =>
import('./magnitude/app.component').then(com => com.AppComponent),
path: 'magnitude',
},
{
+ data: {
+ label: 'Response Spectra',
+ },
loadComponent: () =>
import('./spectra/app.component').then(com => com.AppComponent),
path: 'spectra',
diff --git a/projects/nshmp-apps/src/app/hazard/hazard.routes.ts b/projects/nshmp-apps/src/app/hazard/hazard.routes.ts
index 58efd4ed6..59e783ecc 100644
--- a/projects/nshmp-apps/src/app/hazard/hazard.routes.ts
+++ b/projects/nshmp-apps/src/app/hazard/hazard.routes.ts
@@ -8,16 +8,25 @@ const routes: Routes = [
path: '',
},
{
+ data: {
+ label: 'Disaggregation',
+ },
loadComponent: () =>
import('./disagg/app.component').then(com => com.AppComponent),
path: 'disagg',
},
{
+ data: {
+ label: 'Dynamic Hazard',
+ },
loadComponent: () =>
import('./dynamic/app.component').then(com => com.AppComponent),
path: 'dynamic',
},
{
+ data: {
+ label: 'Static Hazard',
+ },
loadComponent: () =>
import('./static/app.component').then(com => com.AppComponent),
path: 'static',
diff --git a/projects/nshmp-apps/src/app/internal/aws/aws.routes.ts b/projects/nshmp-apps/src/app/internal/aws/aws.routes.ts
index 966d2a81f..e6de16c84 100644
--- a/projects/nshmp-apps/src/app/internal/aws/aws.routes.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/aws.routes.ts
@@ -7,16 +7,25 @@ const routes: Routes = [
path: '',
},
{
+ data: {
+ label: 'Check Jobs',
+ },
loadComponent: () =>
import('./check-haz-jobs/app.component').then(com => com.AppComponent),
path: 'check-haz-jobs',
},
{
+ data: {
+ label: 'Job Histroy',
+ },
loadComponent: () =>
import('./haz-job-history/app.component').then(com => com.AppComponent),
path: 'haz-job-history',
},
{
+ data: {
+ label: 'Terminate Jobs',
+ },
loadComponent: () =>
import('./terminate-haz-jobs/app.component').then(
com => com.AppComponent
@@ -24,6 +33,9 @@ const routes: Routes = [
path: 'terminate-haz-jobs',
},
{
+ data: {
+ label: 'Submit Jobs',
+ },
loadComponent: () =>
import('./submit-haz-jobs/app.component').then(com => com.AppComponent),
path: 'submit-haz-jobs',
diff --git a/projects/nshmp-apps/src/app/internal/internal.routes.ts b/projects/nshmp-apps/src/app/internal/internal.routes.ts
index 8fd1ea962..899ea06cf 100644
--- a/projects/nshmp-apps/src/app/internal/internal.routes.ts
+++ b/projects/nshmp-apps/src/app/internal/internal.routes.ts
@@ -17,6 +17,9 @@ const routes: Routes = [
{
canActivate: [networkGuard],
children: devAwsRoutes(),
+ data: {
+ label: 'Internal Dashboard',
+ },
path: 'aws',
},
];
diff --git a/projects/nshmp-apps/src/app/ncm/ncm.routes.ts b/projects/nshmp-apps/src/app/ncm/ncm.routes.ts
index 6db1834d1..c6255150f 100644
--- a/projects/nshmp-apps/src/app/ncm/ncm.routes.ts
+++ b/projects/nshmp-apps/src/app/ncm/ncm.routes.ts
@@ -7,6 +7,9 @@ const routes: Routes = [
path: '',
},
{
+ data: {
+ label: 'Geophysical Profiles',
+ },
loadComponent: () =>
import('./geophysical-profiles/app.component').then(
com => com.AppComponent
diff --git a/projects/nshmp-apps/src/app/source/source.routes.ts b/projects/nshmp-apps/src/app/source/source.routes.ts
index 5054debe4..322a5ad21 100644
--- a/projects/nshmp-apps/src/app/source/source.routes.ts
+++ b/projects/nshmp-apps/src/app/source/source.routes.ts
@@ -9,6 +9,9 @@ const routes: Routes = [
},
// model maps application
{
+ data: {
+ label: 'Source Model Maps',
+ },
loadComponent: () =>
import('./model-maps/app.component').then(com => com.AppComponent),
path: 'model-maps',
@@ -20,12 +23,18 @@ const routes: Routes = [
},
// MFD application
{
+ data: {
+ label: 'Magnitude Frequency Distribution',
+ },
loadComponent: () =>
import('./mfd/app.component').then(com => com.AppComponent),
path: 'mfd',
},
// Rates application
{
+ data: {
+ label: 'Rates and Probabilities',
+ },
loadComponent: () =>
import('./rates/app.component').then(com => com.AppComponent),
path: 'rates',
--
GitLab
From 204b41934f60ff867b644d839c360d8a3061da5c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 5 Dec 2024 15:52:33 -0700
Subject: [PATCH 22/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 64d134687..ba8bedf31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.12.0",
- "@ghsc/nshmp-template": "^30.1.0",
+ "@ghsc/nshmp-lib-ng": "^30.13.0",
+ "@ghsc/nshmp-template": "^30.2.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.12.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.12.0.tgz",
- "integrity": "sha1-ZyptuUyMwHqXlXrbETBgiwI6KR0=",
+ "version": "30.13.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.13.0.tgz",
+ "integrity": "sha1-CQkw5DtjAgVyLpDhOmjRL1kWQj0=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "30.1.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.1.0.tgz",
- "integrity": "sha1-EFkPWreH+BPRkquUA3YI2tV3JhA=",
+ "version": "30.2.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.2.0.tgz",
+ "integrity": "sha1-GQxFK/38g1MnAgP4CVKLpKKOZSM=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 7092b0171..ea1e352ae 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.12.0",
- "@ghsc/nshmp-template": "^30.1.0",
+ "@ghsc/nshmp-lib-ng": "^30.13.0",
+ "@ghsc/nshmp-template": "^30.2.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 48175e77b09ee5b3a488104c5517c271f116c40e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 5 Dec 2024 16:23:24 -0700
Subject: [PATCH 23/28] add style
---
projects/nshmp-apps/src/styles/styles.scss | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/projects/nshmp-apps/src/styles/styles.scss b/projects/nshmp-apps/src/styles/styles.scss
index 1030dff5a..c0fb170ca 100644
--- a/projects/nshmp-apps/src/styles/styles.scss
+++ b/projects/nshmp-apps/src/styles/styles.scss
@@ -54,7 +54,16 @@ a {
}
body.dark-mode {
- mat-tab-group .mdc-tab {
- filter: brightness(1.5);
+ mat-tab-group mat-tab-header {
+ --mdc-tab-indicator-focus-indicator-color: white;
+ --mdc-tab-indicator-active-indicator-color: white;
+ --mat-tab-header-pagination-icon-color: white;
+ --mat-tab-header-active-label-text-color: white;
+ --mat-tab-header-active-ripple-color: white;
+ --mat-tab-header-inactive-ripple-color: white;
+ --mat-tab-header-active-focus-label-text-color: white;
+ --mat-tab-header-active-hover-label-text-color: white;
+ --mat-tab-header-active-focus-indicator-color: white;
+ --mat-tab-header-active-hover-indicator-color: white;
}
}
--
GitLab
From c799972183abcb60d71191850df425c285c4e144 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 5 Dec 2024 17:35:57 -0700
Subject: [PATCH 24/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index ba8bedf31..2c3a2ae0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.13.0",
- "@ghsc/nshmp-template": "^30.2.0",
+ "@ghsc/nshmp-lib-ng": "^30.14.0",
+ "@ghsc/nshmp-template": "^30.3.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.13.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.13.0.tgz",
- "integrity": "sha1-CQkw5DtjAgVyLpDhOmjRL1kWQj0=",
+ "version": "30.14.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.14.0.tgz",
+ "integrity": "sha1-UYnGgbqt1Ce4WqG+8GO74TPPHKw=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "30.2.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.2.0.tgz",
- "integrity": "sha1-GQxFK/38g1MnAgP4CVKLpKKOZSM=",
+ "version": "30.3.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.3.0.tgz",
+ "integrity": "sha1-aRzLnv/VyRd3w9B/bH8yaCkqSw4=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index ea1e352ae..acf1bb01c 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.13.0",
- "@ghsc/nshmp-template": "^30.2.0",
+ "@ghsc/nshmp-lib-ng": "^30.14.0",
+ "@ghsc/nshmp-template": "^30.3.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 4671ba239264f857563acea52be143fceaab171f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 6 Dec 2024 08:51:49 -0700
Subject: [PATCH 25/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 2c3a2ae0a..89afc9b84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.14.0",
- "@ghsc/nshmp-template": "^30.3.0",
+ "@ghsc/nshmp-lib-ng": "^30.15.0",
+ "@ghsc/nshmp-template": "^30.4.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.14.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.14.0.tgz",
- "integrity": "sha1-UYnGgbqt1Ce4WqG+8GO74TPPHKw=",
+ "version": "30.15.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.15.0.tgz",
+ "integrity": "sha1-nANLC2dUYek34StGRf+MjhnwMro=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "30.3.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.3.0.tgz",
- "integrity": "sha1-aRzLnv/VyRd3w9B/bH8yaCkqSw4=",
+ "version": "30.4.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.4.0.tgz",
+ "integrity": "sha1-/tIf1t5B0DTkSnw+eq3C+tu/oGI=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index acf1bb01c..565c8fe40 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.14.0",
- "@ghsc/nshmp-template": "^30.3.0",
+ "@ghsc/nshmp-lib-ng": "^30.15.0",
+ "@ghsc/nshmp-template": "^30.4.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 19d440e61accb5996c7bded1eed66e69b15c51be Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 6 Dec 2024 09:28:58 -0700
Subject: [PATCH 26/28] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 89afc9b84..b8f758a0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.15.0",
- "@ghsc/nshmp-template": "^30.4.0",
+ "@ghsc/nshmp-lib-ng": "^30.16.0",
+ "@ghsc/nshmp-template": "^30.5.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.15.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.15.0.tgz",
- "integrity": "sha1-nANLC2dUYek34StGRf+MjhnwMro=",
+ "version": "30.16.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.16.0.tgz",
+ "integrity": "sha1-Oo9Ktxnpm70uaWvzajzInWBQ1xQ=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "30.4.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.4.0.tgz",
- "integrity": "sha1-/tIf1t5B0DTkSnw+eq3C+tu/oGI=",
+ "version": "30.5.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.5.0.tgz",
+ "integrity": "sha1-TDiVbCSWRY9pHl2zVbggYwZPzHE=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 565c8fe40..557dc4c4a 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.15.0",
- "@ghsc/nshmp-template": "^30.4.0",
+ "@ghsc/nshmp-lib-ng": "^30.16.0",
+ "@ghsc/nshmp-template": "^30.5.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 563a9657cb35a8a0b4b5d08e9ad39ecf5f8a0ae5 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 6 Dec 2024 11:16:59 -0700
Subject: [PATCH 27/28] update deps
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b8f758a0d..45a8a5633 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.16.0",
+ "@ghsc/nshmp-lib-ng": "^30.17.0",
"@ghsc/nshmp-template": "^30.5.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.16.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.16.0.tgz",
- "integrity": "sha1-Oo9Ktxnpm70uaWvzajzInWBQ1xQ=",
+ "version": "30.17.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.17.0.tgz",
+ "integrity": "sha1-xVVFbVtkpHqLb93GklmLqJ8BRk8=",
"dependencies": {
"tslib": "^2.3.0"
},
diff --git a/package.json b/package.json
index 557dc4c4a..45d867b58 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.16.0",
+ "@ghsc/nshmp-lib-ng": "^30.17.0",
"@ghsc/nshmp-template": "^30.5.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
--
GitLab
From 145f5bc945c7b642f973bae19c07cec55d9f59fc Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 10 Dec 2024 13:44:39 -0700
Subject: [PATCH 28/28] update deps
---
.npmrc | 1 -
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/.npmrc b/.npmrc
index 55d5e28d6..fcdbb5524 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1 @@
@ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/
-//code.usgs.gov/api/v4/packages/npm/:_authToken=glpat-A8C9_MkxAzPXybLUQhE1
diff --git a/package-lock.json b/package-lock.json
index 45a8a5633..10f9760bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.17.0",
- "@ghsc/nshmp-template": "^30.5.0",
+ "@ghsc/nshmp-lib-ng": "^18.24.0",
+ "@ghsc/nshmp-template": "^18.3.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4632,9 +4632,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "30.17.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-30.17.0.tgz",
- "integrity": "sha1-xVVFbVtkpHqLb93GklmLqJ8BRk8=",
+ "version": "18.24.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-18.24.0.tgz",
+ "integrity": "sha1-CZaWKhpn24v0dowD7jB6qb0eX7M=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4644,9 +4644,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "30.5.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-30.5.0.tgz",
- "integrity": "sha1-TDiVbCSWRY9pHl2zVbggYwZPzHE=",
+ "version": "18.3.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-18.3.0.tgz",
+ "integrity": "sha1-UIuGtvLUtgPgQ6gVr2Ko32QIJGM=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 45d867b58..5f5509149 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@asymmetrik/ngx-leaflet": "^18.0.1",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^30.17.0",
- "@ghsc/nshmp-template": "^30.5.0",
+ "@ghsc/nshmp-lib-ng": "^18.24.0",
+ "@ghsc/nshmp-template": "^18.3.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab