🚧 mount <Editor /> component on mobile view

client/modules/IDE/pages/IDEViewMobile.jsx

@@ -1,14 +1,33 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { Link } from 'react-router';
+// import { Link } from 'react-router';
+import { connect } from 'react-redux';
+import { withRouter } from 'react-router';
+import { useState } from 'react';
 
+// Imports to be Refactored
+import { bindActionCreators } from 'redux';
+import * as FileActions from '../actions/files';
+import * as IDEActions from '../actions/ide';
+import * as ProjectActions from '../actions/project';
+import * as EditorAccessibilityActions from '../actions/editorAccessibility';
+import * as PreferencesActions from '../actions/preferences';
+import * as UserActions from '../../User/actions';
+import * as ToastActions from '../actions/toast';
+import * as ConsoleActions from '../actions/console';
+import { getHTMLFile } from '../reducers/files';
+
+// Local Imports
+import Editor from '../components/Editor';
 import { prop, remSize } from '../../../theme';
 
+
 const background = prop('Button.default.background');
 const textColor = prop('primaryTextColor');
 
 const Header = styled.div`
+  position: fixed;
   width: 100%;
   background-color: ${background};
   color: ${textColor};
@@ -17,13 +36,18 @@ const Header = styled.div`
 
 const Footer = styled.div`
   width: 100%;
-  position: absolute;
+  position: fixed;
   bottom: 0;
   background: ${background};
   color: ${textColor};
   padding-left: ${remSize(32)};
 `;
 
