Merge pull request #45 from jinsoolim/realrevert

Realrevert

Author: brianjshan

__tests__/HTMLPanel.test.tsx

@@ -27,7 +27,6 @@ test('Renders HTMLPanel component', () => {
     <Test/>
   );
   expect(screen.getAllByRole('textbox')).toHaveLength(2);
-  // console.log(container.firstChild);
   expect(screen.getByText('Div')).toBeInTheDocument();
   expect(screen.getByText('Image')).toBeInTheDocument();
   expect(screen.getByText('Form')).toBeInTheDocument();

app/src/components/login/FBPassWord.tsx

@@ -86,7 +86,6 @@ const SignUp: React.FC<LoginInt & RouteComponentProps> = props => {
   const handleSignUp = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     e.preventDefault();
     const email = props.location.state.email;
-    console.log(email);
     // Reset Error Validation
     setInvalidPasswordMsg('');
     setInvalidVerifyPasswordMsg('');
@@ -132,7 +131,7 @@ const SignUp: React.FC<LoginInt & RouteComponentProps> = props => {
     }
 
     // get username and email from FB
-    
+
     newUserIsCreated(email, email, password).then(userCreated => {
       if (userCreated === 'Success') {
         props.history.push('/');

app/src/components/main/Canvas.tsx

@@ -10,18 +10,14 @@ import ListItem from '@material-ui/core/ListItem';
 import ListItemText from '@material-ui/core/ListItemText';
 import createModal from '../right/createModal';
 
-const checkChildren = (child, currentComponent) => {
-  for (let i = 0; i < child.length; i+=1) {
-    if (child[i].children.length) {
-      for (let j = 0; j < child[i].children.length; j+=1) {
-        if (child[i].children[j].name === currentComponent.name) {
-          return true;
-        }
-      }
-      return checkChildren(child[i].children, currentComponent);
-    }
-  }
-  return false;
+const findNestedChild = (curr, components) => {
+  components.forEach((comp, i) => {
+    comp.children.forEach(child => {
+      if (child.name === curr.name) {};
+    });
+    if (comp.children.length !== 0) findNestedChild(curr, comp.children);
+  });
+
 };
 
 function Canvas() {

app/src/reducers/componentReducer.ts

@@ -484,7 +484,8 @@ const reducer = (state: State, action: Action) => {
           state.projectType,
           state.HTMLTypes
         );
-      })
+      }
+
 
       const canvasFocus = { componentId: 1, childId: null };