From 5cb14aba897fa3abeb89623807edf8ad653ec796 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 16 Oct 2018 08:26:57 +0200 Subject: [PATCH] Canvas Hidden and Visible Working. --- client/html/index.html | 23 +++++++++++++++-- client/package-lock.json | 6 ++--- client/package.json | 2 +- client/src/views/home/index.js | 47 +++++++++++++--------------------- 4 files changed, 43 insertions(+), 35 deletions(-) diff --git a/client/html/index.html b/client/html/index.html index 5d7ced121..3200513aa 100644 --- a/client/html/index.html +++ b/client/html/index.html @@ -10,8 +10,27 @@ + + + + + - -
+ + +
+
+ diff --git a/client/package-lock.json b/client/package-lock.json index d3c6d98f4..6c5a00368 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -122,9 +122,9 @@ } }, "@advancedalgos/users-client": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.8.tgz", - "integrity": "sha512-k3rJNSel2/pMYFQlZ1AP+g7oK3AD+KrbU6id6NSQdoH6ZnqQQybwCJtOClLYFYRJR4TKVLxaaPs/WExw3s78wQ==", + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.9.tgz", + "integrity": "sha512-xWXBpztvv5UeGvfy8KnTGhUTtSFZkfL8yL13Mm0BWE7ZeM/63T68HKysCROL8l3GCQueiCyV82PICb9nlO+/Eg==", "dev": true, "requires": { "@material-ui/core": "3.2.0", diff --git a/client/package.json b/client/package.json index 2e426feb7..e6e33ab9f 100644 --- a/client/package.json +++ b/client/package.json @@ -23,7 +23,7 @@ "devDependencies": { "@advancedalgos/key-vault-client": "^0.0.7", "@advancedalgos/teams-client": "^0.0.20", - "@advancedalgos/users-client": "^0.0.8", + "@advancedalgos/users-client": "^0.0.9", "@advancedalgos/web-components": "^0.0.10", "@babel/core": "^7.1.2", "autoprefixer": "^9.1.5", diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js index 88827d722..1263be2f7 100644 --- a/client/src/views/home/index.js +++ b/client/src/views/home/index.js @@ -1,12 +1,10 @@ -import React from 'react' +import React, { Component } from 'react' import PropTypes from 'prop-types' import CssBaseline from '@material-ui/core/CssBaseline' import Typography from '@material-ui/core/Typography' import { withStyles } from '@material-ui/core/styles' -import BackgroundImage from '../../assets/advanced-algos/evolution.jpg' - const styles = theme => ({ '@global': { body: { @@ -14,7 +12,6 @@ const styles = theme => ({ } }, layout: { - backgroundImage: `url(${BackgroundImage})`, width: '100%', height: '100%' }, @@ -27,31 +24,23 @@ const styles = theme => ({ } }) -const Home = ({ classes }) => ( - - -
-
- - Collaborate. Innovate. Evolve. - - - Welcome to Advanced Algos - -
-
-
-) +class Home extends Component { + + componentDidMount () { + window.CANVAS_VISIBLE = true + } + + componentWillUnmount () { + window.CANVAS_VISIBLE = false + } + + render () { + const { classes } = this.props + return ( + + ) + } +} Home.propTypes = { classes: PropTypes.object.isRequired