Merge branch 'dev' into ah/final-touches

Author: anthonyHerr

package-lock.json

@@ -10,11 +10,11 @@
 <script setup>
 /* IMPORTS */
 import { onMounted, ref } from "vue";
-import { useStore } from "./store/main.js";
+import { useStore } from "./stores/main.js";
 const deepEqual = require("lodash.isequal");
 const cloneDeep = require("lodash.clonedeep");
 const throttle = require("lodash.throttle");
-
+const store = useStore();
 /* LIFECYCLE HOOKS */
 
 onMounted(() => {
@@ -50,7 +50,7 @@ const doneAction = ref([]);
 const undoneAction = ref([]);
 const isTimetraveling = ref(false);
 
-const store = useStore();
+
 
 store.$onAction((action) => {
   if (typeof action.args[0] === "object") {
@@ -118,7 +118,7 @@ const redo = () => {
     store[actionName](cloneDeep(action.args[0]));
   }
   isTimetraveling.value = false;
-  
+
   if (action && ignoredActions.has(action.name)) {
     redo();
   }
@@ -135,4 +135,4 @@ const redoTrigger = () => {
   const throttledRedo = throttle(redo, 300);
   throttledRedo();
 };
-</script>
+</script>

src/App.vue

@@ -533,7 +533,7 @@ import VueMultiselect from "vue-multiselect";
 import "vue-draggable-resizable/src/components/vue-draggable-resizable.css";
 import "vue3-draggable-resizable/dist/Vue3DraggableResizable.css";
 import { ColorPicker } from "vue-accessible-color-picker";
-import { useStore } from "../store/main.js";
+import { useStore } from "../stores/main.js";
 import { ref, computed, onMounted, watch } from "vue";
 import { ResizePayload, Component } from "../../types";
 
@@ -1255,3 +1255,4 @@ li:hover {
   background: black;
 }
 </style>
+../stores/main.js

src/components/Canvas.vue

@@ -1,6 +1,6 @@
-import { openHtmlElementMap } from "src/store/state/htmlElementMap";
+import { openHtmlElementMap } from "src/stores/state/htmlElementMap";
 import { computed } from "vue";
-import { useStore } from "src/store/main";
+import { useStore } from "src/stores/main";
 // @ts-ignore
 const { ipcRenderer } = window;
 

src/components/composables/useExportComponent.ts

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   LOCATION IN APP:
   [left sidebar] COMPONENT > Update Component > Actions
 
@@ -62,7 +62,7 @@
 /* IMPORTS */
 import { computed } from "vue";
 import VueMultiselect from "vue-multiselect";
-import { useStore } from "../../../store/main.js";
+import { useStore } from "../../../stores/main.js";
 import { Component } from "../../../../types";
 
 /* COMPUTED VALUES */
@@ -115,3 +115,4 @@ const deleteAction = (action: string) => {
   align-items: center;
 }
 </style>
+../../../stores/main.js

src/components/left-sidebar/ComponentTab/ActionsSubMenu.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   LOCATION IN APP:
   [left sidebar] COMPONENT > Update Component > Component Attributes
 
@@ -84,7 +84,7 @@
 <script setup lang="ts">
 /* IMPORTS */
 import { computed, ref } from "vue";
-import { useStore } from "../../../store/main.js";
+import { useStore } from "../../../stores/main.js";
 import { Component } from "../../../../types";
 const cloneDeep = require("lodash.clonedeep");
 
@@ -156,3 +156,4 @@ const deleteAttribute = (attribute: "id" | "class") => {
   cursor: pointer;
 }
 </style>
+../../../stores/main.js

src/components/left-sidebar/ComponentTab/AttributesSubMenu.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   LOCATION IN APP:
   [left sidebar] COMPONENT
 
@@ -16,7 +16,7 @@
 <script setup lang="ts">
 /* IMPORTS */
 import { computed } from "vue";
-import { useStore } from "../../../store/main.js";
+import { useStore } from "../../../stores/main.js";
 import CreateMenu from "./CreateMenu.vue";
 import UpdateMenu from "./UpdateMenu.vue";
 
@@ -56,3 +56,4 @@ const activeComponent = computed(() => store.activeComponent);
   padding: 10px 0;
 }
 </style>
+../../../stores/main.js

src/components/left-sidebar/ComponentTab/ComponentTab.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   LOCATION IN APP:
   [left sidebar] COMPONENT > default view
 
@@ -131,7 +131,7 @@
 <script setup lang="ts">
 /* IMPORTS */
 import { computed, ref, watch } from "vue";
-import { useStore } from "../../../store/main.js";
+import { useStore } from "../../../stores/main.js";
 import { Component } from "../../../../types";
 import { useCreateComponent } from "../../composables/useCreateComponent.js";
 import ParentMultiselect from "./ParentMultiselect.vue";
@@ -356,3 +356,4 @@ img {
   background: $subprimary;
 }
 </style>
+../../../stores/main.js

src/components/left-sidebar/ComponentTab/CreateMenu.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   LOCATION IN APP:
   [left sidebar] COMPONENT > default view > ELEMENTS
 
@@ -31,7 +31,7 @@
 <script setup lang="ts">
 /* IMPORTS */
 import { computed } from "vue";
-import { useStore } from "../../../store/main.js";
+import { useStore } from "../../../stores/main.js";
 import { HtmlElement } from "app/types";
 
 /* EMITS */
@@ -157,3 +157,4 @@ button:active {
   color: $menutext;
 }
 </style>
+../../../stores/main.js

src/components/left-sidebar/ComponentTab/Icons.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   NOTE:
   [OverVue v.10.0] Functionality is disabled; past iterations had intended to implement this functionality though hasn't actually been incorporated yet
 
@@ -20,7 +20,7 @@
 /* IMPORTS */
 import { computed } from "vue";
 const { fs, ipcRenderer } = window as any;
-import { useStore } from "../../../store/main.js";
+import { useStore } from "../../../stores/main.js";
 import { Component, HtmlElement, HtmlElementMap } from "../../../../types";
 import { useCreateComponent } from "../../composables/useCreateComponent.js";
 
@@ -418,3 +418,4 @@ const openVueFile = (data: any) => {
   margin: 30px 0px;
 }
 </style>
+../../../stores/main.js