summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md4
-rw-r--r--docs/images/component-diagram.png (renamed from docs/images/opendc-component-diagram.png)bin39965 -> 39965 bytes
-rw-r--r--docs/images/opendc-frontend-construction.pngbin76461 -> 0 bytes
-rw-r--r--docs/images/opendc-frontend-simulation-zoom.pngbin100583 -> 0 bytes
-rw-r--r--docs/images/opendc-frontend-simulation.pngbin96351 -> 0 bytes
-rw-r--r--docs/images/screenshot-construction.pngbin0 -> 275103 bytes
-rw-r--r--docs/images/screenshot-simulation.pngbin0 -> 291836 bytes
-rw-r--r--opendc-web/opendc-web-ui/public/img/screenshot-construction.pngbin76461 -> 275103 bytes
-rw-r--r--opendc-web/opendc-web-ui/public/img/screenshot-simulation-zoom.pngbin100583 -> 0 bytes
-rw-r--r--opendc-web/opendc-web-ui/public/img/screenshot-simulation.pngbin0 -> 291836 bytes
-rw-r--r--opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.js21
-rw-r--r--opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.sass1
-rw-r--r--opendc-web/opendc-web-ui/src/components/home/SimulationSection.js10
13 files changed, 21 insertions, 15 deletions
diff --git a/README.md b/README.md
index 7fa141ce..904fb206 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,12 @@ Collaborative Datacenter Simulation and Exploration for Everybody
OpenDC is a free and open-source platform for datacenter simulation aimed at both research and education.
-![Datacenter construction in OpenDC](docs/images/opendc-frontend-construction.png)
+![Datacenter construction in OpenDC](docs/images/screenshot-construction.png)
Users can construct datacenters (see above) and define portfolios of scenarios (experiments) to see how these
datacenters perform under different workloads and schedulers (see below).
-![Datacenter simulation in OpenDC](docs/images/opendc-frontend-simulation.png)
+![Datacenter simulation in OpenDC](docs/images/screenshot-simulation.png)
The simulator is accessible both as a ready-to-use website hosted by us at [opendc.org](https://opendc.org), and as
source code that users can run locally on their own machine, through Docker.
diff --git a/docs/images/opendc-component-diagram.png b/docs/images/component-diagram.png
index 312ca72a..312ca72a 100644
--- a/docs/images/opendc-component-diagram.png
+++ b/docs/images/component-diagram.png
Binary files differ
diff --git a/docs/images/opendc-frontend-construction.png b/docs/images/opendc-frontend-construction.png
deleted file mode 100644
index 223e8d48..00000000
--- a/docs/images/opendc-frontend-construction.png
+++ /dev/null
Binary files differ
diff --git a/docs/images/opendc-frontend-simulation-zoom.png b/docs/images/opendc-frontend-simulation-zoom.png
deleted file mode 100644
index d7744926..00000000
--- a/docs/images/opendc-frontend-simulation-zoom.png
+++ /dev/null
Binary files differ
diff --git a/docs/images/opendc-frontend-simulation.png b/docs/images/opendc-frontend-simulation.png
deleted file mode 100644
index bbf4cbd6..00000000
--- a/docs/images/opendc-frontend-simulation.png
+++ /dev/null
Binary files differ
diff --git a/docs/images/screenshot-construction.png b/docs/images/screenshot-construction.png
new file mode 100644
index 00000000..ea20a7c4
--- /dev/null
+++ b/docs/images/screenshot-construction.png
Binary files differ
diff --git a/docs/images/screenshot-simulation.png b/docs/images/screenshot-simulation.png
new file mode 100644
index 00000000..1bd989c7
--- /dev/null
+++ b/docs/images/screenshot-simulation.png
Binary files differ
diff --git a/opendc-web/opendc-web-ui/public/img/screenshot-construction.png b/opendc-web/opendc-web-ui/public/img/screenshot-construction.png
index 223e8d48..ea20a7c4 100644
--- a/opendc-web/opendc-web-ui/public/img/screenshot-construction.png
+++ b/opendc-web/opendc-web-ui/public/img/screenshot-construction.png
Binary files differ
diff --git a/opendc-web/opendc-web-ui/public/img/screenshot-simulation-zoom.png b/opendc-web/opendc-web-ui/public/img/screenshot-simulation-zoom.png
deleted file mode 100644
index d7744926..00000000
--- a/opendc-web/opendc-web-ui/public/img/screenshot-simulation-zoom.png
+++ /dev/null
Binary files differ
diff --git a/opendc-web/opendc-web-ui/public/img/screenshot-simulation.png b/opendc-web/opendc-web-ui/public/img/screenshot-simulation.png
new file mode 100644
index 00000000..1bd989c7
--- /dev/null
+++ b/opendc-web/opendc-web-ui/public/img/screenshot-simulation.png
Binary files differ
diff --git a/opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.js b/opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.js
index c987d5d0..263590d5 100644
--- a/opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.js
+++ b/opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.js
@@ -1,23 +1,28 @@
import classNames from 'classnames'
import React from 'react'
+import { Row, Col } from 'reactstrap'
import ContentSection from './ContentSection'
import './ScreenshotSection.sass'
const ScreenshotSection = ({ name, title, imageUrl, caption, imageIsRight, children }) => (
<ContentSection name={name} title={title}>
- <div className="row">
- <div
- className={classNames('col-xl-5 col-lg-5 col-md-5 col-sm-12 col-12 text-left', {
+ <Row>
+ <Col
+ xl="5"
+ lg="5"
+ md="5"
+ sm="!2"
+ className={classNames('text-left my-auto', {
'order-1': !imageIsRight,
})}
>
{children}
- </div>
- <div className="col-xl-7 col-lg-7 col-md-7 col-sm-12 col-12">
+ </Col>
+ <Col xl="7" lg="7" md="7" sm="12">
<img src={imageUrl} className="col-12 screenshot" alt={caption} />
- <div className="row text-muted justify-content-center">{caption}</div>
- </div>
- </div>
+ <Row className="text-muted justify-content-center">{caption}</Row>
+ </Col>
+ </Row>
</ContentSection>
)
diff --git a/opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.sass b/opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.sass
index 2f454cb4..6b1a6ec4 100644
--- a/opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.sass
+++ b/opendc-web/opendc-web-ui/src/components/home/ScreenshotSection.sass
@@ -1,5 +1,4 @@
.screenshot
- outline: 2px black solid
padding-left: 0
padding-right: 0
margin-bottom: 5px
diff --git a/opendc-web/opendc-web-ui/src/components/home/SimulationSection.js b/opendc-web/opendc-web-ui/src/components/home/SimulationSection.js
index b0244cb5..739a5d11 100644
--- a/opendc-web/opendc-web-ui/src/components/home/SimulationSection.js
+++ b/opendc-web/opendc-web-ui/src/components/home/SimulationSection.js
@@ -5,16 +5,18 @@ const ModelingSection = () => (
<ScreenshotSection
name="project"
title="Datacenter Simulation"
- imageUrl="/img/screenshot-simulation-zoom.png"
+ imageUrl="/img/screenshot-simulation.png"
caption="Running an experiment in OpenDC"
imageIsRight={false}
>
<h3>Working with OpenDC:</h3>
<ul>
<li>Seamlessly switch between construction and simulation modes</li>
- <li>Choose one of several predefined workloads (Big Data, Bag of Tasks, Hadoop, etc.)</li>
- <li>Play, pause, and skip around the informative simulation timeline</li>
- <li>Visualize and demo live</li>
+ <li>
+ Choose one of several predefined workloads (Business Critical, Workflows, Machine Learning, Serverless,
+ etc.)
+ </li>
+ <li>Compare datacenter topologies using automated plots and visual summaries</li>
</ul>
</ScreenshotSection>
)