+const Content = styled.div`
+`;
+
+const f = x => x;
+
 const Screen = ({ children }) => (
   <div className="fullscreen-preview">
     {children}
@@ -33,16 +57,201 @@ Screen.propTypes = {
   children: PropTypes.node.isRequired
 };
 
-export default () => (
+const IDEViewMobile = (props) => {
+  // const
+  // const {
+  //   preferences, ide, editorAccessibility, project, updateLintMessage, clearLintMessage, selectedFile, updateFileContent, files, closeEditorOptions, showEditorOptions, showKeyboardShortcutModal, setUnsavedChanges, startRefreshSketch, stopSketch, expandSidebar, collapseSidebar, clearConsole, console, showRuntimeErrorWarning, hideRuntimeErrorWarning
+  // } = props;
+
+  const [tmController, setTmController] = useState(null);
+
+  return (
     <Screen>
       <Header><h1>Mobile View</h1></Header>
+      {/* <div>
+        { [preferences, ide, editorAccessibility, project, updateLintMessage, clearLintMessage, selectedFile, updateFileContent, files, closeEditorOptions, showEditorOptions, showKeyboardShortcutModal, setUnsavedChanges, startRefreshSketch, stopSketch, expandSidebar, collapseSidebar, clearConsole, console, showRuntimeErrorWarning, hideRuntimeErrorWarning]
+          .map(pr => <h5>{pr.toString()}</h5>) }
+      </div> */}
 
-
+      <Editor
-    <h3>
+        lintWarning={props.preferences.lintWarning}
-      <br />This page is under construction.
+        linewrap={props.preferences.linewrap}
-      <br /><Link to="/">Click here</Link> to return to the regular editor
+        lintMessages={props.editorAccessibility.lintMessages}
-    </h3>
+        updateLintMessage={props.updateLintMessage}
+        clearLintMessage={props.clearLintMessage}
+        file={props.selectedFile}
+        updateFileContent={props.updateFileContent}
+        fontSize={props.preferences.fontSize}
+        lineNumbers={props.preferences.lineNumbers}
+        files={props.files}
+        editorOptionsVisible={props.ide.editorOptionsVisible}
+        showEditorOptions={props.showEditorOptions}
+        closeEditorOptions={props.closeEditorOptions}
+        showKeyboardShortcutModal={props.showKeyboardShortcutModal}
+        setUnsavedChanges={props.setUnsavedChanges}
+        isPlaying={props.ide.isPlaying}
+        theme={props.preferences.theme}
+        startRefreshSketch={props.startRefreshSketch}
+        stopSketch={props.stopSketch}
+        autorefresh={props.preferences.autorefresh}
+        unsavedChanges={props.ide.unsavedChanges}
+        projectSavedTime={props.project.updatedAt}
+        isExpanded={props.ide.sidebarIsExpanded}
+        expandSidebar={props.expandSidebar}
+        collapseSidebar={props.collapseSidebar}
+        isUserOwner={setTmController}
+        clearConsole={props.clearConsole}
+        consoleEvents={props.console}
+        showRuntimeErrorWarning={props.showRuntimeErrorWarning}
+        hideRuntimeErrorWarning={props.hideRuntimeErrorWarning}
+        runtimeErrorWarningVisible={props.ide.runtimeErrorWarningVisible}
+        provideController={setTmController}
+      />
 
       <Footer><h1>Bottom Bar</h1></Footer>
     </Screen>
   );
+};
+
+
+IDEViewMobile.propTypes = {
+
+  preferences: PropTypes.shape({
+    fontSize: PropTypes.number.isRequired,
+    autosave: PropTypes.bool.isRequired,
+    linewrap: PropTypes.bool.isRequired,
+    lineNumbers: PropTypes.bool.isRequired,
+    lintWarning: PropTypes.bool.isRequired,
+    textOutput: PropTypes.bool.isRequired,
+    gridOutput: PropTypes.bool.isRequired,
+    soundOutput: PropTypes.bool.isRequired,
+    theme: PropTypes.string.isRequired,
+    autorefresh: PropTypes.bool.isRequired
+  }).isRequired,
+
+  ide: PropTypes.shape({
+    isPlaying: PropTypes.bool.isRequired,
+    isAccessibleOutputPlaying: PropTypes.bool.isRequired,
+    consoleEvent: PropTypes.array,
+    modalIsVisible: PropTypes.bool.isRequired,
+    sidebarIsExpanded: PropTypes.bool.isRequired,
+    consoleIsExpanded: PropTypes.bool.isRequired,
+    preferencesIsVisible: PropTypes.bool.isRequired,
+    projectOptionsVisible: PropTypes.bool.isRequired,
+    newFolderModalVisible: PropTypes.bool.isRequired,
+    shareModalVisible: PropTypes.bool.isRequired,
+    shareModalProjectId: PropTypes.string.isRequired,
+    shareModalProjectName: PropTypes.string.isRequired,
+    shareModalProjectUsername: PropTypes.string.isRequired,
+    editorOptionsVisible: PropTypes.bool.isRequired,
+    keyboardShortcutVisible: PropTypes.bool.isRequired,
+    unsavedChanges: PropTypes.bool.isRequired,
+    infiniteLoop: PropTypes.bool.isRequired,
+    previewIsRefreshing: PropTypes.bool.isRequired,
+    infiniteLoopMessage: PropTypes.string.isRequired,
+    projectSavedTime: PropTypes.string,
+    previousPath: PropTypes.string.isRequired,
+    justOpenedProject: PropTypes.bool.isRequired,
+    errorType: PropTypes.string,
+    runtimeErrorWarningVisible: PropTypes.bool.isRequired,
+    uploadFileModalVisible: PropTypes.bool.isRequired
+  }).isRequired,
+
+  editorAccessibility: PropTypes.shape({
+    lintMessages: PropTypes.array.isRequired,
+  }).isRequired,
+
+  project: PropTypes.shape({
+    id: PropTypes.string,
+    name: PropTypes.string.isRequired,
+    owner: PropTypes.shape({
+      username: PropTypes.string,
+      id: PropTypes.string
+    }),
+    updatedAt: PropTypes.string
+  }).isRequired,
+
+  updateLintMessage: PropTypes.func.isRequired,
+
+  clearLintMessage: PropTypes.func.isRequired,
+
+  selectedFile: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    content: PropTypes.string.isRequired,
+    name: PropTypes.string.isRequired
+  }).isRequired,
+
+  updateFileContent: PropTypes.func.isRequired,
+
+  files: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    name: PropTypes.string.isRequired,
+    content: PropTypes.string.isRequired
+  })).isRequired,
+
+  closeEditorOptions: PropTypes.func.isRequired,
+
+  showEditorOptions: PropTypes.func.isRequired,
+
+  showKeyboardShortcutModal: PropTypes.func.isRequired,
+
+  setUnsavedChanges: PropTypes.func.isRequired,
+
+  startRefreshSketch: PropTypes.func.isRequired,
+
+  stopSketch: PropTypes.func.isRequired,
+
+  expandSidebar: PropTypes.func.isRequired,
+
+  collapseSidebar: PropTypes.func.isRequired,
+
+  clearConsole: PropTypes.func.isRequired,
+
+  console: PropTypes.arrayOf(PropTypes.shape({
+    method: PropTypes.string.isRequired,
+    args: PropTypes.arrayOf(PropTypes.string)
+  })).isRequired,
+
+  showRuntimeErrorWarning: PropTypes.func.isRequired,
+
+  hideRuntimeErrorWarning: PropTypes.func.isRequired,
+
+};
+
+
+function mapStateToProps(state) {
+  return {
+    files: state.files,
+    selectedFile: state.files.find(file => file.isSelectedFile) ||
+      state.files.find(file => file.name === 'sketch.js') ||
+      state.files.find(file => file.name !== 'root'),
+    htmlFile: getHTMLFile(state.files),
+    ide: state.ide,
+    preferences: state.preferences,
+    editorAccessibility: state.editorAccessibility,
+    user: state.user,
+    project: state.project,
+    toast: state.toast,
+    console: state.console
+  };
+}
+
+function mapDispatchToProps(dispatch) {
+  return bindActionCreators(
+    Object.assign(
+      {},
+      EditorAccessibilityActions,
+      FileActions,
+      ProjectActions,
+      IDEActions,
+      PreferencesActions,
+      UserActions,
+      ToastActions,
+      ConsoleActions
+    ),
+    dispatch
+  );
+}
+
+
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(IDEViewMobile));