Merge pull request #11 from brendancboyle/dev

1.0.5
bcbee · Feb 14, 2018 · 6ad828d · 6ad828d
2 parents 518f123 + c98f6b2
commit 6ad828d
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 3 deletions.
diff --git a/app/components/Present.css b/app/components/Present.css
@@ -2,3 +2,33 @@
   margin: 8px;
   text-align: center;
 }
+
+.container h2 {
+  margin-top: 25px;
+}
+
+.statusContainer {
+  width: 200px;
+  margin: auto;
+}
+
+.statusContainer img {
+  width: 100%;
+}
+
+.slide {
+  width: 200px;
+  position: absolute;
+}
+
+.slide div {
+  width: 130px;
+  background: white;
+  border-radius: 5px;
+  height: 72px;
+  margin: 45px auto 0 auto;
+}
+
+.slide img {
+  width: 70px;
+}
diff --git a/app/components/Present.jsx b/app/components/Present.jsx
@@ -3,6 +3,8 @@ import React, { Component } from 'react';
 import styles from './Present.css';
 import NavBar from '../containers/NavBar';
 import UPRKit from '../UPRKit';
+import Display from '../images/display.svg';
+import Check from '../images/check.svg';
 
 type Props = {
   token: string,
@@ -18,7 +20,16 @@ export default class Home extends Component<Props> {
       <div>
         <NavBar title="Present" />
         <div className={styles.container} data-tid="container">
-          <h2>Universal Presenter Remote</h2>
+          <h2>Ready to Go</h2>
+          <h3>Open your presentation and use the app as a remote</h3>
+          <div className={styles.statusContainer}>
+            <div className={styles.slide}>
+              <div>
+                <img src={Check} alt="computer" />
+              </div>
+            </div>
+            <img src={Display} alt="computer" />
+          </div>
         </div>
       </div>
     );

diff --git a/app/images/check.svg b/app/images/check.svg
diff --git a/app/images/display.svg b/app/images/display.svg
diff --git a/app/images/play-button.svg b/app/images/play-button.svg
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "upr-desktop",
   "productName": "Universal Presenter Remote",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Control your presentations from any platform.",
   "main": "./main.prod.js",
   "author": {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "upr-desktop",
   "productName": "Universal Presenter Remote",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Control your presentations from any platform.",
   "scripts": {
     "build": "concurrently \"npm run build-main\" \"npm run build-renderer\"",