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

fixed ngprime style bleed problem

parent b65a6797
Branches
Tags
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 13184 additions and 27 deletions
angular.json
+ 27
− 0
View file @ 09800fff
......@@ -81,6 +81,33 @@
}
]
},
"dock1-production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.dock1.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "500kb"
}
]
},
"remote": {
"optimization": true,
"outputHashing": "all",
......
drugstone-test.html
+ 55
− 2
View file @ 09800fff
......@@ -2,7 +2,7 @@
<head>
<link rel="stylesheet" type="text/css" href="src/stylesheets/theme.css">
<script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.8.2-rc2/remote/drugsTone.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.8.2-rc2/remote/styles.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.8.2-rc7/remote/styles.css">
<!-- <link rel="stylesheet" type="text/css" href="./drugsTone-build/styles.css">-->
</head>
<body>
......@@ -10,7 +10,60 @@
<network-expander
id='drugstOne'
config='{"nodeGroups":{"patient":{"type":"patient","color":"#000000","font":{"color":"#f0f0f0"},"groupName":"Patient","shape":"image","image":"https://static.thenounproject.com/png/22780-200.png","shadow":true},"condition":{"type":"condition","color":"#000000","font":{"color":"#f0f0f0"},"groupName":"Condition","shape":"text","shadow":false},"important":{"type":"gene","color":"#ff881f","font":{"color":"#f0f0f0"},"groupName":"Important Gene","shape":"star","shadow":true},"gene":{"type":"gene","color":"#4da300","font":{"color":"#f0f0f0"},"groupName":"Gene","shape":"circle","shadow":true}},"edgeGroups":{"genotype":{"color":"white","groupName":"Relevant Gene","shadow":false},"has-condition":{"color":"white","groupName":"Has Condition","dashes":[2,2],"shadow":false},"ggi":{"color":"#ffffff","groupName":"Interaction","dashes":[3,2],"shadow":false}},"identifier":"symbol","title":"Breast cancer example network","nodeShadow":false,"edgeShadow":false,"showLegend":true}'
network='{"nodes":[{"id":"patient-1","group":"patient","x":592,"y":446},{"id":"patient-2","group":"patient","x":235,"y":87},{"id":"patient-3","group":"patient","x":105,"y":369},{"id":"ATM","label":"ATM","group":"gene","x":289,"y":242},{"id":"BARD1","label":"BARD1","group":"gene","x":44,"y":250},{"id":"BRCA1","label":"BRCA1","group":"gene","x":466,"y":576},{"id":"BRCA2","label":"BRCA2","group":"gene","x":507,"y":285},{"id":"BRIP1","label":"BRIP1","group":"gene","x":54,"y":474},{"id":"CHEK2","label":"CHEK2","group":"gene","x":216,"y":590},{"id":"CDH1","label":"CDH1","group":"gene","x":320,"y":-57},{"id":"NF1","label":"NF1","group":"gene","x":481,"y":111},{"id":"NBN","label":"NBN","group":"gene","x":-57,"y":314},{"id":"PALB2","label":"PALB2","group":"gene","x":450,"y":190},{"id":"PTEN","label":"PTEN","group":"important","x":305,"y":494},{"id":"RAD51C","label":"RAD51C","group":"gene","x":182,"y":-90},{"id":"RAD51D","label":"RAD51D","group":"gene","x":368,"y":73},{"id":"STK11","label":"STK11","group":"gene","x":686,"y":330},{"id":"TP53","label":"TP53","group":"important","x":333,"y":316},{"id":"subtype-1","label":"Subtype 1","group":"condition","x":556,"y":171},{"id":"subtype-2","label":"Subtype 2","group":"condition","x":-87,"y":221}],"edges":[{"from":"BRCA1","to":"BRCA2","group":"ggi"},{"from":"ATM","to":"BARD1","group":"ggi"},{"from":"BRCA1","to":"CHEK2","group":"ggi"},{"from":"RAD51C","to":"RAD51D","group":"ggi"},{"from":"STK11","to":"TP53","group":"ggi"},{"from":"TP53","to":"PALB2","group":"ggi"},{"from":"TP53","to":"RAD51D","group":"ggi"},{"from":"TP53","to":"NF1","group":"ggi"},{"from":"TP53","to":"BRCA1","group":"ggi"},{"from":"TP53","to":"BRCA2","group":"ggi"},{"from":"PTEN","to":"BRCA1","group":"ggi"},{"from":"PTEN","to":"BRCA2","group":"ggi"},{"from":"TP53","to":"PTEN","group":"ggi"},{"from":"ATM","to":"PTEN","group":"ggi"},{"from":"CDH1","to":"RAD51D","group":"ggi"},{"from":"CDH1","to":"PALB2","group":"ggi"},{"from":"NBN","to":"BRIP1","group":"ggi"},{"from":"BRIP1","to":"PTEN","group":"ggi"},{"from":"patient-1","to":"BRCA1","group":"genotype"},{"from":"patient-1","to":"TP53","group":"genotype"},{"from":"patient-1","to":"BRCA2","group":"genotype"},{"from":"patient-1","to":"PTEN","group":"genotype"},{"from":"patient-2","to":"TP53","group":"genotype"},{"from":"patient-2","to":"NF1","group":"genotype"},{"from":"patient-2","to":"BARD1","group":"genotype"},{"from":"patient-3","to":"TP53","group":"genotype"},{"from":"patient-3","to":"PTEN","group":"genotype"},{"from":"patient-3","to":"NBN","group":"genotype"},{"from":"patient-1","to":"subtype-1","group":"has-condition"},{"from":"patient-2","to":"subtype-1","group":"has-condition"},{"from":"patient-3","to":"subtype-2","group":"has-condition"}]}'
network='{"nodes": [{"id": "patient-1", "group": "patient","x": 592, "y": 446},
{"id": "patient-2", "group": "patient","x": 235, "y": 87},
{"id": "patient-3", "group": "patient","x": 105, "y": 369},
{"id": "ATM","label":"ATM", "group": "gene","x": 289, "y": 242},
{"id": "BARD1","label":"BARD1", "group": "gene","x": 44, "y": 250},
{"id": "BRCA1","label":"BRCA1", "group": "gene","x": 466, "y": 576},
{"id": "BRCA2","label":"BRCA2", "group": "gene","x": 507, "y": 285},
{"id": "BRIP1","label":"BRIP1", "group": "gene","x": 54, "y": 474},
{"id": "CHEK2","label":"CHEK2", "group": "gene","x": 216, "y": 590},
{"id": "CDH1","label":"CDH1", "group": "gene","x": 320, "y": -57},
{"id": "NF1","label":"NF1", "group": "gene","x": 481, "y": 111},
{"id": "NBN","label":"NBN", "group": "gene","x": -57, "y": 314},
{"id": "PALB2","label":"PALB2", "group": "gene","x": 450, "y": 190},
{"id": "PTEN", "label":"PTEN","group": "important","x": 305, "y": 494},
{"id": "RAD51C", "label":"RAD51C", "group": "gene","x": 182, "y": -90},
{"id": "RAD51D", "label":"RAD51D", "group": "gene","x": 368, "y": 73},
{"id": "STK11", "label":"STK11", "group": "gene","x": 686, "y": 330},
{"id": "TP53", "label":"TP53","group": "important","x": 333, "y": 316},
{"id": "subtype-1","label": "Subtype 1", "group": "condition","x": 556, "y": 171},
{"id": "subtype-2","label": "Subtype 2", "group": "condition","x": -87, "y": 221}],
"edges": [{"from": "BRCA1", "to": "BRCA2", "group": "ggi"},
{"from": "ATM", "to": "BARD1", "group": "ggi"},
{"from": "BRCA1", "to": "CHEK2", "group": "ggi"},
{"from": "RAD51C", "to": "RAD51D", "group": "ggi"},
{"from": "STK11", "to": "TP53", "group": "ggi"},
{"from": "TP53", "to": "PALB2", "group": "ggi"},
{"from": "TP53", "to": "RAD51D", "group": "ggi"},
{"from": "TP53", "to": "NF1", "group": "ggi"},
{"from": "TP53", "to": "BRCA1", "group": "ggi"},
{"from": "TP53", "to": "BRCA2", "group": "ggi"},
{"from": "PTEN", "to": "BRCA1", "group": "ggi"},
{"from": "PTEN", "to": "BRCA2", "group": "ggi"},
{"from": "TP53", "to": "PTEN", "group": "ggi"},
{"from": "ATM", "to": "PTEN", "group": "ggi"},
{"from": "CDH1", "to": "RAD51D", "group": "ggi"},
{"from": "CDH1", "to": "PALB2", "group": "ggi"},
{"from": "NBN", "to": "BRIP1", "group": "ggi"},
{"from": "BRIP1", "to": "PTEN", "group": "ggi"},
{"from": "patient-1", "to": "BRCA1", "group": "genotype"},
{"from": "patient-1", "to": "TP53", "group": "genotype"},
{"from": "patient-1", "to": "BRCA2", "group": "genotype"},
{"from": "patient-1", "to": "PTEN", "group": "genotype"},
{"from": "patient-2", "to": "TP53", "group": "genotype"},
{"from": "patient-2", "to": "NF1", "group": "genotype"},
{"from": "patient-2", "to": "BARD1", "group": "genotype"},
{"from": "patient-3", "to": "TP53", "group": "genotype"},
{"from": "patient-3", "to": "PTEN", "group": "genotype"},
{"from": "patient-3", "to": "NBN", "group": "genotype"},
{"from": "patient-1", "to":"subtype-1", "group":"has-condition"},
{"from": "patient-2", "to":"subtype-1", "group":"has-condition"},
{"from": "patient-3", "to":"subtype-2", "group":"has-condition"}
]}'
task-id='EkxzkoNW7KjWc7Kq9kLQClfnCy5GI1ht'
>
</network-expander>
......
netex/assets/styles/theme.css 0 → 100644
+ 6538
− 0
View file @ 09800fff
This diff is collapsed.
package.json
+ 3
− 1
View file @ 09800fff
{
"name": "netex",
"version": "0.7.1",
"version": "0.8.3-rc2",
"scripts": {
"ng": "ng",
"start:local": "ng serve --configuration=local",
......@@ -12,6 +12,7 @@
"e2e": "ng e2e",
"build-prod": "ng build --configuration=production --output-hashing=none",
"build-uhh": "ng build --configuration=uhh-production --output-hashing=none",
"build-dock1": "ng build --configuration=dock1-production --output-hashing=none",
"build-dev": "ng build --configuration=development --output-hashing=none",
"build-remote": "ng build --configuration=remote --output-hashing=none",
"package-es5": "cd dist/netex && cat runtime-es5.js polyfills-es5.js main-es5.js > bundle-es5.js",
......@@ -20,6 +21,7 @@
"build:netex": "npm run build-prod netex && node build-netex.js",
"build:netex-dev": "npm run build-dev netex && node build-netex.js",
"build:netex-uhh": "npm run build-uhh netex && node build-netex.js",
"build:netex-dock1": "npm run build-dock1 netex && node build-netex.js",
"build:netex-remote": "npm run build-remote netex && node build-netex.js",
"prefix": "bash prefix_styles.sh",
"prefixcss": "postcss -r drugsTone-build/styles.css"
......
releases/release_tag.sh
+ 9
− 4
View file @ 09800fff
......@@ -39,12 +39,17 @@ npm run build:netex-remote
cd ../
cp frontend/drugsTone-build/* drugstone-releases/remote/
echo "Building v-server..."
echo "Building v-server dock1..."
cd frontend || exit
npm run build:netex-uhh
npm run build:netex-dock1
cd ../
cp frontend/drugsTone-build/* drugstone-releases/uhh/
cp frontend/drugsTone-build/* drugstone-releases/dock1/
#echo "Building v-server dock2..."
#cd frontend || exit
#npm run build:netex-uhh
#cd ../
#cp frontend/drugsTone-build/* drugstone-releases/uhh/
cd drugstone-releases || echo "Error!" exit
git commit -am "$VERSION commit: $MESSAGE"
......
src/app/config.ts
+ 1
− 1
View file @ 09800fff
......@@ -72,7 +72,7 @@ export const defaultConfig: IConfig = {
legendUrl: '', // 'https://exbio.wzw.tum.de/covex/assets/leg1.png' show legend image if set, otherwise default legend
legendClass: 'legend',
legendPos: 'left',
taskName: 'Run Task X',
taskName: 'Find Drug Candidates',
showLegendNodes: true,
showLegendEdges: true,
showLeftSidebar: true,
......
src/assets/styles/theme.css 0 → 100644
+ 6538
− 0
View file @ 09800fff
This diff is collapsed.
src/environments/environment.prod.dock1.ts 0 → 100644
+ 4
− 0
View file @ 09800fff
export const environment = {
production: true,
backend: 'http://ml-s-zbhdock1.ad.uni-hamburg.de/drugstone_api/',
};
src/index.html
+ 3
− 15
View file @ 09800fff
......@@ -43,20 +43,8 @@
<div style="width: 1300px">
<network-expander id="netexp1"
config='{
"nodeGroups": {"selectedNode": {"font": {"size": "18"} }, "0.5": {"shadow":"true","font": "18px verdana blue", "type": "0.5er Instanz", "color": "green", "groupName": "0.5", "shape": "star"}, "patientgroup": {"type": "Patient", "detailShowLabel": "true", "color": "#632345", "groupName": "patient group", "shape": "text", "size": "50"}, "pugGroup": {"type": "woof woof", "color": "grey", "groupName": "Pug Group", "shape": "triangle", "image": "https://static.raymondcamden.com/images/2016/11/pug.png"}},
"edgeGroups": {"xxx": {"color": "black", "groupName": "xxx Group", "dashes": [1, 2]}, "notdashes": {"color": "black", "groupName": "not dashes Group"}},
"identifier": "symbol",
"nodeShadow": true,
"edgeShadow": true,
"interactionProteinProtein": "APID",
"interactionDrugProtein": "ChEMBL"
}'
network='{
"nodes": [{"id": "TP53", "group": "0.5"}, {"id": "MYC", "group": "pugGroup"}, {"id": "Patient No. 5", "group": "patientgroup"}, {"label": "PTEN", "id": "PTEN", "group": 0.5, "value":"5"}],
"edges": [
]
config='{"nodeGroups":{"patient":{"type":"patient","color":"#000000","font":{"color":"#f0f0f0"},"groupName":"Patient","shape":"image","image":"https://static.thenounproject.com/png/22780-200.png"},"condition":{"type":"condition","color":"#000000","font":{"color":"#f0f0f0"},"groupName":"Condition","shape":"text"},"important":{"type":"gene","color":"#ff881f","font":{"color":"#f0f0f0"},"groupName":"Important Gene","shape":"star"},"gene":{"type":"gene","color":"#4da300","font":{"color":"#f0f0f0"},"groupName":"Gene","shape":"circle"},"foundDrug":{"type":"drug","color":{"border":"#F12590","background":"#F12590","highlight":{"border":"#F12590","background":"#F12590"}},"font":{"color":"#f0f0f0"},"groupName":"Drug","shape":"diamond"}},"edgeGroups":{"genotype":{"color":"white","groupName":"Relevant Gene"},"has-condition":{"color":"white","groupName":"Has Condition","dashes":[2,2]},"default":{"color":"#ffffff","groupName":"default edge"},"ggi":{"color":"#ffffff","groupName":"Interaction","dashes":[3,2]}},"identifier":"symbol","title":"Breast cancer example network","nodeShadow":true,"edgeShadow":false,"autofillEdges":false,"showLegend":true}'
network='{"nodes":[{"id":"patient-1","group":"patient","x":592,"y":446},{"id":"patient-2","group":"patient","x":235,"y":87},{"id":"patient-3","group":"patient","x":105,"y":369},{"id":"ATM","label":"ATM","group":"gene","x":289,"y":242},{"id":"BARD1","label":"BARD1","group":"gene","x":44,"y":250},{"id":"BRCA1","label":"BRCA1","group":"gene","x":466,"y":576},{"id":"BRCA2","label":"BRCA2","group":"gene","x":507,"y":285},{"id":"BRIP1","label":"BRIP1","group":"gene","x":54,"y":474},{"id":"CHEK2","label":"CHEK2","group":"gene","x":216,"y":590},{"id":"CDH1","label":"CDH1","group":"gene","x":320,"y":-57},{"id":"NF1","label":"NF1","group":"gene","x":481,"y":111},{"id":"NBN","label":"NBN","group":"gene","x":-57,"y":314},{"id":"PALB2","label":"PALB2","group":"gene","x":450,"y":190},{"id":"PTEN","label":"PTEN","group":"important","x":305,"y":494},{"id":"RAD51C","label":"RAD51C","group":"gene","x":182,"y":-90},{"id":"RAD51D","label":"RAD51D","group":"gene","x":368,"y":73},{"id":"STK11","label":"STK11","group":"gene","x":686,"y":330},{"id":"TP53","label":"TP53","group":"important","x":333,"y":316},{"id":"subtype-1","label":"Subtype 1","group":"condition","x":556,"y":171},{"id":"subtype-2","label":"Subtype 2","group":"condition","x":-87,"y":221}],"edges":[{"from":"BRCA1","to":"BRCA2","group":"ggi"},{"from":"ATM","to":"BARD1","group":"ggi"},{"from":"BRCA1","to":"CHEK2","group":"ggi"},{"from":"RAD51C","to":"RAD51D","group":"ggi"},{"from":"STK11","to":"TP53","group":"ggi"},{"from":"TP53","to":"PALB2","group":"ggi"},{"from":"TP53","to":"RAD51D","group":"ggi"},{"from":"TP53","to":"NF1","group":"ggi"},{"from":"TP53","to":"BRCA1","group":"ggi"},{"from":"TP53","to":"BRCA2","group":"ggi"},{"from":"PTEN","to":"BRCA1","group":"ggi"},{"from":"PTEN","to":"BRCA2","group":"ggi"},{"from":"TP53","to":"PTEN","group":"ggi"},{"from":"ATM","to":"PTEN","group":"ggi"},{"from":"CDH1","to":"RAD51D","group":"ggi"},{"from":"CDH1","to":"PALB2","group":"ggi"},{"from":"NBN","to":"BRIP1","group":"ggi"},{"from":"BRIP1","to":"PTEN","group":"ggi"},{"from":"patient-1","to":"BRCA1","group":"genotype"},{"from":"patient-1","to":"TP53","group":"genotype"},{"from":"patient-1","to":"BRCA2","group":"genotype"},{"from":"patient-1","to":"PTEN","group":"genotype"},{"from":"patient-2","to":"TP53","group":"genotype"},{"from":"patient-2","to":"NF1","group":"genotype"},{"from":"patient-2","to":"BARD1","group":"genotype"},{"from":"patient-3","to":"TP53","group":"genotype"},{"from":"patient-3","to":"PTEN","group":"genotype"},{"from":"patient-3","to":"NBN","group":"genotype"},{"from":"patient-1","to":"subtype-1","group":"has-condition"},{"from":"patient-2","to":"subtype-1","group":"has-condition"},{"from":"patient-3","to":"subtype-2","group":"has-condition"}]}'>
}'
></network-expander>
</div>
......
src/stylesheets/primeng.scss
+ 5
− 3
View file @ 09800fff
@import '../../node_modules/primeng/resources/themes/md-dark-deeppurple/theme.css';
@import "../../node_modules/primeng/resources/primeng.min.css";
@import "../../node_modules/primeicons/primeicons.css";
.drgstn {
@import '../../node_modules/primeng/resources/primeng.min';
@import '../assets/styles/theme';
.p-tooltip-text, .p-tooltip-arrow {
background: var(--drgstn-tooltip) !important;
border-radius: 2px !important;
......
src/stylesheets/styles.scss
+ 1
− 1
View file @ 09800fff
@charset "utf-8";
@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";
@import "../../node_modules/bulma/bulma";
@import "../../node_modules/animate.css/animate.min.css";
@import "variables";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment