merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

6 files changed, 0 insertions, 175 deletions

diff --git a/opendc-web/opendc-web-ui/src/components/not-found/BlinkingCursor.js b/opendc-web/opendc-web-ui/src/components/not-found/BlinkingCursor.js
deleted file mode 100644
index dbdba212..00000000
--- a/opendc-web/opendc-web-ui/src/components/not-found/BlinkingCursor.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react'
-import './BlinkingCursor.sass'
-
-const BlinkingCursor = () => <span className="blinking-cursor">_</span>
-
-export default BlinkingCursor
diff --git a/opendc-web/opendc-web-ui/src/components/not-found/BlinkingCursor.sass b/opendc-web/opendc-web-ui/src/components/not-found/BlinkingCursor.sass
deleted file mode 100644
index ad91df85..00000000
--- a/opendc-web/opendc-web-ui/src/components/not-found/BlinkingCursor.sass
+++ /dev/null
@@ -1,35 +0,0 @@
-.blinking-cursor
-    -webkit-animation: 1s blink step-end infinite
-    -moz-animation: 1s blink step-end infinite
-    -o-animation: 1s blink step-end infinite
-    animation: 1s blink step-end infinite
-
-@keyframes blink
-    from, to
-        color: #eeeeee
-    50%
-        color: #333333
-
-@-moz-keyframes blink
-    from, to
-        color: #eeeeee
-    50%
-        color: #333333
-
-@-webkit-keyframes blink
-    from, to
-        color: #eeeeee
-    50%
-        color: #333333
-
-@-ms-keyframes blink
-    from, to
-        color: #eeeeee
-    50%
-        color: #333333
-
-@-o-keyframes blink
-    from, to
-        color: #eeeeee
-    50%
-        color: #333333
diff --git a/opendc-web/opendc-web-ui/src/components/not-found/CodeBlock.js b/opendc-web/opendc-web-ui/src/components/not-found/CodeBlock.js
deleted file mode 100644
index bcc522c9..00000000
--- a/opendc-web/opendc-web-ui/src/components/not-found/CodeBlock.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react'
-import './CodeBlock.sass'
-
-const CodeBlock = () => {
-    const textBlock =
-        '    oo      oooo       oo   <br/>' +
-        '   oo      oo  oo     oo    <br/>' +
-        '  oo       oo  oo    oo     <br/>' +
-        ' oooooo    oo  oo   oooooo  <br/>' +
-        '     oo    oo  oo       oo  <br/>' +
-        '     oo     oooo        oo  <br/>'
-    const charList = textBlock.split('')
-
-    // Binary representation of the string "OpenDC!" ;)
-    const binaryString = '01001111011100000110010101101110010001000100001100100001'
-
-    let binaryIndex = 0
-    for (let i = 0; i < charList.length; i++) {
-        if (charList[i] === 'o') {
-            charList[i] = binaryString[binaryIndex]
-            binaryIndex++
-        }
-    }
-
-    return <div className="code-block" dangerouslySetInnerHTML={{ __html: textBlock }} />
-}
-
-export default CodeBlock
diff --git a/opendc-web/opendc-web-ui/src/components/not-found/CodeBlock.sass b/opendc-web/opendc-web-ui/src/components/not-found/CodeBlock.sass
deleted file mode 100644
index e452f917..00000000
--- a/opendc-web/opendc-web-ui/src/components/not-found/CodeBlock.sass
+++ /dev/null
@@ -1,3 +0,0 @@
-.code-block
-    white-space: pre-wrap
-    margin-top: 60px
diff --git a/opendc-web/opendc-web-ui/src/components/not-found/TerminalWindow.js b/opendc-web/opendc-web-ui/src/components/not-found/TerminalWindow.js
deleted file mode 100644
index a25e558a..00000000
--- a/opendc-web/opendc-web-ui/src/components/not-found/TerminalWindow.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react'
-import { Link } from 'react-router-dom'
-import BlinkingCursor from './BlinkingCursor'
-import CodeBlock from './CodeBlock'
-import './TerminalWindow.sass'
-
-const TerminalWindow = () => (
-    <div className="terminal-window">
-        <div className="terminal-header">Terminal -- bash</div>
-        <div className="terminal-body">
-            <div className="segfault">
-                $ status
-                <br />
-                opendc[4264]: segfault at 0000051497be459d1 err 12 in libopendc.9.0.4
-                <br />
-                opendc[4269]: segfault at 000004234855fc2db err 3 in libopendc.9.0.4
-                <br />
-                opendc[4270]: STDERR Page does not exist
-                <br />
-            </div>
-            <CodeBlock />
-            <div className="sub-title">
-                Got lost?
-                <BlinkingCursor />
-            </div>
-            <Link to="/" className="home-btn">
-                <span className="fa fa-home" /> GET ME BACK TO OPENDC
-            </Link>
-        </div>
-    </div>
-)
-
-export default TerminalWindow
diff --git a/opendc-web/opendc-web-ui/src/components/not-found/TerminalWindow.sass b/opendc-web/opendc-web-ui/src/components/not-found/TerminalWindow.sass
deleted file mode 100644
index 7f05335a..00000000
--- a/opendc-web/opendc-web-ui/src/components/not-found/TerminalWindow.sass
+++ /dev/null
@@ -1,70 +0,0 @@
-.terminal-window
-    width: 600px
-    height: 400px
-    display: block
-
-    position: absolute
-    top: 0
-    bottom: 0
-    left: 0
-    right: 0
-
-    margin: auto
-
-    -webkit-user-select: none
-    -moz-user-select: none
-    -ms-user-select: none
-    user-select: none
-    cursor: default
-
-    overflow: hidden
-
-    box-shadow: 5px 5px 20px #444444
-
-.terminal-header
-    font-family: monospace
-    background: #cccccc
-    color: #444444
-    height: 30px
-    line-height: 30px
-    padding-left: 10px
-
-    border-top-left-radius: 7px
-    border-top-right-radius: 7px
-
-.terminal-body
-    font-family: monospace
-    text-align: center
-    background-color: #333333
-    color: #eeeeee
-    padding: 10px
-
-    height: 100%
-
-.segfault
-    text-align: left
-
-.sub-title
-    margin-top: 20px
-
-.home-btn
-    margin-top: 10px
-    padding: 5px
-    display: inline-block
-    border: 1px solid #eeeeee
-    color: #eeeeee
-    text-decoration: none
-    cursor: pointer
-
-    -webkit-transition: all 200ms
-    -moz-transition: all 200ms
-    -o-transition: all 200ms
-    transition: all 200ms
-
-.home-btn:hover
-    background: #eeeeee
-    color: #333333
-
-.home-btn:active
-    background: #333333
-    color: #eeeeee