Skip to content

GitLab

Commit bfe24fee authored by Dorian Goepp's avatar Dorian Goepp
Browse files

Merge branch 'master' into dgoepp/config-modules

parents fa5c4795 3d084e6f
Hide whitespace changes
Inline Side-by-side
package-lock.json
View file @ bfe24fee
......@@ -1570,6 +1570,18 @@
"loader-utils": "^1.1.0"
}
},
"@trendmicro/react-sidenav": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/@trendmicro/react-sidenav/-/react-sidenav-0.4.5.tgz",
"integrity": "sha512-smCo/Kdb9VI0Sylk96UhFB0mFKmcUo3oioeNrXy2KZVszO8/eVanNFj06Nw4D8vG+EMJSqnsdUTZ1+Lb0pn5jg==",
"requires": {
"chained-function": "^0.5.0",
"classnames": "^2.2.5",
"prop-types": "^15.6.0",
"uncontrollable": "^4.1.0",
"warning": "^3.0.0"
}
},
"@types/babel__core": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.2.tgz",
......@@ -3163,6 +3175,11 @@
"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.4.tgz",
"integrity": "sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w=="
},
"chained-function": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/chained-function/-/chained-function-0.5.0.tgz",
"integrity": "sha1-JWS73994AxlL6/daayvQQe3iOzo="
},
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
......@@ -3733,6 +3750,11 @@
}
}
},
"classnames": {
"version": "2.2.6",
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
"integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
},
"clean-css": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
......@@ -13056,6 +13078,14 @@
"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
},
"uncontrollable": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-4.1.0.tgz",
"integrity": "sha1-4DWCkSUuGGUiLZCTmxny9J+Bwak=",
"requires": {
"invariant": "^2.1.0"
}
},
"unicode-canonical-property-names-ecmascript": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
......@@ -13424,6 +13454,14 @@
"makeerror": "1.0.x"
}
},
"warning": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
"requires": {
"loose-envify": "^1.0.0"
}
},
"watchpack": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
......
package.json
View file @ bfe24fee
......@@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"@babel/core": "^7.0.0",
"@trendmicro/react-sidenav": "^0.4.5",
"@types/d3-array": "^1.2.6",
"@types/roslib": "^0.18.3",
"bootstrap": "^4.3.1",
......@@ -14,7 +15,7 @@
"mobx": "^5.9.0",
"mobx-react": "^5.4.3",
"prop-types": "^15.7.2",
"react": "^16.7.0",
"react": "^16.8.6",
"react-dom": "^16.7.0",
"react-jsonschema-form": "^1.5.0",
"react-numeric-input": "^2.2.3",
......
public/LearnMore.css
View file @ bfe24fee
......@@ -11,15 +11,15 @@ h1 {
color: #edc61b;
text-align:center;
font-weight: bold;
margin-top: 1.2em;
margin-top: 1.2vh;
}
h2 {
color:#383838;
font-weight: bold;
text-align: center;
margin-top: 2em;
margin-bottom: 2em;
margin-top: 2vh;
margin-bottom: 2vh;
}
p {
......@@ -32,7 +32,7 @@ p {
display:block;
float:left;
width: 500px;
margin: 0px 1.5em 1.5em 0px;
margin: 0px 1.5vw 1.5vh 0px;
border-radius: 10px;
}
......@@ -49,7 +49,7 @@ p {
width: auto;
padding: 10px 20px 10px 20px;
position: absolute;
top: 1em;
top: 1vh;
right: 15%;
}
......
public/dark.css
View file @ bfe24fee
......@@ -134,7 +134,7 @@
.flexlayout__tab_button:hover .flexlayout__tab_button_trailing,
.flexlayout__tab_button--selected .flexlayout__tab_button_trailing{
background: transparent url("images/baseline-close-24px.svg") no-repeat center;
background: transparent url("images/icons/close.svg") no-repeat center;
}
.flexlayout__tab_button_overflow {
......@@ -147,7 +147,7 @@
font-size: 10px;
color:lightgray;
font-family: Arial, sans-serif;
background: transparent url("images/baseline-more_horiz-24px.svg") no-repeat left;
background: transparent url("images/icons/more_horiz.svg") no-repeat left;
}
.flexlayout__tabset_header
......@@ -205,7 +205,7 @@
height:20px;
border:none;
outline-width: 0;
background: transparent url("images/baseline-fullscreen-24px.svg") no-repeat center;
background: transparent url("images/icons/fullscreen.svg") no-repeat center;
}
.flexlayout__tab_toolbar_button-max {
......@@ -213,7 +213,7 @@
height:20px;
border:none;
outline-width: 0;
background: transparent url("images/baseline-fullscreen_exit-24px.svg") no-repeat center;
background: transparent url("images/icons/fullscreen_exit.svg") no-repeat center;
}
.flexlayout__popup_menu {
......@@ -336,7 +336,7 @@
.flexlayout__border_button:hover .flexlayout__border_button_trailing,
.flexlayout__border_button--selected .flexlayout__border_button_trailing{
background: transparent url("images/baseline-close-24px.svg") no-repeat center;
background: transparent url("images/icons/close.svg") no-repeat center;
}
......
public/images/baseline-close-24px.svg deleted 100644 → 0
View file @ fa5c4795
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
\ No newline at end of file
public/images/icons/1-yellow.svg deleted 100644 → 0
View file @ fa5c4795
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>numbers/solid/green</title>
<desc>Created with Sketch.</desc>
<g id="numbers/solid/green" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="green">
<circle id="Oval-2" fill="#EDC61B" cx="11" cy="11" r="11"></circle>
<text id="1" font-family="Roboto-Bold, Roboto" font-size="11" font-weight="bold" letter-spacing="0.1833334" fill="#FFFFFF">
<tspan x="8.25281572" y="15">1</tspan>
</text>
</g>
</g>
</svg>
\ No newline at end of file
public/images/icons/2-yellow.svg deleted 100644 → 0
View file @ fa5c4795
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>numbers/solid/orange</title>
<desc>Created with Sketch.</desc>
<g id="numbers/solid/orange" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="orange">
<circle id="Oval-2" fill="#EDC61B" cx="11" cy="11" r="11"></circle>
<text id="2" font-family="Roboto-Bold, Roboto" font-size="11" font-weight="bold" letter-spacing="0.1833334" fill="#FFFFFF">
<tspan x="8.25281572" y="15">2</tspan>
</text>
</g>
</g>
</svg>
\ No newline at end of file
public/images/icons/3-yellow.svg deleted 100644 → 0
View file @ fa5c4795
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>numbers/solid/blue</title>
<desc>Created with Sketch.</desc>
<g id="numbers/solid/blue" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="blue">
<circle id="Oval-2" fill="#EDC61B" cx="11" cy="11" r="11"></circle>
<text id="3" font-family="Roboto-Bold, Roboto" font-size="11" font-weight="bold" letter-spacing="0.1833334" fill="#FFFFFF">
<tspan x="8.25281572" y="15">3</tspan>
</text>
</g>
</g>
</svg>
\ No newline at end of file
public/images/icons/4-yellow.svg deleted 100644 → 0
View file @ fa5c4795
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>numbers/solid/yellow</title>
<desc>Created with Sketch.</desc>
<g id="numbers/solid/yellow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="yellow">
<circle id="Oval-2" fill="#FFC539" cx="11" cy="11" r="11"></circle>
<text id="4" font-family="Roboto-Bold, Roboto" font-size="11" font-weight="bold" letter-spacing="0.1833334" fill="#FFFFFF">
<tspan x="7.25281572" y="15">4</tspan>
</text>
</g>
</g>
</svg>
\ No newline at end of file
public/images/icons/about.svg 0 → 100644
View file @ bfe24fee
<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 34 34" height="34px" id="Layer_1" version="1.1" viewBox="0 0 34 34" width="34px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><path d="M17.123,9.2c-1.44,0-2.642,0.503-3.604,1.32S11.994,12,11.832,14h2.937c0.064-1,0.303-1.231,0.716-1.611 s0.926-0.618,1.541-0.618c0.615,0,1.116,0.174,1.504,0.571c0.389,0.396,0.583,0.882,0.583,1.48s-0.187,1.094-0.558,1.499 l-1.772,1.769c-0.518,0.518-0.626,0.934-0.78,1.249C15.849,18.654,16,19.133,16,19.78V21h2v-0.832c0-0.646,0.289-1.148,0.581-1.504 c0.112-0.129,0.333-0.287,0.521-0.473c0.186-0.187,0.448-0.405,0.715-0.656c0.267-0.25,0.5-0.457,0.662-0.619 c0.161-0.161,0.404-0.437,0.712-0.825c0.533-0.647,0.805-1.456,0.805-2.427c0-1.408-0.45-2.503-1.356-3.289 C19.732,9.592,18.563,9.2,17.123,9.2z" fill="black"/><path d="M16.94,22.145c-0.51,0-0.946,0.179-1.311,0.534c-0.364,0.356-0.546,0.78-0.546,1.274 c0,0.493,0.186,0.914,0.558,1.262c0.372,0.348,0.813,0.521,1.322,0.521c0.51,0,0.947-0.178,1.311-0.533 c0.363-0.356,0.546-0.781,0.546-1.274s-0.187-0.914-0.559-1.263C17.891,22.318,17.45,22.145,16.94,22.145z" fill="black"/><path d="M17,0C7.611,0,0,7.611,0,17s7.611,17,17,17s17-7.611,17-17S26.389,0,17,0z M17,31C9.268,31,3,24.732,3,17 C3,9.268,9.268,3,17,3c7.732,0,14,6.268,14,14C31,24.732,24.732,31,17,31z" fill="black"/></g></svg>
public/images/icons/add-yellow.svg deleted 100644 → 0
View file @ fa5c4795
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>Icon / Add / yellow</title>
<desc>Created with Sketch.</desc>
<defs>
<polygon id="path-1" points="11 5 11 11 5 11 5 13 11 13 11 19 13 19 13 13 19 13 19 11 13 11 13 5"></polygon>
</defs>
<g id="Icon-/-Add-/-yellow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="Mask" fill="#EDC61B" xlink:href="#path-1"></use>
</g>
</svg>
\ No newline at end of file
public/images/icons/backtostart.svg
View file @ bfe24fee
......@@ -11,8 +11,8 @@
<use xlink:href="#path-1"></use>
</mask>
<g fill-rule="nonzero"></g>
<g id="↳-Color" mask="url(#mask-2)" fill="#000000" fill-opacity="0.54">
<g id="↳-Color" mask="url(#mask-2)" fill="#000000">
<rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
public/images/icons/checkbox-off.svg
View file @ bfe24fee
......@@ -12,9 +12,9 @@
<use xlink:href="#path-1"></use>
</mask>
<g id="ic_check_box_outline_blank_24px" fill-rule="nonzero"></g>
<g id="✱-/-Color-/-Icons-/-Black-/-Inactive" mask="url(#mask-2)" fill="#000000" fill-opacity="0.54" fill-rule="evenodd">
<g id="✱-/-Color-/-Icons-/-Black-/-Inactive" mask="url(#mask-2)" fill="#000000" fill-rule="evenodd">
<rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
</g>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
public/images/icons/chevron_left.svg
View file @ bfe24fee
......@@ -11,8 +11,8 @@
<use xlink:href="#path-1"></use>
</mask>
<g id="icon/navigation/chevron_left_24px" fill-rule="nonzero"></g>
<g id="↳-Color" mask="url(#mask-2)" fill="#000000" fill-opacity="0.54">
<g id="↳-Color" mask="url(#mask-2)" fill="#000000">
<rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
public/images/icons/choice-grey.svg
View file @ bfe24fee
......@@ -10,6 +10,6 @@
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="icon/device/usb_24px" fill-opacity="0.5" fill="#000000" fill-rule="nonzero" transform="translate(12.000000, 11.594159) rotate(90.000000) translate(-12.000000, -11.594159) " xlink:href="#path-1"></use>
<use id="icon/device/usb_24px" fill="#000000" fill-rule="nonzero" transform="translate(12.000000, 11.594159) rotate(90.000000) translate(-12.000000, -11.594159) " xlink:href="#path-1"></use>
</g>
</svg>
\ No newline at end of file
</svg>
public/images/icons/choice-yellow.svg deleted 100644 → 0
View file @ fa5c4795
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>icon/device/choice/yellow</title>
<desc>Created with Sketch.</desc>
<defs>
<path d="M16.995057,7.51947534 L15.1058407,11.0941593 L16.1058407,11.0941593 L16.1058407,13.0941593 L13.1058407,13.0941593 L13.1058407,5.09415935 L15.1058407,5.09415935 L12.1058407,1.09415935 L9.10584065,5.09415935 L11.1058407,5.09415935 L11.1058407,13.0941593 L8.10584065,13.0941593 L8.10584065,11.0941593 L9.10584065,11.0941593 L7.24367516,7.52415935 L4.89415935,11.0941593 L6.10584065,11.0941593 L6.10584065,13.0941593 C6.10584065,14.2041593 6.99584065,15.0941593 8.10584065,15.0941593 L11.1058407,15.0941593 L11.1058407,18.1441593 L11.1058407,22.0941593 L12.1002376,22.0941593 L13.1058407,22.0941593 L13.1058407,18.1441593 L13.1058407,15.0941593 L16.1058407,15.0941593 C17.2158407,15.0941593 18.1058407,14.2041593 18.1058407,13.0941593 L18.1058407,11.0941593 L19.1058407,11.0941593 L16.995057,7.51947534 Z" id="path-1"></path>
</defs>
<g id="icon/device/choice/yellow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="icon/device/usb_24px" fill="#EDC61B" fill-rule="nonzero" transform="translate(12.000000, 11.594159) rotate(90.000000) translate(-12.000000, -11.594159) " xlink:href="#path-1"></use>
</g>
</svg>
\ No newline at end of file
public/images/icons/copy-grey.svg
View file @ bfe24fee
......@@ -11,8 +11,8 @@
<use xlink:href="#path-1"></use>
</mask>
<g id="icon/content/file_copy_24px" fill-rule="nonzero"></g>
<g id="↳-Color" mask="url(#mask-2)" fill="#000000" fill-opacity="0.54">
<g id="↳-Color" mask="url(#mask-2)" fill="#000000">
<rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
public/images/icons/copy-yellow.svg deleted 100644 → 0
View file @ fa5c4795
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>icon/content/file_copy/yellow</title>
<desc>Created with Sketch.</desc>
<defs>
<path d="M17,1 L5,1 C3.9,1 3,1.9 3,3 L3,17 L5,17 L5,3 L17,3 L17,1 Z M16,5 L22,11 L22,21 C22,22.1 21.1,23 20,23 L8.99,23 C7.89,23 7,22.1 7,21 L7.01,7 C7.01,5.9 7.9,5 9,5 L16,5 Z M15,12 L20.5,12 L15,6.5 L15,12 Z" id="path-1"></path>
</defs>
<g id="icon/content/file_copy/yellow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="icon/content/file_copy_24px" fill="#EDC61B" fill-rule="nonzero" xlink:href="#path-1"></use>
</g>
</svg>
\ No newline at end of file
public/images/icons/dashboard-grey.svg
View file @ bfe24fee
......@@ -11,8 +11,8 @@
<use xlink:href="#path-1"></use>
</mask>
<g id="icon/action/dashboard_24px" fill-rule="nonzero"></g>
<g id="✱-/-Color-/-Icons-/-Black-/-Inactive" mask="url(#mask-2)" fill="#000000" fill-opacity="0.54">
<g id="✱-/-Color-/-Icons-/-Black-/-Inactive" mask="url(#mask-2)" fill="#000000">
<rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
</g>
</g>
</svg>
\ No newline at end of file
</svg>
public/images/icons/dashboard-yellow.svg deleted 100644 → 0
View file @ fa5c4795
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>icon/action/dashboard/yellow</title>
<desc>Created with Sketch.</desc>
<defs>
<path d="M3,13 L11,13 L11,3 L3,3 L3,13 Z M3,21 L11,21 L11,15 L3,15 L3,21 Z M13,21 L21,21 L21,11 L13,11 L13,21 Z M13,3 L13,9 L21,9 L21,3 L13,3 Z" id="path-1"></path>
</defs>
<g id="icon/action/dashboard/yellow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<use id="icon/action/dashboard_24px" fill="#EDC61B" fill-rule="nonzero" xlink:href="#path-1"></use>
</g>
</svg>
\ No newline at end of file
Markdown is supported
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