From 18e945c7d5d482ed593f6e7dff555f6aad8c8d4c Mon Sep 17 00:00:00 2001 From: ghalestrilo Date: Wed, 15 Jul 2020 17:24:12 -0300 Subject: [PATCH] :construction: Improve Footer, Emplace Console component --- client/components/mobile/Footer.jsx | 31 +++++++++++++++++++--- client/modules/App/App.jsx | 1 + client/modules/IDE/pages/MobileIDEView.jsx | 22 ++++++++++++++- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/client/components/mobile/Footer.jsx b/client/components/mobile/Footer.jsx index 5d82d3c7..d84b7275 100644 --- a/client/components/mobile/Footer.jsx +++ b/client/components/mobile/Footer.jsx @@ -1,20 +1,43 @@ import React from 'react'; import styled from 'styled-components'; +import PropTypes from 'prop-types'; import { prop, remSize } from '../../theme'; + const background = prop('MobilePanel.default.background'); const textColor = prop('primaryTextColor'); -const Footer = styled.div` +const FooterWrapper = styled.div` position: fixed; width: 100%; + bottom: 0; +`; + +const FooterContent = styled.div` background: ${background}; color: ${textColor}; padding: ${remSize(12)}; padding-left: ${remSize(32)}; - z-index: 1; - - bottom: 0; `; + +const Footer = ({ before, children }) => ( + + {before} + + {children} + + +); + +Footer.propTypes = { + before: PropTypes.element, + children: PropTypes.element +}; + +Footer.defaultProps = { + before: <>, + children: <> +}; + export default Footer; diff --git a/client/modules/App/App.jsx b/client/modules/App/App.jsx index 15bf7d19..79a8549f 100644 --- a/client/modules/App/App.jsx +++ b/client/modules/App/App.jsx @@ -36,6 +36,7 @@ class App extends React.Component {
{/* FIXME: remove "false &&" from line below */} {false && this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && } + {/* {this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && } */} {this.props.children}
); diff --git a/client/modules/IDE/pages/MobileIDEView.jsx b/client/modules/IDE/pages/MobileIDEView.jsx index 180cbb2e..7bc916f1 100644 --- a/client/modules/IDE/pages/MobileIDEView.jsx +++ b/client/modules/IDE/pages/MobileIDEView.jsx @@ -3,6 +3,7 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { withRouter } from 'react-router'; import { useState } from 'react'; +import styled from 'styled-components'; // Imports to be Refactored import { bindActionCreators } from 'redux'; @@ -25,6 +26,8 @@ import Header from '../../../components/mobile/Header'; import Screen from '../../../components/mobile/MobileScreen'; import Footer from '../../../components/mobile/Footer'; import IDEWrapper from '../../../components/mobile/IDEWrapper'; +import Console from '../components/Console'; +import { remSize } from '../../../theme'; const isUserOwner = ({ project, user }) => (project.owner && project.owner.id === user.id); @@ -40,6 +43,11 @@ const MobileIDEView = (props) => { const [tmController, setTmController] = useState(null); // eslint-disable-line const [overlay, setOverlay] = useState(null); // eslint-disable-line + // FIXME: + const dispatchConsoleEvent = () => {}; + const expandConsole = () => {}; + const collapseConsole = () => {}; + return (
{ provideController={setTmController} /> -

Bottom Bar

+ ); };