pulled from alex

Author: JojuOlaode

src/components/ComponentDisplay.vue

@@ -250,13 +250,8 @@ export default {
         routeArray: this.routes[this.activeRoute],
         activeComponentData: this.activeComponentData
       }
-<<<<<<< HEAD
-      console.log("x: ",payload.x,"y:",payload.y)
-      // this.updateStartingPosition(payload);
-=======
       console.log("x: ",payload.x,"y: ",payload.y)
       //this.updateStartingPosition(payload);
->>>>>>> 823ed2271ff432299d30b485464fbc842b60ff07
     },
 
     recordInitialSize: function (e) {

src/store/actions.js

@@ -205,9 +205,9 @@ const actions = {
   // },
   [types.openProject]: ({ commit }, payload) => {
     // open project imagePath, componentPath, routePath
-    console.log('image', payload.imagePath)
-    console.log('component', payload.componentMap)
-    console.log('route', payload.routes)
+    // console.log('image', payload.imagePath)
+    // console.log('component', payload.componentMap)
+    // console.log('route', payload.routes)
     commit(types.SET_IMAGE_PATH, payload.imagePath)
     commit(types.SET_COMPONENT_MAP, payload.componentMap)
     commit(types.SET_ROUTES, payload.routes)

src/store/mutations.js

@@ -81,51 +81,6 @@ const mutations = {
   },
   // empty state
   [types.EMPTY_STATE]: (state, payload) => {
-<<<<<<< HEAD
-    console.log('This is our defaultstate still', defaultState)
-    console.log(payload)
-    payload.replaceState({
-      icons,
-      htmlElementMap,
-      // every single time we create a component
-      // sent to export project component
-      componentMap: {
-        App: {
-          componentName: 'App',
-          children: ['HomeView'],
-          htmlList: []
-        },
-        HomeView: {
-          componentName: 'HomeView',
-          children: [],
-          htmlList: []
-        }
-        // NewView: {}
-      },
-      routes: {
-        HomeView: []
-        // NewView: []
-      },
-      userActions: [],
-      userState: {},
-      /**
-       *
-       */
-      componentNameInputValue: '',
-      projects: [{ filename: 'Untitled-1', lastSavedLocation: '' }],
-      activeRoute: 'HomeView',
-      activeComponent: '',
-      selectedElementList: [],
-      projectNumber: 2,
-      activeTab: 0,
-      componentChildrenMultiselectValue: [],
-      modalOpen: false,
-      parentSelected: false,
-      imagePath: {
-        HomeView: ''
-      }
-    })
-=======
     // console.log('This is our defaultstate still', defaultState)
     console.log("hopefully this stays pure", payload)
     payload.store.replaceState(cloneDeep(payload.initialState))
@@ -168,7 +123,6 @@ const mutations = {
     //   parentSelected: false,
     //   imagePath: ''
     // })
->>>>>>> 823ed2271ff432299d30b485464fbc842b60ff07
   },
 
   // add parent