Skip to content

Commit 18e945c

Browse files
committed
🚧 Improve Footer, Emplace Console component
1 parent c44e60e commit 18e945c

File tree

3 files changed

+49
-5
lines changed

3 files changed

+49
-5
lines changed

client/components/mobile/Footer.jsx

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,43 @@
11
import React from 'react';
22
import styled from 'styled-components';
3+
import PropTypes from 'prop-types';
34
import { prop, remSize } from '../../theme';
45

6+
57
const background = prop('MobilePanel.default.background');
68
const textColor = prop('primaryTextColor');
79

8-
const Footer = styled.div`
10+
const FooterWrapper = styled.div`
911
position: fixed;
1012
width: 100%;
13+
bottom: 0;
14+
`;
15+
16+
const FooterContent = styled.div`
1117
background: ${background};
1218
color: ${textColor};
1319
padding: ${remSize(12)};
1420
padding-left: ${remSize(32)};
15-
z-index: 1;
16-
17-
bottom: 0;
1821
`;
1922

23+
24+
const Footer = ({ before, children }) => (
25+
<FooterWrapper>
26+
{before}
27+
<FooterContent>
28+
{children}
29+
</FooterContent>
30+
</FooterWrapper>
31+
);
32+
33+
Footer.propTypes = {
34+
before: PropTypes.element,
35+
children: PropTypes.element
36+
};
37+
38+
Footer.defaultProps = {
39+
before: <></>,
40+
children: <></>
41+
};
42+
2043
export default Footer;

client/modules/App/App.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class App extends React.Component {
3636
<div className="app">
3737
{/* FIXME: remove "false &&" from line below */}
3838
{false && this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && <DevTools />}
39+
{/* {this.state.isMounted && !window.devToolsExtension && getConfig('NODE_ENV') === 'development' && <DevTools />} */}
3940
{this.props.children}
4041
</div>
4142
);

client/modules/IDE/pages/MobileIDEView.jsx

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
33
import { connect } from 'react-redux';
44
import { withRouter } from 'react-router';
55
import { useState } from 'react';
6+
import styled from 'styled-components';
67

78
// Imports to be Refactored
89
import { bindActionCreators } from 'redux';
@@ -25,6 +26,8 @@ import Header from '../../../components/mobile/Header';
2526
import Screen from '../../../components/mobile/MobileScreen';
2627
import Footer from '../../../components/mobile/Footer';
2728
import IDEWrapper from '../../../components/mobile/IDEWrapper';
29+
import Console from '../components/Console';
30+
import { remSize } from '../../../theme';
2831

2932
const isUserOwner = ({ project, user }) => (project.owner && project.owner.id === user.id);
3033

@@ -40,6 +43,11 @@ const MobileIDEView = (props) => {
4043
const [tmController, setTmController] = useState(null); // eslint-disable-line
4144
const [overlay, setOverlay] = useState(null); // eslint-disable-line
4245

46+
// FIXME:
47+
const dispatchConsoleEvent = () => {};
48+
const expandConsole = () => {};
49+
const collapseConsole = () => {};
50+
4351
return (
4452
<Screen fullscreen>
4553
<Header
@@ -94,7 +102,19 @@ const MobileIDEView = (props) => {
94102
provideController={setTmController}
95103
/>
96104
</IDEWrapper>
97-
<Footer><h2>Bottom Bar</h2></Footer>
105+
<Footer before={<Console
106+
fontSize={preferences.fontSize}
107+
consoleEvents={console}
108+
isExpanded={ide.consoleIsExpanded}
109+
clearConsole={clearConsole}
110+
theme={preferences.theme}
111+
dispatchConsoleEvent={dispatchConsoleEvent}
112+
expandConsole={expandConsole}
113+
collapseConsole={collapseConsole}
114+
/>}
115+
>
116+
<h2>Bottom Bar</h2>
117+
</Footer>
98118
</Screen>
99119
);
100120
};

0 commit comments

Comments
 (0)