Skip to content

Commit

Permalink
fixing mixure details, reverting travis changes until SR1 is out
Browse files Browse the repository at this point in the history
  • Loading branch information
NikoAnderson committed Jul 11, 2023
1 parent bf62a9e commit 7c2c19b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 26 deletions.
25 changes: 1 addition & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
dist: trusty

env:
global:
- TRAVIS_TAG=buildRelease

language: node_js
node_js:
- 14.17.0
Expand All @@ -29,23 +25,4 @@ install:
script:
- npm run build:fda:prod
after_success:
- ls
- zip -r deployable_binaries.zip dist/browser
- ls
- cp deployable_binaries.zip ../
- ls
before_deploy:
# Set up git user name and tag this commit
- echo "before deploy"
- echo "$TRAVIS_TAG"
- gh release delete $TRAVIS_TAG --repo ncats/gsrsFrontend --yes || true
- if [ $TRAVIS_BRANCH = 'development_3.0' ]; then git tag $TRAVIS_TAG; fi
- echo "$TRAVIS_TAG"

deploy:
provider: releases
api_key: ${GIT_ACCESS_TOKEN}
file: "../deployable_binaries.zip"
skip_cleanup: true
on:
all_branches: true
- if [ $TRAVIS_BRANCH = 'development_3.0' ]; then bash travisScript.sh; else echo "Not a branch set to push"; fi
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h3>One of these components may be present:</h3>
<div class="flex-row">
<div *ngFor="let component of presentInOne" class="thumb-col">

<div *ngIf="component.substance.linkingID" class="code">{{component}}</div>
<div *ngIf="component.substance.linkingID" class="code">{{component.substance.linkingID}}</div>
<a tabindex="0" role="img" aria-label="substance image" class="zoom" (click)="openImageModal(structureTemplate, component)">

<img class="image-icon" appSubstanceImage [entityId]="component.substance.refuuid">
Expand All @@ -57,7 +57,7 @@ <h3>One of these components may be present:</h3>

<ng-template #structureTemplate>
<div class = "close-container" mat-dialog-header>
<button mat-mini-fab class = "mat-mini-fab" mat-dialog-close>
<button mat-mini-fab class = "mat-mini-fab" (click) = "close()">
<mat-icon class = "icon" svgIcon="close"></mat-icon>
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,8 @@ export class SubstanceMixtureComponentsComponent extends SubstanceCardBase imple
});
}

close() {
this.dialog.closeAll();
}

}

0 comments on commit 7c2c19b

Please sign in to comment.