Skip to content

Commit 83cd4f4

Browse files
authored
Merge pull request #187 from oslabs-beta/master
Final merge from oslabs-beta to open-source-labs main for OverVue 10.0
2 parents a6e1aa1 + 1b45b18 commit 83cd4f4

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h1 align="center">
2-
<img src="src/assets/overvue_256x256.png">
2+
<img src="src/assets/overvue_256x256_old.png">
33
</h1>
44

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

427426
### Changelog 10.0
428427

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

471471
<br/>
472472

src/components/right-sidebar/ComponentDetails.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<q-tab-panels v-model="tab" animated class="html-bg text-white">
2727
<!-- HTML Elements -->
2828
<q-tab-panel name="newhtml">
29-
<V10HTMLQueue />
29+
<HTMLElementsList />
3030
</q-tab-panel>
3131

3232
<!-- Code Preview -->
@@ -119,7 +119,7 @@
119119
import { computed } from "vue";
120120
import { useStore } from "../../store/main.js";
121121
import { Component } from "../../../types";
122-
import V10HTMLQueue from "./V10HTMLQueue.vue";
122+
import HTMLElementsList from "./HTMLElementsList.vue";
123123
import CodeSnippet from "./CodeSnippet.vue";
124124

125125
/* COMPUTED VALUES */

src/components/right-sidebar/Tree.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { useStore } from "../../store/main.js";
1818
import VueTree from "@overvue/vue3-tree-chart";
1919
import "@overvue/vue3-tree-chart/dist/vue3-tree-chart.css";
2020

21-
import V10HTMLQueue from "./V10HTMLQueue.vue";
21+
import HTMLElementsList from "./HTMLElementsList.vue";
2222

2323
/* LIFECYCLE HOOKS */
2424
onMounted(() => {
@@ -259,8 +259,7 @@ watch(componentMap, () => (treeData.value = buildTree(componentMap.value)), {
259259
{{ activeComponent }}
260260
</div>
261261
<div class="modal-box">
262-
<!-- <HTMLQueue /> -->
263-
<V10HTMLQueue />
262+
<HTMLElementsList />
264263
</div>
265264
</div>
266265
</q-dialog>

src/store/actions.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,8 @@ import {
33
breadthFirstSearchParent,
44
} from "src/utils/search.util";
55

6-
import { isProxy, toRaw } from "vue";
7-
import {
8-
State,
9-
Actions,
10-
Component,
11-
RouteComponentMap,
12-
HtmlElement,
13-
} from "../../types";
6+
import { toRaw } from "vue";
7+
import { State, Actions, Component, HtmlElement } from "../../types";
148
import { Store } from "pinia";
159
import localforage from "localforage";
1610
// *** GLOBAL *** //////////////////////////////////////////////

0 commit comments

Comments
 (0)