Skip to content
Snippets Groups Projects
Commit 6eda522b authored by Maiykol's avatar Maiykol
Browse files

Merge branch 'master' of https://gitlab.lrz.de/netex/frontend

parents b00dd239 d2d37390
No related branches found
No related tags found
No related merge requests found
Pipeline #11028 failed
Stage: setup
Stage: check
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
angular.json
+ 19
− 0
View file @ 6eda522b
...@@ -48,6 +48,25 @@ ...@@ -48,6 +48,25 @@
] ]
}, },
"remote": { "remote": {
"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": "10kb"
}
]
}, },
"development": { "development": {
"fileReplacements": [ "fileReplacements": [
......
drugsTone-build/drugsTone.js
+ 1
− 1
View file @ 6eda522b
Source diff could not be displayed: it is too large. Options to address this: view the blob.
drugsTone-build/styles.css
+ 8
− 1
View file @ 6eda522b
Source diff could not be displayed: it is too large. Options to address this: view the blob.
drugstone-test.html 0 → 100644
+ 43
− 0
View file @ 6eda522b
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Website</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<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>-->
<!-- <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>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.5.7/remote/styles.css">
<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>-->
<!-- function highlightCode() {-->
<!-- var pres = document.querySelectorAll("pre>code");-->
<!-- for (var i = 0; i < pres.length; i++) {-->
<!-- hljs.highlightBlock(pres[i]);-->
<!-- }-->
<!-- }-->
<!-- highlightCode();-->
<!-- </script>-->
</head>
<body style="background-color: var(--surface-b)">
<div style="height: 700px; width: 1300px;">
<network-expander id="netexp1"
config='{
"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"}},
"edgeGroups": {"custom": {"color": "black", "name": "Custom Group"}},
"identifier": "symbol",
"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>
</body>
</html>
package.json
+ 3
− 1
View file @ 6eda522b
...@@ -11,11 +11,13 @@ ...@@ -11,11 +11,13 @@
"e2e": "ng e2e", "e2e": "ng e2e",
"build-prod": "ng build --configuration=production --output-hashing=none", "build-prod": "ng build --configuration=production --output-hashing=none",
"build-dev": "ng build --configuration=development --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", "package-es5": "cd dist/netex && cat runtime-es5.js polyfills-es5.js main-es5.js > bundle-es5.js",
"package-es2015": "cd dist/netex && cat runtime-es2015.js polyfills-es2015.js main-es2015.js > bundle-es2015.js", "package-es2015": "cd dist/netex && cat runtime-es2015.js polyfills-es2015.js main-es2015.js > bundle-es2015.js",
"bundle": "npm run build-prod netex && npm run package-es5 && npm run package-es2015", "bundle": "npm run build-prod netex && npm run package-es5 && npm run package-es2015",
"build:netex": "npm run build-prod netex && node build-netex.js", "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-dev": "npm run build-dev netex && node build-netex.js",
"build:netex-remote": "npm run build-remote netex && node build-netex.js"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
......
releases/release_tag.sh
+ 7
− 0
View file @ 6eda522b
...@@ -33,6 +33,13 @@ npm run build:netex-dev ...@@ -33,6 +33,13 @@ npm run build:netex-dev
cd ../ cd ../
cp frontend/drugsTone-build/* drugstone-releases/dev/ cp frontend/drugsTone-build/* drugstone-releases/dev/
echo "Building remote..."
cd frontend || exit
npm run build:netex-remote
cd ../
cp frontend/drugsTone-build/* drugstone-releases/remote/
cd drugstone-releases || echo "Error!" exit cd drugstone-releases || echo "Error!" exit
git commit -am "$VERSION commit: $MESSAGE" git commit -am "$VERSION commit: $MESSAGE"
git push git push
......
src/styles.scss
+ 2
− 0
View file @ 6eda522b
...@@ -11,12 +11,14 @@ $success: #3070B3; ...@@ -11,12 +11,14 @@ $success: #3070B3;
$danger: #EF476F; $danger: #EF476F;
$link: $primary; $link: $primary;
$info: $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";
@import "~primeicons/primeicons.css"; @import "~primeicons/primeicons.css";
@import "~animate.css/animate.min"; @import "~animate.css/animate.min";
@import "variables"; @import "variables";
.fullheight { .fullheight {
......
src/theme.scss 0 → 100644
+ 1
− 0
View file @ 6eda522b
$primary: #fd2020;
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