diff --git a/src/app/components/task-list/task-list.component.html b/src/app/components/task-list/task-list.component.html
index 1c44521f3a3a28c113a1a28f9d3752da6b464730..a144771005999160e307d6978773936626724aec 100644
--- a/src/app/components/task-list/task-list.component.html
+++ b/src/app/components/task-list/task-list.component.html
@@ -18,7 +18,7 @@
>
</div>
<div class="column is-2">
- <span class="icon "
+ <span class="icon is-pulled-right"
><i class="fas fa-pause" aria-hidden="true"></i
></span>
</div>
@@ -46,7 +46,7 @@
</small>
</div>
<div class="column is-2 pt-0 pb-0">
- <a (click)="analysis.removeTask(task.token)" class="text-danger">
+ <a (click)="analysis.removeTask(task.token)" class="text-danger is-pulled-right">
<span class="icon">
<i class="fa fa-trash"></i>
</span>
@@ -67,7 +67,7 @@
>
</div>
<div class="column is-2">
- <span class="icon"
+ <span class="icon is-pulled-right"
><i class="fas fa-spinner fa-spin" aria-hidden="true"></i
></span>
</div>
@@ -79,7 +79,7 @@
<div class="column is-2 pt-0 pb-0">
<a
(click)="analysis.removeTask(task.token)"
- class=" text-danger"
+ class="text-danger is-pulled-right"
>
<span class="icon">
<i class="fa fa-trash"></i>
@@ -112,7 +112,7 @@
>
</div>
<div class="column is-2">
- <span class="icon"
+ <span class="icon is-pulled-right"
><i class="fas fa-check" aria-hidden="true"></i
></span>
</div>
@@ -122,7 +122,7 @@
<small>Finished {{ task.info.finishedAt | date: "short" }}</small>
</div>
<div class="column is-2 pt-0 pb-0">
- <a (click)="analysis.removeTask(task.token)" class="text-danger">
+ <a (click)="analysis.removeTask(task.token)" class="text-danger is-pulled-right">
<span class="icon">
<i class="fa fa-trash"></i>
</span>
@@ -143,7 +143,7 @@
>
</div>
<div class="column is-2">
- <span class="icon "
+ <span class="icon is-pulled-right"
><i class="fas fa-exclamation-triangle" aria-hidden="true"></i
></span>
</div>
@@ -155,7 +155,7 @@
<div class="column is-2 pt-0 pb-0">
<a
(click)="analysis.removeTask(task.token)"
- class=" text-danger"
+ class="text-danger is-pulled-right"
>
<span class="icon ">
<i class="fa fa-trash"></i>
diff --git a/src/app/dialogs/launch-analysis/launch-analysis.component.html b/src/app/dialogs/launch-analysis/launch-analysis.component.html
index fe6c5a5cc7374237bb11565ea894e8b477b9967a..317d61cdace7dc3727632cd31c881bb9a27b77dd 100644
--- a/src/app/dialogs/launch-analysis/launch-analysis.component.html
+++ b/src/app/dialogs/launch-analysis/launch-analysis.component.html
@@ -222,7 +222,7 @@
<h6 class="is-6">About Degree Centrality</h6>
<p>
Degree Centrality assigns an importance score based simply on the number of links held by each node.
- In CoVex, we use a modified version which does not consider all links but only the neighbouring seeds.
+ In Drugst.One, we use a modified version which does not consider all links but only the neighbouring seeds.
</p>
</div>
</div>
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index 6f28ac422af6877dde3ce7af8542bc192c5cc614..f60204a703cab31836613f78e8bacf6cbdce317f 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -25,9 +25,11 @@
</app-add-expressed-proteins>
<!-- Start explorer -->
- <div class="covex explorer">
+ <div class="drugstone explorer columns is-gapless" [ngClass]="{ 'is-flex-direction-row-reverse': myConfig.sidebarPos === 'right' }">
<!-- Start left sidebar -->
- <div class="covex sidebar" [ngClass]="{ 'is-pulled-right': myConfig.sidebarPos === 'right' }">
+ <div
+ class="drugstone sidebar column"
+ >
<div *ngIf="myConfig.showItemSelector" class="card bar-large mt-0">
<header
class="card-header"
@@ -38,8 +40,8 @@
<i class="fas fa-info" aria-hidden="true"></i>
</span>
<!-- <i *ngIf="selectedWrapper && selectedWrapper.data.netexId && selectedWrapper.data.netexId.startsWith('p')" class="fas fa-dna" aria-hidden="true"></i>
- <i *ngIf="selectedWrapper && selectedWrapper.data.netexId && selectedWrapper.data.netexId.startsWith('d')" class="fas fa-capsules"
- aria-hidden="true"></i> -->
+ <i *ngIf="selectedWrapper && selectedWrapper.data.netexId && selectedWrapper.data.netexId.startsWith('d')" class="fas fa-capsules"
+ aria-hidden="true"></i> -->
<span *ngIf="!selectedWrapper">No item selected</span>
<span *ngIf="selectedWrapper">
<span>{{ selectedWrapper.data.type }}</span>
@@ -99,13 +101,13 @@
<div class="card-content">
<nav class="level" *ngIf="proteinData">
<!-- TO DO : CHANGE THIS LATER
- <div class="level-item has-text-centered">
- <div>
- <p class="heading">Viral<br>Proteins</p>
- <p class="title"> {{ proteinData.effects.length }}</p>
- </div>
- </div>
- -->
+ <div class="level-item has-text-centered">
+ <div>
+ <p class="heading">Viral<br>Proteins</p>
+ <p class="title"> {{ proteinData.effects.length }}</p>
+ </div>
+ </div>
+ -->
<div class="level-item has-text-centered">
<div>
@@ -510,7 +512,10 @@
class="card-content overflow task-list-container"
*ngIf="analysis.tasks && analysis.tasks.length > 0"
>
- <app-task-list [(token)]="selectedAnalysisToken" [smallStyle]="smallStyle"></app-task-list>
+ <app-task-list
+ [(token)]="selectedAnalysisToken"
+ [smallStyle]="smallStyle"
+ ></app-task-list>
</div>
<footer class="card-footer">
<a
@@ -615,60 +620,60 @@
</div>
<!-- <footer class="card-footer" *ngIf="selectedAnalysisToken">
- <a (click)="analysis.addSeeds(currentViewNodes)"
- class="card-footer-item has-text-success" tooltipPosition="top" pTooltip="Add all visible seeds.">
+ <a (click)="analysis.addSeeds(currentViewNodes)"
+ class="card-footer-item has-text-success" tooltipPosition="top" pTooltip="Add all visible seeds.">
- <span class="icon">
- <i class="fa fa-plus"></i>
- </span>
- <span>
- Add seeds
- </span>
- </a>
- <a (click)="analysis.removeSeeds(currentViewNodes)"
- class="card-footer-item text-danger" tooltipPosition="top" pTooltip="Remove all seeds.">
- <span class="icon">
- <i class="fa fa-minus"></i>
- </span>
- <span>
- Remove seeds
- </span>
- </a>
- </footer>
+ <span class="icon">
+ <i class="fa fa-plus"></i>
+ </span>
+ <span>
+ Add seeds
+ </span>
+ </a>
+ <a (click)="analysis.removeSeeds(currentViewNodes)"
+ class="card-footer-item text-danger" tooltipPosition="top" pTooltip="Remove all seeds.">
+ <span class="icon">
+ <i class="fa fa-minus"></i>
+ </span>
+ <span>
+ Remove seeds
+ </span>
+ </a>
+ </footer>
- <footer class="card-footer">
- <a (click)="showCustomProteinsDialog = true"
- class="card-footer-item text-primary"
- tooltipPosition="top" pTooltip="Add a custom list of proteins.">
- <span class="icon">
- <i class="fa fa-upload"></i>
- </span>
- <span>
- Custom proteins
- </span>
+ <footer class="card-footer">
+ <a (click)="showCustomProteinsDialog = true"
+ class="card-footer-item text-primary"
+ tooltipPosition="top" pTooltip="Add a custom list of proteins.">
+ <span class="icon">
+ <i class="fa fa-upload"></i>
+ </span>
+ <span>
+ Custom proteins
+ </span>
+ </a>
+ <a (click)="showThresholdDialog = true"
+ class="card-footer-item text-primary"
+ pTooltip="Add proteins expressed in the tissue." tooltipPosition="top">
+ <span class="icon">
+ <i class="fas fa-angle-double-up"></i>
+ </span>
+ <span>
+ Tissue proteins
+ </span>
</a>
- <a (click)="showThresholdDialog = true"
- class="card-footer-item text-primary"
- pTooltip="Add proteins expressed in the tissue." tooltipPosition="top">
- <span class="icon">
- <i class="fas fa-angle-double-up"></i>
- </span>
- <span>
- Tissue proteins
- </span>
- </a>
- </footer> -->
+ </footer> -->
<footer class="card-footer">
<!-- <a (click)="analysis.invertSelection(currentViewNodes)" class="card-footer-item text-primary"
- tooltipPosition="top" pTooltip="Invert the current selection.">
- <span class="icon">
- <i class="fa fa-sync"></i>
- </span>
- <span>
- Invert
- </span>
- </a> -->
+ tooltipPosition="top" pTooltip="Invert the current selection.">
+ <span class="icon">
+ <i class="fa fa-sync"></i>
+ </span>
+ <span>
+ Invert
+ </span>
+ </a> -->
<a
*ngIf="analysis.getSelection().length"
(click)="analysis.resetSelection()"
@@ -690,7 +695,7 @@
</div>
<!-- Start network block -->
- <div class="covex network center-panel" id="main-column">
+ <div class="drugstone network column" id="main-column">
<div class="analysis-view" *ngIf="selectedAnalysisToken">
<app-analysis-panel
[(token)]="selectedAnalysisToken"
@@ -869,8 +874,8 @@
<!-- End network block -->
<div class="is-hidden-tablet mobile-fallback">
- Sorry, CoVex is not available for mobile phones. To find information
- about CoVex, please check the <a routerLink="/about">About</a> page or
+ Sorry, drugstone is not available for mobile phones. To find information
+ about drugstone, please check the <a routerLink="/about">About</a> page or
visit this page with another device with a larger screen.
</div>
</div>
diff --git a/src/app/services/analysis/analysis.service.ts b/src/app/services/analysis/analysis.service.ts
index 0752bd504f9dc66a1ee2ca704a811fb063edf310..cc49fe19a0dd0a4188895b1445c1e83965c84078 100644
--- a/src/app/services/analysis/analysis.service.ts
+++ b/src/app/services/analysis/analysis.service.ts
@@ -394,7 +394,7 @@ export class AnalysisService {
clearInterval(this.intervalId);
}
// 5000
- this.intervalId = setInterval(watch, 5000);
+ this.intervalId = setInterval(watch, 5000000);
}
diff --git a/src/stylesheets/styles.scss b/src/stylesheets/styles.scss
index 061b8a7d832acb8cc54f028dda595b9dd05b1a8d..db064d85ec7b02edfb6707eebf8456c49b1193da 100644
--- a/src/stylesheets/styles.scss
+++ b/src/stylesheets/styles.scss
@@ -104,12 +104,10 @@
margin-left: 15px;
}
- div.covex.sidebar {
+ div.drugstone.sidebar {
height: $height;
overflow-y: auto;
overflow-x: hidden;
- float: left;
- width: $sidebar-width;
max-width: $sidebar-max-width;
min-width: $sidebar-min-width;
height: 100%;
@@ -144,18 +142,12 @@
max-height: 350px;
}
- div.covex.network {
+ div.drugstone.network {
height: 100%;
- float: left;
position: relative;
}
- .center-panel {
- width: $main-width;
- max-width: $main-max-width;
- }
-
div.card.network {
width: 100%;
height: $height;
@@ -176,7 +168,7 @@
}
- div.covex.explorer {
+ div.drugstone.explorer {
height: #{$height};
margin-left: 10px;
margin-right: 10px;
diff --git a/src/stylesheets/variables.scss b/src/stylesheets/variables.scss
index be773f9037ca85b08d16b8137384b9800aa41d5b..7931dc94beac2b62d00848624520c27840816dbb 100644
--- a/src/stylesheets/variables.scss
+++ b/src/stylesheets/variables.scss
@@ -34,13 +34,8 @@ $legend-diamond-size: 25px;
$height: 100%;
-// Settings Interface Components
-$sidebar-width: 25%;
-$sidebar-min-width: 235px;
-$sidebar-max-width: 320px;
-$main-width: calc(100% - (max(#{$sidebar-width},#{$sidebar-min-width})));
-$main-max-width: calc(100% - (min(#{$sidebar-width},#{$sidebar-max-width})));
-
+$sidebar-max-width: 25%;
+$sidebar-min-width: 240px;
// settings for different screen sizes
$b-text-small-font-size: 14px;