Skip to content
Snippets Groups Projects
Commit 4b43c231 authored by Maiykol's avatar Maiykol
Browse files

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

parents 93b11bfe d3fc875c
No related branches found
No related tags found
No related merge requests found
Pipeline #11038 failed
Expand all Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 77
− 77
View file @ 4b43c231
stages: #stages:
- setup # - setup
- check # - check
- build # - build
- deploy # - deploy
cache: #cache:
paths: # paths:
- node_modules/ # - node_modules/
setup: #setup:
image: trion/ng-cli-karma # image: trion/ng-cli-karma
stage: setup # stage: setup
script: # script:
- npm install # - npm install
tags: # tags:
- drugstone # - drugstone
check:lint: #check:lint:
image: trion/ng-cli-karma # image: trion/ng-cli-karma
stage: check # stage: check
script: # script:
- npm install # - npm install
- npm run lint # - npm run lint
dependencies: # dependencies:
- setup # - setup
tags: # tags:
- drugstone # - drugstone
#check:test: #check:test:
# image: trion/ng-cli-karma # image: trion/ng-cli-karma
...@@ -36,19 +36,19 @@ check:lint: ...@@ -36,19 +36,19 @@ check:lint:
# dependencies: # dependencies:
# - setup # - setup
build: #build:
image: trion/ng-cli-karma # image: trion/ng-cli-karma
stage: build # stage: build
artifacts: # artifacts:
paths: # paths:
- dist # - dist
script: # script:
- npm install # - npm install
- npm run build:netex # - npm run build:netex
dependencies: # dependencies:
- check:lint # - check:lint
tags: # tags:
- drugstone # - drugstone
# - check:test # - check:test
#deploy:release: #deploy:release:
...@@ -79,43 +79,43 @@ build: ...@@ -79,43 +79,43 @@ build:
# tags: # tags:
# - drugstone # - drugstone
deploy:dev: #deploy:dev:
image: docker # image: docker
stage: deploy # stage: deploy
only: # only:
- master # - master
services: # services:
- docker:dind # - docker:dind
variables: # variables:
CONTAINER_HOSTNAME: docker # CONTAINER_HOSTNAME: docker
before_script: # before_script:
- docker info # - docker info
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY # - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script: # script:
- docker build -t gitlab.lrz.de:5005/netex/frontend:dev -f ./Dockerfile.dev . # - docker build -t gitlab.lrz.de:5005/netex/frontend:dev -f ./Dockerfile.dev .
- docker push gitlab.lrz.de:5005/netex/frontend:dev # - docker push gitlab.lrz.de:5005/netex/frontend:dev
dependencies: # dependencies:
- build # - build
tags: # tags:
- drugstone # - drugstone
deploy:prod: #deploy:prod:
image: docker # image: docker
stage: deploy # stage: deploy
only: # only:
- production # - production
when: manual # when: manual
services: # services:
- docker:dind # - docker:dind
variables: # variables:
CONTAINER_HOSTNAME: docker # CONTAINER_HOSTNAME: docker
before_script: # before_script:
- docker info # - docker info
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY # - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script: # script:
- docker build -t gitlab.lrz.de:5005/netex/frontend:prod -f ./Dockerfile.prod . # - docker build -t gitlab.lrz.de:5005/netex/frontend:prod -f ./Dockerfile.prod .
- docker push gitlab.lrz.de:5005/netex/frontend:prod # - docker push gitlab.lrz.de:5005/netex/frontend:prod
dependencies: # dependencies:
- build # - build
tags: # tags:
- drugstone # - drugstone
drugsTone-build/drugsTone.js
+ 3
− 3
View file @ 4b43c231
This diff is collapsed.
drugstone-test.html
+ 12
− 31
View file @ 4b43c231
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.6.1/remote/drugsTone.js"></script>
<title>Website</title> <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.6.3/remote/styles.css">
<base href="/"> </head>
<meta name="viewport" content="width=device-width, initial-scale=1"> <body>
<link rel="icon" type="image/x-icon" href="favicon.ico"> <div style="height: 700px; width: 1300px;">
<!-- <script type = "text/javascript" src="/home/andimajore/projects/drugstOne/frontend/drugsTone-build/drugsTone.js"></script>--> <network-expander
<!-- <link rel="/home/andimajore/projects/drugstOne/frontend/drugsTone-build/drugsTone.css">--> id='drugstone-panel-1'
<script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.6.1/remote/drugsTone.js"></script> config='{"nodeGroups":{"0.5":{"type":"gene","color":"#CCFF33FF","groupName":"0.5","shape":"circle"},"1.5":{"type":"gene","color":"#66FF33FF","groupName":"1.5","shape":"circle"},"2.0":{"type":"gene","color":"#33CC33FF","groupName":"2.0","shape":"circle"},"patient_group":{"type":"gene","color":"#FF0000FF","groupName":"-2.0","shape":"circle"}},"edgeGroups":{"normal":{"color":"black","groupName":"Custom Group"},"dashed":{"color":"#000857","groupName":"Dashed","dashes":[18,2]}},"identifier":"symbol","legendUrl":"https://exbio.wzw.tum.de/covex/assets/leg1.png"}'
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.6.1/remote/styles.css"> 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":[{"from":"TP53","to":"C5","group":"dashed"},{"from":"TP53","to":"PTEN","group":"dashed"},{"from":"Patient","to":"C5","group":"normal"},{"from":"Patient","to":"PTEN","group":"normal"}]}'>
<script src="https://kit.fontawesome.com/3ad4fe992f.js"></script> </network-expander>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/highlight.min.js"></script> </div>
<!-- <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='drugstone-panel-1'
config='{"nodeGroups":{"0.5":{"type":"gene","color":"#CCFF33FF","name":"0.5","shape":"image","image":"http://simpleicon.com/wp-content/uploads/icon2.png"},"patient_group":{"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"}'
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":[]}'>
</network-expander>
</div>
</body> </body>
</html> </html>
releases/delete_tag.sh
+ 1
− 1
View file @ 4b43c231
...@@ -10,7 +10,7 @@ VERSION=v$1 ...@@ -10,7 +10,7 @@ VERSION=v$1
cd ../../ cd ../../
echo "Cloning Release Repo..." echo "Cloning Release Repo..."
git clone git@gitlab.lrz.de:netex/drugstone-website.git git clone git@github.com:AndiMajore/drugstone-releases.git
echo "Deleting Release Version..." echo "Deleting Release Version..."
cd drugstone-releases || echo "Error!" exit cd drugstone-releases || echo "Error!" exit
git push --delete origin "$VERSION" git push --delete origin "$VERSION"
......
releases/release_tag.sh
+ 1
− 1
View file @ 4b43c231
...@@ -18,7 +18,7 @@ MESSAGE=$2 ...@@ -18,7 +18,7 @@ MESSAGE=$2
cd ../../ cd ../../
echo "Cloning Release Repo..." echo "Cloning Release Repo..."
git clone git@gitlab.lrz.de:netex/drugstone-website.git git clone git@github.com:AndiMajore/drugstone-releases.git
echo "Updating Repo..." echo "Updating Repo..."
echo "Building release..." echo "Building release..."
......
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