Skip to content
Snippets Groups Projects
Commit a8f4eead authored by AndiMajore's avatar AndiMajore
Browse files

adjusted production route and some other stuff

parent 29295607
No related branches found
Tags v1.0.9-rc4
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
drugsTone-build/drugsTone.js
+ 1
− 1
View file @ a8f4eead
This diff is collapsed.
drugsTone-build/styles.css
+ 2
− 2
View file @ a8f4eead
This diff is collapsed.
drugstone-test.html
+ 7
− 15
View file @ a8f4eead
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<!-- <script type = "text/javascript" src="/home/andimajore/projects/drugstOne/frontend/drugsTone-build/drugsTone.js"></script>--> <!-- <script type = "text/javascript" src="/home/andimajore/projects/drugstOne/frontend/drugsTone-build/drugsTone.js"></script>-->
<!-- <link rel="/home/andimajore/projects/drugstOne/frontend/drugsTone-build/drugsTone.css">--> <!-- <link rel="/home/andimajore/projects/drugstOne/frontend/drugsTone-build/drugsTone.css">-->
<script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.5.7/remote/drugsTone.js"></script> <script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.5.8/remote/drugsTone.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.5.7/remote/styles.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.5.8/remote/styles.css">
<script src="https://kit.fontawesome.com/3ad4fe992f.js"></script> <script src="https://kit.fontawesome.com/3ad4fe992f.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/highlight.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/highlight.min.js"></script>
<!-- <script>--> <!-- <script>-->
...@@ -25,19 +25,11 @@ ...@@ -25,19 +25,11 @@
<body style="background-color: var(--surface-b)"> <body style="background-color: var(--surface-b)">
<div style="height: 700px; width: 1300px;"> <div style="height: 700px; width: 1300px;">
<network-expander id="netexp1" <network-expander
config='{ id='drugstone-panel-1'
"nodeGroups": {"0.5": {"type": "gene", "color": "rgb(204, 255, 51)", "name": "0.5", "shape": "circle"}, "patient_group": {"type": "patient", "color": "red", "name": "patient group", "shape": "circle"}, "2.0": {"type": "gene", "color": "rgb(51, 204, 51)", "name": "2.0", "shape": "circle"}, "-2.0": {"type": "gene", "color": "rgb(255, 0, 0)", "name": "-2.0", "shape": "circle"}}, config='{"nodeGroups":{"0.5":{"type":"gene","color":"#CCFF33FF","name":"0.5","shape":"image","image":"http://simpleicon.com/wp-content/uploads/icon2.png"},"1.5":{"type":"gene","color":"#66FF33FF","name":"1.5","shape":"circle"},"2.0":{"type":"gene","color":"#33CC33FF","name":"2.0","shape":"circle"},"-2.0":{"type":"gene","color":"#FF0000FF","name":"-2.0","shape":"circle"}},"edgeGroups":{"custom":{"color":"black","name":"Custom Group"}},"identifier":"symbol","legendUrl":"https://exbio.wzw.tum.de/covex/assets/leg1.png"}'
"edgeGroups": {"custom": {"color": "black", "name": "Custom Group"}}, network='{"nodes":[{"id":"TP53","group":"0.5"},{"id":"C5","group":"0.5"},{"id":"Patient","group":"patient_group"},{"label":"PTEN","id":"PTEN","group":0.5}],"edges":[]}'>
"identifier": "symbol", </network-expander>
"legendUrl": "https://exbio.wzw.tum.de/covex/assets/leg1.png"
}'
network='{
"nodes": [{"id": "TP53", "group": "0.5"}, {"id": "C5", "group": "0.5"}, {"id": "Patient", "group": "patient_group"}, {"label": "PTEN", "id": "PTEN", "group": 0.5}],
"edges": []
}'
style="height: 100%; width: 100vw; display: block;"
></network-expander>
</div> </div>
</body> </body>
</html> </html>
package.json
+ 1
− 0
View file @ a8f4eead
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"ng": "ng", "ng": "ng",
"start:local": "ng serve --configuration=local", "start:local": "ng serve --configuration=local",
"start:remote": "ng serve --configuration=remote", "start:remote": "ng serve --configuration=remote",
"start:prod": "ng serve --configuration=production",
"build": "ng build", "build": "ng build",
"test": "ng test", "test": "ng test",
"lint": "ng lint && htmlhint", "lint": "ng lint && htmlhint",
......
src/styles.scss
+ 18
− 19
View file @ a8f4eead
...@@ -5,13 +5,7 @@ ...@@ -5,13 +5,7 @@
@import url('https://fonts.googleapis.com/css?family=Varela+Round'); @import url('https://fonts.googleapis.com/css?family=Varela+Round');
@import "~@ng-select/ng-select/themes/default.theme.css"; @import "~@ng-select/ng-select/themes/default.theme.css";
$family-sans-serif: "Varela Round", sans-serif; //@import "src/theme";
$primary: #48C774;
$success: #3070B3;
$danger: #EF476F;
$link: $primary;
$info: $primary;
@import "./theme.scss";
@import "~bulma/bulma.sass"; @import "~bulma/bulma.sass";
@import '~bulma-tooltip'; @import '~bulma-tooltip';
@import "~primeng/resources/primeng.min.css"; @import "~primeng/resources/primeng.min.css";
...@@ -29,7 +23,7 @@ $info: $primary; ...@@ -29,7 +23,7 @@ $info: $primary;
height: calc(100% - #{$network-footer-height}); height: calc(100% - #{$network-footer-height});
} }
.explorer-footer{ .explorer-footer {
//position: absolute; //position: absolute;
//overflow: auto; //overflow: auto;
//width: $main-width; //width: $main-width;
...@@ -76,8 +70,8 @@ div.covex.sidebar { ...@@ -76,8 +70,8 @@ div.covex.sidebar {
div.covex.bar-left { div.covex.bar-left {
float: left; float: left;
width: $sidebar-left-width; width: $sidebar-left-width;
max-width:300px; max-width: 300px;
min-width:$sidebar-left-min-width; min-width: $sidebar-left-min-width;
height: 100%; height: 100%;
} }
...@@ -85,15 +79,16 @@ div.covex.bar-left { ...@@ -85,15 +79,16 @@ div.covex.bar-left {
div.covex.bar-right { div.covex.bar-right {
float: left; float: left;
width: $sidebar-right-width; width: $sidebar-right-width;
max-width:450px; max-width: 450px;
min-width:$sidebar-right-min-width; min-width: $sidebar-right-min-width;
/* Hide scrollbar for Chrome, Safari and Opera */ /* Hide scrollbar for Chrome, Safari and Opera */
&::-webkit-scrollbar { &::-webkit-scrollbar {
display: none; display: none;
} }
/* Hide scrollbar for IE, Edge and Firefox */ /* Hide scrollbar for IE, Edge and Firefox */
-ms-overflow-style: none; /* IE and Edge */ -ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */ scrollbar-width: none; /* Firefox */
} }
...@@ -126,16 +121,19 @@ div.covex.network { ...@@ -126,16 +121,19 @@ div.covex.network {
} }
.center-panel{ .center-panel {
width: $main-width; width: $main-width;
&.leftgone{
&.leftgone {
width: calc(#{$main-width} + max(#{$sidebar-left-width},#{$sidebar-left-min-width})); width: calc(#{$main-width} + max(#{$sidebar-left-width},#{$sidebar-left-min-width}));
} }
&.rightgone{
&.rightgone {
width: calc(#{$main-width} + max(#{$sidebar-right-width},#{$sidebar-right-min-width})); width: calc(#{$main-width} + max(#{$sidebar-right-width},#{$sidebar-right-min-width}));
} }
&.rightgone.leftgone{
width: calc(#{$main-width} + max(#{$sidebar-left-width},#{$sidebar-left-min-width}) + max(#{$sidebar-right-width},#{$sidebar-right-min-width})); &.rightgone.leftgone {
width: calc(#{$main-width} + max(#{$sidebar-left-width},#{$sidebar-left-min-width}) + max(#{$sidebar-right-width},#{$sidebar-right-min-width}));
} }
} }
...@@ -212,6 +210,7 @@ div.field.has-addons.add-remove-toggle { ...@@ -212,6 +210,7 @@ div.field.has-addons.add-remove-toggle {
.field { .field {
margin-bottom: 0; margin-bottom: 0;
.control { .control {
margin-bottom: 0; margin-bottom: 0;
} }
......
src/theme.scss
+ 6
− 1
View file @ a8f4eead
$primary: #fd2020; $primary: #48C774;
$success: #3070B3;
$danger: #EF476F;
$background: 'white';
$link: $primary;
$info: $primary;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment