From b32c5c06ee844072a760f776e5f37f7c32c97c8f Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 22 Sep 2017 15:05:50 +0200 Subject: Update metadata and docs --- src/colors/index.js | 29 ---------------------- src/components/map/elements/Backdrop.js | 2 +- src/components/map/elements/GrayLayer.js | 2 +- src/components/map/elements/HoverTile.js | 2 +- src/components/map/elements/RackFillBar.js | 2 +- src/components/map/elements/TileObject.js | 2 +- src/components/map/elements/TilePlusIcon.js | 2 +- src/components/map/elements/WallSegment.js | 2 +- src/components/map/groups/GridGroup.js | 2 +- src/components/map/groups/RackGroup.js | 2 +- src/components/map/groups/TileGroup.js | 2 +- .../sidebars/simulation/LoadMetricComponent.js | 2 +- src/pages/Home.js | 2 ++ src/util/colors.js | 29 ++++++++++++++++++++++ src/util/simulation-load.js | 2 +- 15 files changed, 43 insertions(+), 41 deletions(-) delete mode 100644 src/colors/index.js create mode 100644 src/util/colors.js (limited to 'src') diff --git a/src/colors/index.js b/src/colors/index.js deleted file mode 100644 index 1e84e162..00000000 --- a/src/colors/index.js +++ /dev/null @@ -1,29 +0,0 @@ -export const GRID_COLOR = "rgba(0, 0, 0, 0.5)"; -export const BACKDROP_COLOR = "rgba(255, 255, 255, 1)"; -export const WALL_COLOR = "rgba(0, 0, 0, 1)"; - -export const ROOM_DEFAULT_COLOR = "rgba(150, 150, 150, 1)"; -export const ROOM_IN_CONSTRUCTION_COLOR = "rgba(51, 153, 255, 1)"; -export const ROOM_HOVER_VALID_COLOR = "rgba(51, 153, 255, 1)"; -export const ROOM_HOVER_INVALID_COLOR = "rgba(255, 102, 0, 1)"; -export const ROOM_NAME_COLOR = "rgba(245, 245, 245, 1)"; -export const ROOM_TYPE_COLOR = "rgba(245, 245, 245, 1)"; - -export const TILE_PLUS_COLOR = "rgba(0, 0, 0, 1)"; - -export const OBJECT_BORDER_COLOR = "rgba(0, 0, 0, 1)"; - -export const RACK_BACKGROUND_COLOR = "rgba(170, 170, 170, 1)"; -export const RACK_SPACE_BAR_BACKGROUND_COLOR = "rgba(222, 235, 247, 0.6)"; -export const RACK_SPACE_BAR_FILL_COLOR = "rgba(91, 155, 213, 0.7)"; -export const RACK_ENERGY_BAR_BACKGROUND_COLOR = "rgba(255, 242, 204, 0.6)"; -export const RACK_ENERGY_BAR_FILL_COLOR = "rgba(244, 215, 0, 0.7)"; -export const COOLING_ITEM_BACKGROUND_COLOR = "rgba(40, 50, 230, 1)"; -export const PSU_BACKGROUND_COLOR = "rgba(230, 50, 60, 1)"; - -export const GRAYED_OUT_AREA_COLOR = "rgba(0, 0, 0, 0.6)"; - -export const SIM_LOW_COLOR = "rgba(197, 224, 180, 1)"; -export const SIM_MID_LOW_COLOR = "rgba(255, 230, 153, 1)"; -export const SIM_MID_HIGH_COLOR = "rgba(248, 203, 173, 1)"; -export const SIM_HIGH_COLOR = "rgba(249, 165, 165, 1)"; diff --git a/src/components/map/elements/Backdrop.js b/src/components/map/elements/Backdrop.js index 32e95989..5022f747 100644 --- a/src/components/map/elements/Backdrop.js +++ b/src/components/map/elements/Backdrop.js @@ -1,6 +1,6 @@ import React from "react"; import {Rect} from "react-konva"; -import {BACKDROP_COLOR} from "../../../colors/index"; +import {BACKDROP_COLOR} from "../../../util/colors"; import {MAP_SIZE_IN_PIXELS} from "../MapConstants"; const Backdrop = () => ( diff --git a/src/components/map/elements/GrayLayer.js b/src/components/map/elements/GrayLayer.js index dfcbe71a..0cd91df8 100644 --- a/src/components/map/elements/GrayLayer.js +++ b/src/components/map/elements/GrayLayer.js @@ -1,6 +1,6 @@ import React from "react"; import {Rect} from "react-konva"; -import {GRAYED_OUT_AREA_COLOR} from "../../../colors/index"; +import {GRAYED_OUT_AREA_COLOR} from "../../../util/colors"; import {MAP_SIZE_IN_PIXELS} from "../MapConstants"; const GrayLayer = ({onClick}) => ( diff --git a/src/components/map/elements/HoverTile.js b/src/components/map/elements/HoverTile.js index 02d31714..b967f2f9 100644 --- a/src/components/map/elements/HoverTile.js +++ b/src/components/map/elements/HoverTile.js @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import React from "react"; import {Rect} from "react-konva"; -import {ROOM_HOVER_INVALID_COLOR, ROOM_HOVER_VALID_COLOR} from "../../../colors/index"; +import {ROOM_HOVER_INVALID_COLOR, ROOM_HOVER_VALID_COLOR} from "../../../util/colors"; import {TILE_SIZE_IN_PIXELS} from "../MapConstants"; const HoverTile = ({pixelX, pixelY, isValid, scale, onClick}) => ( diff --git a/src/components/map/elements/RackFillBar.js b/src/components/map/elements/RackFillBar.js index 7b1351a5..5b36d442 100644 --- a/src/components/map/elements/RackFillBar.js +++ b/src/components/map/elements/RackFillBar.js @@ -6,7 +6,7 @@ import { RACK_ENERGY_BAR_FILL_COLOR, RACK_SPACE_BAR_BACKGROUND_COLOR, RACK_SPACE_BAR_FILL_COLOR -} from "../../../colors/index"; +} from "../../../util/colors"; import { OBJECT_BORDER_WIDTH_IN_PIXELS, OBJECT_MARGIN_IN_PIXELS, diff --git a/src/components/map/elements/TileObject.js b/src/components/map/elements/TileObject.js index b1d3315e..252fcfc2 100644 --- a/src/components/map/elements/TileObject.js +++ b/src/components/map/elements/TileObject.js @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import React from "react"; import {Rect} from "react-konva"; -import {OBJECT_BORDER_COLOR} from "../../../colors/index"; +import {OBJECT_BORDER_COLOR} from "../../../util/colors"; import {OBJECT_BORDER_WIDTH_IN_PIXELS, OBJECT_MARGIN_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants"; const TileObject = ({positionX, positionY, color}) => ( diff --git a/src/components/map/elements/TilePlusIcon.js b/src/components/map/elements/TilePlusIcon.js index ed5ef5b5..3283c3cd 100644 --- a/src/components/map/elements/TilePlusIcon.js +++ b/src/components/map/elements/TilePlusIcon.js @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import React from "react"; import {Group, Line} from "react-konva"; -import {TILE_PLUS_COLOR} from "../../../colors/index"; +import {TILE_PLUS_COLOR} from "../../../util/colors"; import {TILE_PLUS_MARGIN_IN_PIXELS, TILE_PLUS_WIDTH_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants"; const TilePlusIcon = ({pixelX, pixelY, mapScale}) => { diff --git a/src/components/map/elements/WallSegment.js b/src/components/map/elements/WallSegment.js index ed3627bb..b029579b 100644 --- a/src/components/map/elements/WallSegment.js +++ b/src/components/map/elements/WallSegment.js @@ -1,7 +1,7 @@ import React from "react"; import {Line} from "react-konva"; -import {WALL_COLOR} from "../../../colors/index"; import Shapes from "../../../shapes/index"; +import {WALL_COLOR} from "../../../util/colors"; import {TILE_SIZE_IN_PIXELS, WALL_WIDTH_IN_PIXELS} from "../MapConstants"; const WallSegment = ({wallSegment}) => { diff --git a/src/components/map/groups/GridGroup.js b/src/components/map/groups/GridGroup.js index 1af29f6e..bd2a78c3 100644 --- a/src/components/map/groups/GridGroup.js +++ b/src/components/map/groups/GridGroup.js @@ -1,6 +1,6 @@ import React from "react"; import {Group, Line} from "react-konva"; -import {GRID_COLOR} from "../../../colors/index"; +import {GRID_COLOR} from "../../../util/colors"; import {GRID_LINE_WIDTH_IN_PIXELS, MAP_SIZE, MAP_SIZE_IN_PIXELS, TILE_SIZE_IN_PIXELS} from "../MapConstants"; const MAP_COORDINATE_ENTRIES = Array.from(new Array(MAP_SIZE), (x, i) => i); diff --git a/src/components/map/groups/RackGroup.js b/src/components/map/groups/RackGroup.js index a34a5543..7bf8855e 100644 --- a/src/components/map/groups/RackGroup.js +++ b/src/components/map/groups/RackGroup.js @@ -1,9 +1,9 @@ import React from "react"; import {Group} from "react-konva"; -import {RACK_BACKGROUND_COLOR} from "../../../colors/index"; import RackEnergyFillContainer from "../../../containers/map/RackEnergyFillContainer"; import RackSpaceFillContainer from "../../../containers/map/RackSpaceFillContainer"; import Shapes from "../../../shapes/index"; +import {RACK_BACKGROUND_COLOR} from "../../../util/colors"; import {convertLoadToSimulationColor} from "../../../util/simulation-load"; import TileObject from "../elements/TileObject"; diff --git a/src/components/map/groups/TileGroup.js b/src/components/map/groups/TileGroup.js index c7991507..b88867b3 100644 --- a/src/components/map/groups/TileGroup.js +++ b/src/components/map/groups/TileGroup.js @@ -1,9 +1,9 @@ import PropTypes from "prop-types"; import React from "react"; import {Group} from "react-konva"; -import {ROOM_DEFAULT_COLOR, ROOM_IN_CONSTRUCTION_COLOR} from "../../../colors/index"; import RackContainer from "../../../containers/map/RackContainer"; import Shapes from "../../../shapes/index"; +import {ROOM_DEFAULT_COLOR, ROOM_IN_CONSTRUCTION_COLOR} from "../../../util/colors"; import {convertLoadToSimulationColor} from "../../../util/simulation-load"; import RoomTile from "../elements/RoomTile"; diff --git a/src/components/sidebars/simulation/LoadMetricComponent.js b/src/components/sidebars/simulation/LoadMetricComponent.js index 19b9927b..d9a1ed71 100644 --- a/src/components/sidebars/simulation/LoadMetricComponent.js +++ b/src/components/sidebars/simulation/LoadMetricComponent.js @@ -1,5 +1,5 @@ import React from "react"; -import {SIM_HIGH_COLOR, SIM_LOW_COLOR, SIM_MID_HIGH_COLOR, SIM_MID_LOW_COLOR} from "../../../colors/index"; +import {SIM_HIGH_COLOR, SIM_LOW_COLOR, SIM_MID_HIGH_COLOR, SIM_MID_LOW_COLOR} from "../../../util/colors"; import {LOAD_NAME_MAP} from "../../../util/simulation-load"; const LoadMetricComponent = ({loadMetric}) => ( diff --git a/src/pages/Home.js b/src/pages/Home.js index 1486f422..03df4dc5 100644 --- a/src/pages/Home.js +++ b/src/pages/Home.js @@ -1,4 +1,5 @@ import React from 'react'; +import DocumentTitle from "react-document-title"; import ContactSection from "../components/home/ContactSection"; import IntroSection from "../components/home/IntroSection"; import JumbotronHeader from "../components/home/JumbotronHeader"; @@ -49,6 +50,7 @@ class Home extends React.Component { + ); diff --git a/src/util/colors.js b/src/util/colors.js new file mode 100644 index 00000000..1e84e162 --- /dev/null +++ b/src/util/colors.js @@ -0,0 +1,29 @@ +export const GRID_COLOR = "rgba(0, 0, 0, 0.5)"; +export const BACKDROP_COLOR = "rgba(255, 255, 255, 1)"; +export const WALL_COLOR = "rgba(0, 0, 0, 1)"; + +export const ROOM_DEFAULT_COLOR = "rgba(150, 150, 150, 1)"; +export const ROOM_IN_CONSTRUCTION_COLOR = "rgba(51, 153, 255, 1)"; +export const ROOM_HOVER_VALID_COLOR = "rgba(51, 153, 255, 1)"; +export const ROOM_HOVER_INVALID_COLOR = "rgba(255, 102, 0, 1)"; +export const ROOM_NAME_COLOR = "rgba(245, 245, 245, 1)"; +export const ROOM_TYPE_COLOR = "rgba(245, 245, 245, 1)"; + +export const TILE_PLUS_COLOR = "rgba(0, 0, 0, 1)"; + +export const OBJECT_BORDER_COLOR = "rgba(0, 0, 0, 1)"; + +export const RACK_BACKGROUND_COLOR = "rgba(170, 170, 170, 1)"; +export const RACK_SPACE_BAR_BACKGROUND_COLOR = "rgba(222, 235, 247, 0.6)"; +export const RACK_SPACE_BAR_FILL_COLOR = "rgba(91, 155, 213, 0.7)"; +export const RACK_ENERGY_BAR_BACKGROUND_COLOR = "rgba(255, 242, 204, 0.6)"; +export const RACK_ENERGY_BAR_FILL_COLOR = "rgba(244, 215, 0, 0.7)"; +export const COOLING_ITEM_BACKGROUND_COLOR = "rgba(40, 50, 230, 1)"; +export const PSU_BACKGROUND_COLOR = "rgba(230, 50, 60, 1)"; + +export const GRAYED_OUT_AREA_COLOR = "rgba(0, 0, 0, 0.6)"; + +export const SIM_LOW_COLOR = "rgba(197, 224, 180, 1)"; +export const SIM_MID_LOW_COLOR = "rgba(255, 230, 153, 1)"; +export const SIM_MID_HIGH_COLOR = "rgba(248, 203, 173, 1)"; +export const SIM_HIGH_COLOR = "rgba(249, 165, 165, 1)"; diff --git a/src/util/simulation-load.js b/src/util/simulation-load.js index 55c37929..c81bb406 100644 --- a/src/util/simulation-load.js +++ b/src/util/simulation-load.js @@ -1,4 +1,4 @@ -import {SIM_HIGH_COLOR, SIM_LOW_COLOR, SIM_MID_HIGH_COLOR, SIM_MID_LOW_COLOR} from "../colors/index"; +import {SIM_HIGH_COLOR, SIM_LOW_COLOR, SIM_MID_HIGH_COLOR, SIM_MID_LOW_COLOR} from "./colors"; export const LOAD_NAME_MAP = { LOAD: "computational load", -- cgit v1.2.3