Merge pull request #261 from TheJacksonLaboratory/develop

september 1 release
TheJacksonLaboratory · Sep 1, 2023 · 185dad9 · 185dad9
2 parents f2b9a8e + 70efb4d
commit 185dad9
Show file tree

Hide file tree

Showing 21 changed files with 119,261 additions and 118,572 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hpo-web",
-  "version": "1.8.10",
+  "version": "1.8.11",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

diff --git a/client/src/app/app.component.css b/client/src/app/app.component.css
@@ -41,3 +41,15 @@
 .sidenav .mat-menu-item.backButton .mat-icon {
   float: left;
 }
+
+.banner {
+  height: 30px;
+}
+
+.banner p {
+  margin: 0 0 0 2.5rem;
+}
+
+.banner p a {
+  color: white !important;
+}
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
@@ -1,4 +1,8 @@
 <mat-sidenav-container>
+  <mat-toolbar class="banner" color="warn">
+    <mat-icon>warning</mat-icon>
+     <p>The API for this application is moving. <strong><a [routerLink]="['/data/ontology']">See the changes here.</a></strong></p>
+  </mat-toolbar>
   <navbar-hpo (navToggle)="sidenav.open(); mobileNavSection = 'home'"></navbar-hpo>
   <mat-sidenav #sidenav class="sidenav">
     <mat-nav-list>
@@ -56,6 +60,7 @@ <h3 class="center menuTitle">Menu</h3>
       <div *ngIf="mobileNavSection == 'dataMenu'">
         <button mat-menu-item (click)="sidenav.close()" routerLink="data/ontology"> Ontology</button>
         <button mat-menu-item (click)="sidenav.close()" routerLink="data/annotations"> Annotations</button>
+        <button mat-menu-item (click)="sidenav.close()" routerLink="resources/phenopacket"> Annotations</button>
         <button mat-menu-item (click)="mobileNavigate('translationMenu')">Translation
           <mat-icon>arrow_right</mat-icon>
         </button>

diff --git a/client/src/app/shared/navbar/navbar.component.html b/client/src/app/shared/navbar/navbar.component.html
@@ -46,6 +46,7 @@
   <mat-menu [overlapTrigger]="false" #downloadsMenu="matMenu">
     <button mat-menu-item routerLink="data/ontology"> Ontology</button>
     <button mat-menu-item routerLink="data/annotations"> Annotations</button>
+    <button mat-menu-item routerLink="resources/phenopacket"> Phenopacket</button>
     <button mat-menu-item [matMenuTriggerFor]="otherMenu"> Translation</button>
     <button mat-menu-item (click)="navigateToDocs()"> API</button>
   </mat-menu>

diff --git a/client/src/app/static/data/annotation-format/annotation-format.component.css b/client/src/app/static/data/annotation-format/annotation-format.component.css
@@ -5,3 +5,18 @@
 .table-spacer td, .table-spacer th {
   padding: 5px;
 }
+
+
+.code-wrapper {
+  border: 1px solid rgba(0,0,0,.2);
+  border-radius: 4px;
+}
+
+.code {
+  padding: 20px;
+  background: rgba(0,0,0,.01);
+}
+
+.margin-auto {
+  margin: auto auto;
+}