From cec5bdb7f54ff373c02629bd32a98337ca147e17 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 1 Nov 2017 11:18:23 +0100 Subject: Add and update SEO tags in index.html --- public/index.html | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/public/index.html b/public/index.html index a076ac66..5426097a 100644 --- a/public/index.html +++ b/public/index.html @@ -4,16 +4,26 @@ OpenDC - - - + + - + + + + + + + + + + + - + + @@ -22,21 +32,34 @@ simulation, and exploratory datacenter performance feedback."> - - - + + + + + + +

+ -- cgit v1.2.3 From 4ecc5bc02e5530a30ceaf5a130daeb09f830454c Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 1 Nov 2017 11:20:08 +0100 Subject: Remove blank lines in gtag.js --- public/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/index.html b/public/index.html index 5426097a..e88cca42 100644 --- a/public/index.html +++ b/public/index.html @@ -46,11 +46,8 @@ -- cgit v1.2.3 From 0ccd0fc94b61ffc1c82b75d72f95e85bf07c193c Mon Sep 17 00:00:00 2001 From: Making GitHub Delicious Date: Thu, 2 Nov 2017 04:13:14 -0400 Subject: add waffle.io badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 55d3db00..af1df759 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Waffle.io - Columns and their card count](https://badge.waffle.io/atlarge-research/opendc-frontend.png?columns=all)](https://waffle.io/atlarge-research/opendc-frontend?utm_source=badge)

-- cgit v1.2.3 From 09aa9c967d0b1a775487754d30f4f3124bcf5f87 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Thu, 2 Nov 2017 09:14:27 +0100 Subject: Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index af1df759..9a57534d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -[![Waffle.io - Columns and their card count](https://badge.waffle.io/atlarge-research/opendc-frontend.png?columns=all)](https://waffle.io/atlarge-research/opendc-frontend?utm_source=badge)

@@ -10,7 +9,8 @@ Collaborative Datacenter Simulation and Exploration for Everybody [![Build Status](https://travis-ci.org/atlarge-research/opendc-frontend.svg?branch=master)](https://travis-ci.org/atlarge-research/opendc-frontend) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier) +[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
+[![Waffle.io - Columns and their card count](https://badge.waffle.io/atlarge-research/opendc-frontend.png?columns=all)](https://waffle.io/atlarge-research/opendc-frontend?utm_source=badge) The user-facing component of the OpenDC stack, allowing users to build and interact with their own (virtual) datacenters. Built in React.js and Redux, with the help of `create-react-app`. -- cgit v1.2.3 From f4fb3fae6366b380fe5f709ec3b6413dcafed4d5 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 3 Nov 2017 15:28:39 +0100 Subject: Disable rack construction when leaving room --- src/reducers/construction-mode.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/reducers/construction-mode.js b/src/reducers/construction-mode.js index 4778bd44..c4c0c010 100644 --- a/src/reducers/construction-mode.js +++ b/src/reducers/construction-mode.js @@ -1,14 +1,12 @@ -import { combineReducers } from "redux"; -import { OPEN_EXPERIMENT_SUCCEEDED } from "../actions/experiments"; +import {combineReducers} from "redux"; +import {OPEN_EXPERIMENT_SUCCEEDED} from "../actions/experiments"; +import {GO_DOWN_ONE_INTERACTION_LEVEL} from "../actions/interaction-level"; import { CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED, FINISH_NEW_ROOM_CONSTRUCTION, START_NEW_ROOM_CONSTRUCTION_SUCCEEDED } from "../actions/topology/building"; -import { - START_RACK_CONSTRUCTION, - STOP_RACK_CONSTRUCTION -} from "../actions/topology/room"; +import {START_RACK_CONSTRUCTION, STOP_RACK_CONSTRUCTION} from "../actions/topology/room"; export function currentRoomInConstruction(state = -1, action) { switch (action.type) { @@ -29,6 +27,7 @@ export function inRackConstructionMode(state = false, action) { return true; case STOP_RACK_CONSTRUCTION: case OPEN_EXPERIMENT_SUCCEEDED: + case GO_DOWN_ONE_INTERACTION_LEVEL: return false; default: return state; -- cgit v1.2.3 From 262a3ea510af4fef615106e0b7a160a9438ca642 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 3 Nov 2017 15:58:25 +0100 Subject: Show more accurate alert while loading exp.s --- .../experiments/ExperimentListComponent.js | 32 ++++++++++++++++------ .../experiments/ExperimentListContainer.js | 1 + 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/components/experiments/ExperimentListComponent.js b/src/components/experiments/ExperimentListComponent.js index 28c06f29..2f7106e5 100644 --- a/src/components/experiments/ExperimentListComponent.js +++ b/src/components/experiments/ExperimentListComponent.js @@ -2,15 +2,30 @@ import PropTypes from "prop-types"; import React from "react"; import ExperimentRowContainer from "../../containers/experiments/ExperimentRowContainer"; -const ExperimentListComponent = ({ experimentIds }) => { +const ExperimentListComponent = ({ experimentIds, loading }) => { + let alert; + + if (loading) { + alert = ( +
+ + Loading Experiments... +
+ ); + } else if (experimentIds.length === 0 && !loading) { + alert = ( +
+ + No experiments here yet... Add some with the button + below! +
+ ); + } + return (
- {experimentIds.length === 0 ? ( -
- - No experiments here yet... Add some with the button - below! -
+ {alert ? ( + alert ) : ( @@ -37,7 +52,8 @@ const ExperimentListComponent = ({ experimentIds }) => { }; ExperimentListComponent.propTypes = { - experimentIds: PropTypes.arrayOf(PropTypes.number).isRequired + experimentIds: PropTypes.arrayOf(PropTypes.number).isRequired, + loading: PropTypes.bool }; export default ExperimentListComponent; diff --git a/src/containers/experiments/ExperimentListContainer.js b/src/containers/experiments/ExperimentListContainer.js index 632942bf..53bb1dad 100644 --- a/src/containers/experiments/ExperimentListContainer.js +++ b/src/containers/experiments/ExperimentListContainer.js @@ -7,6 +7,7 @@ const mapStateToProps = state => { !("experimentIds" in state.objects.simulation[state.currentSimulationId]) ) { return { + loading: true, experimentIds: [] }; } -- cgit v1.2.3 From d6f2296d60399fa0156c3908fa63e61fb0e3b4bf Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 3 Nov 2017 21:55:14 +0100 Subject: Add label to current tick line in state charts This vertically-oriented label gives the user an indication of what that blue bar actually means in the graph, for the case that this was not clear from the UI itself. Fixes #31 --- src/components/app/sidebars/elements/LoadChartComponent.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/app/sidebars/elements/LoadChartComponent.js b/src/components/app/sidebars/elements/LoadChartComponent.js index 6f66010e..5f0d40cb 100644 --- a/src/components/app/sidebars/elements/LoadChartComponent.js +++ b/src/components/app/sidebars/elements/LoadChartComponent.js @@ -4,6 +4,7 @@ import SvgSaver from "svgsaver"; import { VictoryAxis, VictoryChart, + VictoryLabel, VictoryLine, VictoryScatter } from "victory"; @@ -56,9 +57,17 @@ const VictoryChartComponent = ({ data, currentTick, showCurrentTick }) => ( {showCurrentTick ? ( + } data={[{ x: currentTick + 1, y: 0 }, { x: currentTick + 1, y: 1 }]} + labels={point => + point.y === 1 + ? "Current tick : " + convertSecondsToFormattedTime(currentTick) + : ""} style={{ - data: { stroke: "#00A6D6", strokeWidth: 3 } + data: { stroke: "#00A6D6", strokeWidth: 4 }, + labels: { fill: "#00A6D6" } }} /> ) : ( -- cgit v1.2.3