Skip to content

Commit fb831f5

Browse files
committed
🐛 fix basic layout issues
1 parent f40cd4f commit fb831f5

File tree

1 file changed

+48
-40
lines changed

1 file changed

+48
-40
lines changed

client/modules/IDE/pages/IDEViewMobile.jsx

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ const Header = styled.div`
3131
width: 100%;
3232
background-color: ${background};
3333
color: ${textColor};
34+
padding: ${remSize(12)};
3435
padding-left: ${remSize(32)};
36+
z-index: 1;
3537
`;
3638

3739
const Footer = styled.div`
@@ -44,9 +46,10 @@ const Footer = styled.div`
4446
`;
4547

4648
const Content = styled.div`
49+
z-index: 0;
50+
margin-top: ${remSize(16)};
4751
`;
4852

49-
const f = x => x;
5053

5154
const Screen = ({ children }) => (
5255
<div className="fullscreen-preview">
@@ -59,55 +62,60 @@ Screen.propTypes = {
5962

6063
const IDEViewMobile = (props) => {
6164
// const
62-
// const {
63-
// preferences, ide, editorAccessibility, project, updateLintMessage, clearLintMessage, selectedFile, updateFileContent, files, closeEditorOptions, showEditorOptions, showKeyboardShortcutModal, setUnsavedChanges, startRefreshSketch, stopSketch, expandSidebar, collapseSidebar, clearConsole, console, showRuntimeErrorWarning, hideRuntimeErrorWarning
64-
// } = props;
65+
const {
66+
preferences, ide, editorAccessibility, project, updateLintMessage, clearLintMessage, selectedFile, updateFileContent, files, closeEditorOptions, showEditorOptions, showKeyboardShortcutModal, setUnsavedChanges, startRefreshSketch, stopSketch, expandSidebar, collapseSidebar, clearConsole, console, showRuntimeErrorWarning, hideRuntimeErrorWarning
67+
} = props;
6568

6669
const [tmController, setTmController] = useState(null);
6770

6871
return (
6972
<Screen>
70-
<Header><h1>Mobile View</h1></Header>
73+
<Header>
74+
{/* <h1>Mobile View</h1> */}
75+
<h2>{project.name}</h2>
76+
<h3>{selectedFile.name}</h3>
77+
</Header>
7178
{/* <div>
7279
{ [preferences, ide, editorAccessibility, project, updateLintMessage, clearLintMessage, selectedFile, updateFileContent, files, closeEditorOptions, showEditorOptions, showKeyboardShortcutModal, setUnsavedChanges, startRefreshSketch, stopSketch, expandSidebar, collapseSidebar, clearConsole, console, showRuntimeErrorWarning, hideRuntimeErrorWarning]
7380
.map(pr => <h5>{pr.toString()}</h5>) }
7481
</div> */}
7582

76-
<Editor
77-
lintWarning={props.preferences.lintWarning}
78-
linewrap={props.preferences.linewrap}
79-
lintMessages={props.editorAccessibility.lintMessages}
80-
updateLintMessage={props.updateLintMessage}
81-
clearLintMessage={props.clearLintMessage}
82-
file={props.selectedFile}
83-
updateFileContent={props.updateFileContent}
84-
fontSize={props.preferences.fontSize}
85-
lineNumbers={props.preferences.lineNumbers}
86-
files={props.files}
87-
editorOptionsVisible={props.ide.editorOptionsVisible}
88-
showEditorOptions={props.showEditorOptions}
89-
closeEditorOptions={props.closeEditorOptions}
90-
showKeyboardShortcutModal={props.showKeyboardShortcutModal}
91-
setUnsavedChanges={props.setUnsavedChanges}
92-
isPlaying={props.ide.isPlaying}
93-
theme={props.preferences.theme}
94-
startRefreshSketch={props.startRefreshSketch}
95-
stopSketch={props.stopSketch}
96-
autorefresh={props.preferences.autorefresh}
97-
unsavedChanges={props.ide.unsavedChanges}
98-
projectSavedTime={props.project.updatedAt}
99-
isExpanded={props.ide.sidebarIsExpanded}
100-
expandSidebar={props.expandSidebar}
101-
collapseSidebar={props.collapseSidebar}
102-
isUserOwner={setTmController}
103-
clearConsole={props.clearConsole}
104-
consoleEvents={props.console}
105-
showRuntimeErrorWarning={props.showRuntimeErrorWarning}
106-
hideRuntimeErrorWarning={props.hideRuntimeErrorWarning}
107-
runtimeErrorWarningVisible={props.ide.runtimeErrorWarningVisible}
108-
provideController={setTmController}
109-
/>
110-
83+
<Content>
84+
<Editor
85+
lintWarning={props.preferences.lintWarning}
86+
linewrap={props.preferences.linewrap}
87+
lintMessages={props.editorAccessibility.lintMessages}
88+
updateLintMessage={props.updateLintMessage}
89+
clearLintMessage={props.clearLintMessage}
90+
file={props.selectedFile}
91+
updateFileContent={props.updateFileContent}
92+
fontSize={props.preferences.fontSize}
93+
lineNumbers={props.preferences.lineNumbers}
94+
files={props.files}
95+
editorOptionsVisible={props.ide.editorOptionsVisible}
96+
showEditorOptions={props.showEditorOptions}
97+
closeEditorOptions={props.closeEditorOptions}
98+
showKeyboardShortcutModal={props.showKeyboardShortcutModal}
99+
setUnsavedChanges={props.setUnsavedChanges}
100+
isPlaying={props.ide.isPlaying}
101+
theme={props.preferences.theme}
102+
startRefreshSketch={props.startRefreshSketch}
103+
stopSketch={props.stopSketch}
104+
autorefresh={props.preferences.autorefresh}
105+
unsavedChanges={props.ide.unsavedChanges}
106+
projectSavedTime={props.project.updatedAt}
107+
isExpanded={props.ide.sidebarIsExpanded}
108+
expandSidebar={props.expandSidebar}
109+
collapseSidebar={props.collapseSidebar}
110+
isUserOwner={setTmController}
111+
clearConsole={props.clearConsole}
112+
consoleEvents={props.console}
113+
showRuntimeErrorWarning={props.showRuntimeErrorWarning}
114+
hideRuntimeErrorWarning={props.hideRuntimeErrorWarning}
115+
runtimeErrorWarningVisible={props.ide.runtimeErrorWarningVisible}
116+
provideController={setTmController}
117+
/>
118+
</Content>
111119
<Footer><h1>Bottom Bar</h1></Footer>
112120
</Screen>
113121
);

0 commit comments

Comments
 (0)