diff --git a/client/components/Nav.js b/client/components/Nav.js
index 07456387..ad51f760 100644
--- a/client/components/Nav.js
+++ b/client/components/Nav.js
@@ -8,7 +8,7 @@ function Nav(props) {
New
@@ -21,6 +21,16 @@ function Nav(props) {
Save
+
+
+ Duplicate
+
+
+
+
+ Download
+
+
@@ -28,16 +38,6 @@ function Nav(props) {
-
-
- Export (zip)
-
-
-
-
- Clone
-
-
-
@@ -50,7 +50,7 @@ function Nav(props) {
}
Nav.propTypes = {
- createProject: PropTypes.func.isRequired,
+ newProject: PropTypes.func.isRequired,
saveProject: PropTypes.func.isRequired,
exportProjectAsZip: PropTypes.func.isRequired,
cloneProject: PropTypes.func.isRequired,
diff --git a/client/constants.js b/client/constants.js
index b863005e..f71c2317 100644
--- a/client/constants.js
+++ b/client/constants.js
@@ -26,6 +26,7 @@ export const SET_PROJECT_NAME = 'SET_PROJECT_NAME';
export const PROJECT_SAVE_SUCCESS = 'PROJECT_SAVE_SUCCESS';
export const PROJECT_SAVE_FAIL = 'PROJECT_SAVE_FAIL';
export const NEW_PROJECT = 'NEW_PROJECT';
+export const RESET_PROJECT = 'RESET_PROJECT';
export const SET_PROJECT = 'SET_PROJECT';
export const SET_PROJECTS = 'SET_PROJECTS';
diff --git a/client/modules/IDE/actions/project.js b/client/modules/IDE/actions/project.js
index d44cf12a..d541a49f 100644
--- a/client/modules/IDE/actions/project.js
+++ b/client/modules/IDE/actions/project.js
@@ -52,6 +52,9 @@ export function setProjectName(event) {
export function saveProject() {
return (dispatch, getState) => {
const state = getState();
+ if (state.user.id && state.project.owner && state.project.owner.id !== state.user.id) {
+ return;
+ }
const formParams = Object.assign({}, state.project);
formParams.files = [...state.files];
if (state.project.id) {
@@ -116,7 +119,6 @@ export function createProject() {
export function exportProjectAsZip() {
return (dispatch, getState) => {
- console.log('exporting project!');
const state = getState();
const zip = new JSZip();
async.each(state.files, (file, cb) => {
@@ -139,6 +141,13 @@ export function exportProjectAsZip() {
};
}
+export function newProject() {
+ browserHistory.push('/');
+ return {
+ type: ActionTypes.RESET_PROJECT
+ };
+}
+
export function cloneProject() {
return (dispatch, getState) => {
const state = getState();
diff --git a/client/modules/IDE/components/Editor.js b/client/modules/IDE/components/Editor.js
index 5ea18126..4e4d6e5d 100644
--- a/client/modules/IDE/components/Editor.js
+++ b/client/modules/IDE/components/Editor.js
@@ -89,6 +89,8 @@ class Editor extends React.Component {
this._cm.setOption('mode', 'htmlmixed');
}
}
+
+ console.log('componentDidUpdate in editor');
}
componentWillUnmount() {
diff --git a/client/modules/IDE/pages/IDEView.js b/client/modules/IDE/pages/IDEView.js
index 28981a48..ae73357b 100644
--- a/client/modules/IDE/pages/IDEView.js
+++ b/client/modules/IDE/pages/IDEView.js
@@ -39,6 +39,7 @@ class IDEView extends React.Component {
this.consoleSize = this.props.ide.consoleIsExpanded ? 180 : 29;
this.sidebarSize = this.props.ide.sidebarIsExpanded ? 180 : 20;
+ this.forceUpdate();
}
componentWillUpdate(nextProps) {
@@ -66,11 +67,18 @@ class IDEView extends React.Component {
this.autosaveInterval = null;
}
}
+
+ if (this.autosaveInterval && !this.props.project.id) {
+ clearInterval(this.autosaveInterval);
+ this.autosaveInterval = null;
+ }
}
componentWillUnmount() {
clearInterval(this.autosaveInterval);
this.autosaveInterval = null;
+ this.consoleSize = undefined;
+ this.sidebarSize = undefined;
}
_handleConsolePaneOnDragFinished() {
@@ -82,6 +90,7 @@ class IDEView extends React.Component {
}
_handleSidebarPaneOnDragFinished() {
+ console.log('setting sidebar size');
this.sidebarSize = this.refs.sidebarPane.state.draggedSize;
this.refs.sidebarPane.setState({
resized: false,
@@ -94,7 +103,7 @@ class IDEView extends React.Component {