diff --git a/Dockerfile.dev b/Dockerfile.dev
index 92f94e58693701446d1472a5d669f90513d4fdf9..b9ca87d6fb2e0c949b5cb8193e5c354792187ea2 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -16,9 +16,13 @@ RUN npm install
COPY . /app/
-RUN npm run build -- --prod --base-href=/covex_dev/
+RUN npm run -- bundle
-RUN cp -r dist/covid19/* /usr/share/nginx/html/
+RUN cp -r website/* /usr/share/nginx/html/
+
+RUN mkdir /usr/share/nginx/html/lib
+RUN cp dist/covid19/bundle-es2015.js /usr/share/nginx/html/lib/
+RUN cp dist/covid19/bundle-es5.js /usr/share/nginx/html/lib/
COPY nginx/default.conf /etc/nginx/conf.d/
COPY nginx/htpasswd /etc/nginx/htpasswd
diff --git a/package.json b/package.json
index aaac7c835f13e5c69cf6b2f7e3a5426ee315c97d..6a6ede4229c2471c6e171a1ecbdea9a93bb861f8 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,11 @@
"build": "ng build",
"test": "ng test",
"lint": "ng lint && htmlhint",
- "e2e": "ng e2e"
+ "e2e": "ng e2e",
+ "build-prod": "ng build --prod --output-hashing=none",
+ "package-es5": "cd dist/covid19 && cat runtime-es5.js polyfills-es5.js main-es5.js > bundle-es5.js",
+ "package-es2015": "cd dist/covid19 && cat runtime-es2015.js polyfills-es2015.js main-es2015.js > bundle-es2015.js",
+ "bundle": "npm run build-prod covid19 && npm run package-es5 && npm run package-es2015"
},
"private": true,
"dependencies": {
diff --git a/src/app/components/analysis-panel/analysis-panel.component.html b/src/app/components/analysis-panel/analysis-panel.component.html
index bf5ff4aca1571714f71ba9c6e5e8fa306a0aa3ab..6ff2bde3fd65f98e35fcf9711bb3bcf912679fd3 100644
--- a/src/app/components/analysis-panel/analysis-panel.component.html
+++ b/src/app/components/analysis-panel/analysis-panel.component.html
@@ -71,13 +71,6 @@
<i *ngIf="!task.info.parameters.includeNonApprovedDrugs" class="fa fa-times"></i>
</td>
</tr>
- <tr *ngIf="task.info.parameters.ignoreNonSeedBaits !== undefined && task.info.target === 'drug-target'">
- <td>Include non-seed viral proteins</td>
- <td>
- <i *ngIf="!task.info.parameters.ignoreNonSeedBaits" class="fa fa-check"></i>
- <i *ngIf="task.info.parameters.ignoreNonSeedBaits" class="fa fa-times"></i>
- </td>
- </tr>
</tbody>
</table>
</div>
diff --git a/src/app/config.ts b/src/app/config.ts
index f6d3e60372cc6f473e8975223b4224e7877ae38c..34a5a918cbbb1de0c39d47bc9d762a7bb4b4651f 100644
--- a/src/app/config.ts
+++ b/src/app/config.ts
@@ -5,7 +5,6 @@ export interface IConfig {
showLeftSidebar: boolean;
showOverview: boolean;
showQuery: boolean;
- showFilter: boolean;
showItemSelector: boolean;
showSimpleAnalysis: boolean;
showAdvAnalysis: boolean;
@@ -21,7 +20,6 @@ export const defaultConfig: IConfig = {
showLeftSidebar: true,
showOverview: true,
showQuery: true,
- showFilter: true,
showItemSelector: true,
showSimpleAnalysis: false,
showAdvAnalysis: true,
diff --git a/src/app/dialogs/launch-analysis/launch-analysis.component.html b/src/app/dialogs/launch-analysis/launch-analysis.component.html
index e2ec02687bb4fd619c6471542e0b91fd957f1b1f..9133d7867a755f960a20b53d8c9d9d538d23db5e 100644
--- a/src/app/dialogs/launch-analysis/launch-analysis.component.html
+++ b/src/app/dialogs/launch-analysis/launch-analysis.component.html
@@ -90,15 +90,6 @@
</p>
</div>
- <div class="field" *ngIf="target === 'drug-target'">
- <label class="label">Include non-seed viral proteins</label>
- <app-toggle textOn="Include" textOff="Ignore"
- tooltipOn="Include viral proteins that are not seeds."
- tooltipOff="Exclude viral proteins that are not seeds."
- [(value)]="trustrankIncludeViralNonSeeds">
- </app-toggle>
- </div>
-
<div class="box">
<article class="media">
<div class="media-left">
@@ -174,14 +165,6 @@
</p>
</div>
- <div class="field" *ngIf="target === 'drug-target'">
- <label class="label">Include non-seed viral proteins</label>
- <app-toggle textOn="Include" textOff="Ignore"
- tooltipOn="Include viral proteins that are not seeds."
- tooltipOff="Exclude viral proteins that are not seeds."
- [(value)]="closenessIncludeViralNonSeeds"></app-toggle>
- </div>
-
<div class="box">
<article class="media">
<div class="media-left">
@@ -229,14 +212,6 @@
</p>
</div>
- <div class="field" *ngIf="target === 'drug-target'">
- <label class="label">Include non-seed viral proteins</label>
- <app-toggle textOn="Include" textOff="Ignore"
- tooltipOn="Include viral proteins that are not seeds."
- tooltipOff="Exclude viral proteins that are not seeds."
- [(value)]="degreeIncludeViralNonSeeds"></app-toggle>
- </div>
-
<div class="box">
<article class="media">
<div class="media-left">
@@ -346,14 +321,6 @@
</p>
</div>
- <div class="field">
- <label class="label">Include non-seed viral proteins</label>
- <app-toggle textOn="Include" textOff="Ignore"
- tooltipOn="Include viral proteins that are not seeds."
- tooltipOff="Exclude viral proteins that are not seeds."
- [(value)]="betweennessIncludeViralNonSeeds"></app-toggle>
- </div>
-
<div class="box">
<article class="media">
<div class="media-left">
@@ -477,14 +444,6 @@
</p>
</div>
- <div class="field" *ngIf="target === 'drug-target'">
- <label class="label">Include non-seed viral proteins</label>
- <app-toggle textOn="Include" textOff="Ignore"
- tooltipOn="Include viral proteins that are not seeds."
- tooltipOff="Exclude viral proteins that are not seeds."
- [(value)]="multisteinerIncludeViralNonSeeds"></app-toggle>
- </div>
-
</div>
<p class="doc-link">
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index 9130e3e1caf64d419295b2e223097f1cb9ebe7a4..a7ff6356b1e13ca82cf576f2415ba079ce66886c 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -273,7 +273,7 @@
<span class="icon">
<i class="fas fa-flask" aria-hidden="true"></i>
</span>
- Advanced Analysis
+ Analysis
</p>
<a (click)="collapseAnalysis = !collapseAnalysis" data-action="collapse"
class="card-header-icon is-hidden-fullscreen" aria-label="more options">
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index b8a20738f63e45dffefe50351ddd2bca350db76f..66f901e69948b935e55fae5fb6e4e76465bd78bf 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -67,7 +67,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
public selectedWrapper: Wrapper | null = null;
public collapseAnalysisQuick = true;
- public collapseAnalysis = false;
+ public collapseAnalysis = true;
public collapseDetails = true;
public collapseTask = true;
public collapseSelection = true;
diff --git a/src/index.html b/src/index.html
index 2083606c17722e21deac36498c00ca99750a9e2e..909534743a9f859515a0d1958584a3c710491032 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,14 +1,6 @@
<!doctype html>
<html lang="en">
<head>
-<style>
- .my-legend-1{
- width: 10%;
- }
-</style>
-
-
-
<meta charset="utf-8">
<title>Network Expander</title>
<base href="/">
@@ -25,16 +17,14 @@
<input type="checkbox" onclick=changeConfigStr('{"showOverview":'+this.checked+'}') checked /> Show overview<br>
<input type="checkbox" onclick=changeConfigStr('{"showQuery":'+this.checked+'}') /> Show query<br>
-<input type="checkbox" onclick=changeConfigStr('{"showFilter":'+this.checked+'}') /> Show filter<br>
<input type="checkbox" onclick=changeConfigStr('{"showLeftSidebar":'+this.checked+'}') checked /> Show sidebar<br>
<br>
-<button onclick="changeConfig()">Hide sidebar</button>
<button onclick="setNetwork('netexp1')">Add proteins</button>
-<div style="border: 3px solid red">
- <network-expander id="netexp1" config='{"legendClass": "my-legend-1", "showQuery": false, "showFilter": false}' onload="init1()" style="height: 100vh"></network-expander>
+<div>
+ <network-expander id="netexp1" config='{"legendClass": "my-legend-1", "showQuery": false}' onload="init1()" style="height: 100vh"></network-expander>
</div>
<!--
@@ -43,8 +33,6 @@
</div>
-->
-
-
<script>
function init1() {
document.getElementsByClassName('my-legend-1')[0].onclick = function() {this.remove()};
diff --git a/src/styles.scss b/src/styles.scss
index 1cfb339b6a2df523957dff31b50a61aea0d7d8d2..11392e29ad65977d98c76561e268299213bde206 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -16,6 +16,8 @@ $info: $primary;
@import "~primeng/resources/primeng.min.css";
@import "~primeicons/primeicons.css";
+$height: '1000px';
+
nav.navbar {
height: 60px;
}
@@ -53,7 +55,7 @@ input.checkbox {
}
div.covex.sidebar {
- height: calc(100% - 70px);
+ height: calc(#{$height} - 70px);
overflow-y: auto;
overflow-x: hidden;
width: 340px;
@@ -109,7 +111,7 @@ div.card.network {
}
div.network {
- height: calc(100% - 200px);
+ height: calc(#{$height} - 200px);
}
div.parent {
@@ -134,7 +136,7 @@ div.center {
div.covex.explorer {
- height: calc(100% - 70px);
+ height: calc(#{$height} - 70px);
margin-left: 10px;
margin-right: 10px;
}
diff --git a/website/index.html b/website/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..0ccf46fa801aad83232e5c543f9f967687f44662
--- /dev/null
+++ b/website/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>DrugsToNe</title>
+</head>
+<body>
+
+DrugsToNe!
+
+</body>
+</html>