Skip to content

Commit

Permalink
Add Kegg Branding
Browse files Browse the repository at this point in the history
  • Loading branch information
matty234 committed Jun 26, 2019
1 parent 638f624 commit 6fed7e7
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 8 deletions.
4 changes: 2 additions & 2 deletions deployment/ing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
spec:
tls:
- hosts:
- uks.verdict.genericname.dev
- verdict.paccanarolab.org
secretName: letsencrypt-prod
rules:
- host: 'uks.verdict.genericname.dev'
- host: 'verdict.paccanarolab.org'
http:
paths:
-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@
box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
}

.kegg-description {
padding: 10px;
}
.kegg-logo {
display: inline-block;
background-image: url(/assets/external/kegg128.gif);
height: 22px;
width: 25px;
background-repeat: no-repeat;
background-position: center;
background-size: contain;
vertical-align: middle;
}

.list {
padding-top: 0px !important;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<div *ngIf="(query | async).typeId === 'PATHWAY'" class="kegg-description muted">
Loading results from <div class="kegg-logo"></div>...
</div>
<mat-list class="list">
<ng-container *ngIf="!isLoading; else loading">
<ng-container *ngFor="let item of searchResults; let last = last">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import {
OnInit,
} from '@angular/core';
import { Router } from '@angular/router';
import { Observable, Subject } from 'rxjs';
import { filter, finalize, switchMap, takeUntil } from 'rxjs/operators';
import { concat, forkJoin, Observable, Subject } from 'rxjs';
import { distinctUntilChanged, filter, finalize, flatMap, map, mergeMap, switchMap, takeUntil } from 'rxjs/operators';
import { Gene } from 'src/app/directory/gene/gene.model';
import { Phenotype } from 'src/app/directory/phenotype/phenotype.model';

import { ISearchQuery } from '../search-bar/search-bar.component';
import { ISearchQuery, SearchIDs } from '../search-bar/search-bar.component';
import { SearchResult, SearchResults } from '../search.model';
import { SearchService } from '../search.service';

Expand All @@ -33,9 +33,8 @@ export class SearchSuggestionsComponent implements OnInit, OnDestroy {
$destroy = new Subject<void>();
isLoading = false;
searchResults: SearchResults = [];

constructor(
@Inject(SEARCH_QUERY) private query: Observable<ISearchQuery>,
@Inject(SEARCH_QUERY) public query: Observable<ISearchQuery>,
private searchService: SearchService,
private elementRef: ElementRef,
private router: Router,
Expand All @@ -62,6 +61,10 @@ export class SearchSuggestionsComponent implements OnInit, OnDestroy {
this.searchResults = results;
this.cd.detectChanges();
});

this.query.pipe(map((q: ISearchQuery) => q.typeId), distinctUntilChanged()).subscribe(() => {
this.searchResults = [];
});
}

@HostListener('document:click', [ '$event' ])
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion services/verdict-web/src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
export const environment = {
production: false,
api: {
root: 'https://cors-anywhere.herokuapp.com/https://uks.verdict.genericname.dev/__',
root: 'https://cors-anywhere.herokuapp.com/https://verdict.paccanarolab.org/__',
phenotype: 'phenotype',
gene: 'gene',
search: 'search',
Expand Down

0 comments on commit 6fed7e7

Please sign in to comment.