Merge branch 'develop' into feature/Internationalize-mobile-text

Author: catarak

client/common/icons.jsx

@@ -14,6 +14,7 @@ import Preferences from '../images/preferences.svg';
 import Play from '../images/triangle-arrow-right.svg';
 import More from '../images/more.svg';
 import Code from '../images/code.svg';
+import Save from '../images/save.svg';
 import Terminal from '../images/terminal.svg';
 
 import Folder from '../images/folder-padded.svg';
@@ -87,6 +88,7 @@ export const PlayIcon = withLabel(Play);
 export const MoreIcon = withLabel(More);
 export const TerminalIcon = withLabel(Terminal);
 export const CodeIcon = withLabel(Code);
+export const SaveIcon = withLabel(Save);
 
 export const FolderIcon = withLabel(Folder);
 

client/components/mobile/ActionStrip.jsx

@@ -1,20 +1,16 @@
 import React from 'react';
-import styled from 'styled-components';
 import PropTypes from 'prop-types';
-import { bindActionCreators } from 'redux';
-import { useDispatch, useSelector } from 'react-redux';
+import styled from 'styled-components';
 import { remSize, prop } from '../../theme';
 import IconButton from './IconButton';
-import { TerminalIcon, FolderIcon } from '../../common/icons';
-import * as IDEActions from '../../modules/IDE/actions/ide';
 
 const BottomBarContent = styled.div`
   padding: ${remSize(8)};
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(8,1fr);
 
   svg {
     max-height: ${remSize(32)};
-
   }
 
   path { fill: ${prop('primaryTextColor')} !important }
@@ -25,42 +21,28 @@ const BottomBarContent = styled.div`
   }
 `;
 
-// Maybe this component shouldn't be connected, and instead just receive the `actions` prop
-const ActionStrip = ({ toggleExplorer }) => {
-  const { expandConsole, collapseConsole } = bindActionCreators(IDEActions, useDispatch());
-  const { consoleIsExpanded } = useSelector(state => state.ide);
-
-  const actions = [
-    {
-      icon: TerminalIcon, inverted: true, aria: 'Open terminal console', action: consoleIsExpanded ? collapseConsole : expandConsole
-    },
-    { icon: FolderIcon, aria: 'Open files explorer', action: toggleExplorer }
-  ];
-
-  return (
-    <BottomBarContent>
-      {actions.map(({
-        icon, aria, action, inverted
-      }) =>
-        (
-          <IconButton
-            inverted={inverted}
-            className={inverted && 'inverted'}
-            icon={icon}
-            aria-label={aria}
-            key={`bottom-bar-${aria}`}
-            onClick={() => action()}
-          />))}
-    </BottomBarContent>
-  );
-};
+const ActionStrip = ({ actions }) => (
+  <BottomBarContent>
+    {actions.map(({
+      icon, aria, action, inverted
+    }) =>
+      (<IconButton
+        inverted={inverted}
+        className={inverted && 'inverted'}
+        icon={icon}
+        aria-label={aria}
+        key={`bottom-bar-${aria}`}
+        onClick={action}
+      />))}
+  </BottomBarContent>);
 
 ActionStrip.propTypes = {
-  toggleExplorer: PropTypes.func
-};
-
-ActionStrip.defaultProps = {
-  toggleExplorer: () => {}
+  actions: PropTypes.arrayOf(PropTypes.shape({
+    icon: PropTypes.any,
+    aria: PropTypes.string.isRequired,
+    action: PropTypes.func.isRequired,
+    inverted: PropTypes.bool
+  })).isRequired
 };
 
 export default ActionStrip;

client/components/mobile/Header.jsx

@@ -35,6 +35,12 @@ const HeaderDiv = styled.div`
   }
 
   & svg path { fill: ${textColor} !important; }
+
+  .editor__unsaved-changes svg {
+    width: ${remSize(16)};
+    padding: 0;
+    vertical-align: top
+  }
 `;
 
 const IconContainer = styled.div`
