Skip to content

Commit

Permalink
Merge pull request #187 from oslabs-beta/master
Browse files Browse the repository at this point in the history
Final merge from oslabs-beta to open-source-labs main for OverVue 10.0
  • Loading branch information
janicaa1 authored Sep 6, 2023
2 parents a6e1aa1 + 1b45b18 commit 83cd4f4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 15 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1 align="center">
<img src="src/assets/overvue_256x256.png">
<img src="src/assets/overvue_256x256_old.png">
</h1>

<p align="center"><b>Prototyping Development Tool for Vue Developers</b></p>
Expand Down Expand Up @@ -422,7 +422,6 @@ package.json
<li>Eliminated code redundancy by implementing Composition API and Pinia</li>
</ul>
</details>
<br/>

### Changelog 10.0

Expand Down Expand Up @@ -467,6 +466,7 @@ Smaller changes that can be worked on:
- Removing ghost image when dragging HTML elements
- Highlight active HTML element when selected/updating
- Remove duplicate imports and account for nested components in Vuetensils import statement
- HTML elements list occasionally does not render properly after component is dragged

<br/>

Expand Down
4 changes: 2 additions & 2 deletions src/components/right-sidebar/ComponentDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<q-tab-panels v-model="tab" animated class="html-bg text-white">
<!-- HTML Elements -->
<q-tab-panel name="newhtml">
<V10HTMLQueue />
<HTMLElementsList />
</q-tab-panel>

<!-- Code Preview -->
Expand Down Expand Up @@ -119,7 +119,7 @@
import { computed } from "vue";
import { useStore } from "../../store/main.js";
import { Component } from "../../../types";
import V10HTMLQueue from "./V10HTMLQueue.vue";
import HTMLElementsList from "./HTMLElementsList.vue";
import CodeSnippet from "./CodeSnippet.vue";
/* COMPUTED VALUES */
Expand Down
5 changes: 2 additions & 3 deletions src/components/right-sidebar/Tree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { useStore } from "../../store/main.js";
import VueTree from "@overvue/vue3-tree-chart";
import "@overvue/vue3-tree-chart/dist/vue3-tree-chart.css";
import V10HTMLQueue from "./V10HTMLQueue.vue";
import HTMLElementsList from "./HTMLElementsList.vue";
/* LIFECYCLE HOOKS */
onMounted(() => {
Expand Down Expand Up @@ -259,8 +259,7 @@ watch(componentMap, () => (treeData.value = buildTree(componentMap.value)), {
{{ activeComponent }}
</div>
<div class="modal-box">
<!-- <HTMLQueue /> -->
<V10HTMLQueue />
<HTMLElementsList />
</div>
</div>
</q-dialog>
Expand Down
10 changes: 2 additions & 8 deletions src/store/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,8 @@ import {
breadthFirstSearchParent,
} from "src/utils/search.util";

import { isProxy, toRaw } from "vue";
import {
State,
Actions,
Component,
RouteComponentMap,
HtmlElement,
} from "../../types";
import { toRaw } from "vue";
import { State, Actions, Component, HtmlElement } from "../../types";
import { Store } from "pinia";
import localforage from "localforage";
// *** GLOBAL *** //////////////////////////////////////////////
Expand Down

0 comments on commit 83cd4f4

Please sign in to comment.