diff --git a/demo/static/cypher/.gitattributes b/demo/simulation/static/cypher/.gitattributes
similarity index 100%
rename from demo/static/cypher/.gitattributes
rename to demo/simulation/static/cypher/.gitattributes
diff --git a/demo/static/cypher/.gitignore b/demo/simulation/static/cypher/.gitignore
similarity index 100%
rename from demo/static/cypher/.gitignore
rename to demo/simulation/static/cypher/.gitignore
diff --git a/demo/static/cypher/.npmignore b/demo/simulation/static/cypher/.npmignore
similarity index 100%
rename from demo/static/cypher/.npmignore
rename to demo/simulation/static/cypher/.npmignore
diff --git a/demo/static/cypher/.travis.yml b/demo/simulation/static/cypher/.travis.yml
similarity index 100%
rename from demo/static/cypher/.travis.yml
rename to demo/simulation/static/cypher/.travis.yml
diff --git a/demo/static/cypher/codemirror.css b/demo/simulation/static/cypher/codemirror.css
similarity index 100%
rename from demo/static/cypher/codemirror.css
rename to demo/simulation/static/cypher/codemirror.css
diff --git a/demo/static/cypher/codemirror.js b/demo/simulation/static/cypher/codemirror.js
similarity index 100%
rename from demo/static/cypher/codemirror.js
rename to demo/simulation/static/cypher/codemirror.js
diff --git a/demo/static/cypher/cypher.js b/demo/simulation/static/cypher/cypher.js
similarity index 100%
rename from demo/static/cypher/cypher.js
rename to demo/simulation/static/cypher/cypher.js
diff --git a/demo/static/cypher/neo.css b/demo/simulation/static/cypher/neo.css
similarity index 100%
rename from demo/static/cypher/neo.css
rename to demo/simulation/static/cypher/neo.css
diff --git a/demo/static/demo.css b/demo/simulation/static/demo.css
similarity index 100%
rename from demo/static/demo.css
rename to demo/simulation/static/demo.css
diff --git a/demo/static/demo.html b/demo/simulation/static/demo.html
similarity index 99%
rename from demo/static/demo.html
rename to demo/simulation/static/demo.html
index f02dd437c..3c83c32e3 100644
--- a/demo/static/demo.html
+++ b/demo/simulation/static/demo.html
@@ -130,13 +130,14 @@
</div>
</div>
</div>
+
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/js/materialize.min.js"></script>
-
<script type="text/javascript" src="http://bernii.github.io/gauge.js/dist/gauge.min.js"></script>
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="https://cdn.rawgit.com/novus/nvd3/v1.8.1/build/nv.d3.min.js"></script>
<script src="cypher/codemirror.js"></script>
<script src="cypher/cypher.js"></script>
<script src="demo.js"></script>
+
</body>
diff --git a/demo/static/demo.js b/demo/simulation/static/demo.js
similarity index 76%
rename from demo/static/demo.js
rename to demo/simulation/static/demo.js
index 8294b302e..5b94bed8f 100644
--- a/demo/static/demo.js
+++ b/demo/simulation/static/demo.js
@@ -96,8 +96,9 @@
}
}
+ // counters init
let value = 0;
- let maxQps = 5000;
+ let maxQps = 15000;
let card1 = new QueryCard($('#q1')[0], maxQps);
let card2 = new QueryCard($('#q2')[0], maxQps);
@@ -108,6 +109,7 @@
let card7 = new QueryCard($('#q7')[0], maxQps);
let card8 = new QueryCard($('#q8')[0], maxQps);
+ // counters update
function run() {
setTimeout(() => {
value += 10;
@@ -127,16 +129,18 @@
run();
}, 20);
}
-
run();
-
+ // graph init
+ var data = [];
+ var chart;
+ var chartData;
nv.addGraph(function() {
- var chart = nv.models.lineChart()
- .useInteractiveGuideline(true)
- .showLegend(true)
- .showYAxis(true)
- .showXAxis(true);
+ chart = nv.models.lineChart()
+ .useInteractiveGuideline(true)
+ .showLegend(true)
+ .showYAxis(true)
+ .showXAxis(true);
chart.xAxis
.axisLabel('Time (s)')
@@ -146,41 +150,41 @@
.axisLabel('QPS')
.tickFormat(d3.format(',r'));
- var myData = sinAndCos();
-
- d3.select('#chart svg')
- .datum(myData)
- .call(chart);
+ chartData = d3.select('#chart svg')
+ .datum(data);
+ chartData.call(chart);
chart.update();
nv.utils.windowResize(function() { chart.update(); });
return chart;
});
- function sinAndCos() {
- var sin = [],sin2 = [],
- cos = [];
-
- for (var i = 0; i < 100; i++) {
- sin.push({x: i, y: Math.sin(i/10)});
- sin2.push({x: i, y: Math.sin(i/10) *0.25 + 0.5});
- cos.push({x: i, y: 0.5 * Math.cos(i/10)});
- }
-
- return [{
- values: sin,
- key: 'Sine Wave',
- color: '#ff7f0e'
+ // graph update
+ let x = 0;
+ function updateGraph() {
+ setTimeout(() => {
+ x += 1;
+ if (x > 100)
+ x = 0
+ var memgraphLine = [];
+ var neo4jLine = [];
+ for (var i = 0; i < x; i++) {
+ memgraphLine.push({x: i, y: 100 * Math.random() + 1000});
+ neo4jLine.push({x: i, y: 100 * Math.random() + 50});
+ }
+ var newData = [{
+ values: memgraphLine,
+ key: 'Memgraph',
+ color: '#ff0000'
}, {
- values: cos,
- key: 'Cosine Wave',
- color: '#2ca02c'
- }, {
- values: sin2,
- key: 'Another sine wave',
- color: '#7777ff',
- area: true
+ values: neo4jLine,
+ key: 'Neo4j',
+ color: '#0000ff'
}];
+ chartData.datum(newData).transition().duration(500).call(chart);
+ updateGraph();
+ }, 1000);
}
+ updateGraph();
})();
diff --git a/demo/static/sigmajs/captors/sigma.captors.mouse.js b/demo/simulation/static/sigmajs/captors/sigma.captors.mouse.js
similarity index 100%
rename from demo/static/sigmajs/captors/sigma.captors.mouse.js
rename to demo/simulation/static/sigmajs/captors/sigma.captors.mouse.js
diff --git a/demo/static/sigmajs/captors/sigma.captors.touch.js b/demo/simulation/static/sigmajs/captors/sigma.captors.touch.js
similarity index 100%
rename from demo/static/sigmajs/captors/sigma.captors.touch.js
rename to demo/simulation/static/sigmajs/captors/sigma.captors.touch.js
diff --git a/demo/static/sigmajs/classes/sigma.classes.camera.js b/demo/simulation/static/sigmajs/classes/sigma.classes.camera.js
similarity index 100%
rename from demo/static/sigmajs/classes/sigma.classes.camera.js
rename to demo/simulation/static/sigmajs/classes/sigma.classes.camera.js
diff --git a/demo/static/sigmajs/classes/sigma.classes.configurable.js b/demo/simulation/static/sigmajs/classes/sigma.classes.configurable.js
similarity index 100%
rename from demo/static/sigmajs/classes/sigma.classes.configurable.js
rename to demo/simulation/static/sigmajs/classes/sigma.classes.configurable.js
diff --git a/demo/static/sigmajs/classes/sigma.classes.dispatcher.js b/demo/simulation/static/sigmajs/classes/sigma.classes.dispatcher.js
similarity index 100%
rename from demo/static/sigmajs/classes/sigma.classes.dispatcher.js
rename to demo/simulation/static/sigmajs/classes/sigma.classes.dispatcher.js
diff --git a/demo/static/sigmajs/classes/sigma.classes.edgequad.js b/demo/simulation/static/sigmajs/classes/sigma.classes.edgequad.js
similarity index 100%
rename from demo/static/sigmajs/classes/sigma.classes.edgequad.js
rename to demo/simulation/static/sigmajs/classes/sigma.classes.edgequad.js
diff --git a/demo/static/sigmajs/classes/sigma.classes.graph.js b/demo/simulation/static/sigmajs/classes/sigma.classes.graph.js
similarity index 100%
rename from demo/static/sigmajs/classes/sigma.classes.graph.js
rename to demo/simulation/static/sigmajs/classes/sigma.classes.graph.js
diff --git a/demo/static/sigmajs/classes/sigma.classes.quad.js b/demo/simulation/static/sigmajs/classes/sigma.classes.quad.js
similarity index 100%
rename from demo/static/sigmajs/classes/sigma.classes.quad.js
rename to demo/simulation/static/sigmajs/classes/sigma.classes.quad.js
diff --git a/demo/static/sigmajs/conrad.js b/demo/simulation/static/sigmajs/conrad.js
similarity index 100%
rename from demo/static/sigmajs/conrad.js
rename to demo/simulation/static/sigmajs/conrad.js
diff --git a/demo/static/sigmajs/middlewares/sigma.middlewares.copy.js b/demo/simulation/static/sigmajs/middlewares/sigma.middlewares.copy.js
similarity index 100%
rename from demo/static/sigmajs/middlewares/sigma.middlewares.copy.js
rename to demo/simulation/static/sigmajs/middlewares/sigma.middlewares.copy.js
diff --git a/demo/static/sigmajs/middlewares/sigma.middlewares.rescale.js b/demo/simulation/static/sigmajs/middlewares/sigma.middlewares.rescale.js
similarity index 100%
rename from demo/static/sigmajs/middlewares/sigma.middlewares.rescale.js
rename to demo/simulation/static/sigmajs/middlewares/sigma.middlewares.rescale.js
diff --git a/demo/static/sigmajs/misc/sigma.misc.animation.js b/demo/simulation/static/sigmajs/misc/sigma.misc.animation.js
similarity index 100%
rename from demo/static/sigmajs/misc/sigma.misc.animation.js
rename to demo/simulation/static/sigmajs/misc/sigma.misc.animation.js
diff --git a/demo/static/sigmajs/misc/sigma.misc.bindDOMEvents.js b/demo/simulation/static/sigmajs/misc/sigma.misc.bindDOMEvents.js
similarity index 100%
rename from demo/static/sigmajs/misc/sigma.misc.bindDOMEvents.js
rename to demo/simulation/static/sigmajs/misc/sigma.misc.bindDOMEvents.js
diff --git a/demo/static/sigmajs/misc/sigma.misc.bindEvents.js b/demo/simulation/static/sigmajs/misc/sigma.misc.bindEvents.js
similarity index 100%
rename from demo/static/sigmajs/misc/sigma.misc.bindEvents.js
rename to demo/simulation/static/sigmajs/misc/sigma.misc.bindEvents.js
diff --git a/demo/static/sigmajs/misc/sigma.misc.drawHovers.js b/demo/simulation/static/sigmajs/misc/sigma.misc.drawHovers.js
similarity index 100%
rename from demo/static/sigmajs/misc/sigma.misc.drawHovers.js
rename to demo/simulation/static/sigmajs/misc/sigma.misc.drawHovers.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.arrow.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.arrow.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.arrow.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.arrow.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.curve.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.curve.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.curve.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.curve.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.curvedArrow.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.curvedArrow.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.curvedArrow.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.curvedArrow.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.def.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.def.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edgehovers.def.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.edges.arrow.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edges.arrow.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.edges.arrow.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edges.arrow.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.edges.curve.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edges.curve.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.edges.curve.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edges.curve.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.edges.curvedArrow.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edges.curvedArrow.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.edges.curvedArrow.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edges.curvedArrow.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.edges.def.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edges.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.edges.def.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.edges.def.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.extremities.def.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.extremities.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.extremities.def.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.extremities.def.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.hovers.def.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.hovers.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.hovers.def.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.hovers.def.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.labels.def.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.labels.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.labels.def.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.labels.def.js
diff --git a/demo/static/sigmajs/renderers/canvas/sigma.canvas.nodes.def.js b/demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.nodes.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/canvas/sigma.canvas.nodes.def.js
rename to demo/simulation/static/sigmajs/renderers/canvas/sigma.canvas.nodes.def.js
diff --git a/demo/static/sigmajs/renderers/sigma.renderers.canvas.js b/demo/simulation/static/sigmajs/renderers/sigma.renderers.canvas.js
similarity index 100%
rename from demo/static/sigmajs/renderers/sigma.renderers.canvas.js
rename to demo/simulation/static/sigmajs/renderers/sigma.renderers.canvas.js
diff --git a/demo/static/sigmajs/renderers/sigma.renderers.def.js b/demo/simulation/static/sigmajs/renderers/sigma.renderers.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/sigma.renderers.def.js
rename to demo/simulation/static/sigmajs/renderers/sigma.renderers.def.js
diff --git a/demo/static/sigmajs/renderers/sigma.renderers.svg.js b/demo/simulation/static/sigmajs/renderers/sigma.renderers.svg.js
similarity index 100%
rename from demo/static/sigmajs/renderers/sigma.renderers.svg.js
rename to demo/simulation/static/sigmajs/renderers/sigma.renderers.svg.js
diff --git a/demo/static/sigmajs/renderers/sigma.renderers.webgl.js b/demo/simulation/static/sigmajs/renderers/sigma.renderers.webgl.js
similarity index 100%
rename from demo/static/sigmajs/renderers/sigma.renderers.webgl.js
rename to demo/simulation/static/sigmajs/renderers/sigma.renderers.webgl.js
diff --git a/demo/static/sigmajs/renderers/svg/sigma.svg.edges.curve.js b/demo/simulation/static/sigmajs/renderers/svg/sigma.svg.edges.curve.js
similarity index 100%
rename from demo/static/sigmajs/renderers/svg/sigma.svg.edges.curve.js
rename to demo/simulation/static/sigmajs/renderers/svg/sigma.svg.edges.curve.js
diff --git a/demo/static/sigmajs/renderers/svg/sigma.svg.edges.def.js b/demo/simulation/static/sigmajs/renderers/svg/sigma.svg.edges.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/svg/sigma.svg.edges.def.js
rename to demo/simulation/static/sigmajs/renderers/svg/sigma.svg.edges.def.js
diff --git a/demo/static/sigmajs/renderers/svg/sigma.svg.hovers.def.js b/demo/simulation/static/sigmajs/renderers/svg/sigma.svg.hovers.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/svg/sigma.svg.hovers.def.js
rename to demo/simulation/static/sigmajs/renderers/svg/sigma.svg.hovers.def.js
diff --git a/demo/static/sigmajs/renderers/svg/sigma.svg.labels.def.js b/demo/simulation/static/sigmajs/renderers/svg/sigma.svg.labels.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/svg/sigma.svg.labels.def.js
rename to demo/simulation/static/sigmajs/renderers/svg/sigma.svg.labels.def.js
diff --git a/demo/static/sigmajs/renderers/svg/sigma.svg.nodes.def.js b/demo/simulation/static/sigmajs/renderers/svg/sigma.svg.nodes.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/svg/sigma.svg.nodes.def.js
rename to demo/simulation/static/sigmajs/renderers/svg/sigma.svg.nodes.def.js
diff --git a/demo/static/sigmajs/renderers/svg/sigma.svg.utils.js b/demo/simulation/static/sigmajs/renderers/svg/sigma.svg.utils.js
similarity index 100%
rename from demo/static/sigmajs/renderers/svg/sigma.svg.utils.js
rename to demo/simulation/static/sigmajs/renderers/svg/sigma.svg.utils.js
diff --git a/demo/static/sigmajs/renderers/webgl/sigma.webgl.edges.arrow.js b/demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.edges.arrow.js
similarity index 100%
rename from demo/static/sigmajs/renderers/webgl/sigma.webgl.edges.arrow.js
rename to demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.edges.arrow.js
diff --git a/demo/static/sigmajs/renderers/webgl/sigma.webgl.edges.def.js b/demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.edges.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/webgl/sigma.webgl.edges.def.js
rename to demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.edges.def.js
diff --git a/demo/static/sigmajs/renderers/webgl/sigma.webgl.edges.fast.js b/demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.edges.fast.js
similarity index 100%
rename from demo/static/sigmajs/renderers/webgl/sigma.webgl.edges.fast.js
rename to demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.edges.fast.js
diff --git a/demo/static/sigmajs/renderers/webgl/sigma.webgl.nodes.def.js b/demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.nodes.def.js
similarity index 100%
rename from demo/static/sigmajs/renderers/webgl/sigma.webgl.nodes.def.js
rename to demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.nodes.def.js
diff --git a/demo/static/sigmajs/renderers/webgl/sigma.webgl.nodes.fast.js b/demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.nodes.fast.js
similarity index 100%
rename from demo/static/sigmajs/renderers/webgl/sigma.webgl.nodes.fast.js
rename to demo/simulation/static/sigmajs/renderers/webgl/sigma.webgl.nodes.fast.js
diff --git a/demo/static/sigmajs/sigma.core.js b/demo/simulation/static/sigmajs/sigma.core.js
similarity index 100%
rename from demo/static/sigmajs/sigma.core.js
rename to demo/simulation/static/sigmajs/sigma.core.js
diff --git a/demo/static/sigmajs/sigma.export.js b/demo/simulation/static/sigmajs/sigma.export.js
similarity index 100%
rename from demo/static/sigmajs/sigma.export.js
rename to demo/simulation/static/sigmajs/sigma.export.js
diff --git a/demo/static/sigmajs/sigma.settings.js b/demo/simulation/static/sigmajs/sigma.settings.js
similarity index 100%
rename from demo/static/sigmajs/sigma.settings.js
rename to demo/simulation/static/sigmajs/sigma.settings.js
diff --git a/demo/static/sigmajs/utils/sigma.polyfills.js b/demo/simulation/static/sigmajs/utils/sigma.polyfills.js
similarity index 100%
rename from demo/static/sigmajs/utils/sigma.polyfills.js
rename to demo/simulation/static/sigmajs/utils/sigma.polyfills.js
diff --git a/demo/static/sigmajs/utils/sigma.utils.js b/demo/simulation/static/sigmajs/utils/sigma.utils.js
similarity index 100%
rename from demo/static/sigmajs/utils/sigma.utils.js
rename to demo/simulation/static/sigmajs/utils/sigma.utils.js
diff --git a/demo/simulation/web_server.py b/demo/simulation/web_server.py
index 08e2bbe1b..a2b7139cd 100644
--- a/demo/simulation/web_server.py
+++ b/demo/simulation/web_server.py
@@ -34,6 +34,8 @@ class SimulationWebServer(object):
Setup all routes.
'''
self.add_route('/ping', self.ping, 'GET')
+ self.add_route('/', self.index, 'GET')
+ self.add_route('/<path:path>', self.static, 'GET')
self.add_route('/tasks', self.tasks_get, 'GET')
self.add_route('/tasks', self.tasks_set, 'POST')
self.add_route('/start', self.start, 'POST')
@@ -67,6 +69,19 @@ class SimulationWebServer(object):
'''
return ('', 204)
+ def index(self):
+ '''
+ Serves demo.html on the index path.
+ '''
+ print('index')
+ return self.server.send_static_file('demo.html')
+
+ def static(self, path):
+ '''
+ Serves other static files.
+ '''
+ return self.server.send_static_file(path)
+
def tasks_get(self):
'''
Retutns all defined tasks.
diff --git a/demo/static/demo.py b/demo/static/demo.py
deleted file mode 100644
index 183f5d88b..000000000
--- a/demo/static/demo.py
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-class Chromosome(object):
-
- def __init__(self, k):
- pass