@@ -71,8 +77,9 @@ const Header = ({
   </HeaderDiv>
 );
 
+
 Header.propTypes = {
-  title: PropTypes.string,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   subtitle: PropTypes.string,
   leftButton: PropTypes.element,
   children: PropTypes.oneOfType([PropTypes.element, PropTypes.arrayOf(PropTypes.element)]),

client/components/mobile/Sidebar.jsx

@@ -16,7 +16,7 @@ const SidebarWrapper = styled.div`
   z-index: 2;
   left: 0;
 
-  background: white;
+  background: ${prop('backgroundColor')};
   box-shadow: 0 6px 6px 0 rgba(0,0,0,0.10);
 `;
 

client/images/save.svg

@@ -126,7 +126,7 @@ function getSynchedProject(currentState, responseProject) {
   };
 }
 
-export function saveProject(selectedFile = null, autosave = false) {
+export function saveProject(selectedFile = null, autosave = false, mobile = false) {
   return (dispatch, getState) => {
     const state = getState();
     if (state.project.isSaving) {
@@ -185,16 +185,15 @@ export function saveProject(selectedFile = null, autosave = false) {
       .then((response) => {
         dispatch(endSavingProject());
         const { hasChanges, synchedProject } = getSynchedProject(getState(), response.data);
+
+        dispatch(setNewProject(synchedProject));
+        dispatch(setUnsavedChanges(false));
+        browserHistory.push(`/${response.data.user.username}/sketches/${response.data.id}`);
+
         if (hasChanges) {
-          dispatch(setNewProject(synchedProject));
-          dispatch(setUnsavedChanges(false));
-          browserHistory.push(`/${response.data.user.username}/sketches/${response.data.id}`);
           dispatch(setUnsavedChanges(true));
-        } else {
-          dispatch(setNewProject(synchedProject));
-          dispatch(setUnsavedChanges(false));
-          browserHistory.push(`/${response.data.user.username}/sketches/${response.data.id}`);
         }
+
         dispatch(projectSaveSuccess());
         if (!autosave) {
           if (state.preferences.autosave) {
@@ -222,9 +221,9 @@ export function saveProject(selectedFile = null, autosave = false) {
   };
 }
 
-export function autosaveProject() {
+export function autosaveProject(mobile = false) {
   return (dispatch, getState) => {
-    saveProject(null, true)(dispatch, getState);
+    saveProject(null, true, mobile)(dispatch, getState);
   };
 }
 

client/modules/IDE/actions/project.js

@@ -27,6 +27,8 @@ import { CSSLint } from 'csslint';
 import { HTMLHint } from 'htmlhint';
 import classNames from 'classnames';
 import { debounce } from 'lodash';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
 import '../../../utils/htmlmixed';
 import '../../../utils/p5-javascript';
 import '../../../utils/webGL-clike';
@@ -40,6 +42,16 @@ import beepUrl from '../../../sounds/audioAlert.mp3';
 import UnsavedChangesDotIcon from '../../../images/unsaved-changes-dot.svg';
 import RightArrowIcon from '../../../images/right-arrow.svg';
 import LeftArrowIcon from '../../../images/left-arrow.svg';
+import { getHTMLFile } from '../reducers/files';
+
+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';
 
 search(CodeMirror);
 
@@ -413,4 +425,47 @@ Editor.defaultProps = {
   consoleEvents: [],
 };
 
-export default withTranslation()(Editor);
+
+function mapStateToProps(state) {
+  return {
+    files: state.files,
+    file:
+      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,
+
+    ...state.preferences,
+    ...state.ide,
+    ...state.project,
+    ...state.editorAccessibility,
+    isExpanded: state.ide.consoleIsExpanded,
+    projectSavedTime: state.project.updatedAt
+  };
+}
+
+function mapDispatchToProps(dispatch) {
+  return bindActionCreators(
+    Object.assign(
+      {},
+      EditorAccessibilityActions,
+      FileActions,
+      ProjectActions,
+      IDEActions,
+      PreferencesActions,
+      UserActions,
+      ToastActions,
+      ConsoleActions
+    ),
+    dispatch
+  );
+}
+
+export default withTranslation()(connect(mapStateToProps, mapDispatchToProps)(Editor));