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

fixed releasing and tagging somewhat

parent 33512b49
No related branches found
No related tags found
No related merge requests found
Pipeline #11012 failed
Stage: setup
Stage: check
Stage: build
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 0
View file @ a5089004
...@@ -46,3 +46,4 @@ testem.log ...@@ -46,3 +46,4 @@ testem.log
Thumbs.db Thumbs.db
.idea .idea
drugsTone-build
drugsTone-build/drugsTone.js
+ 1
− 1
View file @ a5089004
This diff is collapsed.
releases/release_tag.sh
+ 14
− 18
View file @ a5089004
...@@ -16,27 +16,23 @@ fi ...@@ -16,27 +16,23 @@ fi
VERSION=v$1 VERSION=v$1
MESSAGE=$2 MESSAGE=$2
cd ../ cd ../../
if [ -z "$3" ]
then
echo "Building..."
npm run build:netex
else
echo "Building dev..."
npm run build:netex-dev
VERSION=$VERSION
fi
cd ../
echo "Cloning Release Repo..." echo "Cloning Release Repo..."
git clone git@github.com:AndiMajore/drugstone-releases.git git clone git@github.com:AndiMajore/drugstone-releases.git
echo "Updating Repo..." echo "Updating Repo..."
if [ -z "$3" ]
then echo "Building release..."
cp frontend/drugsTone-build/* drugstone-releases/releases/ cd frontend || exit
else npm run build:netex
cp frontend/drugsTone-build/* drugstone-releases/dev/ cd ../
fi cp frontend/drugsTone-build/* drugstone-releases/releases/
echo "Building dev..."
cd frontend || exit
npm run build:netex-dev
cd ../
cp frontend/drugsTone-build/* drugstone-releases/dev/
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/app/pages/explorer-page/explorer-page.component.ts
+ 0
− 7
View file @ a5089004
...@@ -216,15 +216,9 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -216,15 +216,9 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
const network = JSON.parse(this.networkJSON); const network = JSON.parse(this.networkJSON);
// map data to nodes in backend // map data to nodes in backend
console.log('before')
console.log( this.myConfig.identifier)
console.log(network.nodes)
if (network.nodes.length) { if (network.nodes.length) {
network.nodes = await this.netex.mapNodes(network.nodes, this.myConfig.identifier); network.nodes = await this.netex.mapNodes(network.nodes, this.myConfig.identifier);
} }
console.log('after')
console.log(network.nodes)
this.proteins = network.nodes; this.proteins = network.nodes;
this.edges = network.edges; this.edges = network.edges;
} }
...@@ -277,7 +271,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -277,7 +271,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
this.nodeData.nodes = new vis.DataSet(nodes); this.nodeData.nodes = new vis.DataSet(nodes);
this.nodeData.edges = new vis.DataSet(edges); this.nodeData.edges = new vis.DataSet(edges);
console.log(this.nodeData);
const container = this.networkEl.nativeElement; const container = this.networkEl.nativeElement;
const options = NetworkSettings.getOptions('main'); const options = NetworkSettings.getOptions('main');
this.networkInternal = new vis.Network(container, this.nodeData, options); this.networkInternal = new vis.Network(container, this.nodeData, options);
......
website/index.html
+ 2
− 2
View file @ a5089004
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>DrugsToNe</title> <title>DrugsToNe</title>
<script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@master/releases/drugsTone.js"></script> <script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.4/dev/drugsTone.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@master/dev/styles.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.4/dev/styles.css">
</head> </head>
<body> <body>
......
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