diff --git a/public/index.html b/public/index.html index bab6c681..62778c3c 100644 --- a/public/index.html +++ b/public/index.html @@ -1,20 +1,13 @@ - Simple users app built with redux-minimal + Js + Video = Art by Josh Hoegen - - - - - - + diff --git a/public/media/favicon.ico b/public/media/favicon.ico new file mode 100644 index 00000000..b5ad7a9d Binary files /dev/null and b/public/media/favicon.ico differ diff --git a/public/media/jh-logo-80.png b/public/media/jh-logo-80.png new file mode 100644 index 00000000..d8f70891 Binary files /dev/null and b/public/media/jh-logo-80.png differ diff --git a/public/media/logo.svg b/public/media/logo.svg deleted file mode 100644 index 823d9098..00000000 --- a/public/media/logo.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/public/media/pattern.jpg b/public/media/pattern.jpg deleted file mode 100644 index 46824649..00000000 Binary files a/public/media/pattern.jpg and /dev/null differ diff --git a/src/components/Home.js b/src/components/Home.js index de6707b9..d47864dd 100644 --- 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 (
- +
); } diff --git a/src/components/trails/index.js b/src/components/trails/index.js index a3583e58..b21efe8a 100644 --- 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 { + Art by Josh Hoegen ); } diff --git a/src/stylesheets/main.scss b/src/stylesheets/main.scss index ab074de1..fcfda252 100644 --- 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;