Merge pull request #15 from joshhoegen/optimizations

Setting up get param options.
joshhoegen · Jun 12, 2017 · c2bd8db · c2bd8db
2 parents 371e59a + f2bb0fe
commit c2bd8db
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 26 deletions.
diff --git a/public/index.html b/public/index.html
@@ -1,20 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>Simple users app built with redux-minimal</title>
+  <title>Js + Video = Art by Josh Hoegen </title>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"/>
-
-  <link rel="stylesheet" href="../css/chroma-demo.css">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
-    integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"
-    integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
-
+  <link rel="shortcut icon" type="image/x-icon" href="media/favicon.ico?v=1.0"/>
   <link rel="stylesheet" href="/css/main.css">
 </head>
 <body>

diff --git a/public/media/favicon.ico b/public/media/favicon.ico
diff --git a/public/media/jh-logo-80.png b/public/media/jh-logo-80.png
diff --git a/public/media/logo.svg b/public/media/logo.svg
diff --git a/public/media/pattern.jpg b/public/media/pattern.jpg
diff --git a/src/components/Home.js b/src/components/Home.js
@@ -10,7 +10,11 @@ export default class Home extends React.Component {
     const query = this.query;
     return (
       <div className="page-home">
-        <GreenScreen hex={query.hex || '2ab050'} />
+        <GreenScreen
+          hex={query.hex || '2ab050'}
+          size={query.size || '4'}
+          pixelate={query.pixelate || 'false'}
+        />
       </div>
     );
   }

diff --git a/src/components/trails/index.js b/src/components/trails/index.js
@@ -18,15 +18,18 @@ export default class GreenScreen extends React.Component {
     }
 
     this.state = {
-      size: 4,
-      pixelate: false,
+      size: this.props.size,
+      pixelate: this.props.pixelate,
       color: hex,
     };
   }
 
   componentDidMount() {
     this.trails = new Trails(this.hexToRgbA(this.state.color));
+    this.trails.size = this.state.size;
+    this.trails.mode = this.state.pixelate === 'true' ? 'pixelate' : 'blur';
     this.trails.draw();
+    console.log(this.trails.mode);
   }
 
   hexToRgbA(hex) {
@@ -131,6 +134,7 @@ export default class GreenScreen extends React.Component {
             </canvas>
           </div>
         </div>
+        <img className="logo" src="media/jh-logo-80.png" alt="Art by Josh Hoegen" />
       </div>
     );
   }

diff --git a/src/stylesheets/main.scss b/src/stylesheets/main.scss
@@ -103,6 +103,12 @@ video {
     direction: rtl;
   }
 }
+.logo {
+  position: absolute;
+  right: 20px;
+  bottom: 20px;
+  z-index: 5;
+}
 .color-picker {
   float: left;
   margin-right: 20px;