Commit b659076c authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼
Browse files

Merge branch '157-replace-pintura-files-by-npm-package' into develop

parents 7b11f6d0 3a0d98b1
variables:
GIT_SUBMODULE_STRATEGY: normal
DOCKER_TAG: ${CI_COMMIT_REF_NAME}
DOCKER_IMAGE_DEV: villas/web-dev:${CI_COMMIT_REF_NAME}
cache:
untracked: true
key: "$CI_PROJECT_ID"
key: ${CI_PROJECT_ID}
paths:
- node_modules/
- _site/vendor/
......@@ -14,11 +16,12 @@ stages:
- prepare
- build
- test
- deploy
prepare:
stage: prepare
script:
- docker build -t villas/web-dev .
- docker build -t ${DOCKER_IMAGE_DEV} -f packaging/docker/Dockerfile.dev .
tags:
- linux
- shell
......@@ -30,7 +33,7 @@ build_job:
script:
- npm install
- npm run build
image: villas/web-dev
image: ${DOCKER_IMAGE_DEV}
artifacts:
paths:
- build/
......@@ -42,8 +45,22 @@ test_job:
stage: test
script:
- npm test
image: villas/web-dev
image: ${DOCKER_IMAGE_DEV}
dependencies:
- build_job
tags:
- docker
deploy:docker:
stage: deploy
script:
- docker build -t ${DOCKER_IMAGE} -f packaging/docker/Dockerfile .
- docker tag villas/web:${DOCKER_TAG} villas/web:latest
- docker push villas/web:${DOCKER_TAG}
- docker push villas/web:latest
tags:
- shell
- linux
only:
refs:
- master
FROM node:8.2
# Create app directory
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app
# use changes to package.json to force Docker not to use the cache
# when we change our application's nodejs dependencies:
ADD package.json /usr/src/app
RUN npm install
# Install app dependencies
COPY . /usr/src/app
RUN npm run build
# Run the app in a local webserver
RUN npm install -g serve
EXPOSE 5000
CMD [ "serve", "-s", "build" ]
packaging/docker/Dockerfile
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -19,7 +19,10 @@
"file-saver": "^1.3.8",
"flux": "^3.1.2",
"gaugeJS": "^1.3.2",
"handlebars": "^4.1.1",
"immutable": "^3.8.1",
"jszip": "^3.2.0",
"libcimsvg": "git+https://git.rwth-aachen.de/acs/public/cim/pintura-npm-package.git",
"lodash": "^4.17.11",
"prop-types": "^15.6.2",
"rc-slider": "^8.6.3",
......@@ -36,7 +39,7 @@
"react-rnd": "^7.4.3",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-scripts": "^1.1.5",
"react-scripts": "^3.0.1",
"react-sortable-tree": "^0.1.19",
"react-svg-pan-zoom": "^2.18.0",
"superagent": "^3.8.3",
......@@ -51,5 +54,17 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
"proxy": "http://localhost:4000"
"proxy": "http://localhost:4000",
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
FROM node:12.2 AS builder
RUN apt-get install -y \
git
# Create app directory
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app
# use changes to package.json to force Docker not to use the cache
# when we change our application's nodejs dependencies:
ADD package.json /usr/src/app
RUN npm install
# Install app dependencies
COPY . /usr/src/app
RUN npm run build
FROM nginx
COPY --from=builder /usr/src/app/build /usr/share/nginx/html
FROM node:12.2
RUN apt-get install -y \
git
#menu {
color:#fff!important;
background-color:#000!important
}
.dark-grey-background {
color:black;
background:#aaa;
}
.light-grey-background {
color:black;
background:#ddd;
}
.blue-grey-background {
color:white;
background:#607d8b;
}
.floating-panel-item {
font-size:12px;
}
#floating-panel-list-div {
background:#aaa;
}
.floating-panel-list {
background:grey;
border:none;
}
.w3-ul li {
border-bottom:0px;
}
#sidebar {
background:#607d8b;
border-right:thick solid white;
}
.component-type-name {
color:black;
font-size:12px;
}
.floating-panel-name {
font-size:12px;
}
.dark-font {
color:black;
}
.dropdown-menu {
border:medium solid black;
background:#607d8b;
border:medium solid black;
border-width: 1px 1px 1px 1px;
}
.dropdown-menu h4 {
color:white;
}
.dropdown-menu a {
color: black;
background:#ddd;
font-size:14px;
}
.dropdown-menu a:hover {
background:#bbb;
color: white;
}
.bar {
stroke: #000;
stroke-width: 3px;
}
.highlighted-node:hover {
stroke: #ff0;
}
line {
stroke: #000;
stroke-width: 1px;
}
.line {
stroke: #000;
stroke-width: 2px;
}
.terminal-connnode {
stroke: #000;
stroke-width: 1px;
}
.terminal-toponode {
stroke: #000;
stroke-width: 1px;
}
.conduct {
stroke: #000;
stroke-width: 1px;
}
.unknown {
stroke: #f0f;
stroke-width: 1px;
height: 20px;
width: 20px;
}
.acline {
stroke: #000;
stroke-width: 2px;
}
#backing {
fill: whitesmoke;
}
/* Below here are SVG elements that we don't want the user to interact with
therefore we disable pointer events */
.svglabel {
visibility: hidden;
pointer-events: none;
-webkit-user-select: none; /* Chrome all / Safari all */
-moz-user-select: none; /* Firefox all */
-ms-user-select: none; /* IE 10+ */
}
.svglabel-high {
visibility: visible;
font-size: 12px;
font-family: "sans-serif";
text-anchor: right;
fill: black;
stroke-width: 1px;
pointer-events: none;
-webkit-user-select: none; /* Chrome all / Safari all */
-moz-user-select: none; /* Firefox all */
-ms-user-select: none; /* IE 10+ */
}
.gridLine {
stroke: #aaa;
stroke-width: 1px;
pointer-events: none;
-webkit-user-select: none; /* Chrome all / Safari all */
-moz-user-select: none; /* Firefox all */
-ms-user-select: none; /* IE 10+ */
}
.gridLabel {
font-size: 8px;
font-family: "sans-serif";
fill: grey;
stroke-width: 0px;
pointer-events: none;
-webkit-user-select: none; /* Chrome all / Safari all */
-moz-user-select: none; /* Firefox all */
-ms-user-select: none; /* IE 10+ */
}
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="112.78396mm"
height="105.07154mm"
viewBox="0 0 112.78396 105.07154"
version="1.1"
id="svg8"
inkscape:version="0.92.1 r15371"
sodipodi:docname="Pintura_logo.svg"
inkscape:export-filename="D:\ACS\Pintura_logo.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="225.83525"
inkscape:cy="135.8158"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="927"
inkscape:window-height="1048"
inkscape:window-x="984"
inkscape:window-y="0"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-51.593227,-28.825704)">
<path
style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:3.56058073;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 96.783192,27.272982 C 63.518526,26.831645 32.042711,51.562605 24.976781,84.129479 16.369611,117.1972 34.513673,154.56466 65.810963,168.27381 96.514072,183.28166 136.73135,172.92239 156.38953,144.97315 177.19243,117.85926 175.045,76.386999 151.54735,51.56772 137.82667,36.159587 117.37298,27.280376 96.783192,27.272982 Z"
id="path4329"
inkscape:connector-curvature="0" />
<g
id="g5888"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<g
id="g5060">
<g
id="g4575-1"
transform="matrix(0.63758439,0,0,-0.593985,4.3591847,175.37885)"
style="fill:#75a9d0;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-3"
transform="matrix(0,0.593985,-0.63758439,0,167.93529,-15.178378)"
style="fill:#75a9d0;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-1"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-6"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-7"
transform="matrix(-0.6375844,0,0,-0.59398501,211.61124,137.21204)"
style="fill:#75a9d0;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-4"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-4"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-3-6"
transform="matrix(0,0.59398501,-0.6375844,0,208.90361,-15.178379)"
style="fill:#94cef9;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-1-5"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-6-25"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-0"
transform="matrix(-0.6375844,0,0,0.59398501,211.61124,25.510911)"
style="fill:#94cef9;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-4"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-0"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-3-5"
transform="matrix(0,-0.59398501,-0.6375844,0,208.90361,177.90133)"
style="fill:#75a9d0;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-1-1"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-6-4"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-3-1"
transform="matrix(0,-0.59398501,-0.6375844,0,167.93528,177.90132)"
style="fill:#94cef9;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-1-4"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-6-2"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575"
transform="matrix(0.63758439,0,0,0.593985,4.3591847,-12.655904)"
style="fill:#94cef9;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:#000000;fill-opacity:0.09345793;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.92990657"
d="m 164.37686,66.99252 -15.42333,14.368955 v 6.901024 l 15.3258,-15.325794 z"
id="path4836"
inkscape:connector-curvature="0" />
<path
style="fill:#000000;fill-opacity:0.09345793;stroke:none;stroke-width:0.25527689px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.92990657"
d="m 67.114418,75.828936 -15.42333,13.375907 v 6.42409 l 15.3258,-14.266618 z"
id="path4836-7"
inkscape:connector-curvature="0" />
<path
style="fill:#000000;fill-opacity:0.09345793;stroke:none;stroke-width:0.26553199px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.92990657"
d="m 92.561557,28.826011 15.518003,14.383895 h 7.45287 L 98.981074,28.916968 Z"
id="path4836-1"
inkscape:connector-curvature="0" />
<path
style="fill:#000000;fill-opacity:0.09345793;stroke:none;stroke-width:0.2560958px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.92990657"
d="m 102.09485,119.43733 14.43467,14.38389 h 6.93258 l -15.39588,-14.29294 z"
id="path4836-1-6"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(0.98137396,0.25924642,-0.2592465,0.98137425,23.446475,-26.207422)"
id="g5030">
<g
id="g4575-1-5"
transform="matrix(0.44145321,0,0,-0.41126569,35.529736,146.17707)"
style="fill:#75a9d0;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-0"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-65"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-3-7"
transform="matrix(0,0.41126569,-0.44145321,0,148.7872,14.238305)"
style="fill:#75a9d0;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-1-7"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-6-40"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-7-9"
transform="matrix(-0.44145321,0,0,-0.41126569,179.02773,119.75099)"
style="fill:#75a9d0;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-4-1"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-4-7"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-3-6-3"
transform="matrix(0,0.41126569,-0.44145321,0,177.15302,14.238303)"
style="fill:#94cef9;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-1-5-0"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-6-25-7"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-0-0"
transform="matrix(-0.44145321,0,0,0.41126569,179.02773,42.410916)"
style="fill:#94cef9;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-4-7"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-0-3"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-3-5-1"
transform="matrix(0,-0.41126569,-0.44145321,0,177.15302,147.92359)"
style="fill:#75a9d0;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-1-1-1"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#75a9d0;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-6-4-2"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-1-3-1-4"
transform="matrix(0,-0.41126569,-0.44145321,0,148.7872,147.92359)"
style="fill:#94cef9;fill-opacity:1">
<path
inkscape:connector-curvature="0"
id="rect4553-9-1-4-8"
d="M 74.083332,69.836121 V 126.15465 H 98.273585 V 94.026892 Z"
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
<path
style="fill:#94cef9;fill-opacity:1;stroke-width:1.13199997;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 74.083335,182.47318 v -56.31853 h 24.19025 v 32.12776 z"
id="path4571-4-6-2-0"
inkscape:connector-curvature="0" />
</g>
<g
id="g4575-3"