Merge pull request #3 from Linhatran/master

commented out SaveProjectButton, OpenProjectFolder, DeleteProjects bu…

Author: aw2934

app/src/components/right/ProjectManager.tsx

@@ -204,9 +204,9 @@ const ProjectManager = () => {
             </Select>
           </FormControl>
         </div>
-        {state.isLoggedIn ? <SaveProjectButton /> : ''}
+        {/* {state.isLoggedIn ? <SaveProjectButton /> : ''}
         {state.isLoggedIn ? <ProjectsFolder /> : ''}
-        {state.isLoggedIn ? <DeleteProjects /> : ''} 
+        {state.isLoggedIn ? <DeleteProjects /> : ''}  */}
         {/* <div className={classes.btnGroup}>
 
 {/* ---------------------------EXPORT PROJECT BUTTON----------------------------- */}

app/src/helperFunctions/generateCode.ts

@@ -271,19 +271,19 @@ const generateUnformattedCode = (
 const formatCode = (code: string) => {
   // in test environment, window.api is not defined,
   // so we reference original prettier format function instead
-  // if (process.env.NODE_ENV === 'test') {
-  //   const { format } = require('prettier');
-  //   return format(code, {
-  //     singleQuote: true,
-  //     trailingComma: 'es5',
-  //     bracketSpacing: true,
-  //     jsxBracketSameLine: true,
-  //     parser: 'babel'
-  //   });
-  // } else {
-  //   return window.api.formatCode(code);
-  // }
-  return code;
+  if (process.env.NODE_ENV === 'test') {
+    const { format } = require('prettier');
+    return format(code, {
+      singleQuote: true,
+      trailingComma: 'es5',
+      bracketSpacing: true,
+      jsxBracketSameLine: true,
+      parser: 'babel'
+    });
+  } else {
+    return window.api.formatCode(code);
+  }
+  // return code;
 };
 
 // generate code based on component hierarchy and then return the rendered code

app/src/helperFunctions/manageSeparators.ts

@@ -8,7 +8,7 @@ const manageSeparators = {};
 manageSeparators.nextTopSeparatorId = initialState.nextTopSeparatorId;
 
 manageSeparators.handleSeparators = (arr, str) => {
-  if (str === 'delete' && arr.length === 1) {
+  if ((str === 'delete' || str === 'change position') && arr.length === 1) {
     arr.splice(0, 1);
   }
 
@@ -37,14 +37,13 @@ manageSeparators.handleSeparators = (arr, str) => {
     // check is length is > 0 or it is a nested element
     if (arr[index].children.length) {
     // recursive call if children array
-       (str === 'delete') ? manageSeparators.handleSeparators(arr[index].children, str) : manageSeparators.handleSeparators(arr[index].children);
+       (str === 'delete' || str === 'change position') ? manageSeparators.handleSeparators(arr[index].children, str) : manageSeparators.handleSeparators(arr[index].children);
     }
   }
   return manageSeparators.nextTopSeparatorId;
 };
 
 manageSeparators.mergeSeparator = (arr, index) => {
-  console.log('mergerSeparator',arr)
   return arr.map((child) => {
     if (child.name === 'div' && child.children.length) {
       const divContents = manageSeparators.mergeSeparator(child.children, index);