Merge branch 'dev' into dependencyUpdates

Author: MrBeeAreWhy

src/components/dashboard_items/Dashboard.vue

@@ -48,7 +48,7 @@ Description:
 import { mapState, mapActions } from "vuex";
 import Tree from "./Tree.vue";
 import ComponentDetails from "./ComponentDetails.vue";
-import RouteDisplay from "../home_sidebar_items/RouteDisplay.vue";
+import RouteDisplay from "./RouteDisplay.vue";
 
 export default {
   components: {

src/components/home_sidebar_items/RouteDisplay.vue renamed to src/components/dashboard_items/RouteDisplay.vue

@@ -12,7 +12,7 @@ Functionality includes: if active component is selected, will switch view to edi
 import CreateComponent from './CreateComponent.vue'
 import EditDeleteComponents from './EditDeleteComponents.vue'
 import { mapState } from 'vuex'
-import UploadImage from '../UploadImage.vue'
+import UploadImage from './UploadImage.vue'
 export default {
   data () {
     return {

src/components/home_sidebar_items/Routes.vue renamed to src/components/dashboard_items/Routes.vue

@@ -45,8 +45,8 @@ Description:
 </template>
 
 <script>
-import Icons from "../Icons";
-import ParentMultiselect from "../ParentMultiselect.vue";
+import Icons from "./Icons.vue";
+import ParentMultiselect from "./ParentMultiselect.vue";
 import { mapState, mapActions } from "vuex";
 export default {
   name: "HomeSidebar",

src/components/home_sidebar_items/ComponentTab/ComponentTab.vue

@@ -142,7 +142,7 @@ Description:
 import { mapState, mapActions } from "vuex";
 import VueMultiselect from "vue-multiselect";
 import HTMLQueue from "../../dashboard_items/HTMLQueue.vue";
-import Icons from "../Icons.vue";
+import Icons from "./Icons.vue";
 import AddProps from "./AddProps.vue";
 import ComponentState from "./ComponentState.vue";
 import ComponentActions from "./ComponentActions.vue";

src/components/home_sidebar_items/ComponentTab/CreateComponent.vue

@@ -46,8 +46,8 @@ Description:
 
 <script>
 import { mapState, mapActions } from "vuex";
-import uploadImage from "../../utils/uploadImage.util";
-import clearImageDialog from "../../utils/clearImage.util";
+import uploadImage from "../../../utils/uploadImage.util";
+import clearImageDialog from "../../../utils/clearImage.util";
 
 export default {
   name: "upload-image",